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

remove mana cost constants

master
melvin 2013-02-27 16:47:39 +08:00
parent a1634f4339
commit 24311d504b
43 changed files with 117 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import magic.model.action.MagicDealDamageAction;
import magic.model.action.MagicTargetAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -20,13 +21,13 @@ import magic.model.target.MagicTarget;
public class Ancient_Hellkite {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.IS_ATTACKING_CONDITION,MagicManaCost.RED.getCondition()},
new MagicCondition[]{MagicCondition.IS_ATTACKING_CONDITION,MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Removal),
"Damage") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.RED)};
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{R}"))};
}
@Override

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

@ -8,6 +8,7 @@ import magic.model.MagicPlayer;
import magic.model.MagicSource;
import magic.model.action.MagicExileUntilEndOfTurnAction;
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;
@ -19,7 +20,7 @@ import magic.model.event.MagicTiming;
public class Argent_Sphinx {
public static final MagicPermanentActivation A =new MagicPermanentActivation(
new MagicCondition[]{
MagicManaCost.BLUE.getCondition(),
MagicConditionFactory.ManaCost("{U}"),
MagicCondition.METALCRAFT_CONDITION
},
new MagicActivationHints(MagicTiming.Removal,false,1),
@ -28,7 +29,7 @@ public class Argent_Sphinx {
public MagicEvent[] getCostEvent(final MagicPermanent source) {
final MagicPlayer player=source.getController();
return new MagicEvent[]{
new MagicPayManaCostEvent(source,player,MagicManaCost.BLUE),
new MagicPayManaCostEvent(source,player,MagicManaCost.create("{U}")),
new MagicPlayAbilityEvent(source)};
}
@Override

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

@ -9,6 +9,7 @@ import magic.model.action.MagicDestroyAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostSacrificeEvent;
@ -18,7 +19,7 @@ import magic.model.target.MagicDestroyTargetPicker;
public class Barbarian_Riftcutter {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.RED.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Removal),
"Destroy"
) {
@ -29,7 +30,7 @@ public class Barbarian_Riftcutter {
new MagicPayManaCostSacrificeEvent(
source,
source.getController(),
MagicManaCost.RED
MagicManaCost.create("{R}")
)
};
}

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

@ -3,6 +3,7 @@ package magic.card;
import magic.model.MagicManaCost;
import magic.model.MagicPermanent;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -12,14 +13,14 @@ import magic.model.event.MagicTiming;
public class Blinding_Mage {
public static final MagicPermanentActivation A = new MagicTapCreatureActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.WHITE.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{W}")},
new MagicActivationHints(MagicTiming.Tapping),
"Tap") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),
MagicManaCost.WHITE)};
MagicManaCost.create("{W}"))};
}
};
}

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

@ -11,6 +11,7 @@ import magic.model.action.MagicDealDamageAction;
import magic.model.action.MagicPlayerAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -24,7 +25,7 @@ import magic.model.target.MagicTargetHint;
public class Brion_Stoutarm {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,MagicManaCost.RED.getCondition(),
MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{R}"),
MagicCondition.TWO_CREATURES_CONDITION
},
new MagicActivationHints(MagicTiming.Removal),
@ -37,7 +38,7 @@ public class Brion_Stoutarm {
final MagicTargetChoice targetChoice=new MagicTargetChoice(
targetFilter,false,MagicTargetHint.None,"a creature other than " + source + " to sacrifice");
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.RED),
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{R}")),
new MagicSacrificePermanentEvent(source,source.getController(),targetChoice)};
}

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

@ -9,6 +9,7 @@ import magic.model.action.MagicChangeTurnPTAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -19,14 +20,14 @@ import magic.model.target.MagicPumpTargetPicker;
public class Captive_Flame {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.RED.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Pump,true),
"Pump"
) {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.RED)};
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{R}"))};
}
@Override

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

@ -8,6 +8,7 @@ import magic.model.MagicPermanent;
import magic.model.MagicSource;
import magic.model.action.MagicChangeCountersAction;
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;
@ -23,14 +24,14 @@ public class Carnifex_Demon {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.MINUS_COUNTER_CONDITION,
MagicManaCost.BLACK.getCondition()
MagicConditionFactory.ManaCost("{B}")
},
new MagicActivationHints(MagicTiming.Removal),
"-1/-1") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.BLACK),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{B}")),
new MagicRemoveCounterEvent(source,MagicCounterType.MinusOne,1)};
}
@Override

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

