X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=2e1b99fcdf1d8f94e4712e36736db572e42bb7e3;hp=09ebdcbc0db8531802edf22e6e56d69ea702befa;hb=4ea75c3db75e83c8133e2833d0ad7820aacc30b7;hpb=060a48dce227e8c53e007941cc673b494ca36024

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 09ebdcb..2e1b99f 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -17,31 +17,32 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync room)
+  #:use-module (mudsync command)
   #:use-module (mudsync gameobj)
   #:use-module (8sync systems actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
+  #:use-module (srfi srfi-1)
   #:export (<room>
             room-actions
             room-actions*
 
             <exit>))
 
-;;; Rooms
+
+;;; Exits
 ;;; =====
 
 (define-class <exit> ()
   ;; Used for wiring
-  (to-symbol #:accessor exit-to-symbol
-             #:init-keyword #:to-symbol)
+  (to-symbol #:init-keyword #:to-symbol)
   ;; The actual address we use
-  (to-address #:accessor exit-to-address
-              #:init-keyword #:address)
+  (to-address #:init-keyword #:address)
   ;; Name of the room (@@: Should this be names?)
-  (name #:accessor exit-name
+  (name #:getter exit-name
         #:init-keyword #:name)
-  (desc #:accessor exit-desc
-               #:init-keyword #:desc)
+  (desc #:init-keyword #:desc
+        #:init-value #f)
 
   ;; *Note*: These two methods have an extra layer of indirection, but
   ;;   it's for a good reason.
@@ -60,38 +61,40 @@
   ((slot-ref exit 'traverse-check) exit actor target-actor))
 
 
-;; Kind of a useful utility, maybe?
-(define (simple-slot-getter slot)
-  (lambda (actor message)
-    (reply-message actor message
-                   #:val (slot-ref actor slot))))
-
-(define always (const #t))
-
-;; TODO: remove hack
-(define full-command list)
-
-;; TODO: fill these in
-(define cmatch-just-verb #f)
-(define cmatch-direct-verb #f)
-(define cmatch-direct-obj #f)
+
+;;; Rooms
+;;; =====
 
 (define %room-contain-commands
   (list
-   (full-command "look" cmatch-just-verb always 'look-room)
-   (full-command "look" cmatch-direct-obj always 'look-member)
-   (full-command "go" cmatch-just-verb always 'go-where)
-   (full-command "go" cmatch-direct-obj always 'go-exit)))
+   (loose-direct-command "look" 'cmd-look-at)
+   (empty-command "look" 'cmd-look-room)
+   (empty-command "go" 'cmd-go-where)
+   (loose-direct-command "go" 'cmd-go)))
+
+(define room-actions
+  (build-actions
+   ;; desc == description
+   (wire-exits! (wrap-apply room-wire-exits!))
+   (cmd-go (wrap-apply room-cmd-go))
+   (cmd-go-where (wrap-apply room-cmd-go-where))
+   (cmd-look-room (wrap-apply room-cmd-look-room))))
+
+(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>
   (exits #:init-value '()
+         #:init-keyword #:exits
          #:getter room-exits)
 
-  (contain-commands
-   #:init-value %room-contain-commands)
+  (container-commands
+   #:init-value (wrap %room-contain-commands))
 
   (message-handler
    #:allocation #:each-subclass
@@ -99,28 +102,39 @@
    #:init-value (wrap-apply room-action-dispatch)))
 
 
-(define room-actions
-  (build-actions
-   ;; desc == description
-   (wire-exits! (wrap-apply room-wire-exits!))))
-
-(define room-actions*
-  (append room-actions gameobj-actions))
-
-(define room-action-dispatch
-  (simple-dispatcher room-actions*))
-
-
 (define (room-wire-exits! room message)
   "Actually hook up the rooms' exit addresses to the rooms they
 claim to point to."
   (for-each
    (lambda (exit)
      (define new-exit
-       (<-wait room (gameobj-gm room) 'lookup-room
-               #:symbol (exit-to-symbol exit)))
+       (message-ref
+        (<-wait room (gameobj-gm room) 'lookup-room
+                #:symbol (slot-ref exit 'to-symbol))
+        'room-id))
 
-     (set! (exit-to-address exit) new-exit))
+     (slot-set! exit 'to-address new-exit))
 
    (room-exits room)))
 
+(define-mhandler (room-cmd-go room message direct-obj)
+  (define exit
+    (find
+     (lambda (exit)
+       (equal? (exit-name exit) direct-obj))
+     (room-exits room)))
+  (cond
+   (exit
+    (<-wait room (message-from message) 'set-loc!
+            #:loc (slot-ref exit 'to-address))
+    (<- room (message-from message) 'look-room))
+   (else
+    (<- room (message-from message) 'tell
+        #:text "You don't see any way to go there.\n"))))
+
+(define-mhandler (room-cmd-go-where room message)
+  (<- room (message-from message) 'tell
+      #:text "Go where?\n"))
+
+(define-mhandler (room-cmd-look-room room message)
+  (<- room (message-from message) 'look-room))