rom24-quickmud-python 2.9.18__tar.gz → 2.9.20__tar.gz

{rom24_quickmud_python-2.9.18 → rom24_quickmud_python-2.9.20}/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.9.20]
+
+### Fixed
+- **`do_group` missing TO_VICT / TO_NOTVICT broadcasts on add/remove** (`mud/commands/group_commands.py:do_group`): ROM `src/act_obj.c... src/act_comm.c:1850-1854` (add) emits three messages — `$N joins $n's group.` (TO_NOTVICT, onlookers), `You join $n's group.` (TO_VICT, the joined victim), `$N joins your group.` (TO_CHAR, the leader). The remove path at `:1841-1846` is symmetric: `$n removes $N from $s group.` / `$n removes you from $s group.` / `You remove $N from your group.`. Python returned only the TO_CHAR string, so victims never learned they had been added to (or removed from) a group, and onlookers never saw membership changes. Fix: emit ROM-shaped messages on both branches via `messages.append(...)`, iterating room occupants for TO_NOTVICT. One enforcement test in `tests/integration/test_do_group_notification.py` covering the add path (victim TO_VICT + onlooker TO_NOTVICT + leader/follower state).
+
+## [2.9.19]
+
+### Fixed
+- **`do_follow` missing master/follower notification broadcasts** (`mud/commands/group_commands.py:add_follower / stop_follower`): ROM `src/act_comm.c:1602-1605 add_follower` emits `$n now follows you.` to the master (gated on `can_see`) and `You now follow $N.` to the follower; `src/act_comm.c:1626-1630 stop_follower` emits the symmetric `$n stops following you.` / `You stop following $N.` (gated on `can_see && in_room != NULL`). Python's `add_follower` / `stop_follower` in `mud/commands/group_commands.py` — the variants the command dispatcher actually uses (`mud/commands/dispatcher.py:114,320`) — were silent on both sides, so masters never learned when someone began or stopped following them. (A second canonical copy in `mud/characters/follow.py` already had the broadcasts, but it's not the one wired to `do_follow`.) Fix: add ROM-shaped messages to both `add_follower` and `stop_follower` in `group_commands.py`, gated by `can_see_character` to match ROM's `can_see (master, ch)` conjunction. One enforcement test in `tests/integration/test_do_follow_master_notification.py` covering both sides of the follow handshake. Duplicate-implementations sweep (consolidating onto the canonical `mud/characters/follow.py`) deferred — out of scope for this single-gap fix.
+
 ## [2.9.18]
 
 ### Fixed

{rom24_quickmud_python-2.9.18/rom24_quickmud_python.egg-info → rom24_quickmud_python-2.9.20}/PKG-INFO

@@ -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 → rom24_quickmud_python-2.9.20}/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 → rom24_quickmud_python-2.9.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rom24-quickmud-python"
-version = "2.9.18"
+version = "2.9.20"
 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.9.18 → rom24_quickmud_python-2.9.20/rom24_quickmud_python.egg-info}/PKG-INFO

@@ -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 → rom24_quickmud_python-2.9.20}/rom24_quickmud_python.egg-info/SOURCES.txt

@@ -669,6 +669,8 @@ tests/integration/test_do_consider_command.py
 tests/integration/test_do_equipment.py
 tests/integration/test_do_examine_command.py
 tests/integration/test_do_exits_command.py
+tests/integration/test_do_follow_master_notification.py
+tests/integration/test_do_group_notification.py
 tests/integration/test_do_help_command.py
 tests/integration/test_do_inventory.py
 tests/integration/test_do_look_command.py

rom24_quickmud_python-2.9.20/tests/integration/test_do_follow_master_notification.py

@@ -0,0 +1,102 @@
+"""Probe: do_follow must notify the master and the follower per ROM.
+
+ROM ``src/act_comm.c:1591-1607 add_follower``:
+
+    void add_follower (CHAR_DATA * ch, CHAR_DATA * master)
+    {
+        ...
+        if (can_see (master, ch))
+            act ("$n now follows you.", ch, NULL, master, TO_VICT);
+        act ("You now follow $N.", ch, NULL, master, TO_CHAR);
+    }
+
+The TO_VICT broadcast is load-bearing: without it, the master never
+learns someone began following them — they cannot decide whether to
+allow it, nofollow, or order their new tag-along.
+
+Python has two parallel ``add_follower`` implementations:
+
+- ``mud/characters/follow.py:add_follower`` (emits both messages,
+  matches ROM).
+- ``mud/commands/group_commands.py:add_follower`` (silent, no
+  messages).
+
+The command dispatcher registers
+``mud/commands/group_commands.py:do_follow`` (`mud/commands/dispatcher.py:114, 320`),
+which calls the silent variant. So players' ``follow X`` does NOT
+notify X. ROM-divergent at the load-bearing command entry point.
+"""
+
+from __future__ import annotations
+
+from mud.commands.dispatcher import process_command
+from mud.models.character import Character, character_registry
+from mud.models.constants import Position
+from mud.models.room import Room
+from mud.registry import room_registry
+
+
+def _make_room(vnum: int = 9410) -> Room:
+    room = Room(vnum=vnum, name="Follow Room", description="", room_flags=0, sector_type=0)
+    room.people = []
+    room.contents = []
+    room_registry[vnum] = room
+    return room
+
+
+def test_do_follow_notifies_master():
+    """ROM src/act_comm.c:1603 — master sees `$n now follows you.`."""
+    snapshot = list(character_registry)
+    character_registry.clear()
+    try:
+        room = _make_room()
+
+        follower = Character(
+            name="follower",
+            is_npc=False,
+            level=10,
+            room=room,
+            position=int(Position.STANDING),
+        )
+        follower.messages = []
+        room.people.append(follower)
+        character_registry.append(follower)
+
+        master = Character(
+            name="master",
+            is_npc=False,
+            level=10,
+            room=room,
+            position=int(Position.STANDING),
+        )
+        master.messages = []
+        room.people.append(master)
+        character_registry.append(master)
+
+        process_command(follower, "follow master")
+
+        # ROM: master sees "follower now follows you."
+        joined_master = "\n".join(master.messages).lower()
+        assert (
+            "follower" in joined_master and "now follows you" in joined_master
+        ), (
+            f"master must receive `$n now follows you.` broadcast "
+            f"(ROM src/act_comm.c:1603); master.messages = {master.messages!r}"
+        )
+
+        # ROM: follower sees "You now follow master."
+        joined_follower = "\n".join(follower.messages).lower()
+        assert (
+            "now follow" in joined_follower and "master" in joined_follower
+        ), (
+            f"follower must receive `You now follow $N.` "
+            f"(ROM src/act_comm.c:1605); follower.messages = {follower.messages!r}"
+        )
+
+        # State assertions: master/leader fields per ROM lines 1599-1600.
+        assert follower.master is master
+        assert follower.leader is None
+    finally:
+        character_registry.clear()
+        character_registry.extend(snapshot)
+        room_registry.pop(9410, None)

