rom24-quickmud-python 2.9.10__tar.gz → 2.9.11__tar.gz

{rom24_quickmud_python-2.9.10 → rom24_quickmud_python-2.9.11}/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.9.11]
+
+### Fixed
+- **HPCNT-001 — `TRIG_HPCNT` over-fired inside `_apply_damage`** (`mud/combat/engine.py:603-606` pre-removal): ROM's only `mp_hprct_trigger` call site is `src/fight.c:97` inside `violence_update`, which fires it once per pulse per NPC after `multi_hit` on the NPC attacker. ROM `damage()` (`src/fight.c:825-870`) does NOT fire HPCNT on the victim. The Python `_apply_damage` carried a `if victim_is_npc and victim.hit > 0: mp_hprct_trigger(victim, attacker)` block with a misattributed `ROM Reference: src/fight.c:1094-1136` comment — that range is `is_safe_spell`, not HPCNT. Symptom: HP-percent mob scripts that gate on `hpcnt N` fired N+1 times per `multi_hit` (once per landed hit plus once at multi_hit's end), and also fired on spell-damage paths where ROM doesn't fire HPCNT at all. Deleted the `_apply_damage` block; the canonical site at `mud/combat/engine.py:388-390` (end of `multi_hit`, NPC attacker only) remains and continues to mirror ROM `src/fight.c:91-98`. Two enforcement tests in `tests/integration/test_hpcnt_once_per_pulse.py`: (1) PC attacker on NPC victim runs `attack_round` and HPCNT must fire 0 times; (2) NPC attacker on PC victim runs `multi_hit` with 2nd/3rd-attack skills at 100% and HPCNT must fire exactly once.
+
 ## [2.9.10]
 
 ### Fixed

