rom24-quickmud-python 2.4.0__py3-none-any.whl → 2.4.2__py3-none-any.whl

mud/commands/equipment.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from mud.models.constants import ItemType, Position, WearLocation
+from mud.models.constants import ItemType, Position, WearFlag, WearLocation
 
 if TYPE_CHECKING:
     from mud.models.character import Character
@@ -45,12 +45,13 @@ def do_wear(ch: Character, args: str) -> str:
 
     # Determine where this can be worn
     wear_flags = getattr(obj, "wear_flags", 0)
-    item_type = getattr(obj, "item_type", ItemType.TRASH)
+    item_type_str = getattr(obj, "item_type", None)
+    item_type = int(item_type_str) if item_type_str else ItemType.TRASH
 
     # Weapons and held items should use wield/hold
     if item_type == ItemType.WEAPON:
         return "You need to wield weapons, not wear them."
-    if wear_flags & WearLocation.WEAR_HOLD:
+    if wear_flags & WearFlag.HOLD:
         return "You need to hold that, not wear it."
 
     # Find appropriate wear location
@@ -73,7 +74,7 @@ def do_wear(ch: Character, args: str) -> str:
     obj.wear_loc = wear_loc
 
     # Remove from inventory
-    inventory = getattr(ch, "carrying", [])
+    inventory = getattr(ch, "inventory", [])
     if obj in inventory:
         inventory.remove(obj)
 
@@ -105,8 +106,9 @@ def do_wield(ch: Character, args: str) -> str:
     if ch.position < Position.SLEEPING:
         return "You can't do that right now."
 
-    # Check if it's a weapon
-    item_type = getattr(obj, "item_type", ItemType.TRASH)
+    # Check if it's a weapon (item_type is stored as string, enum value is int)
+    item_type_str = getattr(obj, "item_type", None)
+    item_type = int(item_type_str) if item_type_str else ItemType.TRASH
     if item_type != ItemType.WEAPON:
         return "You can't wield that."
 
@@ -137,7 +139,7 @@ def do_wield(ch: Character, args: str) -> str:
     obj.wear_loc = wear_loc
 
     # Remove from inventory
-    inventory = getattr(ch, "carrying", [])
+    inventory = getattr(ch, "inventory", [])
     if obj in inventory:
         inventory.remove(obj)
 
@@ -171,12 +173,12 @@ def do_hold(ch: Character, args: str) -> str:
 
     # Check if it can be held
     wear_flags = getattr(obj, "wear_flags", 0)
-    if not (wear_flags & WearLocation.WEAR_HOLD):
+    if not (wear_flags & WearFlag.HOLD):
         return "You can't hold that."
 
     # Check if hold slot is occupied
     equipment = getattr(ch, "equipment", {})
-    wear_loc = WearLocation.WEAR_HOLD
+    wear_loc = WearLocation.HOLD
 
     if wear_loc in equipment and equipment[wear_loc] is not None:
         existing = equipment[wear_loc]
@@ -191,14 +193,15 @@ def do_hold(ch: Character, args: str) -> str:
     obj.wear_loc = wear_loc
 
     # Remove from inventory
-    inventory = getattr(ch, "carrying", [])
+    inventory = getattr(ch, "inventory", [])
     if obj in inventory:
         inventory.remove(obj)
 
     obj_name = getattr(obj, "short_descr", "something")
 
-    # Special message for lights
-    item_type = getattr(obj, "item_type", ItemType.TRASH)
+    # Special message for lights (item_type is stored as string)
+    item_type_str = getattr(obj, "item_type", None)
+    item_type = int(item_type_str) if item_type_str else ItemType.TRASH
     if item_type == ItemType.LIGHT:
         return f"You hold {obj_name} as your light."
 
@@ -207,7 +210,7 @@ def do_hold(ch: Character, args: str) -> str:
 
 def _wear_all(ch: Character) -> str:
     """Wear all wearable items in inventory."""
-    inventory = getattr(ch, "carrying", [])
+    inventory = getattr(ch, "inventory", [])
     if not inventory:
         return "You are not carrying anything."
 
