Fix code for going someplace that doesn't exist

[mudsync.git] / mudsync / player.scm

diff --git a/mudsync/player.scm b/mudsync/player.scm
index bf19a16a6b0e1a0a4716f70333cddaec2a757b8e..8b9a22f5c72c5de58370db5843ee11bce20b0035 100644 (file)
--- a/mudsync/player.scm
+++ b/mudsync/player.scm
@@ -37,11 +37,10 @@
 
 (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))
-   ;; @@: We really need to unify / make sensible this look stuff
-   (look-room (wrap-apply player-look-room))))
+   (disconnect-self-destruct (wrap-apply player-disconnect-self-destruct))))
 
 (define player-actions*
   (append player-actions
@@ -52,13 +51,11 @@
 
 (define-class <player> (<gameobj>)
   (username #:init-keyword #:username
-            #:accessor player-username)
-  ;; Connection id
-  (client #:accessor player-client)
+            #:getter player-username)
 
   (self-commands
    #:init-value '()
-   #:accessor player-self-commands)
+   #:getter player-self-commands)
 
   (message-handler
    #:init-value
@@ -68,25 +65,25 @@
 
 ;;; 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"))))
@@ -95,25 +92,15 @@
   (<- player (gameobj-gm player) 'write-home
       #:text text))
 
-(define-mhandler (player-look-room player message)
-  (player-look-around player))
-
-
-;;; 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))
 
 
 ;;; Command handling
@@ -156,14 +143,18 @@
   (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
@@ -174,7 +165,7 @@
 
   ;; 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
@@ -188,8 +179,8 @@
   (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)
@@ -211,7 +202,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)))