rom24-quickmud-python 2.5.2__py3-none-any.whl → 2.5.4__py3-none-any.whl

mud/__main__.py

@@ -31,7 +31,7 @@ def loadtestuser():
 
 
 @cli.command()
-def socketserver(host: str = "0.0.0.0", port: int = 5000):
+def socketserver(host: str = "0.0.0.0", port: int = 5001):
     """Start the telnet server."""
     asyncio.run(start_telnet(host=host, port=port))
 

mud/ai/__init__.py

@@ -16,7 +16,8 @@ from mud.models.constants import (
     EX_CLOSED,
 )
 from mud.models.obj import ObjectData
-from mud.models.room import Exit, Room, room_registry
+from mud.models.room import Exit, Room
+from mud.registry import room_registry
 from mud.utils import rng_mm
 from mud.world.movement import move_character
 
@@ -209,14 +210,20 @@ def _room_contents(room: Room | None) -> Iterable[ObjectData]:
 
 
 def _take_object(mob: Character, obj: ObjectData) -> None:
-    room = getattr(obj, "in_room", None) or getattr(mob, "room", None)
+    room = getattr(obj, "in_room", None) or getattr(obj, "location", None) or getattr(mob, "room", None)
     if room is not None:
         contents = getattr(room, "contents", None)
         if isinstance(contents, list) and obj in contents:
             contents.remove(obj)
-    obj.in_room = None
-    obj.in_obj = None
-    obj.carried_by = mob
+
+    if hasattr(obj, "in_room"):
+        obj.in_room = None
+    if hasattr(obj, "location"):
+        obj.location = None
+    if hasattr(obj, "in_obj"):
+        obj.in_obj = None
+    if hasattr(obj, "carried_by"):
+        obj.carried_by = mob
 
     inventory = getattr(mob, "inventory", None)
     if isinstance(inventory, list) and obj not in inventory:
@@ -280,9 +287,8 @@ def _maybe_wander(mob: Character, room: Room) -> None:
     if rng_mm.number_bits(3) != 0:
         return
 
-    door = rng_mm.number_bits(5)
-    if door > int(Direction.DOWN):
-        return
+    # ROM C mob_cmds.c:1274 uses number_door() for random direction
+    door = rng_mm.number_door()
 
     exit_obj = _valid_exit(room, door)
     if exit_obj is None:

mud/characters/follow.py

@@ -67,4 +67,18 @@ def stop_follower(follower: "Character") -> None:
     follower.leader = None
 
 
