Merge pull request #103 from KSneijders/dev

v0.6.2

Author: KSneijders

AoE2ScenarioParser/helper/bytes_parser.py

@@ -6,7 +6,7 @@
 from AoE2ScenarioParser.helper.bytes_conversions import bytes_to_int
 from AoE2ScenarioParser.exceptions.asp_exceptions import EndOfFileError
 from AoE2ScenarioParser.helper.incremental_generator import IncrementalGenerator
-from AoE2ScenarioParser.helper.string_manipulations import create_textual_hex
+from AoE2ScenarioParser.helper.string_manipulations import create_textual_hex, trunc_string
 
 if TYPE_CHECKING:
     from AoE2ScenarioParser.sections.retrievers.retriever import Retriever
@@ -71,7 +71,11 @@ def retrieve_bytes(igenerator: IncrementalGenerator, retriever: 'Retriever') ->
         else:
             print(f"\n\nError while setting bytes on retriever: \n\t{retriever} [Iteration: {i + 1}/{retriever.datatype.repeat}]")
             print("Remaining bytes:")
-            print(create_textual_hex(igenerator.get_remaining_bytes().hex(), enter_distance=96))
+            bytes_ = igenerator.get_remaining_bytes()
+            complete_hex = create_textual_hex(bytes_.hex(), enter_distance=96)
+            hex_ = trunc_string(complete_hex, 2000, add_ellipsis=False)
+
+            print(hex_ + f"// (Truncated. {len(bytes_)} bytes remaining)")
 
             raise e
 

AoE2ScenarioParser/objects/data_objects/effect.py

@@ -596,7 +596,10 @@ def _is_variable_based_aa_effect(effect_type: int | EffectId, object_attributes:
 
 
 def _is_float_quantity_effect(effect_type: int | EffectId, object_attributes: int | ObjectAttribute) -> bool:
-    return "quantity_float" in effects.attributes[effect_type] and ObjectAttribute._storage_type(object_attributes) == 'float'
+    try:
+        return "quantity_float" in effects.attributes[effect_type] and ObjectAttribute._storage_type(object_attributes) == 'float'
+    except KeyError:
+        return False
 
 
 def _get_armour_attack_source(effect_type: int | EffectId, object_attributes: int | ObjectAttribute) -> str | None:

AoE2ScenarioParser/objects/managers/option_manager.py

@@ -30,6 +30,8 @@ class OptionManager(AoE2Object):
             RetrieverObjectLink("lock_coop_alliances", support=Support(since=1.42)),
             RetrieverObjectLink("secondary_game_modes", support=Support(since=1.42)),
         ]),
+
+        RetrieverObjectLink("legacy_execution_order", "Triggers", "legacy_exec_order", support=Support(since=1.55)),
     ]
 
     def __init__(
@@ -45,6 +47,7 @@ def __init__(
             collide_and_correct: bool,
             villager_force_drop: bool,
             lock_coop_alliances: bool,
+            legacy_execution_order: bool,
             **kwargs
     ):
         super().__init__(**kwargs)
@@ -67,6 +70,8 @@ def __init__(
         self.villager_force_drop: bool = bool(villager_force_drop) if villager_force_drop is not None else None
         self.lock_coop_alliances: bool = bool(lock_coop_alliances) if lock_coop_alliances is not None else None
 
+        self.legacy_execution_order = bool(legacy_execution_order) if legacy_execution_order is not None else None
+
     @property
     def victory_years(self) -> float:
         return self._victory_years_10ths / 10

AoE2ScenarioParser/scenarios/aoe2_de_scenario.py

@@ -18,7 +18,7 @@ class AoE2DEScenario(AoE2Scenario):
     Used to represent a scenario with version >= 1.36 (DE). It is the main class that is exposed to the user of the API.
     """
 
-    LATEST_VERSION: Tuple[int, int] = (1, 55)
+    LATEST_VERSION: Tuple[int, int] = (1, 56)
 
     @property
     def trigger_manager(self) -> TriggerManagerDE:

AoE2ScenarioParser/versions/DE/v1.54/structure.json

@@ -1980,6 +1980,33 @@
                                 "comment": "Present since Trigger Version 4.1",
                                 "default": -1
                             },
+                            "_filler_0": {
+                                "is_list": false,
+                                "type": "s32",
+                                "comment": "In some scenarios? But not others with trigger version 4.1...",
+                                "default": -1,
+
+                                "dependencies": {
+                                    "on_construct": {
+                                        "action": "SET_REPEAT",
+                                        "target": "self:static_value_62",
+                                        "eval": "1 if static_value_62 >= 63 else 0"
+                                    }
+                                }
+                            },
+                            "_filler_1": {
+                                "is_list": false,
+                                "type": "s32",
+                                "comment": "In some scenarios? But not others with trigger version 4.1...",
+                                "default": -1,
+                                "dependencies": {
+                                    "on_construct": {
+                                        "action": "SET_REPEAT",
+                                        "target": "self:static_value_62",
+                                        "eval": "1 if static_value_62 >= 64 else 0"
+                                    }
+                                }
+                            },
                             "message": {
                                 "type": "str32",
                                 "default": ""
@@ -2150,6 +2177,20 @@
                                 "comment": "Present since Trigger Version 4.1",
                                 "default": -1
                             },
+                            "_filler_0": {
+                                "is_list": false,
+                                "type": "s32",
+                                "comment": "In some scenarios? But not others with trigger version 4.1...",
+                                "default": -1,
+
+                                "dependencies": {
+                                    "on_construct": {
+                                        "action": "SET_REPEAT",
+                                        "target": "self:static_value_30",
+                                        "eval": "1 if static_value_30 >= 31 else 0"
+                                    }
+                                }
+                            },
                             "xs_function": {
                                 "type": "str32",
                                 "default": ""

AoE2ScenarioParser/versions/DE/v1.55/structure.json

@@ -1576,9 +1576,9 @@
                 "comment": "Present since Trigger Version 4.1"
             },
             "legacy_exec_order": {
-                "comment": "",
-                "type": "1",
-                "default": "00",
+                "is_list": false,
+                "type": "u8",
+                "default": "0",
 
                 "dependencies": {
                     "on_construct": {

AoE2ScenarioParser/versions/DE/v1.56/default.aoe2scenario

@@ -1584,9 +1584,9 @@
                 "comment": "Present since Trigger Version 4.1"
             },
             "legacy_exec_order": {
-                "comment": "",
-                "type": "1",
-                "default": "00",
+                "is_list": false,
+                "type": "u8",
+                "default": "0",
 
                 "dependencies": {
                     "on_construct": {

AoE2ScenarioParser/versions/DE/v1.56/structure.json

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+##  0.6.2 - 2025-October-31
+
+### Added
+
+- `OptionsManager.legacy_execution_order` (When `False`: Run triggers and effects in display order)
+
+### Fixes
+
+- `LATEST_VERSION` not being set to `(1, 56)`
+- Missing default scenario for scenario version `1.56`
+- Inability to read some campaigns with inconsistent structures
+- Reading scenarios with effects that are hidden in the editor
+
+---
+
 ##  0.6.1 - 2025-October-31
 
 ### Added