rom24-quickmud-python 2.9.17__tar.gz → 2.9.19__tar.gz

{rom24_quickmud_python-2.9.17 → rom24_quickmud_python-2.9.19}/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+- **`do_buy` missing `$n buys $p.` TO_ROOM broadcast** (`mud/commands/shop.py:836-846`): ROM `src/act_obj.c:2734-2745 do_buy` emits `$n buys $p[N].` (multi) or `$n buys $p.` (single) to the room before deducting cost, so onlookers see the purchase. Python's `do_buy` had zero room broadcasts — the buyer received their TO_CHAR confirmation but no witness in the room saw the transaction. ROM-divergent. (Sibling `do_sell` at `mud/commands/shop.py:938-942` already had the matching `$n sells $p.` broadcast.) Fix: emit the broadcast via `room.broadcast(..., exclude=char)` before `deduct_cost`, mirroring ROM ordering and `do_sell`'s established pattern. Two enforcement tests in `tests/integration/test_shop_room_broadcasts.py`: (1) witness in same room sees `$n buys $p.` after buy, buyer excluded; (2) regression-pin for the pre-existing `do_sell` broadcast so it can't silently regress.
+
 ## [2.9.17]
 
 ### Fixed

{rom24_quickmud_python-2.9.17/rom24_quickmud_python.egg-info → rom24_quickmud_python-2.9.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.17
+Version: 2.9.19
 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.17 → rom24_quickmud_python-2.9.19}/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
 

{rom24_quickmud_python-2.9.17 → rom24_quickmud_python-2.9.19}/mud/commands/shop.py

@@ -833,6 +833,17 @@ def do_buy(char: Character, args: str) -> str:
                 char.messages.append("You haggle with the shopkeeper.")
             check_improve(char, "haggle", True, 4)
 
+    # ROM src/act_obj.c:2734-2745 — broadcast `$n buys $p[N].` or `$n buys $p.`
+    # to the room before deducting cost so onlookers see the transaction.
+    room = getattr(char, "room", None)
+    if room is not None:
+        buyer_name = char.short_descr or char.name or "Someone"
+        item_name = selected_obj.short_descr or selected_obj.name or "something"
+        if quantity > 1:
+            room.broadcast(f"{buyer_name} buys {item_name}[{quantity}].", exclude=char)
+        else:
+            room.broadcast(f"{buyer_name} buys {item_name}.", exclude=char)
+
     deduct_cost(char, total_cost)
     _set_keeper_total_wealth(keeper, _keeper_total_wealth(keeper) + total_cost)
 

{rom24_quickmud_python-2.9.17 → rom24_quickmud_python-2.9.19}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.17
+Version: 2.9.19
 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.17 → rom24_quickmud_python-2.9.19}/rom24_quickmud_python.egg-info/SOURCES.txt

@@ -669,6 +669,7 @@ 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_help_command.py
 tests/integration/test_do_inventory.py
 tests/integration/test_do_look_command.py
@@ -808,6 +809,7 @@ tests/integration/test_runtime_bugs_2026_04_30.py
 tests/integration/test_sacrifice_command.py
 tests/integration/test_say_parity.py
 tests/integration/test_scan_broadcasts.py
+tests/integration/test_shop_room_broadcasts.py
 tests/integration/test_shout_yell_parity.py
 tests/integration/test_skills_integration.py
 tests/integration/test_skills_integration_combat_specials.py

rom24_quickmud_python-2.9.19/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.19/tests/integration/test_shop_room_broadcasts.py

