diff --git a/res/cardsfolder/gelid_shackles.txt b/res/cardsfolder/gelid_shackles.txt index fe9fe82f1b7..7598351e859 100644 --- a/res/cardsfolder/gelid_shackles.txt +++ b/res/cardsfolder/gelid_shackles.txt @@ -3,7 +3,7 @@ ManaCost:W Types:Snow Enchantment Aura Text:no text K:Enchant Creature -K:enPumpCurse:HIDDEN CARDNAME can't block. & CARDNAME's activated abilities can't be activated.:Enchanted creature can't block and its activated abilities can't be activated. +K:enPumpCurse:HIDDEN CARDNAME can't block. & HIDDEN CARDNAME's activated abilities can't be activated.:Enchanted creature can't block and its 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 diff --git a/res/cardsfolder/ice_cage.txt b/res/cardsfolder/ice_cage.txt index dcc7b98a7c0..cb153769d84 100644 --- a/res/cardsfolder/ice_cage.txt +++ b/res/cardsfolder/ice_cage.txt @@ -2,7 +2,7 @@ Name:Ice Cage ManaCost:1 U Types:Enchantment Aura Text:no text -K:enPumpCurse:HIDDEN CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated.:Enchanted creature can't attack or block and its activated abilities can't be activated. +K:enPumpCurse:HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated.:Enchanted creature can't attack or block and its 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 diff --git a/res/cardsfolder/linvala_keeper_of_silence.txt b/res/cardsfolder/linvala_keeper_of_silence.txt index 068b02560dd..a8cf044f2ed 100644 --- a/res/cardsfolder/linvala_keeper_of_silence.txt +++ b/res/cardsfolder/linvala_keeper_of_silence.txt @@ -1,9 +1,10 @@ Name:Linvala, Keeper of Silence ManaCost:2 W W Types:Legendary Creature Angel -Text:Activated abilities of creatures your opponents control can't be activated. +Text:no text PT:3/4 K:Flying +K:stPumpAll:Creature.YouDontCtrl:1/1/HIDDEN CARDNAME's activated abilities can't be activated.:No Condition:Activated abilities of creatures your opponents control can't be activated. SVar:PlayMain1:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/linvala_keeper_of_silence.jpg diff --git a/src/forge/card/spellability/Ability.java b/src/forge/card/spellability/Ability.java index bf76ecad5a1..2ff57dd6838 100644 --- a/src/forge/card/spellability/Ability.java +++ b/src/forge/card/spellability/Ability.java @@ -39,15 +39,7 @@ abstract public class Ability extends SpellAbility { return c.getSVar("PithingTarget").equals(sourceCardName); } }); - - if(getSourceCard().isCreature() == true) { - CardList Silence = AllZoneUtil.getPlayerCardsInPlay(getSourceCard().getController().getOpponent()); - Silence = Silence.getName("Linvala, Keeper of Silence"); - - return AllZone.GameAction.isCardInPlay(getSourceCard()) && !getSourceCard().isFaceDown() && getSourceCard().getName().equals("Spreading Seas") == false && Silence.size() == 0 && Pithing.size() == 0; // For Spreading Seas - } - - + return AllZone.GameAction.isCardInPlay(getSourceCard()) && !getSourceCard().isFaceDown() && getSourceCard().getName().equals("Spreading Seas") == false && Pithing.size() == 0; // return false; } diff --git a/src/forge/card/spellability/Ability_Activated.java b/src/forge/card/spellability/Ability_Activated.java index 70726b7b534..aeb71c4663e 100644 --- a/src/forge/card/spellability/Ability_Activated.java +++ b/src/forge/card/spellability/Ability_Activated.java @@ -39,13 +39,6 @@ abstract public class Ability_Activated extends SpellAbility implements java.io. }); if(Pithing.size() != 0) return false; - - if(c.isCreature() && AllZone.getZone(c).is(Constant.Zone.Battlefield)) { - CardList Silence = AllZoneUtil.getPlayerCardsInPlay(getSourceCard().getController().getOpponent()); - Silence = Silence.getName("Linvala, Keeper of Silence"); - if (Silence.size() != 0) - return false; - } if (!(getRestrictions().canPlay(c, this))) return false;