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

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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAa,OAAO,EAAE,MAAM,UAAU,CAAC;AAcnD,OAAO,KAAK,EAAkB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,mBAAmB;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,mBAAmB;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,kEAAkE;IAClE,QAAQ,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sEAAsE;IACtE,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,qDAAqD;IACrD,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,+DAA+D;IAC/D,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,qEAAqE;IACrE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kFAAkF;IAClF,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,6DAA6D;IAC7D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;IAC5B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;;OAGG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B;;;OAGG;IACH,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B;;;OAGG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED,kCAAkC;AAClC,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAChC,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8EAA8E;IAC9E,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAED,qDAAqD;AACrD,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB,8EAA8E;IAC9E,IAAI,EAAE,OAAO,CAAC;CACf;AAED,gDAAgD;AAChD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB;AAgBD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,GACxB,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,UAAU,EAAE,OAAO,GAClB,MAAM,CAGR;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,EACjC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,GAC9B,MAAM,CAYR;AAED,gFAAgF;AAChF,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;CACd;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,EACxB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,EACjC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,GAC9B,aAAa,CA2Cf;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,EACjC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,EAC/B,IAAI,GAAE,YAAiB,GACtB,SAAS,CAgJX;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1B,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,+CAA+C;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4EAA4E;IAC5E,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,gDAAgD;IAChD,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,gDAAgD;IAChD,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACtD;AAsHD;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,GAAG,EAAE,GAAG,EACR,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,EACjC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,EAC/B,IAAI,GAAE,YAAiB,GACtB,WAAW,CAwDb"}
+{"version":3,"file":"melee.d.ts","sourceRoot":"","sources":["../../src/combat/melee.ts"],"names":[],"mappings":"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"}

package/dist/combat/melee.js

@@ -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,8 +24,9 @@
  * 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
