* Started adding the new colorless mana {C}. Not finished yet but the exception is removed.

This commit is contained in:
LevelX2 2015-12-16 12:40:10 +01:00
parent aa07fcecd5
commit 131d3af759
4 changed files with 230 additions and 137 deletions

View file

@ -0,0 +1,110 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.costs.mana;
import mage.Mana;
import mage.abilities.Ability;
import mage.constants.ColoredManaSymbol;
import mage.game.Game;
import mage.players.ManaPool;
/**
*
* @author LevelX2
*/
public class ColorlessManaCost extends ManaCostImpl {
protected int mana;
public ColorlessManaCost(int mana) {
this.mana = mana;
this.cost = Mana.ColorlessMana(mana);
this.options.addMana(Mana.ColorlessMana(mana));
}
public ColorlessManaCost(ColorlessManaCost manaCost) {
super(manaCost);
this.mana = manaCost.mana;
}
public void setMana(int mana) {
this.mana = mana;
}
@Override
public int convertedManaCost() {
return mana;
}
@Override
public boolean isPaid() {
if (paid) {
return true;
}
return this.isColorlessPaid(mana);
}
@Override
public void assignPayment(Game game, Ability ability, ManaPool pool) {
this.assignColorless(ability, game, pool, mana);
}
@Override
public String getText() {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < mana; i++) {
sb.append("{C}");
}
return sb.toString();
}
@Override
public ColorlessManaCost getUnpaid() {
ColorlessManaCost unpaid = new ColorlessManaCost(mana - this.payment.count());
if (sourceFilter != null) {
unpaid.setSourceFilter(sourceFilter);
}
return unpaid;
}
@Override
public boolean testPay(Mana testMana) {
return testMana.getColorless() > 0;
}
@Override
public ColorlessManaCost copy() {
return new ColorlessManaCost(this);
}
@Override
public boolean containsColor(ColoredManaSymbol coloredManaSymbol) {
return false;
}
}

View file

@ -315,13 +315,14 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
if (symbol.length() > 0) {
if (symbol.length() == 1 || isNumeric(symbol)) {
if (Character.isDigit(symbol.charAt(0))) {
this.add((T) new GenericManaCost(Integer.valueOf(symbol)));
this.add(new GenericManaCost(Integer.valueOf(symbol)));
} else {
if(symbol.equals("S")) {
this.add((T) new SnowManaCost());
}
else if (!symbol.equals("X")) {
this.add((T) new ColoredManaCost(ColoredManaSymbol.lookup(symbol.charAt(0))));
if (symbol.equals("S")) {
this.add(new SnowManaCost());
} else if (symbol.equals("C")) {
this.add(new ColorlessManaCost(1));
} else if (!symbol.equals("X")) {
this.add(new ColoredManaCost(ColoredManaSymbol.lookup(symbol.charAt(0))));
} else {
// check X wasn't added before
if (modifierForX == 0) {
@ -331,7 +332,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
modifierForX++;
}
}
this.add((T) new VariableManaCost(modifierForX));
this.add(new VariableManaCost(modifierForX));
}
}
//TODO: handle multiple {X} and/or {Y} symbols