X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=mudsync%2Froom.scm;h=4e5fd9e9e23909303b0fba8cbeed342bbe2741cc;hb=8c357c87019a70aabdfadb4c71e3b063251cff87;hp=09ebdcbc0db8531802edf22e6e56d69ea702befa;hpb=060a48dce227e8c53e007941cc673b494ca36024;p=mudsync.git
diff --git a/mudsync/room.scm b/mudsync/room.scm
index 09ebdcb..4e5fd9e 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -17,17 +17,20 @@
;;; along with Mudsync. If not, see .
(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-actions
room-actions*
))
-;;; Rooms
+
+;;; Exits
;;; =====
(define-class ()
@@ -60,37 +63,24 @@
((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)
+ (loose-direct-command "go" 'cmd-go)))
;; TODO: Subclass from container?
(define-class ()
;; A list of
(exits #:init-value '()
+ #:init-keyword #:exits
#:getter room-exits)
- (contain-commands
+ (container-commands
#:init-value %room-contain-commands)
(message-handler
@@ -102,7 +92,8 @@
(define room-actions
(build-actions
;; desc == description
- (wire-exits! (wrap-apply room-wire-exits!))))
+ (wire-exits! (wrap-apply room-wire-exits!))
+ (cmd-go (wrap-apply room-cmd-go))))
(define room-actions*
(append room-actions gameobj-actions))
@@ -124,3 +115,15 @@ claim to point to."
(room-exits room)))
+(define-mhandler (room-cmd-go room message direct-obj)
+ (define exit
+ (find
+ (lambda (exit)
+ (equal? (exit-name exit) direct-obj))
+ (pk 'later-exits (room-exits room))))
+ (if exit
+ (<- room (message-from message) 'tell
+ #:text "Yeah you can go there...\n")
+ (<- room (message-from message) 'tell
+ #:text "I don't know where that is?\n")))
+