@@ -218,12 +221,13 @@ def _wear_all(ch: Character) -> str:
             continue
 
         # Skip weapons and held items
-        item_type = getattr(obj, "item_type", ItemType.TRASH)
+        item_type_str = getattr(obj, "item_type", None)
+        item_type = int(item_type_str) if item_type_str else ItemType.TRASH
         wear_flags = getattr(obj, "wear_flags", 0)
 
         if item_type == ItemType.WEAPON:
             continue
-        if wear_flags & WearLocation.WEAR_HOLD:
+        if wear_flags & WearFlag.HOLD:
             continue
 
         # Try to wear it
@@ -255,39 +259,40 @@ def _wear_all(ch: Character) -> str:
 def _get_wear_location(obj: Object, wear_flags: int) -> WearLocation | None:
     """Determine which slot an item should be worn in."""
     # Priority order for wear locations (from ROM)
-    if wear_flags & WearLocation.WEAR_FINGER:
-        return WearLocation.WEAR_FINGER
-    if wear_flags & WearLocation.WEAR_NECK:
-        return WearLocation.WEAR_NECK
-    if wear_flags & WearLocation.WEAR_BODY:
-        return WearLocation.WEAR_BODY
-    if wear_flags & WearLocation.WEAR_HEAD:
-        return WearLocation.WEAR_HEAD
-    if wear_flags & WearLocation.WEAR_LEGS:
-        return WearLocation.WEAR_LEGS
-    if wear_flags & WearLocation.WEAR_FEET:
-        return WearLocation.WEAR_FEET
-    if wear_flags & WearLocation.WEAR_HANDS:
-        return WearLocation.WEAR_HANDS
-    if wear_flags & WearLocation.WEAR_ARMS:
-        return WearLocation.WEAR_ARMS
-    if wear_flags & WearLocation.WEAR_ABOUT:
-        return WearLocation.WEAR_ABOUT
-    if wear_flags & WearLocation.WEAR_WAIST:
-        return WearLocation.WEAR_WAIST
-    if wear_flags & WearLocation.WEAR_WRIST:
-        return WearLocation.WEAR_WRIST
-    if wear_flags & WearLocation.WEAR_SHIELD:
-        return WearLocation.WEAR_SHIELD
-    if wear_flags & WearLocation.WEAR_FLOAT:
-        return WearLocation.WEAR_FLOAT
+    # Check WearFlag bits and return corresponding WearLocation slot
+    if wear_flags & WearFlag.WEAR_FINGER:
+        return WearLocation.FINGER_L  # Will need multi-slot handling later
+    if wear_flags & WearFlag.WEAR_NECK:
+        return WearLocation.NECK_1
+    if wear_flags & WearFlag.WEAR_BODY:
+        return WearLocation.BODY
+    if wear_flags & WearFlag.WEAR_HEAD:
+        return WearLocation.HEAD
+    if wear_flags & WearFlag.WEAR_LEGS:
+        return WearLocation.LEGS
+    if wear_flags & WearFlag.WEAR_FEET:
+        return WearLocation.FEET
+    if wear_flags & WearFlag.WEAR_HANDS:
+        return WearLocation.HANDS
+    if wear_flags & WearFlag.WEAR_ARMS:
+        return WearLocation.ARMS
+    if wear_flags & WearFlag.WEAR_ABOUT:
+        return WearLocation.ABOUT
+    if wear_flags & WearFlag.WEAR_WAIST:
+        return WearLocation.WAIST
+    if wear_flags & WearFlag.WEAR_WRIST:
+        return WearLocation.WRIST_L  # Will need multi-slot handling later
+    if wear_flags & WearFlag.WEAR_SHIELD:
+        return WearLocation.SHIELD
+    if wear_flags & WearFlag.WEAR_FLOAT:
+        return WearLocation.FLOAT
 
     return None
 
 
 def _find_obj_inventory(ch: Character, name: str) -> Object | None:
     """Find an object in character's inventory by name."""
-    inventory = getattr(ch, "carrying", [])
+    inventory = getattr(ch, "inventory", [])
     if not inventory or not name:
         return None
 

mud/commands/obj_manipulation.py

