PyPI - rom24-quickmud-python - Versions diffs - 2.9.3__tar.gz → 2.9.4__tar.gz - Mend

Files changed (826) hide show

rom24_quickmud_python-2.9.4/tests/integration/test_inv013_add_object_carrier.py ADDED Viewed

@@ -0,0 +1,140 @@
+"""INV-013/INV-011 follow-up: ``Character.add_object`` must set
+``obj.carried_by`` and update carry counters per ROM
+``src/handler.c:1626 obj_to_char``.
+ROM ``obj_to_char`` does three things atomically:
+    obj->next_content = ch->carrying;
+    ch->carrying = obj;
+    obj->carried_by = ch;
+    obj->in_room = NULL;
+    obj->in_obj = NULL;
+    ch->carry_number += get_obj_number(obj);
+    ch->carry_weight += get_obj_weight(obj);
+The Python ``Character.add_object`` previously updated
+``inventory`` + carry counters but never set ``obj.carried_by``, so
+the canonical INV-013 carrier field stayed ``None`` for every direct
+``add_object`` caller. Per the INV-013 property dispatch,
+``obj.location = self`` is the convergent way to set the field and
+clear the other two (``in_room``, ``in_obj``).
+Surfaced through the ``do_mpoload`` audit: the script command
+appended directly to ``ch.inventory`` instead of going through
+``add_object``, so it hit BOTH gaps — the carrier field stayed unset
+AND the carry counters drifted. Both regression tests live here so
+``Character.add_object`` and ``do_mpoload`` are pinned to ROM
+contracts together.
+"""
+from __future__ import annotations
+import pytest
+from mud.mob_cmds import do_mpoload
+from mud.models.character import Character
+from mud.models.obj import ObjIndex
+from mud.models.room import Room
+from mud.registry import obj_registry, room_registry
+from mud.spawning.obj_spawner import spawn_object
+_TEST_VNUM = 91510
+_ROOM_VNUM = 9511
+@pytest.fixture
+def add_room() -> Room:
+    room = room_registry.get(_ROOM_VNUM)
+    if room is None:
+        room = Room(vnum=_ROOM_VNUM, name="Add-Object Test Room")
+        room_registry[_ROOM_VNUM] = room
+    room.contents.clear()
+    room.people.clear()
+    return room
+@pytest.fixture(autouse=True)
+def _register_proto():
+    proto = ObjIndex(
+        vnum=_TEST_VNUM,
+        name="anvil",
+        short_descr="an anvil",
+        description="A heavy anvil.",
+        item_type=1,
+        level=5,
+        weight=20,
+        value=[0, 0, 0, 0, 0],
+    )
+    obj_registry[_TEST_VNUM] = proto
+    yield
+    obj_registry.pop(_TEST_VNUM, None)
+@pytest.fixture
+def carrier(add_room: Room) -> Character:
+    ch = Character(name="Carrier", is_npc=True)
+    ch.level = 30
+    ch.trust = 30
+    add_room.add_character(ch)
+    return ch
+def test_add_object_sets_carried_by(carrier: Character) -> None:
+    """``Character.add_object`` must set ``obj.carried_by`` per
+    ROM ``src/handler.c:1626 obj_to_char``.
+    """
+    obj = spawn_object(_TEST_VNUM)
+    assert obj is not None
+    carrier.add_object(obj)
+    assert obj in carrier.inventory
+    assert obj.carried_by is carrier, (
+        "Character.add_object appended to inventory without setting "
+        "obj.carried_by; ROM src/handler.c:1626 obj_to_char sets it "
+        "atomically and INV-013 makes carried_by the canonical "
+        "carrier field."
+    )
+    # INV-013: setting carried_by must clear the other two location
+    # fields atomically (property dispatch contract).
+    assert obj.in_room is None
+    assert obj.in_obj is None
+def test_mpoload_inventory_sets_carried_by(carrier: Character) -> None:
+    """``do_mpoload`` (inventory mode) must route through
+    ``Character.add_object`` so the carrier field is set.
+    """
+    do_mpoload(carrier, f"{_TEST_VNUM}")
+    assert len(carrier.inventory) == 1
+    obj = carrier.inventory[0]
+    assert obj.carried_by is carrier, (
+        "do_mpoload appended to ch.inventory directly without calling "
+        "ch.add_object(obj); obj.carried_by stayed None, violating "
+        "INV-013 and ROM src/mob_cmds.c:603-607 → src/handler.c:1626 "
+        "obj_to_char."
+    )
+def test_mpoload_inventory_updates_carry_counters(carrier: Character) -> None:
+    """``do_mpoload`` (inventory mode) must update ``carry_weight``
+    and ``carry_number`` per ROM ``obj_to_char`` (INV-011).
+    """
+    initial_weight = carrier.carry_weight
+    initial_number = carrier.carry_number
+    do_mpoload(carrier, f"{_TEST_VNUM}")
+    obj = carrier.inventory[0]
+    proto_weight = int(getattr(obj.prototype, "weight", 0) or 0)
+    assert carrier.carry_weight == initial_weight + proto_weight, (
+        f"carry_weight={carrier.carry_weight}; expected initial "
+        f"({initial_weight}) + obj.weight ({proto_weight}). do_mpoload "
+        "must route through Character.add_object so INV-011 carry "
+        "counters stay in lockstep with inventory contents."
+    )
+    assert carrier.carry_number == initial_number + 1

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
+## [2.9.4]
+### Fixed
+- **`Character.add_object` did not set `obj.carried_by`** (`mud/models/character.py:542`): ROM `src/handler.c:1626 obj_to_char` sets `obj->carried_by = ch` atomically with the inventory append. The Python helper updated `inventory` + carry counters but left the canonical INV-013 carrier field as `None`, so every direct `add_object` caller silently produced an inventory item with no back-pointer to its carrier. Fix: `add_object` now sets `obj.location = self` (INV-013 property dispatch sets `carried_by` and clears `in_room` / `in_obj`).
+- **`do_mpoload` bypassed `Character.add_object` entirely** (`mud/mob_cmds.py:651-655`, ROM `src/mob_cmds.c:603-607 → src/handler.c:1626 obj_to_char`): the inventory-mode branch did `inventory.append(obj)`, missing both the INV-013 `carried_by` field AND the INV-011 carry counters. Every MOBprog `mob oload <vnum>` left the script-mob's `carry_weight` and `carry_number` unchanged, so encumbrance skewed every time a mob scripted an item load. Fix: route through `ch.add_object(obj)`.
+- Surfaced via the INV-012 follow-up scan of `do_mpoload`; existing `test_mob_cmds_oload.py` only checked `obj.level` and inventory membership, never asserting `carried_by` or carry counters. New `tests/integration/test_inv013_add_object_carrier.py` pins both behaviors (3 tests).
 ## [2.9.3]
 ### Added

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

