rom24-quickmud-python 2.9.6__py3-none-any.whl → 2.9.8__py3-none-any.whl

mud/affects/engine.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from mud.handler import affect_remove
 from mud.models.character import Character
 from mud.utils import rng_mm
 
@@ -43,8 +44,28 @@ def tick_spell_effects(character: Character) -> list[str]:
                 or int(getattr(next_affect, "duration", 0) or 0) > 0
             )
 
+            # ROM src/handler.c:1317 affect_remove — affect_modify(FALSE)
+            # subtracts the stat mod and clears the bitvector; affect_check
+            # re-sets the bit only if another affect still provides it.
+            # INV-015 fix (2.9.7): was a bare `affected.remove(affect)`,
+            # which leaked stat mods and bitvectors for any AffectData
+            # whose `type` is an integer SN (the ROM-canonical form).
+            #
+            # Python has a parallel apply path: `Character.apply_spell_effect`
+            # already calls `_apply_stat_modifier(+mod)`, mirrors a shadow
+            # AffectData into `ch.affected`, and on expiry the
+            # `remove_spell_effect` branch below unwinds via
+            # `_apply_stat_modifier(-mod)`. For those entries the shadow
+            # AffectData's modifier was NEVER applied via `affect_modify(True)`,
+            # so calling `affect_modify(False)` on it would double-unwind.
+            # Split: spell_effects-managed entries get bare list removal;
+            # raw ROM-canonical AffectData routes through affect_remove.
+            spell_effects_managed = isinstance(spell_name, str) and spell_name in effects
             if affect in affected:
-                affected.remove(affect)
+                if spell_effects_managed:
+                    affected.remove(affect)
+                else:
+                    affect_remove(character, affect)
 
             if isinstance(spell_name, str) and spell_name in effects:
                 touched_names.add(spell_name)

mud/handler.py

@@ -442,6 +442,36 @@ def affect_check(ch: Character, where: int, vector: int) -> None:
                             return
 
 
