arkparser 0.1.8__tar.gz → 0.1.11__tar.gz

{arkparser-0.1.8 → arkparser-0.1.11}/PKG-INFO

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

{arkparser-0.1.8 → arkparser-0.1.11}/arkparser/__init__.py

@@ -115,4 +115,4 @@ __all__ = [
     "ArkParseError",
 ]
 
-__version__ = "0.1.8"
+__version__ = "0.1.11"

{arkparser-0.1.8 → arkparser-0.1.11}/arkparser/export.py

@@ -351,27 +351,84 @@ def export_tribe_logs(
 
 
 # -------------------------------------------------------------------------
-# Map Structures (ASV_MapStructures): structures with GPS coords
+# Map Structures (ASV_MapStructures): untribed environmental map elements
 # -------------------------------------------------------------------------
 
+# Canonical match rules. Mirrors C# ContentContainer.cs:846.
+# (pattern, label, match_kind) where match_kind is "startswith" or "contains".
+# Order matters: first match wins.
+_MAP_STRUCT_RULES: tuple[tuple[str, str, str], ...] = (
+    ("TributeTerminal_", "ASV_Terminal", "startswith"),
+    ("CityTerminal_", "ASV_Terminal", "contains"),
+    ("PowerNodeCharge", "ASV_ChargeNode", "startswith"),
+    ("BeaverDam_C", "ASV_BeaverDam", "startswith"),
+    ("DeinonychusNest_C", "ASV_DeinoNest", "startswith"),
+    ("RockDrakeNest_C", "ASV_DrakeNest", "startswith"),
+    ("CherufeNest_C", "ASV_MagmaNest", "startswith"),
+    ("WyvernNest_", "ASV_WyvernNest", "startswith"),
+    ("OilVein_", "ASV_OilVein", "startswith"),
+    ("WaterVein_", "ASV_WaterVein", "startswith"),
+    ("GasVein_", "ASV_GasVein", "startswith"),
+    ("ArtifactCrate_", "ASV_Artifact", "startswith"),
+    # PlantSpeciesZ_Wild_C is in the C# prefix list but legacy doesn't actually
+    # emit them — only player-grown plants are surfaced.
+    ("Structure_PlantSpeciesZ_PlayerGrown", "ASV_PlantSpeciesZ", "startswith"),
+    ("BeeHive_C", "ASV_BeeHive", "startswith"),
+)
+
+
+def _asv_map_struct_label(class_name: str) -> str | None:
+    for pattern, label, kind in _MAP_STRUCT_RULES:
+        if kind == "startswith":
+            if class_name.startswith(pattern):
+                return label
+        elif pattern in class_name:
+            return label
+    return None
+
 
 def export_map_structures(
     save: t.Any,
     map_config: MapConfig | None = None,
 ) -> list[dict[str, t.Any]]:
     """
-    Export structures with map coordinates in ASV_MapStructures format.
-
-    Same as ASV_Structures but intended for map visualisation with GPS coords.
+    Export environmental map elements in ASV_MapStructures format.
 
-    Args:
-        save: A parsed savegame.
-        map_config: Map config for GPS coordinate conversion.
+    Mirrors C# ContentContainer.cs:846 filter:
+      * has a Location
+      * TargetingTeam is null
+      * class_name starts with one of the canonical map-element prefixes.
 
-    Returns:
-        List of structure dictionaries with GPS coordinates.
+    Does NOT include player structures.
     """
-    return export_structures(save, map_config)
+    assert hasattr(save, "objects"), "save must expose .objects"
+    objects = save.objects if hasattr(save, "objects") else {}
+    obj_lookup = _build_lookup(objects)
+    all_objs = list(objects.values()) if isinstance(objects, dict) else list(objects)
+
+    results: list[dict[str, t.Any]] = []
+    bound = len(all_objs) + 1
+    for i, obj in enumerate(all_objs):
+        assert i < bound
+        cn = getattr(obj, "class_name", "") or ""
+        label = _asv_map_struct_label(cn)
+        if label is None:
+            continue
+        loc = getattr(obj, "location", None)
+        if loc is None:
+            continue
+        if obj.get_property_value("TargetingTeam") is not None:
+            continue
+        ccc = f"{loc.x} {loc.y} {loc.z}"
+        data: dict[str, t.Any] = {"struct": label, "ccc": ccc}
+        if map_config is not None:
+            data["lat"] = map_config.ue_to_lat(loc.y)
+            data["lon"] = map_config.ue_to_lon(loc.x)
+        data["inventory"] = _get_inventory_items(obj, obj_lookup)
+        results.append(data)
+
+    assert isinstance(results, list)
+    return results
 
 
 # -------------------------------------------------------------------------
@@ -478,6 +535,9 @@ def _get_collection(source: t.Any, attr_name: str, parser_type: type[t.Any]) ->
     """Normalize a parser collection or single parser instance to a list."""
     if isinstance(source, parser_type):
         return [source]
+    # source may already be a list of parser objects
+    if isinstance(source, (list, tuple)):
+        return list(source)
 
     values = getattr(source, attr_name, None)
     if isinstance(values, (list, tuple)):
@@ -500,9 +560,18 @@ def _get_worldsave_objects(save: t.Any, getter_name: str, legacy_attr: str) -> l
 
 
 def _resolve_reference(ref: t.Any, lookup: dict[t.Any, t.Any]) -> t.Any:
-    """Resolve an object reference stored as an ID, GUID, or name."""
+    """Resolve an object reference to a game object.
+
+    Handles three reference forms:
+    - int or str: direct lookup (ASE object IDs, GUID strings, name strings)
+    - (type_tag, value) tuple: array-property format where type_tag is "id",
+      "name", or "path" and value is the actual lookup key
+    """
     if ref is None:
         return None
+    if isinstance(ref, tuple) and len(ref) == 2:
+        _, key = ref
+        return lookup.get(key)
     return lookup.get(ref)
 
 
@@ -598,14 +667,29 @@ def _find_status_component(obj: t.Any, lookup: dict[t.Any, t.Any]) -> t.Any:
 
 
 def _get_inventory_items(obj: t.Any, lookup: dict[t.Any, t.Any]) -> list[dict[str, t.Any]]:
-    """Get inventory items for a creature."""
+    """Get inventory items for a game object (creature or structure).
+
+    Tries two strategies in order:
+    1. MyInventoryComponent property + reference lookup (works for ASE and some ASA objects).
+    2. Iterate obj.components to find the first component whose class_name contains
+       "Inventory" (fallback for ASA, where the property may be absent).
+    """
     items: list[dict[str, t.Any]] = []
 
-    inv_ref = None
+    inv_obj = None
+
+    # Strategy 1: property reference
     if hasattr(obj, "get_property_value"):
         inv_ref = obj.get_property_value("MyInventoryComponent", default=None)
-
-    inv_obj = _resolve_reference(inv_ref, lookup)
+        if inv_ref is not None:
+            inv_obj = _resolve_reference(inv_ref, lookup)
+
+    # Strategy 2: component dict (ASA or when property is absent)
+    if inv_obj is None and hasattr(obj, "components"):
+        for comp in obj.components.values():
+            if "Inventory" in getattr(comp, "class_name", ""):
+                inv_obj = comp
+                break
 
     if inv_obj is None:
         return items

{arkparser-0.1.8 → arkparser-0.1.11}/arkparser/files/world_save.py

@@ -217,31 +217,23 @@ class WorldSave:
         """Return all objects whose ``class_name`` contains *class_name*."""
         return self.container.find_by_class_pattern(class_name)
 
-    _TAMED_MARKER_PROPERTIES: t.ClassVar[tuple[str, ...]] = (
-        "TamerString",
-        "TamedName",
-        "TamedAtTime",
-        "TribeName",
-        "TamedOnServerName",
-        "UploadedFromServerName",
-        "ImprinterName",
-        "ImprinterPlayerDataID",
-    )
+    # TargetingTeam threshold: the C# reference (TeamType.cs) uses 50_000 as the
+    # boundary between non-player (wild/AI) and player-owned teams.
+    _PLAYER_TEAM_THRESHOLD: t.ClassVar[int] = 50_000
+    # Unclaimed babies use 2_000_000_000 as a sentinel; still tamed.
+    _BREEDING_SENTINEL: t.ClassVar[int] = 2_000_000_000
 
     def _is_tamed_creature(self, obj: GameObject) -> bool:
-        """Return ``True`` if a creature carries tame ownership markers."""
-        taming_team = obj.get_property_value("TamingTeamID")
-        if isinstance(taming_team, (int, float)) and taming_team > 0:
-            return True
+        """Return ``True`` if a creature is player-owned.
 
+        Mirrors C# GameObjectExtensions.IsTamed: targeting_team >= 50_000.
+        The breeding sentinel (2_000_000_000) is also considered tamed.
+        """
         targeting_team = obj.get_property_value("TargetingTeam")
-        if isinstance(targeting_team, (int, float)) and targeting_team > 1000:
-            return True
-
-        return any(
-            obj.get_property_value(prop_name) not in (None, "", 0, 0.0, False)
-            for prop_name in self._TAMED_MARKER_PROPERTIES
-        )
+        if not isinstance(targeting_team, (int, float)):
+            return False
+        team = int(targeting_team)
+        return team >= self._PLAYER_TEAM_THRESHOLD
 
     def get_creatures(self) -> list[GameObject]:
         """Return all creature objects (tamed **and** wild)."""
@@ -283,6 +275,10 @@ class WorldSave:
         """Return engine-placed resource / vein / node objects."""
         return self.container.get_map_resources()
 
+    def get_nests(self) -> list[GameObject]:
+        """Return creature nest objects (wyvern, drake, etc.)."""
+        return self.container.get_nests()
+
     # ------------------------------------------------------------------
     # Properties
     # ------------------------------------------------------------------

{arkparser-0.1.8 → arkparser-0.1.11}/arkparser/game_objects/container.py

@@ -121,14 +121,35 @@ class GameObjectContainer:
         "DinoDropInventory",
     )
 
