diff --git a/src/DeckConverter.java b/src/DeckConverter.java index e1c2e479bfc..0461a302904 100644 --- a/src/DeckConverter.java +++ b/src/DeckConverter.java @@ -73,6 +73,7 @@ public class DeckConverter { return o; } else if(o instanceof forge.Deck[]) { //a new-type booster deck + //TODO: FIX this impossible cast Deck d = (Deck) o; return d.migrate(); } else if(o instanceof Deck) { diff --git a/src/forge/Ability_Mana.java b/src/forge/Ability_Mana.java index 8035816dfc9..432d44cba49 100644 --- a/src/forge/Ability_Mana.java +++ b/src/forge/Ability_Mana.java @@ -200,7 +200,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria getSourceCard().setX(X); }//i.e. "T, remove X charge counters from {name}: add X+1 mana to your mana pool" - public String Mana() { + public String mana() { if(!orig.contains("for each")) return Mana; else { /*String[] manaPart = orig.split(": add "); diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index e8a8187a77f..4c379210d5e 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -1061,7 +1061,7 @@ public class CardFactory implements NewConstants { final boolean TgtPlayer[] = {false}; final boolean TgtCP[] = {false}; final boolean TgtOpp[] = {false}; - String tmpCost = new String(""); + String tmpCost = ""; if(k[0].contains("CP")) { TgtCP[0] = true; @@ -13372,7 +13372,7 @@ public class CardFactory implements NewConstants { } @Override - public String Mana() { + public String mana() { return this.choices_made[0].toString(); } @@ -15982,7 +15982,7 @@ public class CardFactory implements NewConstants { public boolean canPlayAI() { int m = (int)Math.pow(2, CardFactoryUtil.getCards("Doubling Season", Constant.Player.Computer).size()); - int n = Math.max(1, Math.min((int)Math.ceil((100-getSourceCard().getCounters(Counters.TOWER))/m), + int n = Math.max(1, Math.min((100-getSourceCard().getCounters(Counters.TOWER))/m, ComputerUtil.getAvailableMana().size())) ; setManaCost(n + ""); return !(new CardList(AllZone.Computer_Hand.getCards()).containsName("Doubling Season") && n>=5 ) diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 9cdd3ae3c17..8cbbcc3871b 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -16759,7 +16759,7 @@ public class CardFactory_Creatures { { private static final long serialVersionUID = 3818278127211421729L; - public String Mana() + public String mana() { StringBuilder sb = new StringBuilder(); for(int i = 0; i < card.getNetAttack(); i++) diff --git a/src/forge/CardUtil.java b/src/forge/CardUtil.java index 3e67262127d..cc5c98f4e93 100644 --- a/src/forge/CardUtil.java +++ b/src/forge/CardUtil.java @@ -229,7 +229,7 @@ public class CardUtil { static public String addManaCosts(String mc1, String mc2) { - String tMC = new String(""); + String tMC = ""; Integer cl1, cl2, tCL; cl1 = Integer.valueOf(mc1.replaceAll("[WUBRGSX]", "").trim()); diff --git a/src/forge/ManaPool.java b/src/forge/ManaPool.java index da217e24c18..800e77fb4ac 100644 --- a/src/forge/ManaPool.java +++ b/src/forge/ManaPool.java @@ -199,7 +199,7 @@ public class ManaPool extends Card { } public void addMana(Ability_Mana am) { - (!isSnow() && am.isSnow()? smp:this).addMana(!am.Mana().contains("X")? am.Mana():am.Mana().replaceAll("X", + (!isSnow() && am.isSnow()? smp:this).addMana(!am.mana().contains("X")? am.mana():am.mana().replaceAll("X", am.getX() + "")); } @@ -245,7 +245,7 @@ public class ManaPool extends Card { } public static String[] getManaParts(Ability_Mana manaAbility) { - return getManaParts(manaAbility.Mana(), true); + return getManaParts(manaAbility.mana(), true); }//wrapper public static String[] getManaParts(String Mana_2)//turns "G G" -> {"G","G"}, "2 UG"->"{"2","U/G"}, "B W U R G" -> {"B","W","U","R","G"}, etc.