@@ -54,22 +56,24 @@ function critActor(p, state) {
 /**
  * chance_of_melee_hit_base: the player's melee to-hit before the target.
  */
-export function chanceOfMeleeHitBase(state, weapon) {
-    const bonus = state.toH + (weapon ? objectToHit(weapon) : 0) + (state.blessWield ? 2 : 0);
+export function chanceOfMeleeHitBase(state, weapon, curses) {
+    const bonus = state.toH +
+        (weapon ? objectToHit(weapon, curses) : 0) +
+        (state.blessWield ? 2 : 0);
     return skill(state, SKILL.TO_HIT_MELEE) + bonus * BTH_PLUS_ADJ;
 }
 /**
  * chance_of_melee_hit: to-hit against a specific monster (half if unseen).
  */
-export function chanceOfMeleeHit(state, weapon, monVisible) {
-    const chance = chanceOfMeleeHitBase(state, weapon);
+export function chanceOfMeleeHit(state, weapon, monVisible, curses) {
+    const chance = chanceOfMeleeHitBase(state, weapon, curses);
     return monVisible ? chance : Math.trunc(chance / 2);
 }
 /**
  * melee_damage: base weapon dice, times the best slay or brand multiplier,
  * plus the weapon's to-dam. Standard (non-O) combat.
  */
-export function meleeDamage(rng, mon, weapon, brand, slay, brands, slays) {
+export function meleeDamage(rng, mon, weapon, brand, slay, brands, slays, curses) {
     let dmg = weapon ? rng.damroll(weapon.dd, weapon.ds) : 1;
     if (slay) {
         dmg *= slays[slay].multiplier;
@@ -78,7 +82,7 @@ export function meleeDamage(rng, mon, weapon, brand, slay, brands, slays) {
         dmg *= getMonsterBrandMultiplier(mon, brands[brand], false);
     }
     if (weapon)
-        dmg += objectToDam(weapon);
+        dmg += objectToDam(weapon, curses);
     return dmg;
 }
 /**
@@ -94,7 +98,7 @@ export function meleeDamage(rng, mon, weapon, brand, slay, brands, slays) {
  *     a crit the one_in_ level walk.
  *  3. damroll(dice, sides).
  */
-export function oMeleeDamage(rng, state, mon, weapon, brand, slay, brands, slays) {
+export function oMeleeDamage(rng, state, mon, weapon, brand, slay, brands, slays, curses) {
     let dice = weapon ? weapon.dd : 1;
     let add = 0;
     /* Average value of a single damage die, x10. */
@@ -115,7 +119,7 @@ export function oMeleeDamage(rng, state, mon, weapon, brand, slay, brands, slays
         dieAverage *= 10;
     }
     /* Apply deadliness (x100) from to_d + weapon to-dam. */
-    const deadliness = state.toD + (weapon ? objectToDam(weapon) : 0);
+    const deadliness = state.toD + (weapon ? objectToDam(weapon, curses) : 0);
     dieAverage = applyDeadliness(dieAverage, Math.min(deadliness, 150));
     /* Sides per die, with a fractional-sides roll. */
     let sides = 2 * dieAverage - 10000;
@@ -125,7 +129,7 @@ export function oMeleeDamage(rng, state, mon, weapon, brand, slay, brands, slays
     /* Criticals add dice (excluded for unarmed; upstream leaves msg at MSG_HIT). */
     let msg = "HIT";
     if (weapon) {
-        const crit = oCriticalMelee(rng, chanceOfMeleeHitBase(state, weapon), mon);
+        const crit = oCriticalMelee(rng, chanceOfMeleeHitBase(state, weapon, curses), mon);
         dice += crit.addDice;
         msg = crit.msg;
     }
@@ -157,7 +161,7 @@ export function pyAttackReal(rng, p, state, weapon, mon, brands, slays, opts = {
     monClearTimed(rng, mon, MON_TMD.HOLD, MON_TMD_FLG_NOTIFY);
     const th = h?.takeHit;
     /* See if the player hit. */
-    const success = testHit(rng, chanceOfMeleeHit(state, weapon, monVisible), mon.race.ac);
+    const success = testHit(rng, chanceOfMeleeHit(state, weapon, monVisible, opts.curses), mon.race.ac);
     if (!success) {
         /* Small chance of bloodlust side-effects on a miss (player-attack.c L770). */
         if (h?.bloodlust && rng.oneIn(50))
@@ -167,7 +171,7 @@ export function pyAttackReal(rng, p, state, weapon, mon, brands, slays, opts = {
             brand: 0, slay: 0, monsterDied: false, stopAttack: false, fear: false,
         };
     }
-    const weight = weapon ? objectWeightOne(weapon) : 0;
+    const weight = weapon ? objectWeightOne(weapon, opts.curses) : 0;
     const oCombat = opts.percentDamage ?? false;
     /* Best attack from all slays or brands on all non-launcher equipment.
      * improve_attack_modifier reads birth_percent_damage internally to pick the
@@ -188,10 +192,10 @@ export function pyAttackReal(rng, p, state, weapon, mon, brands, slays, opts = {
     let dmg;
     let msg;
     if (!oCombat) {
-        dmg = meleeDamage(rng, mon, weapon, mod.brand, mod.slay, brands, slays);
+        dmg = meleeDamage(rng, mon, weapon, mod.brand, mod.slay, brands, slays, opts.curses);
         msg = "HIT";
         if (weapon) {
-            const crit = criticalMelee(rng, critActor(p, state), mon, weight, objectToHit(weapon), dmg);
+            const crit = criticalMelee(rng, critActor(p, state), mon, weight, objectToHit(weapon, opts.curses), dmg);
             dmg = crit.damage;
             msg = crit.msg;
         }
@@ -199,7 +203,7 @@ export function pyAttackReal(rng, p, state, weapon, mon, brands, slays, opts = {
         dmg += state.toD;
     }
     else {
-        const o = oMeleeDamage(rng, state, mon, weapon, mod.brand, mod.slay, brands, slays);
+        const o = oMeleeDamage(rng, state, mon, weapon, mod.brand, mod.slay, brands, slays, opts.curses);
         dmg = o.damage;
         msg = o.msg;
     }

package/dist/combat/melee.js.map

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