diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index eef10410726..44fbf4c2899 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1157,7 +1157,7 @@ public class CardFactoryUtil { return doXMath(Integer.parseInt(sq[cc.hasLandfall() ? 1 : 2]), m, c); } if (sq[0].contains("Monarch")) { - return doXMath(Integer.parseInt(sq[cc.equals(game.getMonarch() ? 1 : 2]), m, c); + return doXMath(Integer.parseInt(sq[cc.equals(game.getMonarch()) ? 1 : 2]), m, c); } if (sq[0].contains("Blessing")) { return doXMath(Integer.parseInt(sq[cc.hasBlessing() ? 1 : 2]), m, c); diff --git a/forge-gui/res/cardsfolder/upcoming/CMR/aurora_phoenix.txt b/forge-gui/res/cardsfolder/upcoming/CMR/aurora_phoenix.txt new file mode 100644 index 00000000000..23b4dea1768 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/CMR/aurora_phoenix.txt @@ -0,0 +1,9 @@ +Name:Aurora Phoenix +ManaCost:4 R R +Types:Creature Phoenix +PT:5/3 +K:Flying +K:Cascade +T:Mode$ SpellCast | ValidCard$ Card.withCascade | ValidActivatingPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a spell with cascade, return CARDNAME from your graveyard to your hand. +SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand +Oracle:Flying\nCascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nWhenever you cast a spell with cascade, return Aurora Phoenix from your graveyard to your hand. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/CMR/court_of_cunning.txt b/forge-gui/res/cardsfolder/upcoming/CMR/court_of_cunning.txt index 6a99e89d7ab..0538da519c0 100644 --- a/forge-gui/res/cardsfolder/upcoming/CMR/court_of_cunning.txt +++ b/forge-gui/res/cardsfolder/upcoming/CMR/court_of_cunning.txt @@ -5,6 +5,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your upkeep, any number of target players each mill two cards. If you're the monarch, each of those players mills ten cards instead. (To mill a card, a player puts the top card of their library into their graveyard.) SVar:TrigMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | NumCards$ X | References$ X,MaxTgt -SVar:X:Count$Monarch.2.10 +SVar:X:Count$Monarch.10.2 SVar:MaxTgt:PlayerCountPlayers$Amount Oracle:When Court of Cunning enters the battlefield, you become the monarch.\nAt the beginning of your upkeep, any number of target players each mill two cards. If you're the monarch, each of those players mills ten cards instead. (To mill a card, a player puts the top card of their library into their graveyard.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/CMR/forceful_denial.txt b/forge-gui/res/cardsfolder/upcoming/CMR/forceful_denial.txt new file mode 100644 index 00000000000..9ceb0df08d4 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/CMR/forceful_denial.txt @@ -0,0 +1,6 @@ +Name:Forceful Denial +ManaCost:3 U U +Types:Instant +K:Cascade +A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. +Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)\nCounter target spell. \ No newline at end of file