+    # Vehicles that carry DinoID1/bServerInitializedDino but are not creatures.
+    # Source: C# GameObjectExtensions.IsCreature (SavegameToolkitAdditions).
+    _VEHICLE_CLASS_NAMES: t.ClassVar[frozenset[str]] = frozenset({
+        "MotorRaft_BP_C",
+        "Raft_BP_C",
+        "TekHoverSkiff_Character_BP_C",
+        "CogRaft_BP_C",
+        "DingyRaft_BP_C",
+        "LongshipRaft_BP_C",
+        "SRaft_BP_C",
+    })
+
     def _is_creature_object(self, obj: GameObject) -> bool:
-        """Return ``True`` for top-level creature actors only."""
-        class_name = obj.class_name
-        if not class_name or obj.is_item:
-            return False
+        """Return ``True`` for top-level creature actors only.
 
-        is_creature = "_Character_BP" in class_name or "DinoCharacter" in class_name
-        return is_creature and "StatusComponent" not in class_name and "Inventory" not in class_name
+        Primary check mirrors C# GameObjectExtensions.IsCreature: presence of
+        ``bServerInitializedDino`` AND not a vehicle.  Falls back to class name
+        patterns for unit tests and edge cases where properties are absent.
+        """
+        if obj.is_item:
+            return False
+        if obj.class_name in self._VEHICLE_CLASS_NAMES:
+            return False
+        if obj.get_property_value("bServerInitializedDino") is not None:
+            return True
+        # Class-name fallback for minimal test objects or pre-property-load pass.
+        cn = obj.class_name
+        is_character = "_Character_" in cn or "DinoCharacter" in cn
+        return is_character and "StatusComponent" not in cn and "Inventory" not in cn
 
     def get_creatures(self) -> list[GameObject]:
         """Get all creature objects (tamed and wild)."""
