Merge pull request #139 from Northmoc/changenum_defaults

AI: "ChangeNum" defaults
This commit is contained in:
Agetian
2022-04-25 19:56:56 +03:00
committed by GitHub
2 changed files with 9 additions and 10 deletions

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);

View File

@@ -387,15 +387,13 @@ 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()); if (xPay == 0) return false;
if (xPay == 0) return false; 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")) {