;;; Mudsync --- Live hackable MUD
-;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of Mudsync.
;;;
#:player-id (actor-id player)))))
;; Ask the room for its commands
- (define room-commands
+ (define room-dom-commands
;; TODO: Map room id and sort
(mbody-receive (_ #:key commands)
- (<-wait player-loc 'get-container-commands
+ (<-wait player-loc 'get-container-dom-commands
+ #:verb verb)
+ commands))
+
+ (define room-sub-commands
+ ;; TODO: Map room id and sort
+ (mbody-receive (_ #:key commands)
+ (<-wait player-loc 'get-container-sub-commands
#:verb verb)
commands))
;; Now return a big ol sorted list of ((actor-id . command))
(append
- (sort-commands-append-actor room-commands
+ (sort-commands-append-actor room-dom-commands
player-loc '()) ; room doesn't go by anything
(sort-commands-multi-actors co-occupant-commands)
(sort-commands-append-actor our-commands
(actor-id player) '()) ; nor does player
- (sort-commands-multi-actors inv-item-commands)))
+ (sort-commands-multi-actors inv-item-commands)
+ (sort-commands-append-actor room-sub-commands
+ player-loc '())))
(define (sort-commands-append-actor commands actor-id goes-by)
(sort-commands-multi-actors