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

4 files changed, 111 insertions, 128 deletions

diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 13255ba..5a61bba 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -32,8 +32,42 @@ objects:
       hidden: true
       name: framed sign
       on_look:
-        - set_player_flags:
-            1001_look_sign: true
+        - steps:
+            - set_player_flags:
+                1001_look_sign: true
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags: {}
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
+              wait: 5
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags: {}
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
+              wait: 5
+            - broadcast: ""
+              broadcast_global: ""
+              despawn_mob: ""
+              give_item: ""
+              heal: 0
+              set_global_flags: {}
+              set_player_flags:
+                1001_touchdown: true
+              spawn_mob: null
+              take_item: ""
+              teleport: 0
     - description:
         - text: A sturdy, locked steel door that keeps passengers out of the cockpit. There is a tiny, thin window at eye level.
       hidden: true
@@ -54,123 +88,71 @@ objects:
       hidden: true
       name: pilot
 on_enter:
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 5
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B bold}Welcome to The House of Icarus{/}'
-      set_global_flags: {}
-      set_player_flags: {}
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 7
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
-      set_global_flags: {}
-      set_player_flags:
-        1001_welcome: true
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-    - broadcast: ""
-      broadcast_global: ""
-      condition:
-        all_of: []
-        any_of: []
-        global_flag: ""
-        has_item: ""
-        min_credits: 0
-        not: true
-        player_flag: 1001_welcome
-        value: null
-      delay: 7
-      despawn_mob: ""
-      give_item: ""
-      heal: 0
-      messages:
-        - delay: 0
-          message: '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
-      set_global_flags: {}
-      set_player_flags: {}
-      spawn_mob: null
-      take_item: ""
-      teleport: 0
-triggers:
-    - id: ""
-      on_global_flag: ""
-      on_player_flag: 1001_look_sign
-      room: 0
-      steps:
+    - steps:
         - broadcast: ""
           broadcast_global: ""
-          delay: 5
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: The cabin shakes as the small craft touches down
+            - '{0B bold}Welcome to The House of Icarus{/}'
           set_global_flags: {}
           set_player_flags: {}
           spawn_mob: null
           take_item: ""
           teleport: 0
+          wait: 5
         - broadcast: ""
           broadcast_global: ""
-          delay: 5
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: The pistons hiss as the rear staircase opens
+            - '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
           set_global_flags: {}
-          set_player_flags: {}
+          set_player_flags:
+            1001_welcome: true
           spawn_mob: null
           take_item: ""
           teleport: 0
+          wait: 7
         - broadcast: ""
           broadcast_global: ""
-          delay: 0
+          condition:
+            all_of: []
+            any_of: []
+            global_flag: ""
+            has_item: ""
+            min_credits: 0
+            not: true
+            player_flag: 1001_welcome
+            value: null
           despawn_mob: ""
           give_item: ""
           heal: 0
           messages:
-            - delay: 0
-              message: ""
+            - '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
           set_global_flags: {}
-          set_player_flags:
-            1001_touchdown: true
+          set_player_flags: {}
           spawn_mob: null
           take_item: ""
           teleport: 0
-      value: null
+          wait: 7
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index 8863c60..3abfffd 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -67,26 +67,24 @@ objects:
         - text: The sign simply says 'Processing' in bold red letters. Beneath in smaller text it says 'Welcome to Vesta', seemingly added afterwards to try to give the sign some warmth.
       name: sign
 on_enter:
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction.
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: The pilot pops out of the hatch of the craft and calls out "Shuttle to Passenger Barge Denali. Tickets out, please! Nice and orderly!"
-    - condition:
-        not: true
-        player_flag: 1002_lined_up
-      delay: 7
-      messages:
-        - delay: 0
-          message: The people all shuffle into a line, dragging their luggage out of the path to clear the way for you.
-      set_player_flags:
-        1002_lined_up: true
+    - steps:
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction.
+          wait: 7
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - The pilot pops out of the hatch of the craft and calls out "Shuttle to Passenger Barge Denali. Tickets out, please! Nice and orderly!"
+          wait: 7
+        - condition:
+            not: true
+            player_flag: 1002_lined_up
+          messages:
+            - The people all shuffle into a line, dragging their luggage out of the path to clear the way for you.
+          set_player_flags:
+            1002_lined_up: true
+          wait: 7
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index 5cd7d64..05f8c56 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -17,13 +17,13 @@ mobs:
 name: Processing Building
 objects: []
 on_enter:
-    - condition:
-        not: true
-        player_flag: 1003_first_time
-      delay: 5
-      messages:
-        - delay: 0
-          message: '{bold}The ground rumbles as the shuttle departs the pad behind you!{/}'
-      set_player_flags:
-        1003_first_time: true
+    - steps:
+        - condition:
+            not: true
+            player_flag: 1003_first_time
+          messages:
+            - '{bold}The ground rumbles as the shuttle departs the pad behind you!{/}'
+          set_player_flags:
+            1003_first_time: true
+          wait: 5
 triggers: []
diff --git a/data/rooms/intro/1007.yaml b/data/rooms/intro/1007.yaml
index bc05da9..1d02bfe 100644
--- a/data/rooms/intro/1007.yaml
+++ b/data/rooms/intro/1007.yaml
@@ -1,5 +1,4 @@
-id: 1007
-name: 'Room #1007'
+block_transport: false
 color: ""
 description: []
 exits:
@@ -9,10 +8,14 @@ exits:
     room: 1008
   south:
     room: 1005
-objects: []
+hazard: ""
+id: 1007
 item_spawns: []
 mobs: []
+name: 'Room #1007'
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
+on_exit: []
+on_flag_change: []
+on_global_flag_change: []
 triggers: []