@@ -3,6 +3,7 @@ Player essential object commands - put, remove, quaff, sacrifice.
 
 ROM Reference: src/act_obj.c
 """
+
 from __future__ import annotations
 
 from mud.models.character import Character
@@ -21,11 +22,11 @@ CONT_PUT_ON = 16
 def get_obj_list(char: Character, name: str, obj_list: list) -> object | None:
     """
     Find an object in a list by name.
-    
+
     ROM Reference: src/handler.c get_obj_list
     """
     name_lower = name.lower()
-    
+
     # Handle numbered prefix (2.sword, 3.potion)
     count = 0
     number = 1
@@ -33,26 +34,26 @@ def get_obj_list(char: Character, name: str, obj_list: list) -> object | None:
         parts = name.split(".", 1)
         number = int(parts[0])
         name_lower = parts[1].lower()
-    
+
     for obj in obj_list:
         obj_name = getattr(obj, "name", "").lower()
         short = getattr(obj, "short_descr", "").lower()
-        
+
         # Check if name matches any keyword
         if name_lower in obj_name.split() or name_lower in obj_name or name_lower in short:
             count += 1
             if count == number:
                 return obj
-    
+
     return None
 
 
 def do_put(char: Character, args: str) -> str:
     """
     Put an item into a container.
-    
+
     ROM Reference: src/act_obj.c do_put (lines 346-490)
-    
+
     Usage:
     - put <item> <container>
     - put <item> in <container>
@@ -61,156 +62,156 @@ def do_put(char: Character, args: str) -> str:
     """
     if not args or not args.strip():
         return "Put what in what?"
-    
+
     parts = args.strip().split()
     if len(parts) < 2:
         return "Put what in what?"
-    
+
     item_name = parts[0]
     container_name = parts[-1]
-    
+
     # Handle "put x in y" or "put x on y"
     if len(parts) >= 3 and parts[1].lower() in ("in", "on"):
         container_name = parts[2] if len(parts) > 2 else parts[-1]
-    
+
     # Can't put into all
     if container_name.lower() == "all" or container_name.lower().startswith("all."):
         return "You can't do that."
-    
+
     # Find the container
     container = get_obj_here(char, container_name)
     if container is None:
         return f"I see no {container_name} here."
-    
+
     # Check if it's a container
     item_type = _get_item_type(container)
     if item_type != ItemType.CONTAINER and str(item_type) != "container":
         return "That's not a container."
-    
+
     # Check if closed
     container_value = getattr(container, "value", [0, 0, 0, 0, 0])
     if len(container_value) > 1 and (container_value[1] & CONT_CLOSED):
         container_name = getattr(container, "name", "container")
         return f"The {container_name.split()[0]} is closed."
-    
+
     # Handle single item or all
     if item_name.lower() != "all" and not item_name.lower().startswith("all."):
         # Single item
         obj = get_obj_carry(char, item_name)
         if obj is None:
             return "You do not have that item."
-        
+
         if obj is container:
             return "You can't fold it into itself."
-        
+
         # Check if can drop
         if not _can_drop_obj(char, obj):
             return "You can't let go of it."
-        
+
         # Check weight
         obj_weight = _get_obj_weight(obj)
         container_weight = _get_true_weight(container)
         max_weight = container_value[0] * 10 if len(container_value) > 0 else 1000
         max_single = container_value[3] * 10 if len(container_value) > 3 else 1000
-        
+
         if obj_weight + container_weight > max_weight or obj_weight > max_single:
             return "It won't fit."
-        
+
         # Transfer the item
         _obj_from_char(char, obj)
         _obj_to_obj(obj, container)
-        
+
         obj_name = getattr(obj, "short_descr", "something")
         container_short = getattr(container, "short_descr", "something")
-        
+
         if len(container_value) > 1 and (container_value[1] & CONT_PUT_ON):
             return f"You put {obj_name} on {container_short}."
         else:
             return f"You put {obj_name} in {container_short}."
-    
+
     else:
         # Put all or all.<type>
         filter_name = None
         if item_name.lower().startswith("all."):
             filter_name = item_name[4:].lower()
-        
+
         carrying = list(getattr(char, "carrying", []))
         count = 0
         messages = []
-        
+
         for obj in carrying:
             # Skip if doesn't match filter
             if filter_name:
                 obj_name = getattr(obj, "name", "").lower()
                 if filter_name not in obj_name:
                     continue
-            
+
             # Skip if worn
             if getattr(obj, "wear_loc", -1) != -1:
                 continue
-            
+
             # Skip container itself
             if obj is container:
                 continue
-            
+
             # Skip if can't drop
             if not _can_drop_obj(char, obj):
                 continue
-            
+
             # Check weight
             obj_weight = _get_obj_weight(obj)
             container_weight = _get_true_weight(container)
             max_weight = container_value[0] * 10 if len(container_value) > 0 else 1000
             max_single = container_value[3] * 10 if len(container_value) > 3 else 1000
-            
+
             if obj_weight + container_weight > max_weight or obj_weight > max_single:
                 continue
-            
+
             # Transfer
             _obj_from_char(char, obj)
             _obj_to_obj(obj, container)
-            
+
             obj_short = getattr(obj, "short_descr", "something")
             container_short = getattr(container, "short_descr", "something")
-            
+
             if len(container_value) > 1 and (container_value[1] & CONT_PUT_ON):
                 messages.append(f"You put {obj_short} on {container_short}.")
             else:
                 messages.append(f"You put {obj_short} in {container_short}.")
             count += 1
-        
+
         if count == 0:
             return "You have nothing to put."
-        
+
         return "\n".join(messages)
 
 
 def do_remove(char: Character, args: str) -> str:
     """
     Remove a worn item.
