feat: room-specific objects can be defined inline in room yaml

6 files changed, 41 insertions, 46 deletions

diff --git a/data/objects/unique/1001_door.yaml b/data/objects/unique/1001_door.yaml
deleted file mode 100644
index f9dbb20..0000000
--- a/data/objects/unique/1001_door.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: door
-hidden: true
-description: "A sturdy, locked steel door that keeps passengers out of the cockpit. There is a tiny, thin window at eye level."
diff --git a/data/objects/unique/1001_instruments.yaml b/data/objects/unique/1001_instruments.yaml
deleted file mode 100644
index 2d50c4f..0000000
--- a/data/objects/unique/1001_instruments.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: instrument panel
-aliases: [cockpit]
-hidden: true
-description: "The cramped cockpit is surrounded by buttons, swiches, dials, and analog gauges. The parts are a mix of technologies from the last century. Part of the panel is obscured by a draped cloth as if to hide it from view. Odd."
diff --git a/data/objects/unique/1001_pilot.yaml b/data/objects/unique/1001_pilot.yaml
deleted file mode 100644
index fccb61f..0000000
--- a/data/objects/unique/1001_pilot.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: pilot
-hidden: true
-description: "That's the guy who took you from the Passenger Barge Denali down here to Vesta. A middle-aged man in a neat white jumpsuit with a matching white sort of conductor's hat. He's following a written procedure checklist and seems to take his job seriously."
diff --git a/data/objects/unique/1001_sign.yaml b/data/objects/unique/1001_sign.yaml
deleted file mode 100644
index 8b9ea0d..0000000
--- a/data/objects/unique/1001_sign.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: sign
-aliases: [safety card, safety instructions, frame]
-inroom_description: A large framed sign is mounted near the cockpit door.
-description: |-
-  We hope you enjoy your trip on our shuttle. Your pilot is [TYLER].
-
-  When you arrive at your final destination, please be aware of the following basic commands:
-
-  {0B bold}Movement:{/}  {0A}north{/}, {0A}south{/}, {0A}east{/}, {0A}west{/}, {0A}up{/}, {0A}down{/}
-  {0B bold}Look:{/}      {0A}look{/}, {0A}look <item/object/mob>{/}, and {0A}map{/}
-  {0B bold}Items:{/}     {0A}inv{/} to see your 28-slot inventory
-             {0A}get <item>{/}, {0A}drop <item>{/}, {0A}wear <item>{/}, {0A}remove <item>{/}
-             {0A}use <item> on <item/object>{/}
-             {0A}eq{/} for equiped gear
-  {0B bold}Comms:{/}     {0A}talk <mob>{/} for NPC chat
-             {0A}say <msg>{/} and {0A}global <msg>{/} for human chat
-  {0B bold}Character:{/} {0A}score{/} and {0A}skills{/} for stats. 
-  {0B bold}Combat{/}     {0A}attack <mob>{/}
-  {0B bold}Skills{/}     Many skills have shortcuts like {0A}mine{/}, {0A}fish{/}, or {0A}chop{/}
-  {0B bold}Options{/}    {0A}options{/} for a list of account options
-             {0A}options <opt> <value>{/} to change an option
-
-  Type {0C bold}what{/} for a list of possible common actions
-
-  Make sure to check the {0A}help{/} pages, especially {0A}help newplayer{/}!
-on_look:
-  set_player_flags:
-    1001_look_sign: true
diff --git a/data/objects/unique/1001_window.yaml b/data/objects/unique/1001_window.yaml
deleted file mode 100644
index e8d76f8..0000000
--- a/data/objects/unique/1001_window.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-name: window
-hidden: true
-description: "A thick trim with rounded bolt heads frames the tiny window. It looks like it was cut into the door at some point, potentially as a simple replacement to computerized security systems. Inside the cockpit there's a pilot finishing up landing procedures on a large panel of analog instruments."
diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 2f5ffe0..8e2f573 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -6,11 +6,47 @@ description:
       not: true
   - text: "A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large framed sign hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft with a smiling attendant ready to help disembark."
 objects:
-  - id: 1001_sign
-  - id: 1001_door
-  - id: 1001_window
-  - id: 1001_instruments
-  - id: 1001_pilot
+  - name: sign
+    aliases: [safety card, safety instructions, frame]
+    inroom_description: A large framed sign is mounted near the cockpit door.
+    description: |-
+      We hope you enjoy your trip on our shuttle. Your pilot is [TYLER].
+
+      When you arrive at your final destination, please be aware of the following basic commands:
+
+      {0B bold}Movement:{/}  {0A}north{/}, {0A}south{/}, {0A}east{/}, {0A}west{/}, {0A}up{/}, {0A}down{/}
+      {0B bold}Look:{/}      {0A}look{/}, {0A}look <item/object/mob>{/}, and {0A}map{/}
+      {0B bold}Items:{/}     {0A}inv{/} to see your 28-slot inventory
+                 {0A}get <item>{/}, {0A}drop <item>{/}, {0A}wear <item>{/}, {0A}remove <item>{/}
+                 {0A}use <item> on <item/object>{/}
+                 {0A}eq{/} for equiped gear
+      {0B bold}Comms:{/}     {0A}talk <mob>{/} for NPC chat
+                 {0A}say <msg>{/} and {0A}global <msg>{/} for human chat
+      {0B bold}Character:{/} {0A}score{/} and {0A}skills{/} for stats. 
+      {0B bold}Combat{/}     {0A}attack <mob>{/}
+      {0B bold}Skills{/}     Many skills have shortcuts like {0A}mine{/}, {0A}fish{/}, or {0A}chop{/}
+      {0B bold}Options{/}    {0A}options{/} for a list of account options
+                 {0A}options <opt> <value>{/} to change an option
+
+      Type {0C bold}what{/} for a list of possible common actions
+
+      Make sure to check the {0A}help{/} pages, especially {0A}help newplayer{/}!
+    on_look:
+      set_player_flags:
+        1001_look_sign: true
+  - name: door
+    hidden: true
+    description: "A sturdy, locked steel door that keeps passengers out of the cockpit. There is a tiny, thin window at eye level."
+  - name: window
+    hidden: true
+    description: "A thick trim with rounded bolt heads frames the tiny window. It looks like it was cut into the door at some point, potentially as a simple replacement to computerized security systems. Inside the cockpit there's a pilot finishing up landing procedures on a large panel of analog instruments."
+  - name: instrument panel
+    aliases: [cockpit]
+    hidden: true
+    description: "The cramped cockpit is surrounded by buttons, swiches, dials, and analog gauges. The parts are a mix of technologies from the last century. Part of the panel is obscured by a draped cloth as if to hide it from view. Odd."
+  - name: pilot
+    hidden: true
+    description: "That's the guy who took you from the Passenger Barge Denali down here to Vesta. A middle-aged man in a neat white jumpsuit with a matching white sort of conductor's hat. He's following a written procedure checklist and seems to take his job seriously."
 mobs:
   - flight_attendant
 exits: