Update to use build-actions; fix clerk communication

diff --git a/mudsync.scm b/mudsync.scm
index a3caaa17d8f30b85f998234853433d2fca7b17e1..15f4c862ad18d7ead1d2339c0f8b7cb3a284035d 100644 (file)
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -18,7 +18,7 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)

diff --git a/mudsync/command.scm b/mudsync/command.scm
index 8672d35c70e1222116925d7a06ab5f1e065b92b1..765962ce28dcd88defa2efbfe814f029bb5440c9 100644 (file)
--- a/mudsync/command.scm
+++ b/mudsync/command.scm
@@ -18,7 +18,7 @@
 
 (define-module (mudsync command)
   #:use-module (mudsync parser)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (ice-9 control)

diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index b8030d9d72a4f2114183576683561909e726fd1c..b11d21cff800e1955a730c97e196c13b55ca8c2d 100644 (file)
--- a/mudsync/game-master.scm
+++ b/mudsync/game-master.scm
@@ -18,7 +18,7 @@
 
 (define-module (mudsync game-master)
   #:use-module (mudsync networking)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:use-module (ice-9 match)
@@ -52,7 +52,7 @@
   (actions
    #:allocation #:each-subclass
    #:init-value
-   (mhandlers
+   (build-actions
     (init-world gm-init-world)
     (client-input gm-handle-client-input)
     (lookup-special gm-lookup-special)

diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm
index 3bb743ac5101e09182c0c5e6020c931d73394e10..07b3ddbc728957e33fe5b68bafb5efdbd40a5349 100644 (file)
--- a/mudsync/gameobj.scm
+++ b/mudsync/gameobj.scm
@@ -21,7 +21,7 @@
 
 (define-module (mudsync gameobj)
   #:use-module (mudsync command)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 format)
@@ -94,7 +94,7 @@
   (actions #:allocation #:each-subclass
            ;;; Actions supported by all gameobj
            #:init-value
-           (mhandlers
+           (build-actions
             (init gameobj-act-init)
             ;; Commands for co-occupants
             (get-commands gameobj-get-commands)

diff --git a/mudsync/networking.scm b/mudsync/networking.scm
index 4714556b4427595ec1e1b1ee2694880bd5be8bd2..c2c1068aedf8d3dbc50a61c56bca34b82e1377dd 100644 (file)
--- a/mudsync/networking.scm
+++ b/mudsync/networking.scm
@@ -17,7 +17,7 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync networking)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
@@ -49,7 +49,7 @@
   (actions
    #:allocation #:each-subclass
    #:init-value
-   (mhandlers
+   (build-actions
     (start-listening
      (lambda* (actor message
                      #:key (server %default-server)

diff --git a/mudsync/player.scm b/mudsync/player.scm
index 8bf75b2c0e9e59100ae2a8dd3dec465d7152674c..e3ae2ba8ffcee53cea6cef848d72216e5a74fbc4 100644 (file)
--- a/mudsync/player.scm
+++ b/mudsync/player.scm
@@ -21,7 +21,7 @@
   #:use-module (mudsync gameobj)
   #:use-module (mudsync game-master)
   #:use-module (mudsync parser)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (ice-9 control)
   #:use-module (ice-9 format)
@@ -51,7 +51,7 @@
 
   (actions #:allocation #:each-subclass
            #:init-value
-           (mhandlers
+           (build-actions
             (init player-init)
             (handle-input player-handle-input)
             (tell player-tell)

diff --git a/mudsync/room.scm b/mudsync/room.scm
index a3ebc65908212063e2d60b9a21d8f7afe30d60c6..efb52d828e96efeda3c5d12e3ace6262f5f22b40 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -19,7 +19,7 @@
 (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)
@@ -80,7 +80,7 @@
 
   (actions #:allocation #:each-subclass
            #:init-value
-           (mhandlers
+           (build-actions
             (cmd-go room-cmd-go)
             (cmd-go-where room-cmd-go-where)
             (announce-entrance room-announce-entrance)

diff --git a/mudsync/run-game.scm b/mudsync/run-game.scm
index 6bacfcd573d7de43fa01b542fede6a9487b1c4d6..95fedb0ec99c0fe37f7e172e0f9af5ef7826f821 100644 (file)
--- a/mudsync/run-game.scm
+++ b/mudsync/run-game.scm
@@ -20,8 +20,8 @@
   #:use-module (mudsync game-master)
   #:use-module (8sync agenda)
   #:use-module (8sync repl)
-  #:use-module (8sync systems actors)
-  #:use-module (8sync systems actors debug)
+  #:use-module (8sync actors)
+  #:use-module (8sync debug)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 receive)
   #:use-module (ice-9 q)

diff --git a/mudsync/thing.scm b/mudsync/thing.scm
index 212ad2e11c20963afa6f6c47c057afa561d3b4db..6963c01b985a2867f7fa89e89a12831ac50dfd70 100644 (file)
--- a/mudsync/thing.scm
+++ b/mudsync/thing.scm
@@ -21,7 +21,7 @@
 (define-module (mudsync thing)
   #: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 (ice-9 match)
@@ -63,7 +63,7 @@
    #:init-value (wrap thing-contained-commands))
   (actions #:allocation #:each-subclass
            #:init-value
-           (mhandlers
+           (build-actions
             (cmd-take thing-cmd-take)
             (cmd-drop thing-cmd-drop))))
 

diff --git a/worlds/bricabrac.scm b/worlds/bricabrac.scm
index e5392aaa428222699a8012e7046e48c76545d20a..daf63539ab8dadc8663fbdb47755d40d775b2c85 100644 (file)
--- a/worlds/bricabrac.scm
+++ b/worlds/bricabrac.scm
@@ -20,7 +20,7 @@
 
 (use-modules (mudsync)
              (mudsync parser)
-             (8sync systems actors)
+             (8sync actors)
              (8sync agenda)
              (oop goops)
              (ice-9 control)
@@ -60,7 +60,7 @@
   (commands
    #:init-value readable-commands*)
   (actions #:allocation #:each-subclass
-           #:init-value (mhandlers
+           #:init-value (build-actions
                          (cmd-read readable-cmd-read))))
 
 (define (readable-cmd-read actor message)
@@ -108,7 +108,7 @@ or 'skribe'?  Now *that's* composition!"))
    #:init-value chat-commands)
   (actions #:allocation #:each-subclass
            #:init-value
-           (mhandlers
+           (build-actions
             (cmd-chat npc-chat-randomly))))
 
 (define random-bricabrac
@@ -128,7 +128,7 @@ or 'skribe'?  Now *that's* composition!"))
     (prep-direct-command "sign" 'cmd-sign-form
                          '("as"))))
   (actions #:allocation #:each-subclass
-           #:init-value (mhandlers
+           #:init-value (build-actions
                          (cmd-sign-form sign-cmd-sign-in))))
 
 
@@ -173,7 +173,7 @@ character.\n")))
   (commands
    #:init-value summoning-bell-commands*)
   (actions #:allocation #:each-subclass
-           #:init-value (mhandlers
+           #:init-value (build-actions
                          (cmd-ring summoning-bell-cmd-ring))))
 
 (define* (summoning-bell-cmd-ring bell message . _)
@@ -385,7 +385,7 @@ if this room is intended for children or child-like adults."
    (list
     (direct-command "sit" 'cmd-sit-furniture)))
   (actions #:allocation #:each-subclass
-           #:init-value (mhandlers
+           #:init-value (build-actions
                          (cmd-sit-furniture furniture-cmd-sit))))
 
 (define* (furniture-cmd-sit actor message #:key direct-obj)
@@ -484,7 +484,7 @@ seat in the room, though."
   (commands #:init-value clerk-commands*)
   (patience #:init-value 0)
   (actions #:allocation #:each-subclass
-           #:init-value (mhandlers
+           #:init-value (build-actions
                          (init clerk-act-init)
                          (cmd-chat clerk-cmd-chat)
                          (cmd-ask-incomplete clerk-cmd-ask-incomplete)
@@ -555,7 +555,8 @@ with tuition at where it is..."))
 (define clerk-doesnt-know-text
   "The clerk apologizes and says she doesn't know about that topic.\n")
 
-(define (clerk-cmd-ask clerk message indir-obj)
+(define* (clerk-cmd-ask clerk message #:key indir-obj
+                        #:allow-other-keys)
   (match (slot-ref clerk 'state)
     ('on-duty
      (match (assoc (pk 'indir indir-obj) clerk-help-topics)

diff --git a/worlds/goblin-hq.scm b/worlds/goblin-hq.scm
index 0e1de7e91cf2105f831e47345c26cf2bd8102150..3330a104ca116e288ba35815bef131fea92059bc 100644 (file)
--- a/worlds/goblin-hq.scm
+++ b/worlds/goblin-hq.scm
@@ -17,7 +17,7 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (mudsync)
-             (8sync systems actors)
+             (8sync actors)
              (8sync agenda)
              (oop goops)
              (ice-9 format))