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

{rom24_quickmud_python-2.9.4 → rom24_quickmud_python-2.9.5}/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.9.5]
+
+### Fixed
+- **`Character.equip_object` did not set `obj.carried_by`** (`mud/models/character.py:547`): ROM `src/handler.c equip_char` leaves the carrier field set — equipped objs stay owned by the carrier, only `wear_loc` changes. The Python helper updated the equipment dict but never touched `carried_by`, so an obj equipped directly (e.g. via `caster.equip_object(disc, "float")` in `floating_disc`) ended up in the slot with `carried_by=None`, violating INV-013.
+- **`Character.remove_object` did not clear `obj.carried_by`** (`mud/models/character.py:556`): ROM `src/handler.c:1642 obj_from_char` clears the carrier back-pointer atomically with the extraction. The Python helper removed from inventory/equipment and updated counters but left `carried_by` pointing at the (now-former) carrier — stale back-pointer that would surface as a wrong-carrier report in `locate object`, save serialization, or any INV-013-aware code. Defensive `getattr` guard handles the small number of legacy tests that pass `SimpleNamespace` stand-ins instead of real `Object` instances.
+- INV-013 row "Touched by" trail extended to record the equip / remove enforcement points. 3 new enforcement tests in `tests/integration/test_inv013_add_object_carrier.py` (now 6 total covering the full add / equip / remove cycle).
+
 ## [2.9.4]
 
 ### Fixed

{rom24_quickmud_python-2.9.4/rom24_quickmud_python.egg-info → rom24_quickmud_python-2.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.4
+Version: 2.9.5
 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.4 → rom24_quickmud_python-2.9.5}/mud/models/character.py

@@ -556,6 +556,10 @@ class Character:
         else:
             self.carry_number += carry_delta
         self.equipment[slot] = obj
+        # mirroring ROM src/handler.c equip_char — equipped objs stay
+        # owned by the carrier (only wear_loc changes); INV-013 makes
+        # carried_by the canonical carrier field.
+        obj.carried_by = self
         self._recalculate_carry_weight()
 
     def remove_object(self, obj: Object) -> None:
@@ -568,6 +572,10 @@ class Character:
                     del self.equipment[slot]
                     break
         self.carry_number = max(0, self.carry_number - carry_delta)
+        # mirroring ROM src/handler.c:1642 obj_from_char — extraction
+        # clears the carrier back-pointer atomically. INV-013.
+        if getattr(obj, "carried_by", None) is self:
+            obj.carried_by = None
         self._recalculate_carry_weight()
 
     # START affects_saves

{rom24_quickmud_python-2.9.4 → rom24_quickmud_python-2.9.5}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rom24-quickmud-python
-Version: 2.9.4
+Version: 2.9.5
 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.4 → rom24_quickmud_python-2.9.5}/tests/integration/test_inv013_add_object_carrier.py

@@ -119,6 +119,67 @@ def test_mpoload_inventory_sets_carried_by(carrier: Character) -> None:
     )
 
 
+def test_equip_object_sets_carried_by(carrier: Character) -> None:
+    """ROM ``equip_char`` (``src/handler.c``) leaves ``carried_by``
+    set — equipped items are still owned by the carrier, only
+    ``wear_loc`` changes. The Python ``Character.equip_object`` must
+    not leave ``carried_by`` as ``None`` when the obj was equipped
+    directly (without first going through ``add_object``).
+    """
+
+    obj = spawn_object(_TEST_VNUM)
+    assert obj is not None
+
+    carrier.equip_object(obj, "wield")
+
+    assert carrier.equipment.get("wield") is obj
+    assert obj.carried_by is carrier, (
+        "Character.equip_object did not set obj.carried_by; ROM keeps "
+        "equipped objs owned by the carrier (only wear_loc changes), "
+        "and INV-013 makes carried_by the canonical carrier field."
+    )
+
+
+def test_remove_object_clears_carried_by(carrier: Character) -> None:
+    """ROM ``obj_from_char`` (``src/handler.c:1642``) clears
+    ``obj->carried_by`` and ``obj->wear_loc``. The Python
+    ``Character.remove_object`` must mirror that — leaving the back-
+    pointer set after extraction is an INV-013 contract violation.
+    """
+
+    obj = spawn_object(_TEST_VNUM)
+    assert obj is not None
+    carrier.add_object(obj)
+    assert obj.carried_by is carrier
+
+    carrier.remove_object(obj)
+
+    assert obj not in carrier.inventory
+    assert obj.carried_by is None, (
+        "Character.remove_object did not clear obj.carried_by; ROM "
+        "src/handler.c:1642 obj_from_char clears it atomically."
+    )
+
+
+def test_remove_object_clears_carried_by_when_equipped(
+    carrier: Character,
+) -> None:
+    """Symmetry: removing an *equipped* obj must also clear
+    ``carried_by`` (ROM ``obj_from_char`` does not branch on
+    ``wear_loc``).
+    """
+
+    obj = spawn_object(_TEST_VNUM)
+    assert obj is not None
+    carrier.equip_object(obj, "wield")
+    assert obj.carried_by is carrier
+
+    carrier.remove_object(obj)
+
+    assert carrier.equipment.get("wield") is None
+    assert obj.carried_by is None
+
+
 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).