You can now look at things

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index aee0636ab4c817c6e9c985d18c6bee1ef2b888e9..a84550d630c726f7e6588d63a740d4d07bfed0ef 100644 (file)
--- 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*
@@ -82,7 +83,8 @@
    (look-room (wrap-apply room-look-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))
@@ -147,14 +149,63 @@ claim to point to."
 
 ;;; look commands
 
+(define (list-words-as-string words)
+  "A little utility for listing a bunch of words in an English-style list"
+  ;; TODO: This could be made faster by traversing the O(n)
+  ;;   list once, not twice
+  (let ((word-length (length words)))
+    (cond 
+     ((eqv? word-length 0) "")
+     ((eqv? word-length 1) (car words))
+     (else
+      ;; TODO: and this is NOT efficient
+      (string-append
+       (string-join
+        (drop-right words 1)
+        ", ")
+       " and "
+       (last words))))))
+
 (define (room-player-looks-around room player-id)
   "Handle looking around the room"
+  ;; Get the room text
   (define room-text
     (format #f "**~a**\n~a\n"
             (slot-ref room 'name)
             (slot-ref room 'desc)))
+
+  ;; Get a list of other things the player would see in the room
+  (define occupant-names-all
+    (map
+     (lambda (occupant)
+       (message-ref
+        (<-wait room occupant 'visible-name
+                #:whos-looking player-id)
+        'text))
+     (remove
+      (lambda (x) (equal? x player-id))
+      (hash-map->list (lambda (x _) x)
+                      (slot-ref room 'occupants)))))
+
+  ;; Strip out the #f responses (these aren't listed because they lack a name
+  ;; or they aren't "obviously visible" to the player)
+  (define occupant-names-filtered
+    (filter identity occupant-names-all))
+
+  (define occupant-names-string
+    (if (eq? occupant-names-filtered '())
+        #f
+        (format #f "You see here: ~a.\n"
+                (list-words-as-string occupant-names-filtered))))
+
+  (define final-text
+    (if occupant-names-string
+        (string-append room-text occupant-names-string)
+        room-text))
+  
   (<- room player-id 'tell
-      #:text room-text))
+      #:text final-text))
+
 
 (define-mhandler (room-look-room room message)
   "Command: Player asks to look around the room"
@@ -164,3 +215,42 @@ 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)
+            '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"))))