arkparser 0.3.2__tar.gz → 0.3.3__tar.gz

{arkparser-0.3.2 → arkparser-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.3.2
+Version: 0.3.3
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT
@@ -210,7 +210,7 @@ The legacy ASVExport.exe emitted only the visible 8 stats (`hp`, `stam`, `melee`
 | `hp-m` .. `fort-m` (all 12) | added | `NumberOfMutationsAppliedTamed[i]` (mutation point counts per stat) |
 | `c0` .. `c5` | legacy | `ColorSetIndices[i]` |
 | `mut-f`, `mut-m` | legacy | **Ancestor-line totals.** `RandomMutationsFemale` and `RandomMutationsMale` — single integers counting the total number of mutations that occurred down the maternal and paternal ancestry lines respectively. These are *not* per-stat — they share the `-m` token with the per-stat mutation block below but mean a different thing. Kept under the legacy names for ASVExport parity. |
-| `cryo` | legacy | `IsInCryo` |
+| `cryo` | legacy | `True` for creatures embedded inside cryopod / soultrap / vivarium / dinoball items in the world save, `False` for actor-in-world tames. `export_tamed` walks `WorldSave.iter_cryopod_creatures()` and emits one ASV_Tamed record per embedded creature in addition to the actor-in-world tames; on busy PvE servers cryopodded tames are the majority of the roster (e.g. 10,277 of 11,054 on a live Ragnarok_WP). Cluster-uploaded tames also surface here (via `export_cluster_uploads`) with `cryo=True`. |
 | `ccc` | legacy | `"{x} {y} {z}"` from `LocationData` |
 | `dinoid` | legacy | string form of `id` |
 | `isMating` | legacy | `bEnableTamedMating` |

{arkparser-0.3.2 → arkparser-0.3.3}/README.md

@@ -176,7 +176,7 @@ The legacy ASVExport.exe emitted only the visible 8 stats (`hp`, `stam`, `melee`
 | `hp-m` .. `fort-m` (all 12) | added | `NumberOfMutationsAppliedTamed[i]` (mutation point counts per stat) |
 | `c0` .. `c5` | legacy | `ColorSetIndices[i]` |
 | `mut-f`, `mut-m` | legacy | **Ancestor-line totals.** `RandomMutationsFemale` and `RandomMutationsMale` — single integers counting the total number of mutations that occurred down the maternal and paternal ancestry lines respectively. These are *not* per-stat — they share the `-m` token with the per-stat mutation block below but mean a different thing. Kept under the legacy names for ASVExport parity. |
-| `cryo` | legacy | `IsInCryo` |
+| `cryo` | legacy | `True` for creatures embedded inside cryopod / soultrap / vivarium / dinoball items in the world save, `False` for actor-in-world tames. `export_tamed` walks `WorldSave.iter_cryopod_creatures()` and emits one ASV_Tamed record per embedded creature in addition to the actor-in-world tames; on busy PvE servers cryopodded tames are the majority of the roster (e.g. 10,277 of 11,054 on a live Ragnarok_WP). Cluster-uploaded tames also surface here (via `export_cluster_uploads`) with `cryo=True`. |
 | `ccc` | legacy | `"{x} {y} {z}"` from `LocationData` |
 | `dinoid` | legacy | string form of `id` |
 | `isMating` | legacy | `bEnableTamedMating` |

{arkparser-0.3.2 → arkparser-0.3.3}/arkparser/__init__.py

@@ -91,4 +91,4 @@ __all__ = [
     "ArkParseError",
 ]
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"

{arkparser-0.3.2 → arkparser-0.3.3}/arkparser/data_models.py

@@ -547,20 +547,29 @@ class CryopodCreature:
             ]
 
             if len(floats) >= 22:
-                # Determine offset based on array length
-                # ASA has 36 floats with offset 11, ASE has 25 floats with offset 12
-                max_offset = 11 if len(floats) >= 36 else 12
-
-                # Current stats start at 0
-                for i, stat_name in enumerate(stat_names):
+                # ASA cryopod blob: 11 current stats + 11 max stats + extras (36 floats).
+                # ASE cryopod blob: 12 current stats + 12 max stats + 1 extra (25 floats).
+                # Without the per-format count, the ASA loop walks 12 names against an
+                # 11-wide current block, leaking max[0] (which equals current[0] at full
+                # HP) into current_stats["CraftingSkill"] and surfacing hp=craft on every
+                # cryopod tame in exports.
+                if len(floats) >= 36:
+                    current_count = 11
+                    max_offset = 11
+                else:
+                    current_count = 12
+                    max_offset = 12
+
+                # Current stats: only consume the per-format slot count
+                for i in range(min(current_count, len(stat_names))):
                     if i < len(floats):
-                        cryo.current_stats[stat_name] = floats[i]
+                        cryo.current_stats[stat_names[i]] = floats[i]
 
-                # Max stats start at offset
-                for i, stat_name in enumerate(stat_names):
+                # Max stats: same count, starting at offset
+                for i in range(min(current_count, len(stat_names))):
                     max_idx = i + max_offset
                     if max_idx < len(floats):
-                        cryo.max_stats[stat_name] = floats[max_idx]
+                        cryo.max_stats[stat_names[i]] = floats[max_idx]
 
             # Parse soft class for blueprint reference
             soft_classes = normalize_indexed_list(custom_data.get("CustomDataSoftClasses"))
@@ -569,6 +578,32 @@ class CryopodCreature:
                 if isinstance(first_class, dict):
                     cryo.class_name = first_class.get("name", cryo.class_name)
 
+            # Populate raw creature_props / status_props so the export
+            # pipeline's _SyntheticGameObject adapter (which calls
+            # ``get_property_value``) sees the fields it expects. ARK
+            # cryopod CustomItemDatas blobs only carry a small subset of
+            # the original creature properties (no DinoID, no TribeID, no
+            # tamer string, etc.) — surface what we have, leave the rest
+            # absent so consumers can detect the gap.
+            _stat_to_idx = {
+                "Health": 0, "Stamina": 1, "Torpidity": 2, "Oxygen": 3,
+                "Food": 4, "Water": 5, "Temperature": 6, "Weight": 7,
+                "MeleeDamage": 8, "MovementSpeed": 9, "Fortitude": 10,
+                "CraftingSkill": 11,
+            }
+            if cryo.name:
+                cryo.creature_props["TamedName"] = cryo.name
+            for i, color in enumerate(cryo.colors[:6]):
+                cryo.creature_props[f"ColorSetIndices_{i}" if i > 0 else "ColorSetIndices"] = color
+            if cryo.level:
+                cryo.status_props["BaseCharacterLevel"] = cryo.level
+            for stat_name, value in cryo.current_stats.items():
+                idx = _stat_to_idx.get(stat_name)
+                if idx is None:
+                    continue
+                key = "CurrentStatusValues" if idx == 0 else f"CurrentStatusValues_{idx}"
+                cryo.status_props[key] = value
+
             return cryo
 
         except Exception:

{arkparser-0.3.2 → arkparser-0.3.3}/arkparser/export.py

@@ -771,12 +771,55 @@ def _tamed_dict(
 
 
 def export_tamed(save: t.Any, map_config: MapConfig | None = None) -> list[dict[str, t.Any]]:
+    """Emit ASV_Tamed records.
+
+    Pre-conditions: ``save`` exposes ``get_tamed_creatures()`` (in-world
+    tames) and ideally ``iter_cryopod_creatures()`` (creatures whose actor
+    has been removed from the world and re-embedded inside a cryopod /
+    soultrap / vivarium / dinoball item).
+
+    Post-conditions: returned list combines (a) every in-world tame and
+    (b) every cryopod-embedded tame, with the latter carrying ``cryo=True``
+    and inheriting the cryopod item's world location for GPS fields.
+    """
     objects = _world_objects(save, "get_tamed_creatures", "tamed_objects")
     lookup = _save_lookup(save)
-    return [
+    results: list[dict[str, t.Any]] = [
         _tamed_dict(obj, _status_for(obj, lookup), lookup, map_config, save)
         for obj in objects
     ]
+    results.extend(_export_world_cryopods(save, map_config))
+    return results
+
+
+def _export_world_cryopods(
+    save: t.Any,
+    map_config: MapConfig | None,
+) -> list[dict[str, t.Any]]:
+    """Build ASV_Tamed records for cryopod-embedded creatures on the map.
+
+    ARK strips the actor for any creature stuffed into a cryopod / soultrap
+    / vivarium / dinoball and serialises a snapshot into the item's
+    ``CustomItemDatas``. ``get_tamed_creatures()`` therefore misses them
+    entirely. We walk ``iter_cryopod_creatures()`` (when available),
+    decode each embedded blob, and produce ``ASV_Tamed`` entries with
+    ``cryo=True`` and the cryopod item's location.
+    """
+    iter_cryos = getattr(save, "iter_cryopod_creatures", None)
+    if not callable(iter_cryos):
+        return []
+    out: list[dict[str, t.Any]] = []
+    empty_lookup: dict[t.Any, t.Any] = {}
+    for item_obj, cryo in iter_cryos():
+        actor, status = _cryo_props_to_synthetic(cryo)
+        # Inherit the cryopod's world location so GPS fields populate.
+        actor.location = getattr(item_obj, "location", None)
+        record = _tamed_dict(actor, status, empty_lookup, map_config, save)
+        # The synthetic actor carries no IsInCryo property; force the legacy
+        # flag so consumers can distinguish in-world tames from stored ones.
+        record["cryo"] = True
+        out.append(record)
+    return out
 
 
 class _SyntheticGameObject:

{arkparser-0.3.2 → arkparser-0.3.3}/arkparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparser
-Version: 0.3.2
+Version: 0.3.3
 Summary: Pure Python parser for ARK: Survival Evolved and ARK: Survival Ascended save files
 Author: Vertyco
 License-Expression: MIT
@@ -210,7 +210,7 @@ The legacy ASVExport.exe emitted only the visible 8 stats (`hp`, `stam`, `melee`
 | `hp-m` .. `fort-m` (all 12) | added | `NumberOfMutationsAppliedTamed[i]` (mutation point counts per stat) |
 | `c0` .. `c5` | legacy | `ColorSetIndices[i]` |
 | `mut-f`, `mut-m` | legacy | **Ancestor-line totals.** `RandomMutationsFemale` and `RandomMutationsMale` — single integers counting the total number of mutations that occurred down the maternal and paternal ancestry lines respectively. These are *not* per-stat — they share the `-m` token with the per-stat mutation block below but mean a different thing. Kept under the legacy names for ASVExport parity. |
-| `cryo` | legacy | `IsInCryo` |
+| `cryo` | legacy | `True` for creatures embedded inside cryopod / soultrap / vivarium / dinoball items in the world save, `False` for actor-in-world tames. `export_tamed` walks `WorldSave.iter_cryopod_creatures()` and emits one ASV_Tamed record per embedded creature in addition to the actor-in-world tames; on busy PvE servers cryopodded tames are the majority of the roster (e.g. 10,277 of 11,054 on a live Ragnarok_WP). Cluster-uploaded tames also surface here (via `export_cluster_uploads`) with `cryo=True`. |
 | `ccc` | legacy | `"{x} {y} {z}"` from `LocationData` |
 | `dinoid` | legacy | string form of `id` |
 | `isMating` | legacy | `bEnableTamedMating` |

{arkparser-0.3.2 → arkparser-0.3.3}/arkparser.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ tests/test_asa_header_position.py
 tests/test_binary_reader.py
 tests/test_binary_reader_layouts.py
 tests/test_cloud_inventory.py
+tests/test_cryopod_export.py
 tests/test_current_stats.py
 tests/test_data_models.py
 tests/test_export.py

{arkparser-0.3.2 → arkparser-0.3.3}/pyproject.toml

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

arkparser-0.3.3/tests/test_cryopod_export.py

@@ -0,0 +1,122 @@
+"""Tests pinning ASA cryopod creature decode + export integration.
+
+ARK strips the actor for every cryopodded / soultrapped / vivariumed /
+dinoballed creature and embeds a serialised snapshot into the item's
+``CustomItemDatas``. ``WorldSave.iter_cryopod_creatures`` walks these
+items, and ``export_tamed`` then surfaces them as ``ASV_Tamed`` entries
+with ``cryo=True``. Two regressions tested here:
+
+- ASA cryopod blobs carry 11 current stats (no CraftingSkill in the
+  current block), 11 max stats, and 14 extras (36 floats total). The
+  pre-0.3.3 parser walked 12 names against an 11-wide block, leaking
+  ``max[0]`` (Health) into ``current_stats["CraftingSkill"]`` and
+  surfacing ``hp == craft`` on every cryopod tame.
+- ``from_asa_cryopod_data`` did not populate ``creature_props`` /
+  ``status_props``; the ``_SyntheticGameObject`` adapter the exporter
+  uses then saw empty dicts and emitted records with ``lvl=1``,
+  ``name=""``, all-zero colors, and ``current_stats: null``.
+"""
+
+from __future__ import annotations
+
+from arkparser.data_models import CryopodCreature
+
+
+def _asa_blob(current: list[float], max_: list[float]) -> dict[str, object]:
+    """Synthesise the smallest ASA cryopod CustomItemDatas entry we can.
+
+    36 floats total: 11 current + 11 max + 14 extras (zeros).
+    """
+    assert len(current) == 11
+    assert len(max_) == 11
+    floats = current + max_ + [0.0] * 14
+    return {
+        "CustomDataName": "Dino",
+        "CustomDataStrings": [
+            "Argent_Character_BP_C_2094073921",  # [0] class_name
+            "dada - Lvl 259 (Argentavis)",       # [1] display
+            "37,0,37,0,0,0,",                    # [2] colors
+            "", "", "", "", "", "", "Argentavis",  # [9] species
+        ],
+        "CustomDataFloats": floats,
+        "CustomDataNames": [],
+    }
+
+
+def test_asa_cryopod_eleven_current_stats_does_not_leak_max_into_craft() -> None:
+    """ASA cryopod blob: current[0..10] then max[0..10]. craft must come
+    from current[11] — which does not exist, so it must stay 0.0, NOT pick
+    up max[0]."""
+    current = [6206.46, 2411.2, 0.0, 750.0, 13153.03, 100.0, 0.0, 63.6, 6.69, 0.09, 0.0]
+    max_ = [6206.46, 2411.2, 0.0, 750.0, 13153.03, 100.0, 0.0, 63.6, 6.69, 0.09, 0.0]
+    cryo = CryopodCreature.from_asa_cryopod_data(_asa_blob(current, max_))
+    assert cryo is not None
+    assert "Health" in cryo.current_stats
+    assert cryo.current_stats["Health"] == 6206.46
+    # CraftingSkill must NOT be in current_stats on ASA cryopods (only
+    # 11 slots are populated). Pre-0.3.3 set it equal to max[0]=Health.
+    assert "CraftingSkill" not in cryo.current_stats
+    # Max block round-trips properly
+    assert cryo.max_stats["Health"] == 6206.46
+
+
+def test_asa_cryopod_populates_creature_and_status_props() -> None:
+    """The exporter adapter (``_SyntheticGameObject``) reads via
+    ``get_property_value`` keyed by ARK property name + index suffix. The
+    ASA cryopod decoder must mirror those keys into ``creature_props`` /
+    ``status_props`` so the synthetic adapter surfaces tamed-name, level,
+    colors, and CurrentStatusValues per stat index."""
+    current = [3000.0, 800.0, 0.0, 500.0, 5000.0, 100.0, 0.0, 200.0, 2.5, 0.05, 0.0]
+    max_ = [3000.0] * 11
+    cryo = CryopodCreature.from_asa_cryopod_data(_asa_blob(current, max_))
+    assert cryo is not None
+
+    # TamedName from display-name parse
+    assert cryo.creature_props.get("TamedName") == "dada"
+    # Level from display-name parse
+    assert cryo.status_props.get("BaseCharacterLevel") == 259
+    # Colors at expected indices (first non-zero is c0=37, then c2=37)
+    assert cryo.creature_props.get("ColorSetIndices") == 37
+    assert cryo.creature_props.get("ColorSetIndices_2") == 37
+    # CurrentStatusValues indexed by EPrimalCharacterStatusValue
+    # 0=Health, 1=Stamina, 3=Oxygen, 4=Food, 7=Weight, 8=MeleeDamage
+    assert cryo.status_props.get("CurrentStatusValues") == 3000.0      # health
+    assert cryo.status_props.get("CurrentStatusValues_1") == 800.0     # stam
+    assert cryo.status_props.get("CurrentStatusValues_4") == 5000.0    # food
+    assert cryo.status_props.get("CurrentStatusValues_7") == 200.0     # weight
+    assert cryo.status_props.get("CurrentStatusValues_8") == 2.5       # melee
+
+
+def test_asa_cryopod_display_name_parses_level_and_species() -> None:
+    """Display-name format ``"Name - Lvl N (Species)"`` must yield all three."""
+    cryo = CryopodCreature.from_asa_cryopod_data(_asa_blob([0.0] * 11, [0.0] * 11))
+    assert cryo is not None
+    assert cryo.name == "dada"
+    assert cryo.level == 259
+    # Species comes from strings[9] when present, falling back to display parse
+    assert cryo.species == "Argentavis"
+
+
+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
+    correct behaviour when ``len(floats) < 36``."""
+    # 25 floats = 12 current + 12 max + 1 extra
+    floats = [float(i + 1) for i in range(12)] + [float(i + 100) for i in range(12)] + [0.0]
+    blob = {
+        "CustomDataName": "Dino",
+        "CustomDataStrings": [
+            "Raptor_Character_BP_C", "Bluey - Lvl 30 (Raptor)", "0,0,0,0,0,0,",
+        ],
+        "CustomDataFloats": floats,
+        "CustomDataNames": [],
+    }
+    cryo = CryopodCreature.from_asa_cryopod_data(blob)
+    assert cryo is not None
+    # All 12 current and 12 max should be populated on ASE blobs
+    assert len(cryo.current_stats) == 12
+    assert len(cryo.max_stats) == 12
+    assert cryo.current_stats["Health"] == 1.0
+    assert cryo.current_stats["CraftingSkill"] == 12.0
+    assert cryo.max_stats["Health"] == 100.0
+    assert cryo.max_stats["CraftingSkill"] == 111.0