(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>))
\f
;;; Exits
(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>)
(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
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
- (msg-val (<-wait room (message-from message) 'get-name)))
+ (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
"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)))
(define final-text
(if occupant-names-string
- (string-append room-text occupant-names-string)
+ `(,@room-text
+ (p (i ,occupant-names-string)))
room-text))
- (<- room player-id 'tell
+ (<- player-id 'tell
#:text final-text))
(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)
(cond
(matching-object
(let ((obj-desc
- (msg-val (<-wait room matching-object 'get-desc
+ (mbody-val (<-wait matching-object 'get-desc
#:whos-looking (message-from message)))))
(if obj-desc
- (<- room (message-from message) 'tell
+ (<- (message-from message) 'tell
#:text (string-append obj-desc "\n"))
- (<- room (message-from message) 'tell
+ (<- (message-from message) 'tell
#:text (string-append %formless-desc "\n")))))
(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"))))
(if wait
<-wait
<-))
- (deliver-method room tell-me 'tell
+ (deliver-method tell-me 'tell
#:text text))
who-to-tell))
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (msg-val (<-wait room (message-from message)
- 'get-name)))
+ (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-val (<-wait room (message-from message)
- 'get-name)))
+ (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-val (<-wait room who-entered 'get-name)))
+ (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
projects / mudsync.git / blobdiff