feat: admin gui object CRUD is much nicer

20 files changed, 99 insertions, 373 deletions

diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 98eebab..defd1b1 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -1,5 +1,4 @@
-id: 1001
-name: Inside Transport Shuttle
+block_transport: true
 color: ""
 description:
   - text: |-
@@ -8,169 +7,171 @@ description:
       A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large {11}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.
 exits:
   down:
-    room: 1002
+    blocked_message: The piston-powered staircase is firmly closed.
     condition:
+      all_of: []
+      any_of: []
       flag: ""
-      value: null
-      not: false
-      player_flag: 1001_touchdown
       has_item: ""
       min_credits: 0
-      all_of: []
-      any_of: []
-    blocked_message: The piston-powered staircase is firmly closed.
+      not: false
+      player_flag: 1001_touchdown
+      value: null
+    room: 1002
   east:
     room: 2001
+hazard: ""
+id: 1001
+item_spawns: []
+mobs:
+  - id: flight_attendant
+name: Inside Transport Shuttle
 objects:
-  - name: framed sign
-    hidden: true
-    description:
+  - description:
       - text: "We hope you enjoy your trip on our shuttle! Your pilot is [TYLER].\n\nWhen you arrive at your final destination, please be aware of the following basic commands:\n\n{0B bold}Movement:{/}  {0A}north{/}, {0A}south{/}, {0A}east{/}, {0A}west{/}, {0A}up{/}, {0A}down{/}\n{0B bold}Look:{/}      {0A}look{/}, {0A}look <item/object/mob>{/}, and {0A}map{/}\n{0B bold}Items:{/}     {0A}inv{/} to see your 28-slot inventory\n           {0A}get <item>{/}, {0A}drop <item>{/}, {0A}wear <item>{/}, {0A}remove <item>{/}\n           {0A}use <item> on <item/object>{/}\n           {0A}eq{/} for equiped gear\n{0B bold}Comms:{/}     {0A}talk <mob>{/} for NPC chat\n           {0A}say <msg>{/} and {0A}global <msg>{/} for human chat\n{0B bold}Character:{/} {0A}score{/} and {0A}skills{/} for stats. \n{0B bold}Combat{/}     {0A}attack <mob>{/}\n{0B bold}Skills{/}     Many skills have shortcuts like {0A}mine{/}, {0A}fish{/}, or {0A}chop{/}\n{0B bold}Options{/}    {0A}options{/} for a list of account options\n           {0A}options <opt> <value>{/} to change an option\n\nType {0C bold}what{/} for a list of possible common actions\n\nMake sure to check the {0A}help{/} pages, especially {0A}help newplayer{/}!"
+    hidden: true
+    name: framed sign
     on_look:
+      aps_node: false
+      assign_task: false
+      cost: 0
+      extend_task: false
+      give_item: ""
+      heal: 0
+      reputation_cost: 0
+      sawmill: false
       set_flags: {}
       set_player_flags:
         1001_look_sign: true
-      give_item: ""
-      take_item: ""
-      teleport: 0
-      heal: 0
-      cost: 0
       shop: null
-      assign_task: false
       skip_task: false
-      extend_task: false
-      reputation_cost: 0
-      sawmill: false
-      aps_node: false
-  - name: door
-    hidden: true
-    description:
+      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.
-  - name: window
     hidden: true
-    description:
+    name: door
+  - description:
       - text: 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
+    name: window
+  - aliases:
+      - cockpit
     description:
       - text: 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
+    name: instrument panel
+  - aliases: []
     description:
       - text: 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.
-item_spawns: []
-mobs:
-  - id: flight_attendant
+    hidden: true
+    name: pilot
 on_enter:
-  - message: '{0B bold}Welcome to The House of Icarus{/}'
+  - broadcast: ""
+    broadcast_global: ""
     condition:
+      all_of: []
+      any_of: []
       flag: ""
