(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
;;; =====
(define-class <exit> ()
- ;; Used for wiring
- (to-symbol #:init-keyword #:to-symbol)
- ;; The actual address we use
- (to-address #:init-keyword #:address)
+ (to #:init-keyword #:to)
;; Name of the room (@@: Should this be names?)
(name #:getter exit-name
#:init-keyword #:name)
(empty-command "look" 'cmd-look-room)
(empty-command "go" 'cmd-go-where)
(loose-direct-command "go" 'cmd-go)
- (greedy-command "say" 'cmd-say)))
-
-(define room-actions
- (build-actions
- ;; desc == description
- (init (wrap-apply room-init))
- (wire-exits! (wrap-apply room-wire-exits!))
- (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))))
-
-(define room-actions*
- (append room-actions gameobj-actions))
-
-(define room-action-dispatch
- (simple-dispatcher room-actions*))
+ (greedy-command "say" 'cmd-say)
+ (greedy-command "emote" '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)))
-
-(define (room-init room message)
- (room-wire-exits! room))
-
-(define (room-wire-exits! room)
- "Actually hook up the rooms' exit addresses to the rooms they
-claim to point to."
- (for-each
- (lambda (exit)
- (define new-exit
- (message-ref
- (<-wait room (gameobj-gm room) 'lookup-special
- #:symbol (slot-ref exit 'to-symbol))
- 'room-id))
-
- (slot-set! exit 'to-address new-exit))
-
- (room-exits room)))
-
-(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)
(equal? (exit-name exit) direct-obj))
(room-exits room)))
- (define to-address (slot-ref exit 'to-address))
+ (define to-address (if exit
+ ;; Get the exit, but resolve it dynamically
+ ;; in case it's a special
+ (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
(<- room to-address 'announce-entrance
#:who-entered (message-from message))
;; Have the new room update the player to the new location
- (<- room (slot-ref exit 'to-address) 'look-room
+ (<- room to-address 'look-room
#:to-id (message-from message)))
(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)
+(define (room-cmd-go-where room message)
(<- room (message-from message) 'tell
#:text "Go where?\n"))
(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)
#: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."
(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)))
(define %formless-desc
- "You don't see anything special about it.")
+ "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))
(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"))
#: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-announce-entrance room message who-entered)
+(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)))
+ (define message-to-send
+ (format #f "* ~a ~a\n" player-name phrase))
+ (room-tell-room room message-to-send))
+
+(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
projects / mudsync.git / blobdiff