@@ -648,11 +648,19 @@ def do_mpoload(ch: Character, argument: str) -> None:
     if mode.startswith("r"):
         room.add_object(obj)
         return
+    # mirroring ROM src/mob_cmds.c:603-607 → src/handler.c:1626 obj_to_char.
+    # Route through Character.add_object so the INV-013 carrier field
+    # and INV-011 carry counters stay in lockstep with inventory.
+    add = getattr(ch, "add_object", None)
+    if callable(add):
+        add(obj)
+        return
     inventory = getattr(ch, "inventory", None)
     if inventory is None:
         inventory = []
         ch.inventory = inventory
     inventory.append(obj)
+    obj.location = ch
 def _resolve_transfer_location(ch: Character, token: str) -> Room | None:

@@ -540,7 +540,12 @@ class Character:
         return base_weight + silver // 10 + (gold * 2) // 5
     def add_object(self, obj: Object) -> None:
+        # mirroring ROM src/handler.c:1626 obj_to_char — the carrier
+        # field is set atomically with the inventory append. Using the
+        # INV-013 `obj.location` property dispatch sets `carried_by`
+        # and clears `in_room` / `in_obj` per the property contract.
         self.inventory.append(obj)
+        obj.location = self
         self.carry_number += _object_carry_number(obj)
         self._recalculate_carry_weight()

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "rom24-quickmud-python"
-version = "2.9.3"
+version = "2.9.4"
 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"

@@ -703,6 +703,7 @@ tests/integration/test_inv010_room_people_coherence.py
 tests/integration/test_inv011_carry_weight_coherence.py
 tests/integration/test_inv012_end_to_end.py
 tests/integration/test_inv012_object_list_canonical.py
+tests/integration/test_inv013_add_object_carrier.py
 tests/integration/test_inv013_object_location_coherence.py
 tests/integration/test_inv014_object_registry_membership.py
 tests/integration/test_invisibility_combat.py

rom24-quickmud-python 2.9.3__tar.gz → 2.9.4__tar.gz

rom24-quickmud-python 2.9.3tar.gz → 2.9.4tar.gz