@@ -0,0 +1,120 @@
+"""Probe: shop do_buy / do_sell must emit TO_ROOM broadcasts.
+
+ROM ``src/act_obj.c``:
+
+  - do_buy (line 2734-2745): emits ``$n buys $p[N].`` (multi) or
+    ``$n buys $p.`` (single) to the room before deducting cost.
+  - do_sell (line 2923): emits ``$n sells $p.`` to the room before
+    haggle/cost-transfer.
+
+Python ``mud/commands/shop.py`` has zero ``broadcast_room`` calls — the
+buyer/seller gets a TO_CHAR string but no witness in the room sees the
+transaction. ROM-divergent: in the original engine, every onlooker sees
+shop activity.
+"""
+
+from __future__ import annotations
+
+from mud.commands.dispatcher import process_command
+from mud.models.character import character_registry
+from mud.registry import shop_registry
+from mud.spawning.mob_spawner import spawn_mob
+from mud.spawning.obj_spawner import spawn_object
+from mud.time import time_info
+from mud.world import create_test_character, initialize_world
+
+
+def _grocer_in_room(char):
+    return next(
+        (
+            p
+            for p in char.room.people
+            if getattr(p, "prototype", None) and p.prototype.vnum in shop_registry
+        ),
+        None,
+    )
+
+
+def _ensure_lantern(keeper):
+    if not any(
+        (obj.short_descr or "").lower().startswith("a hooded brass lantern")
+        for obj in keeper.inventory
+    ):
+        lantern = spawn_object(3031)
+        assert lantern is not None
+        lantern.prototype.short_descr = "a hooded brass lantern"
+        keeper.inventory.append(lantern)
+
+
+def test_do_buy_broadcasts_to_room():
+    """ROM src/act_obj.c:2742 — `act("$n buys $p.", ch, obj, NULL, TO_ROOM)`."""
+    initialize_world("area/area.lst")
+    char = create_test_character("Buyer", 3010)
+    char.level = 20
+    char.gold = 100
+    keeper = _grocer_in_room(char) or spawn_mob(3002)
+    assert keeper is not None
+    if keeper not in char.room.people:
+        keeper.move_to_room(char.room)
+
+    witness = create_test_character("Witness", 3010)
+    witness.messages = []
+
+    previous_hour = time_info.hour
+    try:
+        time_info.hour = 10
+        _ensure_lantern(keeper)
+        process_command(char, "buy lantern")
+    finally:
+        time_info.hour = previous_hour
+
+    joined = "\n".join(witness.messages)
+    assert "buys" in joined.lower() and "lantern" in joined.lower(), (
+        f"witness must see `$n buys $p.` broadcast (ROM src/act_obj.c:2742); "
+        f"witness.messages = {witness.messages!r}"
+    )
+    # Buyer should be excluded from the room broadcast.
+    assert not any("buys" in m.lower() for m in getattr(char, "messages", []) or []), (
+        "buyer should not receive the TO_ROOM `$n buys $p.` broadcast"
+    )
+
+
+def test_do_sell_broadcasts_to_room():
+    """ROM src/act_obj.c:2923 — `act("$n sells $p.", ch, obj, NULL, TO_ROOM)`."""
+    initialize_world("area/area.lst")
+    char = create_test_character("Seller", 3010)
+    char.level = 20
+    char.gold = 100
+    keeper = _grocer_in_room(char) or spawn_mob(3002)
+    assert keeper is not None
+    if keeper not in char.room.people:
+        keeper.move_to_room(char.room)
+
+    # Buy a lantern so the seller has something the keeper will buy back.
+    previous_hour = time_info.hour
+    try:
+        time_info.hour = 10
+        _ensure_lantern(keeper)
+        process_command(char, "buy lantern")
+    finally:
+        time_info.hour = previous_hour
+
+    witness = create_test_character("Witness", 3010)
+    witness.messages = []
+    if hasattr(char, "messages"):
+        char.messages.clear()
+
+    try:
+        time_info.hour = 10
+        process_command(char, "sell lantern")
+    finally:
+        time_info.hour = previous_hour
+
+    joined = "\n".join(witness.messages)
+    assert "sells" in joined.lower() and "lantern" in joined.lower(), (
+        f"witness must see `$n sells $p.` broadcast (ROM src/act_obj.c:2923); "
+        f"witness.messages = {witness.messages!r}"
+    )
+    assert not any("sells" in m.lower() for m in getattr(char, "messages", []) or []), (
+        "seller should not receive the TO_ROOM `$n sells $p.` broadcast"
+    )