remove mana cost constants
parent
6d9b9a17f3
commit
a1634f4339
|
@ -15,6 +15,7 @@ import magic.model.choice.MagicMayChoice;
|
|||
import magic.model.choice.MagicPayManaCostChoice;
|
||||
import magic.model.choice.MagicPayManaCostResult;
|
||||
import magic.model.condition.MagicCondition;
|
||||
import magic.model.condition.MagicConditionFactory;
|
||||
import magic.model.event.MagicActivationHints;
|
||||
import magic.model.event.MagicEvent;
|
||||
import magic.model.event.MagicPayManaCostEvent;
|
||||
|
@ -30,18 +31,20 @@ import java.util.Collection;
|
|||
public class Rise_of_the_Hobgoblins {
|
||||
|
||||
public static final MagicPermanentActivation A1 = new MagicPermanentActivation(
|
||||
new MagicCondition[]{MagicManaCost.RED_OR_WHITE.getCondition()},
|
||||
new MagicCondition[]{MagicConditionFactory.ManaCost("{R/W}")},
|
||||
new MagicActivationHints(MagicTiming.Block,true,1),
|
||||
"First strike") {
|
||||
|
||||
@Override
|
||||
public MagicEvent[] getCostEvent(final MagicPermanent source) {
|
||||
return new MagicEvent[]{
|
||||
new MagicPayManaCostEvent(
|
||||
source,
|
||||
source.getController(),
|
||||
MagicManaCost.RED_OR_WHITE),
|
||||
new MagicPlayAbilityEvent(source)};
|
||||
new MagicPayManaCostEvent(
|
||||
source,
|
||||
source.getController(),
|
||||
MagicManaCost.create("{R/W}")
|
||||
),
|
||||
new MagicPlayAbilityEvent(source)
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -51,10 +51,6 @@ public class MagicManaCost {
|
|||
public static final MagicManaCost RED=MagicManaCost.create("{R}");
|
||||
public static final MagicManaCost WHITE=MagicManaCost.create("{W}");
|
||||
|
||||
public static final MagicManaCost RED_OR_WHITE=MagicManaCost.create("{R/W}");
|
||||
public static final MagicManaCost BLACK_OR_RED=MagicManaCost.create("{B/R}");
|
||||
public static final MagicManaCost WHITE_OR_BLACK=MagicManaCost.create("{W/B}");
|
||||
|
||||
private final String costText;
|
||||
private final int[] amounts;
|
||||
private final int converted;
|
||||
|
|
|
@ -28,7 +28,7 @@ public class MagicExtortTrigger extends MagicWhenOtherSpellIsCastTrigger {
|
|||
new MagicEvent(
|
||||
permanent,
|
||||
new MagicMayChoice(
|
||||
new MagicPayManaCostChoice(MagicManaCost.WHITE_OR_BLACK)
|
||||
new MagicPayManaCostChoice(MagicManaCost.create("{W/B}"))
|
||||
),
|
||||
this,
|
||||
"You may$ pay {W/B}. If you do, each opponent loses 1 life and you gain that much life."
|
||||
|
|
Loading…
Reference in New Issue