From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 10 May 2016 02:20:01 +0000 (-0500)
Subject: Last minute bricabrac fixes and adjustments
X-Git-Tag: fosdem-2017~144
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=7eb469aad2ae78746d6b5c9f9b4995d99a40ee48;p=mudsync.git

Last minute bricabrac fixes and adjustments
---

diff --git a/worlds/bricabrac.scm b/worlds/bricabrac.scm
index b2607be..fe158ff 100644
--- a/worlds/bricabrac.scm
+++ b/worlds/bricabrac.scm
@@ -212,7 +212,8 @@ character.\n")))
               who-rang)
       #:exclude (message-from message))
 
-  (<- bell (dyn-ref bell (slot-ref bell 'summons)) 'be-summoned))
+  (<- bell (dyn-ref bell (slot-ref bell 'summons)) 'be-summoned
+      #:who-summoned (message-from message)))
 
 
 (define lobby
@@ -333,7 +334,8 @@ room\", while a door to the west is labeled \"playroom\"."
     #:name "a statue"
     #:desc "  The statue is of a serious-looking bearded man with long, flowing hair.
 The inscription says \"St. Ignucius\".
-  It has a large physical halo.  It doesn't look like it would be hard to remove."
+  It has a large physical halo.  Removing it is tempting, but it looks pretty
+well fastened."
     #:goes-by '("statue" "st ignucius" "st. ignucius"))))
 
 
@@ -355,7 +357,13 @@ if this room is intended for children or child-like adults."
     <thing> 'room:playroom
     #:name "cubey"
     #:takeable #t
-    #:desc "  It's a little foam cube with googly eyes on it.  So cute!")))
+    #:desc "  It's a little foam cube with googly eyes on it.  So cute!")
+   ('thing:cuddles-plushie
+    <thing> 'room:playroom
+    #:name "a cuddles plushie"
+    #:goes-by '("plushie" "cuddles plushie")
+    #:takeable #t
+    #:desc "  A warm and fuzzy cuddles plushie!  It's a cuddlefish!")))
 
 
 
@@ -572,10 +580,10 @@ with tuition at where it is..."))
      (<- clerk (message-from message) 'tell
          #:text "The clerk says, \"Sorry, I'm on my break.\"\n"))))
 
-(define-mhandler (clerk-act-be-summoned clerk message)
+(define-mhandler (clerk-act-be-summoned clerk message who-summoned)
   (match (slot-ref clerk 'state)
     ('on-duty
-     (<- clerk (message-from message) 'tell
+     (<- clerk who-summoned 'tell
          #:text
          "The clerk tells you as politely as she can that she's already here,
 so there's no need to ring the bell.\n"))