Remove thing and fold into gameobj. Allow to mark obvious / not obvious commands

[mudsync.git] / worlds / bricabrac.scm

diff --git a/worlds/bricabrac.scm b/worlds/bricabrac.scm
index cf34903e0d1df476f2198c759db7fa768a1e49e0..26b479634df4ffa63fe74ce7011c43b10e53c8e7 100644 (file)
--- a/worlds/bricabrac.scm
+++ b/worlds/bricabrac.scm
@@ -46,7 +46,7 @@
 ;;; Some simple object types.
 ;;; =========================
 
-(define-class <readable> (<thing>)
+(define-class <readable> (<gameobj>)
   (read-text #:init-value "All it says is: \"Blah blah blah.\""
              #:init-keyword #:read-text)
   (commands
@@ -140,7 +140,7 @@ Alphanumerics, _ and - only, 2-15 characters, starts with an alphabetic
 character.\n")))
 
 
-(define-class <summoning-bell> (<thing>)
+(define-class <summoning-bell> (<gameobj>)
   (summons #:init-keyword #:summons)
 
   (commands
@@ -275,14 +275,14 @@ Ooh, ~a!" (random-choice
     #:desc "It looks like you could sign this form and set your name.")
 
    ('thing:lobby:porcelain-doll
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a creepy porcelain doll"
     #:desc "It strikes you that while the doll is technically well crafted,
 it's also the stuff of nightmares."
     #:goes-by '("porcelain doll" "doll"))
    ('thing:lobby:1950s-robots
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a set of 1950s robots"
     #:desc "There's a whole set of these 1950s style robots.
@@ -290,7 +290,7 @@ They seem to be stamped out of tin, and have various decorations of levers
 and buttons and springs.  Some of them have wind-up knobs on them."
     #:goes-by '("robot" "robots" "1950s robot" "1950s robots"))
    ('thing:lobby:tea-set
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a tea set"
     #:desc "A complete tea set.  Some of the cups are chipped.
@@ -298,7 +298,7 @@ You can imagine yourself joining a tea party using this set, around a
 nice table with some doilies, drinking some Earl Grey tea, hot.  Mmmm."
     #:goes-by '("tea set" "tea"))
    ('thing:lobby:mustard-pot
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a mustard pot"
     #:desc '((p "It's a mustard pot.  I mean, it's kind of cool, it has a
@@ -307,7 +307,7 @@ like this in a museum.")
              (p "Ha... imagine that... a mustard museum."))
     #:goes-by '("mustard pot" "antique mustard pot" "mustard"))
    ('thing:lobby:head-of-elvis
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "the pickled head of Elvis"
     #:desc '((p "It's a jar full of some briny-looking liquid and...
@@ -321,7 +321,7 @@ everything you read."))
     #:goes-by '("pickled head of elvis" "pickled head of Elvis"
                 "elvis" "Elvis" "head" "pickled head"))
    ('thing:lobby:circuitboard-of-evlis
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "the pickled circuitboard of Evlis"
     #:desc '((p "It's a circuitboard from a Lisp Machine called EVLIS.
@@ -335,7 +335,7 @@ Too bad..."))
                 "pickled circuitboard of EVLIS"
                 "evlis" "Evlis" "EVLIS" "circuitboard" "pickled circuitboard"))
    ('thing:lobby:teletype-scroll
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a scroll of teletype"
     #:desc '((p "This is a scroll of teletype paper.  It's a bit old
@@ -356,7 +356,7 @@ English language surrounding the word 'free' have lead to a lot of terminology d
                 "scroll of teletype paper holding the software Four Freedoms"
                 "scroll of teletype paper holding the software four freedoms"))
    ('thing:lobby:orange-cat-phone
-    <thing> 'room:lobby
+    <gameobj> 'room:lobby
     #:generally-visible #f
     #:name "a telephone shaped like an orange cartoon cat"
     #:desc "It's made out of a cheap plastic, and it's very orange.
@@ -420,12 +420,12 @@ if this room is intended for children or child-like adults."
             #:name "east"
             #:to 'room:grand-hallway)))
    ('thing:playroom:cubey
-    <thing> 'room:playroom
+    <gameobj> 'room:playroom
     #:name "cubey"
     #:takeable #t
     #:desc "  It's a little foam cube with googly eyes on it.  So cute!")
    ('thing:cuddles-plushie
-    <thing> 'room:playroom
+    <gameobj> 'room:playroom
     #:name "a cuddles plushie"
     #:goes-by '("plushie" "cuddles plushie" "cuddles")
     #:takeable #t
@@ -527,7 +527,7 @@ seat in the room, though."
     #:catchphrases prefect-quotes)
 
    ('thing:smoking-parlor:no-smoking-sign
-    <thing> 'room:smoking-parlor
+    <gameobj> 'room:smoking-parlor
     #:generally-visible #f
     #:name "No Smoking Sign"
     #:desc "This sign says \"No Smoking\" in big, red letters.
@@ -542,7 +542,7 @@ It has some bits of bubble gum stuck to it... yuck."
 ;;; Breakroom
 ;;; ---------
 
-(define-class <desk-clerk> (<thing>)
+(define-class <desk-clerk> (<gameobj>)
   ;; The desk clerk has three states:
   ;;  - on-duty: Arrived, and waiting for instructions (and losing patience
   ;;    gradually)
@@ -783,13 +783,13 @@ the scenery tapers off nothingness.  But that can't be right, can it?"
 hotel insignia.  She appears to be rather exhausted."
     #:goes-by '("hotel desk clerk" "clerk" "desk clerk"))
    ('thing:break-room:void
-    <thing> 'room:break-room
+    <gameobj> 'room:break-room
     #:generally-visible #f
     #:name "The Void"
     #:desc "As you stare into the void, the void stares back into you."
     #:goes-by '("void" "abyss" "nothingness" "scenery"))
    ('thing:break-room:fence
-    <thing> 'room:break-room
+    <gameobj> 'room:break-room
     #:generally-visible #f
     #:name "break room cage"
     #:desc "It's a mostly-cubical wire mesh surrounding the break area.