X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fgameobj.scm;h=370ba47d2d67ecb104a9d37d0950a85dd6b81fa2;hp=3bb743ac5101e09182c0c5e6020c931d73394e10;hb=6f7c1d4f9a2043c16f83facef6b3216e45e14f40;hpb=ca990b14f563fc450548954184ff6fc0e4792739 diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm index 3bb743a..370ba47 100644 --- a/mudsync/gameobj.scm +++ b/mudsync/gameobj.scm @@ -21,7 +21,7 @@ (define-module (mudsync gameobj) #:use-module (mudsync command) - #:use-module (8sync systems actors) + #:use-module (8sync actors) #:use-module (8sync agenda) #:use-module (srfi srfi-1) #:use-module (ice-9 format) @@ -94,7 +94,7 @@ (actions #:allocation #:each-subclass ;;; Actions supported by all gameobj #:init-value - (mhandlers + (build-actions (init gameobj-act-init) ;; Commands for co-occupants (get-commands gameobj-get-commands) @@ -123,7 +123,7 @@ ;; Kind of a useful utility, maybe? (define (simple-slot-getter slot) (lambda (actor message) - (<-reply actor message (slot-ref actor slot)))) + (<-reply message (slot-ref actor slot)))) (define (gameobj-replace-step-occupants actor occupants) ;; Snarf all the occupants! @@ -131,7 +131,7 @@ (when occupants (for-each (lambda (occupant) - (<-wait actor occupant 'set-loc! + (<-wait occupant 'set-loc! #:loc (actor-id actor))) occupants))) @@ -140,8 +140,8 @@ (define (run-replacement actor replaces replace-steps) (when replaces - (msg-receive (_ #:key occupants) - (<-wait actor replaces 'assist-replace) + (mbody-receive (_ #:key occupants) + (<-wait replaces 'assist-replace) (for-each (lambda (replace-step) (replace-step actor occupants)) @@ -165,8 +165,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 actor message - #:goes-by (gameobj-goes-by actor))) + (<-reply message #:goes-by (gameobj-goes-by actor))) (define (val-or-run val-or-proc) "Evaluate if a procedure, or just return otherwise" @@ -186,7 +185,7 @@ Assists in its replacement of occupants if necessary and nothing else." (define filtered-commands (filter-commands (val-or-run (slot-ref actor 'commands)) verb)) - (<-reply actor message + (<-reply message #:commands filtered-commands #:goes-by (gameobj-goes-by actor))) @@ -195,14 +194,14 @@ Assists in its replacement of occupants if necessary and nothing else." (define filtered-commands (filter-commands (val-or-run (slot-ref actor 'container-commands)) verb)) - (<-reply actor message #:commands filtered-commands)) + (<-reply message #:commands filtered-commands)) (define* (gameobj-get-contained-commands actor message #:key verb) "Get commands as being contained (eg inventory) of commanding gameobj" (define filtered-commands (filter-commands (val-or-run (slot-ref actor 'contained-commands)) verb)) - (<-reply actor message + (<-reply message #:commands filtered-commands #:goes-by (gameobj-goes-by actor))) @@ -226,7 +225,7 @@ Assists in its replacement of occupants if necessary and nothing else." ;; A list of addresses... since our address object is (annoyingly) ;; currently a simple cons cell... ((exclude-1 ... exclude-rest) - (pk 'failboat (member occupant (pk 'exclude-lst exclude)))) + (member occupant exclude)) ;; Must be an individual address! (_ (equal? occupant exclude)))) (if exclude-it? @@ -240,11 +239,10 @@ Assists in its replacement of occupants if necessary and nothing else." (define occupants (gameobj-occupants actor #:exclude exclude)) - (<-reply actor message - #:occupants occupants)) + (<-reply message #:occupants occupants)) (define (gameobj-act-get-loc actor message) - (<-reply actor message (slot-ref actor 'loc))) + (<-reply message (slot-ref actor 'loc))) (define (gameobj-set-loc! gameobj loc) "Set the location of this object." @@ -256,9 +254,9 @@ Assists in its replacement of occupants if necessary and nothing else." (slot-set! gameobj 'loc loc) ;; Change registation of where we currently are (if old-loc - (<-wait gameobj old-loc 'remove-occupant! #:who (actor-id gameobj))) + (<-wait old-loc 'remove-occupant! #:who (actor-id gameobj))) (if loc - (<-wait gameobj loc 'add-occupant! #:who (actor-id gameobj))))) + (<-wait loc 'add-occupant! #:who (actor-id gameobj))))) ;; @@: Should it really be #:id ? Maybe #:loc-id or #:loc? (define* (gameobj-act-set-loc! actor message #:key loc) @@ -284,7 +282,7 @@ and whos-asking, and see if we should just return it or run it." ((? procedure? desc-proc) (desc-proc actor whos-looking)) (desc desc))) - (<-reply actor message desc-text)) + (<-reply message desc-text)) (define (gameobj-visible-to-player? gameobj whos-looking) "Check to see whether we're visible to the player or not. @@ -306,7 +304,7 @@ By default, this is whether or not the generally-visible flag is set." name) (#f #f)) #f)) - (<-reply actor message #:text name-to-return)) + (<-reply message #:text name-to-return)) (define (gameobj-self-destruct gameobj) "General gameobj self destruction routine" @@ -338,7 +336,7 @@ By default, this is whether or not the generally-visible flag is set." ;; But that's life in a live hacked game! (define (gameobj-act-assist-replace actor message) "Vanilla method for assisting in self-replacement for live hacking" - (apply <-reply actor message + (apply <-reply message (gameobj-replace-data* actor))) @@ -350,8 +348,8 @@ By default, this is whether or not the generally-visible flag is set." (match special-symbol ;; if it's a symbol, look it up dynamically ((? symbol? _) - (msg-val (<-wait gameobj (slot-ref gameobj 'gm) 'lookup-special - #:symbol special-symbol))) + (mbody-val (<-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