@ -8,6 +8,7 @@ import magic.model.MagicSource;
import magic.model.action.MagicRegenerateAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.condition.MagicSingleActivationCondition;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
@ -19,7 +20,7 @@ import magic.model.event.MagicTiming;
public class Corrupted_Harvester {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicManaCost.BLACK.getCondition(),
MagicConditionFactory.ManaCost("{B}"),
MagicCondition.ONE_CREATURE_CONDITION,
MagicCondition.CAN_REGENERATE_CONDITION,
new MagicSingleActivationCondition()
@ -29,7 +30,7 @@ public class Corrupted_Harvester {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.BLACK),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{B}")),
new MagicSacrificePermanentEvent(
source,
source.getController(),

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

@ -10,6 +10,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicSetAbilityAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -19,14 +20,14 @@ import magic.model.target.MagicHasteTargetPicker;
public class Crimson_Mage {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.RED.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Pump,true),
"Haste"
) {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.RED)};
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{R}"))};
}
@Override

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

@ -18,7 +18,7 @@ public class Drifter_il_Dal {
new MagicEvent(
permanent,
new MagicMayChoice(
new MagicPayManaCostChoice(MagicManaCost.BLUE)
new MagicPayManaCostChoice(MagicManaCost.create("{U}"))
),
this,
"You may$ pay {U}$. If you don't, sacrifice SN.") :

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

@ -12,6 +12,7 @@ import magic.model.action.MagicPlayCardAction;
import magic.model.action.MagicRemoveCardAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -24,7 +25,7 @@ public class Elvish_Piper {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.GREEN.getCondition()},
MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Token),
"Token"
) {
@ -33,7 +34,7 @@ public class Elvish_Piper {
final MagicPermanent permanent = source;
return new MagicEvent[]{
new MagicTapEvent(permanent),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.GREEN)
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{G}"))
};
}

9
src/magic/card/Esper_Battlemage.java
View File

@ -10,6 +10,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicPreventDamageAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -21,7 +22,7 @@ public class Esper_Battlemage {
public static final MagicPermanentActivation A =new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.WHITE.getCondition()
MagicConditionFactory.ManaCost("{W}")
},
new MagicActivationHints(MagicTiming.Pump),
"Prevent"
@ -29,7 +30,7 @@ public class Esper_Battlemage {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.WHITE)};
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{W}"))};
}
@Override
@ -51,13 +52,13 @@ public class Esper_Battlemage {
};
public static final MagicPermanentActivation A2 = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.BLACK.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{B}")},
new MagicActivationHints(MagicTiming.Removal),
"-1/-1") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.BLACK)};
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{B}"))};
}
@Override

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

@ -9,6 +9,7 @@ import magic.model.MagicSource;
import magic.model.action.MagicChangeTurnPTAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -19,7 +20,7 @@ import magic.model.event.MagicTiming;
public class Ferrovore {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicManaCost.RED.getCondition(),
MagicConditionFactory.ManaCost("{R}"),
MagicCondition.ONE_CREATURE_CONDITION,
MagicCondition.CONTROL_ARTIFACT_CONDITION
},
@ -29,7 +30,7 @@ public class Ferrovore {
public MagicEvent[] getCostEvent(final MagicPermanent source) {
final MagicPlayer player = source.getController();
return new MagicEvent[]{
new MagicPayManaCostEvent(source,player,MagicManaCost.RED),
new MagicPayManaCostEvent(source,player,MagicManaCost.create("{R}")),
new MagicSacrificePermanentEvent(
source,
player,

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

@ -8,6 +8,7 @@ import magic.model.MagicPowerToughness;
import magic.model.MagicSource;
import magic.model.action.MagicChangeTurnPTAction;
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;
@ -32,7 +33,7 @@ public class Fledgling_Dragon {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.THRESHOLD_CONDITION,
MagicManaCost.GREEN.getCondition()},
MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Pump),
"Pump") {
@ -41,7 +42,7 @@ public class Fledgling_Dragon {
return new MagicEvent[]{new MagicPayManaCostEvent(
source,
source.getController(),
MagicManaCost.GREEN)};
MagicManaCost.create("{G}"))};
}
@Override

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

@ -22,7 +22,7 @@ public class Frenzied_Goblin {
new MagicEvent(
permanent,
new MagicMayChoice(
new MagicPayManaCostChoice(MagicManaCost.RED),
new MagicPayManaCostChoice(MagicManaCost.create("{R}")),
MagicTargetChoice.NEG_TARGET_CREATURE
),
new MagicNoCombatTargetPicker(false,true,false),

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

@ -3,6 +3,7 @@ package magic.card;
import magic.model.MagicManaCost;
import magic.model.MagicPermanent;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -12,14 +13,14 @@ import magic.model.event.MagicTiming;
public class Gideon_s_Lawkeeper {
public static final MagicPermanentActivation A1 = new MagicTapCreatureActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.WHITE.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{W}")},
new MagicActivationHints(MagicTiming.Tapping),
"Tap") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),
MagicManaCost.WHITE)};
MagicManaCost.create("{W}"))};
}
};
}

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

