fix: harden economy recovery, shutdown concurrency, world validation, and inventory-loss paths

36 files changed, 4 insertions, 45 deletions

diff --git a/data/items/misc/birds_nest.yaml b/data/items/misc/birds_nest.yaml
index 569210c..bbc4f12 100644
--- a/data/items/misc/birds_nest.yaml
+++ b/data/items/misc/birds_nest.yaml
@@ -3,6 +3,3 @@ color: "B3"
 description: "A bird's nest. You can search it for treasure."
 value: 5
 stackable: false
-search_table: birds_nest_drop
-search_ticks: 3
-search_message: "digging through the bird's nest"
diff --git a/data/items/misc/christmas_cracker.yaml b/data/items/misc/christmas_cracker.yaml
index 3845ca8..35e3d2e 100644
--- a/data/items/misc/christmas_cracker.yaml
+++ b/data/items/misc/christmas_cracker.yaml
@@ -3,6 +3,3 @@ color: "A7"
 description: "A festive party cracker. Pull it apart to see what's inside!"
 value: 10
 stackable: true
-search_table: christmas_cracker_hat
-search_ticks: 3
-search_message: "digging through the christmas cracker"
diff --git a/data/items/misc/credit_stick.yaml b/data/items/misc/credit_stick.yaml
index 32c375b..d40e393 100644
--- a/data/items/misc/credit_stick.yaml
+++ b/data/items/misc/credit_stick.yaml
@@ -3,6 +3,3 @@ color: "B3"
 description: "A small electronic stick loaded with credits. You can search it to extract the credits."
 value: 10
 stackable: false
-search_table: credit_stick_drop
-search_ticks: 2
-search_message: "cracking open the credit stick"
diff --git a/data/objects/adamantite_rock.yaml b/data/objects/adamantite_rock.yaml
index 2d28f54..3eed994 100644
--- a/data/objects/adamantite_rock.yaml
+++ b/data/objects/adamantite_rock.yaml
@@ -8,7 +8,6 @@ gather:
     - depletes: true
       item_id: adamantite_ore
       level: 70
-      message: ""
       quantity: 0
       table: ""
       weight: 100
diff --git a/data/objects/anglerfish_spot.yaml b/data/objects/anglerfish_spot.yaml
index 24c77a1..f721103 100644
--- a/data/objects/anglerfish_spot.yaml
+++ b/data/objects/anglerfish_spot.yaml
@@ -8,7 +8,6 @@ gather:
   - depletes: false
     item_id: raw_anglerfish
     level: 82
-    message: ""
     quantity: 0
     table: ""
     weight: 100
diff --git a/data/objects/harpoon_fishing_spot.yaml b/data/objects/harpoon_fishing_spot.yaml
index 01622f7..d8b94d3 100644
--- a/data/objects/harpoon_fishing_spot.yaml
+++ b/data/objects/harpoon_fishing_spot.yaml
@@ -9,7 +9,6 @@ gather:
   - depletes: false
     item_id: raw_tuna
     level: 35
-    message: ""
     quantity: 0
     table: ""
     weight: 60
@@ -17,7 +16,6 @@ gather:
   - depletes: false
     item_id: raw_swordfish
     level: 50
-    message: ""
     quantity: 0
     table: ""
     weight: 50
@@ -25,7 +23,6 @@ gather:
   - depletes: false
     item_id: raw_shark
     level: 76
-    message: ""
     quantity: 0
     table: ""
     weight: 30
