X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fplayer.scm;h=d2fc76dd64d1cbb15a4cf079bb3c9de8317761e9;hp=3aa22873a257155d994c5aced4310f12738e3060;hb=7e11c67b59dc07a46576b2acaa4657ee533df7d5;hpb=8c357c87019a70aabdfadb4c71e3b063251cff87 diff --git a/mudsync/player.scm b/mudsync/player.scm index 3aa2287..d2fc76d 100644 --- a/mudsync/player.scm +++ b/mudsync/player.scm @@ -37,9 +37,11 @@ (define player-actions (build-actions - (init (wrap-apply player-init!)) + (init (wrap-apply player-init)) (handle-input (wrap-apply player-handle-input)) - (tell (wrap-apply player-tell)))) + (tell (wrap-apply player-tell)) + (disconnect-self-destruct (wrap-apply player-disconnect-self-destruct)) + (cmd-inventory (wrap-apply player-cmd-inventory)))) (define player-actions* (append player-actions @@ -48,43 +50,46 @@ (define player-dispatcher (simple-dispatcher player-actions*)) +(define player-self-commands + (list + (empty-command "inventory" 'cmd-inventory) + ;; aliases... + ;; @@: Should use an "alias" system for common aliases? + (empty-command "inv" 'cmd-inventory) + (empty-command "i" 'cmd-inventory))) + (define-class () (username #:init-keyword #:username - #:accessor player-username) - ;; Connection id - (client #:accessor player-client) + #:getter player-username) - (self-commands - #:init-value '() - #:accessor player-self-commands) + (self-commands #:init-value player-self-commands) (message-handler #:init-value - ;; @@: We're gonna need action inheritance real awful soon, huh? (wrap-apply player-dispatcher))) ;;; player message handlers -(define-mhandler (player-init! player message) - (player-look-around player)) +(define-mhandler (player-init player message) + ;; Look around the room we're in + (<- player (gameobj-loc player) 'look-room)) (define-mhandler (player-handle-input player message input) (define split-input (split-verb-and-rest input)) - (define input-verb (pk 'input-verb (car split-input))) - (define input-rest (pk 'input-rest (cdr split-input))) + (define input-verb (car split-input)) + (define input-rest (cdr split-input)) (define command-candidates - (pk 'candidates - (player-gather-command-handlers player input-verb))) + (player-gather-command-handlers player input-verb)) (define winner - (pk 'winner (find-command-winner command-candidates input-rest))) + (find-command-winner command-candidates input-rest)) (match winner ((cmd-action winner-id message-args) - (apply send-message player (pk 'winner-id winner-id) (pk 'cmd-action cmd-action) (pk 'message-args message-args))) + (apply send-message player winner-id cmd-action message-args)) (#f (<- player (gameobj-gm player) 'write-home #:text "Huh?\n")))) @@ -93,22 +98,33 @@ (<- player (gameobj-gm player) 'write-home #:text text)) - -;;; player methods - -(define (player-look-around player) - (define room-name - (message-ref - (<-wait player (gameobj-loc player) 'get-name) - 'val)) - (define room-desc - (message-ref - (<-wait player (gameobj-loc player) 'get-desc) - 'val)) - (define message-text - (format #f "**~a**\n~a\n" room-name room-desc)) - - (<- player (gameobj-gm player) 'write-home #:text message-text)) +(define-mhandler (player-disconnect-self-destruct player message) + "Action routine for being told to disconnect and self destruct." + (define loc (gameobj-loc player)) + (when loc + (<- player loc 'tell-room + #:exclude (actor-id player) + #:text (format #f "~a disappears in a puff of entropy!\n" + (slot-ref player 'name)))) + (gameobj-self-destruct player)) + +(define-mhandler (player-cmd-inventory player message) + "Display the inventory for the player" + (define inv-names + (map + (lambda (inv-item) + (message-ref (<-wait player inv-item 'get-name) + 'val)) + (gameobj-occupants player))) + (define text-to-show + (if (eq? inv-names '()) + "You aren't carrying anything.\n" + (apply string-append + "You are carrying:\n" + (map (lambda (item-name) + (string-append " * " item-name "\n")) + inv-names)))) + (<- player (actor-id player) 'tell #:text text-to-show)) ;;; Command handling @@ -151,25 +167,33 @@ (define co-occupant-commands ;; TODO: Switch this to a fold. Ignore a result if it ;; returns false for in the command response - (map - (lambda (co-occupant) - (let ((result (<-wait player co-occupant 'get-commands - #:verb verb))) - (list - (message-ref result 'commands) - (message-ref result 'goes-by) - co-occupant))) + (fold + (lambda (co-occupant prev) + (let* ((result (<-wait player co-occupant 'get-commands + #:verb verb)) + (commands (message-ref result 'commands)) + (goes-by (message-ref result 'goes-by))) + (append + (map (lambda (command) + (list command goes-by co-occupant)) + commands) + prev))) + '() co-occupants)) ;; Append our own command handlers (define our-commands - (player-self-commands player)) + (filter + (lambda (cmd) + (equal? (command-verbs cmd) verb)) + (val-or-run + (slot-ref player 'self-commands)))) ;; TODO: Append our inventory's relevant command handlers ;; Now return a big ol sorted list of ((actor-id . command)) (append - (sort-commands-append-actor (pk 'room-commands room-commands) + (sort-commands-append-actor room-commands player-loc '()) ; room doesn't go by anything (sort-commands-multi-actors co-occupant-commands) (sort-commands-append-actor our-commands @@ -183,14 +207,14 @@ (sort actors-and-commands (lambda (x y) - (> (command-priority (car (pk 'x x))) - (command-priority (car (pk 'y y))))))) + (> (command-priority (car x)) + (command-priority (car y)))))) (define (find-command-winner sorted-candidates line) "Find a command winner from a sorted list of candidates" ;; A cache of results from matchers we've already seen - ;; TODO: fill this in + ;; TODO: fill in this cache. This is a *critical* optimization! (define matcher-cache '()) (call/ec (lambda (return) @@ -206,7 +230,7 @@ actor-goes-by matched)) ; matched is kwargs if truthy (return (list (command-action command) - (pk 'earlier-actor-id actor-id) matched)) + actor-id matched)) #f)))) sorted-candidates) #f)))