rom24-quickmud-python 2.0.5__py3-none-any.whl → 2.1.1__py3-none-any.whl

mud/account/account_manager.py

@@ -44,15 +44,46 @@ def save_character(character: Character) -> None:
     try:
         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)
+            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)
             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
-            )
+            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)
@@ -67,6 +98,18 @@ def save_character(character: Character) -> None:
             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)
+
+            # Save perm stats from pcdata (ROM src/handler.c stores perm_hit/perm_mana/perm_move)
+            if pcdata:
+                db_char.perm_hit = int(getattr(pcdata, "perm_hit", character.max_hit or 20))
+                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)
+
             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", ())))

mud/account/account_service.py

@@ -80,9 +80,7 @@ _RESERVED_NAMES = {
 }
 
 
-_HOMETOWN_CHOICES: Final[tuple[tuple[str, int], ...]] = (
-    ("Midgaard", ROOM_VNUM_SCHOOL),
-)
+_HOMETOWN_CHOICES: Final[tuple[tuple[str, int], ...]] = (("Midgaard", ROOM_VNUM_SCHOOL),)
 
 _DEFAULT_WEAPONS: Final[tuple[str, ...]] = ("dagger",)
 
@@ -377,9 +375,7 @@ class CreationSelection:
         cost = self._chosen_skills.pop(normalized, 0)
         if cost > 0:
             self.creation_points = max(self._base_points, self.creation_points - cost)
-        self._skill_order = [
-            entry for entry in self._skill_order if self._normalize(entry) != normalized
-        ]
+        self._skill_order = [entry for entry in self._skill_order if self._normalize(entry) != normalized]
         if not sources:
             self._skill_sources.pop(normalized, None)
             self._known_skills.discard(normalized)
@@ -396,11 +392,7 @@ class CreationSelection:
         if not sources:
             self._group_sources.pop(normalized, None)
             self._known_groups.discard(normalized)
-            self._ordered_groups = [
-                entry
-                for entry in self._ordered_groups
-                if self._normalize(entry) != normalized
-            ]
+            self._ordered_groups = [entry for entry in self._ordered_groups if self._normalize(entry) != normalized]
             for child in self._group_children.get(normalized, set()):
                 self._remove_group_source(child, f"group:{normalized}")
             for skill in self._group_skill_children.get(normalized, set()):
@@ -418,11 +410,7 @@ class CreationSelection:
             self._skill_sources.pop(normalized, None)
             self._known_skills.discard(normalized)
             self._chosen_skills.pop(normalized, None)
-            self._skill_order = [
-                entry
-                for entry in self._skill_order
-                if self._normalize(entry) != normalized
-            ]
+            self._skill_order = [entry for entry in self._skill_order if self._normalize(entry) != normalized]
         else:
             self._skill_sources[normalized] = sources
 
@@ -488,11 +476,7 @@ class CreationSelection:
         if not sources:
             self._group_sources.pop(normalized, None)
             self._known_groups.discard(normalized)
-            self._ordered_groups = [
-                entry
-                for entry in self._ordered_groups
-                if self._normalize(entry) != normalized
-            ]
+            self._ordered_groups = [entry for entry in self._ordered_groups if self._normalize(entry) != normalized]
         else:
             self._group_sources[normalized] = sources
 
@@ -505,9 +489,7 @@ class CreationSelection:
         return True
 
     def experience_per_level(self) -> int:
-        return exp_per_level_for_creation(
-            self.race, self.class_type, self.creation_points
-        )
+        return exp_per_level_for_creation(self.race, self.class_type, self.creation_points)
 
     def skill_names(self) -> tuple[str, ...]:
         ordered: list[str] = []
@@ -599,9 +581,7 @@ def is_valid_account_name(username: str) -> bool:
         return False
 
     capitalized = candidate.capitalize()
-    if capitalized != "Alander" and (
-        capitalized.startswith("Alan") or capitalized.endswith("Alander")
-    ):
+    if capitalized != "Alander" and (capitalized.startswith("Alan") or capitalized.endswith("Alander")):
         return False
 
     if len(candidate) < 2 or len(candidate) > 12:
@@ -676,9 +656,7 @@ def _clamp_stats_to_race(stats: Iterable[int], race: PcRaceType) -> list[int]:
     return clamped
 
 
