rom24-quickmud-python 2.5.4__py3-none-any.whl → 2.7.0__py3-none-any.whl

mud/__init__.py

@@ -0,0 +1 @@
+"""Package marker for mud."""

mud/account/__init__.py

@@ -1,11 +1,17 @@
-"""Account management utilities."""
+"""Account management utilities.
+
+The Python-only PlayerAccount layer has been removed.  Characters now own
+their passwords directly, mirroring ROM src/merc.h PCData.pwd.
+"""
 
 from .account_manager import load_character, save_character
 from .account_service import (
     CreationSelection,
     account_exists,
+    character_exists,
     create_account,
     create_character,
+    create_character_record,
     clear_active_accounts,
     get_creation_classes,
     get_creation_races,
@@ -14,6 +20,8 @@ from .account_service import (
     get_race_archetype,
     is_account_active,
     is_valid_account_name,
+    is_valid_character_name,
+    login_character,
     lookup_creation_class,
     lookup_creation_race,
     lookup_hometown,
@@ -27,17 +35,21 @@ from .account_service import (
     finalize_creation_stats,
     sanitize_account_name,
     release_account,
+    release_character,
 )
 
 __all__ = [
     "load_character",
     "save_character",
     "account_exists",
+    "character_exists",
     "create_account",
+    "create_character",
+    "create_character_record",
     "login",
+    "login_character",
     "login_with_host",
     "list_characters",
-    "create_character",
     "CreationSelection",
     "get_creation_races",
     "lookup_creation_race",
@@ -51,10 +63,12 @@ __all__ = [
     "roll_creation_stats",
     "finalize_creation_stats",
     "is_valid_account_name",
+    "is_valid_character_name",
     "sanitize_account_name",
     "clear_active_accounts",
     "is_account_active",
     "release_account",
+    "release_character",
     "LoginFailureReason",
     "LoginResult",
 ]

mud/account/account_manager.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import json
 
 from mud.db.models import Character as DBCharacter
-from mud.db.models import PlayerAccount
 from mud.db.session import SessionLocal
 from mud.models.character import Character, from_orm
 from mud.models.constants import ROOM_VNUM_LIMBO, ROOM_VNUM_TEMPLE
@@ -13,22 +12,19 @@ from mud.models.conversion import (
 )
 
 
-def load_character(username: str, char_name: str) -> Character | None:
+def load_character(char_name: str, _ignored: str | None = None) -> Character | None:
+    """Load a character by name from the database.
+
+    The second argument is accepted but ignored for backward compatibility;
+    previously it was a username (account name).  Characters are now
+    standalone identities — mirroring ROM src/save.c:fread_char.
+    """
     session = None
     try:
         session = SessionLocal()
-        db_char = (
-            session.query(DBCharacter)
-            .join(PlayerAccount)
-            .filter(
-                DBCharacter.name == char_name,
-                PlayerAccount.username == username,
-            )
-            .first()
-        )
+        db_char = session.query(DBCharacter).filter(DBCharacter.name == char_name).first()
         char = from_orm(db_char) if db_char else None
         if char and db_char:
-            _ = db_char.player  # load relationship
             char.inventory, char.equipment = load_objects_for_character(db_char)
         return char
     except Exception as e:
@@ -45,39 +41,11 @@ def save_character(character: Character) -> None:
         session = SessionLocal()
         db_char = session.query(DBCharacter).filter_by(name=character.name).first()
         if not db_char:
-            # Character doesn't exist in database - create it
-            # This handles cases where character was created via JSON or other means
             print(f"[WARN] Character '{character.name}' not found in database, creating new record")
-            
-            # CRITICAL: Try to find and link the player account
-            player_id = None
-            pcdata = getattr(character, "pcdata", None)
-            if pcdata:
-                account_name = getattr(pcdata, "account_name", None)
-                if account_name:
-                    player_account = session.query(PlayerAccount).filter_by(username=account_name).first()
-                    if player_account:
-                        player_id = player_account.id
-                        print(f"[INFO] Linked character '{character.name}' to account '{account_name}' (id={player_id})")
-                    else:
-                        print(f"[WARN] Could not find player account '{account_name}' for character '{character.name}'")
-            
-            db_char = DBCharacter(name=character.name, player_id=player_id)
+            db_char = DBCharacter(name=character.name)
             session.add(db_char)
-        
-        # Update all fields
+
         if db_char:
-            # Ensure player_id is set if we have account information
-            if not db_char.player_id:
-                pcdata = getattr(character, "pcdata", None)
-                if pcdata:
-                    account_name = getattr(pcdata, "account_name", None)
-                    if account_name:
-                        player_account = session.query(PlayerAccount).filter_by(username=account_name).first()
-                        if player_account:
-                            db_char.player_id = player_account.id
-                            print(f"[INFO] Fixed missing player_id for character '{character.name}' -> account '{account_name}'")
-            
             db_char.level = character.level
             db_char.hp = character.hit
             db_char.race = int(character.race or 0)
@@ -105,11 +73,16 @@ def save_character(character: Character) -> None:
                 db_char.perm_mana = int(getattr(pcdata, "perm_mana", character.max_mana or 100))
                 db_char.perm_move = int(getattr(pcdata, "perm_move", character.max_move or 100))
             else:
-                # Fallback if no pcdata
                 db_char.perm_hit = int(character.max_hit or 20)
                 db_char.perm_mana = int(character.max_mana or 100)
                 db_char.perm_move = int(character.max_move or 100)
 
+            # Persist password hash if available on runtime character
+            if pcdata:
+                pwd = getattr(pcdata, "pwd", None) or ""
+                if pwd and not getattr(db_char, "password_hash", ""):
+                    db_char.password_hash = pwd
+
             db_char.default_weapon_vnum = int(character.default_weapon_vnum or 0)
             db_char.creation_points = int(getattr(character, "creation_points", 0) or 0)
             db_char.creation_groups = json.dumps(list(getattr(character, "creation_groups", ())))