rom24-quickmud-python 2.9.2__py3-none-any.whl → 2.9.4__py3-none-any.whl

mud/combat/death.py

@@ -29,7 +29,7 @@ from mud.characters.follow import stop_follower
 from mud.models.clans import get_clan_hall_vnum
 from mud.models.races import get_race_by_index
 from mud.models.obj import ObjIndex
-from mud.models.object import Object
+from mud.models.object import Object, create_object
 from mud.models.social import expand_placeholders
 from mud.spawning.obj_spawner import spawn_object
 from mud.utils import rng_mm
@@ -74,7 +74,7 @@ def _fallback_gore(
         description=description_template,
     )
     proto.item_type = int(item_type)
-    obj = Object(instance_id=None, prototype=proto)
+    obj = create_object(proto)
     obj.item_type = int(item_type)
     return obj
 
@@ -341,7 +341,7 @@ def _fallback_corpse(vnum: int, *, item_type: ItemType) -> Object:
 
     proto = ObjIndex(vnum=vnum, short_descr="the corpse of %s", description="The corpse of %s is lying here.")
     proto.item_type = int(item_type)
-    corpse = Object(instance_id=None, prototype=proto)
+    corpse = create_object(proto)
     corpse.item_type = int(item_type)
     return corpse
 

mud/commands/shop.py

@@ -20,7 +20,7 @@ from mud.models.constants import (
     ITEM_SELL_EXTRACT,
     ITEM_VIS_DEATH,
 )
-from mud.models.object import Object
+from mud.models.object import Object, create_object
 from mud.registry import room_registry, shop_registry
 from mud.skills import check_improve
 from mud.spawning.obj_spawner import spawn_object
@@ -354,7 +354,7 @@ def _clone_inventory_object(template: Object) -> Object | None:
 
     clone = spawn_object(getattr(proto, "vnum", 0))
     if clone is None:
-        clone = Object(instance_id=None, prototype=proto)
+        clone = create_object(proto)
 
     # Mirror runtime overrides from the template copy so shop customisations persist.
     clone.value = list(getattr(template, "value", clone.value))

mud/handler.py

@@ -892,7 +892,7 @@ def create_money(gold: int, silver: int) -> Object:
         ItemType,
     )
     from mud.models.obj import ObjIndex
-    from mud.models.object import Object
+    from mud.models.object import Object, create_object
 
     # ROM C handler.c:2432-2437 (validate input)
     if gold < 0 or silver < 0 or (gold == 0 and silver == 0):
@@ -957,7 +957,7 @@ def create_money(gold: int, silver: int) -> Object:
         wear_flags=int(WearFlag.TAKE),
         weight=weight,
     )
-    obj = Object(instance_id=None, prototype=proto)
+    obj = create_object(proto)
     obj.item_type = int(ItemType.MONEY)
     obj.short_descr = short_descr
     obj.cost = cost

mud/mob_cmds.py

@@ -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:

mud/models/character.py

@@ -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()
 

mud/models/conversion.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from mud.db.models import Character as DBCharacter
 from mud.db.models import ObjectInstance as DBObjectInstance
-from mud.models.object import Object
+from mud.models.object import Object, create_object
 from mud.registry import obj_registry
 
 
