X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=c1e853689d81422e46fa07c5870bfdc7b9dacf70;hp=2c19788034c3485245553e84278ac13490ac7efa;hb=bbf45570e7dfe20e132cc8e4601ccbf2de667ff3;hpb=6cff5b0062ef928204295ab4327bf2d417070421

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 2c19788..c1e8536 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -19,16 +19,12 @@
 (define-module (mudsync room)
   #:use-module (mudsync command)
   #:use-module (mudsync gameobj)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 control)
-  #:export (<room>
-            room-actions
-            room-actions*
-
-            <exit>))
+  #:export (<room> <exit>))
 
 
 ;;; Exits
@@ -70,27 +66,10 @@
    (empty-command "go" 'cmd-go-where)
    (loose-direct-command "go" 'cmd-go)
    (greedy-command "say" 'cmd-say)
-   (greedy-command "emote" 'cmd-emote)))
-
-(define room-actions
-  (build-actions
-   (cmd-go (wrap-apply room-cmd-go))
-   (cmd-go-where (wrap-apply room-cmd-go-where))
-   (announce-entrance (wrap-apply room-announce-entrance))
-   (look-room (wrap-apply room-look-room))
-   (tell-room (wrap-apply room-act-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-at (wrap-apply room-look-at))
-   (cmd-say (wrap-apply room-cmd-say))
-   (cmd-emote (wrap-apply room-cmd-emote))))
-
-(define room-actions*
-  (append room-actions gameobj-actions))
-
-(define room-action-dispatch
-  (simple-dispatcher room-actions*))
+   (greedy-command "\"" 'cmd-say)
+   (greedy-command "'" 'cmd-say)
+   (greedy-command "emote" 'cmd-emote)
+   (greedy-command "/me" 'cmd-emote)))
 
 ;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
@@ -102,10 +81,20 @@
   (container-commands
    #:init-value (wrap %room-contain-commands))
 
-  (message-handler
-   #:allocation #:each-subclass
-   ;; @@: Can remove this indirection once things settle
-   #:init-value (wrap-apply room-action-dispatch)))
+  (actions #:allocation #:each-subclass
+           #:init-value
+           (build-actions
+            (cmd-go room-cmd-go)
+            (cmd-go-where room-cmd-go-where)
+            (announce-entrance room-announce-entrance)
+            (look-room room-look-room)
+            (tell-room room-act-tell-room)
+            ;; in this case the command is the same version as the normal
+            ;; look-room version
+            (cmd-look-room room-look-room)
+            (cmd-look-at room-look-at)
+            (cmd-say room-cmd-say)
+            (cmd-emote room-cmd-emote))))
 
 (define* (room-cmd-go room message #:key direct-obj)
   (define exit
@@ -119,64 +108,44 @@
                          (dyn-ref room (slot-ref exit 'to))
                          #f))
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message) 'get-name)
-      val))
+    (mbody-val (<-wait (message-from message) 'get-name)))
   (cond
    (exit
     ;; Set the player's new location
-    (<-wait room (message-from message) 'set-loc!
+    (<-wait (message-from message) 'set-loc!
             #:loc to-address)
     ;; Tell everyone else the person walked away
     (room-tell-room
      room
      (format #f "~a wanders ~a.\n"
              player-name direct-obj))
-    (<- room to-address 'announce-entrance
+    (<- to-address 'announce-entrance
         #:who-entered (message-from message))
     ;; Have the new room update the player to the new location
-    (<- room to-address 'look-room
+    (<- to-address 'look-room
         #:to-id (message-from message)))
    (else
-    (<- room (message-from message) 'tell
+    (<- (message-from message) 'tell
         #:text "You don't see any way to go there.\n"))))
 
 (define (room-cmd-go-where room message)
-  (<- room (message-from message) 'tell
+  (<- (message-from message) 'tell
       #:text "Go where?\n"))
 
 ;;; 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)))
+    `((strong "=> " ,(slot-ref room 'name) " <=")
+      (p ,(slot-ref room 'desc))))
 
   ;; Get a list of other things the player would see in the room
   (define occupant-names-all
     (map
      (lambda (occupant)
-       (call-with-message (<-wait room occupant 'visible-name
+       (call-with-message (<-wait occupant 'visible-name
                                   #:whos-looking player-id)
                           (lambda* (_ #:key text)
                             text)))
@@ -194,14 +163,16 @@
     (if (eq? occupant-names-filtered '())
         #f
         (format #f "You see here: ~a.\n"
-                (list-words-as-string occupant-names-filtered))))
+                (string-join occupant-names-filtered
+                             ", "))))
 
   (define final-text
     (if occupant-names-string
-        (string-append room-text occupant-names-string)
+        `(,@room-text
+          (p (em ,occupant-names-string)))
         room-text))
   
-  (<- room player-id 'tell
+  (<- player-id 'tell
       #:text final-text))
 
 
@@ -218,8 +189,8 @@
    (lambda (return)
      (for-each
       (lambda (occupant)
-        (msg-receive (_ #:key goes-by)
-            (<-wait room occupant 'goes-by)
+        (mbody-receive (_ #:key goes-by)
+            (<-wait occupant 'goes-by)
           (if (member called-this goes-by)
               (return occupant))))
       (hash-map->list (lambda (key val) key)
@@ -237,17 +208,13 @@
   (cond
    (matching-object
     (let ((obj-desc
-           (msg-receive (_ #:key val)
-               (<-wait room matching-object 'get-desc
-                       #:whos-looking (message-from message))
-             val)))
+           (mbody-val (<-wait matching-object 'get-desc
+                            #:whos-looking (message-from message)))))
       (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")))))
+          (<- (message-from message) 'tell #:text obj-desc)
+          (<- (message-from message) 'tell #:text %formless-desc))))
    (else
-    (<- room (message-from message) 'tell
+    (<- (message-from message) 'tell
         #:text "You don't see that here, so you can't look at it.\n"))))
 
 
@@ -260,7 +227,7 @@
        (if wait
            <-wait
            <-))
-     (deliver-method room tell-me 'tell
+     (deliver-method tell-me 'tell
                      #:text text))
    who-to-tell))
 
@@ -273,30 +240,22 @@
 (define* (room-cmd-say room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message)
-                'get-name)
-      val))
+    (mbody-val (<-wait (message-from message) 'get-name)))
   (define message-to-send
-    (format #f "~a says: ~a\n" player-name phrase))
+    `((b "<" ,player-name ">") " " ,phrase))
   (room-tell-room room message-to-send))
 
 (define* (room-cmd-emote room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message)
-                'get-name)
-      val))
+    (mbody-val (<-wait (message-from message) 'get-name)))
   (define message-to-send
-    (format #f "* ~a ~a\n" player-name phrase))
+    `((b "* " ,player-name) " " ,phrase))
   (room-tell-room room message-to-send))
 
 (define* (room-announce-entrance room message #:key who-entered)
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room who-entered 'get-name)
-      val))
+    (mbody-val (<-wait who-entered 'get-name)))
   (define message-to-send
     (format #f "~a enters the room.\n" player-name))
   (room-tell-room room message-to-send