diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt index 2e742126d1..b0beb9e7dc 100644 --- a/resources/magic/data/cards.txt +++ b/resources/magic/data/cards.txt @@ -11608,3 +11608,27 @@ color=g converted=4 cost={3}{G} timing=pump + +>Bonds of Quicksilver +image=http://magiccards.info/scans/en/som/29.jpg +value=3 +removal=3 +rarity=C +type=Enchantment +subtype=Aura +color=u +converted=4 +cost={3}{U} +given_ability=doesn't untap during untap step +ability=flash +timing=tapping + +>Carrion Call +image=http://magiccards.info/scans/en/som/115.jpg +value=3 +rarity=U +type=Instant +color=g +converted=4 +cost={3}{G} +timing=main diff --git a/resources/magic/data/images.txt b/resources/magic/data/images.txt index 329395fd1b..16e32ebdec 100644 --- a/resources/magic/data/images.txt +++ b/resources/magic/data/images.txt @@ -69,6 +69,7 @@ Bat.jpg;http://img.photobucket.com/albums/v237/Xand0r/bat-token_guildpact_300.jp Goblin1.jpg;http://img.photobucket.com/albums/v237/Xand0r/goblin-token_ravnica_300.jpg Goblin2.jpg;http://forums.mtgsalvation.com/attachment.php?attachmentid=30596&d=1157620938 Griffin.jpg;http://i248.photobucket.com/albums/gg179/AC666AC/MTG/Griffinfull.jpg +Insect1.jpg;http://magiccards.info/extras/token/scars-of-mirrodin/insect.jpg Voja.jpg;http://img.photobucket.com/albums/v237/Xand0r/voja-token_ravnica_300-2.jpg Beast3.jpg;http://magiccards.info/extras/token/magic-2011/beast.jpg Beast4.jpg;http://magiccards.info/extras/token/zendikar/beast.jpg diff --git a/src/magic/card/Bonds_of_Quicksilver.java b/src/magic/card/Bonds_of_Quicksilver.java new file mode 100644 index 0000000000..ded7f22ad8 --- /dev/null +++ b/src/magic/card/Bonds_of_Quicksilver.java @@ -0,0 +1,12 @@ +package magic.card; + +import magic.model.choice.MagicTargetChoice; +import magic.model.event.MagicPlayAuraEvent; +import magic.model.event.MagicSpellCardEvent; +import magic.model.target.MagicNoCombatTargetPicker; + +public class Bonds_of_Quicksilver { + public static final MagicSpellCardEvent S = new MagicPlayAuraEvent( + MagicTargetChoice.NEG_TARGET_CREATURE, + new MagicNoCombatTargetPicker(true,true,true)); +} diff --git a/src/magic/card/Carrion_Call.java b/src/magic/card/Carrion_Call.java new file mode 100644 index 0000000000..e7e3155e06 --- /dev/null +++ b/src/magic/card/Carrion_Call.java @@ -0,0 +1,37 @@ +package magic.card; + +import magic.data.TokenCardDefinitions; +import magic.model.MagicGame; +import magic.model.MagicPayedCost; +import magic.model.MagicPlayer; +import magic.model.action.MagicMoveCardAction; +import magic.model.action.MagicPlayTokenAction; +import magic.model.event.MagicEvent; +import magic.model.event.MagicSpellCardEvent; +import magic.model.stack.MagicCardOnStack; + +public class Carrion_Call { + public static final MagicSpellCardEvent S = new MagicSpellCardEvent() { + @Override + public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) { + final MagicPlayer player = cardOnStack.getController(); + return new MagicEvent( + cardOnStack.getCard(), + player, + new Object[]{cardOnStack,player}, + this, + player + " puts two 1/1 green Insect creature tokens with infect onto the battlefield"); + } + @Override + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { + game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); + final MagicPlayer player=(MagicPlayer)data[1]; + game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.INSECT1_TOKEN_CARD)); + game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.INSECT1_TOKEN_CARD)); + } + }; +} diff --git a/src/magic/data/TokenCardDefinitions.java b/src/magic/data/TokenCardDefinitions.java index fd9e8b8e77..b45f394aa6 100644 --- a/src/magic/data/TokenCardDefinitions.java +++ b/src/magic/data/TokenCardDefinitions.java @@ -55,6 +55,20 @@ public class TokenCardDefinitions { } }; + public static final MagicCardDefinition INSECT1_TOKEN_CARD = new MagicCardDefinition("Insect","Insect1") { + public void initialize() { + setToken(); + setValue(1); + addType(MagicType.Creature); + setSubTypes(new String[]{"Insect"}); + setCost(MagicManaCost.ZERO); + setColor(MagicColor.Green); + setColoredType(); + setPowerToughness(1,1); + setAbility(MagicAbility.Infect); + } + }; + public static final MagicCardDefinition WORM_TOKEN_CARD=new MagicCardDefinition("Worm") { public void initialize() { setToken(); @@ -452,6 +466,7 @@ public class TokenCardDefinitions { ANGEL4_TOKEN_CARD, DRAGON4_TOKEN_CARD, DRAGON5_TOKEN_CARD, + INSECT1_TOKEN_CARD, WORM_TOKEN_CARD, SAPROLING_TOKEN_CARD, SNAKE_TOKEN_CARD,