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

diff --git a/mudsync/room.scm b/mudsync/room.scm
index aee0636..efc2a38 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -147,14 +147,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"