-      value: null
-      not: true
-      player_flag: 1001_welcome
       has_item: ""
       min_credits: 0
-      all_of: []
-      any_of: []
+      not: true
+      player_flag: 1001_welcome
+      value: null
     delay: 5
+    despawn_mob: ""
+    give_item: ""
+    heal: 0
+    message: '{0B bold}Welcome to The House of Icarus{/}'
     set_flags: {}
     set_player_flags: {}
-    broadcast: ""
-    broadcast_global: ""
     spawn_mob: null
-    despawn_mob: ""
-    give_item: ""
     take_item: ""
     teleport: 0
-    heal: 0
-  - message: '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
+  - broadcast: ""
+    broadcast_global: ""
     condition:
+      all_of: []
+      any_of: []
       flag: ""
-      value: null
-      not: true
-      player_flag: 1001_welcome
       has_item: ""
       min_credits: 0
-      all_of: []
-      any_of: []
+      not: true
+      player_flag: 1001_welcome
+      value: null
     delay: 7
+    despawn_mob: ""
+    give_item: ""
+    heal: 0
+    message: '{0B}Type{/} {0A}look sign{/} {0B}or{/} {0A}talk attendant{/} {0B}to get started{/}'
     set_flags: {}
     set_player_flags:
       1001_welcome: true
-    broadcast: ""
-    broadcast_global: ""
     spawn_mob: null
-    despawn_mob: ""
-    give_item: ""
     take_item: ""
     teleport: 0
-    heal: 0
-  - message: '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
+  - broadcast: ""
+    broadcast_global: ""
     condition:
+      all_of: []
+      any_of: []
       flag: ""
-      value: null
-      not: true
-      player_flag: 1001_welcome
       has_item: ""
       min_credits: 0
-      all_of: []
-      any_of: []
+      not: true
+      player_flag: 1001_welcome
+      value: null
     delay: 7
+    despawn_mob: ""
+    give_item: ""
+    heal: 0
+    message: '{0B}Type{/} {0A}help newplayer{/} {0B}for the new player''s guide. That''s it. Explore and have fun.{/}'
     set_flags: {}
     set_player_flags: {}
-    broadcast: ""
-    broadcast_global: ""
     spawn_mob: null
-    despawn_mob: ""
-    give_item: ""
     take_item: ""
     teleport: 0
-    heal: 0
-hazard: ""
-block_transport: true
 triggers:
   - id: ""
-    on_player_flag: 1001_look_sign
     on_flag: ""
-    value: null
+    on_player_flag: 1001_look_sign
     room: 0
     steps:
-      - delay: 5
-        message: The cabin shakes as the small craft touches down
-        broadcast: ""
+      - broadcast: ""
         broadcast_global: ""
+        delay: 5
+        despawn_mob: ""
+        give_item: ""
+        heal: 0
+        message: The cabin shakes as the small craft touches down
         set_flags: {}
         set_player_flags: {}
         spawn_mob: null
-        give_item: ""
         take_item: ""
         teleport: 0
-        heal: 0
+      - broadcast: ""
+        broadcast_global: ""
+        delay: 5
         despawn_mob: ""
-      - delay: 5
+        give_item: ""
+        heal: 0
         message: The pistons hiss as the rear staircase opens
-        broadcast: ""
-        broadcast_global: ""
         set_flags: {}
         set_player_flags: {}
         spawn_mob: null
-        give_item: ""
         take_item: ""
         teleport: 0
-        heal: 0
+      - broadcast: ""
+        broadcast_global: ""
+        delay: 0
         despawn_mob: ""
-      - delay: 0
+        give_item: ""
+        heal: 0
         message: ""
-        broadcast: ""
-        broadcast_global: ""
         set_flags: {}
         set_player_flags:
           1001_touchdown: true
         spawn_mob: null
-        give_item: ""
         take_item: ""
         teleport: 0
