arkparser 0.7.1__tar.gz → 0.7.2__tar.gz

{arkparser-0.7.1 → arkparser-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.7.1
+Version: 0.7.2
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT

{arkparser-0.7.1 → arkparser-0.7.2}/arkparser/__init__.py

@@ -95,4 +95,4 @@ __all__ = [
     "ArkParseError",
 ]
 
-__version__ = "0.7.0"
+__version__ = "0.7.2"

{arkparser-0.7.1 → arkparser-0.7.2}/arkparser/export.py

@@ -1568,7 +1568,7 @@ def _build_item_owner_lookup(save: t.Any, lookup: dict[t.Any, t.Any]) -> dict[t.
         actor_infos = container._inv_actor_info.items()
     else:
         actor_infos = _iter_inv_actor_info(save)
-    for _actor_id, (inv_ref, team_raw, tribe_raw, owner_raw) in actor_infos:
+    for actor_id, (inv_ref, team_raw, tribe_raw, owner_raw) in actor_infos:
         inv = _resolve(inv_ref, lookup)
         if inv is None:
             continue
@@ -1576,9 +1576,11 @@ def _build_item_owner_lookup(save: t.Any, lookup: dict[t.Any, t.Any]) -> dict[t.
         refs = _prop(inv, "InventoryItems")
         if not isinstance(refs, list) or not refs:
             continue
+        owner_obj = lookup.get(actor_id) if actor_id is not None else None
         info = {
             "TargetingTeam": _int(team_raw),
             "TribeName": _str(tribe_raw) or _str(owner_raw),
+            "OwnerLocation": getattr(owner_obj, "location", None),
         }
         for ref in refs:
             item_obj = _resolve(ref, lookup)
@@ -1667,7 +1669,14 @@ def _export_world_cryopods(
             summaries[item_id] = _cryo_summary(cryo)
         owner_info = owner_lookup.get(item_id) if item_id is not None else None
         if owner_info is not None:
+            # Pods stored in inventories carry no actor transform of their
+            # own (always the case on ASA); inherit the owning container's
+            # location so GPS fields don't collapse to 0/0/0.
+            if actor.location is None:
+                actor.location = owner_info.get("OwnerLocation")
             for key, val in owner_info.items():
+                if key == "OwnerLocation":
+                    continue
                 if val and not cryo.creature_props.get(key):
                     cryo.creature_props[key] = val
         record = _tamed_dict(actor, status, empty_lookup, map_config, save, stored=True)

{arkparser-0.7.1 → arkparser-0.7.2}/arkparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.7.1
+Version: 0.7.2
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT

{arkparser-0.7.1 → arkparser-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkparser"
-version = "0.7.1"
+version = "0.7.2"
 description = "Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files"
 readme = "README.md"
 license = "MIT"

{arkparser-0.7.1 → arkparser-0.7.2}/tests/test_cryopod_export.py

@@ -19,7 +19,11 @@ with ``cryo=True``. Two regressions tested here:
 
 from __future__ import annotations
 
+import typing as t
+
 from arkparser.data_models import CryopodCreature
+from arkparser.export import export_tamed
+from arkparser.game_objects.location import LocationData
 
 
 def _asa_blob(current: list[float], max_: list[float]) -> dict[str, object]:
@@ -97,6 +101,78 @@ def test_asa_cryopod_display_name_parses_level_and_species() -> None:
     assert cryo.species == "Argentavis"
 
 
+class FakeObject:
+    """Minimal GameObject stand-in for exporter graph tests."""
+
+    def __init__(
+        self,
+        obj_id: int,
+        class_name: str,
+        props: dict[str, t.Any] | None = None,
+        location: LocationData | None = None,
+        is_item: bool = False,
+    ) -> None:
+        self.id = obj_id
+        self.guid = ""
+        self.names: list[str] = []
+        self.class_name = class_name
+        self.location = location
+        self.is_item = is_item
+        self.properties: list[t.Any] = []
+        self.components: dict[str, t.Any] = {}
+        self.props = props or {}
+
+    def get_property_value(self, name: str, default: t.Any = None, index: int | None = None) -> t.Any:
+        key = name if not index else f"{name}_{index}"
+        val = self.props.get(key)
+        return default if val is None else val
+
+
+class FakeSave:
+    """Save stand-in exposing just what export_tamed needs."""
+
+    is_asa = True
+
+    def __init__(self, objects: list[FakeObject], cryos: list[tuple[FakeObject, CryopodCreature]]) -> None:
+        self.objects = objects
+        self.cryos = cryos
+
+    def get_tamed_creatures(self) -> list[FakeObject]:
+        return []
+
+    def iter_cryopod_creatures(self) -> t.Iterator[tuple[FakeObject, CryopodCreature]]:
+        yield from self.cryos
+
+
+def test_cryopod_inherits_owning_container_location() -> None:
+    """ASA cryopod items live in inventories, not the world: they carry no
+    actor transform, so ``item_obj.location`` is None. The exported record
+    must fall back to the owning container's (cryofridge / pawn) location
+    instead of emitting 0/0/0."""
+    fridge = FakeObject(
+        10,
+        "CryoFridge_C",
+        props={
+            "MyInventoryComponent": (None, 11),
+            "TargetingTeam": 1500000001,
+            "TribeName": "Frisky Dingo",
+        },
+        location=LocationData(x=10000.0, y=-20000.0, z=300.0),
+    )
+    inventory = FakeObject(11, "PrimalInventoryBP_C", props={"InventoryItems": [(None, 12)]})
+    pod = FakeObject(12, "PrimalItem_WeaponEmptyCryopod_C", is_item=True)
+    cryo = CryopodCreature.from_asa_cryopod_data(_asa_blob([0.0] * 11, [0.0] * 11))
+    assert cryo is not None
+    save = FakeSave([fridge, inventory, pod], [(pod, cryo)])
+
+    records = export_tamed(save, None)
+    assert len(records) == 1
+    record = records[0]
+    assert record["cryo"] is True
+    assert record["tribe"] == "Frisky Dingo"
+    assert record["ccc"] == "10000.0 -20000.0 300.0"
+
+
 def test_ase_cryopod_keeps_twelve_stat_layout() -> None:
     """ASE cryopod blobs carry 12 current stats + 12 max stats (25 floats).
     The ASA fix must not break the ASE path: walking all 12 names is the