@@ -14,7 +14,7 @@ def load_objects_for_character(db_char: DBCharacter) -> tuple[list[Object], dict
         proto = obj_registry.get(inst.prototype_vnum)
         if not proto:
             continue
-        obj = Object(instance_id=inst.id, prototype=proto)
+        obj = create_object(proto, instance_id=inst.id)
         if inst.location and inst.location.startswith("equipment:"):
             slot = inst.location.split(":", 1)[1]
             equipment[slot] = obj

mud/models/object.py

@@ -146,3 +146,23 @@ class Object:
             self.in_room = value  # type: ignore[assignment]
             self.carried_by = None
             self.in_obj = None
+
+
+def create_object(prototype: ObjIndex, *, instance_id: int | None = None) -> Object:
+    """Build a new ``Object`` and register it on ``object_registry``.
+
+    INV-014 OBJECT-REGISTRY-MEMBERSHIP: ROM ``src/db.c:create_object``
+    appends every freshly built ``OBJ_DATA`` to the global
+    ``object_list``. ``mud.models.obj.object_registry`` is the canonical
+    Python equivalent; world-scan consumers (``spell_locate_object`` and
+    any future iteration over every live object) rely on it being
+    complete. Every Python ``Object(...)`` construction site that does
+    not already go through ``mud.spawning.obj_spawner.spawn_object``
+    must call this helper.
+    """
+
+    from mud.models.obj import object_registry
+
+    obj = Object(instance_id=instance_id, prototype=prototype)
+    object_registry.append(obj)
+    return obj

mud/rom_api.py

@@ -658,7 +658,7 @@ def recursive_clone(obj: Object, clone_to: Object | None = None) -> Object:
         Cloned object with all contents
     """
     from mud.models.obj import ObjIndex
-    from mud.models.object import Object
+    from mud.models.object import Object, create_object
 
     if not obj.prototype:
         proto = ObjIndex(
@@ -678,7 +678,7 @@ def recursive_clone(obj: Object, clone_to: Object | None = None) -> Object:
     else:
         proto = obj.prototype
 
-    new_obj = Object(instance_id=None, prototype=proto)
+    new_obj = create_object(proto)
 
     for content in obj.contained_items:
         recursive_clone(content, new_obj)

mud/skills/handlers.py

@@ -857,16 +857,52 @@ def _object_name_matches(obj: Object, search: str) -> bool:
 
 
 def _iterate_world_objects():
-    """Yield (object, holder) pairs mirroring ROM ``object_list`` traversal."""
+    """Yield ``(object, holder)`` pairs mirroring ROM ``object_list``.
+
+    INV-014 OBJECT-REGISTRY-MEMBERSHIP: ``object_registry`` is the
+    canonical Python equivalent of ROM ``object_list``. The primary
+    iteration walks it directly so that registered-but-unplaced objects
+    (e.g. transiently between ``extract`` and re-placement, or freshly
+    spawned before being put in a room) are surfaced exactly as ROM
+    ``spell_locate_object`` (src/magic.c:3737) sees them.
+
+    For each registered obj the holder is computed per ROM
+    src/magic.c:3747: walk the ``in_obj`` chain to the outermost
+    container, then prefer ``carried_by`` over ``in_room`` (``None``
+    if neither is set, rendered as "somewhere").
+
+    A secondary walk of ``room_registry`` / ``character_registry``
+    backstops legacy unit tests that build ``Object`` instances directly
+    without going through ``create_object`` / ``spawn_object``; the seen
+    set dedupes by identity so registered objects are not yielded twice.
+    """
+
+    from mud.models.obj import object_registry
 
     seen: set[int] = set()
 
-    def _walk(obj: Object, holder: object):
+    def _yield(obj: Object, holder: object):
         ident = id(obj)
         if ident in seen:
             return
         seen.add(ident)
         yield obj, holder
+
+    for obj in list(object_registry):
+        outer = obj
+        while getattr(outer, "in_obj", None) is not None:
+            outer = outer.in_obj
+        carried_by = getattr(outer, "carried_by", None)
+        if carried_by is not None:
+            yield from _yield(obj, carried_by)
+            continue
+        in_room = getattr(outer, "in_room", None)
+        yield from _yield(obj, in_room)
+
+    def _walk(obj: Object, holder: object):
+        if id(obj) in seen:
+            return
+        yield from _yield(obj, holder)
         children: list[Object] = []
         contained = getattr(obj, "contained_items", None)
         if isinstance(contained, list):

{rom24_quickmud_python-2.9.2.dist-info → rom24_quickmud_python-2.9.4.dist-info}/METADATA

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

{rom24_quickmud_python-2.9.2.dist-info → rom24_quickmud_python-2.9.4.dist-info}/RECORD

@@ -5,13 +5,13 @@ mud/config.py,sha256=FmuhwTeR5798i_dHBJvZ_EQ4d_eNO8oMa8ni8fxiHhs,7057
 mud/entrypoint.py,sha256=WxBW3GfbKCOtSD5rx2ccSAC7lA3YRFi7DJ_EZvi1rmo,854
 mud/game_loop.py,sha256=nzGos1soW6oN3LCdl_XYlmB-k2QRI0mnpGn5JofbFXM,52109
 mud/game_tick_scheduler.py,sha256=7ybo2ekDQQPGN82u6fhcrrg7tZ-JMtGy4UUrZv9_Umo,1539
-mud/handler.py,sha256=AxfyMfNoAURX-Oa5tkDOAnWc7lB_2QaHP8GxgdSwB24,52001
+mud/handler.py,sha256=UDX7lxaOUFvHBgIJrkxfgVjm0n7B_vD-9xCvvN2CdLM,51995
 mud/logging.py,sha256=DoKcplYwEePAmXKE2CI_wNk4pF-pc_aouoxa5C6tXlc,582
-mud/mob_cmds.py,sha256=Qd2A7YEkLJsKsRcnIR5a-f0EkdX1akSPiq3OsAkvnWg,45825
+mud/mob_cmds.py,sha256=Hv7tFhABraQLRbQihHOHTDE4qgE0GSuue1_RQkchQW4,46158
 mud/mobprog.py,sha256=TZiv4ZErFAlcO1TWaJryzZ5kwTZFe5DSqKVlo6qJcTc,59173
 mud/notes.py,sha256=mJM_f1lQ-Y1us7MHzHkgfozYKQCBm84FKRjmKpgoiOE,11501
 mud/registry.py,sha256=s8tGVKLZUU6-5c7HtBqhHQWLVxzFM4A9bpJ8avGt_0I,306
-mud/rom_api.py,sha256=ychLx7fdjTnoTZb61WotOV-RYrwvsR23qIZTYVVdTno,17262
+mud/rom_api.py,sha256=4XIQZvWt6oNLiUBGr-NShCQ3Ev9nSEMGNh01VPowagA,17256
 mud/server.py,sha256=fv6mprd4h9CejTt8kOFkt6RA-NdzTwOd24d_3p9aOKY,219
 mud/spec_funs.py,sha256=D4x9el8po1FYDY8ZbPwDkJ4ujtIq7fEW1lCvJW8POdk,47536
 mud/time.py,sha256=eVMXzVoi9w7gGE7bN1FVYjCwSwBydSpkkVtptV4qTtw,1324
@@ -34,7 +34,7 @@ mud/characters/conditions.py,sha256=h7anKi7gy-WqBjP15N761SqEehlAsj6tTp4qdd62W6w,
 mud/characters/follow.py,sha256=yP2cJ8WvqpWWebzOUfK5wauIQfdT5BL-ukuyax_Tni4,2751
 mud/combat/__init__.py,sha256=YUphU7bKkxT3Qw0Gj2TcMmDoDyCYyRTQbHPCqKLjugE,215
 mud/combat/assist.py,sha256=_GDeuK0rfrXoELLNgTxBR1S8XdYIqcmPbTh8AinY9s8,7777
-mud/combat/death.py,sha256=ZjdcGo4jMaZdiWDzxCCjdW0ziw5hs-Die1Jl0oHLGlA,19179
+mud/combat/death.py,sha256=FQlnvIBXMtnnhfP9M55RxtiOBheXuGuBZX-IimudGsY,19152
 mud/combat/engine.py,sha256=GIt7Earo2kgE0fqZKOvA8CkEWON0UqvQpqnHNEPilMo,61663
 mud/combat/kill_table.py,sha256=oR77me5GJLGXi3q5ZnQAdp3S5lsfJNhiCmaXOMQrNgA,1040
 mud/combat/messages.py,sha256=PVOYcOCHh4wW0P33ykbr6iYtFN8mottJ8W4S72E5pBM,7726
@@ -91,7 +91,7 @@ mud/commands/player_info.py,sha256=VqEHgETh7u1BMVWJDIMhvBgF2Pm5LGNtNpLRTbXt3mI,7
 mud/commands/position.py,sha256=uwphiwxN_sEGi2wlAD5oE2pmlPCe1y9f50g_HrARg58,16339
 mud/commands/remaining_rom.py,sha256=nIDH2XiMyxm-vR45QX6BLwdIdaS4V0kNEhm5mFY79hU,18780
 mud/commands/session.py,sha256=hrx-HY94JkEed64FPSe6TbfcVITXlsfzQ9DLDQ9ZYjY,14865
-mud/commands/shop.py,sha256=gFF9bK_AV9Xbtc0O8pRaVvo-R6TPAxxyIJr7VCjkjcs,40135
+mud/commands/shop.py,sha256=QXISJ0PsevuNWrP3Nn0K4KYxq4e9mvIBJmgVk4yUROw,40129
 mud/commands/socials.py,sha256=IKSo1n-9aCtMDJFEq9KVBQIeabbijeMOZDXZUGoT_us,4401
 mud/commands/thief_skills.py,sha256=OJ2rT1Z56Pm1zHeaN5NvWCa4g2xT_k7epJNQR7JpYMM,15161
 mud/commands/typo_guards.py,sha256=NDL-6n1KwUduJNKpx_vRv3qGVrA1TvYelBwcla_RU9g,1434
@@ -134,12 +134,12 @@ mud/models/area.py,sha256=RDn6e2N9AhoMW4d68-o8i1p1tNhuszaWjbOIkGTlW9I,835
 mud/models/area_json.py,sha256=GUCWUgFf2s6DUWzcLLYhoxTP38P5cu1vrSD1W3i7D2c,731
 mud/models/board.py,sha256=LDcNFHB7X3_BNJ9efTW_VJ-vOAQG1pPIByh1EsXseVA,6283
 mud/models/board_json.py,sha256=XG8t7lLW7b_V3IjzbGF-o6Ym36CTgKiOiBVZb-M0BpA,472
-mud/models/character.py,sha256=NVAXkqHgzCWN1Z4YqeU_CqbO63nfK3OcY_Sfa1xM_ag,51900
+mud/models/character.py,sha256=Taz0-50kDJ434Nsw3ohqSs0EjCzezTvtxgrQSY63BUc,52208
 mud/models/character_json.py,sha256=7rdI92S-JT38xb2iUyXTAJpLmFOIRy2pb6v1Yen8VQY,1046
 mud/models/clans.py,sha256=vMeVpK4VbYBtGYxRFdg2lUmkrjkCvqEM_jCOTNiuG3g,2227
 mud/models/classes.py,sha256=Fv0KjS339EBWqz5OBZu5TYSIDSRYpoalLTBJOf-6ThI,2602
 mud/models/constants.py,sha256=ltr2MeoyD69x1aSbGlZ1fgcBc9ykPPMIHUoIzLciPUQ,28617
-mud/models/conversion.py,sha256=1pCzm2mnZJqRQP_1UK8Kq_2b7cd53K-pPSCuJx4JPUg,1427
+mud/models/conversion.py,sha256=uTR4Fnj13-v_D9c3_OyToJbLIabUI7Nh5KYnwVZIIYU,1439
 mud/models/help.py,sha256=MgAkueRQt5FUBRmvCjDNicaPH53ckBKzZSzjDDwnbWk,1034
 mud/models/help_json.py,sha256=sUlFUV5V31VANHSNHaRqMWS7EB1Qz87BY1oJsAWXMaw,268
 mud/models/json_io.py,sha256=q_gWOXgmSCS0B-w8xbbfs2DFh0uqpQgywzIJzLPpo_o,2146
@@ -147,7 +147,7 @@ mud/models/mob.py,sha256=d2JGyNh74c-FQYmFQPXN9M9sb3valppaDRLUe49cMcc,3830
 mud/models/note.py,sha256=stKuDsBJ5UQHngPVRbgDH4me_6RtUgjRczC2X3jbhgI,653
 mud/models/note_json.py,sha256=BuYWIGyZFevoObHGknfMOxjpL0laP7G070wNPZLccXU,320
 mud/models/obj.py,sha256=VNVKGLR9uUFOlGnLeFjRaeH4sAXE_gtyJV43lz4UVuY,2141
-mud/models/object.py,sha256=ZC9lSDt0TI3cqZJAz1o_vtPvT1AbJXfsidfvd5prjsA,5706
+mud/models/object.py,sha256=0dtGzbErRPBARyR0IHtlyVMttUAkTzOU5EzGcbLzSQ0,6540
 mud/models/object_json.py,sha256=v1_FnQnvkGBM1lnXPWQARfDQrs20C5mZDhCaLYgNiZs,960
 mud/models/player_json.py,sha256=YQerAs3vxyAo7wr3orCXCC-pM_QWiwbz3aQ9RMzWW-Q,1249
 mud/models/races.py,sha256=U-77PyNogpyLEhdHrwA8Yll3ekBBTYKYfj-l26Catm4,17138
@@ -188,7 +188,7 @@ mud/security/bans.py,sha256=_nM9wEJbxxdLXoe0I31u8dTYgWP0wxMqMVB9mxxfhlk,9174
 mud/security/hash_utils.py,sha256=GNd2W-TFLSIOk1WMQRuvJo8l4CueBYzPI0EhQuydxUg,656
 mud/skills/__init__.py,sha256=zzIr-ejbrlrQF1CSepODWhpxQZv8rO2pgaqIi3vpMg0,241
 mud/skills/groups.py,sha256=_80fJkXfrPUmTcZ9JsCJHIAhRdmmGhayMJgn1pSFcQY,8127
-mud/skills/handlers.py,sha256=pBjNs43Z_QmtJlkml7uqv4We2zjyk-KVo2brJsmFxlQ,266593
+mud/skills/handlers.py,sha256=Q2DPf6SqUAPoFS1FwSaiJ7IS0b4MhEmRBhk5XkKejJs,268106
 mud/skills/metadata.py,sha256=xNpiH3EmCMWY_DtO_Pjrhs2U7bYOBxyrsTL0wC_RJes,15413
 mud/skills/registry.py,sha256=60vHbukciV5f-o0nurt2Nwwjz3EBpQpRjwWOIh-viHE,13838
 mud/skills/say_spell.py,sha256=4voaTUbpYKsF0Plv9m-Eh0FK6lp1-Cz15rQBRq_XLNo,3909
@@ -216,9 +216,9 @@ mud/world/obj_find.py,sha256=tgnUkbFjnCl586Lzl6yRzCmllZSNEfQpQlrxCMVcUGU,5295
 mud/world/time_persistence.py,sha256=K4uhRpu08IDHY5uReBYTvw4BHuqsSxWvbv-h1VsPvf8,1663
 mud/world/vision.py,sha256=NRk3cvrGyyldU4W98qAVlYZp9wL-IUE1dTgk6DpM-NA,11609
 mud/world/world_state.py,sha256=3KpiDP6v24sZDn9-g44UypXpegzgRShHo1XvektJzdU,8810
-rom24_quickmud_python-2.9.2.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
-rom24_quickmud_python-2.9.2.dist-info/METADATA,sha256=8D5F9gYxuzmqWyqrsb9RbY-043yE47Zkl2E7hsc_orE,15670
-rom24_quickmud_python-2.9.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rom24_quickmud_python-2.9.2.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
-rom24_quickmud_python-2.9.2.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
-rom24_quickmud_python-2.9.2.dist-info/RECORD,,
+rom24_quickmud_python-2.9.4.dist-info/licenses/LICENSE,sha256=anQ2j9As6sIC8tZgQCXbo0-09JDH9vPiqhA9djnOvkY,1078
+rom24_quickmud_python-2.9.4.dist-info/METADATA,sha256=Uz9EpfcTPkI6DIsebtsBC5BJWLtrjb3mWlrcEt0vnuI,15670
+rom24_quickmud_python-2.9.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rom24_quickmud_python-2.9.4.dist-info/entry_points.txt,sha256=VFru08UQTXZA_CkK-NBjJmWHyEX5a3864fQHjhaojbw,41
+rom24_quickmud_python-2.9.4.dist-info/top_level.txt,sha256=Fk1WPmabIIjp7_iZXLYpbAVqiq7lG7TeAHt30AsOKtQ,4
+rom24_quickmud_python-2.9.4.dist-info/RECORD,,