diff --git a/data/rooms/example_unused/player_housing/99999300.yaml b/data/rooms/example_unused/player_housing/99999300.yaml
index 308835d..64a2a25 100644
--- a/data/rooms/example_unused/player_housing/99999300.yaml
+++ b/data/rooms/example_unused/player_housing/99999300.yaml
@@ -15,4 +15,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/999991.yaml b/data/rooms/example_unused/town/999991.yaml
index 29ed5a6..ee164f4 100644
--- a/data/rooms/example_unused/town/999991.yaml
+++ b/data/rooms/example_unused/town/999991.yaml
@@ -87,4 +87,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999911.yaml b/data/rooms/example_unused/town/9999911.yaml
index 0ffafc6..75aa59c 100644
--- a/data/rooms/example_unused/town/9999911.yaml
+++ b/data/rooms/example_unused/town/9999911.yaml
@@ -24,4 +24,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999914.yaml b/data/rooms/example_unused/town/9999914.yaml
index 8011516..671f366 100644
--- a/data/rooms/example_unused/town/9999914.yaml
+++ b/data/rooms/example_unused/town/9999914.yaml
@@ -24,4 +24,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999915.yaml b/data/rooms/example_unused/town/9999915.yaml
index 30a5b8f..3e5ef61 100644
--- a/data/rooms/example_unused/town/9999915.yaml
+++ b/data/rooms/example_unused/town/9999915.yaml
@@ -16,4 +16,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999916.yaml b/data/rooms/example_unused/town/9999916.yaml
index 9ebebb2..6937631 100644
--- a/data/rooms/example_unused/town/9999916.yaml
+++ b/data/rooms/example_unused/town/9999916.yaml
@@ -17,4 +17,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999917.yaml b/data/rooms/example_unused/town/9999917.yaml
index be80594..1a3b899 100644
--- a/data/rooms/example_unused/town/9999917.yaml
+++ b/data/rooms/example_unused/town/9999917.yaml
@@ -16,4 +16,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999918.yaml b/data/rooms/example_unused/town/9999918.yaml
index d7ed4b9..64a00c6 100644
--- a/data/rooms/example_unused/town/9999918.yaml
+++ b/data/rooms/example_unused/town/9999918.yaml
@@ -14,4 +14,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999920.yaml b/data/rooms/example_unused/town/9999920.yaml
index a1f1756..eef2b5f 100644
--- a/data/rooms/example_unused/town/9999920.yaml
+++ b/data/rooms/example_unused/town/9999920.yaml
@@ -12,4 +12,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/999993.yaml b/data/rooms/example_unused/town/999993.yaml
index 41c18fc..47a1638 100644
--- a/data/rooms/example_unused/town/999993.yaml
+++ b/data/rooms/example_unused/town/999993.yaml
@@ -19,4 +19,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/9999931.yaml b/data/rooms/example_unused/town/9999931.yaml
index 4bec6b6..d0a2698 100644
--- a/data/rooms/example_unused/town/9999931.yaml
+++ b/data/rooms/example_unused/town/9999931.yaml
@@ -12,4 +12,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/999994.yaml b/data/rooms/example_unused/town/999994.yaml
index 19a72ce..4a338f0 100644
--- a/data/rooms/example_unused/town/999994.yaml
+++ b/data/rooms/example_unused/town/999994.yaml
@@ -44,4 +44,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/999995.yaml b/data/rooms/example_unused/town/999995.yaml
index 87b2160..092dace 100644
--- a/data/rooms/example_unused/town/999995.yaml
+++ b/data/rooms/example_unused/town/999995.yaml
@@ -16,4 +16,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/town/999997.yaml b/data/rooms/example_unused/town/999997.yaml
index 9bd30a5..d775332 100644
--- a/data/rooms/example_unused/town/999997.yaml
+++ b/data/rooms/example_unused/town/999997.yaml
@@ -13,4 +13,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999150.yaml b/data/rooms/example_unused/wilderness/99999150.yaml
index f37190f..10953a3 100644
--- a/data/rooms/example_unused/wilderness/99999150.yaml
+++ b/data/rooms/example_unused/wilderness/99999150.yaml
@@ -34,4 +34,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999151.yaml b/data/rooms/example_unused/wilderness/99999151.yaml
index 0d7f8ed..ee09050 100644
--- a/data/rooms/example_unused/wilderness/99999151.yaml
+++ b/data/rooms/example_unused/wilderness/99999151.yaml
@@ -18,4 +18,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999152.yaml b/data/rooms/example_unused/wilderness/99999152.yaml
index ae28ade..fff6341 100644
--- a/data/rooms/example_unused/wilderness/99999152.yaml
+++ b/data/rooms/example_unused/wilderness/99999152.yaml
@@ -18,4 +18,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999153.yaml b/data/rooms/example_unused/wilderness/99999153.yaml
index 648450b..32b1045 100644
--- a/data/rooms/example_unused/wilderness/99999153.yaml
+++ b/data/rooms/example_unused/wilderness/99999153.yaml
@@ -14,4 +14,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999154.yaml b/data/rooms/example_unused/wilderness/99999154.yaml
index 521981b..493d087 100644
--- a/data/rooms/example_unused/wilderness/99999154.yaml
+++ b/data/rooms/example_unused/wilderness/99999154.yaml
@@ -12,4 +12,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999160.yaml b/data/rooms/example_unused/wilderness/99999160.yaml
index 2171b30..7b81bc3 100644
--- a/data/rooms/example_unused/wilderness/99999160.yaml
+++ b/data/rooms/example_unused/wilderness/99999160.yaml
@@ -24,4 +24,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999161.yaml b/data/rooms/example_unused/wilderness/99999161.yaml
index 2357a82..6566282 100644
--- a/data/rooms/example_unused/wilderness/99999161.yaml
+++ b/data/rooms/example_unused/wilderness/99999161.yaml
@@ -23,4 +23,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999162.yaml b/data/rooms/example_unused/wilderness/99999162.yaml
index d4cca6a..524b14d 100644
--- a/data/rooms/example_unused/wilderness/99999162.yaml
+++ b/data/rooms/example_unused/wilderness/99999162.yaml
@@ -12,4 +12,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999170.yaml b/data/rooms/example_unused/wilderness/99999170.yaml
index 18a0a44..59bddc1 100644
--- a/data/rooms/example_unused/wilderness/99999170.yaml
+++ b/data/rooms/example_unused/wilderness/99999170.yaml
@@ -15,4 +15,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/example_unused/wilderness/99999171.yaml b/data/rooms/example_unused/wilderness/99999171.yaml
index 7d174b9..7e5d7ab 100644
--- a/data/rooms/example_unused/wilderness/99999171.yaml
+++ b/data/rooms/example_unused/wilderness/99999171.yaml
@@ -13,4 +13,3 @@ mobs:
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index 3abfffd..440914a 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -10,8 +10,10 @@ exits:
         condition:
             player_flag: 1002_lined_up
         room: 1003
