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

mud/commands/combat.py

@@ -246,14 +246,17 @@ def do_rescue(char: Character, args: str) -> str:
 
 
 def _find_room_target(char: Character, name: str) -> Character | None:
+    """Find a character in the same room by name.
+
+    ROM Reference: src/act_info.c get_char_room()
+    Note: ROM allows finding self - individual commands check victim == ch.
+    """
     room = getattr(char, "room", None)
     if room is None or not name:
         return None
 
     lowered = name.lower()
     for candidate in getattr(room, "people", []) or []:
-        if candidate is char:
-            continue
         candidate_name = getattr(candidate, "name", "") or ""
         if lowered in candidate_name.lower():
             return candidate
@@ -797,51 +800,22 @@ def do_dirt(char: Character, args: str) -> str:
         if victim is None:
             return "They aren't here."
 
-    # Check if already blinded
+    # Match ROM safety/validation gates in the command layer.
+    if victim is char:
+        return "Very funny."
+
     victim_affected = getattr(victim, "affected_by", 0)
     if victim_affected & AffectFlag.BLIND:
         return "They're already blinded."
 
-    if victim is char:
-        return "Very funny."
-
-    # Safety checks
     safety_msg = _kill_safety_message(char, victim)
     if safety_msg:
         return safety_msg
 
-    # Calculate chance
-    chance = skill_level
-    char_dex = skill_handlers._coerce_int(
-        getattr(char, "perm_stat", [13] * 5)[1] if isinstance(getattr(char, "perm_stat", []), list) else 13
-    )
-    victim_dex = skill_handlers._coerce_int(
-        getattr(victim, "perm_stat", [13] * 5)[1] if isinstance(getattr(victim, "perm_stat", []), list) else 13
-    )
-    chance += char_dex - 2 * victim_dex
-
-    # Level modifier
-    char_level = skill_handlers._coerce_int(getattr(char, "level", 1))
-    victim_level = skill_handlers._coerce_int(getattr(victim, "level", 1))
-    chance += (char_level - victim_level) * 2
-
-    # Roll
-    if rng_mm.number_percent() < chance:
-        # Success - blind the victim
-        victim.affected_by = victim_affected | AffectFlag.BLIND
-        skill_registry._apply_wait_state(char, get_pulse_violence())
-
-        # Start combat if not already fighting
-        if not getattr(char, "fighting", None):
-            char.fighting = victim
-        if not getattr(victim, "fighting", None):
-            victim.fighting = char
-
-        check_killer(char, victim)
-        return f"You kick dirt into {getattr(victim, 'name', 'their')} eyes!"
-    else:
-        skill_registry._apply_wait_state(char, get_pulse_violence())
-        return "You kick dirt but miss their eyes."
+    # Delegate parity math/effects to the skill handler.
+    result = skill_handlers.dirt_kicking(char, target=victim)
+    check_killer(char, victim)
+    return result
 
 
 def do_trip(char: Character, args: str) -> str:
@@ -943,57 +917,21 @@ def do_disarm(char: Character, args: str) -> str:
     if victim is None:
         return "You aren't fighting anyone."
 
-    # Victim must be wielding a weapon
-    victim_equipped = getattr(victim, "equipped", {})
-    victim_weapon = victim_equipped.get("wield") or victim_equipped.get("main_hand")
-    if victim_weapon is None:
-        return "Your opponent is not wielding a weapon."
-
-    # Attacker should have weapon (or hand-to-hand skill)
-    char_equipped = getattr(char, "equipped", {})
-    char_weapon = char_equipped.get("wield") or char_equipped.get("main_hand")
+    # Attacker must have a weapon, or meet ROM hand-to-hand / NPC OFF_DISARM exception.
+    caster_weapon = get_wielded_weapon(char)
     hth_skill = char.skills.get("hand to hand", 0)
-
-    if char_weapon is None and hth_skill == 0:
+    if caster_weapon is None and hth_skill == 0:
         return "You must wield a weapon to disarm."
 
-    # Calculate chance
-    if char_weapon is None:
-        chance = skill_level * hth_skill // 150
-    else:
-        chance = skill_level
-
-    # Dex vs Str
-    char_dex = skill_handlers._coerce_int(
-        getattr(char, "perm_stat", [13] * 5)[1] if isinstance(getattr(char, "perm_stat", []), list) else 13
-    )
-    victim_str = skill_handlers._coerce_int(
-        getattr(victim, "perm_stat", [13] * 5)[0] if isinstance(getattr(victim, "perm_stat", []), list) else 13
-    )
-    chance += char_dex - 2 * victim_str
-
-    # Level modifier
-    char_level = skill_handlers._coerce_int(getattr(char, "level", 1))
-    victim_level = skill_handlers._coerce_int(getattr(victim, "level", 1))
-    chance += (char_level - victim_level) * 2
-
-    skill_registry._apply_wait_state(char, get_pulse_violence())
+    # Victim must be wielding a weapon
+    victim_weapon = get_wielded_weapon(victim)
+    if victim_weapon is None:
+        return "Your opponent is not wielding a weapon."
 
