From e6f4de26dc4fd8150ebd9c6b5e90bc47b9face7a Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 21 Jul 2014 09:59:39 +0000 Subject: [PATCH] - Fixed Pledge of Loyalty --- forge-game/src/main/java/forge/game/card/Card.java | 10 +++++----- forge-gui/res/cardsfolder/p/pledge_of_loyalty.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index cefaeb4d597..e6523f75e25 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -8277,23 +8277,23 @@ public class Card extends GameEntity implements Comparable { continue; } if (kw.equals("Protection from white")) { - if (source.isWhite() && !source.getName().contains("Pledge of Loyalty")) { + if (source.isWhite()) { return true; } } else if (kw.equals("Protection from blue")) { - if (source.isBlue() && !source.getName().contains("Pledge of Loyalty")) { + if (source.isBlue()) { return true; } } else if (kw.equals("Protection from black")) { - if (source.isBlack() && !source.getName().contains("Pledge of Loyalty")) { + if (source.isBlack()) { return true; } } else if (kw.equals("Protection from red")) { - if (source.isRed() && !source.getName().contains("Pledge of Loyalty")) { + if (source.isRed()) { return true; } } else if (kw.equals("Protection from green")) { - if (source.isGreen() && !source.getName().contains("Pledge of Loyalty")) { + if (source.isGreen()) { return true; } } else if (kw.equals("Protection from creatures")) { diff --git a/forge-gui/res/cardsfolder/p/pledge_of_loyalty.txt b/forge-gui/res/cardsfolder/p/pledge_of_loyalty.txt index c7c65ae663b..542346100ee 100644 --- a/forge-gui/res/cardsfolder/p/pledge_of_loyalty.txt +++ b/forge-gui/res/cardsfolder/p/pledge_of_loyalty.txt @@ -3,11 +3,11 @@ ManaCost:1 W Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump -S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection from white | CheckSVar$ WHITE | SVarCompare$ GE1 | Description$ Enchanted creature has protection from the colors of permanents you control. This effect doesn't remove CARDNAME. -S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection from blue | CheckSVar$ BLUE | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection from black | CheckSVar$ BLACK | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection from red | CheckSVar$ RED | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection from green | CheckSVar$ GREEN | SVarCompare$ GE1 +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection:Card.White:Protection from white:Card.CardUID_HostCardUID | CheckSVar$ WHITE | SVarCompare$ GE1 | Description$ Enchanted creature has protection from the colors of permanents you control. This effect doesn't remove CARDNAME. +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection:Card.Blue:Protection from blue:Card.CardUID_HostCardUID | CheckSVar$ BLUE | SVarCompare$ GE1 +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection:Card.Black:Protection from black:Card.CardUID_HostCardUID | CheckSVar$ BLACK | SVarCompare$ GE1 +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection:Card.Red:Protection from red:Card.CardUID_HostCardUID | CheckSVar$ RED | SVarCompare$ GE1 +S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Protection:Card.Green:Protection from green:Card.CardUID_HostCardUID | CheckSVar$ GREEN | SVarCompare$ GE1 SVar:WHITE:Count$Valid Permanent.White+YouCtrl SVar:BLUE:Count$Valid Permanent.Blue+YouCtrl SVar:BLACK:Count$Valid Permanent.Black+YouCtrl