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

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

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+- **`do_say` / `do_tell` missing `!IS_NPC(ch)` gate on SPEECH trigger loop** (`mud/commands/communication.py:140-175`, `:178-241`): ROM `src/act_comm.c:779` (`do_say`) and `:946` (`do_tell`) only enter the SPEECH listener loop when the speaker is a PC: `if (!IS_NPC (ch)) { ... }` and `if (!IS_NPC (ch) && IS_NPC (victim) && HAS_TRIGGER (victim, TRIG_SPEECH))`. The gate is load-bearing: it prevents mob-to-mob speech-trigger cascades (mob A says "X" → mob B's SPEECH trigger fires `mob say "Y"` → mob A's trigger fires → infinite loop). Python's listener loop was unconditional — any NPC who called `do_say` or `do_tell` (e.g. via `mud/agent/character_agent.py`, or any future agent-driven mob path) would fire SPEECH triggers on other NPCs. Fix: gate both listener loops on `not getattr(char, "is_npc", False)` (and `do_tell`'s also requires `getattr(target, "is_npc", False)`, matching ROM's compound conjunction). Two enforcement tests in `tests/integration/test_npc_speaker_does_not_trigger_speech.py`: (1) NPC speaker via `do_say` does not fire SPEECH on listening NPC; (2) NPC teller via `do_tell` does not fire SPEECH on NPC target.
+
 ## [2.9.16]
 
 ### Added

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.16
+Version: 2.9.18
 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.16 → rom24_quickmud_python-2.9.18}/mud/commands/communication.py

@@ -165,13 +165,18 @@ def do_say(char: Character, args: str) -> str:
                 asyncio.create_task(send_to_char(listener, per_message))
             if hasattr(listener, "messages"):
                 listener.messages.append(per_message)
-        for mob in list(char.room.people):
-            if mob is char or not getattr(mob, "is_npc", False):
-                continue
-            default_pos = getattr(mob, "default_pos", getattr(mob, "position", Position.STANDING))
-            if getattr(mob, "position", default_pos) != default_pos:
-                continue
-            mobprog.mp_speech_trigger(args, mob, char)
+        # mirroring ROM src/act_comm.c:779 — `if (!IS_NPC (ch))` gate.
+        # Only PC speakers enter the SPEECH listener loop; this prevents
+        # mob-to-mob speech-trigger cascades (mob A says "X" → mob B's
+        # SPEECH trigger fires → triggers another say → infinite loop).
+        if not getattr(char, "is_npc", False):
+            for mob in list(char.room.people):
+                if mob is char or not getattr(mob, "is_npc", False):
+                    continue
+                default_pos = getattr(mob, "default_pos", getattr(mob, "position", Position.STANDING))
+                if getattr(mob, "position", default_pos) != default_pos:
+                    continue
+                mobprog.mp_speech_trigger(args, mob, char)
     return f"{{6You say '{{7{args}{{6'{{x"
 
 
@@ -215,7 +220,10 @@ def do_tell(char: Character, args: str) -> str:
     if buffered_response:
         return buffered_response
 
-    if getattr(target, "is_npc", False):
+    # mirroring ROM src/act_comm.c:946 — `if (!IS_NPC (ch) && IS_NPC (victim)
+    # && HAS_TRIGGER (victim, TRIG_SPEECH))`. NPC tellers do not fire SPEECH
+    # triggers on NPC targets; same anti-cascade gate as do_say.
+    if not getattr(char, "is_npc", False) and getattr(target, "is_npc", False):
         default_pos = getattr(target, "default_pos", getattr(target, "position", Position.STANDING))
         if getattr(target, "position", default_pos) == default_pos:
             mobprog.mp_speech_trigger(message, target, char)

{rom24_quickmud_python-2.9.16 → rom24_quickmud_python-2.9.18}/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.16 → rom24_quickmud_python-2.9.18}/pyproject.toml

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

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