-    # Roll
-    if rng_mm.number_percent() < chance:
-        # Success - remove weapon from victim
-        if "wield" in victim_equipped:
-            del victim_equipped["wield"]
-        elif "main_hand" in victim_equipped:
-            del victim_equipped["main_hand"]
-
-        # Drop to room
-        victim_room = getattr(victim, "room", None)
-        if victim_room and hasattr(victim_room, "contents"):
-            victim_room.contents.append(victim_weapon)
-            victim_weapon.in_room = victim_room
+    success = skill_handlers.disarm(char, target=victim)
+    check_killer(char, victim)
 
-        check_killer(char, victim)
-        return f"You disarm {getattr(victim, 'name', 'them')}!"
-    else:
-        return f"You fail to disarm {getattr(victim, 'name', 'them')}."
+    victim_name = getattr(victim, "name", "them")
+    if success:
+        return f"You disarm {victim_name}!"
+    return f"You fail to disarm {victim_name}."

mud/commands/healer.py

@@ -21,16 +21,16 @@ def _find_healer(char: Character) -> object | None:
 
 
 PRICE_GOLD = {
-    "light": 10,
-    "serious": 15,
-    "critical": 25,
-    "heal": 50,
-    "blindness": 20,
-    "disease": 15,
-    "poison": 25,
-    "uncurse": 50,
-    "refresh": 5,
-    "mana": 10,
+    "light": 10,  # ROM healer.c:88: cost = 1000 (10 gold)
+    "serious": 16,  # ROM healer.c:96: cost = 1600 (16 gold) - NOTE: Display says 15g but actual cost is 16g!
+    "critical": 25,  # ROM healer.c:104: cost = 2500 (25 gold)
+    "heal": 50,  # ROM healer.c:112: cost = 5000 (50 gold)
+    "blindness": 20,  # ROM healer.c:120: cost = 2000 (20 gold)
+    "disease": 15,  # ROM healer.c:128: cost = 1500 (15 gold)
+    "poison": 25,  # ROM healer.c:136: cost = 2500 (25 gold)
+    "uncurse": 50,  # ROM healer.c:144: cost = 5000 (50 gold)
+    "refresh": 5,  # ROM healer.c:161: cost = 500 (5 gold)
+    "mana": 10,  # ROM healer.c:152: cost = 1000 (10 gold)
 }
 
 

mud/commands/magic_items.py

@@ -152,8 +152,7 @@ def do_recite(ch: Character, args: str) -> str:
     if not scroll:
         return "You do not have that scroll."
 
-    # Check if it's actually a scroll
-    if scroll.item_type != ItemType.ITEM_SCROLL:
+    if scroll.item_type != ItemType.SCROLL:
         return "You can recite only scrolls."
 
     # Check level requirement

mud/game_loop.py

@@ -198,10 +198,12 @@ def hit_gain(character: Character) -> int:
     gain = gain * getattr(room, "heal_rate", 100) // 100
 
     furniture = getattr(character, "on", None)
-    if furniture is not None and getattr(furniture, "item_type", None) == ItemType.FURNITURE:
-        values = getattr(furniture, "value", [100, 100, 100, 100, 100])
-        if len(values) > 3:
-            gain = gain * int(values[3]) // 100
+    if furniture is not None:
+        item_type = getattr(furniture.prototype, "item_type", None)
+        if item_type == ItemType.FURNITURE or item_type == int(ItemType.FURNITURE):
+            values = getattr(furniture, "value", [100, 100, 100, 100, 100])
+            if len(values) > 3:
+                gain = gain * int(values[3]) // 100
 
     if _has_affect(character, AffectFlag.POISON):
         gain //= 4
@@ -262,13 +264,15 @@ def mana_gain(character: Character) -> int:
             if character.pcdata.condition[Condition.THIRST] == 0:
                 gain //= 2
 
-    gain = gain * getattr(room, "mana_rate", 100) // 100
+    gain = gain * getattr(room, "heal_rate", 100) // 100
 
     furniture = getattr(character, "on", None)
-    if furniture is not None and getattr(furniture, "item_type", None) == ItemType.FURNITURE:
-        values = getattr(furniture, "value", [100, 100, 100, 100, 100])
-        if len(values) > 4:
-            gain = gain * int(values[4]) // 100
+    if furniture is not None:
+        item_type = getattr(furniture.prototype, "item_type", None)
+        if item_type == ItemType.FURNITURE or item_type == int(ItemType.FURNITURE):
+            values = getattr(furniture, "value", [100, 100, 100, 100, 100])
+            if len(values) > 3:
+                gain = gain * int(values[3]) // 100
 
     if _has_affect(character, AffectFlag.POISON):
         gain //= 4
