rom24-quickmud-python 2.3.1__py3-none-any.whl → 2.4.1__py3-none-any.whl

mud/commands/auto_settings.py

@@ -4,297 +4,278 @@ Also: brief, compact, combine, prompt, color.
 
 ROM Reference: src/act_info.c lines 659-950
 """
+
 from __future__ import annotations
 
 from mud.models.character import Character
-
-
-# Player act flags (PLR_*)
-PLR_AUTOASSIST = 0x00000100
-PLR_AUTOEXIT = 0x00000200
-PLR_AUTOGOLD = 0x00000400
-PLR_AUTOLOOT = 0x00000800
-PLR_AUTOSAC = 0x00001000
-PLR_AUTOSPLIT = 0x00002000
-PLR_HOLYLIGHT = 0x00004000
-PLR_CANLOOT = 0x00008000
-PLR_NOSUMMON = 0x00010000
-PLR_NOFOLLOW = 0x00020000
-
-# Comm flags (COMM_*)
-COMM_COMPACT = 0x00000001
-COMM_BRIEF = 0x00000002
-COMM_PROMPT = 0x00000004
-COMM_COMBINE = 0x00000008
-COMM_TELNET_GA = 0x00000010
-COMM_NOCOLOUR = 0x00000020
+from mud.models.constants import CommFlag, PlayerFlag
 
 
 def do_autolist(char: Character, args: str) -> str:
     """
     List all auto-settings and their status.
-    
+
     ROM Reference: src/act_info.c do_autolist (lines 659-742)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
     comm_flags = getattr(char, "comm", 0)
-    
+
     lines = []
     lines.append("   action     status")
     lines.append("---------------------")
-    
+
     # Auto settings
     settings = [
-        ("autoassist", act_flags & PLR_AUTOASSIST),
-        ("autoexit", act_flags & PLR_AUTOEXIT),
-        ("autogold", act_flags & PLR_AUTOGOLD),
-        ("autoloot", act_flags & PLR_AUTOLOOT),
-        ("autosac", act_flags & PLR_AUTOSAC),
-        ("autosplit", act_flags & PLR_AUTOSPLIT),
-        ("telnetga", comm_flags & COMM_TELNET_GA),
-        ("compact mode", comm_flags & COMM_COMPACT),
-        ("prompt", comm_flags & COMM_PROMPT),
-        ("combine items", comm_flags & COMM_COMBINE),
+        ("autoassist", act_flags & PlayerFlag.AUTOASSIST),
+        ("autoexit", act_flags & PlayerFlag.AUTOEXIT),
+        ("autogold", act_flags & PlayerFlag.AUTOGOLD),
+        ("autoloot", act_flags & PlayerFlag.AUTOLOOT),
+        ("autosac", act_flags & PlayerFlag.AUTOSAC),
+        ("autosplit", act_flags & PlayerFlag.AUTOSPLIT),
+        ("telnetga", comm_flags & CommFlag.TELNET_GA),
+        ("compact mode", comm_flags & CommFlag.COMPACT),
+        ("prompt", comm_flags & CommFlag.PROMPT),
+        ("combine items", comm_flags & CommFlag.COMBINE),
     ]
-    
+
     for name, is_on in settings:
         status = "{GON{x" if is_on else "{ROFF{x"
         lines.append(f"{name:14} {status}")
-    
+
     # Extra info
-    if not (act_flags & PLR_CANLOOT):
+    if not (act_flags & PlayerFlag.CANLOOT):
         lines.append("Your corpse is safe from thieves.")
     else:
         lines.append("Your corpse may be looted.")
-    
-    if act_flags & PLR_NOSUMMON:
+
+    if act_flags & PlayerFlag.NOSUMMON:
         lines.append("You cannot be summoned.")
     else:
         lines.append("You can be summoned.")
-    
-    if act_flags & PLR_NOFOLLOW:
+
+    if act_flags & PlayerFlag.NOFOLLOW:
         lines.append("You do not welcome followers.")
     else:
         lines.append("You accept followers.")
