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

1 files changed, 73 insertions, 91 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