tjhintz/farm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making another attempt at fixing movement bugs.

Browse Source
This commit is contained in:
Thomas Hintz
2020-04-02 20:27:20 -07:00
parent 28d02a94f0
commit 9a9119cc18
4 changed files with 97 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/server/farm.scm
View File

@@ -767,7 +767,10 @@
(to . ,(player-space player)))))
(safe-set! (game-actions game)
(append (game-actions game)
`(((?action . move) (?value . ,resp)))
`(((?action . move) (?value . ,resp))
((?action . resolve-move)
(?value . ((to . ,(player-space player))
(color . ,(symbol->string (player-color player)))))))
(sort-actions (get-actions player (player-space player)))))
(message-players! game player
`((action . "roll")
@@ -813,6 +816,12 @@
`((action . "move") (value . ,value)))
(create-ws-response player "action"
`((action . "move") (value . ,value))))
((eq? name 'resolve-move)
(safe-set! (game-actions game) (cdr (game-actions game)))
(message-players! game player
`((action . "resolve-move") (value . ,value)))
(create-ws-response player "action"
`((action . "resolve-move") (value . ,value))))
((eq? name 'harvest)
(reconcile-display-cash player game)
(let ((res (do-action action player)))
@@ -902,8 +911,11 @@
(do-action action player)
(safe-set! (player-harvest-mult player) 1)
(safe-set! (game-actions game)
(append (sort-actions (get-actions player (player-space player)))
(cdr (game-actions game))))
(append `(((?action . resolve-move)
(?value . ((to . ,(player-space player))
(color . ,(symbol->string (player-color player)))))))
(sort-actions (get-actions player (player-space player)))
(cdr (game-actions game))))
(let ((resp `((from . ,(player-previous-space player))
(to . ,(player-space player)))))
(message-players! game player `((action . "goto")
@@ -1931,3 +1943,34 @@
;; mark spaces
;; can't trade other player's ridge
;; don't let players join without name
;; error:
;; Call history:
;; farm.scm:714: mailbox#mailbox-send!
;; type-errors.scm:119: make-error-type-message
;; type-errors.scm:104: make-bad-argument-message
;; type-errors.scm:106: make-type-name-message
;; type-errors.scm:290: ->string
;; type-errors.scm:291: conc
;; type-errors.scm:103: string-append
;; type-errors.scm:119: signal-type-error
;; farm.scm:1125: k7172
;; farm.scm:1125: g7176
;; farm.scm:1127: with-output-to-string
;; farm.scm:1129: print-call-chain <--
;; Error: (mailbox-send!) bad argument type - not a mailbox: ()
;; error:
;; Call history:
;; farm.scm:129: alist-ref
;; farm.scm:1125: k7172
;; farm.scm:1125: g7176
;; farm.scm:1127: with-output-to-string
;; farm.scm:1129: print-call-chain <--
;; Error: (assv) bad argument type: ridge-cows