From 2be2de92213995978a7542c0846d126f1d7bbe6c Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:11:51 +0000 Subject: [PATCH] *Added a keyword, which will probably not be very useful on it's own but more likely with PumpCurses. CARDNAME's activated abilities can't be activated. *Added Arrest Gelid Shackles Ice Cage Infantry Veteran --- .gitattributes | 4 ++++ res/cardsfolder/arrest.txt | 9 +++++++++ res/cardsfolder/gelid_shackles.txt | 10 ++++++++++ res/cardsfolder/ice_cage.txt | 9 +++++++++ res/cardsfolder/infantry_veteran.txt | 9 +++++++++ src/forge/Ability_Activated.java | 1 + 6 files changed, 42 insertions(+) create mode 100644 res/cardsfolder/arrest.txt create mode 100644 res/cardsfolder/gelid_shackles.txt create mode 100644 res/cardsfolder/ice_cage.txt create mode 100644 res/cardsfolder/infantry_veteran.txt diff --git a/.gitattributes b/.gitattributes index 6da479c17f6..4d5760d5322 100644 --- a/.gitattributes +++ b/.gitattributes @@ -273,6 +273,7 @@ res/cardsfolder/armorer_guildmage.txt -text svneol=native#text/plain res/cardsfolder/arms_dealer.txt -text svneol=native#text/plain res/cardsfolder/army_ants.txt -text svneol=native#text/plain res/cardsfolder/arnjlots_ascent.txt -text svneol=native#text/plain +res/cardsfolder/arrest.txt -text svneol=native#text/plain res/cardsfolder/arrogant_vampire.txt -text svneol=native#text/plain res/cardsfolder/arrogant_wurm.txt -text svneol=native#text/plain res/cardsfolder/artifact_blast.txt -text svneol=native#text/plain @@ -1915,6 +1916,7 @@ res/cardsfolder/gatherer_of_graces.txt -text svneol=native#text/plain res/cardsfolder/gauntlet_of_might.txt -text svneol=native#text/plain res/cardsfolder/gaze_of_justice.txt -text svneol=native#text/plain res/cardsfolder/gelectrode.txt -text svneol=native#text/plain +res/cardsfolder/gelid_shackles.txt -text svneol=native#text/plain res/cardsfolder/gemhide_sliver.txt -text svneol=native#text/plain res/cardsfolder/gemstone_array.txt -text svneol=native#text/plain res/cardsfolder/gemstone_mine.txt -text svneol=native#text/plain @@ -2403,6 +2405,7 @@ res/cardsfolder/icatian_priest.txt -text svneol=native#text/plain res/cardsfolder/icatian_scout.txt -text svneol=native#text/plain res/cardsfolder/icatian_store.txt -text svneol=native#text/plain res/cardsfolder/icatian_town.txt -text svneol=native#text/plain +res/cardsfolder/ice_cage.txt -text svneol=native#text/plain res/cardsfolder/ice_storm.txt -text svneol=native#text/plain res/cardsfolder/icefall.txt -text svneol=native#text/plain res/cardsfolder/ichor_rats.txt -text svneol=native#text/plain @@ -2445,6 +2448,7 @@ res/cardsfolder/indomitable_ancients.txt -text svneol=native#text/plain res/cardsfolder/indomitable_archangel.txt -text svneol=native#text/plain res/cardsfolder/indomitable_will.txt -text svneol=native#text/plain res/cardsfolder/indrik_stomphowler.txt -text svneol=native#text/plain +res/cardsfolder/infantry_veteran.txt -text svneol=native#text/plain res/cardsfolder/infectious_horror.txt -text svneol=native#text/plain res/cardsfolder/infernal_contract.txt -text svneol=native#text/plain res/cardsfolder/infernal_kirin.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/arrest.txt b/res/cardsfolder/arrest.txt new file mode 100644 index 00000000000..c9283372c95 --- /dev/null +++ b/res/cardsfolder/arrest.txt @@ -0,0 +1,9 @@ +Name:Arrest +ManaCost:2 W +Types:Enchantment Aura +Text:Enchanted creature can't attack or block and its activated abilities can't be activated. +K:Enchant Creature +K:enPumpCurse:HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/arrest.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/gelid_shackles.txt b/res/cardsfolder/gelid_shackles.txt new file mode 100644 index 00000000000..afbae2cf06b --- /dev/null +++ b/res/cardsfolder/gelid_shackles.txt @@ -0,0 +1,10 @@ +Name:Gelid Shackles +ManaCost:W +Types:Snow Enchantment Aura +Text:Enchanted creature can't block and its activated abilities can't be activated. +K:Enchant Creature +K:enPumpCurse:HIDDEN CARDNAME can't block. & CARDNAME's activated abilities can't be activated. +A:AB$Pump | Cost$ S | Defined$ Enchanted | KW$ Defender | SpellDescription$ Enchanted creature gains defender until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/gelid_shackles.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/ice_cage.txt b/res/cardsfolder/ice_cage.txt new file mode 100644 index 00000000000..a4055ae5b35 --- /dev/null +++ b/res/cardsfolder/ice_cage.txt @@ -0,0 +1,9 @@ +Name:Ice Cage +ManaCost:1 U +Types:Enchantment Aura +Text:Enchanted creature can't attack or block and its activated abilities can't be activated. +K:enPumpCurse:HIDDEN CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. +K:When enchanted creature becomes the target of a spell or ability, destroy CARDNAME. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/ice_cage.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/infantry_veteran.txt b/res/cardsfolder/infantry_veteran.txt new file mode 100644 index 00000000000..caaf0dcf82f --- /dev/null +++ b/res/cardsfolder/infantry_veteran.txt @@ -0,0 +1,9 @@ +Name:Infantry Veteran +ManaCost:W +Types:Creature Human Soldier +Text:no text +PT:1/1 +A:AB$Pump | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature. | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target attacking creature gets +1/+1 until end of turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/infantry_veteran.jpg +End \ No newline at end of file diff --git a/src/forge/Ability_Activated.java b/src/forge/Ability_Activated.java index 79ee50305c6..04e80ca12bd 100644 --- a/src/forge/Ability_Activated.java +++ b/src/forge/Ability_Activated.java @@ -18,6 +18,7 @@ abstract public class Ability_Activated extends SpellAbility implements java.io. Card c = getSourceCard(); if (c.isFaceDown() && isIntrinsic()) // Intrinsic abilities can't be activated by face down cards return false; + if(c.hasKeyword("CARDNAME's activated abilities can't be activated.")) return false; CardList Pithing = AllZoneUtil.getPlayerCardsInPlay(AllZone.HumanPlayer); Pithing.add(AllZoneUtil.getPlayerCardsInPlay(AllZone.ComputerPlayer));