{rom24_quickmud_python-2.9.10/rom24_quickmud_python.egg-info → rom24_quickmud_python-2.9.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.10
+Version: 2.9.11
 Summary: A modern Python port of the ROM 2.4b6 MUD engine with full telnet server and JSON world loading
 Author-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>
 Maintainer-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>

{rom24_quickmud_python-2.9.10 → rom24_quickmud_python-2.9.11}/mud/combat/engine.py

@@ -600,11 +600,6 @@ def apply_damage(
     old_pos = victim.position
     victim.hit -= damage
 
-    # Trigger HP percent mobprog (ROM Reference: src/fight.c:1094-1136)
-    victim_is_npc = getattr(victim, "is_npc", False)
-    if victim_is_npc and victim.hit > 0:
-        mobprog.mp_hprct_trigger(victim, attacker)
-
     # Immortals don't die (ROM IS_IMMORTAL check)
     if not victim.is_npc and victim.is_immortal() and victim.hit < 1:
         victim.hit = 1

{rom24_quickmud_python-2.9.10 → rom24_quickmud_python-2.9.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rom24-quickmud-python"
-version = "2.9.10"
+version = "2.9.11"
 description = "A modern Python port of the ROM 2.4b6 MUD engine with full telnet server and JSON world loading"
 readme = "README.md"
 license = "MIT"

{rom24_quickmud_python-2.9.10 → rom24_quickmud_python-2.9.11/rom24_quickmud_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.10
+Version: 2.9.11
 Summary: A modern Python port of the ROM 2.4b6 MUD engine with full telnet server and JSON world loading
 Author-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>
 Maintainer-email: Mark Jedrzejczyk <mark.jedrzejczyk@gmail.com>

{rom24_quickmud_python-2.9.10 → rom24_quickmud_python-2.9.11}/rom24_quickmud_python.egg-info/SOURCES.txt

@@ -692,6 +692,7 @@ tests/integration/test_give_command.py
 tests/integration/test_group_combat.py
 tests/integration/test_healer_command_parity.py
 tests/integration/test_hedit_parity.py
+tests/integration/test_hpcnt_once_per_pulse.py
 tests/integration/test_info_display.py
 tests/integration/test_interp_dispatcher.py
 tests/integration/test_interp_prefix_order.py

rom24_quickmud_python-2.9.11/tests/integration/test_hpcnt_once_per_pulse.py

@@ -0,0 +1,115 @@
+"""HPCNT-001 — TRIG_HPCNT fires once per violence pulse, not per damage.
+
+ROM ``src/fight.c:97`` is the **only** ``mp_hprct_trigger`` site in
+the C codebase. It fires inside ``violence_update`` after
+``multi_hit`` returns, exactly once per pulse per NPC, on the
+NPC's per-pulse turn through the character list. ROM ``damage()``
+(fight.c:825-870) drops victim hp, calls ``update_pos``, and
+broadcasts the position line — it does NOT fire HPCNT on the
+victim.
+
+The Python ``mud/combat/engine.py:_apply_damage`` historically
+fired ``mp_hprct_trigger(victim, attacker)`` on every damage
+application against an NPC victim (with a misattributed
+``ROM Reference: src/fight.c:1094-1136`` comment — that range is
+``is_safe_spell``, not HPCNT). Symptoms: HP-percent mob scripts
+that gate on ``hpcnt N`` would fire N+1 times per ``multi_hit``
+(once per landed hit plus once at multi_hit's end), and would also
+fire on spell-damage paths where ROM doesn't fire HPCNT at all.
+
+The enforcement point is ``mud/combat/engine.py:multi_hit`` —
+HPCNT fires exactly once there, on the NPC attacker, mirroring
+ROM ``src/fight.c:91-98``. The ``_apply_damage`` site was
+deleted.
+"""
+
+from __future__ import annotations
+
+from mud import mobprog
+from mud.combat.engine import attack_round, multi_hit
+from mud.models.character import Character
+from mud.models.constants import Position
+from mud.models.room import Room
+
+
+def _record_hpcnt(monkeypatch) -> list[tuple[str, str]]:
+    calls: list[tuple[str, str]] = []
+
+    def _stub(mob, ch):
+        calls.append((getattr(mob, "name", "?"), getattr(ch, "name", "?")))
+        return False
+
+    monkeypatch.setattr(mobprog, "mp_hprct_trigger", _stub)
+    monkeypatch.setattr("mud.combat.engine.mobprog.mp_hprct_trigger", _stub)
+    return calls
+
+
+def test_hpcnt_does_not_fire_inside_apply_damage(monkeypatch) -> None:
+    """A PC attacking an NPC victim must NOT trigger HPCNT inside
+    ``_apply_damage``. ROM fires HPCNT only from ``violence_update``
+    on the NPC attacker's turn; the victim-side firing was a Python
+    divergence.
+    """
+    calls = _record_hpcnt(monkeypatch)
+    monkeypatch.setattr(
+        "mud.combat.engine.calculate_weapon_damage",
+        lambda attacker, victim, dam_type, **kwargs: 5,
+    )
+
+    room = Room(vnum=99917, name="hpcnt probe room")
+    attacker = Character(name="Hero", is_npc=False, position=Position.STANDING)
+    attacker.level = 30
+    attacker.hit = 100
+    attacker.max_hit = 100
+    attacker.hitroll = 100
+    victim = Character(name="VictimMob", is_npc=True, position=Position.STANDING)
+    victim.level = 1
+    victim.hit = 50
+    victim.max_hit = 50
+    room.add_character(attacker)
+    room.add_character(victim)
+
+    attack_round(attacker, victim)
+
+    assert calls == [], (
+        "ROM src/fight.c:damage does not fire mp_hprct_trigger on the "
+        f"victim NPC; got {len(calls)} call(s): {calls}"
+    )
+
+
+def test_hpcnt_fires_exactly_once_per_multi_hit(monkeypatch) -> None:
+    """When an NPC attacker runs through ``multi_hit`` (the ROM
+    violence_update path), HPCNT fires exactly once at the end —
+    not once per landed hit. Mirrors ROM ``src/fight.c:91-98``.
+    """
+    calls = _record_hpcnt(monkeypatch)
+    monkeypatch.setattr(
+        "mud.combat.engine.calculate_weapon_damage",
+        lambda attacker, victim, dam_type, **kwargs: 5,
+    )
+
+    room = Room(vnum=99918, name="hpcnt multi_hit room")
+    attacker = Character(name="AttackerMob", is_npc=True, position=Position.STANDING)
+    attacker.level = 30
+    attacker.hit = 100
+    attacker.max_hit = 100
+    attacker.hitroll = 100
+    attacker.second_attack_skill = 100
+    attacker.third_attack_skill = 100
+    victim = Character(name="VictimPC", is_npc=False, position=Position.STANDING)
+    victim.level = 30
+    victim.hit = 100
+    victim.max_hit = 100
+    room.add_character(attacker)
+    room.add_character(victim)
+
+    multi_hit(attacker, victim)
+
+    assert len(calls) == 1, (
+        "ROM src/fight.c:97 fires mp_hprct_trigger exactly once at the "
+        f"end of multi_hit on the NPC attacker; got {len(calls)} call(s): "
+        f"{calls}"
+    )
+    assert calls[0] == ("AttackerMob", "VictimPC"), (
+        f"HPCNT must fire on (attacker NPC, victim) per ROM; got {calls[0]}"
+    )