+def affect_remove(ch: Character, paf: Affect) -> None:
+    """Remove an affect from a character — ROM ``src/handler.c:1317``.
+
+    Mirrors ROM exactly: ``affect_modify(ch, paf, FALSE)`` (subtracts
+    the stat modifier and clears the bitvector in
+    ``affected_by``/``imm_flags``/``res_flags``/``vuln_flags``),
+    unlinks ``paf`` from ``ch.affected``, then calls
+    ``affect_check(ch, where, vector)`` which re-sets the bitvector
+    only if another affect on the char or equipped objects still
+    provides it. INV-015 enforcement point for the affect-tick
+    lifecycle contract.
+    """
+
+    affected = getattr(ch, "affected", None)
+    if not isinstance(affected, list) or not affected:
+        return
+
+    where = getattr(paf, "where", 0)
+    vector = getattr(paf, "bitvector", 0)
+
+    affect_modify(ch, paf, False)
+
+    try:
+        affected.remove(paf)
+    except ValueError:
+        pass
+
+    affect_check(ch, where, vector)
+
+
 def affect_to_obj(obj: Object, paf: Affect) -> None:
     """
     Add an affect to an object.

mud/models/character.py

@@ -859,27 +859,6 @@ class Character:
         # Add to affected list (ROM C linked list)
         self.affected.append(affect)
 
-    def affect_remove(self, affect: AffectData) -> None:
-        """
-        Remove a ROM C AFFECT_DATA from the character's affected list.
-
-        ROM Reference: src/handler.c affect_remove (lines 2625-2653)
-
-        Args:
-            affect: AffectData structure to remove
-        """
-        try:
-            self.affected.remove(affect)
-        except ValueError:
-            pass  # Affect not in list
-
-        # Remove bitvector if no other affects use it
-        if affect.bitvector:
-            still_has_bitvector = any(paf.bitvector & affect.bitvector for paf in self.affected)
-            if not still_has_bitvector:
-                self.affected_by = getattr(self, "affected_by", 0) & ~affect.bitvector
-
-
 # END affects_saves
 
 

{rom24_quickmud_python-2.9.6.dist-info → rom24_quickmud_python-2.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.6
+Version: 2.9.8
 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.6.dist-info → rom24_quickmud_python-2.9.8.dist-info}/RECORD

@@ -5,7 +5,7 @@ mud/config.py,sha256=FmuhwTeR5798i_dHBJvZ_EQ4d_eNO8oMa8ni8fxiHhs,7057
 mud/entrypoint.py,sha256=WxBW3GfbKCOtSD5rx2ccSAC7lA3YRFi7DJ_EZvi1rmo,854
 mud/game_loop.py,sha256=nzGos1soW6oN3LCdl_XYlmB-k2QRI0mnpGn5JofbFXM,52109
 mud/game_tick_scheduler.py,sha256=7ybo2ekDQQPGN82u6fhcrrg7tZ-JMtGy4UUrZv9_Umo,1539
-mud/handler.py,sha256=UDX7lxaOUFvHBgIJrkxfgVjm0n7B_vD-9xCvvN2CdLM,51995
+mud/handler.py,sha256=RGAa_ziAJmquIJb0QJhyjJS9-O6KC0U29O8iUaLxAZ0,52935
 mud/logging.py,sha256=DoKcplYwEePAmXKE2CI_wNk4pF-pc_aouoxa5C6tXlc,582
 mud/mob_cmds.py,sha256=Hv7tFhABraQLRbQihHOHTDE4qgE0GSuue1_RQkchQW4,46158
 mud/mobprog.py,sha256=TZiv4ZErFAlcO1TWaJryzZ5kwTZFe5DSqKVlo6qJcTc,59173
@@ -22,7 +22,7 @@ mud/account/account_service.py,sha256=ERKI4Mx6IvZgKreuqZID8uF45II9RP3byimlEHHYOD
 mud/admin_logging/__init__.py,sha256=3W8Z1S7Dg-AtDTKPQIzuqL4_OojeyuAOryGH6BKozcg,40
 mud/admin_logging/admin.py,sha256=WWSNcY6nP-vqMcJ-rUyVAfoYV95xyu2S_iZugfR0dPE,5261
 mud/admin_logging/agent_trace.py,sha256=j1rtrINBp2RIB9BRGXK0awHTH8_nvSu4Co18zmdOU2w,359
-mud/affects/engine.py,sha256=AuSMXR-Wyj3_my3-tu0zyUmWhWQfyojyralPTp6SNlk,3208
+mud/affects/engine.py,sha256=Dkckt2zvKMaL6AU-gzFcbtMvqNVBYuRmywhHl1uk-LI,4563
 mud/affects/saves.py,sha256=afpQt_fEy6O5rphttSveYgjUcCuXzkCG9EI8ZEpD0Hs,5247
 mud/agent/__init__.py,sha256=n7gOkjYxsp38xaokvYaEGEEyfZQz1M7AwpM59o1i3_g,32
 mud/agent/agent_protocol.py,sha256=itC7kgLJiGxJRatZJ9YGg3KhHTMWeedJocsC1f7TmzY,573
@@ -134,7 +134,7 @@ mud/models/area.py,sha256=RDn6e2N9AhoMW4d68-o8i1p1tNhuszaWjbOIkGTlW9I,835
 mud/models/area_json.py,sha256=GUCWUgFf2s6DUWzcLLYhoxTP38P5cu1vrSD1W3i7D2c,731
 mud/models/board.py,sha256=LDcNFHB7X3_BNJ9efTW_VJ-vOAQG1pPIByh1EsXseVA,6283
 mud/models/board_json.py,sha256=XG8t7lLW7b_V3IjzbGF-o6Ym36CTgKiOiBVZb-M0BpA,472
-mud/models/character.py,sha256=CpeRH0VIlaZanz_VnAEWH9bRMKEvatJgJ8Yk_tF3j4I,52652
+mud/models/character.py,sha256=VmRVPEMIvU16v0Eoy6NrWTOwxOssfIhieNeaBDrXSE8,51934
 mud/models/character_json.py,sha256=7rdI92S-JT38xb2iUyXTAJpLmFOIRy2pb6v1Yen8VQY,1046
 mud/models/clans.py,sha256=vMeVpK4VbYBtGYxRFdg2lUmkrjkCvqEM_jCOTNiuG3g,2227
 mud/models/classes.py,sha256=Fv0KjS339EBWqz5OBZu5TYSIDSRYpoalLTBJOf-6ThI,2602
@@ -216,9 +216,9 @@ mud/world/obj_find.py,sha256=tgnUkbFjnCl586Lzl6yRzCmllZSNEfQpQlrxCMVcUGU,5295
 mud/world/time_persistence.py,sha256=K4uhRpu08IDHY5uReBYTvw4BHuqsSxWvbv-h1VsPvf8,1663
 mud/world/vision.py,sha256=NRk3cvrGyyldU4W98qAVlYZp9wL-IUE1dTgk6DpM-NA,11609
 mud/world/world_state.py,sha256=3KpiDP6v24sZDn9-g44UypXpegzgRShHo1XvektJzdU,8810
-rom24_quickmud_python-2.9.6.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.9.6.dist-info/METADATA,sha256=r49o7UJ6j5R-ZhlkgJ3zSOaKVCiuiE6be193v9MQNEY,15670
-rom24_quickmud_python-2.9.6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rom24_quickmud_python-2.9.6.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.9.6.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.9.6.dist-info/RECORD,,
+rom24_quickmud_python-2.9.8.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.9.8.dist-info/METADATA,sha256=yLpScJjRjG7Xt5MTzsablPHyRQW4TqV17ee886ql564,15670
+rom24_quickmud_python-2.9.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rom24_quickmud_python-2.9.8.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.9.8.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.9.8.dist-info/RECORD,,