From 5f2842a1801502f24cca718a6a21d24655c366e9 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 20 Sep 2020 19:53:40 -0400 Subject: [PATCH 1/2] CardFactoryUtil.java add "CardNumAttacksThisTurn" --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 3 +++ 1 file changed, 3 insertions(+) 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 fce27c3824a..e02a9b1106c 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1294,6 +1294,9 @@ public class CardFactoryUtil { if (sq[0].contains("CardNumColors")) { return doXMath(CardUtil.getColors(c).countColors(), m, c); } + if (sq[0].contains("CardNumAttacksThisTurn")) { + return doXMath(c.getDamageHistory().getCreatureAttacksThisTurn(), m, c); + } if (sq[0].contains("ChosenNumber")) { Integer i = c.getChosenNumber(); return doXMath(i == null ? 0 : i, m, c); From 1439069492ea02fb272daaafe274df1fe246fcc5 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 20 Sep 2020 19:53:57 -0400 Subject: [PATCH 2/2] moraug_fury_of_akoum.txt --- .../upcoming/ZNR/moraug_fury_of_akoum.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt b/forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt new file mode 100644 index 00000000000..b884bbf4a18 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt @@ -0,0 +1,12 @@ +Name:Moraug, Fury of Akoum +ManaCost:4 R R +Types:Legendary Creature Minotaur Warrior +PT:6/6 +S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ AffectedX | Description$ Each creature you control gets +1/+0 for each time it has attacked this turn. +SVar:AffectedX:Count$CardNumAttacksThisTurn +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Condition$ PlayerTurn | Phase$ Main1,Main2 | Execute$ TrigAddPhase | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, if it's your main phase, there's an additional combat phase after this phase. At the beginning of that combat, untap all creatures you control. +SVar:TrigAddPhase:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ Main1 | FollowedBy$ BeginCombat | ConditionPhases$ Main1 | SubAbility$ DBAddPhase +SVar:DBAddPhase:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ Main2 | FollowedBy$ End of Turn | ConditionPhases$ Main2 | SubAbility$ DelTrigUntap +SVar:DelTrigUntap:DB$ DelayedTrigger | Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigUntapAll | TriggerDescription$ At the beginning of that combat, untap all creatures you control. +SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl +Oracle:Each creature you control gets +1/+0 for each time it has attacked this turn.\nLandfall — Whenever a land enters the battlefield under your control, if it's your main phase, there's an additional combat phase after this phase. At the beginning of that combat, untap all creatures you control.