@@ -307,10 +311,12 @@ def move_gain(character: Character) -> int:
     gain = gain * getattr(room, "heal_rate", 100) // 100
 
     furniture = getattr(character, "on", None)
-    if furniture is not None and getattr(furniture, "item_type", None) == ItemType.FURNITURE:
-        values = getattr(furniture, "value", [100, 100, 100, 100, 100])
-        if len(values) > 3:
-            gain = gain * int(values[3]) // 100
+    if furniture is not None:
+        item_type = getattr(furniture.prototype, "item_type", None)
+        if item_type == ItemType.FURNITURE or item_type == int(ItemType.FURNITURE):
+            values = getattr(furniture, "value", [100, 100, 100, 100, 100])
+            if len(values) > 3:
+                gain = gain * int(values[3]) // 100
 
     if _has_affect(character, AffectFlag.POISON):
         gain //= 4

mud/models/character.py

@@ -260,20 +260,20 @@ class Character:
     description: str | None = None
     prompt: str | None = None
     prefix: str | None = None
-    
+
     # Class/Race/Clan
     sex: int = 0
     ch_class: int = 0
     race: int = 0
     clan: int = 0
     group: int = 0  # Group number for area repop (ROM: sh_int group)
-    
+
     # Levels and trust
     level: int = 0
     trust: int = 0
     invis_level: int = 0
     incog_level: int = 0
-    
+
     # Stats
     hit: int = 0
     max_hit: int = 0
@@ -284,76 +284,77 @@ class Character:
     gold: int = 0
     silver: int = 0
     exp: int = 0
-    
+
     # Flags
     act: int = 0
     affected_by: int = 0
-    
+
     # Location
     position: int = Position.STANDING
     room: Room | None = None  # ROM: in_room
     was_in_room: Room | None = None  # ROM: was_in_room
     zone: object | None = None  # ROM: AREA_DATA *zone
-    
+
     # Relationships
     master: Character | None = None
     leader: Character | None = None
     pet: "Character | None" = None
     reply: Character | None = None  # ROM: reply target for tells
     mprog_target: "Character | None" = None  # ROM: mob program target
-    
+    on: "Object | None" = None  # ROM: furniture character is sitting/resting on (affects heal rate)
+
     # Skills and training
     practice: int = 0
     train: int = 0
     skills: dict[str, int] = field(default_factory=dict)
-    
+
     # Encumbrance
     carry_weight: int = 0
     carry_number: int = 0
-    
+
     # Combat stats
     saving_throw: int = 0
     alignment: int = 0
     hitroll: int = 0
     damroll: int = 0
     wimpy: int = 0
-    
+
     # Display/UI
     lines: int = DEFAULT_PAGE_LINES
     newbie_help_seen: bool = False
-    
+
     # Time tracking
     played: int = 0
     logon: int = 0
     timer: int = 0  # ROM: idle timer
-    
+
     # Stats (permanent and temporary modifiers)
     perm_stat: list[int] = field(default_factory=list)
     mod_stat: list[int] = field(default_factory=list)
-    
+
     # Body form and parts
     form: int = 0
     parts: int = 0
     size: int = 0
     material: str | None = None
     off_flags: int = 0
-    
+
     # ROM parity: immunity/resistance/vulnerability bitvectors (merc.h)
     imm_flags: int = 0
     res_flags: int = 0
     vuln_flags: int = 0
-    
+
     # Damage and attack type
     damage: list[int] = field(default_factory=lambda: [0, 0, 0])
     dam_type: int = 0
     start_pos: int = 0
     default_pos: int = 0
-    
+
     # Mob programs
     mprog_delay: int = 0
     mob_programs: list[MobProgram] = field(default_factory=list)
     spec_fun: str | None = None  # ROM: special function name
-    
+
     # Custom fields (Python-specific)
     hometown_vnum: int = 0
     pcdata: PCData | None = None
@@ -365,7 +366,7 @@ class Character:
     connection: object | None = None
     desc: object | None = None  # ROM: DESCRIPTOR_DATA
     is_admin: bool = False
-    
+
     # Communication and channels
     imc_permission: str = "Mort"  # IMC permission level (Notset/None/Mort/Imm/Admin/Imp)
     muted_channels: set[str] = field(default_factory=set)
@@ -374,33 +375,33 @@ class Character:
     wiznet: int = 0  # ROM: wiznet flags
     comm: int = 0  # ROM: comm flags
     log_commands: bool = False  # Per-character admin logging flag mirroring ROM PLR_LOG