@ -23,7 +23,7 @@ public class Gigadrowse {
cardOnStack,
new MagicKickerChoice(
MagicTargetChoice.NEG_TARGET_PERMANENT,
MagicManaCost.BLUE,
MagicManaCost.create("{U}"),
true,
true
),

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

@ -9,6 +9,7 @@ import magic.model.action.MagicCardOnStackAction;
import magic.model.action.MagicCounterItemOnStackAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostSacrificeEvent;
@ -19,13 +20,13 @@ import magic.model.stack.MagicCardOnStack;
public class Glen_Elendra_Archmage {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.BLUE.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{U}")},
new MagicActivationHints(MagicTiming.Counter),
"Counter") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostSacrificeEvent(source,source.getController(),MagicManaCost.BLUE)};
return new MagicEvent[]{new MagicPayManaCostSacrificeEvent(source,source.getController(),MagicManaCost.create("{U}"))};
}
@Override

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

@ -13,6 +13,7 @@ import magic.model.action.MagicBecomesCreatureAction;
import magic.model.choice.MagicMayChoice;
import magic.model.choice.MagicSimpleMayChoice;
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;
@ -79,14 +80,14 @@ public class Glint_Hawk_Idol {
};
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.WHITE.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{W}")},
new MagicActivationHints(MagicTiming.Animate,false,1),
"Animate") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.WHITE),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{W}")),
new MagicPlayAbilityEvent(source)};
}

4
src/magic/card/Guul_Draz_Assassin.java
View File

@ -39,7 +39,7 @@ public class Guul_Draz_Assassin {
new MagicCondition[]{
MagicConditionFactory.ChargeCountersAtLeast(2),
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.BLACK.getCondition()
MagicConditionFactory.ManaCost("{B}")
},
new MagicActivationHints(MagicTiming.Removal),
"Weaken") {
@ -47,7 +47,7 @@ public class Guul_Draz_Assassin {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.BLACK)};
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{B}"))};
}
@Override

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

@ -9,6 +9,7 @@ import magic.model.MagicPowerToughness;
import magic.model.MagicSource;
import magic.model.action.MagicPlayTokenAction;
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;
@ -34,13 +35,13 @@ public class Imperious_Perfect {
};
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION, MagicManaCost.GREEN.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION, MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Token),
"Token") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicTapEvent(source),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.GREEN)};
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{G}"))};
}
@Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

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

@ -18,7 +18,7 @@ public class Kami_of_the_Tended_Garden {
new MagicEvent(
permanent,
new MagicMayChoice(
new MagicPayManaCostChoice(MagicManaCost.GREEN)
new MagicPayManaCostChoice(MagicManaCost.create("{G}"))
),
this,
"You may$ pay {G}$. If you don't, sacrifice SN."

4
src/magic/card/Kargan_Dragonlord.java
View File

@ -53,7 +53,7 @@ public class Kargan_Dragonlord {
public static final MagicPermanentActivation A2 = new MagicPermanentActivation(
new MagicCondition[]{
MagicConditionFactory.ChargeCountersAtLeast(8),
MagicManaCost.RED.getCondition()
MagicConditionFactory.ManaCost("{R}")
},
new MagicActivationHints(MagicTiming.Pump),
"+1/+0") {
@ -61,7 +61,7 @@ public class Kargan_Dragonlord {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.RED)};
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{R}"))};
}
@Override

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

@ -3,6 +3,7 @@ package magic.card;
import magic.model.MagicManaCost;
import magic.model.MagicPermanent;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -12,14 +13,14 @@ import magic.model.event.MagicTiming;
public class Loxodon_Mystic {
public static final MagicPermanentActivation A1 = new MagicTapCreatureActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.WHITE.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{W}")},
new MagicActivationHints(MagicTiming.Tapping),
"Tap") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),
MagicManaCost.WHITE)};
MagicManaCost.create("{W}"))};
}
};
}

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