-__all__ = ["add_follower", "stop_follower"]
+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.
+    """
+    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)
+
+
+__all__ = ["add_follower", "stop_follower", "die_follower"]

mud/combat/death.py

@@ -145,7 +145,9 @@ def _is_floating_slot(slot: str | None, obj: Object) -> bool:
 
 
 def _format_corpse_labels(corpse: Object, name: str) -> None:
-    short_template = getattr(corpse.prototype, "short_descr", None) or getattr(corpse, "short_descr", "the corpse of %s")
+    short_template = getattr(corpse.prototype, "short_descr", None) or getattr(
+        corpse, "short_descr", "the corpse of %s"
+    )
     desc_template = getattr(corpse.prototype, "description", None) or getattr(
         corpse, "description", "The corpse of %s is lying here."
     )
@@ -216,11 +218,7 @@ def _broadcast_neighbor_cry(victim: Character) -> None:
     if room is None:
         return
 
-    message = (
-        "You hear something's death cry."
-        if getattr(victim, "is_npc", False)
-        else "You hear someone's death cry."
-    )
+    message = "You hear something's death cry." if getattr(victim, "is_npc", False) else "You hear someone's death cry."
 
     for exit_data in getattr(room, "exits", []) or []:
         if exit_data is None:
@@ -341,7 +339,7 @@ def death_cry(victim: Character) -> None:
 def _fallback_corpse(vnum: int, *, item_type: ItemType) -> Object:
     """Return a minimal corpse object when the real prototype is missing."""
 
-    proto = ObjIndex(vnum=vnum, short_descr="a corpse", description="The corpse of someone lies here.")
+    proto = ObjIndex(vnum=vnum, short_descr="the corpse of %s", description="The corpse of %s is lying here.")
     proto.item_type = int(item_type)
     corpse = Object(instance_id=None, prototype=proto)
     corpse.item_type = int(item_type)
@@ -368,19 +366,6 @@ def _strip_inventory(victim: Character) -> list[tuple[Object, bool]]:
     return items
 
 
-def _set_corpse_coins(corpse: Object, gold: int, silver: int) -> None:
-    """Persist coin totals on the corpse and mirror into ``value[0:2]``."""
-
-    corpse.gold = gold
-    corpse.silver = silver
-    values = list(getattr(corpse, "value", []) or [])
-    while len(values) < 2:
-        values.append(0)
-    values[0] = gold
-    values[1] = silver
-    corpse.value = values
-
-
 def _handle_corpse_item(
     corpse: Object,
     room,
@@ -445,9 +430,18 @@ def make_corpse(victim: Character) -> Object | None:
 
     gold = max(0, int(getattr(victim, "gold", 0) or 0))
     silver = max(0, int(getattr(victim, "silver", 0) or 0))
-    _set_corpse_coins(corpse, gold, silver)
-    victim.gold = max(0, int(getattr(victim, "gold", 0) or 0) - gold)
-    victim.silver = max(0, int(getattr(victim, "silver", 0) or 0) - silver)
+
+    # ROM C fight.c:1473-1478 - Create money object inside corpse
+    if gold > 0 or silver > 0:
+        from mud.handler import create_money
+
+        money_obj = create_money(gold, silver)
+        if money_obj:
+            corpse.contained_items.append(money_obj)
+            money_obj.location = None  # Inside corpse, not in room
+
+    victim.gold = 0
+    victim.silver = 0
 
     if not is_npc:
         _clear_player_flag(victim, PlayerFlag.CANLOOT)
@@ -557,16 +551,18 @@ def raw_kill(victim: Character) -> Object | None:
     """Handle character death by creating a corpse and removing the victim."""
 
     from mud.combat.engine import stop_fighting as _stop_fighting
-    
+    from mud.characters.follow import die_follower
+
     # Trigger death mobprog handled in apply_damage before raw_kill
     # ROM Reference: src/fight.c:1136-1180 (mp_death_trigger called before raw_kill)
-    
+
+    _nuke_pets(victim, room=getattr(victim, "room", None))
+    die_follower(victim)
     _stop_fighting(victim, True)
     death_cry(victim)
     corpse = make_corpse(victim)
 
     room = getattr(victim, "room", None)
-    _nuke_pets(victim, room)
     if room is not None:
         room.remove_character(victim)
 

mud/combat/engine.py

@@ -499,6 +499,20 @@ def apply_damage(
     if victim.position == Position.DEAD:
         return "Already dead."
 
+    # Set up fighting state BEFORE defense checks (ROM parity: src/fight.c:damage sets fighting before parry/dodge)
+    if victim != attacker:
+        if victim.position > Position.STUNNED:
+            if victim.fighting is None:
+                set_fighting(victim, attacker)
+                if getattr(victim, "is_npc", False):
+                    mobprog.mp_kill_trigger(victim, attacker)
+            if getattr(victim, "timer", 0) <= 4:
+                victim.position = Position.FIGHTING
+
+        if victim.position > Position.STUNNED:
+            if attacker.fighting is None:
+                set_fighting(attacker, victim)
+
     # Check for parry, dodge, and shield block following C src/fight.c:damage() order
     # These are checked AFTER hit determination but BEFORE damage application
     # Order is critical: shield_block → parry → dodge (per ROM C src/fight.c:one_hit)
@@ -533,23 +547,6 @@ def apply_damage(
         message_bundle = dam_message(attacker, victim, damage, dt, immune)
         _dispatch_damage_messages(attacker, victim, message_bundle)
 
-    # Set up fighting state if not already fighting
-    if victim != attacker:
-        # Victim starts fighting back if able
-        if victim.position > Position.STUNNED:
-            if victim.fighting is None:
-                set_fighting(victim, attacker)
-                if getattr(victim, "is_npc", False):
-                    mobprog.mp_kill_trigger(victim, attacker)
-            # Update victim to fighting position if timer allows
-            if getattr(victim, "timer", 0) <= 4:
-                victim.position = Position.FIGHTING
-
-        # Attacker starts fighting if not already
-        if victim.position > Position.STUNNED:
-            if attacker.fighting is None:
-                set_fighting(attacker, victim)
-
     if damage <= 0:
         if message_bundle and message_bundle.attacker:
             return message_bundle.attacker
@@ -752,30 +749,53 @@ def _object_has_wear_flag(obj, flag: WearFlag) -> bool:
 
 
 def _transfer_corpse_coins(attacker: Character, corpse) -> bool:
-    """Move coins from *corpse* to *attacker*, returning True when any moved."""
+    """Extract gold/silver from money objects and add to attacker's purse.
 
