diff --git a/launch4j/Readme.txt b/launch4j/Readme.txt index e41ca53136..5bc98572f4 100644 --- a/launch4j/Readme.txt +++ b/launch4j/Readme.txt @@ -26,7 +26,7 @@ Have fun! Release 1.7 (January 14, 2011) =========== -- 6 new cards (510 total) +- 8 new cards (512 total) - new splash screen - added mana info for lands in hand and on battlefield diff --git a/resources/magic/data/cards.txt b/resources/magic/data/cards.txt index a54097bb1a..942214a25f 100644 --- a/resources/magic/data/cards.txt +++ b/resources/magic/data/cards.txt @@ -5792,3 +5792,25 @@ cost={0} power=1 toughness=1 timing=main + +>Drudge Reavers +value=3 +rarity=1 +type=Creature +subtype=Skeleton +color=b +converted=4 +cost={3}{B} +power=2 +toughness=1 +ability=flash +timing=flash + +>Thoughtweft Gambit +value=4 +rarity=2 +type=Instant +color=wu +converted=6 +cost={4}{W/U}{W/U} +timing=tapping diff --git a/resources/magic/data/cube.txt b/resources/magic/data/cube.txt index e905d2532a..ee966a19ea 100644 --- a/resources/magic/data/cube.txt +++ b/resources/magic/data/cube.txt @@ -111,6 +111,7 @@ Drana, Kalastria Bloodchief Dread Dromar, the Banisher Drowned Catacomb +Drudge Reavers Dust Corona Earthquake Echo Mage @@ -438,6 +439,7 @@ Teneb, the Harvester Terminate Terra Stomper Thieving Magpie +Thoughtweft Gambit Thunder Strike Thundersong Trumpeter Tidehollow Strix diff --git a/resources/magic/data/images.txt b/resources/magic/data/images.txt index 83d9bf6f80..0bac9a5397 100644 --- a/resources/magic/data/images.txt +++ b/resources/magic/data/images.txt @@ -197,6 +197,7 @@ Drana, Kalastria Bloodchief.jpg;http://gatherer.wizards.com/Handlers/Image.ashx? Dread.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=140168&type=card Dromar, the Banisher.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=23206&type=card Drowned Catacomb.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=205090&type=card +Drudge Reavers.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=108850&type=card Dust Corona.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=110501&type=card Earthquake.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=190551&type=card Echo Mage.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=198163&type=card @@ -529,6 +530,7 @@ Teneb, the Harvester.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multive Terminate.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=220524&type=card Terra Stomper.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=186321&type=card Thieving Magpie.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=129764&type=card +Thoughtweft Gambit.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=146024&type=card Thunder Strike.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=204973&type=card Thundersong Trumpeter.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=83611&type=card Tidehollow Strix.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=175015&type=card @@ -713,6 +715,7 @@ Drana, Kalastria Bloodchief.jpg;http://magiccards.info/scans/en/roe/107.jpg Dread.jpg;http://magiccards.info/scans/en/lw/107.jpg Dromar, the Banisher.jpg;http://magiccards.info/scans/en/in/244.jpg Drowned Catacomb.jpg;http://magiccards.info/scans/en/m11/224.jpg +Drudge Reavers.jpg;http://magiccards.info/scans/en/ts/105.jpg Dust Corona.jpg;http://magiccards.info/scans/en/pc/97.jpg Earthquake.jpg;http://magiccards.info/scans/en/m10/134.jpg Echo Mage.jpg;http://magiccards.info/scans/en/roe/64.jpg @@ -1045,6 +1048,7 @@ Teneb, the Harvester.jpg;http://magiccards.info/scans/en/pc/163.jpg Terminate.jpg;http://magiccards.info/scans/en/arc/95.jpg Terra Stomper.jpg;http://magiccards.info/scans/en/zen/187.jpg Thieving Magpie.jpg;http://magiccards.info/scans/en/10e/115.jpg +Thoughtweft Gambit.jpg;http://magiccards.info/scans/en/shm/154.jpg Thunder Strike.jpg;http://magiccards.info/scans/en/m11/157.jpg Thundersong Trumpeter.jpg;http://magiccards.info/scans/en/rav/235.jpg Tidehollow Strix.jpg;http://magiccards.info/scans/en/ala/203.jpg diff --git a/src/magic/data/CardEventDefinitions.java b/src/magic/data/CardEventDefinitions.java index 99b87ea696..26f5973c01 100644 --- a/src/magic/data/CardEventDefinitions.java +++ b/src/magic/data/CardEventDefinitions.java @@ -1270,6 +1270,36 @@ public class CardEventDefinitions { } } }; + + private static final MagicSpellCardEvent THOUGHTWEFT_GAMBIT=new MagicSpellCardEvent("Thoughtweft Gambit") { + + @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, + "Tap all creatures your opponent controls and untap all creatures you control."); + } + + @Override + public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { + + final MagicCardOnStack cardOnStack=(MagicCardOnStack)data[0]; + game.doAction(new MagicMoveCardAction(cardOnStack)); + + final MagicPlayer player=(MagicPlayer)data[1]; + final Collection targets=game.filterTargets(player,MagicTargetFilter.TARGET_CREATURE); + for (final MagicTarget target : targets) { + + final MagicPermanent creature=(MagicPermanent)target; + if (creature.getController()==player) { + game.doAction(new MagicUntapAction(creature)); + } else { + game.doAction(new MagicTapAction(creature,true)); + } + } + } + }; private static final MagicSpellCardEvent THUNDER_STRIKE=new MagicSpellCardEvent("Thunder Strike") { @@ -2985,6 +3015,7 @@ public class CardEventDefinitions { SMOTHER, SWORDS_TO_PLOWSHARES, TERMINATE, + THOUGHTWEFT_GAMBIT, THUNDER_STRIKE, TO_ARMS, TRUMPET_BLAST, diff --git a/src/magic/data/PermanentActivationDefinitions.java b/src/magic/data/PermanentActivationDefinitions.java index e5fc96bc48..537154a8dd 100644 --- a/src/magic/data/PermanentActivationDefinitions.java +++ b/src/magic/data/PermanentActivationDefinitions.java @@ -488,6 +488,8 @@ public class PermanentActivationDefinitions { } }; + private static final MagicPermanentActivation DRUDGE_REAVERS=new MagicRegenerationActivation("Drudge Reavers",MagicManaCost.BLACK); + private static final MagicPermanentActivation ECHO_MAGE1=new MagicLevelUpActivation("Echo Mage",MagicManaCost.ONE_BLUE,4); private static final MagicPermanentActivation ECHO_MAGE2=new MagicPermanentActivation("Echo Mage", @@ -2463,6 +2465,7 @@ public class PermanentActivationDefinitions { DAUNTLESS_ESCORT, DEATHLESS_ANGEL, DRANA_KALASTRIA_BLOODCHIEF, + DRUDGE_REAVERS, ECHO_MAGE1, ECHO_MAGE2, EMBER_HAULER, diff --git a/src/magic/test/TestGameBuilder.java b/src/magic/test/TestGameBuilder.java index 6b3377567a..868130a075 100644 --- a/src/magic/test/TestGameBuilder.java +++ b/src/magic/test/TestGameBuilder.java @@ -125,7 +125,9 @@ public class TestGameBuilder { addToHand(player,"Flayer Husk",1); addToHand(player,"Memnite",1); addToHand(player,"Bull Cerodon",1); - + addToHand(player,"Drudge Reavers",1); + addToHand(player,"Thoughtweft Gambit",1); + createPermanent(game,player,"Sigiled Paladin",false,1); createPermanent(game,player,"Hero of Bladehold",false,1); createPermanent(game,player,"Watchwolf",false,1);