feat: old standalone trigger systems completely unified into trigger->condition->action system

5 files changed, 37 insertions, 42 deletions

diff --git a/data/objects/000_test_object.yaml b/data/objects/000_test_object.yaml
index 2f1ed41..7bd79b7 100644
--- a/data/objects/000_test_object.yaml
+++ b/data/objects/000_test_object.yaml
@@ -12,12 +12,13 @@ hidden: false
 id: 000_test_object
 name: 000 test object
 on_use:
-  - action:
-      messages:
-        - delay: 5
-          message: asdfdfs
-        - delay: 3
-          message: sadfdfsadfs
+  - condition:
+      all_of:
+        - global_flag: one
+        - player_flag: two
+        - all_of:
+            - player_flag: three
+            - global_flag: four
 safespot:
   decay_chance: 0
   decay_ticks: 0
diff --git a/data/objects/anvil.yaml b/data/objects/anvil.yaml
index efcb8f2..e58efef 100644
--- a/data/objects/anvil.yaml
+++ b/data/objects/anvil.yaml
@@ -3,13 +3,11 @@ description:
     - text: A heavy iron anvil for hammering metal into shape.
 name: anvil
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You should use this with a mold at a furnace.
-      item_id: silver_bar
-    - action:
-        messages:
-            - delay: 0
-              message: You should use this with a mold at a furnace.
-      item_id: gold_bar
+    - item_id: silver_bar
+      steps:
+        - messages:
+            - You should use this with a mold at a furnace.
+    - item_id: gold_bar
+      steps:
+        - messages:
+            - You should use this with a mold at a furnace.
diff --git a/data/objects/aps_tower.yaml b/data/objects/aps_tower.yaml
index 4b54d9d..b872cae 100644
--- a/data/objects/aps_tower.yaml
+++ b/data/objects/aps_tower.yaml
@@ -4,8 +4,7 @@ description:
 inroom_description: An APS Tower looms here, its beacon pulsing steadily.
 name: APS Tower
 on_use:
-    - action:
-        aps_node: true
-        messages:
-            - delay: 0
-              message: You connect your datapad to the APS Tower. Coordinates triangulated and stored.
+    - steps:
+        - aps_node: true
+          messages:
+            - You connect your datapad to the APS Tower. Coordinates triangulated and stored.
diff --git a/data/objects/iron_gate.yaml b/data/objects/iron_gate.yaml
index c61eebd..bded3b3 100644
--- a/data/objects/iron_gate.yaml
+++ b/data/objects/iron_gate.yaml
@@ -4,13 +4,12 @@ description:
 hidden: true
 name: iron gate
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You push the heavy iron gate open.
-        set_global_flags:
-            gate_open: true
-      condition:
+    - condition:
         global_flag: gate_open
         not: true
         value: true
+      steps:
+        - messages:
+            - You push the heavy iron gate open.
+          set_global_flags:
+            gate_open: true
diff --git a/data/objects/tutorial_lever.yaml b/data/objects/tutorial_lever.yaml
index 371e70b..51960d0 100644
--- a/data/objects/tutorial_lever.yaml
+++ b/data/objects/tutorial_lever.yaml
@@ -5,22 +5,20 @@ hidden: true
 inroom_description: A stone lever protrudes from the base of the rock formation.
 name: stone lever
 on_use:
-    - action:
-        messages:
-            - delay: 0
-              message: You pull the stone lever down. A mechanism clicks into place somewhere in the glade.
-        set_player_flags:
-            unlocked_rock_cover: 1
-      condition:
+    - condition:
         not: true
         player_flag: unlocked_rock_cover
         value: 1
-    - action:
-        messages:
-            - delay: 0
-              message: You push the stone lever back up. The mechanism disengages with a soft clunk.
-        set_player_flags:
-            unlocked_rock_cover: 0
-      condition:
+      steps:
+        - messages:
+            - You pull the stone lever down. A mechanism clicks into place somewhere in the glade.
+          set_player_flags:
+            unlocked_rock_cover: 1
+    - condition:
         player_flag: unlocked_rock_cover
         value: 1
+      steps:
+        - messages:
+            - You push the stone lever back up. The mechanism disengages with a soft clunk.
+          set_player_flags:
+            unlocked_rock_cover: 0