-        heal: 0
-        despawn_mob: ""
+    value: null
diff --git a/data/rooms/intro/1005.yaml b/data/rooms/intro/1005.yaml
deleted file mode 100644
index 5d34027..0000000
--- a/data/rooms/intro/1005.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-id: 1005
-name: New Room
-color: CC
-description:
-  - text: A featureless room.
-exits:
-  east:
-    room: 1009
-  northeast:
-    room: 1016
-  south:
-    room: 1006
-  southwest:
-    room: 2003
-  west:
-    room: 1008
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1006.yaml b/data/rooms/intro/1006.yaml
deleted file mode 100644
index 4f8b9ef..0000000
--- a/data/rooms/intro/1006.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-id: 1006
-name: New Room
-color: E2
-description:
-  - text: A featureless room.
-exits:
-  north:
-    room: 1005
-  northeast:
-    room: 1009
-  northwest:
-    room: 1008
-  up:
-    room: 1010
-  west:
-    room: 2003
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1007.yaml b/data/rooms/intro/1007.yaml
deleted file mode 100644
index 3f40bc1..0000000
--- a/data/rooms/intro/1007.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: 1007
-name: 'Room #1007'
-color: ""
-description: []
-exits:
-  east:
-    room: 1013
-  west:
-    room: 2004
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1008.yaml b/data/rooms/intro/1008.yaml
deleted file mode 100644
index fe5956a..0000000
--- a/data/rooms/intro/1008.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-block_transport: false
-color: A9
-description:
-  - text: A featureless room.
-exits:
-  east:
-    room: 1005
-  north:
-    room: 7
-  south:
-    room: 2003
-  southeast:
-    room: 1006
-hazard: ""
-id: 1008
-item_spawns: []
-mobs: []
-name: New Room
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1009.yaml b/data/rooms/intro/1009.yaml
deleted file mode 100644
index 087a680..0000000
--- a/data/rooms/intro/1009.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-block_transport: false
-color: "27"
-description:
-  - text: A featureless room.
-exits:
-  north:
-    room: 1016
-  northwest:
-    room: 8
-  southwest:
-    room: 1006
-  west:
-    room: 1005
-hazard: ""
-id: 1009
-item_spawns: []
-mobs:
-  - id: man
-  - id: man
-name: New Room
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1010.yaml b/data/rooms/intro/1010.yaml
deleted file mode 100644
index fca6471..0000000
--- a/data/rooms/intro/1010.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: 1010
-name: New Room
-color: ""
-description:
-  - text: A featureless room.
-exits:
-  down:
-    room: 1006
-  north:
-    room: 1011
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1011.yaml b/data/rooms/intro/1011.yaml
deleted file mode 100644
index 0f0c477..0000000
--- a/data/rooms/intro/1011.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: 1011
-name: New Room
-color: ""
-description:
-    - text: A featureless room.
-exits:
-    east:
-        room: 1012
-    south:
-        room: 1010
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1012.yaml b/data/rooms/intro/1012.yaml
deleted file mode 100644
index 93fc6d1..0000000
--- a/data/rooms/intro/1012.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: 1012
-name: New Room
-color: ""
-description:
-  - text: A featureless room.
-exits: {}
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1013.yaml b/data/rooms/intro/1013.yaml
deleted file mode 100644
index 35e3757..0000000
--- a/data/rooms/intro/1013.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-block_transport: false
-color: "72"
-description: []
-exits:
-  northeast:
-    room: 1014
-  west:
-    room: 1007
-hazard: ""
-id: 1013
-item_spawns: []
-mobs: []
-name: 'Room #1013'
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1014.yaml b/data/rooms/intro/1014.yaml
deleted file mode 100644
index a11adfd..0000000
--- a/data/rooms/intro/1014.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-block_transport: false
-color: D5
-description: []
-exits:
-  northeast:
-    room: 1015
-  southwest:
-    room: 1013
-hazard: ""
-id: 1014
-item_spawns: []
-mobs: []
-name: 'Room #1014'
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1015.yaml b/data/rooms/intro/1015.yaml
deleted file mode 100644
index eaec278..0000000
--- a/data/rooms/intro/1015.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-block_transport: false
-color: 0C
-description: []
-exits:
-  northwest:
-    room: 1018
-  southwest:
-    room: 1014
-hazard: ""
-id: 1015
-item_spawns: []
-mobs: []
-name: 'Room #1015'
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1016.yaml b/data/rooms/intro/1016.yaml
deleted file mode 100644
index 58eb906..0000000
--- a/data/rooms/intro/1016.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: 1016
-name: New Room
-color: "97"
-description:
-  - text: A featureless room.
-exits:
-  down:
-    room: 1017
-  east:
-    room: 1018
-  south:
-    room: 1009
-  southwest:
-    room: 1005
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1017.yaml b/data/rooms/intro/1017.yaml
deleted file mode 100644
index 14585ae..0000000
--- a/data/rooms/intro/1017.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: 1017
-name: New Room
-color: ""
-description:
-    - text: A featureless room.
-exits:
-    up:
-        room: 1016
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1018.yaml b/data/rooms/intro/1018.yaml
deleted file mode 100644
index a696922..0000000
--- a/data/rooms/intro/1018.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-block_transport: false
-color: D0
-description: []
-exits:
-  southeast:
-    room: 1015
-  west:
-    room: 1016
-hazard: ""
-id: 1018
-item_spawns: []
-mobs: []
-name: 'Room #1018'
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/1019.yaml b/data/rooms/intro/1019.yaml
deleted file mode 100644
index 3ea9771..0000000
--- a/data/rooms/intro/1019.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-id: 1019
-name: 'Room #1019'
-color: ""
-description: []
-exits:
-  south:
-    room: 1020
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1020.yaml b/data/rooms/intro/1020.yaml
deleted file mode 100644
index 256ea8b..0000000
--- a/data/rooms/intro/1020.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-exits:
-  north: 1019
-id: 1020
-name: 'Room #1020'
diff --git a/data/rooms/intro/2001.yaml b/data/rooms/intro/2001.yaml
index 9f44298..0bb9c16 100644
--- a/data/rooms/intro/2001.yaml
+++ b/data/rooms/intro/2001.yaml
@@ -13,9 +13,13 @@ exits:
     room: 1001
 hazard: ""
 id: 2001
