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

- cleanups

Browse Source
This commit is contained in:
jendave
2011-08-06 03:43:32 +00:00
parent b94fbfee22
commit ebcf75cd5c
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/DeckConverter.java
View File

@@ -73,6 +73,7 @@ public class DeckConverter {
return o; return o;
} else if(o instanceof forge.Deck[]) { } else if(o instanceof forge.Deck[]) {
//a new-type booster deck //a new-type booster deck
//TODO: FIX this impossible cast
Deck d = (Deck) o; Deck d = (Deck) o;
return d.migrate(); return d.migrate();
} else if(o instanceof Deck) { } else if(o instanceof Deck) {

2
src/forge/Ability_Mana.java
View File

@@ -200,7 +200,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
getSourceCard().setX(X); getSourceCard().setX(X);
}//i.e. "T, remove X charge counters from {name}: add X+1 <color> mana to your mana pool" }//i.e. "T, remove X charge counters from {name}: add X+1 <color> mana to your mana pool"
public String Mana() { public String mana() {
if(!orig.contains("for each")) return Mana; if(!orig.contains("for each")) return Mana;
else { else {
/*String[] manaPart = orig.split(": add "); /*String[] manaPart = orig.split(": add ");

6
src/forge/CardFactory.java
View File

@@ -1061,7 +1061,7 @@ public class CardFactory implements NewConstants {
final boolean TgtPlayer[] = {false}; final boolean TgtPlayer[] = {false};
final boolean TgtCP[] = {false}; final boolean TgtCP[] = {false};
final boolean TgtOpp[] = {false}; final boolean TgtOpp[] = {false};
String tmpCost = new String(""); String tmpCost = "";
if(k[0].contains("CP")) { if(k[0].contains("CP")) {
TgtCP[0] = true; TgtCP[0] = true;
@@ -13372,7 +13372,7 @@ public class CardFactory implements NewConstants {
} }
@Override @Override
public String Mana() { public String mana() {
return this.choices_made[0].toString(); return this.choices_made[0].toString();
} }
@@ -15982,7 +15982,7 @@ public class CardFactory implements NewConstants {
public boolean canPlayAI() public boolean canPlayAI()
{ {
int m = (int)Math.pow(2, CardFactoryUtil.getCards("Doubling Season", Constant.Player.Computer).size()); 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())) ; ComputerUtil.getAvailableMana().size())) ;
setManaCost(n + ""); setManaCost(n + "");
return !(new CardList(AllZone.Computer_Hand.getCards()).containsName("Doubling Season") && n>=5 ) return !(new CardList(AllZone.Computer_Hand.getCards()).containsName("Doubling Season") && n>=5 )

2
src/forge/CardFactory_Creatures.java
View File

@@ -16759,7 +16759,7 @@ public class CardFactory_Creatures {
{ {
private static final long serialVersionUID = 3818278127211421729L; private static final long serialVersionUID = 3818278127211421729L;
public String Mana() public String mana()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for(int i = 0; i < card.getNetAttack(); i++) for(int i = 0; i < card.getNetAttack(); i++)

2
src/forge/CardUtil.java
View File

@@ -229,7 +229,7 @@ public class CardUtil {
static public String addManaCosts(String mc1, String mc2) static public String addManaCosts(String mc1, String mc2)
{ {
String tMC = new String(""); String tMC = "";
Integer cl1, cl2, tCL; Integer cl1, cl2, tCL;
cl1 = Integer.valueOf(mc1.replaceAll("[WUBRGSX]", "").trim()); cl1 = Integer.valueOf(mc1.replaceAll("[WUBRGSX]", "").trim());

4
src/forge/ManaPool.java
View File

@@ -199,7 +199,7 @@ public class ManaPool extends Card {
} }
public void addMana(Ability_Mana am) { 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() + "")); am.getX() + ""));
} }
@@ -245,7 +245,7 @@ public class ManaPool extends Card {
} }
public static String[] getManaParts(Ability_Mana manaAbility) { public static String[] getManaParts(Ability_Mana manaAbility) {
return getManaParts(manaAbility.Mana(), true); return getManaParts(manaAbility.mana(), true);
}//wrapper }//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. 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.