-    
+
     return "\n".join(lines)
 
 
 def do_autoall(char: Character, args: str) -> str:
     """
     Toggle all auto-settings on or off.
-    
+
     ROM Reference: src/act_info.c do_autoall (lines 846-875)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     arg = (args or "").strip().lower()
-    
+
     if arg == "on":
         act_flags = getattr(char, "act", 0)
-        act_flags |= PLR_AUTOASSIST
-        act_flags |= PLR_AUTOEXIT
-        act_flags |= PLR_AUTOGOLD
-        act_flags |= PLR_AUTOLOOT
-        act_flags |= PLR_AUTOSAC
-        act_flags |= PLR_AUTOSPLIT
+        act_flags |= PlayerFlag.AUTOASSIST
+        act_flags |= PlayerFlag.AUTOEXIT
+        act_flags |= PlayerFlag.AUTOGOLD
+        act_flags |= PlayerFlag.AUTOLOOT
+        act_flags |= PlayerFlag.AUTOSAC
+        act_flags |= PlayerFlag.AUTOSPLIT
         char.act = act_flags
         return "All autos turned on."
-    
+
     elif arg == "off":
         act_flags = getattr(char, "act", 0)
-        act_flags &= ~PLR_AUTOASSIST
-        act_flags &= ~PLR_AUTOEXIT
-        act_flags &= ~PLR_AUTOGOLD
-        act_flags &= ~PLR_AUTOLOOT
-        act_flags &= ~PLR_AUTOSAC
-        act_flags &= ~PLR_AUTOSPLIT
+        act_flags &= ~PlayerFlag.AUTOASSIST
+        act_flags &= ~PlayerFlag.AUTOEXIT
+        act_flags &= ~PlayerFlag.AUTOGOLD
+        act_flags &= ~PlayerFlag.AUTOLOOT
+        act_flags &= ~PlayerFlag.AUTOSAC
+        act_flags &= ~PlayerFlag.AUTOSPLIT
         char.act = act_flags
         return "All autos turned off."
-    
+
     return "Usage: autoall [on|off]"
 
 
 def do_autoassist(char: Character, args: str) -> str:
     """
     Toggle automatic assist in combat.
-    
+
     ROM Reference: src/act_info.c do_autoassist (lines 744-758)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOASSIST:
-        char.act = act_flags & ~PLR_AUTOASSIST
+
+    if act_flags & PlayerFlag.AUTOASSIST:
+        char.act = act_flags & ~PlayerFlag.AUTOASSIST
         return "Autoassist removed."
     else:
-        char.act = act_flags | PLR_AUTOASSIST
+        char.act = act_flags | PlayerFlag.AUTOASSIST
         return "You will now assist when needed."
 
 
 def do_autoexit(char: Character, args: str) -> str:
     """
     Toggle automatic exit display.
-    
+
     ROM Reference: src/act_info.c do_autoexit (lines 761-775)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOEXIT:
-        char.act = act_flags & ~PLR_AUTOEXIT
+
+    if act_flags & PlayerFlag.AUTOEXIT:
+        char.act = act_flags & ~PlayerFlag.AUTOEXIT
         return "Exits will no longer be displayed."
     else:
-        char.act = act_flags | PLR_AUTOEXIT
+        char.act = act_flags | PlayerFlag.AUTOEXIT
         return "Exits will now be displayed."
 
 
 def do_autogold(char: Character, args: str) -> str:
     """
     Toggle automatic gold looting from corpses.
-    
+
     ROM Reference: src/act_info.c do_autogold (lines 778-792)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOGOLD:
-        char.act = act_flags & ~PLR_AUTOGOLD
+
+    if act_flags & PlayerFlag.AUTOGOLD:
+        char.act = act_flags & ~PlayerFlag.AUTOGOLD
         return "Autogold removed."
     else:
-        char.act = act_flags | PLR_AUTOGOLD
+        char.act = act_flags | PlayerFlag.AUTOGOLD
         return "Automatic gold looting set."
 
 
 def do_autoloot(char: Character, args: str) -> str:
     """
     Toggle automatic corpse looting.
-    
+
     ROM Reference: src/act_info.c do_autoloot (lines 795-809)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOLOOT:
-        char.act = act_flags & ~PLR_AUTOLOOT
+
+    if act_flags & PlayerFlag.AUTOLOOT:
+        char.act = act_flags & ~PlayerFlag.AUTOLOOT
         return "Autolooting removed."
     else:
-        char.act = act_flags | PLR_AUTOLOOT
+        char.act = act_flags | PlayerFlag.AUTOLOOT
         return "Automatic corpse looting set."
 
 
 def do_autosac(char: Character, args: str) -> str:
     """
     Toggle automatic corpse sacrificing.
-    
+
     ROM Reference: src/act_info.c do_autosac (lines 812-826)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOSAC:
-        char.act = act_flags & ~PLR_AUTOSAC
+
+    if act_flags & PlayerFlag.AUTOSAC:
+        char.act = act_flags & ~PlayerFlag.AUTOSAC
         return "Autosacrificing removed."
     else:
-        char.act = act_flags | PLR_AUTOSAC
+        char.act = act_flags | PlayerFlag.AUTOSAC
         return "Automatic corpse sacrificing set."
 
 
 def do_autosplit(char: Character, args: str) -> str:
     """
     Toggle automatic gold splitting with group.
-    
+
     ROM Reference: src/act_info.c do_autosplit (lines 829-843)
     """
     if getattr(char, "is_npc", False):
         return ""
-    
+
     act_flags = getattr(char, "act", 0)
-    
-    if act_flags & PLR_AUTOSPLIT:
-        char.act = act_flags & ~PLR_AUTOSPLIT
+
+    if act_flags & PlayerFlag.AUTOSPLIT:
+        char.act = act_flags & ~PlayerFlag.AUTOSPLIT
         return "Autosplitting removed."
     else:
