From c3d52f5dbb976b7e221e87fb9126453c4e7f668e Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:56:14 +0000 Subject: [PATCH] - Added the option "UntilEndOfCombat" to AF Pump. - Added Glyph of Destruction. --- .gitattributes | 1 + res/cardsfolder/glyph_of_destruction.txt | 11 +++++++++++ .../card/abilityFactory/AbilityFactory_Pump.java | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/glyph_of_destruction.txt diff --git a/.gitattributes b/.gitattributes index b84f45e6bd4..b8f007bb7a8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2872,6 +2872,7 @@ res/cardsfolder/glowing_anemone.txt -text svneol=native#text/plain res/cardsfolder/glowrider.txt -text svneol=native#text/plain res/cardsfolder/gluttonous_slime.txt -text svneol=native#text/plain res/cardsfolder/gluttonous_zombie.txt -text svneol=native#text/plain +res/cardsfolder/glyph_of_destruction.txt -text svneol=native#text/plain res/cardsfolder/gnarled_effigy.txt -text svneol=native#text/plain res/cardsfolder/gnarled_mass.txt -text svneol=native#text/plain res/cardsfolder/gnarlid_pack.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/glyph_of_destruction.txt b/res/cardsfolder/glyph_of_destruction.txt new file mode 100644 index 00000000000..dee58cde4f1 --- /dev/null +++ b/res/cardsfolder/glyph_of_destruction.txt @@ -0,0 +1,11 @@ +Name:Glyph of Destruction +ManaCost:R +Types:Instant +Text:no text +A:SP$ Pump | Cost$ R | ValidTgts$ Creature.Wall+blocking | TgtPrompt$ Select target blocking Wall you control | SubAbility$ SVar=DBPump | KW$ HIDDEN Prevent all combat damage that would be dealt to CARDNAME. & HIDDEN At the beginning of the end step, destroy CARDNAME. | SpellDescription$ Target blocking Wall you control gets +10/+0 until end of combat. Prevent all damage that would be dealt to it this turn. Destroy it at the beginning of the next end step. +SVar:DBPump:DB$Pump | NumAtt$ +10 | Defined$ Targeted | UntilEndOfCombat$ True +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/glyph_of_destruction.jpg +End diff --git a/src/forge/card/abilityFactory/AbilityFactory_Pump.java b/src/forge/card/abilityFactory/AbilityFactory_Pump.java index 59e0c488951..4b950f6d70d 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_Pump.java +++ b/src/forge/card/abilityFactory/AbilityFactory_Pump.java @@ -690,8 +690,8 @@ public class AbilityFactory_Pump { } } }; - - AllZone.EndOfTurn.addUntil(untilEOT); + if(params.containsKey("UntilEndOfCombat")) AllZone.EndOfCombat.addUntil(untilEOT); + else AllZone.EndOfTurn.addUntil(untilEOT); } }