-item_spawns: []
+item_spawns:
+  - id: bronze_axe
+    quantity: 1
+    respawn_ticks: 1
 mobs: []
 name: Test Room
-objects: []
+objects:
+  - id: tree
 on_enter: []
 triggers: []
diff --git a/data/rooms/intro/2003.yaml b/data/rooms/intro/2003.yaml
index 3fcc0c2..6324c9c 100644
--- a/data/rooms/intro/2003.yaml
+++ b/data/rooms/intro/2003.yaml
@@ -1,25 +1,19 @@
-block_transport: false
+id: 2003
+name: Test Room
 color: ""
 description:
   - text: It's a test room
 exits:
-  east:
-    room: 1006
-  north:
-    room: 1008
-  northeast:
-    room: 1005
   south:
     room: 2004
   southwest:
     room: 2005
   west:
     room: 2002
-hazard: ""
-id: 2003
+objects: []
 item_spawns: []
 mobs: []
-name: Test Room
-objects: []
 on_enter: []
+hazard: ""
+block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2004.yaml b/data/rooms/intro/2004.yaml
index e90d370..73d912e 100644
--- a/data/rooms/intro/2004.yaml
+++ b/data/rooms/intro/2004.yaml
@@ -4,8 +4,6 @@ color: ""
 description:
   - text: It's a test room
 exits:
-  east:
-    room: 1007
   north:
     room: 2003
   northwest: