|
|
|
@ -422,11 +422,14 @@ class FarmsContainer extends React.Component {
|
|
|
|
|
let ridges = makeRidgeLookup(this.props.player, this.props.otherPlayers);
|
|
|
|
|
return (
|
|
|
|
|
<GroupBox title='Farms'>
|
|
|
|
|
<b>Ridges</b>: <b>{ridgeNames[0][0]}</b>: <PlayerColorIcon color={ridges.ridge1} />{'\u00A0'}
|
|
|
|
|
<b>{ridgeNames[1][0]}</b>: <PlayerColorIcon color={ridges.ridge2} />{'\u00A0'}
|
|
|
|
|
<b>{ridgeNames[2][0]}</b>: <PlayerColorIcon color={ridges.ridge3} />{'\u00A0'}
|
|
|
|
|
<b>{ridgeNames[3][0]}</b>: <PlayerColorIcon color={ridges.ridge4} />{'\u00A0'}
|
|
|
|
|
<br /><br />
|
|
|
|
|
<b>Ridges</b>:
|
|
|
|
|
{ridgeNames.map((ridge, idx) => (
|
|
|
|
|
<div key={idx} className={"farms-ridge player-" + ridges['ridge' + (idx + 1)]}>
|
|
|
|
|
<span>{ridge}</span>
|
|
|
|
|
<span className='num-cows'>{'(' + ((idx + 2) * 10) + ' cows)'}</span>
|
|
|
|
|
</div>
|
|
|
|
|
))}
|
|
|
|
|
<br />
|
|
|
|
|
{this.props.otherPlayers
|
|
|
|
|
.map(p => (
|
|
|
|
|
<div key={p.player.name}>
|
|
|
|
@ -761,7 +764,7 @@ class TradeContainer2 extends React.Component {
|
|
|
|
|
<Fragment key={'other-player-trade' + ridge}>
|
|
|
|
|
{!tradeProposed && ((otherPlayer.ridges[ridge] > 0) && !toTrade[ridge]) ? (
|
|
|
|
|
<Button className="tiny"
|
|
|
|
|
onClick={() => this.tradeAsset(ridge, otherPlayer.ridges[ridge], verbatim)}>
|
|
|
|
|
onClick={() => this.tradeAsset(ridge, otherPlayer.ridges[ridge], true)}>
|
|
|
|
|
<FontAwesomeIcon icon={faArrowUp} /> {ridgeNames[idx]} {'('}{otherPlayer.ridges[ridge]} cows{')'}
|
|
|
|
|
</Button>
|
|
|
|
|
) : (<></>)}
|
|
|
|
|