rom24_quickmud_python-2.9.20/tests/integration/test_do_group_notification.py

@@ -0,0 +1,101 @@
+"""Probe: do_group must notify victim and room per ROM.
+
+ROM ``src/act_comm.c:1850-1854`` (add path):
+
+    victim->leader = ch;
+    act_new ("$N joins $n's group.", ch, NULL, victim, TO_NOTVICT, POS_RESTING);
+    act_new ("You join $n's group.",  ch, NULL, victim, TO_VICT,   POS_SLEEPING);
+    act_new ("$N joins your group.",  ch, NULL, victim, TO_CHAR,   POS_SLEEPING);
+
+ROM ``src/act_comm.c:1840-1847`` (remove path):
+
+    victim->leader = NULL;
+    act_new ("$n removes $N from $s group.", ch, NULL, victim, TO_NOTVICT, ...);
+    act_new ("$n removes you from $s group.", ch, NULL, victim, TO_VICT,   ...);
+    act_new ("You remove $N from your group.", ch, NULL, victim, TO_CHAR,  ...);
+
+Python ``mud/commands/group_commands.py:do_group`` returns only the
+TO_CHAR string; the victim and onlookers receive nothing. Parallel
+to the do_follow notify gap closed in 2.9.19.
+"""
+
+from __future__ import annotations
+
+from mud.commands.dispatcher import process_command
+from mud.models.character import Character, character_registry
+from mud.models.constants import Position
+from mud.models.room import Room
+from mud.registry import room_registry
+
+
+def _make_room(vnum: int = 9411) -> Room:
+    room = Room(vnum=vnum, name="Group Room", description="", room_flags=0, sector_type=0)
+    room.people = []
+    room.contents = []
+    room_registry[vnum] = room
+    return room
+
+
+def test_do_group_add_notifies_victim_and_room():
+    """ROM src/act_comm.c:1850-1854 — victim and onlooker receive broadcasts on add."""
+    snapshot = list(character_registry)
+    character_registry.clear()
+    try:
+        room = _make_room()
+
+        leader = Character(
+            name="leader",
+            is_npc=False,
+            level=10,
+            room=room,
+            position=int(Position.STANDING),
+        )
+        leader.messages = []
+        room.people.append(leader)
+        character_registry.append(leader)
+
+        victim = Character(
+            name="victim",
+            is_npc=False,
+            level=10,
+            room=room,
+            position=int(Position.STANDING),
+        )
+        victim.messages = []
+        victim.master = leader
+        room.people.append(victim)
+        character_registry.append(victim)
+
+        onlooker = Character(
+            name="onlooker",
+            is_npc=False,
+            level=10,
+            room=room,
+            position=int(Position.STANDING),
+        )
+        onlooker.messages = []
+        room.people.append(onlooker)
+        character_registry.append(onlooker)
+
+        process_command(leader, "group victim")
+
+        # ROM: victim receives "You join $n's group." (TO_VICT)
+        joined_victim = "\n".join(victim.messages).lower()
+        assert "join" in joined_victim and "group" in joined_victim, (
+            f"victim must receive `You join $n's group.` "
+            f"(ROM src/act_comm.c:1853); victim.messages = {victim.messages!r}"
+        )
+
+        # ROM: onlooker receives "$N joins $n's group." (TO_NOTVICT)
+        joined_onlooker = "\n".join(onlooker.messages).lower()
+        assert "joins" in joined_onlooker and "group" in joined_onlooker, (
+            f"onlooker must receive `$N joins $n's group.` "
+            f"(ROM src/act_comm.c:1851); onlooker.messages = {onlooker.messages!r}"
+        )
+
+        # State per ROM line 1850.
+        assert victim.leader is leader
+    finally:
+        character_registry.clear()
+        character_registry.extend(snapshot)
+        room_registry.pop(9411, None)