diff --git a/res/cardsfolder/e/ensnaring_bridge.txt b/res/cardsfolder/e/ensnaring_bridge.txt index 114a49b5907..bb17be276f7 100644 --- a/res/cardsfolder/e/ensnaring_bridge.txt +++ b/res/cardsfolder/e/ensnaring_bridge.txt @@ -1,7 +1,9 @@ Name:Ensnaring Bridge ManaCost:3 Types:Artifact -Text:Creatures with power greater than the number of cards in your hand can't attack. +Text:no text +S:Mode$ Continuous | Affected$ Creature.powerGTX | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures with power greater than the number of cards in your hand can't attack. +SVar:X:Count$InYourHand SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/ensnaring_bridge.jpg diff --git a/res/cardsfolder/r/reverence.txt b/res/cardsfolder/r/reverence.txt index c22d064627c..c3115523083 100644 --- a/res/cardsfolder/r/reverence.txt +++ b/res/cardsfolder/r/reverence.txt @@ -1,7 +1,8 @@ Name:Reverence ManaCost:2 W W Types:Enchantment -Text:Creatures with power 2 or less can't attack you. +Text:no text +S:Mode$ Continuous | Affected$ Creature.YouDontCtrl+powerLE2 | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures with power 2 or less can't attack you. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/reverence.jpg SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/26.jpg diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 1ac709e2108..9928edf2694 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -557,9 +557,7 @@ public class CombatUtil { //The creature won't untap next turn if (c.isTapped() && !PhaseUtil.canUntap(c)) return false; - if (c.hasKeyword("CARDNAME can't attack.") - || c.hasKeyword("CARDNAME can't attack or block.") - || (AllZoneUtil.isCardInPlay("Reverence", c.getController().getOpponent()) && c.getNetAttack() < 3)) + if (c.hasKeyword("CARDNAME can't attack.") || c.hasKeyword("CARDNAME can't attack or block.")) return false; if (c.hasKeyword("Defender") @@ -567,21 +565,6 @@ public class CombatUtil { return false; } - if (AllZoneUtil.isCardInPlay("Ensnaring Bridge")) { - int limit = Integer.MAX_VALUE; - CardList Human = AllZone.getHumanPlayer().getCardsIn(Zone.Battlefield); - if (Human.getName("Ensnaring Bridge").size() > 0) { - CardList Hand = AllZone.getHumanPlayer().getCardsIn(Zone.Hand); - limit = Hand.size(); - } - CardList Compi = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield); - if (Compi.getName("Ensnaring Bridge").size() > 0) { - CardList Hand = AllZone.getComputerPlayer().getCardsIn(Zone.Hand); - if (Hand.size() < limit) limit = Hand.size(); - } - if (c.getNetAttack() > limit) return false; - } - if (AllZoneUtil.isCardInPlay("Kulrath Knight")) { CardList all = AllZoneUtil.getCardsIn(Zone.Battlefield, "Kulrath Knight"); for (int i = 0; i < all.size(); i++) {