@ -7,6 +7,7 @@ import magic.model.MagicPermanent;
import magic.model.MagicSource;
import magic.model.action.MagicChangeTurnPTAction;
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;
@ -20,7 +21,7 @@ import java.util.Collection;
public class Moonveil_Dragon {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicManaCost.RED.getCondition()},
MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Pump),
"Pump") {
@ -30,7 +31,7 @@ public class Moonveil_Dragon {
new MagicPayManaCostEvent(
source,
source.getController(),
MagicManaCost.RED)};
MagicManaCost.create("{R}"))};
}
@Override

9
src/magic/card/Niblis_of_the_Breath.java
View File

@ -9,6 +9,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicUntapAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -21,7 +22,7 @@ public class Niblis_of_the_Breath {
public static final MagicPermanentActivation A1 = new MagicTapCreatureActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.BLUE.getCondition()
MagicConditionFactory.ManaCost("{U}")
},
new MagicActivationHints(MagicTiming.Tapping),
"Tap") {
@ -31,7 +32,7 @@ public class Niblis_of_the_Breath {
new MagicPayManaCostTapEvent(
source,
source.getController(),
MagicManaCost.BLUE)
MagicManaCost.create("{U}"))
};
}
};
@ -39,7 +40,7 @@ public class Niblis_of_the_Breath {
public static final MagicPermanentActivation A2 = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.BLUE.getCondition()
MagicConditionFactory.ManaCost("{U}")
},
new MagicActivationHints(MagicTiming.Tapping),
"Untap") {
@ -49,7 +50,7 @@ public class Niblis_of_the_Breath {
new MagicPayManaCostTapEvent(
source,
source.getController(),
MagicManaCost.BLUE)
MagicManaCost.create("{U}"))
};
}

4
src/magic/card/Null_Champion.java
View File

@ -35,7 +35,7 @@ public class Null_Champion {
new MagicCondition[]{
MagicConditionFactory.ChargeCountersAtLeast(4),
MagicCondition.CAN_REGENERATE_CONDITION,
MagicManaCost.BLACK.getCondition()
MagicConditionFactory.ManaCost("{B}")
},
new MagicActivationHints(MagicTiming.Pump),
"Regen") {
@ -43,7 +43,7 @@ public class Null_Champion {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.BLACK)};
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{B}"))};
}
@Override

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

@ -28,7 +28,7 @@ public class Orim_s_Thunder {
cardOnStack,
new MagicKickerChoice(
MagicTargetChoice.NEG_TARGET_ARTIFACT_OR_ENCHANTMENT,
MagicManaCost.RED,
MagicManaCost.create("{R}"),
false
),
new MagicDestroyTargetPicker(false),

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

@ -9,6 +9,7 @@ import magic.model.action.MagicDestroyAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostSacrificeEvent;
@ -18,13 +19,13 @@ import magic.model.target.MagicDestroyTargetPicker;
public class Pus_Kami {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.BLACK.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{B}")},
new MagicActivationHints(MagicTiming.Removal),
"Destroy") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostSacrificeEvent(source,source.getController(),MagicManaCost.BLACK)};
return new MagicEvent[]{new MagicPayManaCostSacrificeEvent(source,source.getController(),MagicManaCost.create("{B}"))};
}
@Override

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

