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

Merge pull request #139 from Northmoc/changenum_defaults

Browse Source 
AI: "ChangeNum" defaults
This commit is contained in:
Agetian
2022-04-25 19:56:56 +03:00
committed by GitHub
parent 73616c7c8b 92a4407c9b
commit a1c0f479b5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,7 +709,8 @@ public class SpecialCardAi {
} }
} }
int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("ChangeNum"), sa); int changeNum = AbilityUtils.calculateAmount(sa.getHostCard(),
sa.getParamOrDefault("ChangeNum", "1"), sa);
CardCollection lib = CardLists.filter(ai.getCardsIn(ZoneType.Library), CardCollection lib = CardLists.filter(ai.getCardsIn(ZoneType.Library),
Predicates.not(CardPredicates.nameEquals(sa.getHostCard().getName()))); Predicates.not(CardPredicates.nameEquals(sa.getHostCard().getName())));
Collections.sort(lib, CardLists.CmcComparatorInv); Collections.sort(lib, CardLists.CmcComparatorInv);

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

@@ -387,8 +387,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
return false; return false;
} }
String num = sa.getParam("ChangeNum"); String num = sa.getParamOrDefault("ChangeNum", "1");
if (num != null) {
if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) { if (num.contains("X") && sa.getSVar("X").equals("Count$xPaid")) {
// Set PayX here to maximum value. // Set PayX here to maximum value.
int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger()); int xPay = ComputerUtilCost.getMaxXValue(sa, ai, sa.isTrigger());
@@ -396,7 +395,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
xPay = Math.min(xPay, list.size()); xPay = Math.min(xPay, list.size());
sa.setXManaCostPaid(xPay); sa.setXManaCostPaid(xPay);
} }
}
if (sourceName.equals("Temur Sabertooth")) { if (sourceName.equals("Temur Sabertooth")) {
// activated bounce + pump // activated bounce + pump