X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=0b0e10108411c0aa1086cfd682a346c51149e43c;hp=efc2a380e9b2ea13436c1207cd51737b7cdd6ace;hb=902b52f87ea65d6a52cb84afee32ad20d89b2bc3;hpb=582ae7c4ffaddad629c53750b80c807745489b37

diff --git a/mudsync/room.scm b/mudsync/room.scm
index efc2a38..0b0e101 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -23,6 +23,7 @@
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 control)
   #:export (<room>
             room-actions
             room-actions*
@@ -70,7 +71,9 @@
    (loose-direct-command "look" 'cmd-look-at)
    (empty-command "look" 'cmd-look-room)
    (empty-command "go" 'cmd-go-where)
-   (loose-direct-command "go" 'cmd-go)))
+   (loose-direct-command "go" 'cmd-go)
+   ;; (greedy-command "say" 'cmd-say)
+   ))
 
 (define room-actions
   (build-actions
@@ -80,9 +83,11 @@
    (cmd-go (wrap-apply room-cmd-go))
    (cmd-go-where (wrap-apply room-cmd-go-where))
    (look-room (wrap-apply room-look-room))
+   (tell-room (wrap-apply room-tell-room))
    ;; in this case the command is the same version as the normal
    ;; look-room version
-   (cmd-look-room (wrap-apply room-look-room))))
+   (cmd-look-room (wrap-apply room-look-room))
+   (cmd-look-at (wrap-apply room-look-at))))
 
 (define room-actions*
   (append room-actions gameobj-actions))
@@ -213,3 +218,59 @@ claim to point to."
    ;; sender of the message
    (message-ref message 'to-id
                 (message-from message))))
+
+(define (room-find-thing-called room called-this)
+  "Find something called CALLED-THIS in the room, if any."
+  (call/ec
+   (lambda (return)
+     (for-each
+      (lambda (occupant)
+        (define goes-by
+          (message-ref (<-wait room occupant 'goes-by)
+                       'goes-by #f))
+        (display "here!\n")
+        (if (member called-this goes-by)
+            (return occupant)))
+      (hash-map->list (lambda (key val) key)
+                      (slot-ref room 'occupants)))
+     #f)))
+
+(define %formless-desc
+  "You don't see anything special about it.")
+
+(define-mhandler (room-look-at room message direct-obj)
+  "Look at a specific object in the room."
+  (define matching-object
+    (room-find-thing-called room direct-obj))
+
+  (cond
+   (matching-object
+    (let ((obj-desc
+           (message-ref
+            (<-wait room matching-object 'get-desc
+                    #:whos-looking (message-from message))
+            'val)))
+      (if obj-desc
+          (<- room (message-from message) 'tell
+              #:text (string-append obj-desc "\n"))
+          (<- room (message-from message) 'tell
+              #:text (string-append %formless-desc "\n")))))
+   (else
+    (<- room (message-from message) 'tell
+        #:text "You don't see that here, so you can't look at it.\n"))))
+
+(define-mhandler (room-tell-room room message text)
+  "Tell the room some messages."
+  (define exclude (message-ref message 'exclude #f))
+  (define wait-delivery (message-ref message 'wait-delivery #f))
+  (define who-to-tell (gameobj-occupants room #:exclude exclude))
+  (for-each
+   (lambda (tell-me)
+     ;; @@: Does anything really care?
+     (define deliver-method
+       (if wait-delivery
+           <-wait
+           <-))
+     (deliver-method room tell-me 'tell
+                     #:text text))
+   who-to-tell))