@ -7,6 +7,7 @@ import magic.model.MagicPermanent;
import magic.model.MagicSource;
import magic.model.action.MagicChangeTurnPTAction;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -21,7 +22,7 @@ public class Rabble_Rouser {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.RED.getCondition()},
MagicConditionFactory.ManaCost("{R}")},
new MagicActivationHints(MagicTiming.Block),
"Pump") {
@Override
@ -29,7 +30,7 @@ public class Rabble_Rouser {
return new MagicEvent[] {new MagicPayManaCostTapEvent(
source,
source.getController(),
MagicManaCost.RED)};
MagicManaCost.create("{R}"))};
}
@Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

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

@ -9,6 +9,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicTapAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -18,12 +19,12 @@ import magic.model.target.MagicTapTargetPicker;
public class Scepter_of_Dominance {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.WHITE.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{W}")},
new MagicActivationHints(MagicTiming.Tapping),
"Tap") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.WHITE)};
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{W}"))};
}
@Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

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

@ -23,7 +23,7 @@ public class Shattering_Spree {
cardOnStack,
new MagicKickerChoice(
MagicTargetChoice.NEG_TARGET_ARTIFACT,
MagicManaCost.RED,
MagicManaCost.create("{R}"),
true,
true
),

13
src/magic/card/Skinshifter.java
View File

@ -10,6 +10,7 @@ import magic.model.MagicSource;
import magic.model.MagicSubType;
import magic.model.action.MagicBecomesCreatureAction;
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;
@ -46,7 +47,7 @@ public class Skinshifter {
public static final MagicPermanentActivation A1 = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.ABILITY_ONCE_CONDITION,
MagicManaCost.GREEN.getCondition()},
MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Animate,false,1),
"Rhino") {
@ -55,7 +56,7 @@ public class Skinshifter {
return new MagicEvent[]{new MagicPayManaCostEvent(
source,
source.getController(),
MagicManaCost.GREEN),
MagicManaCost.create("{G}")),
new MagicPlayAbilityEvent(source)};
}
@ -102,7 +103,7 @@ public class Skinshifter {
public static final MagicPermanentActivation A2 = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.ABILITY_ONCE_CONDITION,
MagicManaCost.GREEN.getCondition()},
MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Animate,false,1),
"Bird") {
@ -111,7 +112,7 @@ public class Skinshifter {
return new MagicEvent[]{new MagicPayManaCostEvent(
source,
source.getController(),
MagicManaCost.GREEN),
MagicManaCost.create("{G}")),
new MagicPlayAbilityEvent(source)};
}
@ -152,7 +153,7 @@ public class Skinshifter {
public static final MagicPermanentActivation A3 = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.ABILITY_ONCE_CONDITION,
MagicManaCost.GREEN.getCondition()},
MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Animate,false,1),
"Plant") {
@ -161,7 +162,7 @@ public class Skinshifter {
return new MagicEvent[]{new MagicPayManaCostEvent(
source,
source.getController(),
MagicManaCost.GREEN),
MagicManaCost.create("{G}")),
new MagicPlayAbilityEvent(source)};
}

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

@ -11,6 +11,7 @@ import magic.model.action.MagicDealDamageAction;
import magic.model.action.MagicTargetAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -26,7 +27,7 @@ public class Skirsdag_Cultist {
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicCondition.ONE_CREATURE_CONDITION,
MagicManaCost.RED.getCondition()
MagicConditionFactory.ManaCost("{R}")
},
new MagicActivationHints(MagicTiming.Removal),
"Exile") {
@ -34,7 +35,7 @@ public class Skirsdag_Cultist {
public MagicEvent[] getCostEvent(final MagicPermanent source) {
final MagicPlayer player = source.getController();
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,player,MagicManaCost.RED),
new MagicPayManaCostTapEvent(source,player,MagicManaCost.create("{R}")),
new MagicSacrificePermanentEvent(source,player,MagicTargetChoice.SACRIFICE_CREATURE)};
}
@Override

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