-    try:
-        gold = int(getattr(corpse, "gold", 0) or 0)
-    except (TypeError, ValueError):
-        gold = 0
-    try:
-        silver = int(getattr(corpse, "silver", 0) or 0)
-    except (TypeError, ValueError):
-        silver = 0
+    ROM Reference: src/fight.c auto_loot handles money extraction.
+    QuickMUD uses actual money objects (ItemType.MONEY) instead of corpse attributes.
+    Money objects may already be in attacker's inventory if AUTOLOOT moved them.
+    """
+    from mud.models.constants import ItemType
+
+    contained = list(getattr(corpse, "contained_items", []) or [])
+    attacker_inv = list(getattr(attacker, "inventory", []) or [])
 
-    if gold == 0 and silver == 0:
+    money_in_corpse = [obj for obj in contained if getattr(obj, "item_type", None) == int(ItemType.MONEY)]
+    money_in_inventory = [obj for obj in attacker_inv if getattr(obj, "item_type", None) == int(ItemType.MONEY)]
+
+    all_money_objects = money_in_corpse + money_in_inventory
+
+    if not all_money_objects:
         return False
 
-    attacker.gold = int(getattr(attacker, "gold", 0) or 0) + gold
-    attacker.silver = int(getattr(attacker, "silver", 0) or 0) + silver
-    corpse.gold = 0
-    corpse.silver = 0
-    values = list(getattr(corpse, "value", []) or [])
-    if len(values) < 2:
-        values.extend([0] * (2 - len(values)))
-    values[0] = 0
-    values[1] = 0
-    corpse.value = values
+    total_gold = 0
+    total_silver = 0
+
+    for money_obj in all_money_objects:
+        values = list(getattr(money_obj, "value", [0, 0]) or [0, 0])
+        while len(values) < 2:
+            values.append(0)
+
+        silver = int(values[0] or 0)
+        gold = int(values[1] or 0)
+
+        total_silver += silver
+        total_gold += gold
+
+        if money_obj in money_in_corpse:
+            try:
+                corpse.contained_items.remove(money_obj)
+            except (AttributeError, ValueError):
+                pass
+        else:
+            try:
+                attacker.remove_object(money_obj)
+            except (AttributeError, ValueError):
+                pass
+
+    attacker.gold = int(getattr(attacker, "gold", 0) or 0) + total_gold
+    attacker.silver = int(getattr(attacker, "silver", 0) or 0) + total_silver
+
     return True
 
 

mud/commands/admin_commands.py

@@ -34,6 +34,8 @@ def cmd_who(char: Character, args: str) -> str:
 
 
 def cmd_teleport(char: Character, args: str) -> str:
+    if char.level < 52:
+        return "You don't have permission to use this command."
     if not args.isdigit() or int(args) not in room_registry:
         return "Invalid room."
     target = room_registry[int(args)]

mud/commands/advancement.py

@@ -188,9 +188,17 @@ def do_practice(char: Character, args: str) -> str:
     new_value = min(adept, current + increment)
     char.skills[skill_key] = new_value
 
+    # ROM C parity: Send messages to both char and room (src/act_info.c:2767-2777)
     if new_value >= adept:
-        return f"You are now learned at {skill.name}."
-    return f"You practice {skill.name}."
+        char.messages.append(f"You are now learned at {skill.name}.")
+        if char.room:
+            char.room.broadcast(f"{char.name} is now learned at {skill.name}.", exclude=char)
+    else:
+        char.messages.append(f"You practice {skill.name}.")
+        if char.room:
+            char.room.broadcast(f"{char.name} practices {skill.name}.", exclude=char)
+
+    return ""
 
 
 def do_train(char: Character, args: str) -> str:

mud/commands/affects.py

@@ -3,6 +3,7 @@ Affects command - show active spell/affect effects on character.
 
 ROM Reference: src/act_info.c do_affects (lines 2300-2400)
 """
+
 from __future__ import annotations
 
 from mud.models.character import Character
@@ -43,56 +44,106 @@ _AFFECT_NAMES = {
 }
 
 
