(define-module (mudsync gameobj)
#:use-module (mudsync command)
#:use-module (mudsync utils)
+ #:use-module (mudsync receive-star)
#:use-module (8sync actors)
#:use-module (8sync agenda)
#:use-module (8sync rmeta-slot)
(tell gameobj-tell-no-op)
(assist-replace gameobj-act-assist-replace)
(ok-to-drop-here? (lambda (gameobj message . _)
- (<-reply message #t))) ; ok to drop by default
+ #t)) ; ok to drop by default
(ok-to-be-taken-from? gameobj-ok-to-be-taken-from)
(ok-to-be-put-in? gameobj-ok-to-be-put-in)
(define (create-gameobj class gm loc . args)
"Create a gameobj of CLASS with GM and set to location LOC, applying rest of ARGS.
Note that this doesn't do any special dyn-ref of the location."
- (let ((new-gameobj (apply create-actor (%current-actor) class
+ (let ((new-gameobj (apply create-actor class
#:gm gm args)))
;; Set the location
(<-wait new-gameobj 'set-loc! #:loc loc)
;; Kind of a useful utility, maybe?
(define (simple-slot-getter slot)
(lambda (actor message)
- (<-reply message (slot-ref actor slot))))
+ (slot-ref actor slot)))
(define (gameobj-replace-step-occupants actor occupants)
;; Snarf all the occupants!
(define (run-replacement actor replaces replace-steps)
(when replaces
- (mbody-receive (_ #:key occupants)
- (<-wait replaces 'assist-replace)
- (for-each
- (lambda (replace-step)
- (replace-step actor occupants))
- replace-steps))))
+ (call-with-values
+ (lambda ()
+ (<-wait replaces 'assist-replace))
+ (lambda* (#:key occupants)
+ (for-each
+ (lambda (replace-step)
+ (replace-step actor occupants))
+ replace-steps)))))
(define %nothing (cons '*the* '*nothing*))
(define (gameobj-setup-props gameobj)
(hashq-set! (slot-ref gameobj 'props) key val))
(define* (gameobj-act-get-prop actor message key #:optional dflt)
- (<-reply message (gameobj-get-prop actor key dflt)))
+ (gameobj-get-prop actor key dflt))
(define (gameobj-goes-by gameobj)
"Find the name we go by. Defaults to #:name if nothing else provided."
(define (gameobj-act-goes-by actor message)
"Reply to a message requesting what we go by."
- (<-reply message (gameobj-goes-by actor)))
+ (gameobj-goes-by actor))
(define (val-or-run val-or-proc)
"Evaluate if a procedure, or just return otherwise"
"Get commands a co-occupant of the room might execute for VERB"
(define candidate-commands
(get-candidate-commands actor 'commands verb))
- (<-reply message
- #:commands candidate-commands
- #:goes-by (gameobj-goes-by actor)))
+ (values #:commands candidate-commands
+ #:goes-by (gameobj-goes-by actor)))
(define* (gameobj-get-container-dom-commands actor message #:key verb)
"Get (dominant) commands as the container / room of message's sender"
(define candidate-commands
(get-candidate-commands actor 'container-dom-commands verb))
- (<-reply message #:commands candidate-commands))
+ (values #:commands candidate-commands))
(define* (gameobj-get-container-sub-commands actor message #:key verb)
"Get (subordinate) commands as the container / room of message's sender"
(define candidate-commands
(get-candidate-commands actor 'container-sub-commands verb))
- (<-reply message #:commands candidate-commands))
+ (values #:commands candidate-commands))
(define* (gameobj-get-contained-commands actor message #:key verb)
"Get commands as being contained (eg inventory) of commanding gameobj"
(define candidate-commands
(get-candidate-commands actor 'contained-commands verb))
- (<-reply message
- #:commands candidate-commands
- #:goes-by (gameobj-goes-by actor)))
+ (values #:commands candidate-commands
+ #:goes-by (gameobj-goes-by actor)))
(define* (gameobj-add-occupant! actor message #:key who)
"Add an actor to our list of present occupants"
(define* (gameobj-get-occupants actor message #:key exclude)
"Get all present occupants of the room."
- (define occupants
- (gameobj-occupants actor #:exclude exclude))
- (<-reply message occupants))
+ (gameobj-occupants actor #:exclude exclude))
(define (gameobj-act-get-loc actor message)
- (<-reply message (slot-ref actor 'loc)))
+ (slot-ref actor 'loc))
(define (gameobj-set-loc! gameobj loc)
"Set the location of this object."
(define* (gameobj-get-desc actor message #:key whos-looking)
"This is the action equivalent of the gameobj-desc getter"
- (<-reply message (gameobj-desc actor #:whos-looking whos-looking)))
+ (gameobj-desc actor #:whos-looking whos-looking))
(define (gameobj-visible-to-player? gameobj whos-looking)
"Check to see whether we're visible to the player or not.
name)
(#f #f))
#f))
- (<-reply message #:text name-to-return))
+ (values #:text name-to-return))
(define (gameobj-self-destruct gameobj)
"General gameobj self destruction routine"
;; But that's life in a live hacked game!
(define (gameobj-act-assist-replace gameobj message)
"Vanilla method for assisting in self-replacement for live hacking"
- (apply <-reply message
- (gameobj-replace-data* gameobj)))
+ (apply values (gameobj-replace-data* gameobj)))
(define (gameobj-ok-to-be-taken-from gameobj message whos-acting)
(call-with-values (lambda ()
(slot-ref-maybe-runcheck gameobj 'take-me?
whos-acting #:from #t))
;; This allows this to reply with #:why-not if appropriate
- (lambda args
- (apply <-reply message args))))
+ (lambda args args)))
(define (gameobj-ok-to-be-put-in gameobj message whos-acting where)
(call-with-values (lambda ()
(slot-ref-maybe-runcheck gameobj 'drop-me?
whos-acting where))
;; This allows this to reply with #:why-not if appropriate
- (lambda args
- (apply <-reply message args))))
+ (lambda args args)))
\f
;;; Utilities every gameobj has
((? symbol? _)
;; TODO: If we get back an #f at this point, should we throw
;; an error? Obviously #f is okay, but maybe not if
- (mbody-val (<-wait (slot-ref gameobj 'gm) 'lookup-special
- #:symbol special-symbol)))
+ (<-wait (slot-ref gameobj 'gm) 'lookup-special
+ #:symbol special-symbol))
;; if it's false, return nothing
(#f #f)
;; otherwise it's probably an address, return it as-is
#:key direct-obj
(player (message-from message)))
(define player-name
- (mbody-val (<-wait player 'get-name)))
+ (<-wait player 'get-name))
(define player-loc
- (mbody-val (<-wait player 'get-loc)))
+ (<-wait player 'get-loc))
(define our-name (slot-ref gameobj 'name))
(define self-should-take
(slot-ref-maybe-runcheck gameobj 'take-me? player))
#:key direct-obj
(player (message-from message)))
(define player-name
- (mbody-val (<-wait player 'get-name)))
+ (<-wait player 'get-name))
(define player-loc
- (mbody-val (<-wait player 'get-loc)))
+ (<-wait player 'get-loc))
(define our-name (slot-ref gameobj 'name))
(define should-drop
(slot-ref-maybe-runcheck gameobj 'drop-me? player))
(define (room-objection-to-drop)
- (mbody-receive (_ drop-ok? #:key why-not) ; does the room object to dropping?
+
+ (receive* (drop-ok? #:key why-not) ; does the room object to dropping?
(<-wait player-loc 'ok-to-drop-here? player (actor-id gameobj))
(and (not drop-ok?)
;; Either give the specified reason, or give a boilerplate one
projects / mudsync.git / blobdiff