From 6608cf61c2013d52ca7aafb01e194cd103569671 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 13:35:56 +0000 Subject: [PATCH] - Converted Turtleshell Changeling and Windreaver to keyword. - Added Crag Puca, Myr Quadropod and Aquamoeba. --- .gitattributes | 3 +++ res/cardsfolder/aquamoeba.txt | 10 ++++++++++ res/cardsfolder/crag_puca.txt | 9 +++++++++ res/cardsfolder/myr_quadropod.txt | 10 ++++++++++ res/cardsfolder/turtleshell_changeling.txt | 2 ++ res/cardsfolder/windreaver.txt | 6 ++++-- src/forge/CardFactory_Creatures.java | 13 ++++++------- 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 res/cardsfolder/aquamoeba.txt create mode 100644 res/cardsfolder/crag_puca.txt create mode 100644 res/cardsfolder/myr_quadropod.txt diff --git a/.gitattributes b/.gitattributes index c4983c4102a..174ded5a6bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -209,6 +209,7 @@ 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 res/cardsfolder/apprentice_wizard.txt -text svneol=native#text/plain +res/cardsfolder/aquamoeba.txt -text svneol=native#text/plain res/cardsfolder/araba_mothrider.txt -text svneol=native#text/plain res/cardsfolder/arachnoid.txt -text svneol=native#text/plain res/cardsfolder/arashi_the_sky_asunder.txt -text svneol=native#text/plain @@ -970,6 +971,7 @@ res/cardsfolder/crackdown.txt -text svneol=native#text/plain res/cardsfolder/crackling_club.txt -text svneol=native#text/plain res/cardsfolder/cradle_guard.txt -text svneol=native#text/plain res/cardsfolder/cradle_to_grave.txt -text svneol=native#text/plain +res/cardsfolder/crag_puca.txt -text svneol=native#text/plain res/cardsfolder/cranial_extraction.txt -text svneol=native#text/plain res/cardsfolder/crash.txt -text svneol=native#text/plain res/cardsfolder/crash_of_rhinos.txt -text svneol=native#text/plain @@ -3204,6 +3206,7 @@ res/cardsfolder/myr_adapter.txt -text svneol=native#text/plain res/cardsfolder/myr_enforcer.txt -text svneol=native#text/plain res/cardsfolder/myr_galvanizer.txt -text svneol=native#text/plain res/cardsfolder/myr_matrix.txt -text svneol=native#text/plain +res/cardsfolder/myr_quadropod.txt -text svneol=native#text/plain res/cardsfolder/mystic_crusader.txt -text svneol=native#text/plain res/cardsfolder/mystic_denial.txt -text svneol=native#text/plain res/cardsfolder/mystic_enforcer.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/aquamoeba.txt b/res/cardsfolder/aquamoeba.txt new file mode 100644 index 00000000000..a549536e2de --- /dev/null +++ b/res/cardsfolder/aquamoeba.txt @@ -0,0 +1,10 @@ +Name:Aquamoeba +ManaCost:1 U +Types:Creature Elemental Beast +Text:no text +PT:1/3 +A:AB$Pump | Cost$ Discard<1/Any> | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/aquamoeba.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/crag_puca.txt b/res/cardsfolder/crag_puca.txt new file mode 100644 index 00000000000..611c7061d87 --- /dev/null +++ b/res/cardsfolder/crag_puca.txt @@ -0,0 +1,9 @@ +Name:Crag Puca +ManaCost:UR UR UR +Types:Creature Shapeshifter +Text:no text +PT:2/4 +A:AB$Pump | Cost$ UR | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/crag_puca.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/myr_quadropod.txt b/res/cardsfolder/myr_quadropod.txt new file mode 100644 index 00000000000..ee1ad8c3ea9 --- /dev/null +++ b/res/cardsfolder/myr_quadropod.txt @@ -0,0 +1,10 @@ +Name:Myr Quadropod +ManaCost:4 +Types:Artifact Creature Myr +Text:no text +PT:1/4 +A:AB$Pump | Cost$ 3 | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_quadropod.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/turtleshell_changeling.txt b/res/cardsfolder/turtleshell_changeling.txt index 0f8018e60b1..5e9f4701a28 100644 --- a/res/cardsfolder/turtleshell_changeling.txt +++ b/res/cardsfolder/turtleshell_changeling.txt @@ -4,6 +4,8 @@ Types:Creature Shapeshifter Text:no text PT:1/4 K:Changeling +A:AB$Pump | Cost$ 1 U | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn. +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/turtleshell_changeling.jpg SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/94.jpg diff --git a/res/cardsfolder/windreaver.txt b/res/cardsfolder/windreaver.txt index c3c7324f0a8..d7e51b89086 100644 --- a/res/cardsfolder/windreaver.txt +++ b/res/cardsfolder/windreaver.txt @@ -4,10 +4,12 @@ Types:Creature Elemental Text:no text PT:1/3 K:Flying -A:AB$Pump | Cost$ W | KW$ Vigilance | SpellDescription$ Windreaver gains vigilance until end of turn. +A:AB$Pump | Cost$ W | KW$ Vigilance | SpellDescription$ Windreaver gains vigilance until end of turn. A:AB$Pump | Cost$ W | NumDef$ +1 | SpellDescription$ Windreaver gets +0/+1 until end of turn. +A:AB$Pump | Cost$ U | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn. +A:AB$Bounce | Cost$ U | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand. SVar:Rarity:Rare SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/windreaver.jpg SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/138.jpg -End +End diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index f814add9571..d88708679c1 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -6605,9 +6605,7 @@ public class CardFactory_Creatures { card.addSpellAbility(ability2); }//*************** END ************ END ************************** - - - + /* //*************** START *********** START ************************** else if(cardName.equals("Turtleshell Changeling")) { //mana ability - targets itself - until EOT @@ -6651,7 +6649,7 @@ public class CardFactory_Creatures { ability.setDescription("1 U: Switch Turtleshell Changeling's power and toughness until end of turn."); card.addSpellAbility(ability); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Jugan, the Rising Star")) { @@ -11163,6 +11161,7 @@ public class CardFactory_Creatures { ability2.setStackDescription("Molten Hydra deals damage to number of counters on it to target creature or player."); }//*************** END ************ END ************************** + /* //*************** START *********** START ************************** else if(cardName.equals("Windreaver")) { final SpellAbility a1 = new Ability(card, "U") { @@ -11174,10 +11173,10 @@ public class CardFactory_Creatures { @Override public void resolve() { PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getOwner()); - /* + AllZone.getZone(card).remove(card); hand.add(card); - */ + if(card.isToken()) AllZone.getZone(card).remove(card); else AllZone.GameAction.moveTo(hand, card); @@ -11232,7 +11231,7 @@ public class CardFactory_Creatures { a2.setDescription("U: Switch Windreaver's power and toughness until end of turn. "); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Academy Rector")) {