Skip to content

Commit 482db88

Browse files
authored
Add agents to patron choices (#85)
1 parent 1cad218 commit 482db88

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

Engine/src/Patrons/Hlaalu.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ public override (PlayResult, IEnumerable<CompletedAction>) PatronActivation(Play
3030
else if (FavoredPlayer == enemy.ID)
3131
FavoredPlayer = PlayerEnum.NO_PLAYER_SELECTED;
3232

33-
var cardsInPlay = activator.Hand.Concat(activator.Played).Where(c => c.Cost >= 1).ToList();
33+
var cardsInPlay = activator.Hand
34+
.Concat(activator.Played)
35+
.Concat(activator.AgentCards)
36+
.Where(c => c.Cost >= 1)
37+
.ToList();
3438
return (new Choice(cardsInPlay,
3539
ChoiceFollowUp.COMPLETE_HLAALU,
3640
new ChoiceContext(PatronID), 1, 1), new List<CompletedAction>());
@@ -50,7 +54,12 @@ public override List<CardId> GetStarterCards()
5054

5155
public override bool CanPatronBeActivated(Player activator, Player enemy)
5256
{
53-
return activator.Hand.Concat(activator.Played).ToList().FindAll(card => card.Cost >= 1).Any();
57+
return activator.Hand
58+
.Concat(activator.Played)
59+
.Concat(activator.AgentCards)
60+
.ToList()
61+
.FindAll(card => card.Cost >= 1)
62+
.Any();
5463
}
5564
}
5665
}

Engine/src/Patrons/Treasury.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ public override (PlayResult, IEnumerable<CompletedAction>) PatronActivation(Play
1313
}
1414

1515
activator.CoinsAmount -= 2;
16-
var inPlayCards = activator.Played.Concat(activator.Hand).ToList();
16+
var inPlayCards = activator.Played
17+
.Concat(activator.Hand)
18+
.Concat(activator.AgentCards)
19+
.ToList();
1720

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

4750
public override bool CanPatronBeActivated(Player activator, Player enemy)
4851
{
49-
List<UniqueCard> inPlayCards = activator.Played.Concat(activator.Hand).ToList();
52+
List<UniqueCard> inPlayCards = activator.Played
53+
.Concat(activator.Hand)
54+
.Concat(activator.AgentCards)
55+
.ToList();
5056
return activator.CoinsAmount >= 2 && inPlayCards.Any();
5157
}
5258
}

0 commit comments

Comments
 (0)