Skip to content
This repository was archived by the owner on Apr 7, 2024. It is now read-only.

Fix Archmaester Marwyn outside of Conclave #124

Open
EvadLhorg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Archmaester Marwyn outside of Conclave #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Components/GameBoard/PlayerRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ class PlayerRow extends React.Component {
if(this.props.agenda.code === '06018') {
cards = this.props.bannerCards;
title = 'Banners';
} else if(this.props.agenda.code === '09045') {
//Conclave or cards under the agenda
} else if(this.props.agenda.code === '09045' || this.props.conclavePile.length > 0) {
cards = this.props.conclavePile;
source = 'conclave';
title = 'Conclave';
title = this.props.agenda.code === '09045' ? 'Conclave' : 'Agenda';
disablePopup = !this.props.isMe;
}

Expand All @@ -80,7 +81,7 @@ class PlayerRow extends React.Component {
topCard={ this.props.agenda }
size={ this.props.cardSize } />);

if(this.props.agenda.code === '09045') {
if(this.props.agenda.code === '09045' || this.props.conclavePile.length > 0) {
return (
<Droppable onDragDrop={ this.props.onDragDrop } source='conclave'>
{ pile }
Expand Down