feat: who, global chat, removed redundant YAML IDs

3 files changed, 20 insertions, 21 deletions

diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 7ad95fa..543acea 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -1,5 +1,6 @@
-id: 1001
-name: "Inside the Landing Craft"
-description: "Rows of sturdy metal seats fill the cramped cabin of the landing craft, harnesses still swinging from the descent. A thin haze of recycled air hangs in the light spilling through the open hatch. The only way out is north, onto the landing pad."
+name: "Inside Transport Shuttle"
+description: "A dim, metallic shuttle interior with a few uncomfortable rows of steel seats. A large framed sign hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft."
+objects:
+  - id: 1001_sign
 exits:
-  north: 1002
+  down: 1002
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index 2c9bb4f..9bcbd76 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -1,11 +1,10 @@
-id: 1002
 name: "Landing Pad"
-description: "A large, empty concrete pad in the middle of the ocean. The horizon stretches out in all directions."
+description: "A large, circular, concrete landing pad sits empty in the middle of a blue ocean surrounded by black netting to catch anyone careless enough to fall off. Waves quietly lick the structural pylons as they roll towards the nearby beach. North is a short, wide concrete through a small, doorless red building with a wooden sign above the entryway reading \"Vesta Customs\""
 descriptions:
   - condition:
-      player_flag: denali_intro_done
+      player_flag: 1002_intro_done
       not: true
-    text: "A large concrete pad sits in the middle of an endless ocean. A mass of a couple dozen people spill from a small building to the north, their faces a churn of anxiety, impatience, and relief."
+    text: "A large, circular, concrete landing pad sits in the middle of a blue ocean with a transport shuttle taking up nearly all of the walkable area. A crowd of perhaps a dozen people are shambling of a squat, doorless building to the north. A sign above the entryway reads \"Vesta Customs\""
 objects:
   - id: 1002_crowd
   - id: 1002_shuttle
@@ -14,30 +13,30 @@ exits:
   south:
     room: 1001
     condition:
-      player_flag: has_ticket
+      player_flag: always_false
     blocked_message: "You don't have a ticket!"
   north:
     room: 1003
     condition:
-      player_flag: denali_lined_up
-    blocked_message: "A mass of people blocks the way."
+      player_flag: 1002_lined_up
+    blocked_message: "A mass of people is still pouring out of the building!"
     set_player_flags:
-      denali_intro_done: true
+      1002_intro_done: true
 on_enter:
   - condition:
-      player_flag: denali_lined_up
+      player_flag: 1002_lined_up
       not: true
     delay: 5
-    message: "Some of the group look you up and down."
+    message: "A few in the crowd openly look you up and down consideringly, as if you're heading the wrong direction."
   - condition:
-      player_flag: denali_lined_up
+      player_flag: 1002_lined_up
       not: true
     delay: 5
-    message: "The pilot pops out of the hatch of the craft and calls out, \"Shuttle to Passenger Liner Denali. Tickets out, please! Nice and orderly!\""
+    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!\""
     set_player_flags:
-      denali_lined_up: true
+      1002_lined_up: true
   - condition:
-      player_flag: denali_lined_up
+      player_flag: 1002_lined up
       not: true
-    delay: 0
-    message: "The people line up single file."
+    delay: 3
+    message: "The people shamble into a line, dragging their luggage out of the narrow path to clear the way for you."
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index a3fd89f..fba85c6 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -1,4 +1,3 @@
-id: 1003
 name: "Customs Building"
 description: "A cramped customs checkpoint lit by flickering panels. Officials in grey uniforms wave the new arrivals through, one at a time. (This area is still under construction.)"
 exits: