Use simple comma-join when listing items in a room.

[mudsync.git] / worlds / bricabrac.scm

diff --git a/worlds/bricabrac.scm b/worlds/bricabrac.scm
index ba0b75fe008bb90e208299ff3aafd23a02414575..b816c88a8ed592340b252cf2bb1c53ce9080eb91 100644 (file)
--- a/worlds/bricabrac.scm
+++ b/worlds/bricabrac.scm
@@ -221,15 +221,15 @@ character.\n")))
     <room> #f
     #:name "Hotel Lobby"
     #: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
-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
-ambitions, but actually assembled it all in a hurry and used whatever
-kind of objects they found lying around.
-  There's a door to the north leading to some kind of hallway."
+    '((p "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 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 "
+         "ambitions, but actually assembled it all in a hurry and used whatever "
+         "kind of objects they found lying around.")
+      (p "There's a door to the north leading to some kind of hallway."))
     #:exits
     (list (make <exit>
             #:name "north"
@@ -238,14 +238,15 @@ kind of objects they found lying around.
    ('npc:lobby:hotel-owner
     <chatty-npc> 'room:lobby
     #:name "a frumpy fellow"
-    #:desc "  Whoever this is, they looks totally exhausted.  They're
+    #:desc
+    '((p "  Whoever this is, they looks totally exhausted.  They're
 collapsed into the only comfortable looking chair in the room and you
 don't get the sense that they're likely to move any time soon.
   You notice they're wearing a sticker badly adhesed to their clothing
 which says \"Hotel Proprietor\", but they look so disorganized that you
 think that can't possibly be true... can it?
   Despite their exhaustion, you sense they'd be happy to chat with you,
-though the conversation may be a bit one sided."
+though the conversation may be a bit one sided."))
     #:goes-by '("frumpy fellow" "fellow"
                 "Chris Webber"  ; heh, did you rtfc?  or was it so obvious?
                 "hotel proprietor" "proprietor")
@@ -408,12 +409,12 @@ if this room is intended for children or child-like adults."
    ('room:smoking-parlor
     <room> #f
     #:name "Smoking Parlor"
-    #:desc "  This room looks quite posh.  There are huge comfy seats you can sit in
-if you like.
-  Strangely, you see a large sign saying \"No Smoking\".  The owners must
-have installed this place and then changed their mind later.
-  There's a door to the west leading back to the grand hallway, and
-a nondescript steel door to the south, leading apparently outside."
+    #:desc
+    '((p "This room looks quite posh.  There are huge comfy seats you can sit in
+if you like. Strangely, you see a large sign saying \"No Smoking\".  The owners must
+have installed this place and then changed their mind later.")
+      (p "There's a door to the west leading back to the grand hallway, and
+a nondescript steel door to the south, leading apparently outside."))
     #:exits
     (list (make <exit>
             #:name "west"
@@ -518,7 +519,7 @@ feel free to walk around and explore.")))
 
 
 (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
@@ -548,7 +549,7 @@ with tuition at where it is..."))
           (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"))
 
@@ -635,7 +636,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 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
@@ -723,11 +726,11 @@ hotel insignia.  She looks like she'd much rather be somewhere else."
 ;;; Game
 ;;; ----
 
-(define game-spec
+(define (game-spec)
   (append lobby grand-hallway smoking-parlor
           playroom break-room))
 
 ;; TODO: Provide command line args
 (define (run-game . args)
-  (run-demo game-spec 'room:lobby #:repl-server #t))
+  (run-demo (game-spec) 'room:lobby #:repl-server #t))