From edab06a33ad8df5a09c273ca33ba5af046d7a6a9 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:12:37 +0000 Subject: [PATCH] - Added Enchanted as Range to stPump. - Added 3 cards that use it. --- .gitattributes | 3 +++ res/cardsfolder/aboshans_desire.txt | 10 ++++++++++ res/cardsfolder/gate_hound.txt | 2 +- res/cardsfolder/kamahls_desire.txt | 10 ++++++++++ res/cardsfolder/taste_for_mayhem.txt | 10 ++++++++++ src/forge/GameActionUtil.java | 10 ++++++---- 6 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 res/cardsfolder/aboshans_desire.txt create mode 100644 res/cardsfolder/kamahls_desire.txt create mode 100644 res/cardsfolder/taste_for_mayhem.txt diff --git a/.gitattributes b/.gitattributes index e4dfaa42795..ccc7aef300e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ res/cardsScript.py -text svneol=native#text/x-python res/cardsfolder/abandoned_outpost.txt -text svneol=native#text/plain res/cardsfolder/abbey_gargoyles.txt -text svneol=native#text/plain res/cardsfolder/abomination.txt -text svneol=native#text/plain +res/cardsfolder/aboshans_desire.txt -text svneol=native#text/plain res/cardsfolder/absolute_grace.txt -text svneol=native#text/plain res/cardsfolder/absolute_law.txt -text svneol=native#text/plain res/cardsfolder/absorb.txt -text svneol=native#text/plain @@ -1926,6 +1927,7 @@ res/cardsfolder/kaerveks_spite.txt -text svneol=native#text/plain res/cardsfolder/kaleidostone.txt -text svneol=native#text/plain res/cardsfolder/kalonian_behemoth.txt -text svneol=native#text/plain res/cardsfolder/kamahl_pit_fighter.txt -text svneol=native#text/plain +res/cardsfolder/kamahls_desire.txt -text svneol=native#text/plain res/cardsfolder/kami_of_ancient_law.txt -text svneol=native#text/plain res/cardsfolder/kami_of_empty_graves.txt -text svneol=native#text/plain res/cardsfolder/kami_of_lunacy.txt -text svneol=native#text/plain @@ -3648,6 +3650,7 @@ res/cardsfolder/tarmogoyf.txt -text svneol=native#text/plain res/cardsfolder/tarnished_citadel.txt -text svneol=native#text/plain res/cardsfolder/tarox_bladewing.txt -text svneol=native#text/plain res/cardsfolder/tarpan.txt -text svneol=native#text/plain +res/cardsfolder/taste_for_mayhem.txt -text svneol=native#text/plain res/cardsfolder/tattered_drake.txt -text svneol=native#text/plain res/cardsfolder/tattermunge_duo.txt -text svneol=native#text/plain res/cardsfolder/tattermunge_maniac.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/aboshans_desire.txt b/res/cardsfolder/aboshans_desire.txt new file mode 100644 index 00000000000..fc5599fc250 --- /dev/null +++ b/res/cardsfolder/aboshans_desire.txt @@ -0,0 +1,10 @@ +Name:Aboshan's Desire +ManaCost:U +Types:Enchantment Aura +Text:Enchanted creature has flying. +K:Enchant creature +K:enPump:Flying +K:stPumpEnchanted:Creature:0/0/Shroud:Threshold:Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.) +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshans_desire.jpg +End diff --git a/res/cardsfolder/gate_hound.txt b/res/cardsfolder/gate_hound.txt index 1a866795075..55791e4ec49 100644 --- a/res/cardsfolder/gate_hound.txt +++ b/res/cardsfolder/gate_hound.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Creature Hound Text:no text PT:1/1 -K:stPumpAll:YouCtrl Creature:0/0/Vigilance:isEnchanted:Creatures you control have vigilance as long as Gate Hound is enchanted. +K:stPumpAll:Creature.YouCtrl:0/0/Vigilance:isEnchanted:Creatures you control have vigilance as long as Gate Hound is enchanted. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/gate_hound.jpg End diff --git a/res/cardsfolder/kamahls_desire.txt b/res/cardsfolder/kamahls_desire.txt new file mode 100644 index 00000000000..3f0594312e9 --- /dev/null +++ b/res/cardsfolder/kamahls_desire.txt @@ -0,0 +1,10 @@ +Name:Kamahl's Desire +ManaCost:1 R +Types:Enchantment Aura +Text:Enchanted creature has first strike. +K:Enchant creature +K:enPump:First Strike +K:stPumpEnchanted:Creature:3/0:Threshold:Threshold - Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/kamahls_desire.jpg +End diff --git a/res/cardsfolder/taste_for_mayhem.txt b/res/cardsfolder/taste_for_mayhem.txt new file mode 100644 index 00000000000..5015a930908 --- /dev/null +++ b/res/cardsfolder/taste_for_mayhem.txt @@ -0,0 +1,10 @@ +Name:Taste for Mayhem +ManaCost:R +Types:Enchantment Aura +Text:Enchanted creature gets +2/+0. +K:Enchant creature +K:enPump:+2/+0 +K:stPumpEnchanted:Creature:2/0:Hellbent:Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/taste_for_mayhem.jpg +End diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 03153b84733..740323fb1eb 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -11464,13 +11464,15 @@ public class GameActionUtil { } }); } - + if(Range.equals("Enchanted")) { - CardList CardsinPlay = new CardList(); + if (SourceCard.getEnchanting().size() > 0) + Cards_inZone.addAll(SourceCard.getEnchanting().toArray()); + /*CardList CardsinPlay = new CardList(); CardsinPlay.addAll(AllZone.Human_Play.getCards()); CardsinPlay.addAll(AllZone.Computer_Play.getCards()); - for(int i = 0; i < Cards_inZone.size(); i++) - if(CardsinPlay.get(i).getEnchantedBy().contains(SourceCard)) Cards_inZone.add(CardsinPlay.get(i)); + for(int i = 0; i < CardsinPlay.size(); i++) + if(CardsinPlay.get(i).getEnchantedBy().contains(SourceCard)) Cards_inZone.add(CardsinPlay.get(i));*/ } if(Range.equals("Equipped")) {