-    
+
     ROM Reference: src/act_obj.c do_remove (lines 1740-1763)
-    
+
     Usage: remove <item>
     """
     if not args or not args.strip():
         return "Remove what?"
-    
+
     item_name = args.strip().split()[0]
-    
+
     # Find worn item
     obj = get_obj_wear(char, item_name)
     if obj is None:
         return "You do not have that item."
-    
+
     # Get wear location
     wear_loc = getattr(obj, "wear_loc", -1)
     if wear_loc == -1:
         return "You aren't wearing that."
-    
+
     # Remove the item
     _remove_obj(char, obj)
-    
+
     obj_name = getattr(obj, "short_descr", "something")
     return f"You stop using {obj_name}."
 
@@ -218,64 +219,64 @@ def do_remove(char: Character, args: str) -> str:
 def do_sacrifice(char: Character, args: str) -> str:
     """
     Sacrifice an item for silver coins.
-    
+
     ROM Reference: src/act_obj.c do_sacrifice (lines 1765-1862)
-    
+
     Usage: sacrifice <item>
     """
     if not args or not args.strip():
         # Self-sacrifice message
         char_name = getattr(char, "name", "someone")
         return "Mota appreciates your offer and may accept it later."
-    
+
     item_name = args.strip().split()[0]
     char_name = getattr(char, "name", "someone")
-    
+
     if item_name.lower() == char_name.lower():
         return "Mota appreciates your offer and may accept it later."
-    
+
     # Find item in room
     room = getattr(char, "room", None)
     if not room:
         return "You can't find it."
-    
+
     contents = getattr(room, "contents", [])
     obj = get_obj_list(char, item_name, contents)
-    
+
     if obj is None:
         return "You can't find it."
-    
+
     # Check for PC corpse with contents
     item_type = _get_item_type(obj)
     if item_type == ItemType.CORPSE_PC or str(item_type) == "corpse_pc":
         obj_contents = getattr(obj, "contains", [])
         if obj_contents:
             return "Mota wouldn't like that."
-    
+
     # Check if can take/sacrifice
     wear_flags = getattr(obj, "wear_flags", 0)
     if not hasattr(obj, "wear_flags"):
         proto = getattr(obj, "prototype", None)
         if proto:
             wear_flags = getattr(proto, "wear_flags", 0)
-    
+
     extra_flags = getattr(obj, "extra_flags", 0)
     if not hasattr(obj, "extra_flags"):
         proto = getattr(obj, "prototype", None)
         if proto:
             extra_flags = getattr(proto, "extra_flags", 0)
-    
+
     ITEM_TAKE = 1
     ITEM_NO_SAC = 0x4000  # Bit 14
-    
+
     if not (wear_flags & ITEM_TAKE):
         obj_name = getattr(obj, "short_descr", "That")
         return f"{obj_name} is not an acceptable sacrifice."
-    
+
     if extra_flags & ITEM_NO_SAC:
         obj_name = getattr(obj, "short_descr", "That")
         return f"{obj_name} is not an acceptable sacrifice."
-    
+
     # Check if someone is using the object
     room_people = getattr(room, "people", [])
     for person in room_people:
@@ -283,24 +284,23 @@ def do_sacrifice(char: Character, args: str) -> str:
             person_name = getattr(person, "name", "Someone")
             obj_name = getattr(obj, "short_descr", "it")
             return f"{person_name} appears to be using {obj_name}."
-    
+
     # Calculate silver reward
     obj_level = getattr(obj, "level", 1)
     obj_cost = getattr(obj, "cost", 0)
-    
+
     silver = max(1, obj_level * 3)
-    
+
     # Non-corpse items capped at cost
-    if item_type not in (ItemType.CORPSE_NPC, ItemType.CORPSE_PC) and \
-       str(item_type) not in ("corpse_npc", "corpse_pc"):
+    if item_type not in (ItemType.CORPSE_NPC, ItemType.CORPSE_PC) and str(item_type) not in ("corpse_npc", "corpse_pc"):
         silver = min(silver, obj_cost) if obj_cost > 0 else silver
-    
+
     # Give silver
     char.silver = getattr(char, "silver", 0) + silver
-    
+
     # Remove object
     _extract_obj(char, obj)
-    
+
     # Auto-split if enabled
     act_flags = getattr(char, "act", 0)
     PLR_AUTOSPLIT = 0x00002000
@@ -309,8 +309,9 @@ def do_sacrifice(char: Character, args: str) -> str:
         members = _count_group_members(char)
         if members > 1:
             from mud.commands.group_commands import do_split
+
             do_split(char, str(silver))
-    
+
     if silver == 1:
         return "Mota gives you one silver coin for your sacrifice."
     else:
@@ -320,51 +321,52 @@ def do_sacrifice(char: Character, args: str) -> str:
 def do_quaff(char: Character, args: str) -> str:
     """
     Drink a potion.
