diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt index 8951312ec5..28bd08809c 100644 --- a/resources/magic/data/cards.txt +++ b/resources/magic/data/cards.txt @@ -12989,3 +12989,27 @@ converted=3 cost={1}{G}{G} pt=3/2 timing=main + +>Cave Tiger +image=http://magiccards.info/scans/en/us/241.jpg +value=2 +rarity=C +type=Creature +subtype=Cat +color=g +converted=3 +cost={2}{G} +pt=2/2 +timing=main + +>Chambered Nautilus +image=http://magiccards.info/scans/en/mm/64.jpg +value=3 +rarity=U +type=Creature +subtype=Nautilus,Beast +color=u +converted=3 +cost={2}{U} +pt=2/2 +timing=main diff --git a/src/magic/card/Cave_Tiger.java b/src/magic/card/Cave_Tiger.java new file mode 100644 index 0000000000..0acde96ef4 --- /dev/null +++ b/src/magic/card/Cave_Tiger.java @@ -0,0 +1,7 @@ +package magic.card; + +import magic.model.trigger.MagicBecomesBlockedPumpTrigger; + +public class Cave_Tiger { + public static final MagicBecomesBlockedPumpTrigger T1 = new MagicBecomesBlockedPumpTrigger(1,1); +} diff --git a/src/magic/card/Chambered_Nautilus.java b/src/magic/card/Chambered_Nautilus.java new file mode 100644 index 0000000000..2f994747a9 --- /dev/null +++ b/src/magic/card/Chambered_Nautilus.java @@ -0,0 +1,43 @@ +package magic.card; + +import magic.model.MagicGame; +import magic.model.MagicPermanent; +import magic.model.MagicPlayer; +import magic.model.action.MagicDrawAction; +import magic.model.choice.MagicMayChoice; +import magic.model.choice.MagicSimpleMayChoice; +import magic.model.event.MagicEvent; +import magic.model.trigger.MagicWhenBecomesBlockedTrigger; + +public class Chambered_Nautilus { + public static final MagicWhenBecomesBlockedTrigger T = new MagicWhenBecomesBlockedTrigger() { + @Override + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent data) { + final MagicPlayer player = permanent.getController(); + return (permanent == data ) ? + new MagicEvent( + permanent, + player, + new MagicSimpleMayChoice( + player + " may draw a card.", + MagicSimpleMayChoice.DRAW_CARDS, + 1, + MagicSimpleMayChoice.DEFAULT_NONE), + new Object[]{player}, + this, + player + " may$ draw a card."): + MagicEvent.NONE; + } + + @Override + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object data[], + final Object[] choiceResults) { + if (MagicMayChoice.isYesChoice(choiceResults[0])) { + game.doAction(new MagicDrawAction((MagicPlayer)data[0],1)); + } + } + }; +}