rom24-quickmud-python 2.9.10__py3-none-any.whl → 2.9.12__py3-none-any.whl

mud/characters/follow.py

@@ -68,17 +68,34 @@ def stop_follower(follower: "Character") -> None:
 
 
 def die_follower(char: "Character") -> None:
-    """Stop all followers when character dies.
-
-    ROM Reference: src/handler.c die_follower
-    Mirrors ROM behavior: when character dies, all their followers stop following.
+    """Detach a dying character from its group and followers.
+
+    Mirrors ROM ``src/act_comm.c:1658-1680``:
+
+    1. If ``ch`` is following someone, detach ``ch`` from its master
+       (releasing ``master->pet`` if it pointed at ``ch``).
+    2. Clear ``ch->leader``.
+    3. For every other character, if it follows ``ch`` (``master == ch``)
+       stop the follow; if it groups under ``ch`` (``leader == ch``), reset
+       its leader to itself so it becomes its own independent group leader
+       — NOT NULL, otherwise ``is_same_group`` would still equate two
+       former members via their dangling pointer at the extracted corpse.
     """
     from mud.models.character import character_registry
 
-    for follower in list(character_registry):
-        master = getattr(follower, "master", None)
-        if master is char:
-            stop_follower(follower)
+    if getattr(char, "master", None) is not None:
+        master = char.master
+        if getattr(master, "pet", None) is char:
+            master.pet = None
+        stop_follower(char)
+
+    char.leader = None
+
+    for fch in list(character_registry):
+        if getattr(fch, "master", None) is char:
+            stop_follower(fch)
+        if getattr(fch, "leader", None) is char:
+            fch.leader = fch
 
 
 __all__ = ["add_follower", "stop_follower", "die_follower"]

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.dist-info → rom24_quickmud_python-2.9.12.dist-info}/METADATA

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

@@ -31,11 +31,11 @@ mud/ai/__init__.py,sha256=9hQjzFxg8ZXlLZ3mYSrwhnqaDF_9RHieNLlLXk6Hi74,9923
 mud/ai/aggressive.py,sha256=YfD_DeRrLJjRcdwrNsex5hzoqoJB1kiSWS2vVjhPQEk,4177
 mud/characters/__init__.py,sha256=BTnH4-W4m7WtjqvOgiLK2BbgzBA0nPLKb71kaa1BnB4,1635
 mud/characters/conditions.py,sha256=h7anKi7gy-WqBjP15N761SqEehlAsj6tTp4qdd62W6w,1523
-mud/characters/follow.py,sha256=yP2cJ8WvqpWWebzOUfK5wauIQfdT5BL-ukuyax_Tni4,2751
+mud/characters/follow.py,sha256=einKP3qnYLJFs8BfM4aB2KlCrmmgC4gAo5yfE9-xyfM,3463
 mud/combat/__init__.py,sha256=YUphU7bKkxT3Qw0Gj2TcMmDoDyCYyRTQbHPCqKLjugE,215
 mud/combat/assist.py,sha256=_GDeuK0rfrXoELLNgTxBR1S8XdYIqcmPbTh8AinY9s8,7777
 mud/combat/death.py,sha256=FQlnvIBXMtnnhfP9M55RxtiOBheXuGuBZX-IimudGsY,19152
-mud/combat/engine.py,sha256=ZJXDT-aztRjDsj76auszE_XH7dKRVf2XOEZuKy5YMFs,62437
+mud/combat/engine.py,sha256=SnIHFdZMM3CEmpnXml8672qIKechrC-pmVJ1QDQ2xUI,62219
 mud/combat/kill_table.py,sha256=oR77me5GJLGXi3q5ZnQAdp3S5lsfJNhiCmaXOMQrNgA,1040
 mud/combat/messages.py,sha256=PVOYcOCHh4wW0P33ykbr6iYtFN8mottJ8W4S72E5pBM,7726
 mud/combat/safety.py,sha256=EcQdUbE_vUFEhKv5ZG86ba4mNd6VG1Bw1ZWQW2sGYTc,3019
@@ -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.10.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.9.10.dist-info/METADATA,sha256=yaPA3JHg0gV2YTFeEYTD-W_WYrH7SIRgjLOVQyGAQpQ,15671
-rom24_quickmud_python-2.9.10.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rom24_quickmud_python-2.9.10.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.9.10.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.9.10.dist-info/RECORD,,
+rom24_quickmud_python-2.9.12.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.9.12.dist-info/METADATA,sha256=gQ4LagRqS4_EU_4m8qeleWt5xLx5GvNysXwdOQl8JuQ,15671
+rom24_quickmud_python-2.9.12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rom24_quickmud_python-2.9.12.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.9.12.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.9.12.dist-info/RECORD,,