+def affect_loc_name(location: int) -> str:
+    """
+    Return ASCII name of an affect location.
+
+    ROM Reference: src/handler.c affect_loc_name (lines 2718-2775)
+
+    Args:
+        location: APPLY_* constant (0-25)
+
+    Returns:
+        Human-readable location name (e.g., "strength", "armor class", "hit roll")
+    """
+    # ROM C APPLY_* constants (src/merc.h lines 1205-1231)
+    APPLY_NAMES = {
+        0: "none",  # APPLY_NONE
+        1: "strength",  # APPLY_STR
+        2: "dexterity",  # APPLY_DEX
+        3: "intelligence",  # APPLY_INT
+        4: "wisdom",  # APPLY_WIS
+        5: "constitution",  # APPLY_CON
+        6: "sex",  # APPLY_SEX
+        7: "class",  # APPLY_CLASS
+        8: "level",  # APPLY_LEVEL
+        9: "age",  # APPLY_AGE
+        10: "height",  # APPLY_HEIGHT (not shown in ROM affect_loc_name)
+        11: "weight",  # APPLY_WEIGHT (not shown in ROM affect_loc_name)
+        12: "mana",  # APPLY_MANA
+        13: "hp",  # APPLY_HIT
+        14: "moves",  # APPLY_MOVE
+        15: "gold",  # APPLY_GOLD
+        16: "experience",  # APPLY_EXP
+        17: "armor class",  # APPLY_AC
+        18: "hit roll",  # APPLY_HITROLL
+        19: "damage roll",  # APPLY_DAMROLL
+        20: "saves",  # APPLY_SAVES / APPLY_SAVING_PARA
+        21: "save vs rod",  # APPLY_SAVING_ROD
+        22: "save vs petrification",  # APPLY_SAVING_PETRI
+        23: "save vs breath",  # APPLY_SAVING_BREATH
+        24: "save vs spell",  # APPLY_SAVING_SPELL
+        25: "none",  # APPLY_SPELL_AFFECT (returns "none" in ROM C)
+    }
+
+    return APPLY_NAMES.get(location, "(unknown)")
+
+
 def do_affects(char: Character, args: str) -> str:
     """
     Display active affects on the character.
-    
-    ROM Reference: src/act_info.c do_affects (lines 2300-2400)
-    
+
+    ROM Reference: src/act_info.c do_affects (lines 1714-1755)
+
     Usage: affects
+
+    Behavior:
+    - Level <20: Shows simple format (spell name only)
+    - Level 20+: Shows detailed format (modifier, location, duration)
+    - Stacked affects (same spell, multiple modifiers): Indented continuation lines
     """
-    lines = []
-    
-    # Check spell_effects (detailed spell effects with duration)
-    spell_effects = getattr(char, "spell_effects", {})
-    if spell_effects:
-        lines.append("You are affected by the following spells:")
-        for spell_name, effect in spell_effects.items():
-            duration = getattr(effect, "duration", -1)
-            if duration < 0:
-                lines.append(f"  {spell_name}: permanent")
+    # Primary ROM C behavior: iterate ch.affected list (AFFECT_DATA structures)
+    affected = getattr(char, "affected", [])
+
+    if not affected:
+        return "You are not affected by any spells."
+
+    lines = ["You are affected by the following spells:"]
+    paf_last = None
+
+    for paf in affected:
+        # Deduplication: check if same spell as previous affect
+        if paf_last and paf.type == paf_last.type:
+            if char.level >= 20:
+                # Level 20+: Show duplicate affects with indentation (22 spaces + ": ")
+                buf = " " * 22 + ": "
             else:
-                lines.append(f"  {spell_name}: {duration} hours remaining")
-    
-    # Check affect bitvector for built-in affects
-    affected_by = getattr(char, "affected_by", 0)
-    if affected_by:
-        if not spell_effects:
-            lines.append("You are affected by:")
+                # Level <20: Skip duplicate spells entirely
+                continue
         else:
-            lines.append("\nYou also have these affects:")
-        
-        for flag, name in _AFFECT_NAMES.items():
-            if affected_by & flag:
-                # Check if this isn't already shown in spell_effects
-                if name not in spell_effects:
-                    lines.append(f"  {name}")
-    
-    # Check for special conditions
-    if getattr(char, "position", 0) == 0:  # DEAD
-        lines.append("You are DEAD.")
-    
-    # Check for hunger/thirst (if applicable)
-    pcdata = getattr(char, "pcdata", None)
-    if pcdata:
-        hunger = getattr(pcdata, "condition", [0, 0, 0, 0])
-        if len(hunger) >= 2:
-            if hunger[0] == 0:  # COND_FULL
-                lines.append("You are hungry.")
-            if hunger[1] == 0:  # COND_THIRST
-                lines.append("You are thirsty.")
-    
-    if not lines:
-        return "You are not affected by any spells."
-    
+            # New spell: show spell name (left-aligned, 15 chars)
+            # TODO: Replace with proper skill_table[paf.type].name lookup when SN mapping is available
+            # For now, assume paf.type is already a skill name string (temporary until spell system updated)
+            spell_name = str(paf.type) if paf.type else "(unknown)"
+
+            buf = f"Spell: {spell_name:15s}"
+
+        # Level 20+: Show detailed modifier information
+        if char.level >= 20:
+            location_name = affect_loc_name(paf.location)
+
+            # ROM C line 1737: uses raw %d (no explicit + sign)
+            modifier_str = str(paf.modifier)
+
+            if paf.duration == -1:
+                duration_str = "permanently"
+            else:
+                duration_str = f"for {paf.duration} hours"
+
+            # ROM C line 1736: ": modifies..." (colon prefix)
+            buf += f": modifies {location_name} by {modifier_str} {duration_str}"
+
+        lines.append(buf)
+        paf_last = paf
+
     return "\n".join(lines)