-    
+
     # Wait state and delays
     wait: int = 0  # Wait-state (pulses) applied by actions like movement (ROM WAIT_STATE)
     daze: int = 0  # Daze (pulses) — separate action delay used by ROM combat
-    
+
     # Armor class per index [AC_PIERCE, AC_BASH, AC_SLASH, AC_EXOTIC]
     armor: list[int] = field(default_factory=lambda: [100, 100, 100, 100])
-    
+
     # Per-character command aliases: name -> expansion (pre-dispatch)
     aliases: dict[str, str] = field(default_factory=dict)
-    
+
     # Optional defense chances (percent) for parity-friendly tests
     shield_block_chance: int = 0
     parry_chance: int = 0
     dodge_chance: int = 0
-    
+
     # Combat skill levels (0-100) for multi-attack mechanics
     second_attack_skill: int = 0
     third_attack_skill: int = 0
     enhanced_damage_skill: int = 0  # Enhanced damage skill level (0-100)
-    
+
     # Combat state - currently fighting target
     fighting: Character | None = None
-    
+
     # Character type flag
     is_npc: bool = True  # Default to NPC, set to False for PCs
-    
+
     # Spell effects and character generation
     spell_effects: dict[str, SpellEffect] = field(default_factory=dict)  # Active spell effects keyed by skill name
     default_weapon_vnum: int = 0

mud/skills/handlers.py

@@ -1354,7 +1354,7 @@ def bless(caster: Character, target: Character | None = None) -> bool:
     if target is None:
         raise ValueError("bless requires a target")
 
-    if target.position == Position.FIGHTING:
+    if target.position == Position.FIGHTING or target.has_spell_effect("bless"):
         return False
 
     level = max(getattr(caster, "level", 0), 0)
@@ -1890,31 +1890,29 @@ def chain_lightning(caster: Character, target: Character | None = None) -> bool:
             if level <= 0:
                 break
 
-        if found or level <= 0:
-            continue
+        if not found:
+            if last_victim is caster:
+                broadcast_room(
+                    room,
+                    "The bolt seems to have fizzled out.",
+                    exclude=caster,
+                )
+                _send_to_char(caster, "The bolt grounds out through your body.")
+                break
 
-        if last_victim is caster:
+            last_victim = caster
             broadcast_room(
                 room,
-                "The bolt seems to have fizzled out.",
+                f"The bolt arcs to {caster_name}...whoops!",
                 exclude=caster,
             )
-            _send_to_char(caster, "The bolt grounds out through your body.")
-            break
-
-        last_victim = caster
-        broadcast_room(
-            room,
-            f"The bolt arcs to {caster_name}...whoops!",
-            exclude=caster,
-        )
-        _send_to_char(caster, "You are struck by your own lightning!")
-        damage = rng_mm.dice(level, 6)
-        if saves_spell(level, caster, DamageType.LIGHTNING):
-            damage = c_div(damage, 3)
-        apply_damage(caster, caster, damage, DamageType.LIGHTNING, dt="chain lightning")
-        any_hit = any_hit or damage > 0
-        level -= 4
+            _send_to_char(caster, "You are struck by your own lightning!")
+            damage = rng_mm.dice(level, 6)
+            if saves_spell(level, caster, DamageType.LIGHTNING):
+                damage = c_div(damage, 3)
+            apply_damage(caster, caster, damage, DamageType.LIGHTNING, dt="chain lightning")
+            any_hit = any_hit or damage > 0
+            level -= 4
 
     return any_hit
 
@@ -3100,7 +3098,11 @@ def disarm(caster: Character, target: Character | None = None) -> bool:
         victim_weapon.wear_loc = int(WearLocation.NONE)
 
     drop_room = getattr(victim, "room", None)
-    if drop_room is not None and hasattr(drop_room, "add_object"):
+
+    # ROM src/fight.c:2258-2265 - ITEM_NODROP/ITEM_INVENTORY keep weapon on victim.
+    if extra_flags & (int(ExtraFlag.NODROP) | int(ExtraFlag.INVENTORY)):
+        victim.add_object(victim_weapon)
+    elif drop_room is not None and hasattr(drop_room, "add_object"):
         drop_room.add_object(victim_weapon)
     else:
         victim.add_object(victim_weapon)

mud/skills/say_spell.py