@ -10,6 +10,7 @@ import magic.model.action.MagicAddStaticAction;
import magic.model.action.MagicPlayAbilityAction;
import magic.model.choice.MagicColorChoice;
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;
@ -21,7 +22,7 @@ import magic.model.mstatic.MagicStatic;
public class Spiritmonger {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.GREEN.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Pump,false,1),
"Color") {
@Override
@ -29,7 +30,7 @@ public class Spiritmonger {
return new MagicEvent[]{
new MagicPayManaCostEvent(
source,source.getController(),
MagicManaCost.GREEN
MagicManaCost.create("{G}")
),
new MagicPlayAbilityEvent(source)
};

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

@ -9,6 +9,7 @@ import magic.model.action.MagicDestroyAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -21,7 +22,7 @@ public class Torch_Fiend {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicManaCost.RED.getCondition()
MagicConditionFactory.ManaCost("{R}")
},
new MagicActivationHints(MagicTiming.Removal),
"Destroy") {
@ -29,7 +30,7 @@ public class Torch_Fiend {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.RED),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{R}")),
new MagicSacrificeEvent(source)
};
}

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

@ -9,6 +9,7 @@ import magic.model.action.MagicChangeTurnPTAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -18,12 +19,12 @@ import magic.model.target.MagicPumpTargetPicker;
public class Ursapine {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicManaCost.GREEN.getCondition()},
new MagicCondition[]{MagicConditionFactory.ManaCost("{G}")},
new MagicActivationHints(MagicTiming.Pump,true),
"Pump") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.GREEN)};
return new MagicEvent[]{new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{G}"))};
}
@Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

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

@ -10,6 +10,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicRemoveFromPlayAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -19,12 +20,12 @@ import magic.model.target.MagicBounceTargetPicker;
public class Vedalken_Mastermind {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.BLUE.getCondition()},
new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{U}")},
new MagicActivationHints(MagicTiming.Removal),
"Return") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.BLUE)};
return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{U}"))};
}
@Override
public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {

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

@ -24,7 +24,7 @@ public class Vines_of_Vastwood {
cardOnStack,
new MagicKickerChoice(
MagicTargetChoice.TARGET_CREATURE,
MagicManaCost.GREEN,
MagicManaCost.create("{G}"),
false),
MagicPumpTargetPicker.create(),
this,

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

@ -10,6 +10,7 @@ import magic.model.action.MagicDestroyAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
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;
@ -22,14 +23,14 @@ public class Wickerbough_Elder {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.MINUS_COUNTER_CONDITION,
MagicManaCost.GREEN.getCondition()
MagicConditionFactory.ManaCost("{G}")
},
new MagicActivationHints(MagicTiming.Removal),
"Destroy") {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.GREEN),
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{G}")),
new MagicRemoveCounterEvent(source,MagicCounterType.MinusOne,1)
};
}

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

@ -9,6 +9,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicUntapAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -20,7 +21,7 @@ public class Wirewood_Lodge {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.GREEN.getCondition()
MagicConditionFactory.ManaCost("{G}")
},
new MagicActivationHints(MagicTiming.Tapping),
"Untap") {
@ -28,7 +29,7 @@ public class Wirewood_Lodge {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.GREEN)
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{G}"))
};
}

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

@ -9,6 +9,7 @@ import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicRegenerateAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
import magic.model.condition.MagicConditionFactory;
import magic.model.event.MagicActivationHints;
import magic.model.event.MagicEvent;
import magic.model.event.MagicPayManaCostTapEvent;
@ -20,7 +21,7 @@ public class Yavimaya_Hollow {
public static final MagicPermanentActivation A = new MagicPermanentActivation(
new MagicCondition[]{
MagicCondition.CAN_TAP_CONDITION,
MagicManaCost.GREEN.getCondition()
MagicConditionFactory.ManaCost("{G}")
},
new MagicActivationHints(MagicTiming.Pump,false),
"Regen") {
@ -28,7 +29,7 @@ public class Yavimaya_Hollow {
@Override
public MagicEvent[] getCostEvent(final MagicPermanent source) {
return new MagicEvent[]{
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.GREEN)
new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{G}"))
};
}

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

@ -45,11 +45,6 @@ public class MagicManaCost {
public static final MagicManaCost X=MagicManaCost.create("{X}");
public static final MagicManaCost ZERO=MagicManaCost.create("{0}");
public static final MagicManaCost BLACK=MagicManaCost.create("{B}");
public static final MagicManaCost BLUE=MagicManaCost.create("{U}");
public static final MagicManaCost GREEN=MagicManaCost.create("{G}");
public static final MagicManaCost RED=MagicManaCost.create("{R}");
public static final MagicManaCost WHITE=MagicManaCost.create("{W}");
private final String costText;
private final int[] amounts;