diff --git a/app.py b/app.py
index 7d3b206..aa9796a 100644
--- a/app.py
+++ b/app.py
@@ -110,6 +110,9 @@ def player_view(world: dict, player: dict, now: float) -> dict:
view["slots_used"] = game.slots_used(world, player)
view["stack"] = game.stack_size(world)
view["power"] = game.combat_power(player)
+ me = game.fighter(player, game.blessing(player), game.potion_effect(player, "combat"))
+ view["fighter"] = {"max_hit": me["max_hit"], "accuracy": round(me["accuracy"]), "evasion": me["evasion"],
+ "crit": me["crit"], "interval": me["interval"], "block": me["block"], "damage": me["damage"]}
view["perk_costs"] = {perk: game.perk_cost(player, perk) for perk in player["perks"]}
if player["action"]:
action, fight = game.growing(player), player["action"].get("fight")
@@ -171,6 +174,8 @@ def roster(world: dict, now: float) -> list[dict]:
people.append({
"xp": player["xp"], "equip": player["equip"], "joined": player["joined"],
"hp": int(player["hp"]), "max_hp": game.max_hp(player), "power": game.combat_power(player),
+ "fighter": {key: value for key, value in game.fighter(player, game.blessing(player), {}).items()
+ if key in ("max_hit", "accuracy", "evasion", "crit", "interval", "block", "damage")},
"armour": game.armour(player), "reduction": round(game.damage_reduction(player), 3),
"ward": game.magic_ward(player), "ward_reduction": round(game.reduction(game.magic_ward(player)), 3),
"favour": player["favour"],
diff --git a/game.py b/game.py
index 8fd30f9..90f5fc7 100644
--- a/game.py
+++ b/game.py
@@ -3560,7 +3560,8 @@ ACTION_GLYPHS.update({
for _index, (_area, _level, _prefix, _races) in enumerate(AREAS):
for _race, *_rest in _races:
ACTION_GLYPHS[f"fight_{_slug(_race)}"] = (RACE_GLYPHS[_race], TIER_TINTS[_index])
-UI_GLYPHS = ["two-coins", "sparkles", "hearts", "prayer", "checked-shield", "magic-shield", "stopwatch", "swordman", "biceps", "cancel",
+UI_GLYPHS = ["two-coins", "sparkles", "hearts", "prayer", "checked-shield", "magic-shield", "stopwatch", "swordman", "biceps", "cancel", "striking-diamonds",
+ "archery-target", "dodging", "shield-reflect",
"cape", "gem-pendant", "gauntlet", "ring", "quiver", "leather-boot", "crystal-ball", "visored-helm", "breastplate",
"leg-armor", "pointy-sword", "round-shield",
*(kind["glyph"] for kind in DAMAGE_TYPES.values())]
diff --git a/static/app.js b/static/app.js
index 05a75de..dad265c 100644
--- a/static/app.js
+++ b/static/app.js
@@ -1246,31 +1246,46 @@ function dollSlot(p, slot, label, outline, picked) {
const tip = !known ? `${label}: not in the game yet` : id ? `${label}: ${item(id).name}` : `${label}: empty`;
return ``;
+ ${id ? item(id).icon : glyph(outline, "#98a1b4")}${two ? `2H` : ""}
+ ${slot === "weapon" && id ? `${dmgIcon(C.styles[item(id).style || "sword"].damage)}` : ""}`;
}
function paperDoll(p, mine) {
const pick = dollPick && slot2(dollPick, p);
- const totals = `
- ${glyph("biceps", "#e06a6a")} Power${p.power}
- ${glyph("checked-shield", "#d4dae2")} Armour${p.armour}
- ${glyph("magic-shield", "#a77be8")} Ward${p.ward}
-
`;
- let side = totals;
+ let slot = "";
if (pick) {
- const label = DOLL.find(([slot]) => slot === pick)[1];
+ const label = DOLL.find(([s]) => s === pick)[1];
const two = pick === "shield" && p.equip.weapon && item(p.equip.weapon).two_handed;
const id = two ? p.equip.weapon : p.equip[pick], it = id && item(id);
- side = `${it ? `${it.icon}${esc(it.name)}` : `${label}empty`}
- ${it ? gearChips(it, p) : ""}${mine ? swapGrid(p, pick, two) : ""}${totals}`;
+ slot = `${it ? `${it.icon}${esc(it.name)}` : `${label}empty`}
+ ${it ? gearChips(it, p) : ""}${mine ? swapGrid(p, pick, two) : ""}`;
}
return `
${glyph("swordman", "#e6e8ee")}
- ${DOLL.map(([slot, name, outline]) => dollSlot(p, slot, name, outline, slot === pick)).join("")}
-
${side}
+ ${DOLL.map(([s, name, outline]) => dollSlot(p, s, name, outline, s === pick)).join("")}
+
`;
}
+// Your fighting numbers, always in the same place under the slot details: icons and numbers,
+// with what each means on hover.
+function combatStats(p) {
+ const f = p.fighter, pct = (x) => `${Math.round(x * 100)}%`, dt = C.damage_types[f.damage];
+ const cell = (icon, value, tip) => `${icon}${value}`;
+ const cells = [
+ cell(glyph("biceps", "#e06a6a"), p.power, "Power: from your level and gear"),
+ cell(glyph("checked-shield", "#d4dae2"), p.armour, `Armour: ${pct(p.reduction)} less damage from blows`),
+ cell(glyph("magic-shield", "#a77be8"), p.ward, `Ward: ${pct(p.ward_reduction)} less damage from magic`),
+ cell(glyph(dt.glyph, dt.tint), f.max_hit, `Max hit (${dt.name.toLowerCase()})`),
+ cell(glyph("striking-diamonds", "#f0d060"), pct(f.crit), "Crit chance"),
+ cell(glyph("stopwatch", "#9fb3c8"), `${f.interval}s`, `A swing every ${f.interval}s`),
+ cell(glyph("archery-target", "#e0a050"), fmt(f.accuracy), "Accuracy"),
+ cell(glyph("dodging", "#8fd0e0"), fmt(f.evasion), "Evasion"),
+ cell(glyph("shield-reflect", "#e0b04a"), pct(f.block), "Block chance (with a shield)"),
+ ];
+ return `Combat stats
${cells.join("")}