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 bfb2ac6f552..8f2d8987037 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java @@ -582,6 +582,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone if (condition.equals("Ferocious") && !controller.hasFerocious()) return false; if (condition.equals("Desert") && !controller.hasDesert()) return false; if (condition.equals("Blessing") && !controller.hasBlessing()) return false; + if (condition.equals("Monarch") & !controller.isMonarch()) return false; if (condition.equals("PlayerTurn")) { if (!ph.isPlayerTurn(controller)) { diff --git a/forge-gui/res/cardsfolder/e/entourage_of_trest.txt b/forge-gui/res/cardsfolder/e/entourage_of_trest.txt index 8b0c23ee88b..7f8ea4dca78 100644 --- a/forge-gui/res/cardsfolder/e/entourage_of_trest.txt +++ b/forge-gui/res/cardsfolder/e/entourage_of_trest.txt @@ -4,6 +4,6 @@ Types:Creature Elf Soldier PT:4/4 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch. SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You -S:Mode$ Continuous | Affected$ Card.Self | Condition$ You.isMonarch | CanBlockAmount$ 1 | Description$ CARDNAME can block an additional creature each combat as long as you're the monarch. +S:Mode$ Continuous | Affected$ Card.Self | Condition$ Monarch | CanBlockAmount$ 1 | Description$ CARDNAME can block an additional creature each combat as long as you're the monarch. SVar:Picture:http://www.wizards.com/global/images/magic/general/entourage_of_trest.jpg Oracle:When Entourage of Trest enters the battlefield, you become the monarch.\nEntourage of Trest can block an additional creature each combat as long as you're the monarch. diff --git a/forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt b/forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt index f68662bebe9..6abb6d4b093 100755 --- a/forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt +++ b/forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt @@ -5,5 +5,5 @@ PT:5/5 K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch. SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You -S:Mode$ Continuous | Affected$ You | Condition$ You.isMonarch | AddKeyword$ Damage doesn't cause you to lose life. | Description$ As long as you're the monarch, damage doesn't cause you to lose life. +S:Mode$ Continuous | Affected$ You | Condition$ Monarch | AddKeyword$ Damage doesn't cause you to lose life. | Description$ As long as you're the monarch, damage doesn't cause you to lose life. Oracle:Flying\nWhen Archon of Coronation enters the battlefield, you become the monarch.\nAs long as you're the monarch, damage doesn't cause you to lose life. diff --git a/forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt b/forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt index 71f5f107711..f3ea5998b43 100644 --- a/forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt +++ b/forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt @@ -4,5 +4,5 @@ Types:Creature Elk PT:8/8 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch. SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You -S:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddKeyword$ Hexproof | Condition$ You.isMonarch | Description$ As long as you're the monarch, permanents you control have hexproof. +S:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddKeyword$ Hexproof | Condition$ Monarch | Description$ As long as you're the monarch, permanents you control have hexproof. Oracle:When Dawnglade Regent enters the battlefield, you become the monarch.\nAs long as you're the monarch, permanents you control have hexproof.