diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt index 8e87ffd3aa..e53e0d3e76 100644 --- a/resources/magic/data/cards.txt +++ b/resources/magic/data/cards.txt @@ -24752,3 +24752,31 @@ cost={1}{R} pt=2/2 ability=haste timing=main + +>Hammerheim Deadeye +url=http://magiccards.info/pc/en/101.html +image=http://magiccards.info/scans/en/pc/101.jpg +value=3 +removal=2 +rarity=U +type=Creature +subtype=Giant,Warrior +color=r +converted=4 +cost={3}{R} +pt=3/3 +timing=main + +>Henchfiend of Ukor +url=http://magiccards.info/fut/en/117.html +image=http://magiccards.info/scans/en/fut/117.jpg +value=3 +rarity=C +type=Creature +subtype=Ogre +color=r +converted=4 +cost={3}{R} +pt=3/2 +ability=haste +timing=main diff --git a/src/magic/card/Hammerheim_Deadeye.java b/src/magic/card/Hammerheim_Deadeye.java new file mode 100644 index 0000000000..6168abd876 --- /dev/null +++ b/src/magic/card/Hammerheim_Deadeye.java @@ -0,0 +1,39 @@ +package magic.card; + +import magic.model.MagicGame; +import magic.model.MagicPermanent; +import magic.model.MagicPlayer; +import magic.model.action.MagicDestroyAction; +import magic.model.action.MagicPermanentAction; +import magic.model.choice.MagicTargetChoice; +import magic.model.event.MagicEvent; +import magic.model.target.MagicDestroyTargetPicker; +import magic.model.trigger.MagicEchoTrigger; +import magic.model.trigger.MagicWhenComesIntoPlayTrigger; + +public class Hammerheim_Deadeye { + public static final MagicEchoTrigger T1 = new MagicEchoTrigger("{5}{R}"); + + public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() { + @Override + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) { + return new MagicEvent( + permanent, + player, + MagicTargetChoice.TARGET_CREATURE_WITH_FLYING, + new MagicDestroyTargetPicker(false), + MagicEvent.NO_DATA, + this, + "Destroy target creature with flying$."); + } + + @Override + public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) { + event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { + public void doAction(final MagicPermanent permanent) { + game.doAction(new MagicDestroyAction(permanent)); + } + }); + } + }; +} diff --git a/src/magic/card/Henchfiend_of_Ukor.java b/src/magic/card/Henchfiend_of_Ukor.java new file mode 100644 index 0000000000..95521d18d4 --- /dev/null +++ b/src/magic/card/Henchfiend_of_Ukor.java @@ -0,0 +1,12 @@ +package magic.card; + +import magic.model.MagicManaCost; +import magic.model.event.MagicPermanentActivation; +import magic.model.event.MagicPumpActivation; +import magic.model.trigger.MagicEchoTrigger; + +public class Henchfiend_of_Ukor { + public static final MagicEchoTrigger T = new MagicEchoTrigger("{1}{B}"); + + public static final MagicPermanentActivation A = new MagicPumpActivation(MagicManaCost.BLACK_OR_RED,1,0); +} diff --git a/src/magic/model/choice/MagicTargetChoice.java b/src/magic/model/choice/MagicTargetChoice.java index 671a22901a..a8233901f1 100644 --- a/src/magic/model/choice/MagicTargetChoice.java +++ b/src/magic/model/choice/MagicTargetChoice.java @@ -167,6 +167,8 @@ public class MagicTargetChoice extends MagicChoice { public static final MagicTargetChoice NEG_TARGET_CREATURE_PLUSONE_COUNTER = new MagicTargetChoice(MagicTargetFilter.TARGET_CREATURE_PLUSONE_COUNTER,true,MagicTargetHint.Negative, "target creature"); + public static final MagicTargetChoice TARGET_CREATURE_WITH_FLYING= + new MagicTargetChoice(MagicTargetFilter.TARGET_CREATURE_WITH_FLYING,true,MagicTargetHint.None,"target creature with flying"); public static final MagicTargetChoice NEG_TARGET_CREATURE_WITH_FLYING= new MagicTargetChoice(MagicTargetFilter.TARGET_CREATURE_WITH_FLYING,true,MagicTargetHint.Negative,"target creature with flying"); public static final MagicTargetChoice NEG_TARGET_CREATURE_WITHOUT_FLYING=