-    
+
     ROM Reference: src/act_obj.c do_quaff (lines 1865-1906)
-    
+
     Usage: quaff <potion>
     """
     if not args or not args.strip():
         return "Quaff what?"
-    
+
     item_name = args.strip().split()[0]
-    
+
     # Find potion in inventory
     obj = get_obj_carry(char, item_name)
     if obj is None:
         return "You do not have that potion."
-    
+
     # Check if it's a potion
     item_type = _get_item_type(obj)
     if item_type != ItemType.POTION and str(item_type) != "potion":
         return "You can quaff only potions."
-    
+
     # Check level
     obj_level = getattr(obj, "level", 1)
     char_level = getattr(char, "level", 1)
-    
+
     if char_level < obj_level:
         return "This liquid is too powerful for you to drink."
-    
+
     obj_name = getattr(obj, "short_descr", "something")
-    
+
     # Cast the spells from the potion
     obj_value = getattr(obj, "value", [0, 0, 0, 0, 0])
     spell_level = obj_value[0] if len(obj_value) > 0 else 1
-    
+
     for i in range(1, 4):
         if len(obj_value) > i and obj_value[i]:
             _obj_cast_spell(obj_value[i], spell_level, char, char, None)
-    
+
     # Remove the potion
     _extract_obj(char, obj)
-    
+
     return f"You quaff {obj_name}."
 
 
 # Helper functions
 
+
 def _get_item_type(obj) -> ItemType:
     """Get item type from object or prototype."""
     item_type = getattr(obj, "item_type", None)
@@ -382,12 +384,12 @@ def _get_obj_weight(obj) -> int:
         proto = getattr(obj, "prototype", None)
         if proto:
             weight = getattr(proto, "weight", 0)
-    
+
     # Add contents weight
     contains = getattr(obj, "contains", [])
     for contained in contains:
         weight += _get_obj_weight(contained)
-    
+
     return weight
 
 
@@ -415,7 +417,7 @@ def _obj_from_char(char: Character, obj) -> None:
     if obj in carrying:
         carrying.remove(obj)
     obj.carried_by = None
-    
+
     # Update carry weight/number
     weight = _get_obj_weight(obj)
     char.carry_weight = max(0, getattr(char, "carry_weight", 0) - weight)
@@ -437,16 +439,25 @@ def _remove_obj(char: Character, obj) -> None:
     wear_loc = getattr(obj, "wear_loc", -1)
     if wear_loc == -1:
         return
-    
+
     obj.wear_loc = -1  # WEAR_NONE
-    
-    # Move to inventory
-    carrying = getattr(char, "carrying", None)
-    if carrying is None:
-        char.carrying = []
-        carrying = char.carrying
-    if obj not in carrying:
-        carrying.append(obj)
+
+    # Remove from equipment dict
+    equipment = getattr(char, "equipment", {})
+    if equipment:
+        # Find and remove from equipment dict by value
+        for slot, equipped_obj in list(equipment.items()):
+            if equipped_obj == obj:
+                del equipment[slot]
+                break
+
+    # Move to inventory (Character model uses 'inventory', not 'carrying')
+    inventory = getattr(char, "inventory", None)
+    if inventory is None:
+        char.inventory = []
+        inventory = char.inventory
+    if obj not in inventory:
+        inventory.append(obj)
 
 
 def _extract_obj(char: Character, obj) -> None:
@@ -456,11 +467,11 @@ def _extract_obj(char: Character, obj) -> None:
         contents = getattr(room, "contents", [])
         if obj in contents:
             contents.remove(obj)
-    
+
     carrying = getattr(char, "carrying", [])
     if obj in carrying:
         carrying.remove(obj)
-    
+
     # Clear references
     obj.in_room = None
     obj.carried_by = None
@@ -472,13 +483,13 @@ def _count_group_members(char: Character) -> int:
     room = getattr(char, "room", None)
     if not room:
         return 1
-    
+
     count = 0
     room_people = getattr(room, "people", [])
     for person in room_people:
         if _is_same_group(person, char):
             count += 1
-    
+
     return max(1, count)
 
 
@@ -486,11 +497,11 @@ def _is_same_group(char1: Character, char2: Character) -> bool:
     """Check if two characters are in the same group."""
     if char1 is char2:
         return True
-    
+
     # Check if following same leader
     leader1 = getattr(char1, "leader", None) or char1
     leader2 = getattr(char2, "leader", None) or char2
-    
+
     return leader1 is leader2
 
 

mud/world/obj_find.py

@@ -3,6 +3,7 @@ Object finding utilities - find objects by name.
 
 ROM Reference: src/handler.c get_obj_carry, get_obj_wear, get_obj_here, etc.
 """
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
@@ -15,16 +16,16 @@ if TYPE_CHECKING:
 def get_obj_carry(char: "Character", name: str) -> "Obj | None":
     """
     Find an object in character's inventory by name.
-    
+
     ROM Reference: src/handler.c get_obj_carry
     """
     if not name:
         return None