-def finalize_creation_stats(
-    race: PcRaceType, class_type: ClassType, stats: Iterable[int]
-) -> list[int]:
+def finalize_creation_stats(race: PcRaceType, class_type: ClassType, stats: Iterable[int]) -> list[int]:
     """Clamp rolled stats to race bounds and apply the class prime bonus."""
 
     clamped = _clamp_stats_to_race(stats, race)
@@ -859,9 +837,7 @@ def login_with_host(
         _mark_account_active(username)
         return LoginResult(account, None, reconnect_requested)
 
-    failure = (
-        LoginFailureReason.BAD_CREDENTIALS if exists else LoginFailureReason.UNKNOWN_ACCOUNT
-    )
+    failure = LoginFailureReason.BAD_CREDENTIALS if exists else LoginFailureReason.UNKNOWN_ACCOUNT
     return LoginResult(None, failure, reconnect_requested)
 
 
@@ -936,11 +912,7 @@ def create_character(
         sex_value = int(Sex.MALE)
 
     hometown = hometown_vnum if hometown_vnum is not None else starting_room_vnum
-    weapon_vnum = (
-        int(default_weapon_vnum)
-        if default_weapon_vnum is not None
-        else selected_class.first_weapon_vnum
-    )
+    weapon_vnum = int(default_weapon_vnum) if default_weapon_vnum is not None else selected_class.first_weapon_vnum
     default_groups = iter_group_names(
         (
             "rom basics",
@@ -948,30 +920,20 @@ def create_character(
             selected_class.default_group,
         )
     )
-    groups_tuple = (
-        iter_group_names(creation_groups)
-        if creation_groups is not None
-        else default_groups
-    )
-    skills_tuple = (
-        iter_skill_names(creation_skills)
-        if creation_skills is not None
-        else ()
-    )
+    groups_tuple = iter_group_names(creation_groups) if creation_groups is not None else default_groups
+    skills_tuple = iter_skill_names(creation_skills) if creation_skills is not None else ()
     default_points = int(selected_race.points) + (
         _group_cost_for_class(selected_class.default_group, selected_class) or 0
     )
-    creation_points_value = (
-        int(creation_points)
-        if creation_points is not None
-        else default_points
-    )
+    creation_points_value = int(creation_points) if creation_points is not None else default_points
     practice_value = practice if practice is not None else 5
     train_value = train if train is not None else 3
 
     session = SessionLocal()
     try:
-        if session.query(Character).filter_by(name=sanitized).first():
+        existing = session.query(Character).filter_by(name=sanitized).first()
+        if existing:
+            print(f"[ERROR] Character creation failed: name '{sanitized}' already exists (id={existing.id})")
             return False
 
         new_char = Character(
@@ -994,6 +956,9 @@ def create_character(
             vuln_flags=int(archetype.vulnerability_flags) if archetype else 0,
             practice=int(practice_value),
             train=int(train_value),
+            perm_hit=100,
+            perm_mana=100,
+            perm_move=100,
             act=int(PlayerFlag.NOSUMMON),
             default_weapon_vnum=weapon_vnum,
             newbie_help_seen=False,
@@ -1004,6 +969,10 @@ def create_character(
         )
         session.add(new_char)
         session.commit()
+        print(f"[INFO] Character '{sanitized}' created successfully for account {account.username} (id={new_char.id})")
         return True
+    except Exception as e:
+        print(f"[ERROR] Failed to create character '{sanitized}': {e}")
+        return False
     finally:
         session.close()

mud/advancement.py

@@ -7,7 +7,6 @@ from mud.models.character import Character
 from mud.models.constants import LEVEL_HERO
 from mud.models.classes import CLASS_TABLE, ClassType
 from mud.models.races import PcRaceType, list_playable_races
-from mud.persistence import save_character
 from mud.wiznet import WiznetFlag, wiznet
 
 BASE_XP_PER_LEVEL = 1000
@@ -199,4 +198,6 @@ def gain_exp(char: Character, amount: int) -> None:
             None,
             0,
         )
+        # Lazy import to avoid circular dependency
+        from mud.account.account_manager import save_character
         save_character(char)

mud/combat/engine.py

@@ -33,7 +33,7 @@ from mud.models.constants import (
     LEVEL_IMMORTAL,
     WearFlag,
 )
-from mud.persistence import save_character
+from mud.account.account_manager import save_character
 from mud.magic import SpellTarget, cold_effect, fire_effect, shock_effect
 from mud.models.social import expand_placeholders
 from mud.utils import rng_mm
@@ -824,19 +824,11 @@ def _auto_sacrifice(attacker: Character, corpse) -> None:
     if silver_reward == 1:
         attacker.send_to_char("Mota gives you one silver coin for your sacrifice.")
     else:
-        attacker.send_to_char(
-            f"Mota gives you {silver_reward} silver coins for your sacrifice."
-        )
+        attacker.send_to_char(f"Mota gives you {silver_reward} silver coins for your sacrifice.")
 
-    corpse_name = (
-        getattr(corpse, "short_descr", None)
-        or getattr(corpse, "name", "")
-        or "corpse"
-    )
+    corpse_name = getattr(corpse, "short_descr", None) or getattr(corpse, "name", "") or "corpse"
     room.broadcast(
-        expand_placeholders(
-            "$n sacrifices $N to Mota.", attacker, SimpleNamespace(name=corpse_name)
-        ),
+        expand_placeholders("$n sacrifices $N to Mota.", attacker, SimpleNamespace(name=corpse_name)),
         exclude=attacker,
     )
     wiznet(
@@ -906,21 +898,15 @@ def _auto_sacrifice(attacker: Character, corpse) -> None:
         return
 
     attacker.silver = current_silver + share + remainder
-    attacker.send_to_char(
-        f"You split {silver_reward} silver coins. Your share is {share + remainder} silver."
-    )
+    attacker.send_to_char(f"You split {silver_reward} silver coins. Your share is {share + remainder} silver.")
 
-    split_message = (
-        f"$n splits {silver_reward} silver coins. Your share is {share} silver."
-    )
+    split_message = f"$n splits {silver_reward} silver coins. Your share is {share} silver."
     for member in group_members:
         if member is attacker:
             continue
         member.silver = max(0, int(getattr(member, "silver", 0) or 0)) + share
         if hasattr(member, "messages"):
-            member.messages.append(
-                expand_placeholders(split_message, attacker, member)
-            )
+            member.messages.append(expand_placeholders(split_message, attacker, member))
 
 
 def _handle_auto_actions(attacker: Character, corpse) -> None:
@@ -1398,8 +1384,8 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
     if wield is None:
         return messages
 
-    # Check that attacker is still fighting victim (ROM condition)
-    if getattr(attacker, "fighting", None) != victim:
+    current_target = getattr(attacker, "fighting", None)
+    if current_target is not None and current_target is not victim:
         return messages
 
     # Get weapon flags - support both extra_flags (for ObjIndex) and weapon_flags attribute
@@ -1410,11 +1396,7 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
         weapon_flags = int(getattr(wield, "extra_flags"))
 
     weapon_level = _weapon_level(wield) or 1
-    weapon_name = (
-        getattr(wield, "name", None)
-        or getattr(wield, "short_descr", None)
-        or "the weapon"
-    )
+    weapon_name = getattr(wield, "name", None) or getattr(wield, "short_descr", None) or "the weapon"
     room = getattr(victim, "room", None)
 
     # WEAPON_POISON - ROM src/fight.c L600-634
@@ -1430,7 +1412,7 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
                 )
             if hasattr(victim, "add_affect"):
                 victim.add_affect(AffectFlag.POISON)
-            messages.append(f"The venom on {weapon_name} takes hold.")
+            messages.append("You feel poison coursing through your veins.")
 
     # WEAPON_VAMPIRIC - ROM src/fight.c L640-649
     if weapon_flags & WEAPON_VAMPIRIC:
@@ -1451,7 +1433,7 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
         if hasattr(attacker, "alignment"):
             attacker.alignment = max(-1000, attacker.alignment - 1)
 
-        messages.append(f"{weapon_name} drains life.")
+        messages.append(f"You feel {weapon_name} drawing your life away.")
 
     # WEAPON_FLAMING - ROM src/fight.c L651-659
     if weapon_flags & WEAPON_FLAMING:
@@ -1461,7 +1443,7 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
             room.broadcast(f"{victim.name} is burned by {weapon_name}.", exclude=victim)
         fire_effect(victim, weapon_level // 2, dam, SpellTarget.CHAR)
         apply_damage(attacker, victim, dam, DamageType.FIRE, show=False)
-        messages.append(f"{weapon_name} scorches {victim.name}.")
+        messages.append(f"{weapon_name} sears your flesh.")
 
     # WEAPON_FROST - ROM src/fight.c L661-670
     if weapon_flags & WEAPON_FROST:
@@ -1471,7 +1453,7 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
             room.broadcast(f"{victim.name} is frozen by {weapon_name}.", exclude=victim)
         cold_effect(victim, weapon_level // 2, dam, SpellTarget.CHAR)
         apply_damage(attacker, victim, dam, DamageType.COLD, show=False)
-        messages.append(f"{weapon_name} chills {victim.name}.")
+        messages.append("The cold touch surrounds you with ice.")
 
     # WEAPON_SHOCKING - ROM src/fight.c L672-681
     if weapon_flags & WEAPON_SHOCKING:
@@ -1484,6 +1466,6 @@ def process_weapon_special_attacks(attacker: Character, victim: Character) -> li
             )
         shock_effect(victim, weapon_level // 2, dam, SpellTarget.CHAR)
         apply_damage(attacker, victim, dam, DamageType.LIGHTNING, show=False)
-        messages.append(f"{weapon_name} shocks {victim.name}.")
+        messages.append("You are shocked by the weapon.")
 
     return messages

mud/combat/safety.py

@@ -0,0 +1,106 @@
+"""
+Combat safety checks - determine if it's safe to attack.
+
+ROM Reference: src/fight.c is_safe
+"""
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from mud.models.character import Character
+
+
+def is_safe(char: "Character", victim: "Character") -> bool:
+    """
+    Check if it's safe to attack victim (i.e., shouldn't attack).
+    
+    ROM Reference: src/fight.c is_safe (lines 130-230)
+    
+    Returns True if:
+    - Victim is in a SAFE room
+    - Victim is a shopkeeper
+    - Victim is a healer
+    - Attacker is too much lower level (for NPCs attacking players)
+    """
+    from mud.models.constants import RoomFlag, ActFlag
+    
+    if char is None or victim is None:
+        return True
+    
+    # Ghost can't fight
+    if getattr(char, "is_ghost", False):
+        return True
+    
+    # Can't fight yourself
+    if char is victim:
+        return True
+    
+    # Check for safe room
+    room = getattr(victim, "room", None)
+    if room:
+        room_flags = getattr(room, "room_flags", 0)
+        if room_flags & RoomFlag.ROOM_SAFE:
+            return True
+    
+    # Check if victim is a shopkeeper or healer
+    victim_act = getattr(victim, "act", 0)
+    if getattr(victim, "is_npc", False):
+        # Check for special mob types that shouldn't be attacked
+        if victim_act & ActFlag.IS_HEALER:
+            return True
+        if victim_act & ActFlag.IS_CHANGER:
+            return True
+        if victim_act & ActFlag.TRAIN:
+            return True
+        if victim_act & ActFlag.PRACTICE:
+            return True
+        if victim_act & ActFlag.GAIN:
+            return True
+    
+    # Check shop - if mob has a shop, it's a shopkeeper
+    if hasattr(victim, "pShop") and getattr(victim, "pShop", None):
+        return True
+    
+    # NPC attacking much lower level player
+    if getattr(char, "is_npc", False) and not getattr(victim, "is_npc", True):
+        char_level = getattr(char, "level", 1)
+        victim_level = getattr(victim, "level", 1)
+        if victim_level < char_level - 10:
+            return True
+    
+    return False
+
+
+def is_safe_spell(char: "Character", victim: "Character", area: bool = False) -> bool:
+    """
+    Check if it's safe to cast an offensive spell on victim.
+    
+    ROM Reference: src/fight.c is_safe_spell
+    """
+    # Can't spell yourself offensively in most cases
+    if char is victim and not area:
+        return True
+    
+    # Use same logic as regular combat safety
+    return is_safe(char, victim)
+
+
+def check_killer(char: "Character", victim: "Character") -> None:
+    """
+    Mark character as a killer if they attack an innocent.
+    
+    ROM Reference: src/fight.c check_killer
+    """
+    from mud.models.constants import PlayerFlag
+    
+    # Only applies to players
+    if getattr(char, "is_npc", True):
+        return
+    
+    # NPCs don't make you a killer
+    if getattr(victim, "is_npc", True):
+        return
+    
+    # Set KILLER flag
+    char.act = getattr(char, "act", 0) | PlayerFlag.KILLER

mud/commands/admin_commands.py

@@ -12,7 +12,7 @@ from mud.config import (
 from mud.models.character import Character, character_registry
 from mud.models.constants import CommFlag, PlayerFlag, Sex
 from mud.net.session import SESSIONS
-from mud.persistence import save_character as save_player_file
+from mud.account.account_manager import save_character as save_player_file
 from mud.registry import room_registry
 from mud.security import bans
 from mud.security.bans import BanFlag, BanPermissionError

mud/commands/affects.py

@@ -0,0 +1,98 @@
+"""
+Affects command - show active spell/affect effects on character.
+
+ROM Reference: src/act_info.c do_affects (lines 2300-2400)
+"""
+from __future__ import annotations
+
+from mud.models.character import Character
+from mud.models.constants import AffectFlag
+
+
+# Mapping of affect flags to human-readable names
+_AFFECT_NAMES = {
+    AffectFlag.BLIND: "blindness",
+    AffectFlag.INVISIBLE: "invisibility",
+    AffectFlag.DETECT_EVIL: "detect evil",
+    AffectFlag.DETECT_INVIS: "detect invisibility",
+    AffectFlag.DETECT_MAGIC: "detect magic",
+    AffectFlag.DETECT_HIDDEN: "detect hidden",
+    AffectFlag.DETECT_GOOD: "detect good",
+    AffectFlag.SANCTUARY: "sanctuary",
+    AffectFlag.FAERIE_FIRE: "faerie fire",
+    AffectFlag.INFRARED: "infrared vision",
+    AffectFlag.CURSE: "curse",
+    AffectFlag.POISON: "poison",
+    AffectFlag.PROTECT_EVIL: "protection evil",
+    AffectFlag.PROTECT_GOOD: "protection good",
+    AffectFlag.SNEAK: "sneak",
+    AffectFlag.HIDE: "hide",
+    AffectFlag.SLEEP: "sleep",
+    AffectFlag.CHARM: "charm",
+    AffectFlag.FLYING: "fly",
+    AffectFlag.PASS_DOOR: "pass door",
+    AffectFlag.HASTE: "haste",
+    AffectFlag.CALM: "calm",
+    AffectFlag.PLAGUE: "plague",
+    AffectFlag.WEAKEN: "weaken",
+    AffectFlag.DARK_VISION: "dark vision",
+    AffectFlag.BERSERK: "berserk",
+    AffectFlag.SWIM: "swim",
+    AffectFlag.REGENERATION: "regeneration",
+    AffectFlag.SLOW: "slow",
+}
+
+
+def do_affects(char: Character, args: str) -> str:
+    """
+    Display active affects on the character.
+    
+    ROM Reference: src/act_info.c do_affects (lines 2300-2400)
+    
+    Usage: affects
+    """
+    lines = []
+    
+    # Check spell_effects (detailed spell effects with duration)
+    spell_effects = getattr(char, "spell_effects", {})
+    if spell_effects:
+        lines.append("You are affected by the following spells:")
+        for spell_name, effect in spell_effects.items():
+            duration = getattr(effect, "duration", -1)
+            if duration < 0:
+                lines.append(f"  {spell_name}: permanent")
+            else:
+                lines.append(f"  {spell_name}: {duration} hours remaining")
+    
+    # Check affect bitvector for built-in affects
+    affected_by = getattr(char, "affected_by", 0)
+    if affected_by:
+        if not spell_effects:
+            lines.append("You are affected by:")
+        else:
+            lines.append("\nYou also have these affects:")
+        
+        for flag, name in _AFFECT_NAMES.items():
+            if affected_by & flag:
+                # Check if this isn't already shown in spell_effects
+                if name not in spell_effects:
+                    lines.append(f"  {name}")
+    
+    # Check for special conditions
+    if getattr(char, "position", 0) == 0:  # DEAD
+        lines.append("You are DEAD.")
+    
+    # Check for hunger/thirst (if applicable)
+    pcdata = getattr(char, "pcdata", None)
+    if pcdata:
+        hunger = getattr(pcdata, "condition", [0, 0, 0, 0])
+        if len(hunger) >= 2:
+            if hunger[0] == 0:  # COND_FULL
+                lines.append("You are hungry.")
+            if hunger[1] == 0:  # COND_THIRST
+                lines.append("You are thirsty.")
+    
+    if not lines:
+        return "You are not affected by any spells."
+    
+    return "\n".join(lines)