@rpgm-tools/neo-angband-core 0.18.0 → 0.20.0

package/dist/combat/blow-vectors.js

@@ -0,0 +1,195 @@
+/**
+ * Golden vectors for monster blow resolution.
+ *
+ * WHY THIS EXISTS. Converting the two 26-case blow-effect switches in
+ * mon-melee.ts into a registry is a refactor of live combat, and the thing that
+ * must be proven is not "the tests still pass" but "every blow resolves
+ * identically, including the RNG position it leaves behind". The 67 existing
+ * tests over these paths assert particular behaviours; they do not span
+ * 30 effects x both paths x the branches inside each handler.
+ *
+ * So the ground truth is DERIVED, not declared: this module walks a grid of
+ * blow scenarios through the public `monMeleeAttack` entry point and records
+ * everything observable - the result, the env call sequence with its arguments,
+ * the messages, and a probe draw taken from the RNG afterwards. The fixture
+ * committed beside it (`blow-vectors.json`) was generated from the code as it
+ * stood BEFORE the registry existed, so a vector that still matches is evidence
+ * the refactor changed nothing, and a vector that does not names the blow, the
+ * path, and the scenario that moved.
+ *
+ * The probe matters more than it looks. Two implementations can agree on damage
+ * and side effects while drawing a different NUMBER of random values, which is
+ * invisible in the blow itself and diverges the whole game a few turns later.
+ * `rngProbe` is one draw taken after the attack: it can only match if the
+ * stream is at the same position.
+ *
+ * Fixtures are INJECTED rather than loaded here, so this module pulls in no
+ * node:fs and no content pack, and can be imported from anywhere.
+ *
+ * Regenerate with `node packages/core/scripts/gen-blow-vectors.mjs` - which
+ * OVERWRITES the evidence, so only do it when the change is intended and say so
+ * in the commit.
+ */
+import { Rng } from "../rng.js";
+import { loc } from "../loc.js";
+import { monMeleeAttack, RESOLVED_BLOW_EFFECTS } from "./mon-melee.js";
+/** The scenario grid. Every axis here changes which branches a handler takes. */
+const METHODS = ["HIT", "INSULT"];
+const DICE = ["1d4", "15d15"];
+const ACS = [0, 60];
+const HPS = [100, 1];
+const LEVEL = 25;
+const SEED = 20260808;
+/**
+ * INSULT is in the grid on purpose: its blow method carries 8 action messages,
+ * so `monster_blow_method_action` draws `randint0(8)` where a single-message
+ * method draws nothing. That draw is the first RNG event of the effect, which
+ * makes it the axis most likely to expose a handler that moved its message.
+ */
+function describeSideEffect(s) {
+    const rest = Object.keys(s)
+        .filter((k) => k !== "kind")
+        .sort()
+        .map((k) => `${k}=${String(s[k])}`)
+        .join(",");
+    return rest === "" ? s.kind : `${s.kind}(${rest})`;
+}
+function describeResult(r, chp, calls, msgs, rngProbe) {
+    return {
+        attacked: r.attacked,
+        playerDied: r.playerDied,
+        totalDamage: r.totalDamage,
+        blows: r.blows.map((b) => `${b.hit ? "hit" : "miss"} ${b.effect}/${b.method} dam=${b.damage} ` +
+            `obvious=${String(b.obvious)} [${b.sideEffects.map(describeSideEffect).join(" ")}]`),
+        sideEffects: r.sideEffects.map(describeSideEffect),
+        chp,
+        calls,
+        msgs,
+        rngProbe,
+    };
+}
+/**
+ * A recording MonBlowEnv. Every method logs itself with its arguments, so the
+ * ORDER of world-touching calls is part of the evidence rather than something
+ * a reader has to infer from the damage numbers.
+ *
+ * `hard` flips every branch the env controls: resists, saving throws, and the
+ * two theft results. Both variants are recorded because a handler that dropped
+ * a save check would still match the soft run.
+ */
+function recordingEnv(player, monster, hard) {
+    const calls = [];
+    const msgs = [];
+    let died = false;
+    const env = {
+        playerGrid: () => loc(0, 0),
+        applyReduction: (dam) => {
+            const out = hard ? Math.trunc(dam / 2) : dam;
+            calls.push(`applyReduction(${dam})->${out}`);
+            return out;
+        },
+        takeHit: (dam) => {
+            player.chp -= dam;
+            died = player.chp < 0;
+            calls.push(`takeHit(${dam}) chp=${player.chp}${died ? " DEAD" : ""}`);
+        },
+        finishElemental: () => calls.push("finishElemental"),
+        get playerDied() {
+            return died;
+        },
+        msg: (text, msgt) => {
+            msgs.push(msgt === undefined ? text : `${text} <${msgt}>`);
+        },
+        monName: `The ${monster.race.name}`,
+        showDamage: true,
+        monVisible: true,
+        disturb: () => calls.push("disturb"),
+        elementalDam: (proj, dam) => {
+            const out = hard ? Math.trunc(dam / 3) : dam;
+            calls.push(`elementalDam(${proj},${dam})->${out}`);
+            return out;
+        },
+        invenDamage: (elem, cperc) => calls.push(`invenDamage(${elem},${cperc})`),
+        resists: (elem) => {
+            calls.push(`resists(${elem})->${String(hard)}`);
+            return hard;
+        },
+        incTimed: (tmd, amount, check) => {
+            calls.push(`incTimed(${tmd},${amount},${String(check)})`);
+            return true;
+        },
+        saveVsSkill: () => {
+            calls.push(`saveVsSkill->${String(hard)}`);
+            return hard;
+        },
+        drainStat: (stat) => calls.push(`drainStat(${stat})`),
+        hasHoldLife: () => {
+            calls.push(`hasHoldLife->${String(hard)}`);
+            return hard;
+        },
+        drainExp: (chance, amount) => calls.push(`drainExp(${chance},${amount})`),
+        drainCharges: (rlev) => calls.push(`drainCharges(${rlev})`),
+        eatGold: () => {
+            calls.push(`eatGold->${String(hard)}`);
+            return hard;
+        },
+        eatItem: () => {
+            calls.push(`eatItem->${String(hard)}`);
+            return { blinked: hard, obvious: !hard };
+        },
+        eatFood: () => calls.push("eatFood"),
+        eatLight: () => calls.push("eatLight"),
+        disenchant: () => calls.push("disenchant"),
+        earthquake: (radius) => calls.push(`earthquake(${radius})`),
+        thrust: (dist) => calls.push(`thrust(${dist})`),
+        blinkAway: () => calls.push("blinkAway"),
+    };
+    return { env, calls, msgs };
+}
+/**
+ * Run the whole grid and return what every scenario did. Deterministic: each
+ * run gets its own `Rng(SEED)`, so a vector depends on nothing outside this
+ * module and the injected fixtures.
+ */
+export function computeBlowVectors(f) {
+    const out = [];
+    for (const effect of RESOLVED_BLOW_EFFECTS) {
+        for (const method of METHODS) {
+            for (const dice of DICE) {
+                for (const ac of ACS) {
+                    for (const hp of HPS) {
+                        const def = { ac, toA: 0 };
+                        const wRng = new Rng(SEED);
+                        const wPlayer = f.makePlayer();
+                        wPlayer.chp = hp;
+                        const wResult = monMeleeAttack(wRng, f.makeMonster(effect, method, dice, LEVEL), wPlayer, def);
+                        const worldless = describeResult(wResult, wPlayer.chp, [], [], wRng.randint0(100_000_000));
+                        const live = [false, true].map((hard) => {
+                            const rng = new Rng(SEED);
+                            const player = f.makePlayer();
+                            player.chp = hp;
+                            const monster = f.makeMonster(effect, method, dice, LEVEL);
+                            const rec = recordingEnv(player, monster, hard);
+                            const result = monMeleeAttack(rng, monster, player, def, {
+                                env: rec.env,
+                            });
+                            return describeResult(result, player.chp, rec.calls, rec.msgs, rng.randint0(100_000_000));
+                        });
+                        out.push({
+                            effect,
+                            method,
+                            dice,
+                            ac,
+                            hp,
+                            worldless,
+                            liveSoft: live[0],
+                            liveHard: live[1],
+                        });
+                    }
+                }
+            }
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=blow-vectors.js.map

package/dist/combat/blow-vectors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"blow-vectors.js","sourceRoot":"","sources":["../../src/combat/blow-vectors.ts"],"names":[],"mappings":"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"}

package/dist/combat/brand-slay.d.ts

@@ -17,12 +17,19 @@
  * melee's py_attack_real / learn_brand_slay_from_melee consult it upstream
  * (allow_temp = true); the launcher/throw paths pass allow_temp = false.
  *
- * DEFERRED (ledgered in parity/ledger/combat-melee.yaml):
- * - Curse contributions to object_to_hit/to_dam (obj->curses); no object
- *   carries curses through combat yet. object_weight_one's curse adjustment is
- *   likewise skipped there, since combat does not thread the curse table.
+ * object_to_hit / object_to_dam sum the ACTIVE CURSES' template bonuses onto the
+ * object's own (obj-util.c:296-321), and both take the bound curse table for
+ * that, exactly as objectWeightOne does (obj/object.ts:791). A caller that omits
+ * it gets the object's own bonus alone, which is right only for an object with no
+ * curses - so the live melee path threads it (MeleeOptions.curses).
+ *
+ * Note the upstream double-count this reproduces: calc_bonuses already folds a
+ * worn item's curse to_h/to_d into state->to_h/to_d (player-calcs.c:2009-2023),
+ * and then py_attack_real adds object_to_hit(weapon) on top, so a cursed WEAPON's
+ * curse bonus counts twice. Core keeps the C's warts; the bug-fixes mod is where
+ * that would be corrected.
  */
-import type { Brand, Slay } from "../obj/types.js";
+import type { Brand, Curse, Slay } from "../obj/types.js";
 import type { GameObject } from "../obj/object.js";
 import type { MonsterRace } from "../mon/types.js";
 import type { Player } from "../player/player.js";
@@ -43,10 +50,16 @@ export interface TempBrandSlay {
     /** whether a temporary slay with the given index is active. */
     hasSlay(idx: number): boolean;
 }
-/** object_to_hit(obj): the object's to-hit bonus (curses DEFERRED). */
-export declare function objectToHit(obj: GameObject): number;
-/** object_to_dam(obj): the object's to-dam bonus (curses DEFERRED). */
-export declare function objectToDam(obj: GameObject): number;
+/**
+ * object_to_hit (obj-util.c:296-310): the object's to-hit bonus, plus the to_h of
+ * every active curse's template object. `curses` is upstream's global curses[]
+ * (1-based, index 0 null); omitting it yields obj.toH alone.
+ */
+export declare function objectToHit(obj: GameObject, curses?: readonly (Curse | null)[] | null): number;
+/**
+ * object_to_dam (obj-util.c:312-326): as objectToHit, for to_dam.
+ */
+export declare function objectToDam(obj: GameObject, curses?: readonly (Curse | null)[] | null): number;
 /**
  * get_monster_brand_multiplier: the multiplicative factor for a brand hitting
  * a monster. Elemental vulnerability doubles the extra damage; resistances are

package/dist/combat/brand-slay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brand-slay.d.ts","sourceRoot":"","sources":["../../src/combat/brand-slay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQnD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,CAAC;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,gEAAgE;IAChE,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,+DAA+D;IAC/D,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAEnD;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAEnD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,eAAe,EACpB,CAAC,EAAE,KAAK,EACR,SAAS,EAAE,OAAO,GACjB,MAAM,CAaR;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC;CACd;AAaD;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,GAC9B,OAAO,CAOT;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,UAAU,GAAG,IAAI,EACtB,GAAG,EAAE,eAAe,EACpB,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,EACjC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,EAC/B,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,OAAO,EACd,SAAS,UAAQ,EACjB,IAAI,CAAC,EAAE,aAAa,GACnB,IAAI,CAwDN;AAED,6EAA6E;AAC7E,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,+BAA+B;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,gBAAgB,EAAE,WAAW,CAAC;CAC7C;AA6FD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,MAAM,EACT,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,GAAG,EAAE,oBAAoB,EACzB,IAAI,CAAC,EAAE,aAAa,GACnB,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,CAAC,EAAE,MAAM,EACT,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,UAAU,GAAG,IAAI,EAC3B,GAAG,EAAE,oBAAoB,GACxB,IAAI,CAEN;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,MAAM,EACT,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,UAAU,EACnB,GAAG,EAAE,oBAAoB,GACxB,IAAI,CAEN"}
+{"version":3,"file":"brand-slay.d.ts","sourceRoot":"","sources":["../../src/combat/brand-slay.ts"],"names":[],"mappings":"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"}

package/dist/combat/brand-slay.js

@@ -17,20 +17,47 @@
  * melee's py_attack_real / learn_brand_slay_from_melee consult it upstream
  * (allow_temp = true); the launcher/throw paths pass allow_temp = false.
  *
- * DEFERRED (ledgered in parity/ledger/combat-melee.yaml):
- * - Curse contributions to object_to_hit/to_dam (obj->curses); no object
- *   carries curses through combat yet. object_weight_one's curse adjustment is
- *   likewise skipped there, since combat does not thread the curse table.
+ * object_to_hit / object_to_dam sum the ACTIVE CURSES' template bonuses onto the
+ * object's own (obj-util.c:296-321), and both take the bound curse table for
+ * that, exactly as objectWeightOne does (obj/object.ts:791). A caller that omits
+ * it gets the object's own bonus alone, which is right only for an object with no
+ * curses - so the live melee path threads it (MeleeOptions.curses).
+ *
+ * Note the upstream double-count this reproduces: calc_bonuses already folds a
+ * worn item's curse to_h/to_d into state->to_h/to_d (player-calcs.c:2009-2023),
+ * and then py_attack_real adds object_to_hit(weapon) on top, so a cursed WEAPON's
+ * curse bonus counts twice. Core keeps the C's warts; the bug-fixes mod is where
+ * that would be corrected.
  */
 import { tvalIsLauncher, tvalIsWeapon } from "../obj/object.js";
 import { playerKnowsBrand, playerKnowsSlay, playerLearnBrand, playerLearnSlay, } from "../obj/knowledge.js";
-/** object_to_hit(obj): the object's to-hit bonus (curses DEFERRED). */
-export function objectToHit(obj) {
-    return obj.toH;
+/**
+ * object_to_hit (obj-util.c:296-310): the object's to-hit bonus, plus the to_h of
+ * every active curse's template object. `curses` is upstream's global curses[]
+ * (1-based, index 0 null); omitting it yields obj.toH alone.
+ */
+export function objectToHit(obj, curses) {
+    let result = obj.toH;
+    if (obj.curses && curses) {
+        for (let i = 1; i < curses.length; i++) {
+            if (obj.curses[i]?.power)
+                result += curses[i]?.obj?.toH ?? 0;
+        }
+    }
+    return result;
 }
-/** object_to_dam(obj): the object's to-dam bonus (curses DEFERRED). */
-export function objectToDam(obj) {
-    return obj.toD;
+/**
+ * object_to_dam (obj-util.c:312-326): as objectToHit, for to_dam.
+ */
+export function objectToDam(obj, curses) {
+    let result = obj.toD;
+    if (obj.curses && curses) {
+        for (let i = 1; i < curses.length; i++) {
+            if (obj.curses[i]?.power)
+                result += curses[i]?.obj?.toD ?? 0;
+        }
+    }
+    return result;
 }
 /**
  * get_monster_brand_multiplier: the multiplicative factor for a brand hitting

package/dist/combat/brand-slay.js.map

@@ -1 +1 @@
-{"version":3,"file":"brand-slay.js","sourceRoot":"","sources":["../../src/combat/brand-slay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"brand-slay.js","sourceRoot":"","sources":["../../src/combat/brand-slay.ts"],"names":[],"mappings":"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"}

package/dist/combat/index.d.ts

@@ -4,7 +4,7 @@
  * the player (mon-melee.ts), and player ranged attacks (ranged.ts). Ported
  * from Angband 4.2.6 (player-attack.c, mon-attack.c, mon-blows.c, obj-slays.c).
  *
- * Not wired into the package barrel (packages/core/src/index.ts) yet; import
+ * Re-exported from the package barrel (packages/core/src/index.ts:93); import
  * directly from "./combat".
  */
 export * from "./hit.js";

package/dist/combat/index.js

@@ -4,7 +4,7 @@
  * the player (mon-melee.ts), and player ranged attacks (ranged.ts). Ported
  * from Angband 4.2.6 (player-attack.c, mon-attack.c, mon-blows.c, obj-slays.c).
  *
- * Not wired into the package barrel (packages/core/src/index.ts) yet; import
+ * Re-exported from the package barrel (packages/core/src/index.ts:93); import
  * directly from "./combat".
  */
 export * from "./hit.js";

package/dist/combat/melee.d.ts

@@ -5,9 +5,10 @@
  *
  * The upstream `struct player` carries a computed `struct player_state`
  * (calc_bonuses) with to_h/to_d/ac/num_blows/skills/stat_ind; the port's
- * Player does not yet compute that (player/calcs.ts defers it). Combat
- * therefore takes an explicit PlayerCombatState alongside the Player, exactly
- * as upstream separates `p` from `p->state`. num_blows is likewise injected.
+ * port computes it in player/calcs.ts (calcBonuses). Combat takes an explicit
+ * PlayerCombatState alongside the Player rather than reading it off the Player,
+ * exactly as upstream separates `p` from `p->state`; num_blows arrives the same
+ * way. That is a layer boundary, not a missing derive.
  *
  * Knowledge / learning side effects (equip_learn_on_melee_attack,
  * learn_brand_slay_from_melee) are wired at the GAME layer around pyAttack
@@ -23,15 +24,16 @@
  * caller supplying no hooks (e.g. the effect handlers) still rolls fear but
  * skips the state-mutating side effects, exactly as those simplified paths do.
  *
- * DEFERRED (ledgered in parity/ledger/combat-melee.yaml):
- * - Message text/formatting (the combat code returns the HitType key only).
+ * BY LAYER (ledgered in parity/ledger/combat-melee.yaml): message text and
+ * formatting live in the game layer - combat returns the HitType key and
+ * game/mon-message.ts and game/effect-melee.ts render it.
  *
  * O-combat (birth_percent_damage) IS ported: oMeleeDamage / o_critical_melee,
  * gated in pyAttackReal at the same point upstream branches (player-attack.c
  * L803/L811/L826). With the option off the path is byte-identical to standard.
  */
 import type { Rng } from "../rng.js";
-import type { Brand, Slay } from "../obj/types.js";
+import type { Brand, Curse, Slay } from "../obj/types.js";
 import type { GameObject } from "../obj/object.js";
 import type { Monster } from "../mon/monster.js";
 import type { MonTakeHitHooks } from "../mon/take-hit.js";
@@ -40,7 +42,7 @@ import type { HitType } from "./hit.js";
 import type { TempBrandSlay } from "./brand-slay.js";
 /**
  * The subset of upstream `struct player_state` that combat reads. Supplied by
- * the caller (calc_bonuses is deferred in player/calcs.ts).
+ * the caller, which derives it with calcBonuses (player/calcs.ts:720).
  */
 export interface PlayerCombatState {
     /** state->to_h. */
@@ -142,6 +144,15 @@ export interface MeleeOptions {
      * path (the gate adds/reorders nothing).
      */
     percentDamage?: boolean;
+    /**
+     * The bound curse registry (upstream global curses[], 1-based). object_to_hit
+     * and object_to_dam add each active curse template bonus onto the weapon own
+     * bonus (obj-util.c:296-321), and object_weight_one adjusts weight the same
+     * way. A caller that omits it gets the uncursed answer, which is correct only
+     * for a weapon carrying no curses - so the live paths (game/effect-melee.ts,
+     * game/player-turn.ts) pass the bound registry.
+     */
+    curses?: readonly (Curse | null)[] | null;
     /** The blow side effects (gap 2.5); omitted by pure-math / effect callers. */
     hooks?: MeleeEffectHooks;
 }
@@ -173,8 +184,9 @@ export interface MeleeAttack {
     monsterDied: boolean;
     /**
      * The monster survived and was left frightened and visible: py_attack's
-     * end-of-loop add_monster_message(MON_MSG_FLEE_IN_TERROR). The caller emits
-     * the "flees in terror" line.
+     * end-of-loop add_monster_message(MON_MSG_FLEE_IN_TERROR, true). The caller
+     * queues it (game/player-turn.ts); the delayed pass is what makes it read as
+     * a reaction to the blow rather than an interleaved line.
      */
     monsterFled: boolean;
     /**
@@ -187,16 +199,16 @@ export interface MeleeAttack {
 /**
  * chance_of_melee_hit_base: the player's melee to-hit before the target.
  */
-export declare function chanceOfMeleeHitBase(state: PlayerCombatState, weapon: GameObject | null): number;
+export declare function chanceOfMeleeHitBase(state: PlayerCombatState, weapon: GameObject | null, curses?: readonly (Curse | null)[] | null): number;
 /**
  * chance_of_melee_hit: to-hit against a specific monster (half if unseen).
  */
-export declare function chanceOfMeleeHit(state: PlayerCombatState, weapon: GameObject | null, monVisible: boolean): number;
+export declare function chanceOfMeleeHit(state: PlayerCombatState, weapon: GameObject | null, monVisible: boolean, curses?: readonly (Curse | null)[] | null): number;
 /**
  * melee_damage: base weapon dice, times the best slay or brand multiplier,
  * plus the weapon's to-dam. Standard (non-O) combat.
  */
-export declare function meleeDamage(rng: Rng, mon: Monster, weapon: GameObject | null, brand: number, slay: number, brands: readonly (Brand | null)[], slays: readonly (Slay | null)[]): number;
+export declare function meleeDamage(rng: Rng, mon: Monster, weapon: GameObject | null, brand: number, slay: number, brands: readonly (Brand | null)[], slays: readonly (Slay | null)[], curses?: readonly (Curse | null)[] | null): number;
 /** The (possibly critical-boosted) damage of a single blow plus its message. */
 export interface DamageOutcome {
     damage: number;
@@ -215,7 +227,7 @@ export interface DamageOutcome {
  *     a crit the one_in_ level walk.
  *  3. damroll(dice, sides).
  */
-export declare function oMeleeDamage(rng: Rng, state: PlayerCombatState, mon: Monster, weapon: GameObject | null, brand: number, slay: number, brands: readonly (Brand | null)[], slays: readonly (Slay | null)[]): DamageOutcome;
+export declare function oMeleeDamage(rng: Rng, state: PlayerCombatState, mon: Monster, weapon: GameObject | null, brand: number, slay: number, brands: readonly (Brand | null)[], slays: readonly (Slay | null)[], curses?: readonly (Curse | null)[] | null): DamageOutcome;
 /**
  * py_attack_real: a single melee blow against the monster (player-attack.c
  * L717). Mutates mon.hp on a damaging hit (through mon_take_hit, which also

package/dist/combat/melee.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"melee.d.ts","sourceRoot":"","sources":["../../src/combat/melee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"melee.d.ts","sourceRoot":"","sources":["../../src/combat/melee.ts"],"names":[],"mappings":"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"}