external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'moraug' into 'master'

Browse Source 
ZNR: Moraug, Fury of Akoum and support

Closes #1571

See merge request core-developers/forge!3163
This commit is contained in:
Michael Kamensky
2020-09-21 05:48:44 +00:00
parent 8efe4f8118 1439069492
commit 49e8ffae13
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1295,6 +1295,9 @@ public class CardFactoryUtil {
if (sq[0].contains("CardNumColors")) { if (sq[0].contains("CardNumColors")) {
return doXMath(CardUtil.getColors(c).countColors(), m, c); 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")) { if (sq[0].contains("ChosenNumber")) {
Integer i = c.getChosenNumber(); Integer i = c.getChosenNumber();
return doXMath(i == null ? 0 : i, m, c); return doXMath(i == null ? 0 : i, m, c);

12
forge-gui/res/cardsfolder/upcoming/ZNR/moraug_fury_of_akoum.txt Normal file
View File

@@ -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.