rom24-quickmud-python 2.9.18__py3-none-any.whl → 2.9.20__py3-none-any.whl

mud/commands/group_commands.py

@@ -11,11 +11,23 @@ from mud.models.constants import AffectFlag, PlayerFlag, Position
 from mud.world.char_find import get_char_room
 
 
+def _display_name(character: Character | None) -> str:
+    if character is None:
+        return "Someone"
+    name = getattr(character, "name", None)
+    if isinstance(name, str) and name:
+        return name
+    short_descr = getattr(character, "short_descr", None)
+    if isinstance(short_descr, str) and short_descr:
+        return short_descr
+    return "Someone"
+
+
 def add_follower(char: Character, master: Character) -> None:
     """
     Add char as a follower of master.
 
-    ROM Reference: src/act_comm.c add_follower (lines 1600-1620)
+    ROM Reference: src/act_comm.c add_follower (lines 1591-1607)
     """
     if char.master is not None:
         return  # Already following someone
@@ -28,6 +40,19 @@ def add_follower(char: Character, master: Character) -> None:
         if char not in master.followers:
             master.followers.append(char)
 
+    # ROM lines 1602-1605: act("$n now follows you.", ch, NULL, master, TO_VICT)
+    # gated on can_see(master, ch); act("You now follow $N.", ch, NULL, master, TO_CHAR).
+    from mud.world.vision import can_see_character
+
+    if can_see_character(master, char):
+        master_messages = getattr(master, "messages", None)
+        if isinstance(master_messages, list):
+            master_messages.append(f"{_display_name(char)} now follows you.")
+
+    char_messages = getattr(char, "messages", None)
+    if isinstance(char_messages, list):
+        char_messages.append(f"You now follow {_display_name(master)}.")
+
 
 def stop_follower(char: Character) -> None:
     """
@@ -48,6 +73,19 @@ def stop_follower(char: Character) -> None:
     if hasattr(master, "followers") and char in master.followers:
         master.followers.remove(char)
 
+    # ROM lines 1626-1630: act("$n stops following you.", ch, NULL, ch->master, TO_VICT);
+    # act("You stop following $N.", ch, NULL, ch->master, TO_CHAR); gated on
+    # can_see(ch->master, ch) && ch->in_room != NULL.
+    from mud.world.vision import can_see_character
+
+    if can_see_character(master, char) and getattr(char, "room", None) is not None:
+        master_messages = getattr(master, "messages", None)
+        if isinstance(master_messages, list):
+            master_messages.append(f"{_display_name(char)} stops following you.")
+        char_messages = getattr(char, "messages", None)
+        if isinstance(char_messages, list):
+            char_messages.append(f"You stop following {_display_name(master)}.")
+
     char.master = None
     char.leader = None
 
@@ -221,16 +259,45 @@ def do_group(char: Character, args: str) -> str:
     if char_affected & AffectFlag.CHARM:
         return "You like your master too much to leave!"
 
-    # Already in group - remove
+    leader_name = _display_name(char)
+    victim_name_str = _display_name(victim)
+
+    # Already in group - remove (ROM src/act_comm.c:1838-1847)
     if is_same_group(victim, char) and char is not victim:
         victim.leader = None
-        victim_name = getattr(victim, "short_descr", None) or getattr(victim, "name", "them")
-        return f"You remove {victim_name} from your group."
-
-    # Add to group
+        # TO_VICT: "$n removes you from $s group."
+        victim_messages = getattr(victim, "messages", None)
+        if isinstance(victim_messages, list):
+            victim_messages.append(f"{leader_name} removes you from {leader_name}'s group.")
+        # TO_NOTVICT: "$n removes $N from $s group."
+        room = getattr(char, "room", None)
+        if room is not None:
+            notvict_msg = f"{leader_name} removes {victim_name_str} from {leader_name}'s group."
+            for occupant in list(getattr(room, "people", []) or []):
+                if occupant is char or occupant is victim:
+                    continue
+                occ_messages = getattr(occupant, "messages", None)
+                if isinstance(occ_messages, list):
+                    occ_messages.append(notvict_msg)
+        return f"You remove {victim_name_str} from your group."
+
+    # Add to group (ROM src/act_comm.c:1850-1854)
     victim.leader = char
-    victim_name = getattr(victim, "short_descr", None) or getattr(victim, "name", "someone")
-    return f"{victim_name} joins your group."
+    # TO_VICT: "You join $n's group."
+    victim_messages = getattr(victim, "messages", None)
+    if isinstance(victim_messages, list):
+        victim_messages.append(f"You join {leader_name}'s group.")
+    # TO_NOTVICT: "$N joins $n's group."
+    room = getattr(char, "room", None)
+    if room is not None:
+        notvict_msg = f"{victim_name_str} joins {leader_name}'s group."
+        for occupant in list(getattr(room, "people", []) or []):
+            if occupant is char or occupant is victim:
+                continue
+            occ_messages = getattr(occupant, "messages", None)
+            if isinstance(occ_messages, list):
+                occ_messages.append(notvict_msg)
+    return f"{victim_name_str} joins your group."
 
 
 def do_gtell(char: Character, args: str) -> str:

{rom24_quickmud_python-2.9.18.dist-info → rom24_quickmud_python-2.9.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.18
+Version: 2.9.20
 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>

{rom24_quickmud_python-2.9.18.dist-info → rom24_quickmud_python-2.9.20.dist-info}/RECORD

@@ -59,7 +59,7 @@ mud/commands/doors.py,sha256=KWMQPVJHs8-xPFE08kStOOU9x5ugN5sEFuo7nlQL2Z8,19777
 mud/commands/equipment.py,sha256=BXUJhe_volohdgUKpugV8Wfcn-pHXG6ooaKeF6LmcI4,22882
 mud/commands/feedback.py,sha256=qEmUlVy1KC6ludpAREdqvf8gpa8jmgN4AMLor0EoO7E,2472
 mud/commands/give.py,sha256=BcZjqFm1WqhoRi9qZJ8G9zRu_buXptwg9Y7_oSNnFVE,8787
-mud/commands/group_commands.py,sha256=FZeOKy0bu50B4vB3X-pfE-hjZ3CbpI5qSES8Jc56gGM,16916
+mud/commands/group_commands.py,sha256=Cz3LNTCccR4ghpyE5QORDlZBwpzkli93uueF3zZBoHk,20077
 mud/commands/healer.py,sha256=noZ3t97C_0j1GEJd8nUNYYv4clHxuD4dvFSR3c1gfUA,7576
 mud/commands/help.py,sha256=GfQWy6MyFtDc-mW1dM7pPN1SFVsWtIGno8uR4dRQYjg,11124
 mud/commands/imc.py,sha256=v1lPP2xDjQjkk7negwjCXJtcRPQkBEIGWmpPKf1XPzU,12204
@@ -216,9 +216,9 @@ mud/world/obj_find.py,sha256=tgnUkbFjnCl586Lzl6yRzCmllZSNEfQpQlrxCMVcUGU,5295
 mud/world/time_persistence.py,sha256=K4uhRpu08IDHY5uReBYTvw4BHuqsSxWvbv-h1VsPvf8,1663
 mud/world/vision.py,sha256=NRk3cvrGyyldU4W98qAVlYZp9wL-IUE1dTgk6DpM-NA,11609
 mud/world/world_state.py,sha256=3KpiDP6v24sZDn9-g44UypXpegzgRShHo1XvektJzdU,8810
-rom24_quickmud_python-2.9.18.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.9.18.dist-info/METADATA,sha256=Gath7nkg7vP0AgqOnrU6xmSEiNQg1HFEFGo1sn5CBQU,15671
-rom24_quickmud_python-2.9.18.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rom24_quickmud_python-2.9.18.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.9.18.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.9.18.dist-info/RECORD,,
+rom24_quickmud_python-2.9.20.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.9.20.dist-info/METADATA,sha256=2ZdXr4J9qst8o-JpVWVsZJFT2F2Gpnf9vkYZ1_GA7xE,15671
+rom24_quickmud_python-2.9.20.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rom24_quickmud_python-2.9.20.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.9.20.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.9.20.dist-info/RECORD,,