From 60b1b223ebd0b94c3e6c26b6dec77569083a9ea7 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 30 Oct 2020 13:49:46 -0400 Subject: [PATCH 1/2] fall_from_favor.txt --- forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt b/forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt new file mode 100644 index 00000000000..e3c7e870a39 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt @@ -0,0 +1,10 @@ +Name:Fall from Favor +ManaCost:2 U +Types:Enchantment Aura +K:Enchant creature +A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ KeepTapped | AITgts$ Card.cmcGE2 +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature and you become the monarch. +SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBMonarch +SVar:DBMonarch:DB$ BecomeMonarch | Defined$ You +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | UnlessDefinedPlayer$ EnchantedController.isMonarch | Description$ Enchanted creature doesn't untap during its controller's untap step unless that player is the monarch. +Oracle:Enchant creature\nWhen Fall from Favor enters the battlefield, tap enchanted creature and you become the monarch.\nEnchanted creature doesn't untap during its controller's untap step unless that player is the monarch. From ca9714bbc42b7796e9c37dde36566cc58d0adc58 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 30 Oct 2020 13:50:31 -0400 Subject: [PATCH 2/2] StaticAbility.java add UnlessDefinedPlayer param --- .../main/java/forge/game/staticability/StaticAbility.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java index 76c73ae0c70..830cd1c43b5 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java @@ -631,6 +631,13 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone } } + if (hasParam("UnlessDefinedPlayer")) { + List players = AbilityUtils.getDefinedPlayers(hostCard, getParam("UnlessDefinedPlayer"), null); + if (!players.isEmpty()) { + return false; + } + } + if (hasParam("TopCardOfLibraryIs")) { if (controller.getCardsIn(ZoneType.Library).isEmpty()) { return false;