rom24-quickmud-python 2.1.2__tar.gz → 2.2.1__tar.gz

{rom24_quickmud_python-2.1.2/rom24_quickmud_python.egg-info → rom24_quickmud_python-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.1.2
+Version: 2.2.1
 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>
@@ -158,7 +158,7 @@ python -m mud  # Start development server
 
 ## 🎯 Project Status
 
-- **Version**: 2.1.2 (Production Ready)
+- **Version**: 2.2.1 (Production Ready)
 - **ROM 2.4b Parity**: 100% (227/227 behavioral tests passing)
 - **ROM C Function Coverage**: 96.1% (716/745 functions mapped)
 - **Test Coverage**: 1435/1436 tests passing (99.93% success rate)

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/README.md

@@ -105,7 +105,7 @@ python -m mud  # Start development server
 
 ## 🎯 Project Status
 
-- **Version**: 2.1.2 (Production Ready)
+- **Version**: 2.2.1 (Production Ready)
 - **ROM 2.4b Parity**: 100% (227/227 behavioral tests passing)
 - **ROM C Function Coverage**: 96.1% (716/745 functions mapped)
 - **Test Coverage**: 1435/1436 tests passing (99.93% success rate)

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/models/character.py

@@ -249,21 +249,32 @@ class SpellEffect:
 class Character:
     """Python representation of CHAR_DATA"""
 
+    # Core identity (ROM parity fields)
     name: str | None = None
+    id: int = 0  # Unique character ID (ROM: long id)
+    version: int = 0  # Character version (ROM: sh_int version)
+    valid: bool = True  # Validity flag (ROM: bool valid)
     account_name: str = ""
     short_descr: str | None = None
     long_descr: str | None = None
     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
     mana: int = 0
@@ -273,90 +284,125 @@ 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
+    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
+    
+    # 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
-    inventory: list[Object] = field(default_factory=list)
-    equipment: dict[str, Object] = field(default_factory=dict)
+    gen_data: object | None = None  # ROM: GEN_DATA for character generation
+    inventory: list[Object] = field(default_factory=list)  # ROM: carrying
+    equipment: dict[str, Object] = field(default_factory=dict)  # ROM: on (worn items)
     messages: list[str] = field(default_factory=list)
     cooldowns: dict[str, int] = field(default_factory=dict)
     connection: object | None = None
-    desc: object | None = None
-    reply: Character | None = None
+    desc: object | None = None  # ROM: DESCRIPTOR_DATA
     is_admin: bool = False
-    # IMC permission level (Notset/None/Mort/Imm/Admin/Imp)
-    imc_permission: str = "Mort"
+    
+    # Communication and channels
+    imc_permission: str = "Mort"  # IMC permission level (Notset/None/Mort/Imm/Admin/Imp)
     muted_channels: set[str] = field(default_factory=set)
     imc_listen: set[str] = field(default_factory=set)
     banned_channels: set[str] = field(default_factory=set)
-    wiznet: int = 0
-    comm: int = 0
-    # Per-character admin logging flag mirroring ROM PLR_LOG
-    log_commands: bool = False
-    # Wait-state (pulses) applied by actions like movement (ROM WAIT_STATE)
-    wait: int = 0
-    # Daze (pulses) — separate action delay used by ROM combat
-    daze: int = 0
+    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
-    timer: int = 0
-    was_in_room: Room | None = None
-    # Enhanced damage skill level (0-100)
-    enhanced_damage_skill: int = 0
+    
     # Character type flag
     is_npc: bool = True  # Default to NPC, set to False for PCs
-    # Mob program runtime state mirroring ROM's CHAR_DATA fields
-    mob_programs: list[MobProgram] = field(default_factory=list)
-    mprog_target: Character | None = None
-    # Active spell effects keyed by skill name for parity restores
-    spell_effects: dict[str, SpellEffect] = field(default_factory=dict)
+    
+    # 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
     creation_points: int = 0
     creation_groups: tuple[str, ...] = field(default_factory=tuple)

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/models/obj.py

@@ -59,9 +59,14 @@ obj_index_registry: dict[int, ObjIndex] = {}
 
 @dataclass
 class ObjectData:
-    """Python representation of OBJ_DATA"""
+    """Python representation of OBJ_DATA (ROM src/merc.h struct obj_data)"""
 
+    # Core properties
     item_type: int
+    valid: bool = True  # ROM: bool valid (object validity flag)
+    enchanted: bool = False  # ROM: bool enchanted (magical enhancement flag)
+    
+    # Flags and attributes
     extra_flags: int = 0
     wear_flags: int = 0
     wear_loc: int = 0
@@ -71,21 +76,29 @@ class ObjectData:
     condition: int = 0
     timer: int = 0
     value: list[int] = field(default_factory=lambda: [0] * 5)
+    
+    # Descriptive fields
     owner: str | None = None
     name: str | None = None
     short_descr: str | None = None
     description: str | None = None
     material: str | None = None
-    carried_by: Character | None = None
-    in_obj: ObjectData | None = None
-    contains: list[ObjectData] = field(default_factory=list)
-    extra_descr: list[ExtraDescr] = field(default_factory=list)
-    affected: list[Affect] = field(default_factory=list)
-    pIndexData: ObjIndex | None = None
-    in_room: Room | None = None
-    enchanted: bool = False
-    next_content: ObjectData | None = None
-    next: ObjectData | None = None
+    
+    # Relationships and containment
+    carried_by: Character | None = None  # ROM: CHAR_DATA *carried_by
+    in_obj: ObjectData | None = None  # ROM: OBJ_DATA *in_obj (container)
+    on: Character | None = None  # ROM: OBJ_DATA *on (worn on character - we use wear_loc + carried_by)
+    contains: list[ObjectData] = field(default_factory=list)  # ROM: OBJ_DATA *contains
+    extra_descr: list[ExtraDescr] = field(default_factory=list)  # ROM: EXTRA_DESCR_DATA *extra_descr
+    affected: list[Affect] = field(default_factory=list)  # ROM: AFFECT_DATA *affected
+    
+    # Index and location
+    pIndexData: ObjIndex | None = None  # ROM: OBJ_INDEX_DATA *pIndexData
+    in_room: Room | None = None  # ROM: ROOM_INDEX_DATA *in_room
+    
+    # Linked list pointers (Python uses lists but we keep for compatibility)
+    next_content: ObjectData | None = None  # ROM: OBJ_DATA *next_content
+    next: ObjectData | None = None  # ROM: OBJ_DATA *next
 
     def __repr__(self) -> str:
         return f"<ObjectData type={self.item_type} name={self.short_descr!r}>"

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/models/room.py

@@ -38,25 +38,40 @@ class Exit:
 
 @dataclass
 class Room:
-    """Runtime room container built from area files."""
+    """Runtime room container built from area files (ROM ROOM_INDEX_DATA)."""
 
+    # Core properties
     vnum: int
     name: str | None = None
     description: str | None = None
-    owner: str | None = None
-    area: Area | None = None
-    room_flags: int = 0
-    light: int = 0
-    sector_type: int = 0
-    heal_rate: int = 100
-    mana_rate: int = 100
-    clan: int = 0
-    exits: list[Exit | None] = field(default_factory=lambda: [None] * len(Direction))
-    extra_descr: list[ExtraDescr] = field(default_factory=list)
-    resets: list[ResetJson] = field(default_factory=list)
-    people: list[Character | MobInstance] = field(default_factory=list)
-    contents: list[Object] = field(default_factory=list)
-    next: Room | None = None
+    owner: str | None = None  # ROM: char *owner
+    
+    # Area and location
+    area: Area | None = None  # ROM: AREA_DATA *area
+    
+    # Room attributes
+    room_flags: int = 0  # ROM: int room_flags
+    light: int = 0  # ROM: sh_int light
+    sector_type: int = 0  # ROM: sh_int sector_type
+    heal_rate: int = 100  # ROM: sh_int heal_rate
+    mana_rate: int = 100  # ROM: sh_int mana_rate
+    clan: int = 0  # ROM: sh_int clan
+    
+    # Exits and descriptions
+    exits: list[Exit | None] = field(default_factory=lambda: [None] * len(Direction))  # ROM: EXIT_DATA *exit[6]
+    extra_descr: list[ExtraDescr] = field(default_factory=list)  # ROM: EXTRA_DESCR_DATA *extra_descr
+    
+    # Resets (Python uses list; ROM uses linked list)
+    resets: list[ResetJson] = field(default_factory=list)  # Python: list of resets
+    reset_first: object | None = None  # ROM: RESET_DATA *reset_first (OLC)
+    reset_last: object | None = None  # ROM: RESET_DATA *reset_last (OLC)
+    
+    # Contents
+    people: list[Character | MobInstance] = field(default_factory=list)  # ROM: CHAR_DATA *people
+    contents: list[Object] = field(default_factory=list)  # ROM: OBJ_DATA *contents
+    
+    # Linked list pointer
+    next: Room | None = None  # ROM: ROOM_INDEX_DATA *next
 
     def __repr__(self) -> str:
         return f"<Room vnum={self.vnum} name={self.name!r}>"

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/net/connection.py

@@ -1509,11 +1509,15 @@ async def handle_connection_with_stream(
         if selection is None:
             return
 
-        char, is_creation = selection
+        char, forced_reconnect = selection
+        reconnecting = bool(was_reconnect or forced_reconnect)
+        is_new_player = not bool(char.level)
+        
         if char is None:
             return
 
-        if is_creation and not was_reconnect:
+        # Only save if this is truly a new character creation
+        if is_new_player and not reconnecting:
             if account.id:
                 char.account_id = account.id
                 char.account_name = username
@@ -1537,28 +1541,36 @@ async def handle_connection_with_stream(
             ansi_enabled=conn.ansi_enabled,
         )
         SESSIONS[char.name] = session
+        
+        # Give starting outfit if new player
+        outfit_message: str | None = None
+        if is_new_player and give_school_outfit(char):
+            outfit_message = "You have been equipped by Mota."
 
         print(f"[{connection_type}] {char.name} entered the game")
         
         # Send welcome messages
         try:
-            if is_creation:
-                # New character - send MOTD and newbie help
-                await send_to_char(char, "Character created successfully!")
+            if outfit_message:
+                await send_to_char(char, outfit_message)
+            if not reconnecting:
+                await _send_login_motd(char)
                 if _should_send_newbie_help(char):
                     await _send_newbie_help(char)
-            elif was_reconnect:
+        except Exception as exc:
+            print(f"[ERROR] Failed to send MOTD for {session.name}: {exc}")
+
+        try:
+            if reconnecting:
                 await send_to_char(char, RECONNECT_MESSAGE)
-            
-            # Announce login
-            note_reminder = _announce_login_or_reconnect(char, host_for_ban, was_reconnect)
-            if was_reconnect and note_reminder:
+            note_reminder = _announce_login_or_reconnect(char, host_for_ban, reconnecting)
+            if reconnecting and note_reminder:
                 await send_to_char(
                     char,
                     "You have a note in progress. Type NWRITE to continue it.",
                 )
         except Exception as exc:
-            print(f"[ERROR] Failed to send welcome messages for {session.name}: {exc}")
+            print(f"[ERROR] Failed to announce wiznet login for {session.name}: {exc}")
 
         # Send initial room look
         try:
@@ -1574,35 +1586,28 @@ async def handle_connection_with_stream(
         # Main game loop
         while True:
             try:
-                await asyncio.sleep(0.1)
-                if not char or not char.room:
+                await conn.send_prompt("> ", go_ahead=session.go_ahead_enabled)
+                command = await _read_player_command(conn, session)
+                if command is None:
                     break
+                _stop_idling(char)
+                if not command.strip():
+                    continue
 
-                if session.command_queue:
-                    try:
-                        cmd = session.command_queue.pop(0)
-                        result = await interpret_command(char, cmd)
-                        if result and len(result) < 6000:
-                            await send_to_char(char, result)
-                        elif result:
-                            await send_to_char(
-                                char,
-                                "Sorry, there was an error processing that command.",
-                            )
-                    except Exception as exc:
-                        print(f"[ERROR] Command execution error: {exc}")
-                        await send_to_char(
-                            char,
-                            "Sorry, there was an error processing that command.",
-                        )
-
-                while char and char.messages:
-                    try:
-                        msg = char.messages.pop(0)
-                        await send_to_char(char, msg)
-                    except Exception as exc:
-                        print(f"[ERROR] Failed to send message: {exc}")
+                try:
+                    response = process_command(char, command)
+                    await send_to_char(char, response)
+                    
+                    # Check if player requested quit
+                    if getattr(char, "_quit_requested", False):
                         break
+                        
+                except Exception as exc:
+                    print(f"[ERROR] Command processing failed for '{command}': {exc}")
+                    await send_to_char(
+                        char,
+                        "Sorry, there was an error processing that command.",
+                    )
 
             except asyncio.CancelledError:
                 break

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/spawning/templates.py

@@ -285,6 +285,7 @@ class MobInstance:
     is_admin: bool = False
     is_npc: bool = True
     messages: list[str] = field(default_factory=list)
+    fighting: "Character | MobInstance | None" = None  # Combat target
 
     @classmethod
     def from_prototype(cls, proto: MobIndex) -> MobInstance:

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/mud/world/look.py

@@ -72,7 +72,8 @@ def look(char: Character, args: str = "") -> str:
     
     # Check extra descriptions in room
     for ed in getattr(room, "extra_descr", []):
-        if ed.keyword and args.lower() in ed.keyword.lower().split():
+        keyword = getattr(ed, "keyword", None)
+        if keyword and args.lower() in keyword.lower().split():
             return ed.description or "You see nothing special."
     
     return "You do not see that here."

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rom24-quickmud-python"
-version = "2.1.2"
+version = "2.2.1"
 description = "A modern Python port of the ROM 2.4b6 MUD engine with full telnet server and JSON world loading"
 readme = "README.md"
 license = "MIT"

{rom24_quickmud_python-2.1.2 → rom24_quickmud_python-2.2.1/rom24_quickmud_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.1.2
+Version: 2.2.1
 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>
@@ -158,7 +158,7 @@ python -m mud  # Start development server
 
 ## 🎯 Project Status
 
-- **Version**: 2.1.2 (Production Ready)
+- **Version**: 2.2.1 (Production Ready)
 - **ROM 2.4b Parity**: 100% (227/227 behavioral tests passing)
 - **ROM C Function Coverage**: 96.1% (716/745 functions mapped)
 - **Test Coverage**: 1435/1436 tests passing (99.93% success rate)