-    
+
     # Parse N.name format
     count = 0
     target_count = 1
-    
+
     if "." in name:
         parts = name.split(".", 1)
         try:
@@ -32,35 +33,35 @@ def get_obj_carry(char: "Character", name: str) -> "Obj | None":
             name = parts[1]
         except ValueError:
             pass
-    
+
     name_lower = name.lower()
-    
+
     # Search inventory
     for obj in getattr(char, "carrying", []):
         obj_name = getattr(obj, "name", "").lower()
         obj_short = (getattr(obj, "short_descr", "") or "").lower()
-        
+
         if name_lower in obj_name or name_lower in obj_short:
             count += 1
             if count == target_count:
                 return obj
-    
+
     return None
 
 
 def get_obj_wear(char: "Character", name: str) -> "Obj | None":
     """
     Find an object in character's equipment by name.
-    
+
     ROM Reference: src/handler.c get_obj_wear
     """
     if not name:
         return None
-    
+
     # Parse N.name format
     count = 0
     target_count = 1
-    
+
     if "." in name:
         parts = name.split(".", 1)
         try:
@@ -68,32 +69,32 @@ def get_obj_wear(char: "Character", name: str) -> "Obj | None":
             name = parts[1]
         except ValueError:
             pass
-    
+
     name_lower = name.lower()
