Add leather armour, wizard robes, and equipment stat rules.
Wire tiered chestguard/chausses/helmet and mage robe pieces with dual tint, tailor/leatherworking recipes, and design-accurate worn bonuses: leather agility + half defence, wizard magic only, metal defence with rank penalties on magic and archery plus quarter-tier strength and agility rounded up.
@@ -1,31 +1,35 @@
1
import {
2
WORLD_SETTING_CATEGORIES,
3
coerceSettingValue,
4
formatSettingValue,
5
settingsValuesEqual,
6
itemSeedMapsEqual
7
} from "/shared/definitions/worldSettings.js";
8
import {
9
listPricedItems,
10
itemPriceSnapshot,
11
normalizeItemSeedValues,
12
effectiveSeedValue
13
} from "/shared/shop/pricing.js";
1
import
2
{
3
WORLD_SETTING_CATEGORIES,
4
coerceSettingValue,
5
formatSettingValue,
6
settingsValuesEqual,
7
itemSeedMapsEqual
8
} from "/shared/definitions/worldSettings.js";
9
import
10
{
11
listPricedItems,
12
itemPriceSnapshot,
13
normalizeItemSeedValues,
14
effectiveSeedValue
15
} from "/shared/shop/pricing.js";
14
16
import { ITEM_DEFINITIONS, itemAssetPathForStack } from "/shared/definitions/items.js";
15
17
import { EQUIPMENT_SLOTS } from "/shared/items/inventory.js";
16
import {
17
normalizeStarterLoadout,
18
starterLoadoutsEqual,
19
DEFAULT_STARTER_EQUIPMENT,
20
DEFAULT_STARTER_INVENTORY
21
} from "/shared/items/starterLoadout.js";
22
import {
23
EQUIPMENT_STAT_CATEGORIES,
24
normalizeEquipmentStatBonuses,
25
equipmentStatBonusMapsEqual,
26
equipmentStatRowItemId,
27
equipmentStatRowDefaultTier
28
} from "/shared/definitions/equipmentStatCategories.js";
18
import
19
{
20
normalizeStarterLoadout,
21
starterLoadoutsEqual,
22
DEFAULT_STARTER_EQUIPMENT,
23
DEFAULT_STARTER_INVENTORY
24
} from "/shared/items/starterLoadout.js";
25
import
26
{
27
EQUIPMENT_STAT_CATEGORIES,
28
normalizeEquipmentStatBonuses,
29
equipmentStatBonusMapsEqual,
30
equipmentStatRowItemId,
31
equipmentStatRowDefaultTier
32
} from "/shared/definitions/equipmentStatCategories.js";
29
33
import { applyItemIcon } from "/src/render/potionIcon.js";
30
34
31
35
const SEED_PAGE_SIZE = 20;
@@ -634,7 +638,7 @@ export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNi
634
638
skillIcon.height = 14;
635
639
const input = document.createElement("input");
636
640
input.type = "number";
637
input.min = "0";
641
input.min = "-99";
638
642
input.max = "99";
639
643
input.step = "1";
640
644
input.dataset.equipStat = "1";
@@ -647,7 +651,7 @@ export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNi
647
651
{ line.classList.add("dirty"); }
648
652
input.addEventListener("input", () =>
649
653
{
650
const value = Math.max(0, Math.min(99, Math.floor(Number(input.value) || 0)));
654
const value = Math.max(-99, Math.min(99, Math.floor(Number(input.value) || 0)));
651
655
input.value = String(value);
652
656
const nextCat = {
653
657
...(draftEquipmentStats[category.id] ?? {}),
@@ -1,31 +1,35 @@1
import {1
import2
WORLD_SETTING_CATEGORIES,2
{3
coerceSettingValue,3
WORLD_SETTING_CATEGORIES,4
formatSettingValue,4
coerceSettingValue,5
settingsValuesEqual,5
formatSettingValue,6
itemSeedMapsEqual6
settingsValuesEqual,7
} from "/shared/definitions/worldSettings.js";7
itemSeedMapsEqual8
import {8
} from "/shared/definitions/worldSettings.js";9
listPricedItems,9
import10
itemPriceSnapshot,10
{11
normalizeItemSeedValues,11
listPricedItems,12
effectiveSeedValue12
itemPriceSnapshot,13
} from "/shared/shop/pricing.js";13
normalizeItemSeedValues,14
effectiveSeedValue15
} from "/shared/shop/pricing.js";14
import { ITEM_DEFINITIONS, itemAssetPathForStack } from "/shared/definitions/items.js";16
import { ITEM_DEFINITIONS, itemAssetPathForStack } from "/shared/definitions/items.js";15
import { EQUIPMENT_SLOTS } from "/shared/items/inventory.js";17
import { EQUIPMENT_SLOTS } from "/shared/items/inventory.js";16
import {18
import17
normalizeStarterLoadout,19
{18
starterLoadoutsEqual,20
normalizeStarterLoadout,19
DEFAULT_STARTER_EQUIPMENT,21
starterLoadoutsEqual,20
DEFAULT_STARTER_INVENTORY22
DEFAULT_STARTER_EQUIPMENT,21
} from "/shared/items/starterLoadout.js";23
DEFAULT_STARTER_INVENTORY22
import {24
} from "/shared/items/starterLoadout.js";23
EQUIPMENT_STAT_CATEGORIES,25
import24
normalizeEquipmentStatBonuses,26
{25
equipmentStatBonusMapsEqual,27
EQUIPMENT_STAT_CATEGORIES,26
equipmentStatRowItemId,28
normalizeEquipmentStatBonuses,27
equipmentStatRowDefaultTier29
equipmentStatBonusMapsEqual,28
} from "/shared/definitions/equipmentStatCategories.js";30
equipmentStatRowItemId,31
equipmentStatRowDefaultTier32
} from "/shared/definitions/equipmentStatCategories.js";29
import { applyItemIcon } from "/src/render/potionIcon.js";33
import { applyItemIcon } from "/src/render/potionIcon.js";30
34
31
const SEED_PAGE_SIZE = 20;35
const SEED_PAGE_SIZE = 20;@@ -634,7 +638,7 @@ export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNi634
skillIcon.height = 14;638
skillIcon.height = 14;635
const input = document.createElement("input");639
const input = document.createElement("input");636
input.type = "number";640
input.type = "number";637
input.min = "0";641
input.min = "-99";638
input.max = "99";642
input.max = "99";639
input.step = "1";643
input.step = "1";640
input.dataset.equipStat = "1";644
input.dataset.equipStat = "1";@@ -647,7 +651,7 @@ export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNi647
{ line.classList.add("dirty"); }651
{ line.classList.add("dirty"); }648
input.addEventListener("input", () =>652
input.addEventListener("input", () =>649
{653
{650
const value = Math.max(0, Math.min(99, Math.floor(Number(input.value) || 0)));654
const value = Math.max(-99, Math.min(99, Math.floor(Number(input.value) || 0)));651
input.value = String(value);655
input.value = String(value);652
const nextCat = {656
const nextCat = {653
...(draftEquipmentStats[category.id] ?? {}),657
...(draftEquipmentStats[category.id] ?? {}),@@ -1144,6 +1144,10 @@ test("stacked combatants against the same target spread to different tiles", ()
1144
1144
const playerHealth = worker.world.ecs.get(handle, Component.health);
1145
1145
playerHealth.max = 500;
1146
1146
playerHealth.current = 500;
1147
engageTarget(worker.world.ecs, rat1, playerId);
1148
engageTarget(worker.world.ecs, rat2, playerId);
1149
assert.equal(componentsOf(harness.simulation, rat1).combat?.targetEntityId, playerId);
1150
assert.equal(componentsOf(harness.simulation, rat2).combat?.targetEntityId, playerId);
1147
1151
teleportEntity(worker, rat2, 9, 8);
1148
1152
1149
1153
for (let i = 0; i < 200; i++)
@@ -1159,8 +1163,6 @@ test("stacked combatants against the same target spread to different tiles", ()
1159
1163
`${pos2.tileX},${pos2.tileY}`,
1160
1164
"expected stacked rats to spread apart"
1161
1165
);
1162
assert.equal(componentsOf(harness.simulation, rat1).combat?.targetEntityId, playerId);
1163
assert.equal(componentsOf(harness.simulation, rat2).combat?.targetEntityId, playerId);
1164
1166
}
1165
1167
finally
1166
1168
{ harness.close(); }
@@ -1144,6 +1144,10 @@ test("stacked combatants against the same target spread to different tiles", ()1144
const playerHealth = worker.world.ecs.get(handle, Component.health);1144
const playerHealth = worker.world.ecs.get(handle, Component.health);1145
playerHealth.max = 500;1145
playerHealth.max = 500;1146
playerHealth.current = 500;1146
playerHealth.current = 500;1147
engageTarget(worker.world.ecs, rat1, playerId);1148
engageTarget(worker.world.ecs, rat2, playerId);1149
assert.equal(componentsOf(harness.simulation, rat1).combat?.targetEntityId, playerId);1150
assert.equal(componentsOf(harness.simulation, rat2).combat?.targetEntityId, playerId);1147
teleportEntity(worker, rat2, 9, 8);1151
teleportEntity(worker, rat2, 9, 8);1148
1152
1149
for (let i = 0; i < 200; i++)1153
for (let i = 0; i < 200; i++)@@ -1159,8 +1163,6 @@ test("stacked combatants against the same target spread to different tiles", ()1159
`${pos2.tileX},${pos2.tileY}`,1163
`${pos2.tileX},${pos2.tileY}`,1160
"expected stacked rats to spread apart"1164
"expected stacked rats to spread apart"1161
);1165
);1162
assert.equal(componentsOf(harness.simulation, rat1).combat?.targetEntityId, playerId);1163
assert.equal(componentsOf(harness.simulation, rat2).combat?.targetEntityId, playerId);1164
}1166
}1165
finally1167
finally1166
{ harness.close(); }1168
{ harness.close(); }@@ -5,6 +5,10 @@ import { CraftingStationId, CRAFT_DURATION_MS } from "../../shared/definitions/c
5
5
import { ItemId } from "../../shared/definitions/items.js";
6
6
import { ArmourItemId } from "../../shared/definitions/armourItems.js";
7
7
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
8
import { LeatherArmourItemId } from "../../shared/definitions/leatherArmourItems.js";
9
import { WizardItemId } from "../../shared/definitions/wizardItems.js";
10
import { ClothItemId } from "../../shared/definitions/clothItems.js";
11
import { resolveTailorCraft } from "../../shared/crafting/tailor.js";
8
12
import { SkillId } from "../../shared/definitions/skills.js";
9
13
import
10
14
{
@@ -505,3 +509,37 @@ test("leatherworking shoes recipes use 2 leather per tier", () =>
505
509
assert.equal(hide.output.itemId, LeatherItemId.dragonhideShoes);
506
510
assert.deepEqual(hide.inputs, [{ itemId: LeatherItemId.dragonhide, quantity: 2 }]);
507
511
});
512
513
test("leatherworking armour recipes use leather and cloth per tier", () =>
514
{
515
const chest = recipeDefinition("leather-chestguard-softLeather");
516
assert.ok(chest);
517
assert.equal(chest.output.itemId, LeatherArmourItemId.softLeatherChestguard);
518
assert.deepEqual(chest.inputs, [
519
{ itemId: ItemId.leather, quantity: 4 },
520
{ itemId: ClothItemId.cottonCloth, quantity: 2 }
521
]);
522
const chausses = recipeDefinition("leather-chausses-studdedLeather");
523
assert.ok(chausses);
524
assert.equal(chausses.inputs[0].quantity, 3);
525
assert.equal(chausses.inputs[1].quantity, 1);
526
const helmet = recipeDefinition("leather-helmet-dragonhide");
527
assert.ok(helmet);
528
assert.equal(helmet.inputs.length, 1);
529
assert.equal(helmet.inputs[0].quantity, 2);
530
});
531
532
test("tailor wizard robe recipes resolve cloth and leather inputs", () =>
533
{
534
const hat = resolveTailorCraft({ templateId: "wizard-hat", clothTier: "wool" });
535
assert.equal(hat.ok, true);
536
assert.equal(hat.recipe.output.itemId, WizardItemId.woolHat);
537
assert.deepEqual(hat.recipe.inputs, [
538
{ itemId: ClothItemId.woolCloth, quantity: 2 },
539
{ itemId: LeatherItemId.hardLeather, quantity: 1 }
540
]);
541
const bottoms = resolveTailorCraft({ templateId: "wizard-robebottoms", clothTier: "cotton" });
542
assert.equal(bottoms.ok, true);
543
assert.equal(bottoms.recipe.output.itemId, WizardItemId.cottonRobeBottoms);
544
assert.deepEqual(bottoms.recipe.inputs, [{ itemId: ClothItemId.cottonCloth, quantity: 4 }]);
545
});
@@ -5,6 +5,10 @@ import { CraftingStationId, CRAFT_DURATION_MS } from "../../shared/definitions/c5
import { ItemId } from "../../shared/definitions/items.js";5
import { ItemId } from "../../shared/definitions/items.js";6
import { ArmourItemId } from "../../shared/definitions/armourItems.js";6
import { ArmourItemId } from "../../shared/definitions/armourItems.js";7
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";7
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";8
import { LeatherArmourItemId } from "../../shared/definitions/leatherArmourItems.js";9
import { WizardItemId } from "../../shared/definitions/wizardItems.js";10
import { ClothItemId } from "../../shared/definitions/clothItems.js";11
import { resolveTailorCraft } from "../../shared/crafting/tailor.js";8
import { SkillId } from "../../shared/definitions/skills.js";12
import { SkillId } from "../../shared/definitions/skills.js";9
import13
import10
{14
{@@ -505,3 +509,37 @@ test("leatherworking shoes recipes use 2 leather per tier", () =>505
assert.equal(hide.output.itemId, LeatherItemId.dragonhideShoes);509
assert.equal(hide.output.itemId, LeatherItemId.dragonhideShoes);506
assert.deepEqual(hide.inputs, [{ itemId: LeatherItemId.dragonhide, quantity: 2 }]);510
assert.deepEqual(hide.inputs, [{ itemId: LeatherItemId.dragonhide, quantity: 2 }]);507
});511
});512
513
test("leatherworking armour recipes use leather and cloth per tier", () =>514
{515
const chest = recipeDefinition("leather-chestguard-softLeather");516
assert.ok(chest);517
assert.equal(chest.output.itemId, LeatherArmourItemId.softLeatherChestguard);518
assert.deepEqual(chest.inputs, [519
{ itemId: ItemId.leather, quantity: 4 },520
{ itemId: ClothItemId.cottonCloth, quantity: 2 }521
]);522
const chausses = recipeDefinition("leather-chausses-studdedLeather");523
assert.ok(chausses);524
assert.equal(chausses.inputs[0].quantity, 3);525
assert.equal(chausses.inputs[1].quantity, 1);526
const helmet = recipeDefinition("leather-helmet-dragonhide");527
assert.ok(helmet);528
assert.equal(helmet.inputs.length, 1);529
assert.equal(helmet.inputs[0].quantity, 2);530
});531
532
test("tailor wizard robe recipes resolve cloth and leather inputs", () =>533
{534
const hat = resolveTailorCraft({ templateId: "wizard-hat", clothTier: "wool" });535
assert.equal(hat.ok, true);536
assert.equal(hat.recipe.output.itemId, WizardItemId.woolHat);537
assert.deepEqual(hat.recipe.inputs, [538
{ itemId: ClothItemId.woolCloth, quantity: 2 },539
{ itemId: LeatherItemId.hardLeather, quantity: 1 }540
]);541
const bottoms = resolveTailorCraft({ templateId: "wizard-robebottoms", clothTier: "cotton" });542
assert.equal(bottoms.ok, true);543
assert.equal(bottoms.recipe.output.itemId, WizardItemId.cottonRobeBottoms);544
assert.deepEqual(bottoms.recipe.inputs, [{ itemId: ClothItemId.cottonCloth, quantity: 4 }]);545
});@@ -3,8 +3,10 @@ import assert from "node:assert/strict";
3
3
import { ItemId, itemDefinition } from "../../shared/definitions/items.js";
4
4
import { ArmourItemId } from "../../shared/definitions/armourItems.js";
5
5
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
6
import { LeatherArmourItemId } from "../../shared/definitions/leatherArmourItems.js";
7
import { WizardItemId } from "../../shared/definitions/wizardItems.js";
6
8
import { CraftingItemId } from "../../shared/definitions/craftingItems.js";
7
import { MaterialTier, LeatherTier, WoodTier, tierStatBonus, tierMinSkillLevel } from "../../shared/definitions/materialTiers.js";
9
import { MaterialTier, LeatherTier, WoodTier, ClothTier, tierStatBonus, tierMinSkillLevel } from "../../shared/definitions/materialTiers.js";
8
10
import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";
9
11
import { SkillId } from "../../shared/definitions/skills.js";
10
12
import { normalizePlayerSkills } from "../../shared/skills/state.js";
@@ -186,11 +188,16 @@ test("normalizeEquipmentStatBonuses fills defaults and clamps", () =>
186
188
const defaults = defaultEquipmentStatBonuses();
187
189
const normalized = normalizeEquipmentStatBonuses({
188
190
metalArmour: {
189
chestplate: { bronze: { defence: -3 } }
191
chestplate: {
192
bronze: { defence: -3, magic: -150 },
193
iron: { defence: 999 }
194
}
190
195
},
191
196
unknownCategory: { x: 1 }
192
197
});
193
assert.equal(normalized.metalArmour.chestplate.bronze.defence, 0);
198
assert.equal(normalized.metalArmour.chestplate.bronze.defence, -3);
199
assert.equal(normalized.metalArmour.chestplate.bronze.magic, -99);
200
assert.equal(normalized.metalArmour.chestplate.iron.defence, 99);
194
201
assert.equal(normalized.metalArmour.greaves.bronze.defence, defaults.metalArmour.greaves.bronze.defence);
195
202
assert.equal(normalized.unknownCategory, undefined);
196
203
});
@@ -216,3 +223,96 @@ test("bonusForEquippedItem returns null for tools", () =>
216
223
{
217
224
assert.equal(bonusForEquippedItem(itemDefinition(CraftingItemId.bronzePickaxe)), null);
218
225
});
226
227
test("leather armour uses leather-cloth dual tint", () =>
228
{
229
const def = itemDefinition(LeatherArmourItemId.softLeatherChestguard);
230
assert.equal(def?.equipment?.kind, EquipmentKind.leatherArmour);
231
assert.equal(def?.dualTintLeatherCloth, true);
232
assert.equal(def?.leatherTier, LeatherTier.softLeather);
233
assert.equal(def?.clothTier, "cotton");
234
const dual = resolveItemDualTint({ itemId: LeatherArmourItemId.softLeatherChestguard }, def);
235
assert.ok(dual?.shaft);
236
assert.ok(dual?.tip);
237
});
238
239
test("wizard robe top grants magic bonus for cloth tier", () =>
240
{
241
const defaults = defaultEquipmentStatBonuses().wizardArmour.robetop;
242
assert.equal(defaults.cotton.magic, tierStatBonus(ClothTier.cotton));
243
assert.equal(defaults.cotton.defence, undefined);
244
const slots = {
245
...emptyEquipment().slots,
246
chest: { itemId: WizardItemId.cottonRobeTop, quantity: 1 }
247
};
248
const bonuses = equipmentBonusesFromSlots(slots);
249
assert.equal(bonuses[SkillId.magic], tierStatBonus(ClothTier.cotton));
250
assert.equal(bonuses[SkillId.defence], 0);
251
});
252
253
test("leather chestguard grants full agility and half defence", () =>
254
{
255
const defaults = defaultEquipmentStatBonuses().leatherArmour.chestguard;
256
assert.equal(defaults.softLeather.agility, tierStatBonus(LeatherTier.softLeather));
257
assert.equal(defaults.softLeather.defence, Math.floor(tierStatBonus(LeatherTier.softLeather) / 2));
258
const slots = {
259
...emptyEquipment().slots,
260
chest: { itemId: LeatherArmourItemId.softLeatherChestguard, quantity: 1 }
261
};
262
const bonuses = equipmentBonusesFromSlots(slots);
263
assert.equal(bonuses[SkillId.agility], tierStatBonus(LeatherTier.softLeather));
264
assert.equal(bonuses[SkillId.defence], Math.floor(tierStatBonus(LeatherTier.softLeather) / 2));
265
});
266
267
test("metal armour grants quarter-tier strength and agility rounded up", () =>
268
{
269
const defaults = defaultEquipmentStatBonuses().metalArmour.chestplate;
270
assert.equal(defaults.bronze.strength, 1);
271
assert.equal(defaults.bronze.agility, 1);
272
assert.equal(defaults.iron.strength, 1);
273
assert.equal(defaults.steel.strength, 1);
274
assert.equal(defaults.mithril.strength, 2);
275
assert.equal(defaults.dragon.strength, 3);
276
const slots = {
277
...emptyEquipment().slots,
278
chest: { itemId: ArmourItemId.steelChestplate, quantity: 1 }
279
};
280
const bonuses = equipmentBonusesFromSlots(slots);
281
assert.equal(bonuses[SkillId.strength], 1);
282
assert.equal(bonuses[SkillId.agility], 1);
283
});
284
285
test("metal armour penalizes magic and archery by material rank", () =>
286
{
287
const defaults = defaultEquipmentStatBonuses().metalArmour.chestplate;
288
assert.equal(defaults.bronze.defence, tierStatBonus(MaterialTier.bronze));
289
assert.equal(defaults.bronze.magic, -1);
290
assert.equal(defaults.bronze.archery, -1);
291
assert.equal(defaults.dragon.defence, tierStatBonus(MaterialTier.dragon));
292
assert.equal(defaults.dragon.magic, -7);
293
assert.equal(defaults.dragon.archery, -7);
294
const slots = {
295
...emptyEquipment().slots,
296
chest: { itemId: ArmourItemId.ironChestplate, quantity: 1 }
297
};
298
const bonuses = equipmentBonusesFromSlots(slots);
299
assert.equal(bonuses[SkillId.magic], -2);
300
assert.equal(bonuses[SkillId.archery], -2);
301
assert.equal(bonuses[SkillId.defence], tierStatBonus(MaterialTier.iron));
302
});
303
304
test("full helm keeps +1 defence only, not magic or archery penalty", () =>
305
{
306
const defaults = defaultEquipmentStatBonuses().metalArmour.fullHelm;
307
assert.equal(defaults.bronze.defence, tierStatBonus(MaterialTier.bronze) + 1);
308
assert.equal(defaults.bronze.magic, -1);
309
assert.equal(defaults.bronze.archery, -1);
310
});
311
312
test("wizard robe bottoms use single cloth tint", () =>
313
{
314
const def = itemDefinition(WizardItemId.cottonRobeBottoms);
315
assert.equal(def?.tintFromTier, true);
316
assert.equal(def?.dualTintFromTier, undefined);
317
assert.equal(resolveItemDualTint({ itemId: WizardItemId.cottonRobeBottoms }, def), null);
318
});
@@ -3,8 +3,10 @@ import assert from "node:assert/strict";3
import { ItemId, itemDefinition } from "../../shared/definitions/items.js";3
import { ItemId, itemDefinition } from "../../shared/definitions/items.js";4
import { ArmourItemId } from "../../shared/definitions/armourItems.js";4
import { ArmourItemId } from "../../shared/definitions/armourItems.js";5
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";5
import { LeatherItemId } from "../../shared/definitions/leatherItems.js";6
import { LeatherArmourItemId } from "../../shared/definitions/leatherArmourItems.js";7
import { WizardItemId } from "../../shared/definitions/wizardItems.js";6
import { CraftingItemId } from "../../shared/definitions/craftingItems.js";8
import { CraftingItemId } from "../../shared/definitions/craftingItems.js";7
import { MaterialTier, LeatherTier, WoodTier, tierStatBonus, tierMinSkillLevel } from "../../shared/definitions/materialTiers.js";9
import { MaterialTier, LeatherTier, WoodTier, ClothTier, tierStatBonus, tierMinSkillLevel } from "../../shared/definitions/materialTiers.js";8
import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";10
import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";9
import { SkillId } from "../../shared/definitions/skills.js";11
import { SkillId } from "../../shared/definitions/skills.js";10
import { normalizePlayerSkills } from "../../shared/skills/state.js";12
import { normalizePlayerSkills } from "../../shared/skills/state.js";@@ -186,11 +188,16 @@ test("normalizeEquipmentStatBonuses fills defaults and clamps", () =>186
const defaults = defaultEquipmentStatBonuses();188
const defaults = defaultEquipmentStatBonuses();187
const normalized = normalizeEquipmentStatBonuses({189
const normalized = normalizeEquipmentStatBonuses({188
metalArmour: {190
metalArmour: {189
chestplate: { bronze: { defence: -3 } }191
chestplate: {192
bronze: { defence: -3, magic: -150 },193
iron: { defence: 999 }194
}190
},195
},191
unknownCategory: { x: 1 }196
unknownCategory: { x: 1 }192
});197
});193
assert.equal(normalized.metalArmour.chestplate.bronze.defence, 0);198
assert.equal(normalized.metalArmour.chestplate.bronze.defence, -3);199
assert.equal(normalized.metalArmour.chestplate.bronze.magic, -99);200
assert.equal(normalized.metalArmour.chestplate.iron.defence, 99);194
assert.equal(normalized.metalArmour.greaves.bronze.defence, defaults.metalArmour.greaves.bronze.defence);201
assert.equal(normalized.metalArmour.greaves.bronze.defence, defaults.metalArmour.greaves.bronze.defence);195
assert.equal(normalized.unknownCategory, undefined);202
assert.equal(normalized.unknownCategory, undefined);196
});203
});@@ -216,3 +223,96 @@ test("bonusForEquippedItem returns null for tools", () =>216
{223
{217
assert.equal(bonusForEquippedItem(itemDefinition(CraftingItemId.bronzePickaxe)), null);224
assert.equal(bonusForEquippedItem(itemDefinition(CraftingItemId.bronzePickaxe)), null);218
});225
});226
227
test("leather armour uses leather-cloth dual tint", () =>228
{229
const def = itemDefinition(LeatherArmourItemId.softLeatherChestguard);230
assert.equal(def?.equipment?.kind, EquipmentKind.leatherArmour);231
assert.equal(def?.dualTintLeatherCloth, true);232
assert.equal(def?.leatherTier, LeatherTier.softLeather);233
assert.equal(def?.clothTier, "cotton");234
const dual = resolveItemDualTint({ itemId: LeatherArmourItemId.softLeatherChestguard }, def);235
assert.ok(dual?.shaft);236
assert.ok(dual?.tip);237
});238
239
test("wizard robe top grants magic bonus for cloth tier", () =>240
{241
const defaults = defaultEquipmentStatBonuses().wizardArmour.robetop;242
assert.equal(defaults.cotton.magic, tierStatBonus(ClothTier.cotton));243
assert.equal(defaults.cotton.defence, undefined);244
const slots = {245
...emptyEquipment().slots,246
chest: { itemId: WizardItemId.cottonRobeTop, quantity: 1 }247
};248
const bonuses = equipmentBonusesFromSlots(slots);249
assert.equal(bonuses[SkillId.magic], tierStatBonus(ClothTier.cotton));250
assert.equal(bonuses[SkillId.defence], 0);251
});252
253
test("leather chestguard grants full agility and half defence", () =>254
{255
const defaults = defaultEquipmentStatBonuses().leatherArmour.chestguard;256
assert.equal(defaults.softLeather.agility, tierStatBonus(LeatherTier.softLeather));257
assert.equal(defaults.softLeather.defence, Math.floor(tierStatBonus(LeatherTier.softLeather) / 2));258
const slots = {259
...emptyEquipment().slots,260
chest: { itemId: LeatherArmourItemId.softLeatherChestguard, quantity: 1 }261
};262
const bonuses = equipmentBonusesFromSlots(slots);263
assert.equal(bonuses[SkillId.agility], tierStatBonus(LeatherTier.softLeather));264
assert.equal(bonuses[SkillId.defence], Math.floor(tierStatBonus(LeatherTier.softLeather) / 2));265
});266
267
test("metal armour grants quarter-tier strength and agility rounded up", () =>268
{269
const defaults = defaultEquipmentStatBonuses().metalArmour.chestplate;270
assert.equal(defaults.bronze.strength, 1);271
assert.equal(defaults.bronze.agility, 1);272
assert.equal(defaults.iron.strength, 1);273
assert.equal(defaults.steel.strength, 1);274
assert.equal(defaults.mithril.strength, 2);275
assert.equal(defaults.dragon.strength, 3);276
const slots = {277
...emptyEquipment().slots,278
chest: { itemId: ArmourItemId.steelChestplate, quantity: 1 }279
};280
const bonuses = equipmentBonusesFromSlots(slots);281
assert.equal(bonuses[SkillId.strength], 1);282
assert.equal(bonuses[SkillId.agility], 1);283
});284
285
test("metal armour penalizes magic and archery by material rank", () =>286
{287
const defaults = defaultEquipmentStatBonuses().metalArmour.chestplate;288
assert.equal(defaults.bronze.defence, tierStatBonus(MaterialTier.bronze));289
assert.equal(defaults.bronze.magic, -1);290
assert.equal(defaults.bronze.archery, -1);291
assert.equal(defaults.dragon.defence, tierStatBonus(MaterialTier.dragon));292
assert.equal(defaults.dragon.magic, -7);293
assert.equal(defaults.dragon.archery, -7);294
const slots = {295
...emptyEquipment().slots,296
chest: { itemId: ArmourItemId.ironChestplate, quantity: 1 }297
};298
const bonuses = equipmentBonusesFromSlots(slots);299
assert.equal(bonuses[SkillId.magic], -2);300
assert.equal(bonuses[SkillId.archery], -2);301
assert.equal(bonuses[SkillId.defence], tierStatBonus(MaterialTier.iron));302
});303
304
test("full helm keeps +1 defence only, not magic or archery penalty", () =>305
{306
const defaults = defaultEquipmentStatBonuses().metalArmour.fullHelm;307
assert.equal(defaults.bronze.defence, tierStatBonus(MaterialTier.bronze) + 1);308
assert.equal(defaults.bronze.magic, -1);309
assert.equal(defaults.bronze.archery, -1);310
});311
312
test("wizard robe bottoms use single cloth tint", () =>313
{314
const def = itemDefinition(WizardItemId.cottonRobeBottoms);315
assert.equal(def?.tintFromTier, true);316
assert.equal(def?.dualTintFromTier, undefined);317
assert.equal(resolveItemDualTint({ itemId: WizardItemId.cottonRobeBottoms }, def), null);318
});@@ -3,6 +3,8 @@ import assert from "node:assert/strict";
3
3
import { ITEM_DEFINITIONS, listAllItemPickerEntries } from "../../shared/definitions/items.js";
4
4
import { CRAFTING_ITEM_STUBS } from "../../shared/definitions/craftingItems.js";
5
5
import { LEATHER_ITEM_DEFINITIONS } from "../../shared/definitions/leatherItems.js";
6
import { LEATHER_ARMOUR_ITEM_DEFINITIONS } from "../../shared/definitions/leatherArmourItems.js";
7
import { WIZARD_ITEM_DEFINITIONS } from "../../shared/definitions/wizardItems.js";
6
8
import { METAL_ITEM_DEFINITIONS } from "../../shared/definitions/metalItems.js";
7
9
import { WOOD_ITEM_DEFINITIONS } from "../../shared/definitions/woodItems.js";
8
10
import { ARMOUR_ITEM_DEFINITIONS } from "../../shared/definitions/armourItems.js";
@@ -29,6 +31,8 @@ const ITEM_DEFINITION_SOURCES = Object.freeze([
29
31
["core", Object.fromEntries(CORE_ITEM_IDS.map((id) => [id, ITEM_DEFINITIONS[id]]))],
30
32
["crafting", CRAFTING_ITEM_STUBS],
31
33
["leather", LEATHER_ITEM_DEFINITIONS],
34
["leatherArmour", LEATHER_ARMOUR_ITEM_DEFINITIONS],
35
["wizard", WIZARD_ITEM_DEFINITIONS],
32
36
["metal", METAL_ITEM_DEFINITIONS],
33
37
["wood", WOOD_ITEM_DEFINITIONS],
34
38
["armour", ARMOUR_ITEM_DEFINITIONS],
@@ -3,6 +3,8 @@ import assert from "node:assert/strict";3
import { ITEM_DEFINITIONS, listAllItemPickerEntries } from "../../shared/definitions/items.js";3
import { ITEM_DEFINITIONS, listAllItemPickerEntries } from "../../shared/definitions/items.js";4
import { CRAFTING_ITEM_STUBS } from "../../shared/definitions/craftingItems.js";4
import { CRAFTING_ITEM_STUBS } from "../../shared/definitions/craftingItems.js";5
import { LEATHER_ITEM_DEFINITIONS } from "../../shared/definitions/leatherItems.js";5
import { LEATHER_ITEM_DEFINITIONS } from "../../shared/definitions/leatherItems.js";6
import { LEATHER_ARMOUR_ITEM_DEFINITIONS } from "../../shared/definitions/leatherArmourItems.js";7
import { WIZARD_ITEM_DEFINITIONS } from "../../shared/definitions/wizardItems.js";6
import { METAL_ITEM_DEFINITIONS } from "../../shared/definitions/metalItems.js";8
import { METAL_ITEM_DEFINITIONS } from "../../shared/definitions/metalItems.js";7
import { WOOD_ITEM_DEFINITIONS } from "../../shared/definitions/woodItems.js";9
import { WOOD_ITEM_DEFINITIONS } from "../../shared/definitions/woodItems.js";8
import { ARMOUR_ITEM_DEFINITIONS } from "../../shared/definitions/armourItems.js";10
import { ARMOUR_ITEM_DEFINITIONS } from "../../shared/definitions/armourItems.js";@@ -29,6 +31,8 @@ const ITEM_DEFINITION_SOURCES = Object.freeze([29
["core", Object.fromEntries(CORE_ITEM_IDS.map((id) => [id, ITEM_DEFINITIONS[id]]))],31
["core", Object.fromEntries(CORE_ITEM_IDS.map((id) => [id, ITEM_DEFINITIONS[id]]))],30
["crafting", CRAFTING_ITEM_STUBS],32
["crafting", CRAFTING_ITEM_STUBS],31
["leather", LEATHER_ITEM_DEFINITIONS],33
["leather", LEATHER_ITEM_DEFINITIONS],34
["leatherArmour", LEATHER_ARMOUR_ITEM_DEFINITIONS],35
["wizard", WIZARD_ITEM_DEFINITIONS],32
["metal", METAL_ITEM_DEFINITIONS],36
["metal", METAL_ITEM_DEFINITIONS],33
["wood", WOOD_ITEM_DEFINITIONS],37
["wood", WOOD_ITEM_DEFINITIONS],34
["armour", ARMOUR_ITEM_DEFINITIONS],38
["armour", ARMOUR_ITEM_DEFINITIONS],