rom24-quickmud-python 1.2.2__py3-none-any.whl → 2.0.4__py3-none-any.whl

mud/__main__.py

@@ -1,12 +1,15 @@
 import asyncio
+
 import typer
-from mud.server import run_game_loop
+
 from mud.db.migrations import run_migrations
 from mud.net.telnet_server import start_server as start_telnet
 from mud.network.websocket_server import run as start_websocket
+from mud.server import run_game_loop
 
 cli = typer.Typer()
 
+
 @cli.command()
 def runserver():
     """Start the main game server."""
@@ -23,6 +26,7 @@ def migrate():
 def loadtestuser():
     """Load a default test account and character."""
     from mud.scripts.load_test_data import load_test_user
+
     load_test_user()
 
 
@@ -31,10 +35,24 @@ def socketserver(host: str = "0.0.0.0", port: int = 5000):
     """Start the telnet server."""
     asyncio.run(start_telnet(host=host, port=port))
 
+
 @cli.command()
 def websocketserver(host: str = "0.0.0.0", port: int = 8000):
     """Start the websocket server."""
     start_websocket(host=host, port=port)
 
+
+@cli.command()
+def sshserver(host: str = "0.0.0.0", port: int = 2222):
+    """Start the SSH server.
+
+    Players can connect with: ssh -p 2222 player@hostname
+    SSH credentials are ignored; authentication happens via MUD account login.
+    """
+    from mud.net.ssh_server import start_server as start_ssh
+
+    asyncio.run(start_ssh(host=host, port=port))
+
+
 if __name__ == "__main__":
     cli()

mud/account/__init__.py

@@ -2,19 +2,59 @@
 
 from .account_manager import load_character, save_character
 from .account_service import (
+    CreationSelection,
+    account_exists,
     create_account,
+    create_character,
+    clear_active_accounts,
+    get_creation_classes,
+    get_creation_races,
+    get_hometown_choices,
+    get_weapon_choices,
+    get_race_archetype,
+    is_account_active,
+    is_valid_account_name,
+    lookup_creation_class,
+    lookup_creation_race,
+    lookup_hometown,
+    lookup_weapon_choice,
+    LoginFailureReason,
+    LoginResult,
+    list_characters,
     login,
     login_with_host,
-    list_characters,
-    create_character,
+    roll_creation_stats,
+    finalize_creation_stats,
+    sanitize_account_name,
+    release_account,
 )
 
 __all__ = [
     "load_character",
     "save_character",
+    "account_exists",
     "create_account",
     "login",
     "login_with_host",
     "list_characters",
     "create_character",
+    "CreationSelection",
+    "get_creation_races",
+    "lookup_creation_race",
+    "get_race_archetype",
+    "get_creation_classes",
+    "lookup_creation_class",
+    "get_hometown_choices",
+    "lookup_hometown",
+    "get_weapon_choices",
+    "lookup_weapon_choice",
+    "roll_creation_stats",
+    "finalize_creation_stats",
+    "is_valid_account_name",
+    "sanitize_account_name",
+    "clear_active_accounts",
+    "is_account_active",
+    "release_account",
+    "LoginFailureReason",
+    "LoginResult",
 ]

mud/account/account_manager.py

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from typing import Optional
+import json
 
+from mud.db.models import Character as DBCharacter
+from mud.db.models import PlayerAccount
 from mud.db.session import SessionLocal
-from mud.db.models import Character as DBCharacter, PlayerAccount
 from mud.models.character import Character, from_orm
+from mud.models.constants import ROOM_VNUM_LIMBO, ROOM_VNUM_TEMPLE
 from mud.models.conversion import (
     load_objects_for_character,
     save_objects_for_character,
 )
 
 
-def load_character(username: str, char_name: str) -> Optional[Character]:
+def load_character(username: str, char_name: str) -> Character | None:
     session = None
     try:
         session = SessionLocal()
@@ -26,10 +28,8 @@ def load_character(username: str, char_name: str) -> Optional[Character]:
         )
         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
-            )
+            _ = db_char.player  # load relationship
+            char.inventory, char.equipment = load_objects_for_character(db_char)
         return char
     except Exception as e:
         print(f"[ERROR] Failed to load character {char_name}: {e}")
@@ -43,16 +43,46 @@ def save_character(character: Character) -> None:
     session = None
     try:
         session = SessionLocal()
-        db_char = (
-            session.query(DBCharacter)
-            .filter_by(name=character.name)
-            .first()
-        )
+        db_char = session.query(DBCharacter).filter_by(name=character.name).first()
         if db_char:
             db_char.level = character.level
             db_char.hp = character.hit
-            if getattr(character, "room", None):
-                db_char.room_vnum = character.room.vnum
+            db_char.race = int(character.race or 0)
+            db_char.ch_class = int(character.ch_class or 0)
+            pcdata = getattr(character, "pcdata", None)
+            true_sex_value = int(
+                getattr(pcdata, "true_sex", getattr(character, "sex", 0)) or 0
+            )
+            db_char.true_sex = true_sex_value
+            db_char.sex = int(character.sex or true_sex_value or 0)
+            db_char.alignment = int(character.alignment or 0)
+            db_char.act = int(getattr(character, "act", 0) or 0)
+            db_char.hometown_vnum = int(character.hometown_vnum or 0)
+            db_char.perm_stats = json.dumps([int(val) for val in character.perm_stat])
+            db_char.size = int(character.size or 0)
+            db_char.form = int(character.form or 0)
+            db_char.parts = int(character.parts or 0)
+            db_char.imm_flags = int(character.imm_flags or 0)
+            db_char.res_flags = int(character.res_flags or 0)
+            db_char.vuln_flags = int(character.vuln_flags or 0)
+            db_char.practice = int(character.practice or 0)
+            db_char.train = int(character.train or 0)
+            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", ())))
+            db_char.newbie_help_seen = bool(getattr(character, "newbie_help_seen", False))
+            room = getattr(character, "room", None)
+            was_in_room = getattr(character, "was_in_room", None)
+            room_vnum = 0
+            if room is not None:
+                room_vnum = int(getattr(room, "vnum", 0) or 0)
+                if room_vnum == int(ROOM_VNUM_LIMBO) and was_in_room is not None:
+                    room_vnum = int(getattr(was_in_room, "vnum", 0) or 0)
+            elif was_in_room is not None:
+                room_vnum = int(getattr(was_in_room, "vnum", 0) or 0)
+            if room_vnum <= 0:
+                room_vnum = int(ROOM_VNUM_TEMPLE)
+            db_char.room_vnum = room_vnum
             save_objects_for_character(session, character, db_char)
             session.commit()
     except Exception as e: