Merge pull request #126 from KSneijders/dev

v0.8.0

Author: KSneijders

AoE2ScenarioParser/datasets/effects.py

@@ -175,7 +175,8 @@ class EffectId(IntEnum):
     - instruction_panel_position
     - play_sound
     - message
-    - sound_name"""
+    - sound_name
+    - use_tag_color_for_icon"""
     CLEAR_INSTRUCTIONS = 21
     """Attributes for the **clear_instructions** effect are: \n
     - instruction_panel_position"""
@@ -928,7 +929,8 @@ class EffectId(IntEnum):
     - quantity
     - quantity_float
     - armour_attack_class
-        
+    - object_filter
+
     This effect was added in: 1.55 & Trigger Version 4.5
     """
     MODIFY_OBJECT_ATTRIBUTE_BY_VARIABLE = 106
@@ -989,6 +991,14 @@ class EffectId(IntEnum):
 
     This effect was added in: 1.57 & Trigger Version 4.6
     """
+    MIRROR_DIPLOMACY = 109
+    """Attributes for the **mirror_diplomacy** effect are: \n
+    - source_player
+    - target_player
+    - enabled
+
+    This effect was added in: 1.57 & Trigger Version 4.6
+    """
 
 
 empty_attributes = {
@@ -1069,6 +1079,8 @@ class EffectId(IntEnum):
     "wall_y1": -1,
     "wall_x2": -1,
     "wall_y2": -1,
+    "object_filter": -1,
+    "use_tag_color_for_icon": -1,
     "message": "",
     "sound_name": "",
     "selected_object_ids": -1,

AoE2ScenarioParser/datasets/trigger_lists/__init__.py

@@ -42,3 +42,4 @@
 from .disable_unit_flag import DisableUnitFlag
 from .attack_priority import AttackPriority
 from .local_technology import LocalTechnology
+from .object_modify_attribute_state import ObjectModifyAttributeState

AoE2ScenarioParser/datasets/trigger_lists/object_modify_attribute_state.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from AoE2ScenarioParser.datasets.dataset_enum import _DataSetIntEnums
+
+
+class ObjectModifyAttributeState(_DataSetIntEnums):
+    """
+    This enum class provides the integer values used to reference the modification state of a unit used in the
+    modify object attribute effect.
+
+    **Examples**
+
+    >>> ObjectModifyAttributeState.NOT_MODIFIED
+    <ObjectModifyAttributeState.NOT_MODIFIED: 1>
+    """
+    ALL = 0
+    NOT_MODIFIED = 1
+    MODIFIED = 2

AoE2ScenarioParser/objects/data_objects/effect.py

@@ -113,6 +113,8 @@ class Effect(AoE2Object, TriggerComponent):
             RetrieverObjectLink("wall_y1", support=Support(since=1.57)),
             RetrieverObjectLink("wall_x2", support=Support(since=1.57)),
             RetrieverObjectLink("wall_y2", support=Support(since=1.57)),
+            RetrieverObjectLink("object_filter", support=Support(since=1.58)),
+            RetrieverObjectLink("use_tag_color_for_icon", support=Support(since=1.58)),
             RetrieverObjectLink("message", commit_callback=_add_trail_if_string_attr_is_used_in_effect),
             RetrieverObjectLink("sound_name", commit_callback=_add_trail_if_string_attr_is_used_in_effect),
             RetrieverObjectLink("selected_object_ids"),
@@ -203,6 +205,8 @@ def __init__(
             wall_y1: int = None,
             wall_x2: int = None,
             wall_y2: int = None,
+            object_filter: int = None,
+            use_tag_color_for_icon: bool = None,
             message: str = None,
             sound_name: str = None,
             selected_object_ids: List[int] = None,
@@ -339,6 +343,8 @@ def __init__(
         self.wall_y1: int = wall_y1
         self.wall_x2: int = wall_x2
         self.wall_y2: int = wall_y2
+        self.object_filter: int = object_filter
+        self.use_tag_color_for_icon: bool = use_tag_color_for_icon
         self.message: str = message
         self.sound_name: str = sound_name
         self.selected_object_ids: List[int] = selected_object_ids

AoE2ScenarioParser/objects/support/attr_presentation.py

@@ -12,7 +12,7 @@
     ButtonLocation, PanelLocation, TimeUnit, VisibilityState, DifficultyLevel, TechnologyState, Comparison, \
     ObjectAttribute, ObjectType, ObjectClass, TerrainRestrictions, HeroStatusFlag, BlastLevel, \
     DamageClass, Hotkey, ColorMood, ObjectState, ActionType, VictoryTimerType, Attribute, ProjectileSmartMode, \
-    DecisionOption
+    DecisionOption, ObjectModifyAttributeState
 from AoE2ScenarioParser.helper.helper import get_enum_from_unit_const
 from AoE2ScenarioParser.helper.list_functions import listify
 from AoE2ScenarioParser.helper.pretty_format import pretty_format_name
@@ -107,6 +107,7 @@ def format_unit(u: 'Unit') -> str:
     "ActionType": ActionType,
     "VictoryTimerType": VictoryTimerType,
     "DecisionOption": DecisionOption,
+    "ObjectModifyAttributeState": ObjectModifyAttributeState,
 }
 
 _other = {

AoE2ScenarioParser/objects/support/new_effect.py

@@ -391,6 +391,7 @@ def display_instructions(
             play_sound: int | None = None,
             message: str | None = None,
             sound_name: str | None = None,
+            use_tag_color_for_icon: bool | None = None,
     ) -> Effect:
         return self._trigger_ref._add_effect(
             EffectId.DISPLAY_INSTRUCTIONS,
@@ -402,6 +403,7 @@ def display_instructions(
             play_sound=play_sound,
             message=message,
             sound_name=sound_name,
+            use_tag_color_for_icon=use_tag_color_for_icon,
         )
 
     def clear_instructions(
@@ -2018,6 +2020,7 @@ def modify_object_attribute(
             quantity: int | float | None = None,
             armour_attack_quantity: int | None = None,
             armour_attack_class: int | None = None,
+            object_filter: int | None = None,
     ):
         if (armour_attack_quantity is not None or armour_attack_class is not None) and quantity is not None:
             raise ValueError("Cannot use 'armour_attack' attributes together with the 'quantity' attribute.")
@@ -2037,6 +2040,7 @@ def modify_object_attribute(
             quantity=quantity,
             armour_attack_quantity=armour_attack_quantity,
             armour_attack_class=armour_attack_class,
+            object_filter=object_filter,
         )
 
     def modify_object_attribute_by_variable(
@@ -2147,3 +2151,16 @@ def build_object(
             issue_group_command=issue_group_command,
             queue_action=queue_action,
         )
+
+    def mirror_diplomacy(
+            self,
+            source_player: int | None = None,
+            target_player: int | None = None,
+            enabled: bool | None = None,
+    ) -> Effect:
+        return self._trigger_ref._add_effect(
+            EffectId.MIRROR_DIPLOMACY,
+            source_player=source_player,
+            target_player=target_player,
+            enabled=enabled,
+        )

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

@@ -1749,7 +1749,7 @@
                                 "type": "s32",
                                 "default": 0
                             },
-                            "static_value_75": {
+                            "static_value_81": {
                                 "type": "s32",
                                 "default": 81
                             },