convert: Add new activity conditions for applying effects.

Author: heinezen

openage/convert/processor/conversion/aoc/pregen_processor.py

@@ -98,6 +98,9 @@ def generate_activities(
         condition_parent = "engine.util.activity.condition.Condition"
         condition_queue_parent = "engine.util.activity.condition.type.CommandInQueue"
         condition_next_move_parent = "engine.util.activity.condition.type.NextCommandMove"
+        condition_next_apply_parent = (
+            "engine.util.activity.condition.type.NextCommandApplyEffect"
+        )
 
         # =======================================================================
         # Default (Start -> Ability(Idle) -> End)
@@ -276,10 +279,12 @@ def generate_activities(
         branch_raw_api_object.set_location(unit_forward_ref)
         branch_raw_api_object.add_raw_parent(xor_parent)
 
-        condition_forward_ref = ForwardRef(pregen_converter_group,
-                                           "util.activity.types.Unit.NextCommandMove")
+        condition1_forward_ref = ForwardRef(pregen_converter_group,
+                                            "util.activity.types.Unit.NextCommandMove")
+        condition2_forward_ref = ForwardRef(pregen_converter_group,
+                                            "util.activity.types.Unit.NextCommandApplyEffect")
         branch_raw_api_object.add_raw_member("next",
-                                             [condition_forward_ref],
+                                             [condition1_forward_ref, condition2_forward_ref],
                                              xor_parent)
         idle_forward_ref = ForwardRef(pregen_converter_group,
                                       "util.activity.types.Unit.Idle")
@@ -290,6 +295,40 @@ def generate_activities(
         pregen_converter_group.add_raw_api_object(branch_raw_api_object)
         pregen_nyan_objects.update({branch_ref_in_modpack: branch_raw_api_object})
 
+        # condition for branching to apply effect
+        condition_ref_in_modpack = "util.activity.types.Unit.NextCommandApplyEffect"
+        condition_raw_api_object = RawAPIObject(condition_ref_in_modpack,
+                                                "NextCommandApplyEffect", api_objects)
+        condition_raw_api_object.set_location(branch_forward_ref)
+        condition_raw_api_object.add_raw_parent(condition_next_apply_parent)
+
+        apply_effect_forward_ref = ForwardRef(pregen_converter_group,
+                                              "util.activity.types.Unit.ApplyEffect")
+        condition_raw_api_object.add_raw_member("next",
+                                                apply_effect_forward_ref,
+                                                condition_parent)
+
+        pregen_converter_group.add_raw_api_object(condition_raw_api_object)
+        pregen_nyan_objects.update({condition_ref_in_modpack: condition_raw_api_object})
+
+        # Apply effect
+        apply_effect_ref_in_modpack = "util.activity.types.Unit.ApplyEffect"
+        apply_effect_raw_api_object = RawAPIObject(apply_effect_ref_in_modpack,
+                                                   "ApplyEffect", api_objects)
+        apply_effect_raw_api_object.set_location(unit_forward_ref)
+        apply_effect_raw_api_object.add_raw_parent(ability_parent)
+
+        wait_forward_ref = ForwardRef(pregen_converter_group,
+                                      "util.activity.types.Unit.Wait")
+        apply_effect_raw_api_object.add_raw_member("next", wait_forward_ref,
+                                                   ability_parent)
+        apply_effect_raw_api_object.add_raw_member("ability",
+                                                   api_objects["engine.ability.type.ApplyDiscreteEffect"],
+                                                   ability_parent)
+
+        pregen_converter_group.add_raw_api_object(apply_effect_raw_api_object)
+        pregen_nyan_objects.update({apply_effect_ref_in_modpack: apply_effect_raw_api_object})
+
         # condition for branching to move
         condition_ref_in_modpack = "util.activity.types.Unit.NextCommandMove"
         condition_raw_api_object = RawAPIObject(condition_ref_in_modpack,

openage/convert/service/init/api_export_required.py

@@ -16,7 +16,7 @@
     from openage.util.fslike.union import UnionPath
 
 
-CURRENT_API_VERSION = "0.5.0"
+CURRENT_API_VERSION = "0.6.0"
 
 
 def api_export_required(asset_dir: UnionPath) -> bool:

openage/convert/service/read/nyan_api_loader.py

@@ -546,6 +546,13 @@ def _create_objects(api_objects: dict[str, NyanObject]) -> None:
     nyan_object.set_fqon(fqon)
     api_objects.update({fqon: nyan_object})
 
+    # engine.util.activity.condition.type.NextCommandApplyEffect
+    parents = [api_objects["engine.util.activity.condition.Condition"]]
+    nyan_object = NyanObject("NextCommandApplyEffect", parents)
+    fqon = "engine.util.activity.condition.type.NextCommandApplyEffect"
+    nyan_object.set_fqon(fqon)
+    api_objects.update({fqon: nyan_object})
+
     # engine.util.activity.condition.type.NextCommandIdle
     parents = [api_objects["engine.util.activity.condition.Condition"]]
     nyan_object = NyanObject("NextCommandIdle", parents)