external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ignoring Guardian Beast

Browse Source
This commit is contained in:
tool4EvEr
2023-02-13 18:18:29 +01:00
parent 3733983874
commit e48ac2e623
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/AiCostDecision.java
View File

@@ -265,7 +265,8 @@ public class AiCostDecision extends CostDecisionMakerBase {
int c = cost.getAbilityAmount(ability); int c = cost.getAbilityAmount(ability);
final CardCollection typeList = CardLists.getValidCards(player.getGame().getCardsIn(ZoneType.Battlefield), cost.getType().split(";"), player, source, ability); CardCollection typeList = CardLists.getValidCards(player.getGame().getCardsIn(ZoneType.Battlefield), cost.getType().split(";"), player, source, ability);
typeList = CardLists.filter(typeList, crd -> crd.canBeControlledBy(player));
if (typeList.size() < c) { if (typeList.size() < c) {
return null; return null;

1
forge-game/src/main/java/forge/game/cost/CostGainControl.java
View File

@@ -77,6 +77,7 @@ public class CostGainControl extends CostPartWithList {
final Card source = ability.getHostCard(); final Card source = ability.getHostCard();
CardCollectionView typeList = payer.getGame().getCardsIn(ZoneType.Battlefield); CardCollectionView typeList = payer.getGame().getCardsIn(ZoneType.Battlefield);
typeList = CardLists.getValidCards(typeList, this.getType().split(";"), payer, source, ability); typeList = CardLists.getValidCards(typeList, this.getType().split(";"), payer, source, ability);
typeList = CardLists.filter(typeList, c -> c.canBeControlledBy(payer));
return typeList.size() >= getAbilityAmount(ability); return typeList.size() >= getAbilityAmount(ability);
} }

3
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -509,7 +509,8 @@ public class HumanCostDecision extends CostDecisionMakerBase {
int c = cost.getAbilityAmount(ability); int c = cost.getAbilityAmount(ability);
final CardCollectionView list = player.getCardsIn(ZoneType.Battlefield); final CardCollectionView list = player.getCardsIn(ZoneType.Battlefield);
final CardCollectionView validCards = CardLists.getValidCards(list, cost.getType().split(";"), player, source, ability); CardCollectionView validCards = CardLists.getValidCards(list, cost.getType().split(";"), player, source, ability);
validCards = CardLists.filter(validCards, crd -> crd.canBeControlledBy(player));
final InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, c, validCards, ability); final InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, c, validCards, ability);
final String desc = cost.getTypeDescription() == null ? cost.getType() : cost.getTypeDescription(); final String desc = cost.getTypeDescription() == null ? cost.getType() : cost.getTypeDescription();