;;; 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.
;;;
(define-module (mudsync command)
#:use-module (mudsync parser)
+ #:use-module (mudsync utils)
#:use-module (8sync actors)
#:use-module (8sync rmeta-slot)
#:use-module (srfi srfi-1)
...))))))
(define-syntax-rule (build-commands (verb-or-verbs cmd-defs ...) ...)
- (wrap-rmeta-slot
+ (build-rmeta-slot
(append (%build-command verb-or-verbs cmd-defs ...) ...)))
;; @@: Should we allow fancier matching than this?
;; Let the actor itself pass along this whole method?
(lambda* (goes-by #:key direct-obj)
- (member direct-obj goes-by))
+ (ci-member direct-obj goes-by))
action
%default-priority
obvious?))
(lambda* (goes-by #:key direct-obj indir-obj preposition)
(if prepositions
(and
- (member indir-obj goes-by)
- (member preposition prepositions))
- (member indir-obj goes-by)))
+ (ci-member indir-obj goes-by)
+ (ci-member preposition prepositions))
+ (ci-member indir-obj goes-by)))
action
%high-priority
obvious?))
(lambda* (goes-by #:key direct-obj indir-obj preposition)
(if prepositions
(and
- (member direct-obj goes-by)
- (member preposition prepositions))
- (member direct-obj goes-by)))
+ (ci-member direct-obj goes-by)
+ (ci-member preposition prepositions))
+ (ci-member direct-obj goes-by)))
action
%high-priority
obvious?))
(make-command verbs
cmatch-direct-obj-greedy
(lambda* (goes-by #:key direct-obj rest)
- (member direct-obj goes-by))
+ (ci-member direct-obj goes-by))
action
%low-priority
obvious?))