-        set_player_flags:
-            1002_intro_done: true
+        on_traverse:
+            - steps:
+                - set_player_flags:
+                    1002_intro_done: true
     up:
         blocked_message: You have no ticket, or reason, to leave Vesta.
         condition:
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index 05f8c56..f82df21 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -26,4 +26,3 @@ on_enter:
           set_player_flags:
             1003_first_time: true
           wait: 5
-triggers: []
diff --git a/data/rooms/intro/1004.yaml b/data/rooms/intro/1004.yaml
index 45bb882..9c9de9a 100644
--- a/data/rooms/intro/1004.yaml
+++ b/data/rooms/intro/1004.yaml
@@ -11,4 +11,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1006.yaml b/data/rooms/intro/1006.yaml
index 7bd4af5..a6e2575 100644
--- a/data/rooms/intro/1006.yaml
+++ b/data/rooms/intro/1006.yaml
@@ -15,4 +15,3 @@ objects:
     hidden: false
     name: ""
 on_enter: []
-triggers: []
diff --git a/data/rooms/intro/2001.yaml b/data/rooms/intro/2001.yaml
index 3a953b2..bec5534 100644
--- a/data/rooms/intro/2001.yaml
+++ b/data/rooms/intro/2001.yaml
@@ -72,4 +72,3 @@ objects:
     name: hidden guy
   - id: tree
 on_enter: []
-triggers: []
diff --git a/data/rooms/intro/2006.yaml b/data/rooms/intro/2006.yaml
index 5b3019f..ccb312a 100644
--- a/data/rooms/intro/2006.yaml
+++ b/data/rooms/intro/2006.yaml
@@ -12,4 +12,3 @@ mobs: []
 on_enter: []
 hazard: ""
 block_transport: false
-triggers: []