Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions Engine/src/Patrons/Hlaalu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public override (PlayResult, IEnumerable<CompletedAction>) PatronActivation(Play
else if (FavoredPlayer == enemy.ID)
FavoredPlayer = PlayerEnum.NO_PLAYER_SELECTED;

var cardsInPlay = activator.Hand.Concat(activator.Played).Where(c => c.Cost >= 1).ToList();
var cardsInPlay = activator.Hand
.Concat(activator.Played)
.Concat(activator.AgentCards)
.Where(c => c.Cost >= 1)
.ToList();
return (new Choice(cardsInPlay,
ChoiceFollowUp.COMPLETE_HLAALU,
new ChoiceContext(PatronID), 1, 1), new List<CompletedAction>());
Expand All @@ -50,7 +54,12 @@ public override List<CardId> GetStarterCards()

public override bool CanPatronBeActivated(Player activator, Player enemy)
{
return activator.Hand.Concat(activator.Played).ToList().FindAll(card => card.Cost >= 1).Any();
return activator.Hand
.Concat(activator.Played)
.Concat(activator.AgentCards)
.ToList()
.FindAll(card => card.Cost >= 1)
.Any();
}
}
}
10 changes: 8 additions & 2 deletions Engine/src/Patrons/Treasury.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ public override (PlayResult, IEnumerable<CompletedAction>) PatronActivation(Play
}

activator.CoinsAmount -= 2;
var inPlayCards = activator.Played.Concat(activator.Hand).ToList();
var inPlayCards = activator.Played
.Concat(activator.Hand)
.Concat(activator.AgentCards)
.ToList();

return (new Choice(inPlayCards,
ChoiceFollowUp.COMPLETE_TREASURY,
Expand Down Expand Up @@ -46,7 +49,10 @@ public override List<CardId> GetStarterCards()

public override bool CanPatronBeActivated(Player activator, Player enemy)
{
List<UniqueCard> inPlayCards = activator.Played.Concat(activator.Hand).ToList();
List<UniqueCard> inPlayCards = activator.Played
.Concat(activator.Hand)
.Concat(activator.AgentCards)
.ToList();
return activator.CoinsAmount >= 2 && inPlayCards.Any();
}
}
Expand Down
Loading