@@ -138,8 +159,48 @@ class GameObjectContainer:
         """Get all item objects."""
         return [obj for obj in self.objects if obj.is_item]
 
+    # Class-name substrings for environmental map elements that should NOT
+    # appear in get_structures() (they go through get_terminals/get_nests/etc).
+    _MAP_ELEMENT_PATTERNS: t.ClassVar[tuple[str, ...]] = (
+        "TributeTerminal",
+        "CityTerminal",
+        "ArtifactCrate",
+        "OilVein",
+        "WaterVein",
+        "GasVein",
+        "ChargeNode",
+        "ElementVein",
+        "BeaverDam",
+        "Nest",
+    )
+
+    def _is_structure(self, obj: GameObject) -> bool:
+        """Return ``True`` if the object is a structure per the C# IsStructure rule.
+
+        Mirrors C# GameObjectExtensions.IsStructure: has OwnerName OR
+        bHasResetDecayTime OR is one of the known vehicle/special class names;
+        excludes the Structure_LoadoutDummy_Hotbar_C, cryo-pinned objects,
+        DeathItemCache_ entries, and environmental map elements (which belong
+        in map_structures, not player structures).
+        """
+        cn = obj.class_name
+        if cn == "Structure_LoadoutDummy_Hotbar_C":
+            return False
+        if cn.startswith("DeathItemCache_"):
+            return False
+        if obj.get_property_value("IsInCryo"):
+            return False
+        # CherufeNest_C is explicitly a structure per the C# rule.
+        if cn != "CherufeNest_C" and any(p in cn for p in self._MAP_ELEMENT_PATTERNS):
+            return False
+        if obj.get_property_value("OwnerName") is not None:
+            return True
+        if obj.get_property_value("bHasResetDecayTime") is not None:
+            return True
+        return cn == "CherufeNest_C" or cn in self._VEHICLE_CLASS_NAMES
+
     def get_structures(self) -> list[GameObject]:
