From 742c2419953f4bebbed4606a2f0a2cea1a70ecc6 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 11 Nov 2020 15:59:26 -0500 Subject: [PATCH] benevolent_blessing.txt + support for multiple protection exceptions --- forge-game/src/main/java/forge/game/card/Card.java | 4 ++-- .../res/cardsfolder/upcoming/benevolent_blessing.txt | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt 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 0995fd4280b..6517ade342b 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -5494,9 +5494,9 @@ public class Card extends GameEntity implements Comparable { } final String[] characteristics = characteristic.split(","); - final String exception = kws.length > 3 ? kws[3] : null; // check "This effect cannot remove sth" + final String[] exceptions = kws.length > 3 ? kws[3].split(",") : null; // check "This effect cannot remove sth" if (source.isValid(characteristics, getController(), this, null) - && (!checkSBA || exception == null || !source.isValid(exception, getController(), this, null))) { + && (!checkSBA || exceptions == null || !source.isValid(exceptions, getController(), this, null))) { return true; } } diff --git a/forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt b/forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt new file mode 100644 index 00000000000..c6bea12fe7a --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt @@ -0,0 +1,10 @@ +Name:Benevolent Blessing +ManaCost:1 W +Types:Enchantment Aura +K:Flash +K:Enchant creature +K:ETBReplacement:Other:ChooseColor +SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInHumanDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color. +A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor:Aura.YouCtrl,Equipment.YouCtrl | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove Auras and Equipment you control that are already attached to it. +Oracle:Flash\nEnchant creature\nAs Benevolent Blessing enters the battlefield, choose a color.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Auras and Equipment you control that are already attached to it.