X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fgameobj.scm;h=ebd4db7276c44aecd5b307c10a43edc5f7b48486;hp=7f2f4e202defc63db99f4cf1de60b1bb95a21420;hb=f22e3b3e60031ebb8ef6260692bf8c03dcce1c60;hpb=8268d0f1223f0d4fc77a8aa2b195368d56512ca4 diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm index 7f2f4e2..ebd4db7 100644 --- a/mudsync/gameobj.scm +++ b/mudsync/gameobj.scm @@ -21,6 +21,7 @@ (define-module (mudsync gameobj) #:use-module (mudsync command) + #:use-module (mudsync utils) #:use-module (8sync actors) #:use-module (8sync agenda) #:use-module (8sync rmeta-slot) @@ -42,7 +43,11 @@ slot-ref-maybe-runcheck val-or-run - dyn-ref)) + dyn-ref + + ;; Some of the more common commands + cmd-take cmd-drop + cmd-take-from-no-op cmd-put-in-no-op)) ;;; Gameobj ;;; ======= @@ -83,8 +88,12 @@ '("in" "inside" "on")))))) ;; Commands we can handle by being something's container - (container-commands #:allocation #:each-subclass - #:init-thunk (build-commands)) + ;; dominant version (goes before everything) + (container-dom-commands #:allocation #:each-subclass + #:init-thunk (build-commands)) + ;; subordinate version (goes after everything) + (container-sub-commands #:allocation #:each-subclass + #:init-thunk (build-commands)) ;; Commands we can handle by being contained by something else (contained-commands #:allocation #:each-subclass @@ -93,10 +102,10 @@ ("drop" ((direct-command cmd-drop #:obvious? #f))))) ;; Most objects are generally visible by default - (generally-visible #:init-value #t - #:init-keyword #:generally-visible) - ;; @@: Would be preferable to be using generic methods for this... - ;; Hopefully we can port this to Guile 2.2 soon... + (invisible? #:init-value #f + #:init-keyword #:invisible?) + ;; TODO: Fold this into a procedure in invisible? similar + ;; to take-me? and etc (visible-to-player? #:init-value (wrap-apply gameobj-visible-to-player?)) @@ -108,14 +117,6 @@ ;; (gameobj whos-acting where) (drop-me? #:init-value #t #:init-keyword #:drop-me?) - ;; Can be a boolean or a procedure accepting - ;; (gameobj whos-acting take-what) - (take-from-me? #:init-value #f - #:init-keyword #:take-from-me?) - ;; Can be a boolean or a procedure accepting - ;; (gameobj whos-acting put-what) - (put-in-me? #:init-value #f - #:init-keyword #:put-in-me?) ;; TODO: Remove this and use actor-alive? instead. ;; Set this on self-destruct @@ -130,7 +131,8 @@ ;; Commands for co-occupants (get-commands gameobj-get-commands) ;; Commands for participants in a room - (get-container-commands gameobj-get-container-commands) + (get-container-dom-commands gameobj-get-container-dom-commands) + (get-container-sub-commands gameobj-get-container-sub-commands) ;; Commands for inventory items, etc (occupants of the gameobj commanding) (get-contained-commands gameobj-get-contained-commands) @@ -154,9 +156,9 @@ ;; Common commands (cmd-take cmd-take) - (cmd-take-from cmd-take-from) - (cmd-put-in cmd-put-in) - (cmd-drop cmd-drop)))) + (cmd-drop cmd-drop) + (cmd-take-from cmd-take-from-no-op) + (cmd-put-in cmd-put-in-no-op)))) ;;; gameobj message handlers @@ -207,7 +209,7 @@ Assists in its replacement of occupants if necessary and nothing else." (define (gameobj-act-goes-by actor message) "Reply to a message requesting what we go by." - (<-reply message #:goes-by (gameobj-goes-by actor))) + (<-reply message (gameobj-goes-by actor))) (define (val-or-run val-or-proc) "Evaluate if a procedure, or just return otherwise" @@ -227,10 +229,16 @@ Assists in its replacement of occupants if necessary and nothing else." #:commands candidate-commands #:goes-by (gameobj-goes-by actor))) -(define* (gameobj-get-container-commands actor message #:key verb) - "Get commands as the container / room of message's sender" +(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)) + +(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-commands verb)) + (get-candidate-commands actor 'container-sub-commands verb)) (<-reply message #:commands candidate-commands)) (define* (gameobj-get-contained-commands actor message #:key verb) @@ -322,7 +330,7 @@ and whos-asking, and see if we should just return it or run it." (define (gameobj-visible-to-player? gameobj whos-looking) "Check to see whether we're visible to the player or not. By default, this is whether or not the generally-visible flag is set." - (slot-ref gameobj 'generally-visible)) + (not (slot-ref gameobj 'invisible?))) (define* (gameobj-visible-name actor message #:key whos-looking) ;; Are we visible? @@ -375,12 +383,20 @@ By default, this is whether or not the generally-visible flag is set." (gameobj-replace-data* gameobj))) (define (gameobj-ok-to-be-taken-from gameobj message whos-acting) - (<-reply message (slot-ref-maybe-runcheck gameobj 'take-me? - whos-acting #:from #t))) + (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)))) (define (gameobj-ok-to-be-put-in gameobj message whos-acting where) - (<-reply message (slot-ref-maybe-runcheck gameobj 'drop-me? - 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)))) ;;; Utilities every gameobj has @@ -403,8 +419,9 @@ By default, this is whether or not the generally-visible flag is set." ;;; Basic actions ;;; ------------- -(define* (cmd-take gameobj message #:key direct-obj) - (define player (message-from message)) +(define* (cmd-take gameobj message + #:key direct-obj + (player (message-from message))) (define player-name (mbody-val (<-wait player 'get-name))) (define player-loc @@ -414,25 +431,28 @@ By default, this is whether or not the generally-visible flag is set." (slot-ref-maybe-runcheck gameobj 'take-me? player)) ;; @@: Is there any reason to allow the room to object in the way ;; that there is for dropping? It doesn't seem like it. - ;; TODO: Allow gameobj to customize - (if self-should-take - ;; Set the location to whoever's picking us up - (begin - (gameobj-set-loc! gameobj player) - (<- player 'tell - #:text (format #f "You pick up ~a.\n" - our-name)) - (<- player-loc 'tell-room - #:text (format #f "~a picks up ~a.\n" - player-name - our-name) - #:exclude player)) - (<- player 'tell - #:text (format #f "It doesn't seem like you can take ~a.\n" - our-name)))) - -(define* (cmd-drop gameobj message #:key direct-obj) - (define player (message-from message)) + (call-with-values (lambda () + (slot-ref-maybe-runcheck gameobj 'take-me? player)) + (lambda* (self-should-take #:key (why-not + `("It doesn't seem like you can take " + ,our-name "."))) + (if self-should-take + ;; Set the location to whoever's picking us up + (begin + (gameobj-set-loc! gameobj player) + (<- player 'tell + #:text (format #f "You pick up ~a.\n" + our-name)) + (<- player-loc 'tell-room + #:text (format #f "~a picks up ~a.\n" + player-name + our-name) + #:exclude player)) + (<- player 'tell #:text why-not))))) + +(define* (cmd-drop gameobj message + #:key direct-obj + (player (message-from message))) (define player-name (mbody-val (<-wait player 'get-name))) (define player-loc @@ -474,126 +494,18 @@ By default, this is whether or not the generally-visible flag is set." our-name) #:exclude player)))) -(define* (cmd-take-from gameobj message - #:key direct-obj indir-obj preposition) - (define player (message-from message)) - (define player-name - (mbody-val (<-wait player 'get-name))) - (define player-loc - (mbody-val (<-wait player 'get-loc))) - (define our-name (slot-ref gameobj 'name)) - ;; We need to check if we even have such a thing - (define thing-to-take - (call/ec - (lambda (return) - (for-each (lambda (occupant) - (mbody-receive (_ #:key goes-by) - (<-wait occupant 'goes-by) - (when (member direct-obj goes-by) - (return occupant)))) - (gameobj-occupants gameobj)) - ;; nothing found - #f))) - (define (should-take-from-me) - (and thing-to-take - (slot-ref-maybe-runcheck gameobj 'take-from-me? player thing-to-take))) - ;; @@: Right now we give the same response to both something not being - ;; an occupant and to not being permitted to be removed. This isn't - ;; very rich and maybe not as helpful as it could be. Right now I'm - ;; trying to avoid "leaking" information about if an object isn't there. - ;; However maybe by making the different responses as slots which can be - ;; set, this wouldn't be a problem. - (define default-objection - "As much as you'd like to take it, it doesn't seem like you can.") - (define (thing-to-take-objection) - (mbody-receive (_ taken-ok? #:key why-not) ; does the object object to being removed? - (<-wait thing-to-take 'ok-to-be-taken-from? player) ; @@ no need to supply from where - (and (not taken-ok?) - ;; Either give the specified reason, or give a boilerplate one - (or why-not default-objection)))) - (cond - ;; Is it not there, or maybe we won't allow it to be taken? - ((or (not thing-to-take) (not (should-take-from-me))) - (<- (message-from message) 'tell - #:text default-objection)) - ;; the thing we wsant to take itself has objected... - ((thing-to-take-objection) => - (lambda (objection) - (<- (message-from message) 'tell - #:text objection))) - ;; looks like we can take it - (else - (let ((thing-to-take-name - (mbody-val (<-wait thing-to-take 'get-name)))) - ;; Wait to announce to the player just in case settting the location - ;; errors out or something. Maybe it's overthinking things, I dunno. - (<-wait thing-to-take 'set-loc! #:loc player) - (<- player 'tell - #:text `("You take " ,thing-to-take-name " from " - ,our-name ".")) - (<- player-loc 'tell-room - #:text `(,player-name " takes " ,thing-to-take-name " from " - ,our-name ".")))))) - -(define* (cmd-put-in gameobj message - #:key direct-obj indir-obj preposition) - (define player (message-from message)) - (define player-name - (mbody-val (<-wait player 'get-name))) - (define player-loc - (mbody-val (<-wait player 'get-loc))) - (define our-name (slot-ref gameobj 'name)) - ;; We need to check if we even have such a thing - (define this-thing - (call/ec - (lambda (return) - (for-each (lambda (occupant) - (mbody-receive (_ #:key goes-by) - (<-wait occupant 'goes-by) - (when (member direct-obj goes-by) - (return occupant)))) - (pk 'here (mbody-val (<-wait player 'get-occupants)))) - ;; nothing found - #f))) - (define (should-put-in-me) - (and this-thing - (slot-ref-maybe-runcheck gameobj 'put-in-me? player this-thing))) - ;; @@: Right now we give the same response to both something not being - ;; an occupant and to not being permitted to be removed. This isn't - ;; very rich and maybe not as helpful as it could be. Right now I'm - ;; trying to avoid "leaking" information about if an object isn't there. - ;; However maybe by making the different responses as slots which can be - ;; set, this wouldn't be a problem. - (define default-objection - "As much as you'd like to, it doesn't seem like you can put that in there.") - (define (this-thing-objection) - (mbody-receive (_ put-in-ok? #:key why-not) ; does the object object to being moved? - (<-wait this-thing 'ok-to-be-put-in? player (actor-id gameobj)) - (and (not put-in-ok?) - ;; Either give the specified reason, or give a boilerplate one - (or why-not default-objection)))) - (cond - ;; Is it not there, or maybe we won't allow it to be taken? - ((pk '1st (or (not this-thing) (not (should-put-in-me)))) - (<- (message-from message) 'tell - #:text default-objection)) - ;; the thing we wsant to take itself has objected... - ((pk 'objection (this-thing-objection)) => - (lambda (objection) - (<- (message-from message) 'tell - #:text objection))) - ;; looks like we can take it - (else - (let ((this-thing-name - (mbody-val (<-wait this-thing 'get-name)))) - - - ;; Wait to announce to the player just in case settting the location - ;; errors out or something. Maybe it's overthinking things, I dunno. - (<-wait this-thing 'set-loc! #:loc (actor-id gameobj)) - (<- player 'tell - #:text (pk 'txt `("You put " ,this-thing-name " in " - ,our-name "."))) - (<- player-loc 'tell-room - #:text `(,player-name " puts " ,this-thing-name " in " - ,our-name ".")))))) +(define* (cmd-take-from-no-op gameobj message + #:key direct-obj indir-obj preposition + (player (message-from message))) + (<- player 'tell + #:text `("It doesn't seem like you can take anything " + ,preposition " " + ,(slot-ref gameobj 'name) "."))) + +(define* (cmd-put-in-no-op gameobj message + #:key direct-obj indir-obj preposition + (player (message-from message))) + (<- player 'tell + #:text `("It doesn't seem like you can put anything " + ,preposition " " + ,(slot-ref gameobj 'name) ".")))