@@ -0,0 +1,153 @@
+"""ROM say_spell utility - syllable substitution for spell casting messages.
+
+Mirroring ROM src/magic.c:132-207
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    pass  # Avoid import errors during type checking
+
+
+# ROM src/magic.c:146-178 - Syllable substitution table
+_SYL_TABLE = [
+    (" ", " "),
+    ("ar", "abra"),
+    ("au", "kada"),
+    ("bless", "fido"),
+    ("blind", "nose"),
+    ("bur", "mosa"),
+    ("cu", "judi"),
+    ("de", "oculo"),
+    ("en", "unso"),
+    ("light", "dies"),
+    ("lo", "hi"),
+    ("mor", "zak"),
+    ("move", "sido"),
+    ("ness", "lacri"),
+    ("ning", "illa"),
+    ("per", "duda"),
+    ("ra", "gru"),
+    ("fresh", "ima"),
+    ("re", "candus"),
+    ("son", "sabru"),
+    ("tect", "infra"),
+    ("tri", "cula"),
+    ("ven", "nofo"),
+    # Single character substitutions
+    ("a", "a"),
+    ("b", "b"),
+    ("c", "q"),
+    ("d", "e"),
+    ("e", "z"),
+    ("f", "y"),
+    ("g", "o"),
+    ("h", "p"),
+    ("i", "u"),
+    ("j", "y"),
+    ("k", "t"),
+    ("l", "r"),
+    ("m", "w"),
+    ("n", "i"),
+    ("o", "a"),
+    ("p", "s"),
+    ("q", "d"),
+    ("r", "f"),
+    ("s", "g"),
+    ("t", "h"),
+    ("u", "j"),
+    ("v", "z"),
+    ("w", "x"),
+    ("x", "n"),
+    ("y", "l"),
+    ("z", "k"),
+    ("", ""),  # Terminator
+]
+
+
+def say_spell(caster: Any, spell_name: str) -> tuple[str, str]:
+    """ROM say_spell: convert spell name to gibberish for non-class observers.
+
+    Args:
+        caster: Character casting the spell
+        spell_name: Name of the spell being cast
+
+    Returns:
+        Tuple of (actual_words, garbled_words)
+        - actual_words: Message shown to same-class observers
+        - garbled_words: Message shown to different-class observers
+
+    ROM C Reference: src/magic.c:132-207
+    """
+    if not spell_name:
+        return ("", "")
+
+    # Build garbled version using syllable substitution
+    garbled = []
+    name_lower = spell_name.lower()
+    pos = 0
+
+    while pos < len(name_lower):
+        matched = False
+
+        # Try each syllable in the table
+        for old, new in _SYL_TABLE:
+            if not old:  # Terminator
+                break
+
+            if name_lower[pos:].startswith(old):
+                garbled.append(new)
+                pos += len(old)
+                matched = True
+                break
+
+        # If no match, advance by 1 character
+        if not matched:
+            pos += 1
+
+    garbled_words = "".join(garbled)
+
+    # Format messages
+    actual_msg = f"$n utters the words, '{spell_name}'."
+    garbled_msg = f"$n utters the words, '{garbled_words}'."
+
+    return (actual_msg, garbled_msg)
+
+
+def broadcast_spell_words(caster: Any, spell_name: str) -> None:
+    """Broadcast spell words to room with class-based filtering.
+
+    ROM C Reference: src/magic.c:199-204
+    """
+    # Import here to avoid circular dependencies
+    try:
+        from mud.net.protocol import broadcast_room
+    except ImportError:
+        # Gracefully handle if module not available
+        return
+
+    room = getattr(caster, "room", None)
+    if room is None:
+        return
+
+    actual_msg, garbled_msg = say_spell(caster, spell_name)
+    caster_class = getattr(caster, "ch_class", None)
+
+    # ROM L199-203: Show actual words to same class, garbled to others
+    for occupant in list(getattr(room, "people", []) or []):
+        if occupant is caster:
+            continue
+
+        is_npc = getattr(occupant, "is_npc", True)
+        occupant_class = getattr(occupant, "ch_class", None)
+
+        # Non-NPCs of same class see actual words, others see garbled
+        if not is_npc and caster_class == occupant_class:
+            message = actual_msg.replace("$n", getattr(caster, "name", "Someone"))
+        else:
+            message = garbled_msg.replace("$n", getattr(caster, "name", "Someone"))
+
+        if hasattr(occupant, "messages"):
+            occupant.messages.append(message)

mud/spawning/reset_handler.py

@@ -410,7 +410,14 @@ def apply_resets(area: Area) -> None:
                 last_reset_succeeded = False
                 continue
 
-            if global_limit > 0 and mob_counts.get(mob_vnum, 0) >= global_limit:
+            # ROM parity: Check global limit using pMobIndex->count (ROM db.c:1704)
+            proto = mob_registry.get(mob_vnum)
+            proto_count = getattr(proto, "count", 0) if proto else 0
+            logging.debug(
+                f"M reset global limit check: mob_vnum={mob_vnum}, proto_count={proto_count}, global_limit={global_limit}"
+            )
+            if global_limit > 0 and proto_count >= global_limit:
+                logging.debug(f"M reset SKIPPED due to global limit: {proto_count} >= {global_limit}")
                 last_mob = None
                 last_obj = None
                 last_reset_succeeded = False
@@ -470,15 +477,17 @@ def apply_resets(area: Area) -> None:
             proto = getattr(mob, "prototype", None)
             if proto is not None and hasattr(proto, "count"):
                 proto.count = mob_counts[mob_vnum]
+
+            # ROM parity: Apply level fuzzing to mob (ROM db.c:1735)
+            # ROM C: pMob->level = URANGE(0, pMob->level - 2, LEVEL_HERO);
             try:
                 mob_level = int(getattr(mob, "level", 0) or 0)
             except Exception:
                 mob_level = 0
             hero_cap = max(0, LEVEL_HERO - 1)
-            base_level = max(0, mob_level - 2)
-            if base_level > hero_cap:
-                base_level = hero_cap
-            last_mob_level = base_level
+            fuzzed_level = max(0, min(mob_level - 2, hero_cap))
+            mob.level = fuzzed_level
+            last_mob_level = fuzzed_level
             last_mob = mob
             last_obj = None
             last_reset_succeeded = True
@@ -579,7 +588,8 @@ def apply_resets(area: Area) -> None:
                 if rev_exits and rev_idx < len(rev_exits):
                     rev_exit = rev_exits[rev_idx]
                     if rev_exit is not None:
-                        rev_exit.exit_info = int(getattr(rev_exit, "rs_flags", 0) or 0)
+                        rev_exit.rs_flags = base_flags
+                        rev_exit.exit_info = base_flags
         elif cmd == "G":
             if not last_reset_succeeded:
                 continue

mud/world/world_state.py

@@ -15,9 +15,6 @@ from mud.spawning.reset_handler import apply_resets
 
 from .linking import link_exits
 
-# Global skill registry for world initialization
-skill_registry = None
-
 _wizlock_enabled = False
 _newlock_enabled = False
 
@@ -159,18 +156,15 @@ def initialize_world(area_list_path: str | None = "area/area.lst", use_json: boo
     # Load skills registry from JSON
     from pathlib import Path
 
-    from mud.skills.registry import SkillRegistry
+    from mud.skills.registry import skill_registry as global_skill_registry
 
     skills_path = Path("data/skills.json")
     if skills_path.exists():
         try:
-            global skill_registry
-            skill_registry = SkillRegistry()
-            skill_registry.load(skills_path)
-            print(f"✅ Loaded {len(skill_registry.skills)} skills from {skills_path}")
+            global_skill_registry.load(skills_path)
+            print(f"✅ Loaded {len(global_skill_registry.skills)} skills from {skills_path}")
         except Exception as e:
             print(f"Warning: Failed to load skills from {skills_path}: {e}")
-            skill_registry = None
 
     # Load shops from JSON (needed for shopkeeper detection in resets)
     import json

{rom24_quickmud_python-2.5.0.dist-info → rom24_quickmud_python-2.5.2.dist-info}/METADATA

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

@@ -3,7 +3,7 @@ mud/__main__.py,sha256=WtSvCWscFHIlT7F_YWzIhN5xkTz0Ng8k83WbD-tuGxU,1330
 mud/advancement.py,sha256=QWGYRv337unJIzQOupLiIEfKFBge9xvRCc4PQNc0Aq8,6218
 mud/config.py,sha256=ijXo52Q2yL_dbowxMa5mKiXnNCFihWAhHYnnbih4OaY,6497
 mud/entrypoint.py,sha256=WxBW3GfbKCOtSD5rx2ccSAC7lA3YRFi7DJ_EZvi1rmo,854
-mud/game_loop.py,sha256=gIPQBw9Engfym7gZ05kvU-5cmIKmimToCd25-gQINhI,34089
+mud/game_loop.py,sha256=C7EQ1zNZDWgNZc2I_QgdxEMCdxOnc30ejy89-n_nEqU,34389
 mud/game_tick_scheduler.py,sha256=7ybo2ekDQQPGN82u6fhcrrg7tZ-JMtGy4UUrZv9_Umo,1539
 mud/logging.py,sha256=DoKcplYwEePAmXKE2CI_wNk4pF-pc_aouoxa5C6tXlc,582
 mud/mob_cmds.py,sha256=drtURAaaQtsivy8zOfJu6cOyP30L3W89qBxHRDQyLjk,34027
@@ -48,7 +48,7 @@ mud/commands/auto_settings.py,sha256=iO2GCVympiOhySHezcMXleegmswV8VrpEKUBOyXx0r0
 mud/commands/build.py,sha256=uJaJYtmFHrwAoUl0RDWPAWVHduVNZrxtPsAnH-M5j_w,85938
 mud/commands/channels.py,sha256=1PewUVrMk1Uh7dUj7ZZgUyL9xkQbSN7BY9KtBkL4GAc,1584
 mud/commands/character.py,sha256=vLkfLJlxjDIfKXGG_8q5BexbdmhoKh1tAG0Lc56qWXc,4295
-mud/commands/combat.py,sha256=Hr-ZO-qNHHU82VKxr1ciHU8KUW4EhezNA75-sDollDE,33847
+mud/commands/combat.py,sha256=uob0_6dR7IdHcHcFA7mBM9UI6X8J96WlJSt5YqEOMzs,31469
 mud/commands/communication.py,sha256=H3OjaI41Y6dbwje7RDSn2SHoqXtqlv2pjZhxSR52HnQ,19359
 mud/commands/compare.py,sha256=AmGl2OJy5KS_0U2zqv0EwSwpgfFee70oaDZC6xZ7Tzw,5176
 mud/commands/consider.py,sha256=rQwLTZq28nfdpnBmEgpV72FSvJJE5JPuPMhtMouN-hE,2230
@@ -60,7 +60,7 @@ mud/commands/equipment.py,sha256=yWfaZmDYVgRuDIFlcUWEZMzMMYQlGrXfw4hgzgMZoJk,114
 mud/commands/feedback.py,sha256=qEmUlVy1KC6ludpAREdqvf8gpa8jmgN4AMLor0EoO7E,2472
 mud/commands/give.py,sha256=njzoCLD6m2ZKzvi8yjBwzJbR-hrN7JtBCKDxXsvn1zc,6760
 mud/commands/group_commands.py,sha256=wmJj07pSImQLzGQ7QrGZPpmRGlhMQoEK4tj_cWMTLlg,12413
-mud/commands/healer.py,sha256=1ahakNX2AW36zvbgqYnT6upvfvoXL-FX3TS7zK21RVs,2296
+mud/commands/healer.py,sha256=VeRfW6ZuDFSrs6u_lae7mBCm6pGyOTWbNMhcYrFBQkQ,2771
 mud/commands/help.py,sha256=GfQWy6MyFtDc-mW1dM7pPN1SFVsWtIGno8uR4dRQYjg,11124
 mud/commands/imc.py,sha256=v1lPP2xDjQjkk7negwjCXJtcRPQkBEIGWmpPKf1XPzU,12204
 mud/commands/imm_admin.py,sha256=xshWlMpV3RCLuxkdwVxwsiQCM6ku0Nh-rqHYejyCpc8,7455
@@ -78,7 +78,7 @@ mud/commands/info_extended.py,sha256=B1XYgmtHP74DOb6ysPRFZbg7h3NOUBcudrtAePC9ufo
 mud/commands/inspection.py,sha256=IAwfVdiu3fcJvJ88Eny2bndBFdtqB4PfP01E82NDAyo,4343
 mud/commands/inventory.py,sha256=Pgq7-3crr3H4llaYxSpxVJT_sq3wU6AvR2Sb8SwXbHg,6727
 mud/commands/liquids.py,sha256=I8lPH9j446_SaP23NKNa1IOtp8L3sropDeiGRKwh798,8274
-mud/commands/magic_items.py,sha256=5wo_vPcawQc71yG03a_Z83-DQmYuMVVzien4Zx5axnA,15238
+mud/commands/magic_items.py,sha256=EECy8Nh7kjMefPE_vJvUzR_6If9_cl8z_eNS7C6QC0Q,15195
 mud/commands/misc_info.py,sha256=KXrL6V-QyCgv2Y0crnweF__gff22PE2cpPMujypHLKM,7728
 mud/commands/misc_player.py,sha256=bY-_iaOg3XrNQVhxRth-HHCvKEGII54gOrZR1cXgprs,7869
 mud/commands/mobprog_tools.py,sha256=1OXRolsjmVuBn_FtKc_I1M_sTYLYgSspqc8U9f5xFLA,5364
@@ -132,7 +132,7 @@ mud/models/area.py,sha256=RDn6e2N9AhoMW4d68-o8i1p1tNhuszaWjbOIkGTlW9I,835
 mud/models/area_json.py,sha256=GUCWUgFf2s6DUWzcLLYhoxTP38P5cu1vrSD1W3i7D2c,731
 mud/models/board.py,sha256=iO25xwmUjUCJLYY5nAJdrIweW0oryuSGffm58zy9wJ8,5169
 mud/models/board_json.py,sha256=XG8t7lLW7b_V3IjzbGF-o6Ym36CTgKiOiBVZb-M0BpA,472
-mud/models/character.py,sha256=oHHoULEANetPc4P65eEVl_Mo6LyqIIetuP5K6IovhiE,36799
+mud/models/character.py,sha256=lbOcidIIq2okdI2c9DldsTVCLlJSdtnXpRhMpXs4L8I,36796
 mud/models/character_json.py,sha256=7rdI92S-JT38xb2iUyXTAJpLmFOIRy2pb6v1Yen8VQY,1046
 mud/models/clans.py,sha256=0rAzhRdB_1k-GJpQXhANE-Vn1fEnY6oIuqDkq8kvD4c,2066
 mud/models/classes.py,sha256=Fv0KjS339EBWqz5OBZu5TYSIDSRYpoalLTBJOf-6ThI,2602
@@ -182,13 +182,14 @@ mud/security/bans.py,sha256=m78mPOsG10fmsCzD1STjIltxOJIS4Va-0E7_cL04Zr8,9036
 mud/security/hash_utils.py,sha256=GNd2W-TFLSIOk1WMQRuvJo8l4CueBYzPI0EhQuydxUg,656
 mud/skills/__init__.py,sha256=zzIr-ejbrlrQF1CSepODWhpxQZv8rO2pgaqIi3vpMg0,241
 mud/skills/groups.py,sha256=_80fJkXfrPUmTcZ9JsCJHIAhRdmmGhayMJgn1pSFcQY,8127
-mud/skills/handlers.py,sha256=k8dTOBppL_9OtBzC_7y8vrXlUGze31DLir07-3VPYP0,265247
+mud/skills/handlers.py,sha256=JPn-qRrpMzdu87sVOgbxZU0IK-LeWmzwRWRLYXuh3gk,265536
 mud/skills/metadata.py,sha256=xNpiH3EmCMWY_DtO_Pjrhs2U7bYOBxyrsTL0wC_RJes,15413
 mud/skills/registry.py,sha256=B9qmxCQZde7dZaxqdnIRTPHAMYbrnfkDT2qUlCkgvrY,13332
+mud/skills/say_spell.py,sha256=4voaTUbpYKsF0Plv9m-Eh0FK6lp1-Cz15rQBRq_XLNo,3909
 mud/spawning/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 mud/spawning/mob_spawner.py,sha256=CZSvWn1aV3AQbxcS2QFqG0OzL2qXrLUNUKvoQnDQR9o,292
 mud/spawning/obj_spawner.py,sha256=etEqWOvZsteajNO3HCzmJO7GulhxO4k_4ID9PUhZTsM,2708
-mud/spawning/reset_handler.py,sha256=pi3A7WMghn1uYTIC75Ygm7nu_JM2IaPdlX16fdRJ4rw,32493
+mud/spawning/reset_handler.py,sha256=wtp-S0GP4XzhC7a6ekPrhnoxGXsixMT5sRvAXb2Vo84,33092
 mud/spawning/templates.py,sha256=oyFsjjGW-cuEhMs9H1amoSqsWjlsnT7QpbOvlx1PDWs,15110
 mud/utils/act.py,sha256=3GJVlnztkt4d2sMkxgL9uKGLerok8chTf_hM_N8mcaI,4224
 mud/utils/rng_mm.py,sha256=7kCeV9Q6mqvTDaiIwrcEaSarlmFtNjJTYuLYUWYBs5U,3591
@@ -200,10 +201,10 @@ mud/world/look.py,sha256=n9ecKP3y9lEZuzKn2GHsXyd-azfD_vbfeHHCGdEKZls,9631
 mud/world/movement.py,sha256=Y7it7pXrPORgKyy2tRB8br_kb4-s9UK-gj0N-E2U9oM,18695
 mud/world/obj_find.py,sha256=4VAUSwWxhyYIMZIfxdDhKMAP5FZ0NpRikgX02vy0elo,4201
 mud/world/vision.py,sha256=q8VjzSzm0cbNrHX6-o0j1UG-jlcM3Z9bzUxK6T-Bsi8,9862
-mud/world/world_state.py,sha256=W9ABMADlY5H-ZmywACsryFKZp34OufjzMRD6WT331qg,7917
-rom24_quickmud_python-2.5.0.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.5.0.dist-info/METADATA,sha256=ZmF53axq1IGRQIWjEcHpCJoqa1e5tBFuO8duZBrx-qE,12368
-rom24_quickmud_python-2.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rom24_quickmud_python-2.5.0.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.5.0.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.5.0.dist-info/RECORD,,
+mud/world/world_state.py,sha256=tmbLaYKkHTa69Mk3Ul4seMvxSNe_MAVJeibWVvwDTGQ,7772
+rom24_quickmud_python-2.5.2.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.5.2.dist-info/METADATA,sha256=LZD6OYtT_iwkAO9uUavP0A1avrbhqUva5j4ChdpzhlE,12368
+rom24_quickmud_python-2.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rom24_quickmud_python-2.5.2.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.5.2.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.5.2.dist-info/RECORD,,