-        """Get all tribe-owned placed structures.
+        """Get all placed structures.
 
         ASE saves include the same actor in both the main level and sub-levels,
         producing duplicate entries with identical Names[0]. Deduplicating by
@@ -149,12 +210,7 @@ class GameObjectContainer:
         seen_names: set[str] = set()
         results: list[GameObject] = []
         for obj in self.objects:
-            cn = obj.class_name
-            if obj.get_property_value("TargetingTeam") is None:
-                continue
-            if obj.get_property_value("DinoID1") is not None:
-                continue
-            if any(pat in cn for pat in self._NON_STRUCTURE_PATTERNS):
+            if not self._is_structure(obj):
                 continue
             name = obj.primary_name
             if name is not None:
@@ -226,6 +282,16 @@ class GameObjectContainer:
             and not obj.is_item
         ]
 
+    def get_nests(self) -> list[GameObject]:
+        """Get creature nest objects (wyvern, drake, etc.). Inventory excluded."""
+        return [
+            obj
+            for obj in self.objects
+            if "Nest" in obj.class_name
+            and "Inventory" not in obj.class_name
+            and not obj.is_item
+        ]
+
     def get_players(self) -> list[GameObject]:
         """Get all player data objects."""
         return self.get_by_class("PrimalPlayerData") + self.find_by_class_pattern("PlayerPawnTest")

{arkparser-0.1.8 → arkparser-0.1.11}/arkparser.egg-info/PKG-INFO

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

{arkparser-0.1.8 → arkparser-0.1.11}/pyproject.toml

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