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

Syncing displayed cash with actions.

Browse Source
logins
Thomas Hintz 5 years ago
parent 93cc806eb2
commit 41b30fa314
3 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File

12
src/components/farm/Board.jsx
Unescape Escape View File

@ -50,7 +50,7 @@ function netWorth(player) {
(player.assets.fruit * 5000) + (player.assets.fruit * 5000) +
(player.assets.cows * 500) + (player.assets.cows * 500) +
((player.assets.harvester + player.assets.tractor) * 10000) + ((player.assets.harvester + player.assets.tractor) * 10000) +
player.cash - player.debt; player.displayCash - player.debt;
} }
function assetsValue(player) { function assetsValue(player) {
@ -285,7 +285,7 @@ class PlayerSummary extends React.Component {
return ( return (
<GroupBox title={(<Fragment><div className={'player player-' + player.color}></div> {player.name} <GroupBox title={(<Fragment><div className={'player player-' + player.color}></div> {player.name}
</Fragment>)}> </Fragment>)}>
<MoneySummary title='Cash' value={player.cash} /> {' '} <MoneySummary title='Cash' value={player.displayCash} /> {' '}
<MoneySummary title='Debt' value={player.debt} /> {' '} <MoneySummary title='Debt' value={player.debt} /> {' '}
<br /><br /> <br /><br />
<MoneySummary title='Assets' value={assetsValue(player)} /> {' '} <MoneySummary title='Assets' value={assetsValue(player)} /> {' '}
@ -539,7 +539,7 @@ class Loans extends React.Component {
takeOut = value * 1000; takeOut = value * 1000;
} }
this.setState({ repay: Math.max(0, Math.floor( this.setState({ repay: Math.max(0, Math.floor(
Math.min(repay, this.props.player.debt + 900, this.props.player.cash) / 1000)), Math.min(repay, this.props.player.debt + 900, this.props.player.displayCash) / 1000)),
takeOut: Math.max(0, Math.floor( takeOut: Math.max(0, Math.floor(
Math.min(takeOut, this.state.maxLoan) / 1000)) }); Math.min(takeOut, this.state.maxLoan) / 1000)) });
} }
@ -566,7 +566,7 @@ class Loans extends React.Component {
render () { render () {
return ( return (
<GroupBox title={'Loans'}> <GroupBox title={'Loans'}>
<MoneySummary title='Cash' value={this.props.player.cash} /> {' '} <MoneySummary title='Cash' value={this.props.player.displayCash} /> {' '}
<MoneySummary title='Debt' value={this.props.player.debt} /> <MoneySummary title='Debt' value={this.props.player.debt} />
/${formatMoney(this.props.game.settings.maxDebt)} /${formatMoney(this.props.game.settings.maxDebt)}
<br /> <br />
@ -1681,12 +1681,12 @@ class BoardApp extends React.Component {
<div> <div>
<Card ui={this.props.ui} <Card ui={this.props.ui}
setCardError={this.props.setCardError} setCardError={this.props.setCardError}
playerCash={this.props.player.cash} playerCash={this.props.player.displayCash}
playerDebt={this.props.player.debt} playerDebt={this.props.player.debt}
card={this.state.card} card={this.state.card}
cost={this.state.card.total / 1000} cost={this.state.card.total / 1000}
min={(this.state.card.total * this.props.game.settings.downPayment) / 1000} min={(this.state.card.total * this.props.game.settings.downPayment) / 1000}
max={Math.floor(Math.min(this.props.player.cash / 1000, this.state.card.total / 1000))} max={Math.floor(Math.min(this.props.player.displayCash / 1000, this.state.card.total / 1000))}
cash={(this.state.card.total * this.props.game.settings.downPayment) / 1000} /> cash={(this.state.card.total * this.props.game.settings.downPayment) / 1000} />
</div> </div>
</Col> </Col>

1
src/components/farm/reducers.js
Unescape Escape View File

@ -82,6 +82,7 @@ const spaces =
const initialState = { const initialState = {
player: { cash: 5000, player: { cash: 5000,
displayCash: 5000,
lastCash: 5000, lastCash: 5000,
debt: 5000, debt: 5000,
spaces, spaces,

52
src/server/farm.scm
Unescape Escape View File

@ -68,6 +68,7 @@
(define-class <player> () (define-class <player> ()
((cash initform: 5000 accessor: player-cash) ((cash initform: 5000 accessor: player-cash)
(display-cash initform: 5000 accessor: player-display-cash)
(debt initform: 5000 accessor: player-debt) (debt initform: 5000 accessor: player-debt)
(space initform: 0 accessor: player-space) (space initform: 0 accessor: player-space)
(previous-space initform: 0 accessor: player-previous-space) (previous-space initform: 0 accessor: player-previous-space)
@ -91,7 +92,8 @@
(last-updated initform: 0 accessor: player-last-updated) (last-updated initform: 0 accessor: player-last-updated)
(last-cash initform: 5000 accessor: player-last-cash) (last-cash initform: 5000 accessor: player-last-cash)
(mailbox initform: (make-mailbox) accessor: player-mailbox) (mailbox initform: (make-mailbox) accessor: player-mailbox)
(mutex initform: (make-mutex 'player) accessor: player-mutex))) (mutex initform: (make-mutex 'player) accessor: player-mutex)
(harvesting initform: #f accessor: player-harvesting)))
(define-class <game> () (define-class <game> ()
((id initform: 0 accessor: game-id) ((id initform: 0 accessor: game-id)
@ -235,6 +237,7 @@
(define (add-player-to-game game color name) (define (add-player-to-game game color name)
(let ((player (make <player> (let ((player (make <player>
'cash (game-setting 'starting-cash game) 'cash (game-setting 'starting-cash game)
'display-cash (game-setting 'starting-cash game)
'debt (game-setting 'starting-debt game) 'debt (game-setting 'starting-debt game)
'color color 'color color
'name name 'name name
@ -329,6 +332,7 @@
`((player . ((assets . ,(player-assets p)) `((player . ((assets . ,(player-assets p))
(ridges . ,(player-ridges p)) (ridges . ,(player-ridges p))
(cash . ,(player-cash p)) (cash . ,(player-cash p))
(displayCash . ,(player-display-cash p))
(debt . ,(player-debt p)) (debt . ,(player-debt p))
(space . ,(player-space p)) (space . ,(player-space p))
(state . ,(symbol->string (player-state p))) (state . ,(symbol->string (player-state p)))
@ -395,6 +399,7 @@
(player-assets player) (player-assets player)
(alist-update crop (+ (alist-ref crop assets) amount) assets)) (alist-update crop (+ (alist-ref crop assets) amount) assets))
(safe-set! (player-cash player) (- (player-cash player) cash-value)) (safe-set! (player-cash player) (- (player-cash player) cash-value))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-debt player) (safe-set! (player-debt player)
(+ (player-debt player) (- total-cost cash-value))) (+ (player-debt player) (- total-cost cash-value)))
(when (member unnormalized-crop ridges) (when (member unnormalized-crop ridges)
@ -410,6 +415,7 @@
(when collect-wages (when collect-wages
(safe-set! (player-cash player) (safe-set! (player-cash player)
(+ (player-cash player) 5000)) (+ (player-cash player) 5000))
(safe-set! (player-display-cash player) (player-cash player))
(push-message player (push-message player
(conc "You earned $5,000 from your city job!")) (conc "You earned $5,000 from your city job!"))
(safe-set! (game-actions game) (safe-set! (game-actions game)
@ -589,8 +595,10 @@
(when (alist-ref 'money params) (when (alist-ref 'money params)
(safe-set! (player-cash player) (safe-set! (player-cash player)
(+ (player-cash player) (* (alist-ref 'money params) -1))) (+ (player-cash player) (* (alist-ref 'money params) -1)))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-cash originator) (safe-set! (player-cash originator)
(+ (player-cash originator) (alist-ref 'money params)))) (+ (player-cash originator) (alist-ref 'money params)))
(safe-set! (player-display-cash originator) (player-cash originator)))
(when (alist-ref 'cards params) (when (alist-ref 'cards params)
(for-each (for-each
(lambda (id) (lambda (id)
@ -702,6 +710,12 @@
default default
(- n (modulo n 1000))))) (- n (modulo n 1000)))))
(define (reconcile-display-cash player game)
(unless (player-harvesting player)
(for-each (lambda (player)
(safe-set! (player-display-cash player) (player-cash player)))
(game-players game))))
(define (process-message player game type msg) (define (process-message player game type msg)
(when game (when game
(safe-set! (game-messages game) '()) (safe-set! (game-messages game) '())
@ -739,6 +753,7 @@
(if (or (null? (game-actions game)) (if (or (null? (game-actions game))
(>= i 15)) (>= i 15))
(begin (begin
(reconcile-display-cash player game)
(safe-set! (game-actions game) '()) (safe-set! (game-actions game) '())
(message-players! game player `((action . #f) (value . #f))) (message-players! game player `((action . #f) (value . #f)))
(create-ws-response player "action" '((action . #f)))) (create-ws-response player "action" '((action . #f))))
@ -747,6 +762,7 @@
(value (alist-ref '?value action))) (value (alist-ref '?value action)))
(print action) (print action)
(cond ((eq? value 'otb) (cond ((eq? value 'otb)
(reconcile-display-cash player game)
(let ((otb (do-action action player))) (let ((otb (do-action action player)))
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(if otb (if otb
@ -765,17 +781,21 @@
`((action . "info") `((action . "info")
(value . ,(conc "Out of " *item-card-short* "'s.")))))))) (value . ,(conc "Out of " *item-card-short* "'s."))))))))
((eq? name 'move) ((eq? name 'move)
(reconcile-display-cash player game)
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(message-players! game player (message-players! game player
`((action . "move") (value . ,value))) `((action . "move") (value . ,value)))
(create-ws-response player "action" (create-ws-response player "action"
`((action . "move") (value . ,value)))) `((action . "move") (value . ,value))))
((eq? name 'harvest) ((eq? name 'harvest)
(reconcile-display-cash player game)
(let ((res (do-action action player))) (let ((res (do-action action player)))
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(if (eq? res 'nothing) (if (eq? res 'nothing)
(loop (+ i 1)) (loop (+ i 1))
(begin (begin
(safe-set! (player-harvesting player) (alist-ref (string->symbol (player-name player))
(alist-ref 'operatingExpenseValue res)))
(message-players! (message-players!
game player game player
`((action . "harvest") (value . ,res))) `((action . "harvest") (value . ,res)))
@ -784,6 +804,7 @@
`((action . "harvest") `((action . "harvest")
(value . ,res))))))) (value . ,res)))))))
((or (eq? name 'money) (eq? name 'player-action)) ((or (eq? name 'money) (eq? name 'player-action))
(reconcile-display-cash player game)
;; all current player-actions have only a cash effect ;; all current player-actions have only a cash effect
(let ((previous-cash (player-cash player))) (let ((previous-cash (player-cash player)))
(do-action action player) (do-action action player)
@ -798,6 +819,7 @@
(message-players! game player res) (message-players! game player res)
(create-ws-response player "action" res))))) (create-ws-response player "action" res)))))
((eq? name 'end-game) ((eq? name 'end-game)
(reconcile-display-cash player game)
(if (null? (cdr (game-actions game))) (if (null? (cdr (game-actions game)))
(begin (begin
(value) (value)
@ -812,6 +834,7 @@
(do-action action player) (do-action action player)
(loop (+ i 1))) (loop (+ i 1)))
((eq? value 'farmers-fate) ((eq? value 'farmers-fate)
(reconcile-display-cash player game)
(let ((ff (do-action action player))) (let ((ff (do-action action player)))
(safe-set! (game-actions game) (safe-set! (game-actions game)
(append (alist-ref 'actions ff) (append (alist-ref 'actions ff)
@ -823,6 +846,7 @@
`((action . "farmers-fate") `((action . "farmers-fate")
(value . ,(alist-ref 'contents ff)))))) (value . ,(alist-ref 'contents ff))))))
((eq? name 'ff-money) ((eq? name 'ff-money)
(reconcile-display-cash player game)
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(if (= (alist-ref 'amount value) 0) (if (= (alist-ref 'amount value) 0)
(loop (+ i 1)) (loop (+ i 1))
@ -832,6 +856,7 @@
(message-players! game player res) (message-players! game player res)
(create-ws-response player "action" res)))) (create-ws-response player "action" res))))
((eq? name 'ff-uncle-bert) ((eq? name 'ff-uncle-bert)
(reconcile-display-cash player game)
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(message-players! game player (message-players! game player
`((action . "ff-uncle-bert") (value . #f))) `((action . "ff-uncle-bert") (value . #f)))
@ -839,6 +864,7 @@
`((action . "ff-uncle-bert") `((action . "ff-uncle-bert")
(value . #f)))) (value . #f))))
((eq? name 'info) ((eq? name 'info)
(reconcile-display-cash player game)
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(message-players! game player (message-players! game player
`((action . "info") (value . ,value))) `((action . "info") (value . ,value)))
@ -846,6 +872,7 @@
`((action . "info") `((action . "info")
(value . ,value)))) (value . ,value))))
((eq? name 'goto) ((eq? name 'goto)
(reconcile-display-cash player game)
(do-action action player) (do-action action player)
(safe-set! (player-harvest-mult player) 1) (safe-set! (player-harvest-mult player) 1)
(safe-set! (game-actions game) (safe-set! (game-actions game)
@ -859,12 +886,19 @@
`((action . "goto") `((action . "goto")
(value . ,resp))))) (value . ,resp)))))
((eq? name 'add-rule) ((eq? name 'add-rule)
(reconcile-display-cash player game)
(do-action action player) (do-action action player)
(safe-set! (game-actions game) (cdr (game-actions game))) (safe-set! (game-actions game) (cdr (game-actions game)))
(loop (+ i 1))) (loop (+ i 1)))
(else ;; TODO make error (else ;; TODO make error
(create-ws-response player "action" `((action . ,name))))))))) (create-ws-response player "action" `((action . ,name)))))))))
((string=? type "skip") ((string=? type "skip")
(when (and (player-harvesting player) (string=? (alist-ref 'component msg) "harvest|income"))
;; player-harvesting will contain the operating expense amount
(safe-set! (player-display-cash player) (- (player-cash player) (player-harvesting player))))
(when (string=? (alist-ref 'component msg) "harvest|operating-expense")
(safe-set! (player-harvesting player) #f)
(reconcile-display-cash player game))
(message-players! game player `((component . ,(alist-ref 'component msg))) (message-players! game player `((component . ,(alist-ref 'component msg)))
type: "auto-skip") type: "auto-skip")
(create-ws-response player "update" '())) (create-ws-response player "update" '()))
@ -896,6 +930,7 @@
(create-ws-response player "buy" `((error . ,bought-crop)))))) (create-ws-response player "buy" `((error . ,bought-crop))))))
((string=? type "buy-uncle-bert") ((string=? type "buy-uncle-bert")
(safe-set! (player-cash player) (- (player-cash player) 10000)) (safe-set! (player-cash player) (- (player-cash player) 10000))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-assets player) (safe-set! (player-assets player)
(alist-update 'hay (+ (alist-ref 'hay (player-assets player)) 10) (alist-update 'hay (+ (alist-ref 'hay (player-assets player)) 10)
(player-assets player))) (player-assets player)))
@ -911,8 +946,10 @@
(farming-round (+ amount (* amount (game-setting 'loan-interest game))))) (farming-round (+ amount (* amount (game-setting 'loan-interest game)))))
(game-setting 'max-debt game)) (game-setting 'max-debt game))
(begin (safe-set! (player-cash player) (+ (player-cash player) amount)) (begin (safe-set! (player-cash player) (+ (player-cash player) amount))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-debt player) (+ (player-debt player) (* amount 2)))) (safe-set! (player-debt player) (+ (player-debt player) (* amount 2))))
(begin (safe-set! (player-cash player) (+ (player-cash player) amount)) (begin (safe-set! (player-cash player) (+ (player-cash player) amount))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-debt player) (+ (player-debt player) (safe-set! (player-debt player) (+ (player-debt player)
(farming-round (farming-round
(+ amount (* amount (game-setting 'loan-interest game)))))))) (+ amount (* amount (game-setting 'loan-interest game))))))))
@ -921,10 +958,12 @@
(push-message player "Not enough cash to repay loan.")) (push-message player "Not enough cash to repay loan."))
(else (else
(safe-set! (player-cash player) (+ (player-cash player) amount)) (safe-set! (player-cash player) (+ (player-cash player) amount))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-debt player) (+ (player-debt player) amount)) (safe-set! (player-debt player) (+ (player-debt player) amount))
(when (< (player-debt player) 0) (when (< (player-debt player) 0)
(safe-set! (player-cash player) (+ (player-cash player) (safe-set! (player-cash player) (+ (player-cash player)
(abs (player-debt player)))) (abs (player-debt player))))
(safe-set! (player-display-cash player) (player-cash player))
(safe-set! (player-debt player) 0)) (safe-set! (player-debt player) 0))
(push-message player (conc "Loan of $" (abs amount) " repayed.")))) (push-message player (conc "Loan of $" (abs amount) " repayed."))))
)) ))
@ -968,6 +1007,8 @@
`(,(car row) . ,(list->vector (cdr row)))) `(,(car row) . ,(list->vector (cdr row))))
*harvest-table*))))) *harvest-table*)))))
((string=? type "turn-ended") ((string=? type "turn-ended")
(reconcile-display-cash player game)
(safe-set! (player-harvesting player) #f)
(if (>= (player-cash player) 0) (if (>= (player-cash player) 0)
(begin (advance-turn game player) (begin (advance-turn game player)
(if (eq? (game-state game) 'finished) (if (eq? (game-state game) 'finished)
@ -1229,14 +1270,12 @@
(define (make-player-pays-per-unit unit amount) (define (make-player-pays-per-unit unit amount)
(lambda (player) (lambda (player)
(let ((to-pay (* (player-asset (normalize-crop unit) player) amount))) (let ((to-pay (* (player-asset (normalize-crop unit) player) amount)))
(push-message player (conc "You paid $" to-pay "!"))
(safe-set! (player-cash player) (safe-set! (player-cash player)
(- (player-cash player) to-pay))))) (- (player-cash player) to-pay)))))
(define (make-player-gains-per-unit unit amount) (define (make-player-gains-per-unit unit amount)
(lambda (player) (lambda (player)
(let ((to-pay (* (player-asset (normalize-crop unit) player) amount))) (let ((to-pay (* (player-asset (normalize-crop unit) player) amount)))
(push-message player (conc "You earned $" to-pay "!"))
(safe-set! (player-cash player) (safe-set! (player-cash player)
(+ (player-cash player) to-pay))))) (+ (player-cash player) to-pay)))))
@ -1244,7 +1283,6 @@
(lambda (player) (lambda (player)
(let ((to-pay (farming-round-down (let ((to-pay (farming-round-down
(inexact->exact (round (* (player-debt player) 0.1)))))) (inexact->exact (round (* (player-debt player) 0.1))))))
(push-message player (conc "You paid $" to-pay "!"))
(safe-set! (player-cash player) (safe-set! (player-cash player)
(- (player-cash player) to-pay))))) (- (player-cash player) to-pay)))))
@ -1373,7 +1411,6 @@
(1 ,(lambda (player game) (1 ,(lambda (player game)
(with-ff-money-action (player game) (with-ff-money-action (player game)
(let ((to-earn (* (player-acres player) 100))) (let ((to-earn (* (player-acres player) 100)))
(push-message player (conc "You earned $" to-earn "!"))
(safe-set! (player-cash player) (safe-set! (player-cash player)
(+ (player-cash player) to-earn))))) (+ (player-cash player) to-earn)))))
#f) #f)
@ -1500,7 +1537,6 @@
(define *operating-expenses-specs* (define *operating-expenses-specs*
`((2 ,(lambda (player) `((2 ,(lambda (player)
(let ((to-pay (* (player-acres player) 100))) (let ((to-pay (* (player-acres player) 100)))
(push-message player (conc "You paid $" to-pay "!"))
(safe-set! (player-cash player) (safe-set! (player-cash player)
(- (player-cash player) to-pay))))) (- (player-cash player) to-pay)))))
(2 ,(lambda (player) (2 ,(lambda (player)
@ -1519,7 +1555,6 @@
(2 ,(make-player-pays 500)) (2 ,(make-player-pays 500))
(1 ,(lambda (player) (1 ,(lambda (player)
(when (player-has-asset? 'cows player) (when (player-has-asset? 'cows player)
(push-message player "You paid $500!")
(safe-set! (player-cash player) (- (player-cash player) 500))))) (safe-set! (player-cash player) (- (player-cash player) 500)))))
(1 ,(make-player-pays 1500)))) (1 ,(make-player-pays 1500))))
@ -1870,3 +1905,4 @@
;; trade notification keeps popping up ;; trade notification keeps popping up
;; you can see how much money you make before you harvest ;; you can see how much money you make before you harvest
;; show harvest multiplier

Write Preview
Loading…
Cancel
Save