github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support for multi X in variable cost

Browse source
This commit is contained in:
Loki 2012-05-05 17:58:55 +04:00
parent 2d0c1a5efa
commit 160504ef42
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -28,7 +28,6 @@
package mage.abilities.costs.mana;
import java.util.*;
import mage.Constants.ColoredManaSymbol;
import mage.Mana;
import mage.abilities.Ability;
@ -40,6 +39,8 @@ import mage.players.ManaPool;
import mage.players.Player;
import mage.target.Targets;
import java.util.*;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -252,6 +253,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
if (mana == null || mana.length() == 0)
return;
String[] symbols = mana.split("^\\{|\\}\\{|\\}$");
int modifierForX = 0;
for (String symbol : symbols) {
if (symbol.length() > 0) {
if (symbol.length() == 1 || isNumeric(symbol)) {
@ -260,8 +262,18 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
} else {
if (!symbol.equals("X"))
this.add((T) new ColoredManaCost(ColoredManaSymbol.lookup(symbol.charAt(0))));
else
this.add((T) new VariableManaCost());
else {
// check X wasn't added before
if (modifierForX == 0) {
// count X occurence
for (String s : symbols) {
if (s.equals("X")) {
modifierForX++;
}
}
this.add((T) new VariableManaCost(modifierForX));
}
}
//TODO: handle multiple {X} and/or {Y} symbols
}
} else {

4
Mage/src/mage/abilities/costs/mana/VariableManaCost.java
View file

@ -46,12 +46,12 @@ public class VariableManaCost extends ManaCostImpl<VariableManaCost> implements
public VariableManaCost() {
this(1);
this.cost = new Mana();
options.add(new Mana());
}
public VariableManaCost(int multiplier) {
this.multiplier = multiplier;
this.cost = new Mana();
options.add(new Mana());
}
public VariableManaCost(VariableManaCost manaCost) {