some improvements to asking about things

[mudsync.git] / worlds / bricabrac.scm

diff --git a/worlds/bricabrac.scm b/worlds/bricabrac.scm
index 7570b0d02840fb24ee3788652b54bc76d5a16cc8..3ce948d4b7fe568b097f9e0a3a18d4612eedbdf0 100644 (file)
--- a/worlds/bricabrac.scm
+++ b/worlds/bricabrac.scm
@@ -146,7 +146,7 @@ or 'skribe'?  Now *that's* composition!"))
 (define* (sign-cmd-sign-in actor message
                            #:key direct-obj indir-obj preposition)
   (define old-name
 (define* (sign-cmd-sign-in actor message
                            #:key direct-obj indir-obj preposition)
   (define old-name

-    (msg-val (<-wait (message-from message) 'get-name)))
+    (mbody-val (<-wait (message-from message) 'get-name)))

   (define name indir-obj)
   (if (valid-name? indir-obj)
       (begin
   (define name indir-obj)
   (if (valid-name? indir-obj)
       (begin


@@ -182,7 +182,7 @@ character.\n")))
   ;; handler... meanwhile, this procedure suspends until we get
   ;; their response.
   (define who-rang
   ;; handler... meanwhile, this procedure suspends until we get
   ;; their response.
   (define who-rang

-    (msg-val (<-wait (message-from message) 'get-name)))
+    (mbody-val (<-wait (message-from message) 'get-name)))

 
   ;; Now we'll invoke the "tell" message handler on the player
   ;; who rang us, displaying this text on their screen.
 
   ;; Now we'll invoke the "tell" message handler on the player
   ;; who rang us, displaying this text on their screen.


@@ -223,7 +223,7 @@ character.\n")))
     #:desc
     "  You're in some sort of hotel lobby.  You see a large sign hanging
 over the desk that says \"Hotel Bricabrac\".  On the desk is a bell
     #:desc
     "  You're in some sort of hotel lobby.  You see a large sign hanging
 over the desk that says \"Hotel Bricabrac\".  On the desk is a bell

-that says \"ring for service\".  Terrible music plays from a speaker
+that says \"'ring bell' for service\".  Terrible music plays from a speaker

 somewhere overhead.
   The room is lined with various curio cabinets, filled with all sorts
 of kitschy junk.  It looks like whoever decorated this place had great
 somewhere overhead.
   The room is lined with various curio cabinets, filled with all sorts
 of kitschy junk.  It looks like whoever decorated this place had great


@@ -390,7 +390,7 @@ if this room is intended for children or child-like adults."
 
 (define* (furniture-cmd-sit actor message #:key direct-obj)
   (define player-name
 
 (define* (furniture-cmd-sit actor message #:key direct-obj)
   (define player-name

-    (msg-val (<-wait (message-from message) 'get-name)))
+    (mbody-val (<-wait (message-from message) 'get-name)))

   (<- (message-from message) 'tell
       #:text (format #f "You ~a ~a.\n"
                      (slot-ref actor 'sit-phrase)
   (<- (message-from message) 'tell
       #:text (format #f "You ~a ~a.\n"
                      (slot-ref actor 'sit-phrase)


@@ -518,7 +518,7 @@ feel free to walk around and explore.")))
 
 
 (define clerk-knows-about
 
 
 (define clerk-knows-about

-  "'changing name', 'common commands', and 'about the hotel'")
+  "'ask clerk about changing name', 'ask clerk about common commands', and 'ask clerk about the hotel'")

 
 (define clerk-general-helpful-line
   (string-append
 
 (define clerk-general-helpful-line
   (string-append


@@ -548,7 +548,7 @@ with tuition at where it is..."))
           (random-choice clerk-slacking-complaints)
           "\"\n")))))
 
           (random-choice clerk-slacking-complaints)
           "\"\n")))))
 

-(define (clerk-cmd-ask-incomplete clerk message)
+(define (clerk-cmd-ask-incomplete clerk message . _)

   (<- (message-from message) 'tell
       #:text "The clerk says, \"Ask about what?\"\n"))
 
   (<- (message-from message) 'tell
       #:text "The clerk says, \"Ask about what?\"\n"))
 


@@ -601,7 +601,7 @@ You can ask me about the following:
 
 (define* (clerk-cmd-dismiss clerk message . _)
   (define player-name
 
 (define* (clerk-cmd-dismiss clerk message . _)
   (define player-name

-    (msg-val (<-wait (message-from message) 'get-name)))
+    (mbody-val (<-wait (message-from message) 'get-name)))

   (match (slot-ref clerk 'state)
     ('on-duty
      (<- (gameobj-loc clerk) 'tell-room
   (match (slot-ref clerk 'state)
     ('on-duty
      (<- (gameobj-loc clerk) 'tell-room


@@ -635,7 +635,9 @@ The clerk leaves the room in a hurry.\n"
     "The clerk takes a deep breath.\n"
     "The clerk yawns.\n"
     "The clerk drums her nails on the counter.\n"
     "The clerk takes a deep breath.\n"
     "The clerk yawns.\n"
     "The clerk drums her nails on the counter.\n"

-    "The clerk clicks around on the desk computer.\n"))
+    "The clerk clicks around on the desk computer.\n"
+    "The clerk thumbs through a printout of some physics paper.\n"
+    "The clerk mutters that her dissertation isn't going to write itself.\n"))

 
 (define clerk-slack-excuse-text
   "The desk clerk excuses herself, claiming she has important things to
 
 (define clerk-slack-excuse-text
   "The desk clerk excuses herself, claiming she has important things to