-    
-    # Search equipment
-    equipped = getattr(char, "equipped", {})
+
+    # Search equipment (Character model uses 'equipment', not 'equipped')
+    equipped = getattr(char, "equipment", {})
     for obj in equipped.values():
         if obj is None:
             continue
-        
+
         obj_name = getattr(obj, "name", "").lower()
         obj_short = (getattr(obj, "short_descr", "") or "").lower()
-        
+
         if name_lower in obj_name or name_lower in obj_short:
             count += 1
             if count == target_count:
                 return obj
-    
+
     return None
 
 
 def get_obj_here(char: "Character", name: str) -> "Obj | None":
     """
     Find an object in the room by name.
-    
+
     ROM Reference: src/handler.c get_obj_here
-    
+
     Searches:
     1. Character's inventory
     2. Character's equipment
@@ -101,26 +102,26 @@ def get_obj_here(char: "Character", name: str) -> "Obj | None":
     """
     if not name:
         return None
-    
+
     # Check inventory first
     obj = get_obj_carry(char, name)
     if obj:
         return obj
-    
+
     # Check equipment
     obj = get_obj_wear(char, name)
     if obj:
         return obj
-    
+
     # Check room
     room = getattr(char, "room", None)
     if not room:
         return None
-    
+
     # Parse N.name format
     count = 0
     target_count = 1
-    
+
     if "." in name:
         parts = name.split(".", 1)
         try:
@@ -128,36 +129,36 @@ def get_obj_here(char: "Character", name: str) -> "Obj | None":
             name = parts[1]
         except ValueError:
             pass
-    
+
     name_lower = name.lower()
-    
+
     for obj in getattr(room, "contents", []):
         obj_name = getattr(obj, "name", "").lower()
         obj_short = (getattr(obj, "short_descr", "") or "").lower()
-        
+
         if name_lower in obj_name or name_lower in obj_short:
             count += 1
             if count == target_count:
                 return obj
-    
+
     return None
 
 
 def get_obj_world(char: "Character", name: str) -> "Obj | None":
     """
     Find an object anywhere in the world by name.
-    
+
     ROM Reference: src/handler.c get_obj_world
     """
     from mud.registry import object_registry
-    
+
     if not name:
         return None
-    
+
     # Parse N.name format
     count = 0
     target_count = 1
-    
+
     if "." in name:
         parts = name.split(".", 1)
         try:
@@ -165,16 +166,16 @@ def get_obj_world(char: "Character", name: str) -> "Obj | None":
             name = parts[1]
         except ValueError:
             pass
-    
+
     name_lower = name.lower()
-    
+
     for obj in object_registry.values():
         obj_name = getattr(obj, "name", "").lower()
         obj_short = (getattr(obj, "short_descr", "") or "").lower()
-        
+
         if name_lower in obj_name or name_lower in obj_short:
             count += 1
             if count == target_count:
                 return obj
-    
+
     return None

