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

Merge branch 'activateForCost' into 'master'

Browse Source 
Improve activateForCost

See merge request core-developers/forge!5901
This commit is contained in:
Michael Kamensky
2021-11-30 10:48:04 +00:00
parent e54355a151 95e62035aa
commit 4b78274c18
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -1323,7 +1323,7 @@ public class ComputerUtil {
} else if (sa.isPwAbility() && ai.getGame().getPhaseHandler().is(PhaseType.MAIN2)) { } else if (sa.isPwAbility() && ai.getGame().getPhaseHandler().is(PhaseType.MAIN2)) {
for (final CostPart part : abCost.getCostParts()) { for (final CostPart part : abCost.getCostParts()) {
if (part instanceof CostPutCounter) { if (part instanceof CostPutCounter) {
return true; return part.convertAmount() == null || part.convertAmount() > 0 || ai.isCardInPlay("Carth the Lion");
} }
} }
} }

2
forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
View File

@@ -379,7 +379,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
list = CardLists.getValidCards(list, type, source.getController(), source, sa); list = CardLists.getValidCards(list, type, source.getController(), source, sa);
} }
if (!activateForCost || list.isEmpty()) { if (!activateForCost && list.isEmpty()) {
return false; return false;
} }
if ("Atarka's Command".equals(sourceName) if ("Atarka's Command".equals(sourceName)