-        char.act = act_flags | PLR_AUTOSPLIT
+        char.act = act_flags | PlayerFlag.AUTOSPLIT
         return "Automatic gold splitting set."
 
 
 def do_brief(char: Character, args: str) -> str:
     """
     Toggle brief room descriptions.
-    
+
     ROM Reference: src/act_info.c do_brief (lines 877-888)
     """
     comm_flags = getattr(char, "comm", 0)
-    
-    if comm_flags & COMM_BRIEF:
-        char.comm = comm_flags & ~COMM_BRIEF
+
+    if comm_flags & CommFlag.BRIEF:
+        char.comm = comm_flags & ~CommFlag.BRIEF
         return "Full descriptions activated."
     else:
-        char.comm = comm_flags | COMM_BRIEF
+        char.comm = comm_flags | CommFlag.BRIEF
         return "Short descriptions activated."
 
 
 def do_compact(char: Character, args: str) -> str:
     """
     Toggle compact output mode (no extra blank lines).
-    
+
     ROM Reference: src/act_info.c do_compact (lines 890-901)
     """
     comm_flags = getattr(char, "comm", 0)
-    
-    if comm_flags & COMM_COMPACT:
-        char.comm = comm_flags & ~COMM_COMPACT
+
+    if comm_flags & CommFlag.COMPACT:
+        char.comm = comm_flags & ~CommFlag.COMPACT
         return "Compact mode removed."
     else:
-        char.comm = comm_flags | COMM_COMPACT
+        char.comm = comm_flags | CommFlag.COMPACT
         return "Compact mode set."
 
 
 def do_combine(char: Character, args: str) -> str:
     """
     Toggle combining identical items in inventory display.
-    
+
     ROM Reference: src/act_info.c do_combine
     """
     comm_flags = getattr(char, "comm", 0)
-    
-    if comm_flags & COMM_COMBINE:
-        char.comm = comm_flags & ~COMM_COMBINE
+
+    if comm_flags & CommFlag.COMBINE:
+        char.comm = comm_flags & ~CommFlag.COMBINE
         return "Items will no longer be combined in lists."
     else:
-        char.comm = comm_flags | COMM_COMBINE
+        char.comm = comm_flags | CommFlag.COMBINE
         return "Items will now be combined in lists."
 
 
 def do_colour(char: Character, args: str) -> str:
     """
     Toggle ANSI color output.
-    
+
     ROM Reference: src/act_info.c do_colour
     """
-    comm_flags = getattr(char, "comm", 0)
-    
-    if comm_flags & COMM_NOCOLOUR:
-        char.comm = comm_flags & ~COMM_NOCOLOUR
-        return "{RColour{x is now {GON{x."
-    else:
-        char.comm = comm_flags | COMM_NOCOLOUR
+    act_flags = getattr(char, "act", 0)
+
+    if act_flags & PlayerFlag.COLOUR:
+        char.act = act_flags & ~PlayerFlag.COLOUR
         return "Colour is now OFF."
+    else:
+        char.act = act_flags | PlayerFlag.COLOUR
+        return "{RColour{x is now {GON{x."
 
 
 # Alias for American spelling
@@ -304,37 +285,37 @@ do_color = do_colour
 def do_prompt(char: Character, args: str) -> str:
     """
     Toggle or set custom prompt.
-    
+
     ROM Reference: src/act_info.c do_prompt
-    
+
     Usage:
     - prompt         - Toggle prompt on/off
     - prompt all     - Set default full prompt
     - prompt <str>   - Set custom prompt string
     """
     arg = (args or "").strip()
-    
+
     if not arg:
         # Toggle prompt
         comm_flags = getattr(char, "comm", 0)
-        if comm_flags & COMM_PROMPT:
-            char.comm = comm_flags & ~COMM_PROMPT
+        if comm_flags & CommFlag.PROMPT:
+            char.comm = comm_flags & ~CommFlag.PROMPT
             return "You will no longer see prompts."
         else:
-            char.comm = comm_flags | COMM_PROMPT
+            char.comm = comm_flags | CommFlag.PROMPT
             return "You will now see prompts."
-    
+
     if arg.lower() == "all":
         # Set default prompt
         pcdata = getattr(char, "pcdata", None)
         if pcdata:
             pcdata.prompt = "<%hhp %mm %vmv> "
-        char.comm = getattr(char, "comm", 0) | COMM_PROMPT
+        char.comm = getattr(char, "comm", 0) | CommFlag.PROMPT
         return "Prompt set."
-    
+
     # Custom prompt
     pcdata = getattr(char, "pcdata", None)
     if pcdata:
         pcdata.prompt = arg
-    char.comm = getattr(char, "comm", 0) | COMM_PROMPT
+    char.comm = getattr(char, "comm", 0) | CommFlag.PROMPT
     return "Prompt set."

mud/commands/character.py

@@ -78,7 +78,9 @@ def do_title(ch: Character, args: str) -> str:
 
     # Set the title
     try:
-        ch.title = args
+        pcdata = getattr(ch, "pcdata", None)
+        if pcdata:
+            pcdata.title = args
         return "Ok."
     except Exception as e:
         return f"Error setting title: {e}"

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