Game Over!
{alert.contents.results.map((e, i) => (
{e}
@@ -2121,7 +2121,14 @@ class BoardApp extends React.Component {
{alert.contents.stats.emergency}
{alert.contents.stats.highRoller}
{alert.contents.stats.lowRoller}
-
+ {alert.contents.stats.players.map(p => (
+
+
{p.name} Harvests:
+
Total: ${formatMoney(p.harvestTotal)} Expenses: ${formatMoney(Math.abs(p.operatingExpenses))}
+
Avg ${formatMoney(p.harvestAverage)} rolling {p.harvestRoll} for {p.numHarvests} harvests
+
Hay: ${formatMoney(p.hay)} Grain: ${formatMoney(p.grain)} Fruit: ${formatMoney(p.fruit)} Cows: ${formatMoney(p.cows)}
+
))}
+
);
} else if (alert && alert.type === ALERTS.auditCalled) {
diff --git a/src/main.jsx b/src/index.jsx
similarity index 100%
rename from src/main.jsx
rename to src/index.jsx
diff --git a/src/server/farm.scm b/src/server/farm.scm
index ec623c2..d549536 100644
--- a/src/server/farm.scm
+++ b/src/server/farm.scm
@@ -172,7 +172,12 @@
(tax-person . 0)
(emergency . 0)
(num-harvests . 0)
- (harvest-rolls . 0)))
+ (harvest-rolls . 0)
+ (operating-expenses . 0)
+ (hay . 0)
+ (grain . 0)
+ (fruit . 0)
+ (cows . 0)))
(alist-ref 'ai? args eqv? #f)
(alist-ref 'processing-turn args eqv? #f))))
@@ -555,7 +560,7 @@
;; (session-set! (sid) 'game *game*)
;; (set-startup-otbs (session-ref (sid) 'player) 2)
)
- (send-static-file "main.html")
+ (send-static-file "index.html")
;; (with-headers `((connection close)
;; (content-type text/html))
;; (lambda ()
@@ -1015,7 +1020,31 @@
(* (/ (alist-ref 'harvest-rolls (player-stats p))
(max (alist-ref 'num-harvests (player-stats p)) 1))
10))
- 10)) ")"))))))
+ 10)) ")")))
+ (players . ,(list->vector
+ (map (lambda (p)
+ (let ((stats (player-stats p)))
+ `((name . ,(player-name p))
+ (numHarvests . ,(alist-ref 'num-harvests stats))
+ (hay . ,(alist-ref 'hay stats))
+ (grain . ,(alist-ref 'grain stats))
+ (fruit . ,(alist-ref 'fruit stats))
+ (cows . ,(alist-ref 'cows stats))
+ (harvestAverage . ,(exact->inexact
+ (round
+ (/ (fold + 0 (map (lambda (c) (alist-ref c stats))
+ '(hay grain fruit cows)))
+ (alist-ref 'num-harvests stats)))))
+ (harvestTotal . ,(fold + 0 (map (lambda (c) (alist-ref c stats))
+ '(hay grain fruit cows))))
+ (operatingExpenses . ,(alist-ref 'operating-expenses stats))
+ (harvestRoll . ,(exact->inexact
+ (/ (round
+ (* (/ (alist-ref 'harvest-rolls stats)
+ (max (alist-ref 'num-harvests stats) 1))
+ 10))
+ 10))))))
+ (game-players game)))))))
type: "end-of-game")))
(define (create-ws-response player event misc)
@@ -2299,7 +2328,7 @@
(define (make-player-stat stat amount)
(lambda (p)
(safe-set! (player-stats p)
- (alist-update stat (+ (alist-ref stat (player-stats p)) amount)
+ (alist-update stat (+ (alist-ref stat (player-stats p) eqv? 0) amount)
(player-stats p)))))
(define (get-actions player space)
@@ -2522,6 +2551,7 @@
(begin
((make-player-stat 'num-harvests 1) player)
((make-player-stat 'harvest-rolls rolled) player)
+ ((make-player-stat crop income) player)
(safe-set! (player-cash player)
(+ (player-cash player) income))
(safe-set! (player-harvest-mult player) 1)
@@ -2535,6 +2565,9 @@
(player-name player))))
(game-players game)))))
((alist-ref 'action operating-expense) player)
+ ((make-player-stat 'operating-expenses
+ (- (player-cash player) previous-cash))
+ player)
`((rolled . ,rolled)
(rolls . ,(list->vector (make-rolls 22)))
(income . ,income)
diff --git a/src/style.scss b/src/style.scss
index 5bd0222..c921303 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -919,8 +919,6 @@ $trade-margin: 3rem;
color: white; }
.alert-overlay-contents {
- max-height: 90vh;
- overflow: auto;
background: $light-color;
padding: 2rem;
display: flex;
@@ -928,6 +926,10 @@ $trade-margin: 3rem;
justify-content: center;
align-items: center; }
+.alert-container {
+ max-height: 90vh;
+ overflow: auto; }
+
.moving {
display: flex;
justify-content: center;
@@ -1062,3 +1064,9 @@ ul {
font-family: 'IndieFlower-Regular';
width: 0;
height: 0; }
+
+.game-over p {
+ margin-bottom: 0.2rem;
+ text-align: left;
+ width: 100%;
+}
diff --git a/webpack.common.js b/webpack.common.js
index 533cb20..7c69817 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -28,7 +28,7 @@ const CssUrlRelativePlugin = require('css-url-relative-plugin')
module.exports = {
entry: {
- app: './src/main.jsx',
+ app: './src/index.jsx',
},
output: {
filename: './assets/[name].[contenthash].js',
@@ -50,7 +50,7 @@ module.exports = {
new CleanWebpackPlugin(),
new HtmlWebpackPlugin({
title: 'Alpha Centauri Farming',
- filename: 'main.html',
+ filename: 'index.html',
meta: {viewport: 'width=device-width, initial-scale=1'},
}),
new FaviconsWebpackPlugin('./assets/img/tractor.svg'),
diff --git a/webpack.dev.js b/webpack.dev.js
index 42952c9..141c96d 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -24,6 +24,16 @@ module.exports = function(env) {
return merge(common, {
mode: 'development',
devtool: 'inline-source-map',
+ devServer: {
+ port: 9000,
+ contentBase: './dist',
+ proxy: {
+ '/websocket': {
+ target: 'ws://localhost:8080',
+ ws: true
+ },
+ },
+ },
resolve: {
modules: [path.resolve(__dirname, 'src'),
path.resolve(__dirname, env.assets),