params) {
return ComputerUtilCard.getBestCreatureAI(options);
}
}
diff --git a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
index cf01c1d8026..2ec63fb82ac 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
@@ -46,12 +46,10 @@ public class ScryAi extends SpellAbilityAi {
// and right before the beginning of AI's turn, if possible, to avoid mana locking the AI and also to
// try to scry right before drawing a card. Also, avoid tapping creatures in the AI's turn, if possible,
// even if there's no mana cost.
- if (sa.getPayCosts() != null) {
- if (sa.getPayCosts().hasTapCost()
- && (sa.getPayCosts().hasManaCost() || (sa.getHostCard() != null && sa.getHostCard().isCreature()))
- && !SpellAbilityAi.isSorcerySpeed(sa)) {
- return ph.getNextTurn() == ai && ph.is(PhaseType.END_OF_TURN);
- }
+ if (sa.getPayCosts().hasTapCost()
+ && (sa.getPayCosts().hasManaCost() || (sa.getHostCard() != null && sa.getHostCard().isCreature()))
+ && !SpellAbilityAi.isSorcerySpeed(sa)) {
+ return ph.getNextTurn() == ai && ph.is(PhaseType.END_OF_TURN);
}
// AI logic to scry in Main 1 if there is no better option, otherwise scry at opponent's EOT
@@ -76,8 +74,7 @@ public class ScryAi extends SpellAbilityAi {
boolean hasSomethingElse = false;
for (Card c : CardLists.filter(ai.getCardsIn(ZoneType.Hand), Predicates.not(CardPredicates.Presets.LANDS))) {
for (SpellAbility ab : c.getAllSpellAbilities()) {
- if (ab.getPayCosts() != null
- && ab.getPayCosts().hasManaCost()
+ if (ab.getPayCosts().hasManaCost()
&& ComputerUtilMana.hasEnoughManaSourcesToCast(ab, ai)) {
// TODO: currently looks for non-Scry cards, can most certainly be made smarter.
if (ab.getApi() != ApiType.Scry) {
@@ -102,7 +99,7 @@ public class ScryAi extends SpellAbilityAi {
} else if ("BrainJar".equals(aiLogic)) {
final Card source = sa.getHostCard();
- int counterNum = source.getCounters(CounterType.CHARGE);
+ int counterNum = source.getCounters(CounterEnumType.CHARGE);
// no need for logic
if (counterNum == 0) {
return false;
diff --git a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
index 7e03c1cf0f5..ca7404dee76 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
@@ -248,7 +248,7 @@ public class SetStateAi extends SpellAbilityAi {
final Card othercard = aiPlayer.getCardsIn(ZoneType.Battlefield, other.getName()).getFirst();
// for legendary KI counter creatures
- if (othercard.getCounters(CounterType.KI) >= source.getCounters(CounterType.KI)) {
+ if (othercard.getCounters(CounterEnumType.KI) >= source.getCounters(CounterEnumType.KI)) {
// if the other legendary is useless try to replace it
return ComputerUtilCard.isUselessCreature(aiPlayer, othercard);
}
diff --git a/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java b/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
index eb2beab480b..fb5e6efa0f7 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
@@ -47,12 +47,10 @@ public class SurveilAi extends SpellAbilityAi {
// and right before the beginning of AI's turn, if possible, to avoid mana locking the AI and also to
// try to scry right before drawing a card. Also, avoid tapping creatures in the AI's turn, if possible,
// even if there's no mana cost.
- if (sa.getPayCosts() != null) {
- if (sa.getPayCosts().hasTapCost()
- && (sa.getPayCosts().hasManaCost() || (sa.getHostCard() != null && sa.getHostCard().isCreature()))
- && !SpellAbilityAi.isSorcerySpeed(sa)) {
- return ph.getNextTurn() == ai && ph.is(PhaseType.END_OF_TURN);
- }
+ if (sa.getPayCosts().hasTapCost()
+ && (sa.getPayCosts().hasManaCost() || (sa.getHostCard() != null && sa.getHostCard().isCreature()))
+ && !SpellAbilityAi.isSorcerySpeed(sa)) {
+ return ph.getNextTurn() == ai && ph.is(PhaseType.END_OF_TURN);
}
// in the player's turn Surveil should only be done in Main1 or in Upkeep if able
diff --git a/forge-ai/src/main/java/forge/ai/ability/TapAi.java b/forge-ai/src/main/java/forge/ai/ability/TapAi.java
index a4eb933dbe4..54da422ee87 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TapAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TapAi.java
@@ -3,6 +3,7 @@ package forge.ai.ability;
import forge.ai.*;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
+import forge.game.card.CounterEnumType;
import forge.game.card.CounterType;
import forge.game.cost.Cost;
import forge.game.cost.CostPart;
@@ -68,7 +69,7 @@ public class TapAi extends TapAiBase {
} else {
if ("TapForXCounters".equals(sa.getParam("AILogic"))) {
// e.g. Waxmane Baku
- CounterType ctrType = CounterType.KI;
+ CounterType ctrType = CounterType.get(CounterEnumType.KI);
for (CostPart part : sa.getPayCosts().getCostParts()) {
if (part instanceof CostRemoveCounter) {
ctrType = ((CostRemoveCounter)part).counter;
diff --git a/forge-ai/src/main/java/forge/ai/ability/TapAiBase.java b/forge-ai/src/main/java/forge/ai/ability/TapAiBase.java
index 6a408821cbe..34fbe8f5c8b 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TapAiBase.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TapAiBase.java
@@ -126,7 +126,7 @@ public abstract class TapAiBase extends SpellAbilityAi {
}
for (final SpellAbility sa : c.getSpellAbilities()) {
- if (sa.isAbility() && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost()) {
+ if (sa.isAbility() && sa.getPayCosts().hasTapCost()) {
return true;
}
}
@@ -147,7 +147,7 @@ public abstract class TapAiBase extends SpellAbilityAi {
}
for (final SpellAbility sa : c.getSpellAbilities()) {
- if (sa.isAbility() && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost()) {
+ if (sa.isAbility() && sa.getPayCosts().hasTapCost()) {
return true;
}
}
diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
index a5c3a57fad9..f6a62f567ef 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
@@ -1,11 +1,12 @@
package forge.ai.ability;
+import java.util.Map;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.ai.*;
import forge.game.Game;
import forge.game.GameEntity;
-import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityUtils;
import forge.game.ability.ApiType;
import forge.game.card.Card;
@@ -25,16 +26,9 @@ import forge.game.player.PlayerActionConfirmMode;
import forge.game.spellability.AbilitySub;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions;
-import forge.game.trigger.Trigger;
-import forge.game.trigger.TriggerHandler;
import forge.game.zone.ZoneType;
-import forge.item.PaperToken;
-import forge.util.MyRandom;
-import forge.util.TextUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import forge.util.MyRandom;
/**
*
@@ -45,35 +39,10 @@ import java.util.List;
* @version $Id: AbilityFactoryToken.java 17656 2012-10-22 19:32:56Z Max mtg $
*/
public class TokenAi extends SpellAbilityAi {
- private String tokenAmount;
- private String tokenPower;
- private String tokenToughness;
- private Card actualToken;
- /**
- *
- * Constructor for AbilityFactory_Token.
- *
- *
- * a {@link forge.game.ability.AbilityFactory} object.
- */
- private void readParameters(final SpellAbility mapParams) {
- this.tokenAmount = mapParams.getParamOrDefault("TokenAmount", "1");
-
- this.actualToken = TokenInfo.getProtoType(mapParams.getParam("TokenScript"), mapParams);
-
- if (actualToken == null) {
- this.tokenPower = mapParams.getParam("TokenPower");
- this.tokenToughness = mapParams.getParam("TokenToughness");
- } else {
- this.tokenPower = actualToken.getBasePowerString();
- this.tokenToughness = actualToken.getBaseToughnessString();
- }
- }
-
@Override
protected boolean checkPhaseRestrictions(final Player ai, final SpellAbility sa, final PhaseHandler ph) {
- readParameters(sa); // remember to call this somewhere!
+
final Card source = sa.getHostCard();
// Planeswalker-related flags
boolean pwMinus = false;
@@ -96,21 +65,23 @@ public class TokenAi extends SpellAbilityAi {
}
}
}
+ String tokenAmount = sa.getParamOrDefault("TokenAmount", "1");
- if (actualToken == null) {
- actualToken = spawnToken(ai, sa);
- }
+ Card actualToken = spawnToken(ai, sa);
- if (actualToken == null) {
+ if (actualToken == null || actualToken.getNetToughness() < 1) {
final AbilitySub sub = sa.getSubAbility();
// useful
// no token created
return pwPlus || (sub != null && SpellApiToAi.Converter.get(sub.getApi()).chkAIDrawback(sub, ai)); // planeswalker plus ability or sub-ability is
}
+ String tokenPower = sa.getParamOrDefault("TokenPower", actualToken.getBasePowerString());
+ String tokenToughness = sa.getParamOrDefault("TokenToughness", actualToken.getBaseToughnessString());
+
// X-cost spells
- if (this.tokenAmount.equals("X") || (this.tokenToughness != null && this.tokenToughness.equals("X"))) {
- int x = AbilityUtils.calculateAmount(sa.getHostCard(), this.tokenAmount, sa);
+ if ("X".equals(tokenAmount) || "X".equals(tokenPower) || "X".equals(tokenToughness)) {
+ int x = AbilityUtils.calculateAmount(sa.getHostCard(), tokenAmount, sa);
if (source.getSVar("X").equals("Count$Converge")) {
x = ComputerUtilMana.getConvergeCount(sa, ai);
}
@@ -124,14 +95,14 @@ public class TokenAi extends SpellAbilityAi {
}
}
- if (canInterruptSacrifice(ai, sa, actualToken)) {
+ if (canInterruptSacrifice(ai, sa, actualToken, tokenAmount)) {
return true;
}
- boolean haste = this.actualToken.hasKeyword(Keyword.HASTE);
+ boolean haste = actualToken.hasKeyword(Keyword.HASTE);
boolean oneShot = sa.getSubAbility() != null
&& sa.getSubAbility().getApi() == ApiType.DelayedTrigger;
- boolean isCreature = this.actualToken.getType().isCreature();
+ boolean isCreature = actualToken.getType().isCreature();
// Don't generate tokens without haste before main 2 if possible
if (ph.getPhase().isBefore(PhaseType.MAIN2) && ph.isPlayerTurn(ai) && !haste && !sa.hasParam("ActivationPhases")
@@ -166,9 +137,10 @@ public class TokenAi extends SpellAbilityAi {
if (ComputerUtil.preventRunAwayActivations(sa)) {
return false; // prevent infinite tokens?
}
+ Card actualToken = spawnToken(ai, sa);
// Don't kill AIs Legendary tokens
- if (this.actualToken.getType().isLegendary() && ai.isCardInPlay(this.actualToken.getName())) {
+ if (actualToken.getType().isLegendary() && ai.isCardInPlay(actualToken.getName())) {
// TODO Check if Token is useless due to an aura or counters?
return false;
}
@@ -240,7 +212,7 @@ public class TokenAi extends SpellAbilityAi {
/**
* Checks if the token(s) can save a creature from a sacrifice effect
*/
- private boolean canInterruptSacrifice(final Player ai, final SpellAbility sa, final Card token) {
+ private boolean canInterruptSacrifice(final Player ai, final SpellAbility sa, final Card token, final String tokenAmount) {
final Game game = ai.getGame();
if (game.getStack().isEmpty()) {
return false; // nothing to interrupt
@@ -249,7 +221,7 @@ public class TokenAi extends SpellAbilityAi {
if (topStack.getApi() != ApiType.Sacrifice) {
return false; // not sacrifice effect
}
- final int nTokens = AbilityUtils.calculateAmount(sa.getHostCard(), this.tokenAmount, sa);
+ final int nTokens = AbilityUtils.calculateAmount(sa.getHostCard(), tokenAmount, sa);
final String valid = topStack.getParamOrDefault("SacValid", "Card.Self");
String num = sa.getParam("Amount");
num = (num == null) ? "1" : num;
@@ -271,7 +243,8 @@ public class TokenAi extends SpellAbilityAi {
@Override
protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
- readParameters(sa);
+ String tokenAmount = sa.getParamOrDefault("TokenAmount", "1");
+
final Card source = sa.getHostCard();
final TargetRestrictions tgt = sa.getTargetRestrictions();
if (tgt != null) {
@@ -282,8 +255,12 @@ public class TokenAi extends SpellAbilityAi {
sa.getTargets().add(ai);
}
}
- if ("X".equals(this.tokenAmount) || "X".equals(this.tokenPower) || "X".equals(this.tokenToughness)) {
- int x = AbilityUtils.calculateAmount(source, this.tokenAmount, sa);
+ Card actualToken = spawnToken(ai, sa);
+ String tokenPower = sa.getParamOrDefault("TokenPower", actualToken.getBasePowerString());
+ String tokenToughness = sa.getParamOrDefault("TokenToughness", actualToken.getBaseToughnessString());
+
+ if ("X".equals(tokenAmount) || "X".equals(tokenPower) || "X".equals(tokenToughness)) {
+ int x = AbilityUtils.calculateAmount(source, tokenAmount, sa);
if (source.getSVar("X").equals("Count$xPaid")) {
// Set PayX here to maximum value.
x = ComputerUtilMana.determineLeftoverMana(sa, ai);
@@ -321,9 +298,7 @@ public class TokenAi extends SpellAbilityAi {
* @see forge.card.ability.SpellAbilityAi#chooseSinglePlayer(forge.game.player.Player, forge.card.spellability.SpellAbility, Iterable options)
*/
@Override
- protected Player chooseSinglePlayer(Player ai, SpellAbility sa, Iterable options) {
- // TODO: AILogic
- readParameters(sa); // remember to call this somewhere!
+ protected Player chooseSinglePlayer(Player ai, SpellAbility sa, Iterable options, Map params) {
Combat combat = ai.getGame().getCombat();
// TokenAttacking
if (combat != null && sa.hasParam("TokenAttacking")) {
@@ -341,9 +316,7 @@ public class TokenAi extends SpellAbilityAi {
* @see forge.card.ability.SpellAbilityAi#chooseSinglePlayerOrPlaneswalker(forge.game.player.Player, forge.card.spellability.SpellAbility, Iterable options)
*/
@Override
- protected GameEntity chooseSinglePlayerOrPlaneswalker(Player ai, SpellAbility sa, Iterable options) {
- // TODO: AILogic
- readParameters(sa); // remember to call this somewhere!
+ protected GameEntity chooseSinglePlayerOrPlaneswalker(Player ai, SpellAbility sa, Iterable options, Map params) {
Combat combat = ai.getGame().getCombat();
// TokenAttacking
if (combat != null && sa.hasParam("TokenAttacking")) {
@@ -374,154 +347,22 @@ public class TokenAi extends SpellAbilityAi {
* @param sa Token SpellAbility
* @return token creature created by ability
*/
- @Deprecated
public static Card spawnToken(Player ai, SpellAbility sa) {
- return spawnToken(ai, sa, false);
- }
-
- /**
- * Create the token as a Card object.
- * @param ai owner of the new token
- * @param sa Token SpellAbility
- * @param notNull if the token would not survive, still return it
- * @return token creature created by ability
- */
- // TODO Is this just completely copied from TokenEffect? Let's just call that thing
- @Deprecated
- public static Card spawnToken(Player ai, SpellAbility sa, boolean notNull) {
- final Card host = sa.getHostCard();
-
+ if (!sa.hasParam("TokenScript")) {
+ throw new RuntimeException("Spell Ability has no TokenScript: " + sa);
+ }
Card result = TokenInfo.getProtoType(sa.getParam("TokenScript"), sa);
- if (result != null) {
- result.setController(ai, 0);
- return result;
+ if (result == null) {
+ throw new RuntimeException("don't find Token for TokenScript: " + sa.getParam("TokenScript"));
}
- String[] tokenKeywords = sa.hasParam("TokenKeywords") ? sa.getParam("TokenKeywords").split("<>") : new String[0];
- String tokenPower = sa.getParam("TokenPower");
- String tokenToughness = sa.getParam("TokenToughness");
- String tokenName = sa.getParam("TokenName");
- String[] tokenTypes = sa.getParam("TokenTypes").split(",");
- StringBuilder cost = new StringBuilder();
- String[] tokenColors = sa.getParam("TokenColors").split(",");
- String tokenImage = sa.hasParam("TokenImage") ? PaperToken.makeTokenFileName(sa.getParam("TokenImage")) : "";
- String[] tokenAbilities = sa.hasParam("TokenAbilities") ? sa.getParam("TokenAbilities").split(",") : null;
- String[] tokenTriggers = sa.hasParam("TokenTriggers") ? sa.getParam("TokenTriggers").split(",") : null;
- String[] tokenSVars = sa.hasParam("TokenSVars") ? sa.getParam("TokenSVars").split(",") : null;
- String[] tokenStaticAbilities = sa.hasParam("TokenStaticAbilities") ? sa.getParam("TokenStaticAbilities").split(",") : null;
- String[] tokenHiddenKeywords = sa.hasParam("TokenHiddenKeywords") ? sa.getParam("TokenHiddenKeywords").split("&") : null;
- final String[] substitutedColors = Arrays.copyOf(tokenColors, tokenColors.length);
- for (int i = 0; i < substitutedColors.length; i++) {
- if (substitutedColors[i].equals("ChosenColor")) {
- // this currently only supports 1 chosen color
- substitutedColors[i] = host.getChosenColor();
- }
- }
- StringBuilder colorDesc = new StringBuilder();
- for (final String col : substitutedColors) {
- if (col.equalsIgnoreCase("White")) {
- colorDesc.append("W ");
- } else if (col.equalsIgnoreCase("Blue")) {
- colorDesc.append("U ");
- } else if (col.equalsIgnoreCase("Black")) {
- colorDesc.append("B ");
- } else if (col.equalsIgnoreCase("Red")) {
- colorDesc.append("R ");
- } else if (col.equalsIgnoreCase("Green")) {
- colorDesc.append("G ");
- } else if (col.equalsIgnoreCase("Colorless")) {
- colorDesc = new StringBuilder("C");
- }
- }
-
- final List imageNames = new ArrayList<>(1);
- if (tokenImage.equals("")) {
- imageNames.add(PaperToken.makeTokenFileName(TextUtil.fastReplace(colorDesc.toString(), " ", ""), tokenPower, tokenToughness, tokenName));
- } else {
- imageNames.add(0, tokenImage);
- }
+ result.setOwner(ai);
- for (final char c : colorDesc.toString().toCharArray()) {
- cost.append(c + ' ');
- }
-
- cost = new StringBuilder(colorDesc.toString().replace('C', '1').trim());
-
- final int finalPower = AbilityUtils.calculateAmount(host, tokenPower, sa);
- final int finalToughness = AbilityUtils.calculateAmount(host, tokenToughness, sa);
-
- final String[] substitutedTypes = Arrays.copyOf(tokenTypes, tokenTypes.length);
- for (int i = 0; i < substitutedTypes.length; i++) {
- if (substitutedTypes[i].equals("ChosenType")) {
- substitutedTypes[i] = host.getChosenType();
- }
- }
- final String substitutedName = tokenName.equals("ChosenType") ? host.getChosenType() : tokenName;
- final String imageName = imageNames.get(MyRandom.getRandom().nextInt(imageNames.size()));
- final TokenInfo tokenInfo = new TokenInfo(substitutedName, imageName,
- cost.toString(), substitutedTypes, tokenKeywords, finalPower, finalToughness);
- Card token = tokenInfo.makeOneToken(ai);
-
- if (token == null) {
- return null;
- }
-
- // Grant rule changes
- if (tokenHiddenKeywords != null) {
- for (final String s : tokenHiddenKeywords) {
- token.addHiddenExtrinsicKeyword(s);
- }
- }
-
- // Grant abilities
- if (tokenAbilities != null) {
- for (final String s : tokenAbilities) {
- final String actualAbility = host.getSVar(s);
- final SpellAbility grantedAbility = AbilityFactory.getAbility(actualAbility, token);
- token.addSpellAbility(grantedAbility);
- }
- }
-
- // Grant triggers
- if (tokenTriggers != null) {
- for (final String s : tokenTriggers) {
- final String actualTrigger = host.getSVar(s);
- final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, token, true);
- final String ability = host.getSVar(parsedTrigger.getParam("Execute"));
- parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(ability, token));
- token.addTrigger(parsedTrigger);
- }
- }
-
- // Grant SVars
- if (tokenSVars != null) {
- for (final String s : tokenSVars) {
- String actualSVar = host.getSVar(s);
- String name = s;
- if (actualSVar.startsWith("SVar")) {
- actualSVar = actualSVar.split("SVar:")[1];
- name = actualSVar.split(":")[0];
- actualSVar = actualSVar.split(":")[1];
- }
- token.setSVar(name, actualSVar);
- }
- }
-
- // Grant static abilities
- if (tokenStaticAbilities != null) {
- for (final String s : tokenStaticAbilities) {
- token.addStaticAbility(host.getSVar(s));
- }
- }
-
- // Apply static abilities and prune dead tokens
+ // Apply static abilities
final Game game = ai.getGame();
- ComputerUtilCard.applyStaticContPT(game, token, null);
- if (!notNull && token.isCreature() && token.getNetToughness() < 1) {
- return null;
- } else {
- return token;
- }
+ ComputerUtilCard.applyStaticContPT(game, result, null);
+ return result;
}
+
}
diff --git a/forge-ai/src/main/java/forge/ai/ability/UntapAi.java b/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
index 5e2659fdacc..be7eb4f2ae9 100644
--- a/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/UntapAi.java
@@ -24,6 +24,7 @@ import forge.game.spellability.TargetRestrictions;
import forge.game.zone.ZoneType;
import java.util.List;
+import java.util.Map;
public class UntapAi extends SpellAbilityAi {
@Override
@@ -153,12 +154,11 @@ public class UntapAi extends SpellAbilityAi {
// Try to avoid potential infinite recursion,
// e.g. Kiora's Follower untapping another Kiora's Follower and repeating infinitely
- if (sa.getPayCosts() != null && sa.getPayCosts().hasOnlySpecificCostType(CostTap.class)) {
+ if (sa.getPayCosts().hasOnlySpecificCostType(CostTap.class)) {
CardCollection toRemove = new CardCollection();
for (Card c : untapList) {
for (SpellAbility ab : c.getAllSpellAbilities()) {
if (ab.getApi() == ApiType.Untap
- && ab.getPayCosts() != null
&& ab.getPayCosts().hasOnlySpecificCostType(CostTap.class)
&& ab.canTarget(source)) {
toRemove.add(c);
@@ -312,7 +312,7 @@ public class UntapAi extends SpellAbilityAi {
}
@Override
- public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable list, boolean isOptional, Player targetedPlayer) {
+ public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable list, boolean isOptional, Player targetedPlayer, Map params) {
PlayerCollection pl = new PlayerCollection();
pl.add(ai);
pl.addAll(ai.getAllies());
diff --git a/forge-ai/src/main/java/forge/ai/ability/VoteAi.java b/forge-ai/src/main/java/forge/ai/ability/VoteAi.java
index 58aab03ecbb..33d23dd3b22 100644
--- a/forge-ai/src/main/java/forge/ai/ability/VoteAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/VoteAi.java
@@ -46,6 +46,12 @@ public class VoteAi extends SpellAbilityAi {
@Override
public int chooseNumber(Player player, SpellAbility sa, int min, int max, Map params) {
+ if (params.containsKey("Voter")) {
+ Player p = (Player)params.get("Voter");
+ if (p.isOpponentOf(player)) {
+ return min;
+ }
+ }
if (sa.getActivatingPlayer().isOpponentOf(player)) {
return min;
}
diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
index cd99a5a6d94..1fac17f367a 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
@@ -76,7 +76,7 @@ public class GameCopier {
newPlayer.addSpellCastThisTurn();
for (int j = 0; j < origPlayer.getLandsPlayedThisTurn(); j++)
newPlayer.addLandPlayedThisTurn();
- newPlayer.setCounters(Maps.newEnumMap(origPlayer.getCounters()));
+ newPlayer.setCounters(Maps.newHashMap(origPlayer.getCounters()));
newPlayer.setLifeLostLastTurn(origPlayer.getLifeLostLastTurn());
newPlayer.setLifeLostThisTurn(origPlayer.getLifeLostThisTurn());
newPlayer.setPreventNextDamage(origPlayer.getPreventNextDamage());
@@ -125,8 +125,6 @@ public class GameCopier {
}
}
}
- origGame.validateSpabCache();
- newGame.validateSpabCache();
// Undo effects first before calculating them below, to avoid them applying twice.
for (StaticEffect effect : origGame.getStaticEffects().getEffects()) {
@@ -330,7 +328,7 @@ public class GameCopier {
Map counters = c.getCounters();
if (!counters.isEmpty()) {
- newCard.setCounters(Maps.newEnumMap(counters));
+ newCard.setCounters(Maps.newHashMap(counters));
}
if (c.getChosenPlayer() != null) {
newCard.setChosenPlayer(playerMap.get(c.getChosenPlayer()));
diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
index f2d0f01bf85..e3dc9e8a64c 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
@@ -3,7 +3,7 @@ package forge.ai.simulation;
import forge.ai.CreatureEvaluator;
import forge.game.Game;
import forge.game.card.Card;
-import forge.game.card.CounterType;
+import forge.game.card.CounterEnumType;
import forge.game.phase.PhaseType;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
@@ -154,7 +154,7 @@ public class GameStateEvaluator {
// e.g. a 5 CMC permanent results in 200, whereas a 5/5 creature is ~225
int value = 50 + 30 * c.getCMC();
if (c.isPlaneswalker()) {
- value += 2 * c.getCounters(CounterType.LOYALTY);
+ value += 2 * c.getCounters(CounterEnumType.LOYALTY);
}
return value;
}
diff --git a/forge-core/pom.xml b/forge-core/pom.xml
index 9c13b0d69aa..620b62074e2 100644
--- a/forge-core/pom.xml
+++ b/forge-core/pom.xml
@@ -6,7 +6,7 @@
forge
forge
- 1.6.33-SNAPSHOT
+ 1.6.36-SNAPSHOT
forge-core
diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index e07f836566d..4ea30d2a17d 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -6,6 +6,8 @@ import forge.util.ImageUtil;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
+
+
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -113,7 +115,17 @@ public final class ImageKeys {
}
//try fullborder...
if (filename.contains(".full")) {
- file = findFile(dir, TextUtil.fastReplace(filename, ".full", ".fullborder"));
+ String fullborderFile = TextUtil.fastReplace(filename, ".full", ".fullborder");
+ file = findFile(dir, fullborderFile);
+ if (file != null) { return file; }
+ // if there's a 1st art variant try without it for .fullborder images
+ file = findFile(dir, TextUtil.fastReplace(fullborderFile, "1.fullborder", ".fullborder"));
+ if (file != null) { return file; }
+ // if there's an art variant try without it for .full images
+ file = findFile(dir, filename.replaceAll("[0-9].full]",".full"));
+ if (file != null) { return file; }
+ // if there's a 1st art variant try with it for .full images
+ file = findFile(dir, filename.replaceAll("[0-9]*.full", "1.full"));
if (file != null) { return file; }
}
//if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder
diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index 6b65424daab..af533330a5b 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -54,11 +54,11 @@ public class StaticData {
private static StaticData lastInstance = null;
- public StaticData(CardStorageReader cardReader, String editionFolder, String blockDataFolder) {
- this(cardReader, null, editionFolder, blockDataFolder);
+ public StaticData(CardStorageReader cardReader, String editionFolder, String blockDataFolder, boolean enableUnknownCards) {
+ this(cardReader, null, editionFolder, blockDataFolder, enableUnknownCards);
}
- public StaticData(CardStorageReader cardReader, CardStorageReader tokenReader, String editionFolder, String blockDataFolder) {
+ public StaticData(CardStorageReader cardReader, CardStorageReader tokenReader, String editionFolder, String blockDataFolder, boolean enableUnknownCards) {
this.cardReader = cardReader;
this.tokenReader = tokenReader;
this.editions = new CardEdition.Collection(new CardEdition.Reader(new File(editionFolder)));
@@ -84,8 +84,8 @@ public class StaticData {
variantCards = new CardDb(variantsCards, editions);
//must initialize after establish field values for the sake of card image logic
- commonCards.initialize(false, false);
- variantCards.initialize(false, false);
+ commonCards.initialize(false, false, enableUnknownCards);
+ variantCards.initialize(false, false, enableUnknownCards);
}
{
@@ -215,7 +215,7 @@ public class StaticData {
public Predicate getStandardPredicate() { return standardPredicate; }
public Predicate getPioneerPredicate() { return pioneerPredicate; }
-
+
public Predicate getModernPredicate() { return modernPredicate; }
public Predicate getCommanderPredicate() { return commanderPredicate; }
diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 2c4e54ad21a..a7b10ec600e 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -165,7 +165,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
reIndex();
}
- public void initialize(boolean logMissingPerEdition, boolean logMissingSummary) {
+ public void initialize(boolean logMissingPerEdition, boolean logMissingSummary, boolean enableUnknownCards) {
Set allMissingCards = new LinkedHashSet<>();
List missingCards = new ArrayList<>();
CardEdition upcomingSet = null;
@@ -218,7 +218,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
if (!contains(cr.getName())) {
if (upcomingSet != null) {
addCard(new PaperCard(cr, upcomingSet.getCode(), CardRarity.Unknown, 1));
- } else {
+ } else if(enableUnknownCards) {
System.err.println("The card " + cr.getName() + " was not assigned to any set. Adding it to UNKNOWN set... to fix see res/editions/ folder. ");
addCard(new PaperCard(cr, CardEdition.UNKNOWN.getCode(), CardRarity.Special, 1));
}
@@ -312,17 +312,21 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
return tryGetCard(request);
}
- public int getCardCollectorNumber(String cardName, String reqEdition) {
+ public String getCardCollectorNumber(String cardName, String reqEdition, int artIndex) {
cardName = getName(cardName);
CardEdition edition = editions.get(reqEdition);
if (edition == null)
- return -1;
+ return null;
+ int numMatches = 0;
for (CardInSet card : edition.getCards()) {
if (card.name.equalsIgnoreCase(cardName)) {
- return card.collectorNumber;
+ numMatches += 1;
+ if (numMatches == artIndex) {
+ return card.collectorNumber;
+ }
}
}
- return -1;
+ return null;
}
private PaperCard tryGetCard(CardRequest request) {
diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index e2b786c0322..ce6289bb5f5 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -38,6 +38,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
@@ -75,10 +77,10 @@ public final class CardEdition implements Comparable { // immutable
public static class CardInSet {
public final CardRarity rarity;
- public final int collectorNumber;
+ public final String collectorNumber;
public final String name;
- public CardInSet(final String name, final int collectorNumber, final CardRarity rarity) {
+ public CardInSet(final String name, final String collectorNumber, final CardRarity rarity) {
this.name = name;
this.collectorNumber = collectorNumber;
this.rarity = rarity;
@@ -86,7 +88,7 @@ public final class CardEdition implements Comparable { // immutable
public String toString() {
StringBuilder sb = new StringBuilder();
- if (collectorNumber != -1) {
+ if (collectorNumber != null) {
sb.append(collectorNumber);
sb.append(' ');
}
@@ -190,6 +192,7 @@ public final class CardEdition implements Comparable { // immutable
public boolean getSmallSetOverride() { return smallSetOverride; }
public String getBoosterMustContain() { return boosterMustContain; }
public CardInSet[] getCards() { return cards; }
+ public boolean isModern() { return getDate().after(parseDate("2003-07-27")); } //8ED and above are modern except some promo cards and others
public Map getTokens() { return tokenNormalized; }
@@ -266,24 +269,33 @@ public final class CardEdition implements Comparable { // immutable
Map tokenNormalized = new HashMap<>();
List processedCards = new ArrayList<>();
if (contents.containsKey("cards")) {
+ final Pattern pattern = Pattern.compile(
+ /*
+ The following pattern will match the WAR Japanese art entries,
+ it should also match the Un-set and older alternate art cards
+ like Merseine from FEM (should the editions files ever be updated)
+ */
+ //"(^(?[0-9]+.?) )?((?[SCURML]) )?(?