arkparse 0.5.0__tar.gz → 0.5.2__tar.gz

{arkparse-0.5.0 → arkparse-0.5.2}/.gitignore

@@ -188,5 +188,6 @@ temp
 .venv**
 arkparse-fast-core/**
 /arkparse-fast-core
-
-**.zip
+.serena/
+**.zip
+.claude/

{arkparse-0.5.0 → arkparse-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparse
-Version: 0.5.0
+Version: 0.5.2
 Summary: A package to parse and modify ark save files
 Project-URL: Homepage, https://github.com/VincentHenauGithub/ark-save-parser
 Author-email: Vincent Henau <vincent.henau.github@gmail.com>

{arkparse-0.5.0 → arkparse-0.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arkparse"
-version = "0.5.0"
+version = "0.5.2"
 dependencies = [
     "rcon>=2.4.9",
     "numpy>=2.3.2",

arkparse-0.5.2/src/arkparse/__init__.py

@@ -0,0 +1,3 @@
+from .saves.asa_save import AsaSave
+from .classes import Classes
+from .parsing.struct.actor_transform import MapCoords, ActorTransform

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/api/base_api.py

@@ -18,9 +18,9 @@ from arkparse.utils import ImportFile
 from arkparse.logging import ArkSaveLogger
 
 class BaseApi(StructureApi):
-    def __init__(self, save, map: ArkMap):
+    def __init__(self, save, map: ArkMap = None):
         super().__init__(save)
-        self.map = map
+        self.map = map if map is not None else self.save.map
 
     def __get_closest_to(self, structures: Dict[UUID, Structure], coords: MapCoords):
         closest = None

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/api/dino_api.py

@@ -43,7 +43,7 @@ class DinoApi:
     _DEFAULT_CONFIG = GameObjectReaderConfiguration(
         blueprint_name_filter=lambda name: \
             name is not None and \
-                (("Dinos/" in name and "_Character_" in name) or \
+                (((("/Creatures/" in name) or ("/Dinos/" in name) or ("/SDinoVariants/" in name)) and "_Character_" in name) or \
                 ("DinoCharacterStatusComponent" in name) or \
                 ("PrimalItem_WeaponEmptyCryopod" in name or "PrimalItem_SCSCryopod" in name or "ItemDinoball.ItemDinoball_C" in name)))
 

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/api/structure_api.py

@@ -222,7 +222,7 @@ class StructureApi:
 
         return result
     
-    def remove_at_location(self, map: ArkMap, coords: MapCoords, radius: float = 0.3, owner_tribe_id: int = None, owner_tribe_name: str = None):
+    def remove_at_location(self, map: ArkMap, coords: MapCoords, radius: float = 0.3, owner_tribe_id: int | None = None, owner_tribe_name: str | None = None):
         structures = self.get_at_location(map, coords, radius)
         
         removed = []
@@ -236,7 +236,7 @@ class StructureApi:
 
         return removed
 
-    def get_owned_by(self, owner: ObjectOwner = None, owner_tribe_id: int = None, owner_tribe_name: str = None) -> Dict[UUID, Union[Structure, StructureWithInventory]]:
+    def get_owned_by(self, owner: ObjectOwner = None, owner_tribe_id: int | None = None, owner_tribe_name: str | None = None) -> Dict[UUID, Union[Structure, StructureWithInventory]]:
         result = {}
 
         if owner is None and owner_tribe_id is None and owner_tribe_name is None:
@@ -299,32 +299,34 @@ class StructureApi:
         return result
     
     def get_connected_structures(self, structures: Dict[UUID, Union[Structure, StructureWithInventory]]) -> Dict[UUID, Union[Structure, StructureWithInventory]]:
+        from collections import deque
+        
         result = structures.copy()
-        new_found = True
-        ignore = []
-        processed = []
-
-        while new_found:
-            new_found = False
-            new_result = result.copy()
-            unprocessed = [s for s in result.values() if s.uuid not in processed]
-            for s in unprocessed:
-                if s.uuid in processed:
+        ignore = set()
+        processed = set()
+        
+        # Initialize queue with all structures to process
+        queue = deque(structures.values())
+        
+        while queue:
+            s = queue.popleft()
+            
+            if s.uuid in processed:
+                continue
+            processed.add(s.uuid)
+            
+            for uuid in s.linked_structure_uuids:
+                if uuid in result or uuid in ignore:
                     continue
-                for uuid in s.linked_structure_uuids:
-                    if uuid not in new_result.keys() and uuid not in ignore and uuid not in processed:
-                        new_found = True
-                        obj = self.get_by_id(uuid)
-                        if obj is not None:
-                            new_result[uuid] = obj
-                        else:
-                            ignore.append(uuid)
-                            ArkSaveLogger.api_log(f"Could not find linked structure {uuid}, ignoring")
-                    processed.append(s.uuid)
-            result = new_result
-
-            # ArkSaveLogger.api_log(f"Connected structures found so far: {len(result)}")
-
+                
+                obj = self.get_by_id(uuid)
+                if obj is not None:
+                    result[uuid] = obj
+                    queue.append(obj)
+                else:
+                    ignore.add(uuid)
+                    ArkSaveLogger.api_log(f"Could not find linked structure {uuid}, ignoring")
+        
         return result
      
     def modify_structures(self, structures: Dict[UUID, Union[Structure, StructureWithInventory]], new_owner: ObjectOwner = None, new_max_health: float = None):

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/classes/dinos.py

@@ -79,13 +79,16 @@ class Alphas:
     alpha_tuso = "/Game/PrimalEarth/Dinos/Tusoteuthis/Mega_Tusoteuthis_Character_BP.Mega_Tusoteuthis_Character_BP_C"
     alpha_leedsichthys = "/Game/PrimalEarth/Dinos/Leedsichthys/Alpha_Leedsichthys_Character_BP.Alpha_Leedsichthys_Character_BP_C"
     alpha_fire_wyvern = "/Game/ScorchedEarth/Dinos/Wyvern/MegaWyvern_Character_BP_Fire.MegaWyvern_Character_BP_Fire_C"
+    alpha_revenant = "/Game/LostColony/Dinos/Zombie/MegaZombie_Character_BP_Hulking.MegaZombie_Character_BP_Hulking_C"
+    alpha_ossidon = "/Game/LostColony/Dinos/SnowMonster/MegaSnowMonster_Character_BP.MegaSnowMonster_Character_BP_C"
 
     paleo = PaleoAlphas()
 
     all_bps = [
         alpha_reaper_king, alpha_karkinos, alpha_basilisk,
         alpha_carnotaurus, alpha_megalodon, alpha_mosasaurus, alpha_raptor, 
-        alpha_deathworm, alpha_rex, alpha_tuso, alpha_leedsichthys, alpha_fire_wyvern
+        alpha_deathworm, alpha_rex, alpha_tuso, alpha_leedsichthys, alpha_fire_wyvern,
+        alpha_revenant
     ] + paleo.all_bps
 
 class Flyers:
@@ -377,6 +380,8 @@ class Dinos:
     queen_bee = "/Game/PrimalEarth/Dinos/Bee/Bee_Queen_Character_BP.Bee_Queen_Character_BP_C"
     rubble_golem = "/Game/ScorchedEarth/Dinos/RockGolem/RubbleGolem_Character_BP.RubbleGolem_Character_BP_C"
     helicoprion = "/Game/ASA/Dinos/Helicoprion/Helicoprion_Character_BP.Helicoprion_Character_BP_C"
+    acrocanthosaurus = "/Game/ASA/Dinos/Acrocanthosaurus/Acrocanthosaurus_Character_BP.Acrocanthosaurus_Character_BP_C"
+    cryolophosaurus = "/Game/ASA/Dinos/Cryolophosaurus/Cryolophosaurus_Character_BP.Cryolophosaurus_Character_BP_C"
 
     abberant = Abberant()
     paleo = Paleo()
@@ -411,7 +416,7 @@ class Dinos:
         dreadnoughtus, maelizard, shastasaurus, gacha, gasbag,
         managarmr, tek_raptor, tek_rex, tek_stego,
         velonosaur, yutyrannus, tek_parasaur, queen_bee,
-        rubble_golem
+        rubble_golem, helicoprion, acrocanthosaurus, cryolophosaurus
     ]  + abberant.all_bps + flyers.all_bps + \
         dlc_dinos.all_bps + shoulder_pets.all_bps + non_tameable.all_bps + \
         paleo.all_bps

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/classes/equipment.py

@@ -118,6 +118,7 @@ class Saddles:
     pyromane: str = "/Game/ASA/Dinos/FireLion/PrimalItemArmor_Saddle_FireLion.PrimalItemArmor_Saddle_FireLion_C"
     crylophosaurus: str = "/Game/ASA/Dinos/Cryolophosaurus/Saddle/PrimalItemArmor_CryoSaddle.PrimalItemArmor_CryoSaddle_C"
     deinonychus: str = "/Game/Valguero/Dinos/Deinonychus/PrimalItemArmor_DeinonychusSaddle.PrimalItemArmor_DeinonychusSaddle_C"
+    acrocanthosaurus: str = "/Game/ASA/Dinos/Acrocanthosaurus/Saddle/PrimalItemArmor_AcroSaddle.PrimalItemArmor_AcroSaddle_C"
 
 
     all_bps = [yi_ling, archelon, ceratosaurus, deinosuchus, fasolasuchus, gigantoraptor_ASA, 
@@ -135,7 +136,7 @@ class Saddles:
                thorny_dragon, bison, deinotherium, dreadnoughtus, maelizard, gacha, gas_bags,
                snow_owl, ravager, managarmr, velonosaur, helicoprion, gigantoraptor, desmodus,
                soulwyn, gigadesmodus_platform, gigadesmodus, maelwyn, aureliax, ossidon, megaraptor, 
-               pyromane, crylophosaurus, deinonychus]
+               pyromane, crylophosaurus, deinonychus, acrocanthosaurus]
     
 class Hazard:
     boots: str = "/Game/Aberration/CoreBlueprints/Items/Armor/HazardSuit/PrimalItemArmor_HazardSuitBoots.PrimalItemArmor_HazardSuitBoots_C"
@@ -332,7 +333,8 @@ class Advanced:
     chainsaw: str = "/Game/ScorchedEarth/WeaponChainsaw/PrimalItem_ChainSaw.PrimalItem_ChainSaw_C"
     flamethrower: str = "/Game/ScorchedEarth/WeaponFlamethrower/PrimalItem_WeapFlamethrower.PrimalItem_WeapFlamethrower_C"
     tek_spear: str = "/Game/LostColony/Weapons/TekSpear/PrimalItem_WeaponSpear_Tek.PrimalItem_WeaponSpear_Tek_C"
-    all_bps = [compound_bow, fabricated_pistol, fabricated_shotgun, fabricated_sniper, fabricated_crossbow,longneck, assault_rifle, rocket_launcher, tek_rifle, chainsaw, flamethrower, tek_spear]
+    tek_sword: str = "/Game/PrimalEarth/CoreBlueprints/Weapons/PrimalItem_WeaponTekSword.PrimalItem_WeaponTekSword_C"
+    all_bps = [compound_bow, fabricated_pistol, fabricated_shotgun, fabricated_sniper, fabricated_crossbow,longneck, assault_rifle, rocket_launcher, tek_rifle, chainsaw, flamethrower, tek_spear, tek_sword]
 
 class CursedWeapons:
     chainsaw: str = "/Game/LostColony/CoreBlueprints/Items/CursedWeapons/PrimalItem_ChainSaw_Cursed.PrimalItem_ChainSaw_Cursed_C"

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/ftp/ark_ftp_client.py

@@ -5,9 +5,14 @@ from zoneinfo import ZoneInfo
 from io import BytesIO
 from pathlib import Path
 import json
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from arkparse.saves.asa_save import AsaSave
 
 from arkparse.enums import ArkMap
 from arkparse.logging import ArkSaveLogger
+from arkparse.utils.tm_files import CONFIG_FILE_DIR
 
 SAVE_FILES_LOCATION = ["arksa", "ShooterGame", "Saved", "SavedArks"]
 INI_FOLDER_LOCATION = ["arksa", "ShooterGame", "Saved", "Config", "WindowsServer"]
@@ -82,7 +87,21 @@ class INI:
         GAME= "Game.ini"
 
 class ArkFtpClient:
-    def __init__(self, host, port, user, password):
+    _LAST_FTP_CONFIG_PATH = CONFIG_FILE_DIR / "last_ftp_config.json"
+    _LAST_MAP_PATH = CONFIG_FILE_DIR / "last_map.txt"
+    
+    def __init__(self, host = None, port = None, user = None, password = None):
+        self._configured_map = None
+        if host is None or port is None or user is None or password is None:
+            config, configured_map = self.load_configuration()
+            if config is None or map is None:
+                raise ValueError("FTP configuration not provided and no previous configuration found. Please provide host, port, user, and password or ensure the last configuration is saved. You can set the configuration using the set_configuration() method.")
+            host = config['host']
+            port = config['port']
+            user = config['user']
+            password = config['password']
+            self._configured_map = configured_map
+            
         self.host = host
         self.port = port
         self.user = user
@@ -91,8 +110,37 @@ class ArkFtpClient:
         self.connected = False
         self.ftp.connect(host, port, timeout=10)
         self.ftp.login(user, password)
-        self.map = None
         self.connected = True
+        self.map = None
+        if self._configured_map is not None:
+            self.set_map(self._configured_map)
+
+    @staticmethod
+    def set_configuration(host, port, user, password, map: ArkMap):
+        config = {
+            "host": host,
+            "port": port,
+            "user": user,
+            "password": password
+        }
+        with open(ArkFtpClient._LAST_FTP_CONFIG_PATH, 'w') as config_file:
+            json.dump(config, config_file)
+        with open(ArkFtpClient._LAST_MAP_PATH, 'w') as map_file:
+            map_file.write(str(map.value))
+
+    @staticmethod
+    def load_configuration():
+        if not ArkFtpClient._LAST_FTP_CONFIG_PATH.exists() or not ArkFtpClient._LAST_MAP_PATH.exists():
+            return None, None
+        
+        with open(ArkFtpClient._LAST_FTP_CONFIG_PATH, 'r') as config_file:
+            config = json.load(config_file)
+        
+        with open(ArkFtpClient._LAST_MAP_PATH, 'r') as map_file:
+            map_value = map_file.read().strip()
+            map = ArkMap(int(map_value))
+
+        return config, map
 
     @staticmethod
     def from_config(config, map: ArkMap=None):
@@ -276,6 +324,13 @@ class ArkFtpClient:
             self.download_file(file_name, local_file)
             return local_file
         
+    def get_current_save(self, map: ArkMap = None) -> "AsaSave":
+        from arkparse import AsaSave
+        map = map if map is not None else self._configured_map
+        save_contents = self.download_save_file(output_directory=None, map=map)
+        save = AsaSave(contents=save_contents, map=map)
+        return save
+        
     def remove_save_file(self, map: ArkMap = None):
         map: dict = self._check_map(map)
         self.__nav_to_save_files(map)

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/logging/ark_save_logger.py

@@ -52,6 +52,16 @@ class ArkSaveLogger:
     # Use _get_struct_path() for thread-safe access
     current_struct_path = []
     _allow_invalid_objects = None
+    # Governs mod-namespace objects (not /Game/ or /Script/). Defaults to True
+    # (skip & continue) for backward compatibility; set to False to hard-fail.
+    _allow_invalid_mod_objects = None
+    # Optional callback invoked when an object fails to parse. Signature:
+    #   (obj_uuid, class_name, byte_buffer, error) -> None
+    # Used by tooling (e.g. the testbench) to capture failing objects for debug.
+    _object_failure_handler = None
+    # Optional callback invoked on a (non-fatal) struct size mismatch. Signature:
+    #   (struct_type, data_size, start_position, end_position, byte_buffer) -> None
+    _struct_mismatch_handler = None
     _worker_logging_enabled = None  # Whether logging is enabled in worker threads
     _file = ""
     _byte_buffer = None
@@ -140,10 +150,13 @@ class ArkSaveLogger:
                 }
                 ArkSaveLogger._file_viewer_enabled = True
                 ArkSaveLogger._worker_logging_enabled = False
+                ArkSaveLogger._allow_invalid_objects = True
+                ArkSaveLogger._allow_invalid_mod_objects = True
                 config = {
                     "levels": ArkSaveLogger._log_level_states,
                     "fve": False,
                     "allow_invalid": True,
+                    "allow_invalid_mod": True,
                     "worker_logging": False
                 }
                 write_config_file(ArkSaveLogger.__LOG_CONFIG_FILE_NAME, config)
@@ -151,6 +164,7 @@ class ArkSaveLogger:
                 ArkSaveLogger._log_level_states = config["levels"]
                 ArkSaveLogger._file_viewer_enabled = config["fve"]
                 ArkSaveLogger._allow_invalid_objects = config["allow_invalid"]
+                ArkSaveLogger._allow_invalid_mod_objects = config.get("allow_invalid_mod", True)
                 ArkSaveLogger._worker_logging_enabled = config.get("worker_logging", False)
             # Update cached parser_log state for fast checks
             ArkSaveLogger._parser_log_enabled = (
@@ -220,6 +234,69 @@ class ArkSaveLogger:
             global_config["allow_invalid"] = state
             write_config_file(ArkSaveLogger.__LOG_CONFIG_FILE_NAME, global_config)
 
+    @staticmethod
+    def allow_invalid_mod_objects(state: bool = True, set_globally: bool = False):
+        """Governs parsing failures for mod-namespace objects (anything whose
+        class is not under /Game/ or /Script/). When False, such failures are
+        reraised instead of skipped. Defaults to True (skip & continue)."""
+        if ArkSaveLogger._allow_invalid_mod_objects is None:
+            ArkSaveLogger.__init_config()
+
+        ArkSaveLogger._allow_invalid_mod_objects = state
+
+        if set_globally:
+            global_config = read_config_file(ArkSaveLogger.__LOG_CONFIG_FILE_NAME)
+            global_config["allow_invalid_mod"] = state
+            write_config_file(ArkSaveLogger.__LOG_CONFIG_FILE_NAME, global_config)
+
+    @staticmethod
+    def set_object_failure_handler(handler):
+        """Register a callback invoked whenever an object fails to parse.
+
+        The handler receives ``(obj_uuid, class_name, byte_buffer, error)``. Pass
+        ``None`` to clear it. Exceptions raised by the handler are swallowed so
+        debug tooling can never break parsing. Intended for capturing failing
+        objects (binary + structured dump) for offline debugging.
+        """
+        ArkSaveLogger._object_failure_handler = handler
+
+    @staticmethod
+    def _notify_object_failure(obj_uuid, class_name, byte_buffer, error, **kwargs):
+        """Forward a parse failure to the registered handler.
+
+        ``kwargs`` carries optional context (e.g. ``kind`` of "game"/"archive" and
+        a ``reload_hint`` dict) so the handler can capture and reload different
+        object types appropriately. Handlers should accept ``**kwargs``.
+        """
+        handler = ArkSaveLogger._object_failure_handler
+        if handler is None:
+            return
+        try:
+            handler(obj_uuid, class_name, byte_buffer, error, **kwargs)
+        except Exception as e:  # never let debug tooling break parsing
+            ArkSaveLogger.warning_log(f"object_failure_handler raised: {e}")
+
+    @staticmethod
+    def set_struct_mismatch_handler(handler):
+        """Register a callback invoked on a non-fatal struct size mismatch (a
+        struct parsed as a property list that didn't consume exactly data_size).
+
+        The handler receives ``(struct_type, data_size, start_position,
+        end_position, byte_buffer)``. Pass ``None`` to clear it. Exceptions are
+        swallowed. Intended for debug tooling to record under-/over-read structs.
+        """
+        ArkSaveLogger._struct_mismatch_handler = handler
+
+    @staticmethod
+    def _notify_struct_mismatch(struct_type, data_size, start_position, end_position, byte_buffer):
+        handler = ArkSaveLogger._struct_mismatch_handler
+        if handler is None:
+            return
+        try:
+            handler(struct_type, data_size, start_position, end_position, byte_buffer)
+        except Exception as e:  # never let debug tooling break parsing
+            ArkSaveLogger.warning_log(f"struct_mismatch_handler raised: {e}")
+
     @staticmethod
     def enable_worker_logging(state: bool = True, set_globally: bool = False):
         """Enable or disable logging in parallel worker threads.

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/ark_game_object.py

@@ -220,8 +220,10 @@ class ArkGameObject(ArkPropertyContainer):
         # self.uuid2 = reader.read_uuid()
 
     def print_properties(self):
+        ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.INFO, True)
         ArkSaveLogger.info_log(f"Properties for {self.blueprint} ({self.uuid}):")
         super().print_properties()
+        ArkSaveLogger.set_log_level(ArkSaveLogger.LogTypes.INFO, False)
 
     def read_double(self, reader: ArkBinaryParser, property_name: str) -> float:
         reader.validate_name(property_name)

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/bases/base.py

@@ -146,9 +146,13 @@ class Base:
             ArkSaveLogger.objects_log(f"Padding {turret.get_short_name()} ({turret.object.uuid}) to {amount} bullets")
             self.__set_new_inventory(save, turret, bullet, amount)
 
+            # Correct NumBullets prop
+            prop = turret.object.find_property("NumBullets")
+            if prop is not None:
+                turret.binary.replace_u32(prop, amount)
+
             ArkSaveLogger.objects_log(f"Updating {turret.get_short_name()} and inventory in database")
             turret.update_binary()
-            turret.inventory.update_binary()
 
         return len(turrets)
     

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/dinos/dino.py

@@ -5,8 +5,9 @@ import random
 
 from arkparse.object_model.misc.__parsed_object_base import ParsedObjectBase
 from arkparse.saves.asa_save import AsaSave
-from arkparse.parsing.struct.actor_transform import ActorTransform
+from arkparse.parsing.struct.actor_transform import ActorTransform, MapCoords
 from arkparse.parsing.struct.ark_vector import ArkVector
+from arkparse.parsing.struct.ark_rotator import ArkRotator
 from arkparse.object_model.ark_game_object import ArkGameObject
 from arkparse.enums import ArkDinoTrait
 from arkparse.utils.json_utils import DefaultJsonEncoder
@@ -38,6 +39,12 @@ class GeneTrait:
 
     def __str__(self):
         return f"{self.trait.value}[{self.level}]"
+    
+    def __eq__(self, other):
+        if not isinstance(other, GeneTrait):
+            return False
+        
+        return self.trait == other.trait and self.level == other.level
 
 class Dino(ParsedObjectBase):
     id_: DinoId = None
@@ -51,6 +58,7 @@ class Dino(ParsedObjectBase):
     gene_traits: List[GeneTrait] = []
     stats: DinoStats = DinoStats()
     _location: ActorTransform = ActorTransform()
+    _rotation: ArkRotator = None
 
     #saddle: Saddle
     def __init_props__(self):
@@ -82,11 +90,34 @@ class Dino(ParsedObjectBase):
             return False
         
         return self.object.uuid == other.object.uuid and self.id_ == other.id_
-    
+
     @property
     def location(self) -> ActorTransform:
+        if self._rotation is None:
+            full_location = self.save.get_actor_transform(self.object.uuid)
+            if full_location is not None:
+                self._location = full_location
+                self._rotation = ArkRotator(pitch=self._location.pitch, roll=self._location.roll, yaw=self._location.yaw)
         return self._location
+    
+    @property
+    def rotation(self) -> ArkRotator:
+        if self._rotation is not None:
+            return self._rotation
+        full_location = self.save.get_actor_transform(self.object.uuid)
+        if full_location is not None:
+            self._location = full_location
+            self._rotation = ArkRotator(pitch=self._location.pitch, roll=self._location.roll, yaw=self._location.yaw)
+        return ArkRotator(pitch=self._location.pitch, roll=self._location.roll, yaw=self._location.yaw)
 
+    @property
+    def map_coordinates(self) -> MapCoords:
+        location = self.location
+        if location is not None:
+            return location.as_map_coords(self.save.map)
+        else:
+            return None
+        
     @staticmethod
     def from_object(dino_obj: ArkGameObject, status_obj: ArkGameObject, dino: "Dino" = None):
         if dino is not None:
@@ -101,6 +132,12 @@ class Dino(ParsedObjectBase):
 
         return d
     
+    def __eq__(self, other):
+        if not isinstance(other, Dino):
+            return False
+        
+        return self.id_ == other.id_
+
     def remove_from_save(self):
         self.save.remove_obj_from_db(self.stats.uuid)
 
@@ -283,6 +320,7 @@ class Dino(ParsedObjectBase):
         self.save.modify_actor_transform(self.object.uuid, location.to_bytes())
         self.update_binary()
         self._location = location
+        self._rotation = ArkRotator(pitch=location.pitch, roll=location.roll, yaw=location.yaw)
 
     def heal(self):
         self.stats.heal()

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/dinos/tamed_dino.py

@@ -27,6 +27,7 @@ class TamedDino(Dino):
     tamed_name: str
     percentage_imprinted: float
     cryopod: "Cryopod"
+    neutered: bool
 
     @property
     def percentage_imprinted(self):
@@ -47,9 +48,11 @@ class TamedDino(Dino):
         super().__init_props__()
 
         self.cryopod = None
-        self.tamed_name = self.object.get_property_value("TamedName")
+        self.tamed_name = self.object.get_property_value("TamedName", "NONE")
         inv_uuid: ObjectReference = self.object.get_property_value("MyInventoryComponent")
         self.owner = DinoOwner(self.object)
+        self.neutered = self.object.get_property_value("bNeutered", False)
+
 
         if inv_uuid is None:
             self.inv_uuid = None
@@ -139,10 +142,10 @@ class TamedDino(Dino):
     def store_binary(self, path: Path, name = None, prefix = "obj_", no_suffix=False, force_inventory=False):
         if self.inventory is None and force_inventory:
             raise ValueError("Cannot store TamedDino without inventory.")
-        print(self.inventory)
+        # print(self.inventory)
         if self.inventory is not None:
             self.inventory.store_binary(path, name, no_suffix=no_suffix)
-        print(f"Storing TamedDino {self.object.uuid} at {path}")
+        # print(f"Storing TamedDino {self.object.uuid} at {path}")
         return super().store_binary(path, name, prefix, no_suffix)
 
     def to_json_obj(self):
@@ -168,6 +171,12 @@ class TamedDino(Dino):
         self.inventory.add_item(item)
         return True
     
+    def set_neutered(self, neutered: bool):
+        self.binary.replace_boolean(self.object.find_property("bNeutered"), neutered)
+        self.neutered = neutered
+        self.update_binary()
+        self.update_object()
+    
     def remove_item(self, item: UUID):
         self.inventory.remove_item(item)
         self.update_binary()

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/misc/__parsed_object_base.py

@@ -24,6 +24,10 @@ class ParsedObjectBase:
     @property
     def blueprint(self) -> str:
         return self.object.blueprint if self.object is not None else None
+    
+    @property
+    def short_name(self) -> str:
+        return self.object.get_short_name() if self.object is not None else None
 
     def __init_props__(self):
         pass

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/structures/structure.py

@@ -10,7 +10,7 @@ from arkparse.object_model.misc.__parsed_object_base import ParsedObjectBase
 from arkparse.object_model.misc.object_owner import ObjectOwner
 from arkparse.parsing import ArkBinaryParser
 from arkparse.parsing.struct.object_reference import ObjectReference
-from arkparse.parsing.struct import ActorTransform
+from arkparse.parsing.struct import ActorTransform, MapCoords
 from arkparse import AsaSave
 from arkparse.utils.json_utils import DefaultJsonEncoder
 
@@ -156,6 +156,12 @@ class Structure(ParsedObjectBase):
             for linked_structure in self.linked_structure_uuids:
                 result.append(linked_structure.__str__())
         return result
+    
+    @property
+    def map_coordinates(self) -> MapCoords:
+        if self.location is not None:
+            return self.location.as_map_coords(self.save.map)
+        return None
 
     def to_json_obj(self):
         # Grab already set properties

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/object_model/structures/structure_with_inventory.py

@@ -26,7 +26,7 @@ class StructureWithInventory(Structure):
         inv_uuid = self.object.get_property_value("MyInventoryComponent")
         self.inventory_uuid = UUID(inv_uuid.value) if inv_uuid is not None else None
         self.item_count = self.object.get_property_value("CurrentItemCount", default=0)
-        self.max_item_count = self.object.get_property_value("MaxItemCount")
+        self.max_item_count = self.object.get_property_value("MaxItemCount", default=1)
 
         if self.inventory_uuid is not None and not bypass_inventory:
             self._inventory = Inventory(self.inventory_uuid, save=self.save)
@@ -36,6 +36,14 @@ class StructureWithInventory(Structure):
         if self._inventory is None and self.inventory_uuid is not None:
             self._inventory = Inventory(self.inventory_uuid, save=self.save)
         return self._inventory
+    
+    @property
+    def open_slots(self) -> int:
+        return self.max_item_count - self.item_count
+    
+    @property
+    def is_empty(self) -> bool:
+        return self.item_count == 0
 
     def set_item_quantity(self, quantity: int):
         if self.item_count != None:

{arkparse-0.5.0 → arkparse-0.5.2}/src/arkparse/parsing/ark_archive.py

@@ -73,6 +73,12 @@ class ArkArchive:
             except Exception as e:
                 ArkSaveLogger.error_log(f"Error reading properties for object \'{obj.class_name}\' at {self.data.get_position()}: {e}")
                 self.data.structured_print()
+                # Notify any registered debug handler (e.g. the testbench dumper).
+                # Archives reload from their raw bytes via ArkArchive(data, from_store).
+                ArkSaveLogger._notify_object_failure(
+                    None, obj.class_name, self.data, e,
+                    kind="archive", reload_hint={"from_store": from_store},
+                )
                 raise e
             ArkSaveLogger.exit_struct()