${weak ? `Weak to ${weak}` : ""}${weak && tough ? " ยท " : ""}${tough ? `shrugs off ${tough}` : ""}${yours}
`;
+// A damage type's icon: what an enemy attacks with, or (tinted) what it's vulnerable to or resists.
+function dmgIcon(type, how = "") {
+ const t = C.damage_types[type], name = t.name.toLowerCase();
+ const tip = how === "vuln" ? `Vulnerable to ${name} (+${Math.round((C.vulnerable - 1) * 100)}%)`
+ : how === "resist" ? `Resists ${name} (-${Math.round((1 - C.resistant) * 100)}%)`
+ : how === "attack" ? `Attacks with ${name}` : `${t.name} damage`;
+ return `
-
${esc(name)}
+ const side = (who, name, foe) => `
+
${esc(name)}${foe ? `${resistIcons(foe)}` : ""}
`;
return `
-
${side("you", S.me.name)}โ๏ธ${side("foe", f.enemy)}
+
${side("you", S.me.name)}โ๏ธ${side("foe", f.enemy, f.foe)}
`;
}
function fightLine(e, enemy) {
const [, who, kind, amount, , , food] = e;
+ const type = kind === "hit" || kind === "crit" ? (C.damage_types[food] ? ` ${dmgIcon(food)}` : "") : "";
const foe = esc(enemy);
if (kind === "eat") return `
You eat ${esc(item(food).name.toLowerCase())} (+${amount})`;
if (kind === "wind") return `
Second wind! Back on your feet`;
if (kind === "block") return `
You block ${foe}'s blow`;
- if (who === "you") return kind === "miss" ? `
You miss` : `
You ${kind === "crit" ? "crit" : "hit"} for ${amount}`;
- return kind === "miss" ? `
${foe} misses` : `
${foe} ${kind === "crit" ? "crits" : "hits"} you for ${amount}`;
+ if (who === "you") return kind === "miss" ? `
You miss` : `
You ${kind === "crit" ? "crit" : "hit"} for ${amount}${type}`;
+ return kind === "miss" ? `
${foe} misses` : `
${foe} ${kind === "crit" ? "crits" : "hits"} you for ${amount}${type}`;
}
function animateFight(now) {
@@ -605,16 +622,16 @@ function styleNote(me) {
const own = C.class_style[me.cls], traits = {
sword: `${st.interval}s${me.equip.shield ? `, shield blocks ${Math.round(C.block_chance * 100)}%` : ""}`,
hammer: `${st.interval}s, double crits`,
- staff: `${st.interval}s, accurate, ignores armour`,
+ staff: `${st.interval}s, accurate`,
bow: `${st.interval}s, shoots first`,
};
- return `
${weapon ? st.name[0].toUpperCase() + st.name.slice(1) : "Fists"}: ${traits[styleId]}.
+ return `
${dmgIcon(st.damage)} ${weapon ? st.name[0].toUpperCase() + st.name.slice(1) : "Fists"}: ${C.damage_types[st.damage].name.toLowerCase()}, ${traits[styleId]}.
${own === styleId ? `Trade weapon: +15% damage.` : `Trade weapon: ${esc(C.styles[own].name)} (+15%).`}
`;
}
function combatPanel() {
const me = S.me;
- const stat = (id) => [item(id).power && `+${item(id).power} power`, item(id).armour && `+${item(id).armour} armour`].filter(Boolean).join(", ");
+ const stat = (id) => gearStats(item(id));
const slot = (name, label) => {
const id = me.equip[name];
return `
${id
@@ -636,11 +653,17 @@ function combatPanel() {
Equipment
${slot("weapon", "weapon")}${slot("shield", "shield")}${slot("helmet", "helmet")}${slot("body", "body armour")}${slot("legs", "leg armour")}
-
Power ${me.power} ยท armour ${me.armour} (-${Math.round(me.reduction * 100)}% damage)
+
Power ${me.power} ยท armour ${me.armour} (-${Math.round(me.reduction * 100)}% physical) ยท ward ${me.ward} (-${Math.round(me.ward_reduction * 100)}% magic)
${styleNote(me)}
${label}
${id ? `
${it.icon}${esc(it.name)}${stat}
@@ -1183,7 +1207,8 @@ function characterSheet(uid) {
Health
${fmt(p.hp)} / ${p.max_hp}
Combat power
${p.power}
${guard} in the garrison
${mine ? `
Prayer points
${fmt(p.pp)}
${p.prayers.length ? p.prayers.map((id) => esc(C.prayers.find((x) => x.id === id).name)).join(", ") : "No prayers active"}
` : ""}
-
Armour
${p.armour}
${Math.round(p.reduction * 100)}% less damage
+
Armour
${p.armour}
${Math.round(p.reduction * 100)}% less physical
+
Ward
${p.ward}
${Math.round(p.ward_reduction * 100)}% less magic
Given to the city
${fmt(p.donated)}
${fmt(p.favour)} favour to spend
${mine ? `
Purse
${fmt(p.gold)}
${p.slots_used} / ${p.slots} bank slots
` : ""}
diff --git a/static/icons.svg b/static/icons.svg
index 28f80aa..928af53 100644
--- a/static/icons.svg
+++ b/static/icons.svg
@@ -6,10 +6,10 @@
+
-
@@ -22,13 +22,16 @@
+
+
+
@@ -36,13 +39,14 @@
+
+
-
@@ -53,11 +57,14 @@
+
+
+
@@ -71,12 +78,18 @@
+
+
+
+
+
+
@@ -85,30 +98,41 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -116,12 +140,14 @@
+
+
@@ -136,4 +162,5 @@
+
diff --git a/static/styles.css b/static/styles.css
index 6eeafff..79be475 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -443,3 +443,16 @@ button.sheet-skill:hover { background: var(--panel-2); }
.battle-result { font-weight: 700; font-size: 17px; margin: 6px 0 8px; }
.battle-result.win { color: var(--good); }
.battle-result.loss { color: var(--bad); }
+
+/* Damage types and encounter rosters */
+.dmg { display: inline-grid; place-items: center; width: 18px; height: 18px; border-radius: 5px; vertical-align: -4px; }
+.dmg .gi { width: 13px; height: 13px; }
+.dmg.vuln { background: rgba(95, 174, 90, .22); box-shadow: inset 0 0 0 1px rgba(95, 174, 90, .6); }
+.dmg.resist { background: rgba(226, 100, 92, .2); box-shadow: inset 0 0 0 1px rgba(226, 100, 92, .55); }
+.variants { display: grid; gap: 3px; margin: 2px 0 4px; font-size: 13px; }
+.variant { display: grid; grid-template-columns: auto 1fr auto auto; gap: 6px; align-items: center; }
+.variant.good .v-name { color: var(--good); }
+.variant.bad .v-name { color: var(--bad); }
+.v-attack, .v-res { display: inline-flex; gap: 2px; }
+.v-hp { font-size: 12px; }
+.fighter-name .v-res { margin-left: 6px; }
diff --git a/tests/test_game.py b/tests/test_game.py
index e25ff59..f9c14ae 100644
--- a/tests/test_game.py
+++ b/tests/test_game.py
@@ -730,9 +730,13 @@ class TierTest(unittest.TestCase):
self.assertIn(f"{key}_{piece}", game.ITEMS)
self.assertIn(f"smith_{key}_{piece}", game.ACTION_BY_ID)
self.assertIn(f"make_{key}_shield", game.ACTION_BY_ID) # builders make shields
- for *_, prefix, _label, _level, _armour in game.LEATHERS:
+ for *_, prefix, _label, _level in game.LEATHERS:
for piece in ("cap", "legs", "body"):
self.assertIn(f"{prefix}_{piece}", game.ITEMS)
+ for *_, prefix, _label in game.CLOTHS:
+ for piece in ("hood", "legs", "body"):
+ self.assertIn(f"{prefix}_{piece}", game.ITEMS)
+ self.assertIn(f"sew_{prefix}_{piece}", game.ACTION_BY_ID)
self.assertEqual(game.ITEMS["rune_body"]["plural"], "Rune cuirasses")
def test_gear_needs_levels_to_wear(self):
@@ -758,7 +762,7 @@ class TierTest(unittest.TestCase):
self.assertEqual(game.build_cost("walls", 5)["mithril_brackets"], 60)
self.assertEqual(game.build_cost("walls", 5)["steel_bar"], 180)
- def test_dragons_drop_dragonhide(self):
+ def test_dragons_drop_their_areas_reagents(self):
world = world_with(("wil", "commoner"))
p = world["players"]["wil"]
p["xp"]["combat"] = game.XP_TABLE[80]
@@ -767,7 +771,7 @@ class TierTest(unittest.TestCase):
p["bank"] = {"cooked_swordfish": 200}
game.start_action(world, p, "fight_green_dragon", T0)
game.process_player(world, p, T0 + 3600 * 2, random.Random(3))
- self.assertGreater(p["bank"].get("green_dragonhide", 0), 30)
+ self.assertGreater(sum(p["bank"].get(game.reagent(weight, 3), 0) for weight in game.WEIGHTS), 30)
@@ -1345,28 +1349,30 @@ class WeaponStyleTest(unittest.TestCase):
p["equip"].update(weapon=weapon, shield=shield, body="iron_body", helmet="iron_helmet", legs="iron_legs")
return world, p
- def test_each_trade_fights_its_own_monster_best(self):
+ def test_no_trade_is_funnelled_into_one_race(self):
+ # Every race mixes its weaknesses across its variants, so no weapon has one easy target.
styles = {"miner": "iron_warhammer", "builder": "iron_sword", "homesteader": "oak_staff", "ranger": "oak_bow"}
- prey = {"miner": "fight_clay_golem", "builder": "fight_cave_troll", "homesteader": "fight_will_o_wisp",
- "ranger": "fight_giant_bat"}
+ races = ["fight_clay_golems", "fight_cave_trolls", "fight_restless_dead", "fight_harpies"]
for cls, weapon in styles.items():
_world, p = self.armed(cls, weapon, "iron_shield" if cls == "builder" else None)
- times = {target: game.fight_odds(p, game.ACTION_BY_ID[target])["kill_time"] for target in prey.values()}
- self.assertEqual(min(times, key=times.get), prey[cls], cls)
+ times = [game.fight_odds(p, game.ACTION_BY_ID[race])["kill_time"] for race in races]
+ self.assertLess(max(times) / min(times), 1.45, cls)
def test_style_traits(self):
_w, swordsman = self.armed("builder", "iron_sword", "iron_shield")
_w, smith = self.armed("miner", "iron_warhammer")
_w, archer = self.armed("ranger", "oak_bow")
- spec = lambda p: game.fighter(p, game.NO_BLESSING, {}, game.ACTION_BY_ID["fight_clay_golem"]["enemy"])
+ brute = game.ACTION_BY_ID["fight_clay_golems"]["enemy"]["variants"][0] # vulnerable to blunt, resists piercing
+ spec = lambda p: game.fighter(p, game.NO_BLESSING, {}, brute)
self.assertEqual(spec(swordsman)["block"], game.BLOCK_CHANCE)
self.assertEqual(spec(smith)["crit"], 0.10)
- self.assertEqual(spec(smith)["weakness"], 1.5)
- self.assertEqual(spec(archer)["weakness"], 0.5)
+ self.assertEqual(spec(smith)["affinity"], game.VULNERABLE)
+ self.assertEqual(spec(archer)["affinity"], game.RESISTANT)
+ self.assertEqual(spec(swordsman)["affinity"], 1)
_w, other = self.armed("builder", "iron_warhammer")
self.assertGreater(spec(smith)["max_hit"], spec(other)["max_hit"]) # the trade's own weapon hits harder
world, archer = self.armed("ranger", "oak_bow")
- fight = game.simulate_fight(world, archer, game.ACTION_BY_ID["fight_giant_bat"], random.Random(1))
+ fight = game.simulate_fight(world, archer, game.ACTION_BY_ID["fight_harpies"], random.Random(1))
self.assertEqual(fight["events"][0][1], "you") # the bow strikes first
def test_two_handed_weapons_leave_no_room_for_a_shield(self):
@@ -1377,13 +1383,40 @@ class WeaponStyleTest(unittest.TestCase):
def test_weapons_past_copper_need_trophies(self):
for action_id, trophy in (("smith_iron_warhammer", "clay_core"), ("smith_iron_sword", "cave_troll_hide"),
- ("make_iron_shield", "cave_troll_hide"), ("brew_oak_staff", "wisp_essence"),
- ("lw_oak_bow", "bat_sinew"), ("smith_rune_warhammer", "runic_core")):
+ ("make_iron_shield", "cave_troll_hide"), ("brew_oak_staff", "grave_dust"),
+ ("lw_oak_bow", "harpy_sinew"), ("smith_rune_warhammer", "magma_core")):
self.assertIn(trophy, game.ACTION_BY_ID[action_id]["inputs"], action_id)
for action_id in ("smith_copper_warhammer", "smith_copper_sword", "make_copper_shield",
"brew_wooden_staff", "lw_wooden_bow"):
self.assertFalse(any(item in game.TROPHIES for item in game.ACTION_BY_ID[action_id]["inputs"]), action_id)
+ def test_armour_past_copper_needs_its_areas_reagent(self):
+ self.assertEqual(game.ACTION_BY_ID["smith_iron_body"]["inputs"], {"iron_bar": 5, "watchtower_plating": 3})
+ self.assertEqual(game.ACTION_BY_ID["lw_hard_leather_cap"]["inputs"], {"hard_leather": 2, "watchtower_lacing": 1})
+ self.assertEqual(game.ACTION_BY_ID["sew_moonweave_legs"]["inputs"], {"moonweave": 3, "ironhill_thread": 2})
+ for action_id in ("smith_copper_body", "lw_cap", "sew_linen_body"):
+ self.assertFalse(any(item in game.REAGENTS for item in game.ACTION_BY_ID[action_id]["inputs"]), action_id)
+ harpies = game.ACTION_BY_ID["fight_harpies"]["drops"]
+ self.assertIn(["watchtower_thread", 1, game.REAGENT_ODDS], harpies)
+
+ def test_heavy_stops_blows_light_stops_magic(self):
+ _w, plate = self.armed("miner", "iron_warhammer")
+ _w, cloth = self.armed("miner", "iron_warhammer")
+ cloth["equip"].update(helmet="cotton_hood", body="cotton_body", legs="cotton_legs")
+ self.assertGreater(game.armour(plate), game.armour(cloth))
+ self.assertGreater(game.magic_ward(cloth), game.magic_ward(plate))
+ shaper = next(v for v in game.ACTION_BY_ID["fight_clay_golems"]["enemy"]["variants"] if v["name"] == "Mud shaper")
+ brute = game.ACTION_BY_ID["fight_clay_golems"]["enemy"]["variants"][0]
+ hurt = lambda p, foe: game._variant_odds(p, foe, game.NO_BLESSING, {})["damage"]
+ self.assertLess(hurt(cloth, shaper), hurt(plate, shaper))
+ self.assertLess(hurt(plate, brute), hurt(cloth, brute))
+
+ def test_each_kill_is_one_of_the_variants(self):
+ world, p = self.armed("miner", "iron_warhammer", level=30)
+ seen = {game.simulate_fight(world, p, game.ACTION_BY_ID["fight_goblins"], random.Random(seed))["enemy"]
+ for seed in range(60)}
+ self.assertEqual(seen, {"Goblin brute", "Goblin rogue", "Goblin warlock"})
+
def test_shield_smiths_stop_after_the_move(self):
world = world_with(("kay", "miner"))
world["version"] = 13
@@ -1463,3 +1496,24 @@ class IconTest(unittest.TestCase):
if __name__ == "__main__":
unittest.main()
+
+
+class CombatReworkMigrationTest(unittest.TestCase):
+ def test_old_monsters_trophies_and_dragonhide_carry_over(self):
+ world = world_with(("kay", "ranger"))
+ world["version"] = 15
+ p = world["players"]["kay"]
+ del p["xp"]["tailoring"]
+ p["bank"] = {"bat_sinew": 3, "harpy_sinew": 2, "green_dragonhide": 4, "red_dragon_leather": 1}
+ p["equip"]["body"] = "blue_dhide_body"
+ p["action"] = {"id": "fight_giant_bat", "start": T0}
+ world["players"]["kay"] = p
+ game.migrate(world, T0)
+ self.assertEqual(p["bank"], {"harpy_sinew": 3, "spider_silk": 2, "ironhill_lacing": 4, "mammoth_leather": 1})
+ self.assertEqual(p["equip"]["body"], "sabrecat_leather_body")
+ self.assertEqual(p["action"]["id"], "fight_harpies")
+ self.assertEqual(p["xp"]["tailoring"], 0)
+
+ def test_homesteaders_tailor(self):
+ self.assertIn("tailoring", game.CLASSES["homesteader"]["fast"])
+ self.assertIn("tailoring", game.CLASSES["homesteader"]["craft"])