- {this.props.children}
-
-
-
- {this.props.cancelButtonText ? (
- <>
- {' '}
-
-
- ): (<>)}
+
+
+ {this.props.children}
+
+
+
+ {this.props.cancelButtonText ? (
+ <>
+ {' '}
+
+
+ ): (<>)}
+
+ {!this.props.preventHiding ? (
close) : (<>)}
- {!this.props.preventHiding ? (
close) : (<>)}
);
@@ -2055,54 +2057,68 @@ class Info extends React.Component {
}
}
-class StartGame extends React.Component {
- render() {
- const { auditThreshold, downPayment, loanInterest, maxDebt, startingOtbs, startingCash, startingDebt } = this.props.game.settings;
- const playerName = this.props.player.name;
- const { color } = this.props.player;
- const { name, host } = this.props.game;
- return (
- <>
-
Lobby
-
- Game: {name}
-
-
Players
-
- - {playerName}
- {this.props.game.otherPlayers.map((p, i) => (
- -
- {p.player.name}
- {playerName === host ? (
- kickPlayer(p.player.name)}>
+const StartGame = ({ game, player, toggleReady }) => {
+ const { auditThreshold, downPayment, loanInterest, maxDebt, startingOtbs, startingCash, startingDebt } = game.settings;
+ const playerName = player.name;
+ const { color } = player;
+ const { name, host } = game;
+
+ const birthdayClass = (player) =>
+ player.assets.birthday ? 'birthday-selected' : '';
+
+ return (
+ <>
+
Lobby
+
+ Game: {name}
+
+ Players
+
+ -
+ {playerName}
+ {playerName === host ? (
+ birthdayBonusPlayer(playerName)}>
+
+
+ ) : (<>)}
+
+ {game.otherPlayers.map((p, i) => (
+ -
+ {p.player.name}
+ {playerName === host ? (
+ <>
+ kickPlayer(p.player.name)}>
- ): (<>)}
-
- ))}
- -
-
- AI
-
+ birthdayBonusPlayer(p.player.name)}>
+
+
+
+ ): (<>)}
-
- Game Settings
-
- - Audit Threshold: ${formatMoney(auditThreshold)}
- - Max Debt: ${formatMoney(maxDebt)}
- - Loan Interest: {loanInterest * 100}%
- - Required Down Payment: {downPayment * 100}%
- - Starting {itemCardShort}: {startingOtbs}
- - Starting Cash: ${formatMoney(startingCash)}
- - Starting Debt: ${formatMoney(startingDebt)}
-
-
-
- );
- }
+ ))}
+ -
+
+ AI
+
+
+
+
Game Settings
+
+ - Audit Threshold: ${formatMoney(auditThreshold)}
+ - Max Debt: ${formatMoney(maxDebt)}
+ - Loan Interest: {loanInterest * 100}%
+ - Required Down Payment: {downPayment * 100}%
+ - Starting {itemCardShort}: {startingOtbs}
+ - Starting Cash: ${formatMoney(startingCash)}
+ - Starting Debt: ${formatMoney(startingDebt)}
+
+
+
+ );
}
const SCREENS = { summary: 'summary', misc: 'misc', farms: 'farms',
@@ -2246,7 +2262,7 @@ class BoardApp extends React.Component {
buttonText='Close'
hideHandler={() => 'nothing'}
handler={() => { return false; }}>
-
+
Game Over!
{alert.contents.results.map((e, i) => (
{e}
@@ -2257,7 +2273,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/components/farm/interface.js b/src/components/farm/interface.js
index b297540..a78c3ad 100644
--- a/src/components/farm/interface.js
+++ b/src/components/farm/interface.js
@@ -32,7 +32,7 @@ export { initialize, buy, roll, endTurn, loan, trade, submitTradeAccept,
submitTradeDeny, submitTradeCancel, audit, handleMessage,
nextAction, buyUncleBert, actionsFinished, skip, endAiTurn,
startGame, readyToStart, leaveGame, kickPlayer, toggleRevealForTrade,
- addAIPlayer }
+ addAIPlayer, birthdayBonusPlayer }
let store;
let movingTimer = 0;
@@ -218,6 +218,10 @@ function kickPlayer(name) {
sendCommand({ type: 'kick-player', name });
}
+function birthdayBonusPlayer(name) {
+ sendCommand({ type: 'birthday-bonus-player', name });
+}
+
function addAIPlayer() {
sendCommand({ type: 'add-ai-player' });
}
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 eb3e261..a30ddde 100644
--- a/src/server/farm.scm
+++ b/src/server/farm.scm
@@ -180,7 +180,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))))
@@ -563,7 +568,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 ()
@@ -1023,7 +1028,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)
@@ -1588,6 +1617,17 @@
(safe-set! (player-ready-to-start (*player*)) (not (player-ready-to-start (*player*))))
(message-players! (*game*) (*player*) '() type: "update")
(create-ws-response (*player*) "update" '()))
+ ((string=? type "birthday-bonus-player")
+ (let ((player (find (lambda (p)
+ (equal? (player-name p) (alist-ref 'name msg)))
+ (game-players (*game*)))))
+ (if (> (alist-ref 'birthday (player-assets player)) 0)
+ (set! (player-assets player)
+ (alist-update 'birthday 0 (player-assets player)))
+ (set! (player-assets player)
+ (alist-update 'birthday 1 (player-assets player))))
+ (message-players! (*game*) (*player*) '() type: "update")
+ (create-ws-response (*player*) "update" '())))
((string=? type "kick-player")
(let ((kicked-player (find (lambda (p)
(equal? (player-name p) (alist-ref 'name msg)))
@@ -1623,6 +1663,10 @@
type: "player-left-game")
(create-ws-response (*player*) "left-game" '()))
((string=? type "start-game")
+ (for-each (lambda (p)
+ (when (> (alist-ref 'birthday (player-assets p)) 0)
+ (set-startup-otbs (*game*) p 3)))
+ (game-players (*game*)))
(safe-set! (game-state (*game*)) 'pre-turn)
(db-update-game (game-id (*game*)) (symbol->string (game-state (*game*)))
(game->sexp (*game*)))
@@ -2348,7 +2392,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)
@@ -2572,6 +2616,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)
@@ -2585,6 +2630,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..95dc634 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;
@@ -1049,11 +1051,16 @@ $intro-time: 6s;
position: absolute;
bottom: 1rem; }
-.kick-player {
+.lobby-icon {
cursor: pointer;
- color: red;
margin-left: 0.2rem; }
+.kick-player {
+ color: red; }
+
+.birthday-selected {
+ color: blue; }
+
ul {
margin-left: 0;
list-style-type: none; }
@@ -1062,3 +1069,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..1136e8e 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -28,10 +28,10 @@ const CssUrlRelativePlugin = require('css-url-relative-plugin')
module.exports = {
entry: {
- app: './src/main.jsx',
+ app: './src/index.jsx',
},
output: {
- filename: './assets/[name].[contenthash].js',
+ filename: './assets/[name].[hash].js',
path: path.resolve(__dirname, 'dist'),
},
optimization: {
@@ -50,13 +50,13 @@ 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'),
new MiniCssExtractPlugin({
- filename: './assets/[name].[contenthash].css',
- chunkFilename: './assets/[id].[contenthash].css',
+ filename: './assets/[name].[hash].css',
+ chunkFilename: './assets/[id].[hash].css',
}),
new CopyPlugin([
{ from: './src/server/farm.scm', to: './[name].[ext]' },
@@ -96,14 +96,14 @@ module.exports = {
test: /\.(svg|png|gif)$/,
loader: 'file-loader',
options: {
- name: './assets/img/[name].[contenthash].[ext]',
+ name: './assets/img/[name].[hash].[ext]',
},
},
{
test: /\.(woff|woff2|eot|ttf|otf)$/,
loader: 'file-loader',
options: {
- name: './assets/font/[name].[contenthash].[ext]',
+ name: './assets/font/[name].[hash].[ext]',
},
},
{
diff --git a/webpack.dev.js b/webpack.dev.js
index 42952c9..421829a 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -20,14 +20,46 @@ const merge = require('webpack-merge');
const common = require('./webpack.common.js');
const path = require('path');
+const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+
module.exports = function(env) {
return merge(common, {
mode: 'development',
devtool: 'inline-source-map',
+ devServer: {
+ port: 9000,
+ contentBase: './dist',
+ hot: true,
+ proxy: {
+ '/websocket': {
+ target: 'ws://localhost:8080',
+ ws: true
+ },
+ },
+ },
resolve: {
modules: [path.resolve(__dirname, 'src'),
path.resolve(__dirname, env.assets),
'node_modules']
},
+ plugins: [
+ new ReactRefreshWebpackPlugin()
+ ],
+ module: {
+ rules: [
+ {
+ test: /\.jsx?$/,
+ exclude: /node_modules/,
+ use: [
+ {
+ loader: require.resolve('babel-loader'),
+ options: {
+ plugins: [require.resolve('react-refresh/babel')],
+ },
+ },
+ ],
+ },
+ ],
+ },
});
}