diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt b/forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt
index 85816be0a43..2a42805e30d 100644
--- a/forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ZNR/omnath_locus_of_creation.txt
@@ -2,16 +2,15 @@ Name:Omnath, Locus of Creation
 ManaCost:R G W U
 Types:Legendary Creature Elemental
 PT:4/4
-T:Mode$ TurnBegin | ValidPlayer$ Player | Static$ True | TriggerZones$ Battlefield | Execute$ LandfallReset
-SVar:LandfallReset:DB$ StoreSVar | SVar$ LandfallAmount | Type$ Number | Expression$ 0 | References$ LandfallAmount
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | CheckSVar$ LandfallAmount | SVarCompare$ EQ0 | References$ LandfallAmount | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you gain 4 life if this is the first time this ability has resolved this turn.
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | SubAbility$ LandfallCount
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAddMana | CheckSVar$ LandfallAmount | SVarCompare$ EQ1 | References$ LandfallAmount | TriggerDescription$ If it's the second time, add {R}{G}{W}{U}.
-SVar:TrigAddMana:DB$ Mana | Produced$ R G W U | SubAbility$ LandfallCount
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamageAll | CheckSVar$ LandfallAmount | SVarCompare$ EQ2 | References$ LandfallAmount | TriggerDescription$ If it's the third time, CARDNAME deals 4 damage to each opponent and each planeswalker you don't control.
-SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Opponent | ValidCards$ Planeswalker.YouDontCtrl | NumDmg$ 4 | SubAbility$ LandfallCount
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ LandfallReset | Static$ True
+T:Mode$ TurnBegin | ValidPlayer$ Player | Static$ True | TriggerZones$ Battlefield | Execute$ LandfallReset
+SVar:LandfallReset:DB$ StoreSVar | SVar$ LandfallAmount | Type$ Number | Expression$ 0 | References$ LandfallAmount
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you gain 4 life if this is the first time this ability has resolved this turn. If it's the second time, add {R}{G}{W}{U}. If it's the third time, CARDNAME deals 4 damage to each opponent and each planeswalker you don't control.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | ConditionCheckSVar$ LandfallAmount | ConditionSVarCompare$ EQ0 | SubAbility$ DBMana
+SVar:DBMana:DB$ Mana | Produced$ R G W U | ConditionCheckSVar$ LandfallAmount | ConditionSVarCompare$ EQ1 | SubAbility$ DBDamageAll
+SVar:DBDamageAll:DB$ DamageAll | ValidPlayers$ Opponent | ValidCards$ Planeswalker.YouDontCtrl | NumDmg$ 4 | ConditionCheckSVar$ LandfallAmount | ConditionSVarCompare$ EQ2 | SubAbility$ LandfallCount
 SVar:LandfallCount:DB$ StoreSVar | SVar$ LandfallAmount | Type$ CountSVar | Expression$ LandfallAmount/Plus.1
 SVar:LandfallAmount:Number$0
 DeckHas:Ability$LifeGain