(define-module (mudsync room)
#:use-module (mudsync command)
#:use-module (mudsync gameobj)
+ #:use-module (mudsync utils)
#:use-module (8sync actors)
#:use-module (8sync agenda)
#:use-module (oop goops)
;;; Rooms
;;; =====
-(define %room-contain-commands
- (list
- (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)
- (greedy-command "say" 'cmd-say)
- (greedy-command "emote" 'cmd-emote)))
-
;; TODO: Subclass from container?
(define-class <room> (<gameobj>)
;; A list of <exit>
#:init-keyword #:exits
#:getter room-exits)
- (container-commands
- #:init-value (wrap %room-contain-commands))
+ (container-dom-commands
+ #:allocation #:each-subclass
+ #:init-thunk
+ (build-commands
+ (("l" "look") ((empty-command cmd-look-room)))
+ ("go" ((empty-command cmd-go-where)
+ (loose-direct-command cmd-go)))
+ (("say" "\"" "'") ((greedy-command cmd-say)))
+ (("emote" "/me") ((greedy-command cmd-emote)))))
+
+ (container-sub-commands
+ #:allocation #:each-subclass
+ #:init-thunk
+ (build-commands
+ (("l" "look") ((loose-direct-command cmd-look-at-from-room)))))
(actions #:allocation #:each-subclass
- #:init-value
+ #:init-thunk
(build-actions
(cmd-go room-cmd-go)
(cmd-go-where room-cmd-go-where)
;; 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-look-at-from-room room-look-dont-see-it)
(cmd-say room-cmd-say)
(cmd-emote room-cmd-emote))))
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
- (msg-val (<-wait (message-from message) 'get-name)))
+ (mbody-val (<-wait (message-from message) 'get-name)))
(cond
(exit
;; Set the player's new location
;;; look commands
-(define (list-words-as-string words)
- "A little utility for listing a bunch of words in an English-style list"
- ;; TODO: This could be made faster by traversing the O(n)
- ;; list once, not twice
- (let ((word-length (length words)))
- (cond
- ((eqv? word-length 0) "")
- ((eqv? word-length 1) (car words))
- (else
- ;; TODO: and this is NOT efficient
- (string-append
- (string-join
- (drop-right words 1)
- ", ")
- " and "
- (last words))))))
-
(define (room-player-looks-around room player-id)
"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
(if (eq? occupant-names-filtered '())
#f
(format #f "You see here: ~a.\n"
- (list-words-as-string occupant-names-filtered))))
+ (string-join occupant-names-filtered
+ ", "))))
(define final-text
(if occupant-names-string
- (string-append room-text occupant-names-string)
+ `(,@room-text
+ (p (em ,occupant-names-string)))
room-text))
(<- player-id 'tell
(lambda (return)
(for-each
(lambda (occupant)
- (msg-receive (_ #:key goes-by)
- (<-wait occupant 'goes-by)
- (if (member called-this goes-by)
- (return occupant))))
+ (define goes-by (mbody-val (<-wait occupant 'goes-by)))
+ (if (ci-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.")
-
-(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
- (msg-val (<-wait matching-object 'get-desc
- #:whos-looking (message-from message)))))
- (if obj-desc
- (<- (message-from message) 'tell
- #:text (string-append obj-desc "\n"))
- (<- (message-from message) 'tell
- #:text (string-append %formless-desc "\n")))))
- (else
- (<- (message-from message) 'tell
- #:text "You don't see that here, so you can't look at it.\n"))))
+(define* (room-look-dont-see-it room message #:key direct-obj)
+ "In general, if we get to this point, we didn't find something to look at."
+ (<- (message-from message) 'tell
+ #:text "You don't see that here, so you can't look at it.\n"))
(define* (room-tell-room room text #:key exclude wait)
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (msg-val (<-wait (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 (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 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