From efa10db2af6b9ad1027a6b04557227a0524db32a Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 15:36:03 +0000 Subject: [PATCH] - Added Aphetto Runecaster. - Converted to Trigger: Argothian Enchantress, Aven Fisher and Riptide Crab. --- .gitattributes | 1 + res/cardsfolder/aphetto_runecaster.txt | 10 ++++++++++ res/cardsfolder/argothian_enchantress.txt | 4 +++- res/cardsfolder/aven_fisher.txt | 4 +++- res/cardsfolder/riptide_crab.txt | 4 +++- src/forge/CardFactory_Creatures.java | 4 ++-- src/forge/GameActionUtil.java | 3 +-- 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 res/cardsfolder/aphetto_runecaster.txt diff --git a/.gitattributes b/.gitattributes index 0b7086f5339..760b1614cfd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -212,6 +212,7 @@ res/cardsfolder/anvil_of_bogardan.txt svneol=native#text/plain res/cardsfolder/apex_hawks.txt -text svneol=native#text/plain res/cardsfolder/aphetto_alchemist.txt -text svneol=native#text/plain res/cardsfolder/aphetto_grifter.txt -text svneol=native#text/plain +res/cardsfolder/aphetto_runecaster.txt -text svneol=native#text/plain res/cardsfolder/apocalypse_hydra.txt -text svneol=native#text/plain res/cardsfolder/apothecary_initiate.txt -text svneol=native#text/plain res/cardsfolder/apprentice_sorcerer.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/aphetto_runecaster.txt b/res/cardsfolder/aphetto_runecaster.txt new file mode 100644 index 00000000000..8b87ef323d1 --- /dev/null +++ b/res/cardsfolder/aphetto_runecaster.txt @@ -0,0 +1,10 @@ +Name:Aphetto Runecaster +ManaCost:3 U +Types:Creature Human Wizard +Text:no text +PT:2/3 +T:Mode$ TurnFaceUp | ValidCard$ Permanent | Execute$ TrigDraw | Optional$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent is turned face up, you may draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/aphetto_runecaster.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/argothian_enchantress.txt b/res/cardsfolder/argothian_enchantress.txt index c9966b481b5..1156d42c179 100644 --- a/res/cardsfolder/argothian_enchantress.txt +++ b/res/cardsfolder/argothian_enchantress.txt @@ -1,9 +1,11 @@ Name:Argothian Enchantress ManaCost:1 G Types:Creature Human Druid -Text:Whenever you cast an enchantment spell, draw a card. +Text:no text PT:0/1 K:Shroud +T:Mode$ SpellCast | ValidCard$ Card.Enchantment+YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an enchantment spell, draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/argothian_enchantress.jpg SetInfo:USG|Rare|http://magiccards.info/scans/en/us/234.jpg diff --git a/res/cardsfolder/aven_fisher.txt b/res/cardsfolder/aven_fisher.txt index 2d255cfaf9b..8714f5be98f 100644 --- a/res/cardsfolder/aven_fisher.txt +++ b/res/cardsfolder/aven_fisher.txt @@ -1,8 +1,10 @@ Name:Aven Fisher ManaCost:3 U Types:Creature Bird Soldier -Text:When Aven Fisher is put into a graveyard from play, you may draw a card. +Text:no text PT:2/2 +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 K:Flying SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card82998.jpg diff --git a/res/cardsfolder/riptide_crab.txt b/res/cardsfolder/riptide_crab.txt index 90fe822ac8a..ffa65302e39 100644 --- a/res/cardsfolder/riptide_crab.txt +++ b/res/cardsfolder/riptide_crab.txt @@ -1,9 +1,11 @@ Name:Riptide Crab ManaCost:1 W U Types:Creature Crab -Text:When Riptide Crab is put into a graveyard from play, draw a card. +Text:no text PT:1/3 K:Vigilance +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_crab.jpg SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/266.jpg diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 9413ca53309..00c7e1e7a81 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -2433,7 +2433,7 @@ public class CardFactory_Creatures { card.addDestroyCommand(destroy); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Aven Fisher") || cardName.equals("Riptide Crab")) { final SpellAbility ability = new Ability(card, "0") { @@ -2457,7 +2457,7 @@ public class CardFactory_Creatures { }; card.addDestroyCommand(destroy); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Peregrine Drake")) { diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 3c756ebfbfd..8d049692be7 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2616,8 +2616,7 @@ public class GameActionUtil { list = list.filter(new CardListFilter() { public boolean addCard(Card crd) { if (crd.getName().equals("Verduran Enchantress") || crd.getName().equals("Enchantress's Presence") - || crd.getName().equals("Mesa Enchantress") || crd.getName().equals("Argothian Enchantress") - || crd.getName().equals("Kor Spiritdancer")) return true; + || crd.getName().equals("Mesa Enchantress") || crd.getName().equals("Kor Spiritdancer")) return true; else return false; } });