@@ -744,6 +744,7 @@ tests/integration/test_music_play.py
 tests/integration/test_nanny_login_parity.py
 tests/integration/test_nanny_saveload_runtime_path.py
 tests/integration/test_new_player_workflow.py
+tests/integration/test_npc_speaker_does_not_trigger_speech.py
 tests/integration/test_numbered_get_syntax.py
 tests/integration/test_olc_001_run_olc_editor.py
 tests/integration/test_olc_007_redit_list_show.py
@@ -807,6 +808,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.18/tests/integration/test_npc_speaker_does_not_trigger_speech.py

@@ -0,0 +1,213 @@
+"""Probe: NPC speaker must not fire SPEECH triggers on listening NPCs.
+
+ROM ``src/act_comm.c:779-789`` (do_say):
+
+    if (!IS_NPC (ch))
+    {
+        CHAR_DATA *mob, *mob_next;
+        for (mob = ch->in_room->people; mob != NULL; mob = mob_next)
+        {
+            mob_next = mob->next_in_room;
+            if (IS_NPC (mob) && HAS_TRIGGER (mob, TRIG_SPEECH)
+                && mob->position == mob->pIndexData->default_pos)
+                mp_act_trigger (argument, mob, ch, NULL, NULL, TRIG_SPEECH);
+        }
+    }
+
+The outer ``if (!IS_NPC (ch))`` gate is load-bearing: it prevents
+mob-to-mob speech-trigger cascades.  ROM's MOBtrigger global
+(``src/comm.c:311, 2384``) plays a related role for ``act()``-driven
+triggers, but the SPEECH path in do_say has its own static gate at the
+loop head — it never enters the listener loop when the speaker is an
+NPC.
+
+Python's ``mud/commands/communication.py:do_say`` (lines 168-174) iterates
+``char.room.people`` and calls ``mp_speech_trigger`` on every listening
+NPC whose position matches its default_pos — but it does NOT check
+``char.is_npc`` first.  If an NPC ever calls ``do_say`` (via
+``mud/agent/character_agent.py`` or any future agent-driven mob), the
+listener loop runs, contradicting ROM.
+
+Status: probe.  If this test FAILS (the SPEECH trigger fires on the
+listening NPC when an NPC speaker calls do_say), the gap is real and a
+gap-closer follows.  If it PASSES, the contract is enforced by some
+other gate and the probe is closed.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from mud.commands.communication import do_say
+from mud.models.character import Character, character_registry
+from mud.models.constants import Position
+from mud.models.mob import MobIndex
+from mud.models.room import Room
+from mud.registry import room_registry
+
+
+@pytest.fixture(autouse=True)
+def _cleanup():
+    snapshot = list(character_registry)
+    character_registry.clear()
+    yield
+    character_registry.clear()
+    character_registry.extend(snapshot)
+    room_registry.pop(9400, None)
+
+
+def _make_room() -> Room:
+    room = Room(vnum=9400, name="Speech", description="", room_flags=0, sector_type=0)
+    room.people = []
+    room.contents = []
+    room_registry[9400] = room
+    return room
+
+
+class _FakeProg:
+    def __init__(self, trig_type: int, trig_phrase: str, code: str, vnum: int = 9401):
+        self.trig_type = trig_type
+        self.trig_phrase = trig_phrase
+        self.code = code
+        self.vnum = vnum
+
+
+def test_npc_speaker_does_not_fire_speech_trigger_on_listener():
+    """ROM gate: NPC speakers must not trigger SPEECH on listening NPCs.
+
+    Set up a speaker NPC (with messages list to receive its own self-line)
+    and a listener NPC with a SPEECH trigger keyed off a phrase.  The
+    listener's trigger fires by appending to a sentinel list on the mob.
+    """
+    from mud.mobprog import Trigger
+
+    room = _make_room()
+
+    speaker = Character(
+        name="speaker",
+        is_npc=True,
+        level=10,
+        room=room,
+        position=int(Position.STANDING),
+        default_pos=int(Position.STANDING),
+    )
+    speaker.messages = []
+    room.people.append(speaker)
+    character_registry.append(speaker)
+
+    listener = Character(
+        name="listener",
+        is_npc=True,
+        level=10,
+        room=room,
+        position=int(Position.STANDING),
+        default_pos=int(Position.STANDING),
+    )
+    listener.messages = []
+    # Attach a SPEECH trigger whose phrase matches our say.
+    prog = _FakeProg(
+        trig_type=int(Trigger.SPEECH),
+        trig_phrase="hello",
+        code='mob echo "TRIGGERED"\n',
+        vnum=9401,
+    )
+    proto = MobIndex(vnum=9401, short_descr="a listener", level=10)
+    proto.mprogs = [prog]
+    listener.prototype = proto
+
+    room.people.append(listener)
+    character_registry.append(listener)
+
+    # Capture trigger firings via a probe wrapper around mp_act_trigger.
+    fired: list[tuple[str, str]] = []
+
+    import mud.mobprog as mobprog
+
+    original = mobprog.mp_act_trigger
+
+    def _probe(argument, mob, ch, *args, **kwargs):
+        fired.append((getattr(mob, "name", "?"), argument))
+        return original(argument, mob, ch, *args, **kwargs)
+
+    mobprog.mp_act_trigger = _probe
+    try:
+        do_say(speaker, "hello")
+    finally:
+        mobprog.mp_act_trigger = original
+
+    # ROM gate: NPC speakers do NOT enter the SPEECH listener loop.
+    assert fired == [], (
+        f"NPC speaker must not fire SPEECH trigger on listening NPCs "
+        f"(ROM src/act_comm.c:779 `if (!IS_NPC (ch))`); "
+        f"fired triggers: {fired}"
+    )
+
+
+def test_npc_teller_does_not_fire_speech_trigger_on_target():
+    """ROM src/act_comm.c:946 — `if (!IS_NPC (ch) && IS_NPC (victim) ...)`.
+
+    do_tell carries the same anti-cascade gate as do_say.  An NPC who
+    tells another NPC something must not fire the target's SPEECH
+    trigger.
+    """
+    from mud.commands.communication import do_tell
+    from mud.mobprog import Trigger
+
+    room = _make_room()
+
+    speaker = Character(
+        name="speaker",
+        is_npc=True,
+        level=10,
+        room=room,
+        position=int(Position.STANDING),
+        default_pos=int(Position.STANDING),
+    )
+    speaker.messages = []
+    speaker.banned_channels = set()
+    speaker.comm = 0
+    room.people.append(speaker)
+    character_registry.append(speaker)
+
+    target = Character(
+        name="target",
+        is_npc=True,
+        level=10,
+        room=room,
+        position=int(Position.STANDING),
+        default_pos=int(Position.STANDING),
+    )
+    target.messages = []
+    target.banned_channels = set()
+    target.comm = 0
+    proto = MobIndex(vnum=9402, short_descr="a target", level=10)
+    prog = _FakeProg(
+        trig_type=int(Trigger.SPEECH),
+        trig_phrase="hello",
+        code='mob echo "TELL_TRIGGERED"\n',
+        vnum=9402,
+    )
+    proto.mprogs = [prog]
+    target.prototype = proto
+    room.people.append(target)
+    character_registry.append(target)
+
+    fired: list[tuple[str, str]] = []
+    import mud.mobprog as mobprog
+
+    original = mobprog.mp_act_trigger
+
+    def _probe(argument, mob, ch, *args, **kwargs):
+        fired.append((getattr(mob, "name", "?"), argument))
+        return original(argument, mob, ch, *args, **kwargs)
+
+    mobprog.mp_act_trigger = _probe
+    try:
+        do_tell(speaker, "target hello")
+    finally:
+        mobprog.mp_act_trigger = original
+
+    assert fired == [], (
+        f"NPC teller must not fire SPEECH trigger on NPC target "
+        f"(ROM src/act_comm.c:946); fired triggers: {fired}"
+    )

rom24_quickmud_python-2.9.18/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"
+    )