{rom24_quickmud_python-2.4.0.dist-info → rom24_quickmud_python-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.4.0
+Version: 2.4.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>
@@ -53,7 +53,7 @@ Dynamic: license-file
 
 # QuickMUD - A Modern ROM 2.4 Python Port
 
-[![Version](https://img.shields.io/badge/version-2.3.1-blue.svg)](https://github.com/avinson/rom24-quickmud)
+[![Version](https://img.shields.io/badge/version-2.4.2-blue.svg)](https://github.com/avinson/rom24-quickmud)
 [![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-1555%20passing-brightgreen.svg)](https://github.com/Nostoi/rom24-quickmud-python)

{rom24_quickmud_python-2.4.0.dist-info → rom24_quickmud_python-2.4.2.dist-info}/RECORD

@@ -55,7 +55,7 @@ mud/commands/consumption.py,sha256=oKhXIS0mPRr-qq8HRxEHrrsSaHY_rgfjqjd8xC46_Eg,8
 mud/commands/decorators.py,sha256=n_ezcovFkycAZOVxg0UNtMZLtiSlF0Yj8yqYt4YVY1U,345
 mud/commands/dispatcher.py,sha256=cWfQaUG8KH3KAwZKFb5UC9Ti-8KGJO4dsCIZ4heKd2w,38406
 mud/commands/doors.py,sha256=M3TUHyD2PULh5H4Dsj1k6Jgn8qvAIWW687d2tyTVdyM,16058
-mud/commands/equipment.py,sha256=RknjKfCLeR1djSHF3jvB3LHcTjFpuuRJJNSgdtnn17A,9075
+mud/commands/equipment.py,sha256=3k_hfmY_DgwN94cMkGrwfmYWfSDsAYPWvGwYjyfo-JI,9445
 mud/commands/feedback.py,sha256=qEmUlVy1KC6ludpAREdqvf8gpa8jmgN4AMLor0EoO7E,2472
 mud/commands/give.py,sha256=njzoCLD6m2ZKzvi8yjBwzJbR-hrN7JtBCKDxXsvn1zc,6760
 mud/commands/group_commands.py,sha256=wmJj07pSImQLzGQ7QrGZPpmRGlhMQoEK4tj_cWMTLlg,12413
@@ -84,7 +84,7 @@ mud/commands/mobprog_tools.py,sha256=1OXRolsjmVuBn_FtKc_I1M_sTYLYgSspqc8U9f5xFLA
 mud/commands/movement.py,sha256=JT67SMTQ8ZRISEcaSnYBNxk37_JAxDgt1AaOYuyBAN0,2725
 mud/commands/murder.py,sha256=tLYlhu2OJ52_LCOEweAC-3J4B4okATPOuwISfauazNE,3783
 mud/commands/notes.py,sha256=DqKaCnUuKenpdItUJMTOW9CHeZ5F2Xg4Df9JMB0OEoU,15794
-mud/commands/obj_manipulation.py,sha256=g4ZTIUrt6mdq7jqfMR7KymeLETEWF2sNZZVGEbTVo9s,15466
+mud/commands/obj_manipulation.py,sha256=om_RyP9mwlrpi2ZvMSe4i55Xq7idpaS1OQOn-ZYM5mU,15370
 mud/commands/player_config.py,sha256=1J7v-viVe40slfLfzDC42ZLLMwF0vixdWkWFlMIvc0I,6082
 mud/commands/player_info.py,sha256=rZBb3s4saq9kVyjP5Xg7K6udPiZTyptp9O0Ynpe8Etw,4811
 mud/commands/position.py,sha256=hK-VBeiKjvngAbGlhzXk_GRwIaZu4bXb3FMHuH8L-6U,2418
@@ -197,12 +197,12 @@ mud/world/char_find.py,sha256=9k4q1ucT1O_YvN1WUMKh-ePfA1eSEwR2JP0fAyg1P4Q,3523
 mud/world/linking.py,sha256=mxEvgqA9Y6sDGXxN46aauU-jBhx4dOUcbgq64fIVz8g,1169
 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=7QjVAhA-XEqAEm0CoanNtBuYj6rKijNSu8Vu1JcueMY,4304
+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.4.0.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.4.0.dist-info/METADATA,sha256=fbzQz278u1MuZZ0fLJF9EKAtwrmNG5hmO_AoIBGkJjY,11748
-rom24_quickmud_python-2.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rom24_quickmud_python-2.4.0.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.4.0.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.4.0.dist-info/RECORD,,
+rom24_quickmud_python-2.4.2.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.4.2.dist-info/METADATA,sha256=WfHxo2qytCggbZ2GW2IVwi9XOcU9uXx-gk-ME3N7iAo,11748
+rom24_quickmud_python-2.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rom24_quickmud_python-2.4.2.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.4.2.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.4.2.dist-info/RECORD,,