X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=efb52d828e96efeda3c5d12e3ace6262f5f22b40;hp=c4305233672755dad1f35c50057de342ec40ae33;hb=701425bc611abaa8b4140942d995d5f32d24e2d7;hpb=50cd2aba8f13ec7aecb58a683aa55ae665cf83ab

diff --git a/mudsync/room.scm b/mudsync/room.scm
index c430523..efb52d8 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
@@ -72,26 +68,6 @@
    (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*))
-
 ;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
   ;; A list of <exit>
@@ -102,12 +78,22 @@
   (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)))
-
-(define-mhandler (room-cmd-go room message direct-obj)
+  (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
     (find
      (lambda (exit)
@@ -119,8 +105,7 @@
                          (dyn-ref room (slot-ref exit 'to))
                          #f))
   (define player-name
-    (message-ref (<-wait room (message-from message)
-                         'get-name) 'val))
+    (msg-val (<-wait room (message-from message) 'get-name)))
   (cond
    (exit
     ;; Set the player's new location
@@ -140,7 +125,7 @@
     (<- room (message-from message) 'tell
         #:text "You don't see any way to go there.\n"))))
 
-(define-mhandler (room-cmd-go-where room message)
+(define (room-cmd-go-where room message)
   (<- room (message-from message) 'tell
       #:text "Go where?\n"))
 
@@ -175,10 +160,10 @@
   (define occupant-names-all
     (map
      (lambda (occupant)
-       (message-ref
-        (<-wait room occupant 'visible-name
-                #:whos-looking player-id)
-        'text))
+       (call-with-message (<-wait room occupant 'visible-name
+                                  #:whos-looking player-id)
+                          (lambda* (_ #:key text)
+                            text)))
      (remove
       (lambda (x) (equal? x player-id))
       (hash-map->list (lambda (x _) x)
@@ -204,14 +189,12 @@
       #:text final-text))
 
 
-(define-mhandler (room-look-room room message)
+(define* (room-look-room room message
+                            ;; Either send it to the #:to-id of the message,
+                            ;; or to the sender of the message
+                            #:key (to-id (message-from message)))
   "Command: Player asks to look around the room"
-  (room-player-looks-around
-   room
-   ;; Either send it to the #:to-id of the message, or to the
-   ;; sender of the message
-   (message-ref message 'to-id
-                (message-from message))))
+  (room-player-looks-around room to-id))
 
 (define (room-find-thing-called room called-this)
   "Find something called CALLED-THIS in the room, if any."
@@ -219,11 +202,10 @@
    (lambda (return)
      (for-each
       (lambda (occupant)
-        (define goes-by
-          (message-ref (<-wait room occupant 'goes-by)
-                       'goes-by #f))
-        (if (member called-this goes-by)
-            (return occupant)))
+        (msg-receive (_ #:key goes-by)
+            (<-wait room occupant 'goes-by)
+          (if (member called-this goes-by)
+              (return occupant))))
       (hash-map->list (lambda (key val) key)
                       (slot-ref room 'occupants)))
      #f)))
@@ -231,7 +213,7 @@
 (define %formless-desc
   "You don't see anything special.")
 
-(define-mhandler (room-look-at room message direct-obj)
+(define* (room-look-at room message #:key direct-obj)
   "Look at a specific object in the room."
   (define matching-object
     (room-find-thing-called room direct-obj))
@@ -239,10 +221,8 @@
   (cond
    (matching-object
     (let ((obj-desc
-           (message-ref
-            (<-wait room matching-object 'get-desc
-                    #:whos-looking (message-from message))
-            'val)))
+           (msg-val (<-wait room matching-object 'get-desc
+                            #:whos-looking (message-from message)))))
       (if obj-desc
           (<- room (message-from message) 'tell
               #:text (string-append obj-desc "\n"))
@@ -266,36 +246,33 @@
                      #:text text))
    who-to-tell))
 
-(define-mhandler (room-act-tell-room room message text)
+(define* (room-act-tell-room room message #:key text exclude wait)
   "Tell the room some messages."
-  (define exclude (message-ref message 'exclude #f))
-  (define wait-delivery (message-ref message 'wait #f))
   (room-tell-room room text
                   #:exclude exclude
-                  #:wait wait-delivery))
+                  #:wait wait))
 
-(define-mhandler (room-cmd-say room message phrase)
+(define* (room-cmd-say room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (message-ref (<-wait room (message-from message)
-                         'get-name) 'val))
+    (msg-val (<-wait room (message-from message)
+                     'get-name)))
   (define message-to-send
     (format #f "~a says: ~a\n" player-name phrase))
   (room-tell-room room message-to-send))
 
-(define-mhandler (room-cmd-emote room message phrase)
+(define* (room-cmd-emote room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (message-ref (<-wait room (message-from message)
-                         'get-name) 'val))
+    (msg-val (<-wait room (message-from message)
+                     'get-name)))
   (define message-to-send
     (format #f "* ~a ~a\n" player-name phrase))
   (room-tell-room room message-to-send))
 
-(define-mhandler (room-announce-entrance room message who-entered)
+(define* (room-announce-entrance room message #:key who-entered)
   (define player-name
-    (message-ref (<-wait room who-entered 'get-name)
-                 'val))
+    (msg-val (<-wait room who-entered 'get-name)))
   (define message-to-send
     (format #f "~a enters the room.\n" player-name))
   (room-tell-room room message-to-send