Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove mana cost constant

master
melvin 2013-02-27 16:53:15 +08:00
parent 24311d504b
commit f9eaa6613e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/magic/card/Mirror_Entity.java
View File

@ -10,6 +10,7 @@ import magic.model.MagicSubType;
import magic.model.action.MagicBecomesCreatureAction; import magic.model.action.MagicBecomesCreatureAction;
import magic.model.action.MagicPlayAbilityAction; import magic.model.action.MagicPlayAbilityAction;
import magic.model.condition.MagicCondition; import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints; import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent; import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostEvent; import magic.model.event.MagicPayManaCostEvent;
@ -26,13 +27,13 @@ import java.util.Set;
public class Mirror_Entity { public class Mirror_Entity {
public static final MagicPermanentActivation A = new MagicPermanentActivation( public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.X.getCondition()}, new MagicCondition[]{MagicConditionFactory.ManaCost("{X}")},
new MagicActivationHints(MagicTiming.Pump,true,1), new MagicActivationHints(MagicTiming.Pump,true,1),
"X/X") { "X/X") {
@Override @Override
public MagicEvent[] getCostEvent(final MagicPermanent source) { public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{ return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.X), new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{X}")),
new MagicPlayAbilityEvent(source)}; new MagicPlayAbilityEvent(source)};
} }
@Override @Override

5
src/magic/card/Oracle_of_Nectars.java
View File

@ -7,6 +7,7 @@ import magic.model.MagicPermanent;
import magic.model.MagicSource; import magic.model.MagicSource;
import magic.model.action.MagicChangeLifeAction; import magic.model.action.MagicChangeLifeAction;
import magic.model.condition.MagicCondition; import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints; import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent; import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent; import magic.model.event.MagicPayManaCostTapEvent;
@ -15,12 +16,12 @@ import magic.model.event.MagicTiming;
public class Oracle_of_Nectars { public class Oracle_of_Nectars {
public static final MagicPermanentActivation A = new MagicPermanentActivation( public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.X.getCondition()}, new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{X}")},
new MagicActivationHints(MagicTiming.Draw), new MagicActivationHints(MagicTiming.Draw),
"Life+X") { "Life+X") {
@Override @Override
public MagicEvent[] getCostEvent(final MagicPermanent source) { public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.X)}; return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{X}"))};
} }
@Override @Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) { public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

2
src/magic/card/Rise_of_the_Hobgoblins.java
View File

@ -84,7 +84,7 @@ public class Rise_of_the_Hobgoblins {
permanent, permanent,
player, player,
new MagicMayChoice( new MagicMayChoice(
new MagicPayManaCostChoice(MagicManaCost.X) new MagicPayManaCostChoice(MagicManaCost.create("{X}"))
), ),
this, this,
"You may pay$ {X}$. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield."); "You may pay$ {X}$. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield.");

1
src/magic/model/MagicManaCost.java
View File

@ -43,7 +43,6 @@ public class MagicManaCost {
IconImages.COST_SIXTEEN IconImages.COST_SIXTEEN
}; };
public static final MagicManaCost X=MagicManaCost.create("{X}");
public static final MagicManaCost ZERO=MagicManaCost.create("{0}"); public static final MagicManaCost ZERO=MagicManaCost.create("{0}");
private final String costText; private final String costText;