rom24-quickmud-python 2.14.264__py3-none-any.whl → 2.14.298__py3-none-any.whl

mud/admin_logging/admin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -100,7 +100,7 @@ def log_admin_command(
     """
 
     Path("log").mkdir(exist_ok=True)
-    timestamp = datetime.now(UTC).isoformat().replace("+00:00", "Z")
+    timestamp = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
     sanitized = _sanitize_command_line(command_line)
     if character is not None:
         try:
@@ -132,7 +132,7 @@ def rotate_admin_log(today: datetime | None = None) -> Path:
     active = log_dir / "admin.log"
     if not active.exists():
         return active
-    dt = today or datetime.now(UTC)
+    dt = today or datetime.now(timezone.utc)
     dated = log_dir / f"admin-{dt.strftime('%Y%m%d')}.log"
     # Avoid clobbering: if dated file exists, append current log and remove active
     if dated.exists():

mud/combat/engine.py

@@ -688,6 +688,25 @@ def apply_damage(
     if victim.position == Position.DEAD:
         return "Already dead."
 
+    # FIGHT-093 — "Stop up any residual loopholes." (ROM src/fight.c:697-713).
+    # A physical hit (dt >= TYPE_HIT) dealing more than 1200 raw damage is clamped
+    # to 1200; a non-immortal attacker is penalized with "You really shouldn't
+    # cheat." and has their wielded weapon extracted from the game (extract_obj).
+    # This runs before the >35/>80 reduction, exactly as in ROM.
+    if damage > 1200 and _should_check_weapon_defenses(dt):
+        damage = 1200
+        is_imm = getattr(attacker, "is_immortal", None)
+        attacker_immortal = bool(is_imm()) if callable(is_imm) else False
+        if not attacker_immortal:
+            # mirroring ROM src/fight.c:707-711 — get_eq_char(ch, WEAR_WIELD) then
+            # send "You really shouldn't cheat." and extract_obj on the weapon.
+            weapon = get_wielded_weapon(attacker)
+            _push_message(attacker, "You really shouldn't cheat.")
+            if weapon is not None:
+                from mud.game_loop import _extract_obj
+
+                _extract_obj(weapon)
+
     # mirroring ROM src/fight.c:717-720 — damage soft-cap applied before all other
     # modifiers; reduces raw spikes to prevent instant-kill from single high-damage hits.
     if damage > 35:

mud/commands/character.py

@@ -38,7 +38,8 @@ def do_password(ch: Character, args: str) -> str:
     parts = args.split(None, 1)
 
     if len(parts) < 2:
-        return "Syntax: password <old> <new>"
+        # PASSWORD-002: ROM src/act_info.c:2889 — trailing period.
+        return "Syntax: password <old> <new>."
 
     old_password = parts[0]
     new_password = parts[1]
@@ -57,7 +58,8 @@ def do_password(ch: Character, args: str) -> str:
         # The macro is UMAX(ch->wait, 40); a plain `= 40` would lower a higher
         # existing wait. Use the canonical UMAX helper.
         apply_wait_state(ch, 40)
-        return "Wrong password. Wait 10 seconds."
+        # PASSWORD-002: ROM src/act_info.c:2896 — TWO spaces after "password.".
+        return "Wrong password.  Wait 10 seconds."
 
     # Gap 1 (P1): Check minimum length (ROM src/act_info.c:2897-2904)
     if len(new_password) < 5:

mud/commands/combat.py

@@ -11,6 +11,7 @@ from mud.models.character import Character
 from mud.models.constants import (
     AC_BASH,
     EX_CLOSED,
+    LEVEL_HERO,
     LEVEL_IMMORTAL,
     ActFlag,
     AffectFlag,
@@ -45,6 +46,9 @@ _FLEE_MOVEMENT_LOSS: dict[Sector, int] = {
     Sector.DESERT: 6,
 }
 
+# mirroring ROM src/act_move.c dir_name[] — indexed by door number (0..5).
+_FLEE_DIR_NAMES: tuple[str, ...] = ("north", "east", "south", "west", "up", "down")
+
 
 def _kill_safety_message(attacker: Character, victim: Character) -> str | None:
     # FIGHT-074: pure mirror of ROM's is_safe() (src/fight.c:1059) — which contains
@@ -171,10 +175,10 @@ def do_kill(char: Character, args: str) -> str:
 
 
 def do_kick(char: Character, args: str) -> str:
-    opponent = getattr(char, "fighting", None)
-    if opponent is None:
-        return "You aren't fighting anyone."
-
+    # KICK-001: ROM do_kick (src/fight.c:3109-3124) checks the PC level gate and
+    # NPC OFF_KICK gate BEFORE the `fighting == NULL` check, so a sub-level PC who
+    # is not fighting sees "You better leave the martial arts to fighters.", not
+    # "You aren't fighting anyone." The `fighting is None` check is relocated below.
     try:
         skill = skill_registry.get("kick")
     except KeyError:
@@ -204,6 +208,12 @@ def do_kick(char: Character, args: str) -> str:
         if required_level is not None and getattr(char, "level", 0) < required_level:
             return "You better leave the martial arts to fighters."
 
+    # KICK-001: ROM src/fight.c:3121-3124 — `fighting == NULL` check comes AFTER
+    # the level/OFF_KICK gates.
+    opponent = getattr(char, "fighting", None)
+    if opponent is None:
+        return "You aren't fighting anyone."
+
     if skill is not None:
         if int(getattr(char, "wait", 0) or 0) > 0:
             # INV-001 SINGLE-DELIVERY: return-channel only; a mailbox append would
@@ -815,8 +825,20 @@ def do_flee(char: Character, args: str) -> str:
                 continue  # too exhausted — mirrors move_char returning without moving
             flee_move_cost = cost
 
+        # MOVE-009: ROM src/fight.c:3002 flees via move_char(ch, door, FALSE),
+        # which broadcasts "$n leaves $T." to the fled-from room and "$n has
+        # arrived." to the destination (src/act_move.c:196-202) — suppressed for
+        # a sneaking or wizinvis fleer. The inline flee move omitted both.
+        show_movement = not (
+            char.has_affect(AffectFlag.SNEAK) or int(getattr(char, "invis_level", 0) or 0) >= LEVEL_HERO
+        )
+        dir_name = _FLEE_DIR_NAMES[door] if door < len(_FLEE_DIR_NAMES) else ""
+        if show_movement:
+            act_to_room(was_in, "$n leaves $T.", char, arg2=dir_name, exclude=char)
         was_in.remove_character(char)
         new_room.add_character(char)
+        if show_movement:
+            act_to_room(new_room, "$n has arrived.", char, exclude=char)
         now_in = new_room
         break
 
@@ -1202,7 +1224,8 @@ def do_trip(char: Character, args: str, *, victim: Character | None = None) -> s
     else:
         skill_level = _character_skill_percent(char, "trip")
         if skill_level == 0:
-            return "Tripping? What's that?"
+            # TRIP-001: ROM src/fight.c:2654 — TWO spaces after "Tripping?".
+            return "Tripping?  What's that?"
 
     # Find target (skip when an explicit victim is supplied via delegation).
     if victim is not None:

mud/commands/compare.py

@@ -38,7 +38,10 @@ def do_compare(char: Character, args: str) -> str:
         # Compare two items
         obj2 = get_obj_carry(char, parts[1])
         if obj2 is None:
-            return "You do not have that second item."
+            # COMPARE-002: ROM src/act_info.c:2338-2341 emits the SAME string as
+            # the missing-first-item branch (:2317) — not a distinct "second item"
+            # variant. The faithful port must reuse "You do not have that item.".
+            return "You do not have that item."
     else:
         # Compare against equipped item of same type
         obj2 = _find_equipped_match(char, obj1)

mud/commands/doors.py

@@ -378,11 +378,14 @@ def do_lock(char: Character, args: str) -> str:
 
         # Container (ROM C lines 627-656)
         if item_type == ItemType.CONTAINER:
-            if not (values[1] & ContainerFlag.CLOSEABLE):
-                return "You can't do that."
+            # LOCK-001: ROM do_lock's container arm has NO CONT_CLOSEABLE check
+            # (only do_open/do_close do — MOVE-008). Its first guard is CONT_CLOSED.
             if not (values[1] & ContainerFlag.CLOSED):
                 return "It's not closed."
-            if values[2] <= 0:  # No key defined
+            # LOCK-002: ROM src/act_move.c:637 gates on `value[2] < 0`. Key vnum 0
+            # (a keyless container) falls through to has_key → "You lack the key.",
+            # matching the portal sibling arm above (which already uses `< 0`).
+            if values[2] < 0:
                 return "It can't be locked."
             if not _has_key(char, values[2]):
                 return "You lack the key."
@@ -483,11 +486,12 @@ def do_unlock(char: Character, args: str) -> str:
 
         # Container (ROM C lines 761-791)
         if item_type == ItemType.CONTAINER:
-            if not (values[1] & ContainerFlag.CLOSEABLE):
-                return "You can't do that."
+            # LOCK-001: ROM do_unlock's container arm has NO CONT_CLOSEABLE check
+            # (only do_open/do_close do — MOVE-008). Its first guard is CONT_CLOSED.
             if not (values[1] & ContainerFlag.CLOSED):
                 return "It's not closed."
-            if values[2] <= 0:  # No key defined
+            # LOCK-002: ROM src/act_move.c:773 gates on `value[2] < 0` (see do_lock).
+            if values[2] < 0:
                 return "It can't be unlocked."
             if not _has_key(char, values[2]):
                 return "You lack the key."

mud/commands/equipment.py

@@ -18,6 +18,25 @@ if TYPE_CHECKING:
     from mud.models.object import Object
 
 
+# WEAR-015: wear-location flags checked BEFORE the HOLD branch in ROM `wear_obj`
+# (every bit below HOLD's 1<<14 except WIELD, which Python dispatches by
+# item_type). An object carrying any of these takes the armor/shield slot, not HOLD.
+_PRE_HOLD_WEAR_MASK = (
+    WearFlag.WEAR_FINGER
+    | WearFlag.WEAR_NECK
+    | WearFlag.WEAR_BODY
+    | WearFlag.WEAR_HEAD
+    | WearFlag.WEAR_LEGS
+    | WearFlag.WEAR_FEET
+    | WearFlag.WEAR_HANDS
+    | WearFlag.WEAR_ARMS
+    | WearFlag.WEAR_SHIELD
+    | WearFlag.WEAR_ABOUT
+    | WearFlag.WEAR_WAIST
+    | WearFlag.WEAR_WRIST
+)
+
+
 # ROM str_app wield column for STR 0..25.
 # Source: src/const.c:728 str_app[26], fourth field (wield).
 # Max wieldable weight = _STR_WIELD[STR] * 10 (ROM src/act_obj.c:1624-1625).
@@ -141,6 +160,35 @@ def _can_wear_alignment(ch: Character, obj: Object) -> tuple[bool, str | None]:
     return True, None
 
 
+def _zap_align(ch: Character, obj: Object) -> str:
+    """ROM `equip_char` alignment zap — WEAR-014 (src/handler.c:1765-1777).
+
+    When an evil PC dons an ITEM_ANTI_EVIL object (or good+ANTI_GOOD /
+    neutral+ANTI_NEUTRAL), ROM does NOT keep the item in inventory. `equip_char`
+    emits a TO_CHAR + TO_ROOM message using `$p` (the object's short_descr) and
+    drops the item to the floor (`obj_from_char` + `obj_to_room`). The prior
+    Python returned a generic "the item" message, emitted no room line, and left
+    the item CARRIED — a state divergence a player could observe (the item stays
+    in inventory instead of lying on the ground).
+
+    Residual: ROM prints the "You wear $p ..." line *before* the zap (the zap
+    lives in equip_char, called after the wear message). Python checks alignment
+    up-front, so it emits only the zap line — a minor cosmetic ordering residual;
+    the observable state (item on the floor) now matches ROM.
+    """
+    from mud.commands.obj_manipulation import _obj_from_char
+
+    obj_name = getattr(obj, "short_descr", None) or getattr(obj, "name", None) or "it"
+    room = getattr(ch, "room", None)
+    _obj_from_char(ch, obj)  # ROM obj_from_char (src/handler.c:1771)
+    if room is not None:
+        room.add_object(obj)  # ROM obj_to_room (src/handler.c:1772)
+        # ROM src/handler.c:1770 — act("$n is zapped by $p and drops it.", TO_ROOM)
+        act_to_room(room, "$n is zapped by $p and drops it.", ch, arg1=obj, exclude=ch)
+    # ROM src/handler.c:1769 — act("You are zapped by $p and drop it.", TO_CHAR)
+    return f"You are zapped by {obj_name} and drop it."
+
+
 def do_wear(ch: Character, args: str) -> str:
     """
     Wear equipment (armor, clothing, jewelry).
@@ -232,9 +280,9 @@ def _wear_obj(ch: Character, obj: Object, fReplace: bool = True) -> str:
                 return f"You can't remove {existing_name}."
 
         # Alignment zap (mirrors the HOLD/wear paths' _can_wear_alignment block).
-        can_wear, error_msg = _can_wear_alignment(ch, obj)
+        can_wear, _ = _can_wear_alignment(ch, obj)
         if not can_wear:
-            return error_msg or "You cannot hold that item."
+            return _zap_align(ch, obj)  # WEAR-014: drop to room per ROM equip_char
 
         if not equipment:
             ch.equipment = {}
@@ -258,8 +306,14 @@ def _wear_obj(ch: Character, obj: Object, fReplace: bool = True) -> str:
     # then performs the two-hand-weapon check. Implemented below after the
     # generic slot-remove (search "WEAR-009 SHIELD post-check").
 
-    # Check if item has HOLD flag - if so, use hold logic (ROM lines 1670-1677)
-    if wear_flags & WearFlag.HOLD:
+    # Check if item has HOLD flag - if so, use hold logic (ROM lines 1670-1677).
+    # WEAR-015: ROM `wear_obj` dispatches wear flags in bit order, so every
+    # armor/shield slot (WEAR_FINGER..WEAR_WRIST, WEAR_SHIELD — all bits below
+    # HOLD's 1<<14) is checked BEFORE the HOLD branch. Only fall to HOLD when the
+    # object has NO earlier wear-location flag; otherwise let `_get_wear_location`
+    # place it in the armor slot (matching ROM's precedence). WIELD (1<<13) is
+    # item_type-dispatched separately above, so it's excluded from this mask.
+    if (wear_flags & WearFlag.HOLD) and not (wear_flags & _PRE_HOLD_WEAR_MASK):
         # Check if hold slot is occupied
         equipment = getattr(ch, "equipment", {})
         hold_loc = int(WearLocation.HOLD)
@@ -274,9 +328,9 @@ def _wear_obj(ch: Character, obj: Object, fReplace: bool = True) -> str:
                 return f"You can't remove {existing_name}."
 
         # Check alignment restrictions
-        can_hold, error_msg = _can_wear_alignment(ch, obj)
+        can_hold, _ = _can_wear_alignment(ch, obj)
         if not can_hold:
-            return error_msg or "You cannot hold that item."
+            return _zap_align(ch, obj)  # WEAR-014: drop to room per ROM equip_char
 
         # Hold the item
         if not equipment:
@@ -348,11 +402,11 @@ def _wear_obj(ch: Character, obj: Object, fReplace: bool = True) -> str:
                     return "Your hands are tied up with your weapon!"
 
     # Check alignment restrictions (ROM src/handler.c:1765-1777)
-    can_wear, error_msg = _can_wear_alignment(ch, obj)
+    can_wear, _ = _can_wear_alignment(ch, obj)
     if not can_wear:
-        # In ROM, the zap happens in equip_char and item drops to room
-        # For now, just prevent wearing with error message
-        return error_msg or "You cannot wear that item."
+        # WEAR-014: ROM's zap (equip_char) drops the item to the room and emits
+        # a $p-substituted TO_CHAR + TO_ROOM message — not a generic in-inventory error.
+        return _zap_align(ch, obj)
 
     # Wear the item
     if not equipment:
@@ -423,9 +477,9 @@ def _dispatch_wield(ch: Character, obj: Object, fReplace: bool = True) -> str:
         if weight > _str_wield_max(str_stat):
             return "It is too heavy for you to wield."
 
-    can_wield, error_msg = _can_wear_alignment(ch, obj)
+    can_wield, _ = _can_wear_alignment(ch, obj)
     if not can_wield:
-        return error_msg or "You cannot wield that weapon."
+        return _zap_align(ch, obj)  # WEAR-014: drop to room per ROM equip_char
 
     # ROM src/act_obj.c:1631-1636 — two-hand vs shield check skipped for NPCs
     # and for characters of SIZE_LARGE or greater.
@@ -435,7 +489,9 @@ def _dispatch_wield(ch: Character, obj: Object, fReplace: bool = True) -> str:
         if weapon_flags[4] & WeaponFlag.TWO_HANDS:
             shield_loc = int(WearLocation.SHIELD)
             if shield_loc in equipment and equipment[shield_loc] is not None:
-                return "You need two hands free for that weapon!"
+                # WEAR-013: ROM src/act_obj.c:1635 ends this with a PERIOD, not a
+                # "!" (unlike the shield-branch "...weapon!" at :1606).
+                return "You need two hands free for that weapon."
 
     if not equipment:
         ch.equipment = {}

mud/commands/healer.py

@@ -240,7 +240,12 @@ def do_heal(char: Character, args: str = "") -> str:
 
     arg = (args or "").strip().lower()
     if not arg:
-        lines = [f"{_healer_name(healer)} says 'I offer the following spells:'"]
+        # HEALER-007: ROM src/healer.c:67 — act("$N says 'I offer the following
+        # spells:'", ...); act_new (src/comm.c:2379) capitalizes buf[0], so a
+        # lowercase-initial short_descr renders "A healer says ...". Match the
+        # sibling "not enough gold" branch (capitalize_act_line, INV-029/ACT-CAP).
+        header = capitalize_act_line(f"{_healer_name(healer)} says 'I offer the following spells:'")
+        lines = [header]
         lines.extend(service.display_line for service in _SERVICES)
         lines.append(" Type heal <type> to be healed.")
         return "\n".join(lines)

mud/commands/info.py

@@ -353,8 +353,13 @@ def do_where(char: Character, args: str) -> str:
 
         found = False
 
-        # ROM C iterates char_list for all characters (NPCs + players)
-        for victim in character_registry:
+        # ROM C iterates char_list from the head and returns the FIRST match
+        # (src/act_info.c:2445, with `break`). ROM head-inserts new chars into
+        # char_list (`create_mobile`, src/db.c:2256-2257), so a head-first walk is
+        # newest-first. Python `character_registry` is append-ordered (oldest
+        # first), so we iterate it reversed to reproduce ROM's newest-first match
+        # when several same-named mobs share an area (FINDING-044).
+        for victim in reversed(character_registry):
             victim_room = getattr(victim, "room", None)
             if not victim_room:
                 continue

mud/commands/inspection.py

@@ -4,7 +4,7 @@ from mud.models.character import Character
 from mud.models.constants import Direction
 from mud.utils.act import act_to_room
 from mud.world.look import dir_names, look
-from mud.world.vision import can_see_character, describe_character
+from mud.world.vision import can_see_character, pers
 
 
 def do_scan(char: Character, args: str = "") -> str:
@@ -61,7 +61,11 @@ def do_scan(char: Character, args: str = "") -> str:
                 continue
             if not can_see_character(char, p):
                 continue
-            who = describe_character(char, p)
+            # ROM scan_char (src/scan.c:133) uses PERS(victim, ch) — the bare
+            # short_descr/name, NOT show_char_to_char aura tags. describe_character
+            # injects (Pink/White Aura) prefixes, which ROM's scan never shows
+            # (FINDING-042).
+            who = pers(p, char)
             if depth == 0:
                 lines.append(f"{who}, {distance[0]}")
             else:

mud/commands/inventory.py

@@ -810,6 +810,18 @@ def _show_inventory_list(objects: list[Object], char: Character, show_nothing: b
         else:
             return "Nothing.\n"
 
+    # INVEN-001: ROM show_list_to_char formats each object via
+    # format_obj_to_char(obj, ch, fShort) (src/act_info.c:166), which prepends
+    # the object status tags ((Invis)/(Red Aura)/(Blue Aura)/(Magical)/(Glowing)/
+    # (Humming)) before the short_descr. That prefixed string is ALSO the
+    # combine/dedup key (strcmp at :180), so a glowing item and a plain identical
+    # item render as two separate lines instead of coalescing. Bare short_descr
+    # dropped the prefixes AND keyed the dedup on the wrong (prefix-blind) string.
+    from mud.utils.act import format_obj_to_char
+
+    def _display_name(obj: Object) -> str:
+        return format_obj_to_char(obj, char, f_short=True) or obj.short_descr or obj.name or "something"
+
     # Format objects (ROM C lines 162-225)
     if combine_enabled:
         # Combine duplicate objects (ROM C lines 170-195)
@@ -817,8 +829,8 @@ def _show_inventory_list(objects: list[Object], char: Character, show_nothing: b
         object_order: list[str] = []
 
         for obj in visible_objects:
-            # Get object description (short description)
-            obj_desc = obj.short_descr or obj.name or "something"
+            # Get object description (prefix-inclusive, per ROM dedup key)
+            obj_desc = _display_name(obj)
 
             # ROM C lines 176-184: Look for duplicates (case sensitive)
             if obj_desc in object_counts:
@@ -844,8 +856,7 @@ def _show_inventory_list(objects: list[Object], char: Character, show_nothing: b
         # No combining: show each object on separate line (ROM C lines 222-223)
         lines = []
         for obj in visible_objects:
-            obj_desc = obj.short_descr or obj.name or "something"
-            lines.append(obj_desc)
+            lines.append(_display_name(obj))
 
         return "\n".join(lines) + "\n"
 
@@ -912,8 +923,14 @@ def do_equipment(char: Character, args: str = "") -> str:
 
         # ROM C line 2277: if (can_see_obj (ch, obj))
         if can_see_object(char, obj):
-            # ROM C line 2279: format_obj_to_char (obj, ch, TRUE)
-            obj_name = obj.short_descr or obj.name or "object"
+            # EQUIP-002: ROM C line 2279 renders worn items via
+            # format_obj_to_char(obj, ch, TRUE), which prepends the object
+            # status tags ((Invis)/(Red Aura)/(Blue Aura)/(Magical)/(Glowing)/
+            # (Humming)) before the short_descr. The bare short_descr dropped
+            # every status prefix from `equipment` output.
+            from mud.utils.act import format_obj_to_char
+
+            obj_name = format_obj_to_char(obj, char, f_short=True) or obj.short_descr or obj.name or "object"
         else:
             # ROM C line 2283: send_to_char ("something.\n\r", ch);
             obj_name = "something."

mud/commands/obj_manipulation.py

@@ -265,9 +265,9 @@ def do_put(char: Character, args: str) -> str:
                     messages.append(f"You put {obj_short} in {container_short}.")
             count += 1
 
-        if count == 0:
-            return "You have nothing to put."
-
+        # PUT-005: ROM do_put's put-all branch (src/act_obj.c:451-491) is a bare
+        # loop with no `found` flag and no trailing message — nothing eligible ⇒
+        # ROM prints nothing. The prior "You have nothing to put." was non-ROM.
         return "\n".join(messages)
 
 

mud/commands/session.py

@@ -149,15 +149,18 @@ def do_score(ch: Character, args: str) -> str:
         lines.append(f"You have {practice} practices and {train} training sessions.")
 
     # Carrying - ROM src/act_info.c:1514-1518 (immediately after practices)
-    carry_weight = getattr(ch, "carry_weight", 0)
     carry_number = getattr(ch, "carry_number", 0)
-    from mud.world.movement import can_carry_n, can_carry_w
+    from mud.world.movement import can_carry_n, can_carry_w, get_carry_weight
 
+    # SCORE-002: ROM src/act_info.c:1517 prints `get_carry_weight (ch) / 10`,
+    # which adds coin weight (`silver/10 + gold*2/5`, src/merc.h:2118) to the
+    # raw item weight. Using bare `ch.carry_weight` dropped coin burden from the
+    # score sheet. get_carry_weight is non-negative, so `// 10` == C truncation.
     max_carry_number = can_carry_n(ch)
     max_carry_weight = can_carry_w(ch) // 10  # ROM divides by 10 for display
     lines.append(
         f"You are carrying {carry_number}/{max_carry_number} items "
-        f"with weight {carry_weight // 10}/{max_carry_weight} pounds."
+        f"with weight {get_carry_weight(ch) // 10}/{max_carry_weight} pounds."
     )
 
     # Stats - ROM src/act_info.c:1520-1531 (perm(current) per stat).
@@ -339,15 +342,21 @@ def do_recall(ch: Character, args: str) -> str:
     ROM Reference: src/act_move.c lines 1563-1628 (do_recall)
     """
     from mud.combat.engine import stop_fighting
-    from mud.models.constants import ROOM_VNUM_TEMPLE, AffectFlag, RoomFlag
+
+    # RECALL-003: NPCs can't recall unless they carry ACT_PET (ROM
+    # src/act_move.c:1569-1573 — `IS_NPC(ch) && !IS_SET(ch->act, ACT_PET)`), and
+    # ROM `send_to_char("Only players can recall.")` then returns — it does NOT
+    # return silently, and it gates on the ACT_PET *flag*, not on `master` (a
+    # charmed non-pet mob is still blocked). The prior code returned "" and keyed
+    # on `master`, so a charmed non-pet mob would wrongly recall and no message
+    # was shown when an NPC path (e.g. a switched immortal) hit this.
+    from mud.models.constants import ROOM_VNUM_TEMPLE, ActFlag, AffectFlag, RoomFlag
     from mud.registry import room_registry
     from mud.utils.rng_mm import number_percent
 
-    # NPCs can't recall unless they're pets (ROM C lines 1569-1573).
-    # ROM uses IS_NPC + IS_AFFECTED(AFF_CHARM); the QuickMUD analogue is an NPC
-    # that has a master (i.e. it's been charmed/owned).
-    if ch.is_npc and getattr(ch, "master", None) is None:
-        return ""  # ROM returns silently (src/act_move.c:1569-1573)
+    act_flags = int(getattr(ch, "act", 0) or 0)
+    if ch.is_npc and not (act_flags & int(ActFlag.PET)):
+        return "Only players can recall."
 
     # Message to room FIRST (ROM C line 1575)
     if ch.room:

mud/commands/socials.py

@@ -57,8 +57,11 @@ def perform_social(char: Character, name: str, arg: str) -> str:
     if position == Position.STUNNED:
         return "You are too stunned to do that."
     # mirroring ROM src/interp.c:618-626 — POS_SLEEPING blocks every social
-    # except "snore" (the canonical Furey exception).
-    if position == Position.SLEEPING and name.lower() != "snore":
+    # except "snore" (the canonical Furey exception). SOCIAL-001: ROM compares
+    # the RESOLVED social's name (`social_table[cmd].name`, interp.c:623), NOT
+    # the typed argument, so a prefix like "snor" that resolves to snore is also
+    # allowed while asleep. `social` was already resolved via find_social above.
+    if position == Position.SLEEPING and social.name.lower() != "snore":
         return "In your dreams, or what?"
     victim = None
     if arg:

mud/skills/handlers.py

@@ -1328,53 +1328,53 @@ def bash(
         raise ValueError("bash requires both caster and target")
 
     bash_type = int(DamageType.BASH)
-    caster_name = _character_name(caster)
-    target_name = _character_name(target)
     room = getattr(caster, "room", None)
 
+    # BASH-001: ROM do_bash (src/fight.c:2460-2482) calls damage(..., FALSE) on
+    # BOTH branches — show=FALSE suppresses the dam_message, so the three {5..{x
+    # flavor act() lines are the only output. The attacker's TO_CHAR flavor line
+    # is the command return; TO_VICT/TO_NOTVICT are pushed. apply_damage(show=False)
+    # pushes nothing, so returning the flavor line is single-delivery (no double).
     if not success:
-        # mirroring ROM src/fight.c:2478-2481 — failure broadcasts
+        # ROM src/fight.c:2477-2481 — damage() first, then TO_CHAR/TO_NOTVICT/TO_VICT.
+        apply_damage(caster, target, 0, bash_type, dt="bash", show=False)
         if room is not None:
-            caster_his = _possessive_pronoun(caster)
-            caster_him = _objective_pronoun(caster)
-            _notvict_broadcast(
-                room,
-                caster,
-                target,
-                f"{caster_name} falls flat on {caster_his} face.",
-            )
+            act_to_room(room, "{5$n falls flat on $s face.{x", caster, exclude=caster)
             _to_vict_send(
                 target,
-                f"You evade {caster_name}'s bash, causing {caster_him} to fall flat on {caster_his} face.",
+                act_format(
+                    "{5You evade $n's bash, causing $m to fall flat on $s face.{x",
+                    recipient=target,
+                    actor=caster,
+                    arg2=target,
+                ),
             )
-        return apply_damage(caster, target, 0, bash_type, dt="bash")
+        return act_format("{5You fall flat on your face!{x", recipient=caster, actor=caster, arg2=target)
 
     chance = int(chance or 0)
     size = max(0, int(getattr(caster, "size", 0) or 0))
     upper = 2 + 2 * size + c_div(chance, 20)
     damage = rng_mm.number_range(2, max(2, upper))
 
-    # mirroring ROM src/fight.c:2459-2465 — success broadcasts
+    # ROM src/fight.c:2460-2465 — success broadcasts ({5..{x, PERS-rendered).
     if room is not None:
         _to_vict_send(
             target,
-            f"{caster_name} sends you sprawling with a powerful bash!",
-        )
-        _notvict_broadcast(
-            room,
-            caster,
-            target,
-            f"{caster_name} sends {target_name} sprawling with a powerful bash.",
+            act_format("{5$n sends you sprawling with a powerful bash!{x", recipient=target, actor=caster, arg2=target),
         )
+        act_to_room(room, "{5$n sends $N sprawling with a powerful bash.{x", caster, arg2=target, exclude=target)
 
-    # DAZE_STATE in ROM applies 3 * PULSE_VIOLENCE to the victim.
+    # DAZE_STATE(victim, 3 * PULSE_VIOLENCE); ROM :2470-2472 position=RESTING then
+    # damage(show=FALSE) (dam_message suppressed).
     from mud.config import get_pulse_violence
 
     victim_daze = 3 * get_pulse_violence()
     target.daze = max(int(getattr(target, "daze", 0) or 0), victim_daze)
-    result = apply_damage(caster, target, damage, bash_type, dt="bash")
+    apply_damage(caster, target, damage, bash_type, dt="bash", show=False)
+    # ROM sets POS_RESTING before damage() (:2470); in Python apply_damage's
+    # set_fighting resets position, so RESTING is applied AFTER to make it stick.
     target.position = Position.RESTING
-    return result
+    return act_format("{5You slam into $N, and send $M flying!{x", recipient=caster, actor=caster, arg2=target)
 
 
 def berserk(
@@ -3559,16 +3559,114 @@ def dispel_magic(caster: Character, target: Character | None = None) -> bool:
         _send_to_char(caster, "You failed.")
         return False
 
-    effects = getattr(target, "spell_effects", {})
-    if not isinstance(effects, dict) or not effects:
-        return False
+    # MAGIC-050: ROM spell_dispel_magic (src/magic.c:2089-2247) walks a FIXED
+    # hardcoded spell list in order — not the spell_effects dict — calling
+    # check_dispel per spell, with per-effect act(TO_ROOM) wear-off lines for
+    # certain spells, an AFF_SANCTUARY-bit fallback, and a final Ok./Spell failed.
+    # to the caster. The dict-iteration port lost the order, the room messages,
+    # the sanctuary-bit strip, and the result message. This mirrors the sibling
+    # `cancellation` walk (same list) minus its NPC gate and level+2.
+    found = False
+    room = getattr(target, "room", None)
+
+    def _dispel(effect_name: str) -> bool:
+        return check_dispel(level, target, effect_name)
+
+    if _dispel("armor"):
+        found = True
+    if _dispel("bless"):
+        found = True
+    if _dispel("blindness"):
+        found = True
+        act_to_room(room, "$n is no longer blinded.", target, exclude=target)
+    if _dispel("calm"):
+        found = True
+        act_to_room(room, "$n no longer looks so peaceful...", target, exclude=target)
+    if _dispel("change_sex"):
+        found = True
+        act_to_room(room, "$n looks more like $mself again.", target, exclude=target)
+    if _dispel("charm_person"):
+        found = True
+        act_to_room(room, "$n regains $s free will.", target, exclude=target)
+    if _dispel("chill_touch"):
+        found = True
+        act_to_room(room, "$n looks warmer.", target, exclude=target)
+    if _dispel("curse"):
+        found = True
+    if _dispel("detect_evil"):
+        found = True
+    if _dispel("detect_good"):
+        found = True
+    if _dispel("detect_hidden"):
+        found = True
+    if _dispel("detect_invis"):
+        found = True
+    if _dispel("detect_magic"):
+        found = True
+    if _dispel("faerie_fire"):
+        act_to_room(room, "$n's outline fades.", target, exclude=target)
+        found = True
+    if _dispel("fly"):
+        act_to_room(room, "$n falls to the ground!", target, exclude=target)
+        found = True
+    if _dispel("frenzy"):
+        act_to_room(room, "$n no longer looks so wild.", target, exclude=target)
+        found = True
+    if _dispel("giant_strength"):
+        act_to_room(room, "$n no longer looks so mighty.", target, exclude=target)
+        found = True
+    if _dispel("haste"):
+        act_to_room(room, "$n is no longer moving so quickly.", target, exclude=target)
+        found = True
+    if _dispel("infravision"):
+        found = True
+    if _dispel("invis"):
+        act_to_room(room, "$n fades into existance.", target, exclude=target)
+        found = True
+    if _dispel("mass_invis"):
+        act_to_room(room, "$n fades into existance.", target, exclude=target)
+        found = True
+    if _dispel("pass_door"):
+        found = True
+    if _dispel("protection_evil"):
+        found = True
+    if _dispel("protection_good"):
+        found = True
+    if _dispel("sanctuary"):
+        act_to_room(room, "The white aura around $n's body vanishes.", target, exclude=target)
+        found = True
+    # ROM src/magic.c:2209-2217 — an AFF_SANCTUARY *bit* not backed by a
+    # "sanctuary" spell effect (innate/item) is stripped on a failed saves_dispel.
+    if (
+        target.has_affect(AffectFlag.SANCTUARY)
+        and not saves_dispel(level, int(getattr(target, "level", 0) or 0), -1)
+        and "sanctuary" not in getattr(target, "spell_effects", {})
+    ):
+        target.remove_affect(AffectFlag.SANCTUARY)
+        act_to_room(room, "The white aura around $n's body vanishes.", target, exclude=target)
+        found = True
+    if _dispel("shield"):
+        act_to_room(room, "The shield protecting $n vanishes.", target, exclude=target)
+        found = True
+    if _dispel("sleep"):
+        found = True
+    if _dispel("slow"):
+        act_to_room(room, "$n is no longer moving so slowly.", target, exclude=target)
+        found = True
+    if _dispel("stone_skin"):
+        act_to_room(room, "$n's skin regains its normal texture.", target, exclude=target)
+        found = True
+    if _dispel("weaken"):
+        act_to_room(room, "$n looks stronger.", target, exclude=target)
+        found = True
 
-    success = False
-    for effect_name in list(effects.keys()):
-        if check_dispel(level, target, effect_name):
-            success = True
+    # ROM src/magic.c:2249-2251 — result message to the caster.
+    if found:
+        _send_to_char(caster, "Ok.")
+    else:
+        _send_to_char(caster, "Spell failed.")
 
-    return success
+    return found
 
 
 def earthquake(caster: Character, target=None) -> bool:  # noqa: ARG001 - parity signature
@@ -5218,10 +5316,13 @@ def heat_metal(
     room = getattr(target, "room", None)
     iter_carrying = getattr(target, "iter_carrying", None)
     if callable(iter_carrying):
+        # Both Character (re-merged inventory+equipment by _carry_seq) and
+        # MobInstance (single head-inserted inventory list — MAGIC-046) expose
+        # iter_carrying in ROM victim->carrying LIFO order.
         all_items = list(iter_carrying())
     else:
-        # MobInstance has no _carry_seq acquisition tracking yet; fall back to the
-        # inventory (already head-inserted LIFO) + equipment combination.
+        # Last-resort fallback for any other carrier type: inventory (head-inserted
+        # LIFO) + equipment combination.
         inventory = list(getattr(target, "inventory", []) or [])
         equipment = dict(getattr(target, "equipment", {}) or {})
         all_items = inventory + list(equipment.values())

mud/spawning/templates.py

@@ -500,6 +500,20 @@ class MobInstance:
             self.inventory.insert(0, obj)
         obj.carried_by = self
 
+    def iter_carrying(self) -> list[Object]:
+        """Return this mob's items in ROM ``victim->carrying`` (LIFO) order.
+
+        MAGIC-046: unlike ``Character`` (which splits carried ``inventory`` from
+        worn ``equipment`` and must re-merge by ``_carry_seq``), a mob keeps
+        worn and carried items in the single ``inventory`` list — equip only
+        flips ``wear_loc`` (FINDING-025), and every acquisition path
+        (``add_to_inventory``/``equip``, reset G/E) head-inserts, so the list is
+        already newest → oldest exactly like ROM's ``ch->carrying``. Mechanics
+        mirroring ROM's carrying walk (``heat_metal``) iterate this instead of
+        the generic ``inventory + equipment.values()`` fallback.
+        """
+        return list(self.inventory)
+
     def remove_object(self, obj: Object) -> None:
         # ROM src/handler.c obj_from_char: unequip first if worn, then strip
         # from carried list. Mirror that here so disarm/remove paths actually

mud/world/look.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from mud.math.c_compat import c_div
 from mud.models.character import Character
-from mud.models.constants import AffectFlag, Direction, Position
-from mud.world.vision import can_see_character, describe_character
+from mud.models.constants import LEVEL_HERO, AffectFlag, CommFlag, Direction, PlayerFlag, Position
+from mud.world.vision import can_see_character, pers
 
 # mirroring ROM src/act_info.c show_char_to_char_0 — buf[0] = UPPER(buf[0]) and
 # position suffixes appended when a mob is not at its start/default position.
@@ -21,26 +21,69 @@ _POSITION_SUFFIX: dict[Position, str] = {
 }
 
 
+def _char_tags(observer: Character, victim) -> str:
+    """Build ROM show_char_to_char_0's status-tag prefix (src/act_info.c:253-276).
+
+    The full fixed order is [AFK] (Invis) (Wizi) (Hide) (Charmed) (Translucent)
+    (Pink Aura) (Red Aura) (Golden Aura) (White Aura) (KILLER) (THIEF). Red/Golden
+    auras depend on the *observer* carrying detect-evil/good and the victim's
+    alignment; KILLER/THIEF are PC-only PLR flags. Tags live here (the room
+    listing), not in PERS/``describe_character`` — see ``pers`` docstring.
+    """
+    tags: list[str] = []
+    has_affect = getattr(victim, "has_affect", None)
+
+    if int(getattr(victim, "comm", 0) or 0) & int(CommFlag.AFK):
+        tags.append("[AFK]")
+    if callable(has_affect):
+        if victim.has_affect(AffectFlag.INVISIBLE):
+            tags.append("(Invis)")
+    if int(getattr(victim, "invis_level", 0) or 0) >= LEVEL_HERO:
+        tags.append("(Wizi)")
+    if callable(has_affect):
+        if victim.has_affect(AffectFlag.HIDE):
+            tags.append("(Hide)")
+        if victim.has_affect(AffectFlag.CHARM):
+            tags.append("(Charmed)")
+        if victim.has_affect(AffectFlag.PASS_DOOR):
+            tags.append("(Translucent)")
+        if victim.has_affect(AffectFlag.FAERIE_FIRE):
+            tags.append("(Pink Aura)")
+
+    victim_align = int(getattr(victim, "alignment", 0) or 0)
+    obs_has_affect = getattr(observer, "has_affect", None)
+    # ROM IS_EVIL: alignment <= -350; IS_GOOD: alignment >= 350.
+    if victim_align <= -350 and callable(obs_has_affect) and observer.has_affect(AffectFlag.DETECT_EVIL):
+        tags.append("(Red Aura)")
+    if victim_align >= 350 and callable(obs_has_affect) and observer.has_affect(AffectFlag.DETECT_GOOD):
+        tags.append("(Golden Aura)")
+
+    if callable(has_affect) and victim.has_affect(AffectFlag.SANCTUARY):
+        tags.append("(White Aura)")
+
+    if not getattr(victim, "is_npc", False):
+        victim_act = int(getattr(victim, "act", 0) or 0)
+        if victim_act & int(PlayerFlag.KILLER):
+            tags.append("(KILLER)")
+        if victim_act & int(PlayerFlag.THIEF):
+            tags.append("(THIEF)")
+
+    return (" ".join(tags) + " ") if tags else ""
+
+
 def _room_occupant_line(observer: Character, victim) -> str:
     """Render a room-list occupant — ROM src/act_info.c show_char_to_char_0.
 
     An NPC whose position equals its start/default position and which has a
-    non-empty long_descr is listed by that long_descr (with affect auras
+    non-empty long_descr is listed by that long_descr (with the status tags
     prefixed), e.g. "Hassan is here, waiting to dispense some justice."
     Otherwise show PERS(victim) + a position suffix ("is resting here.", etc.).
     """
-    # LOOK-010: aura tags. ROM show_char_to_char_0 (src/act_info.c:266,272) prints
-    # (Pink Aura) [FAERIE_FIRE] before (White Aura) [SANCTUARY]. This `prefix` is
-    # used ONLY by the NPC long_descr branch below; the PERS branch gets its auras
-    # from describe_character() (which also prepends them) — prepending here too
-    # double-rendered them.
-    prefixes = []
-    if hasattr(victim, "has_affect"):
-        if victim.has_affect(AffectFlag.FAERIE_FIRE):
-            prefixes.append("(Pink Aura)")
-        if victim.has_affect(AffectFlag.SANCTUARY):
-            prefixes.append("(White Aura)")
-    prefix = (" ".join(prefixes) + " ") if prefixes else ""
+    # LOOK char-tags: ROM builds the full status-tag prefix (all 12) then appends
+    # either long_descr or PERS. Use pers() for the base name (pure PERS, no aura
+    # injection) so the tags render once and in ROM order — describe_character is
+    # left for its combat/other callers, which a direct unit test locks.
+    prefix = _char_tags(observer, victim)
 
     long_descr = getattr(victim, "long_descr", None)
     # ROM uses start_pos for the long_descr gate; Python stores default_pos (same
@@ -49,8 +92,21 @@ def _room_occupant_line(observer: Character, victim) -> str:
     if getattr(victim, "is_npc", False) and long_descr and getattr(victim, "position", None) == ref_pos:
         return prefix + str(long_descr).rstrip("\r\n")
 
-    pers = describe_character(observer, victim)
+    base = prefix + pers(victim, observer)
     position = getattr(victim, "position", None)
+    # LOOK-017: ROM src/act_info.c:285-288 appends the victim's pcdata->title
+    # after PERS for a standing PC — gated on the OBSERVER's COMM_BRIEF and
+    # furniture (ch->comm / ch->on), a deliberate ROM quirk.
+    if (
+        not getattr(victim, "is_npc", False)
+        and not (int(getattr(observer, "comm", 0) or 0) & int(CommFlag.BRIEF))
+        and position == Position.STANDING
+        and getattr(observer, "on", None) is None
+    ):
+        _pcdata = getattr(victim, "pcdata", None)
+        _title = getattr(_pcdata, "title", None) if _pcdata is not None else None
+        if _title:
+            base += _title
     fighting = getattr(victim, "fighting", None)
     if position == Position.FIGHTING:
         # mirroring ROM src/act_info.c:404-417 show_char_to_char_0 POS_FIGHTING
@@ -59,14 +115,17 @@ def _room_occupant_line(observer: Character, victim) -> str:
         elif fighting is observer:
             fight_str = "YOU!"
         elif getattr(victim, "room", None) is getattr(fighting, "room", object()):
-            fight_str = describe_character(observer, fighting) + "."
+            # ROM src/act_info.c:412 uses PERS(victim->fighting, ch) — the bare
+            # name, NOT the show_char_to_char aura block. describe_character injects
+            # (Pink/White Aura), which ROM never shows here (FINDING-043, same class
+            # as the scan FINDING-042 aura/PERS leak).
+            fight_str = pers(fighting, observer) + "."
         else:
             fight_str = "someone who left??"
-        # pers (describe_character) already carries the aura prefix — do not re-add.
-        line = pers + " is here, fighting " + fight_str
+        line = base + " is here, fighting " + fight_str
     else:
         suffix = _POSITION_SUFFIX.get(position, "") if position is not None else ""
-        line = pers + suffix
+        line = base + suffix
     # mirroring ROM src/act_info.c:421 buf[0] = UPPER(buf[0])
     return line[0].upper() + line[1:] if line else line
 
@@ -307,20 +366,39 @@ def _look_char(char: Character, victim: Character) -> str:
         condition = f"{short} is in awful condition."
     else:
         condition = f"{short} is bleeding to death."
+    # ROM src/act_info.c:480 — `buf[0] = UPPER(buf[0])` capitalizes the first
+    # char of the health line, so a mob's lowercase short_descr ("the beastly
+    # fido ...") renders "The beastly fido ..." (LOOK-014).
+    condition = condition[0].upper() + condition[1:] if condition else condition
     lines.append(condition)
 
-    # Show equipment if visible
-    equipment = _show_equipment(victim)
+    # Show equipment if visible — ROM src/act_info.c:483-499 (LOOK-016).
+    equipment = _show_equipment(victim, char)
     if equipment:
-        lines.append(f"\n{short} is using:")
+        # ROM act("$N is using:", ...) capitalizes the rendered first char.
+        header = f"{short} is using:"
+        header = header[0].upper() + header[1:]
+        lines.append(f"\n{header}")
         lines.append(equipment)
 
     return "\n".join(lines)
 
 
-def _show_equipment(char: Character) -> str:
-    """Show equipped items - ROM show_char_to_char_1"""
-    from mud.models.constants import WearLocation
+def _show_equipment(victim: Character, observer: Character) -> str:
+    """Show *victim*'s equipped items to *observer* — ROM show_char_to_char_1.
+
+    LOOK-016: mirrors ROM ``src/act_info.c:483-499`` — loop wear slots in
+    ascending order, gate each on ``can_see_obj(observer, obj)``, and render
+    ``where_name[iWear] + format_obj_to_char(obj, observer, TRUE)`` (no indent,
+    with aura/status tags). The prior code read a **phantom** ``equipped``
+    attribute (via ``getattr``) where the real one is ``char.equipment``
+    (int-keyed by WearLocation), so the whole block was dead — the equipment-key
+    convention class via a wrong attribute NAME, invisible to the string-key
+    grep-guard.
+    """
+    from mud.models.constants import WearLocation  # noqa: F401  (enum keys hash-equal to int)
+    from mud.utils.act import format_obj_to_char
+    from mud.world.vision import can_see_object
 
     wear_names = {
         WearLocation.LIGHT: "<used as light>     ",
@@ -345,13 +423,15 @@ def _show_equipment(char: Character) -> str:
     }
 
     lines = []
-    equipped = getattr(char, "equipped", {})
-    if isinstance(equipped, dict):
-        for loc, obj in equipped.items():
-            if obj:
-                loc_name = wear_names.get(loc, "<unknown>           ")
-                obj_name = getattr(obj, "short_descr", None) or getattr(obj, "name", "something")
-                lines.append(f"  {loc_name}{obj_name}")
+    equipment = getattr(victim, "equipment", {})
+    if isinstance(equipment, dict):
+        # ROM iterates iWear 0..MAX_WEAR ascending; equipment is int-keyed.
+        for slot in sorted(equipment.keys()):
+            obj = equipment[slot]
+            if obj is None or not can_see_object(observer, obj):
+                continue
+            loc_name = wear_names.get(slot, "<unknown>           ")
+            lines.append(f"{loc_name}{format_obj_to_char(obj, observer, True)}")
 
     return "\n".join(lines)
 
@@ -417,10 +497,15 @@ def _look_in(char: Character, args: str) -> str:
         if value[1] <= 0:
             return "It is empty."
         if value[0] > 0:
-            percent = value[1] * 100 // value[0]
-            if percent < 25:
+            # LOOK-015: mirror ROM's exact integer comparisons
+            # (src/act_info.c:1141-1145) — `value[1] < value[0]/4` and
+            # `value[1] < 3*value[0]/4`. A rewritten `value[1]*100//value[0]`
+            # percentage truncates at a different point and mislabels boundary
+            # amounts (e.g. value=(10,2): ROM "about half-", percent form
+            # "less than half-"). value[0]/value[1] are non-negative, so // == C /.
+            if value[1] < value[0] // 4:
                 amount = "less than half-"
-            elif percent < 75:
+            elif value[1] < 3 * value[0] // 4:
                 amount = "about half-"
             else:
                 amount = "more than half-"
@@ -477,9 +562,11 @@ def _look_direction(char: Character, room, direction: int) -> str:
     keyword = getattr(exit_obj, "keyword", None)
     exit_info = getattr(exit_obj, "exit_info", 0)
 
-    # EX_CLOSED = 1, EX_ISDOOR = 2
-    EX_ISDOOR = 2
-    EX_CLOSED = 1
+    # ROM merc.h: EX_ISDOOR = (A) = 1, EX_CLOSED = (B) = 2. Never hardcode these
+    # (AGENTS.md flag-values rule) — the values below were previously swapped,
+    # so every keyword'd door (which always has the ISDOOR bit) rendered as
+    # "closed" even when open (LOOK-012).
+    from mud.models.constants import EX_CLOSED, EX_ISDOOR
 
     if keyword and keyword.strip():
         if exit_info & EX_CLOSED:

{rom24_quickmud_python-2.14.264.dist-info → rom24_quickmud_python-2.14.298.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.14.264
+Version: 2.14.298
 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>
@@ -59,7 +59,7 @@ Dynamic: license-file
 
 # QuickMUD - A Modern ROM 2.4 Python Port
 
-[![Version](https://img.shields.io/badge/version-2.14.264-blue.svg)](https://github.com/Nostoi/rom24-quickmud-python)
+[![Version](https://img.shields.io/badge/version-2.14.268-blue.svg)](https://github.com/Nostoi/rom24-quickmud-python)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Tests](https://img.shields.io/badge/tests-6127%20passing-brightgreen.svg)](https://github.com/Nostoi/rom24-quickmud-python)
@@ -228,7 +228,7 @@ python -m mud  # Start development server
 **Stage: parity beta** — feature-complete and playable; parity fidelity is being
 systematically hardened toward ROM-exact behavioral equivalence.
 
-- **Version**: 2.14.264
+- **Version**: 2.14.268
 - **Playability**: ✅ All 255 ROM commands implemented. Combat, spells, skills,
   movement, shops, mob programs, OLC building, and admin tools work and pass their
   tests. You can run a server and play today.

{rom24_quickmud_python-2.14.264.dist-info → rom24_quickmud_python-2.14.298.dist-info}/RECORD

@@ -19,7 +19,7 @@ mud/account/__init__.py,sha256=wwII0DQSMn6E8qGwukIw8is-7JEW7z-UDd6qdZDpSYU,1856
 mud/account/account_manager.py,sha256=Ud1-nE55wfsTYokZ3i7dSNle9Hc7I7D0jllUOKMSSic,15449
 mud/account/account_service.py,sha256=OmJ2CogFMZz4O7RI-THajyA5Pu5vn5Q8GCfcBXQpAh0,40597
 mud/admin_logging/__init__.py,sha256=3W8Z1S7Dg-AtDTKPQIzuqL4_OojeyuAOryGH6BKozcg,40
-mud/admin_logging/admin.py,sha256=9ak3Edg62E429NMCydoaFU6xJK1DniGX4fDbKtbHA2Y,5257
+mud/admin_logging/admin.py,sha256=Gn99H4eORIt2KFt1zF7L4yEI0x5Cw1EYc7xoq4uo4NA,5280
 mud/admin_logging/agent_trace.py,sha256=j1rtrINBp2RIB9BRGXK0awHTH8_nvSu4Co18zmdOU2w,359
 mud/affects/engine.py,sha256=JtLaYZUyfm0hPJBmI-7-YcPOtcciGxsJGcz6d5utyrk,6690
 mud/affects/saves.py,sha256=oiHYUagVbF3MLjYqLMAnUui_qYGr1zoUNsqDAhI2xKQ,5246
@@ -34,7 +34,7 @@ mud/characters/follow.py,sha256=8CBBB6hoimoqlKmWTkfVRekTXAJgICtvfqWqhqqLFsw,4438
 mud/combat/__init__.py,sha256=YUphU7bKkxT3Qw0Gj2TcMmDoDyCYyRTQbHPCqKLjugE,215
 mud/combat/assist.py,sha256=G4mQacit5Otcm7Ou1g8lgxZJz-B5QFsGcD5Gi3W0kmI,8775
 mud/combat/death.py,sha256=S6KmG5nfPDHSsyPTK_SKqs3C7APyJ2eGF0LAjqj6HJE,25766
-mud/combat/engine.py,sha256=FuyBjUuZGhb78hGt7lsrMZNGp6QHydmU197cO-6FsXw,81498
+mud/combat/engine.py,sha256=3Qy7knjwakWCmmVKRpdFOZotaqhW37iOoACU86kxwn0,82545
 mud/combat/kill_table.py,sha256=oR77me5GJLGXi3q5ZnQAdp3S5lsfJNhiCmaXOMQrNgA,1040
 mud/combat/messages.py,sha256=c4kBvZFk2BneiJickTF3nRl84tq-InBJcLgKGzVTXMA,8708
 mud/combat/safety.py,sha256=aRcywM5vSU3Ct2xzHW-Eeiwr71DemeU1g0oSTqCYB4U,9049
@@ -46,20 +46,20 @@ mud/commands/alias_cmds.py,sha256=SRG4hdX4HbLqQ9fbnKbPbe8AjPH4klLEdOFjeR4Ppxo,39
 mud/commands/auto_settings.py,sha256=Ui99uWb7-MZ8JDvxSih-97tdLGrIlcCBkk4hjUct-t0,14593
 mud/commands/build.py,sha256=RuirbGApM3Wm5xwlarU7VfqpF_JDef0_pSQYofzI5YU,152534
 mud/commands/channels.py,sha256=EzAIgu4Hkp1unAdpmKb7TQ1DtuYUTEl_71SO4YnBuMM,1552
-mud/commands/character.py,sha256=0Gi7NoRVgz3lWFSu2IS9AXm-hCb32pVxbYRlaKqIt3o,6751
-mud/commands/combat.py,sha256=CekrjAQBMqFpNvCDJDty8oJFrwsta5d8O1fpfWmX0g0,60182
+mud/commands/character.py,sha256=rK4D0TrbU8bZyv0vx2CA5HdANTWmBV--C1JXd-TRbpk,6904
+mud/commands/combat.py,sha256=hrETbdT_lUIoPmMBKenY1QWr8DEQ6ZHLaNmZcboy1zc,61633
 mud/commands/communication.py,sha256=pFNih4ZePV3ZKrstm9WMU_ooMz00g_MOFzOHk91Qu-o,34963
-mud/commands/compare.py,sha256=pVYrZvB5WF_IEE8AWapOFd6JMdxPgrQPkEZj2jvWkfU,4883
+mud/commands/compare.py,sha256=L-vSxp33rLEZe7_HOj901aX2g_Gv3FgQblsXgIZ4fcA,5124
 mud/commands/consider.py,sha256=86stGtNOcdWI0I6sEtcDnB3R7qv6IKOGoUjbDnHuQ_c,3312
 mud/commands/consumption.py,sha256=1t2lvDNmWzIfTa61KJruhxOJLtBuTjsV_Tcu2Byi-yU,15364
 mud/commands/decorators.py,sha256=n_ezcovFkycAZOVxg0UNtMZLtiSlF0Yj8yqYt4YVY1U,345
 mud/commands/dispatcher.py,sha256=sEOpkWiFGivFobZpg7GMGHlD_fEa9D34cFDf8eW3l_Q,52889
-mud/commands/doors.py,sha256=Erukptb5p3ux0iQiOO0ofEo3Q4HI1JDgI0CLrrW7cas,26870
-mud/commands/equipment.py,sha256=xKZiGZoWh-KqNWJZGKlgSI9zdv7ZmJc28zaglNjfqn8,26613
+mud/commands/doors.py,sha256=SSjYZ7J57FnxTzjT0Z1wbQa62ek1Nh_efgPgdFhGBgI,27299
+mud/commands/equipment.py,sha256=bJ4lhUz4K2VDxh7cD_CtjFK1HN0OMMJuCciMWMdsFew,29550
 mud/commands/feedback.py,sha256=MJtqeQgDeUEjteXce9fzAHgmtnneqpzS9oD6hIQknck,2460
 mud/commands/give.py,sha256=xd9K05zxDlxVNHiQ2YzEC5OUCNKNULDHAfP1omMiu5s,10979
 mud/commands/group_commands.py,sha256=xQJUQqXqAJOfmfgv4fvhEioNM-ivlA5bwDsias_ncsA,22509
-mud/commands/healer.py,sha256=-H1IG5MskNLDX1m34v3yx6Low3gt-21AcmT9e7X97Ig,8893
+mud/commands/healer.py,sha256=5R-LeJc1QuJWsBjqoYcQLCIaQ6bg264X2I1YHDkcHWY,9260
 mud/commands/help.py,sha256=J-oUmYD_6zyJ5RyqWk1M3Cipq6xJfGvpbZZe0mz678Q,11112
 mud/commands/imc.py,sha256=aFrmiJJyeYMvcfhnNVCtJtKs04k-88BaLgmPj-vE-8o,12179
 mud/commands/imm_admin.py,sha256=D4OczNuWVo5IQ74Jzz7j0Ypa6W09LyBPMDGmuwvQeHw,9279
@@ -72,10 +72,10 @@ mud/commands/imm_punish.py,sha256=zZPjJKbMbQ-saRPeE-27sI7UqgKUZP18gomNbyQh_X0,82
 mud/commands/imm_search.py,sha256=TFgWqqo145sZW8GfMq9wID5iwAOY06XkPbFfRYOxKtc,46570
 mud/commands/imm_server.py,sha256=JC4UkS8cDqmpQ91Dw34hfoQzgrLuvMZbgWXOLoltmAk,9148
 mud/commands/imm_set.py,sha256=gHHXzCVvmAlBxqor9p3eoDQGaZYIDebXyJqTfNxe9WE,18423
-mud/commands/info.py,sha256=yTq0lkG0CctjTLw8xMqTBuS31jZXFMqEj0Sv68vHZZw,20729
+mud/commands/info.py,sha256=_TvpiXdOIX1tUaF9V0jDfTY2iDasDkYPJ_8imcx-guE,21135
 mud/commands/info_extended.py,sha256=EuGPJK4qjpyIaD3m2cOdwXUpcs9bAevi-JCeu2BDUj0,11365
-mud/commands/inspection.py,sha256=gdpBjcZP8nPLcxtBP51fjWfVzcK6mpEfyvWaf_YJbWA,10756
-mud/commands/inventory.py,sha256=EeBBDixkoVT9q_z7zRuRJrEbSn2pHe2WcwnzExeb4Vc,36698
+mud/commands/inspection.py,sha256=5ii1iYJT9oee-WJUrBjnhPIEugCe5hJNoeqMCIFOTnA,11000
+mud/commands/inventory.py,sha256=aWfh_LoMCj4R1kzPWejmAarWl-5Pr0UNGo5ZIceA68s,37772
 mud/commands/liquids.py,sha256=yeUzBIcVD9_K6QoeoBCaXipEZc1cYMbBkGP7aeZg-Pc,11546
 mud/commands/magic_items.py,sha256=YBymF8EyYdENBqBMf6ujtGqM2onSv-kgMgCRrwBrIhw,14134
 mud/commands/misc_info.py,sha256=gaaOEhV7hDLPJe2BUbxSAg-uFXjGfLfJxuLGgUeEDII,8350
@@ -84,14 +84,14 @@ mud/commands/mobprog_tools.py,sha256=DtfWBkzyYaXTqWoioupnkCH1Lf0mTfzvCZKlWQcSef4
 mud/commands/movement.py,sha256=fSXODjxubl9bbEq65RlDxdTYKknrvAQ_YRkcGAOUqYk,3327
 mud/commands/murder.py,sha256=mWW7AZRfrg86yVjc6EiXlXwApRC9ze5uryhUUXHyOGQ,5932
 mud/commands/notes.py,sha256=hoSBmAN-Po6KGb3H6Yc8sGIJ0FNsn6U1pDpzb70pdek,18155
-mud/commands/obj_manipulation.py,sha256=lj6K4u9hcxiC5BM2SUcqSzJhOfdw3xVTeuGl3XdRSzo,28628
+mud/commands/obj_manipulation.py,sha256=ujye4CciOI0pDCXC8ds-7n-zPuW5Lb8eI8_2Zr5NbbI,28804
 mud/commands/player_config.py,sha256=XCIRNGlDVw7jqD1uHFzPPoWSuS7v_2OAtFKPt2tdL_0,6548
 mud/commands/player_info.py,sha256=aRCn3U-JmEka6zjp6dxRWvNTSF2XpuwVn2Ja6EhbRUg,7101
 mud/commands/position.py,sha256=Br_iqeo_84yJGghMoUY5p2bXqbetiekthj2iK8C4-to,16360
 mud/commands/remaining_rom.py,sha256=vGl3vBTfME99hhPPavQwUEempeaxr4g6Bwu2LzXDM_U,27959
-mud/commands/session.py,sha256=aYhYn2CDRR-ogtgs7dVQbYjuYObfxJ0pZdzeKRPtuGY,16249
+mud/commands/session.py,sha256=pgBAlVSliH2J6M1HTKoAakDstPp7-zPHkGfUMnCx2Ic,16910
 mud/commands/shop.py,sha256=gynLzx08jrYZYiJJkHQeCABSgWkBvrrwTELJaYCYmMU,47657
-mud/commands/socials.py,sha256=KNE5LZfzamZBojg4WHxISZ2bYZOzb4VEVrY0z38qFqY,6219
+mud/commands/socials.py,sha256=RNEzOw8xvxFUM9AoWSFhKeBOG-Opt-1DNiecgVkBUXQ,6492
 mud/commands/thief_skills.py,sha256=B9UqeUVQZqE16VqOyh1cTO86oXy9m6K1iqOKdeDmXII,16578
 mud/commands/typo_guards.py,sha256=SbvD9yZ6Z95qsCJN1CAQPtWNs6rsLH4W930_pc3SuoE,1435
 mud/db/__init__.py,sha256=DuOdj63wifJjPIR252Z1WpYDdJ5M7vqoQVI3MqrGhYY,29
@@ -188,7 +188,7 @@ mud/security/bans.py,sha256=_nM9wEJbxxdLXoe0I31u8dTYgWP0wxMqMVB9mxxfhlk,9174
 mud/security/hash_utils.py,sha256=GNd2W-TFLSIOk1WMQRuvJo8l4CueBYzPI0EhQuydxUg,656
 mud/skills/__init__.py,sha256=zzIr-ejbrlrQF1CSepODWhpxQZv8rO2pgaqIi3vpMg0,241
 mud/skills/groups.py,sha256=DRO7b-XPkP-DZudD-DVLMC74R0N6xXDFjceCrOct1Gw,8140
-mud/skills/handlers.py,sha256=UIQ_MYf_MODiNNHZasGRsTOBBzeoo81_dWVZUIsLpRc,298919
+mud/skills/handlers.py,sha256=jzkgfFvdqmRr3xyVdvEhOPZ7FB7aozr3ZJ-gktDflKM,303843
 mud/skills/metadata.py,sha256=TbsOLZ1hKKAPTmrWBw4zKv1L3KCXByxpa2X2Rfir7G8,17480
 mud/skills/registry.py,sha256=4e8GD9-SUdn_6FhM7yFguJINX2vjKv2Y4Tp7_49Rves,14899
 mud/skills/say_spell.py,sha256=7Lcbx_oxA0JJQbaaILNb27xLbMGadauekyWHVnODiUM,4006
@@ -197,7 +197,7 @@ mud/spawning/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 mud/spawning/mob_spawner.py,sha256=aQRuctCIPpkVZlES5NH0dsvphkCWJWFCrJB5dy7aMKY,577
 mud/spawning/obj_spawner.py,sha256=1jb1_sw7vvUVczXLi-dp5g_g6a-JVK2N4F4cuktiQF8,2930
 mud/spawning/reset_handler.py,sha256=Dfkszau017ReeUd26R9DOl6UWB5YGEOrwHGgSTcPRCQ,35099
-mud/spawning/templates.py,sha256=cVxjwgtXu-xoGPSXI3SkYeb9lAlK5Lvq0yozLfXrL0E,30451
+mud/spawning/templates.py,sha256=hjQrZwFxDU4o3Tuja6DIdzBzTgTImUrbmV-13OLIsp8,31235
 mud/utils/act.py,sha256=385Tfm77Wz6FhsGBvxi9zd67cyhQJ6uku5TyiEY-HtE,14329
 mud/utils/bit.py,sha256=5W4uIoz_HVvUGBSyaO6JViuvseqO7s_1Gw0d2_y2m-4,4891
 mud/utils/fix_sex.py,sha256=_MH1NkDOFn33aTlwUU6e2VMmO8oQJibQNvcH8_w1PPk,601
@@ -213,15 +213,15 @@ mud/utils/timing.py,sha256=fK4LNOEZk5iLUhkmX_VTBgk3zldDBwLjI-_UEDWhmCU,670
 mud/world/__init__.py,sha256=HDEHtULHu1OWjOa3xglmhquW8L6NkJTWzLEURJ4BQjk,263
 mud/world/char_find.py,sha256=AwP7IRukVEHcZY6qtakWYsf-fFJjha5aTR7OiOtj3_s,5647
 mud/world/linking.py,sha256=mxEvgqA9Y6sDGXxN46aauU-jBhx4dOUcbgq64fIVz8g,1169
-mud/world/look.py,sha256=aeQApCN8jS_lWR5AwWAsVPpEi_fRfMINEV3aKy9SUHg,20361
+mud/world/look.py,sha256=Q3iaX8S1Dax6XaTR2XagQci1MHoxGDQn0Zi27cLDJUQ,25178
 mud/world/movement.py,sha256=Rjcttco509exs42xvc1FkEnfJdF5qYX3BVIAaJoIcjE,26093
 mud/world/obj_find.py,sha256=wVF3KlcEm4Bc4GiQZs4yWH5Ih87F-JSM7MtVI8cZEJs,5277
 mud/world/time_persistence.py,sha256=GfhVr6H86Q4YXkeGhhgVAfm5s3ZBT8bF6K_zwqKRkAc,1663
 mud/world/vision.py,sha256=Z7uDNjer2C6-VxlQp35wJO-FpaRiUIj5D1IkLq0wZ6g,12965
 mud/world/world_state.py,sha256=58GTFAZ70d0Xp1FC8pU4PPJv5KlYI9Kmy_xeXoerfTo,9310
-rom24_quickmud_python-2.14.264.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.14.264.dist-info/METADATA,sha256=62-ooa_PMFmZBltNtEzVpce3WDrtw1tcfftkcd-hlaw,19675
-rom24_quickmud_python-2.14.264.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-rom24_quickmud_python-2.14.264.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.14.264.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.14.264.dist-info/RECORD,,
+rom24_quickmud_python-2.14.298.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.14.298.dist-info/METADATA,sha256=kjZi7RVkj_GDL2WQoC_T_dm1NnWJUvtyvBtC2B6rWKE,19675
+rom24_quickmud_python-2.14.298.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+rom24_quickmud_python-2.14.298.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.14.298.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.14.298.dist-info/RECORD,,