Show hand
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
parent
3285b216e4
commit
e116f6a33a
@ -13,13 +13,13 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 40vw;
|
right: 0;/*40vw;*/
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background: rgba(0,0,0,0.5);
|
background: rgba(0,0,0,0.5);
|
||||||
z-index: 1000;
|
z-index: 0;/*1000*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.WaitingForPlayer .Title {
|
.WaitingForPlayer .Title {
|
||||||
|
@ -900,13 +900,22 @@ class Table extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const game = this.state.game;
|
const game = this.state.game,
|
||||||
|
player = game ? game.player : undefined
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="Table">
|
<div className="Table">
|
||||||
|
|
||||||
|
<div style={{display: "inline-flex", flex: 1, flexDirection: "column"}}>
|
||||||
<Board table={this} game={game}/>
|
<Board table={this} game={game}/>
|
||||||
|
{ player !== undefined && <div className="Hand'">
|
||||||
|
<Resource type="wood" count={player.wood}/>
|
||||||
|
<Resource type="wheat" count={player.wheat}/>
|
||||||
|
<Resource type="stone" count={player.stone}/>
|
||||||
|
<Resource type="brick" count={player.brick}/>
|
||||||
|
<Resource type="sheep" count={player.sheep}/>
|
||||||
|
</div> }
|
||||||
|
</div>
|
||||||
{ game && <div className={'Game ' + game.state}>
|
{ game && <div className={'Game ' + game.state}>
|
||||||
<Paper className="Message">{ this.state.message }</Paper>
|
<Paper className="Message">{ this.state.message }</Paper>
|
||||||
{(this.state.pickName || !game.name) && <PlayerName table={this}/> }
|
{(this.state.pickName || !game.name) && <PlayerName table={this}/> }
|
||||||
@ -930,13 +939,7 @@ class Table extends React.Component {
|
|||||||
<div className="Cards">
|
<div className="Cards">
|
||||||
{ game && game.state === "active" && <>
|
{ game && game.state === "active" && <>
|
||||||
<div>In hand</div>
|
<div>In hand</div>
|
||||||
<div className="Hand">
|
|
||||||
<Resource type="wood" count={this.state.wood}/>
|
|
||||||
<Resource type="wheat" count={this.state.wheat}/>
|
|
||||||
<Resource type="stone" count={this.state.stone}/>
|
|
||||||
<Resource type="brick" count={this.state.brick}/>
|
|
||||||
<Resource type="sheep" count={this.state.sheep}/>
|
|
||||||
</div>
|
|
||||||
<div>Available to play</div>
|
<div>Available to play</div>
|
||||||
<div className="Hand">
|
<div className="Hand">
|
||||||
<Development type="monopoly" count="1"/>
|
<Development type="monopoly" count="1"/>
|
||||||
|
@ -1069,6 +1069,7 @@ const sendGame = async (req, res, game, error) => {
|
|||||||
name: session.name,
|
name: session.name,
|
||||||
color: session.color,
|
color: session.color,
|
||||||
order: (session.color in game.players) ? game.players[session.color].order : 0,
|
order: (session.color in game.players) ? game.players[session.color].order : 0,
|
||||||
|
player: session.player,
|
||||||
sessions: reducedSessions,
|
sessions: reducedSessions,
|
||||||
layout: layout
|
layout: layout
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user