Merge branch 'ZNR11' into 'master'

ZNR 11 Sep

See merge request core-developers/forge!3124

forge-gui/res/cardsfolder/upcoming/ZNR/felidar_retreat.txt

@@ -0,0 +1,11 @@
+Name:Felidar Retreat
+ManaCost:3 W
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ TrigCharm | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBPutCounterAll | CharmNum$ 1
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_cat_beast | TokenOwner$ You | SpellDescription$ Create a 2/2 white Cat Beast creature token.
+SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll | SpellDescription$ Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance
+DeckHas:Ability$Token & Ability$Counters
+SVar:BuffedBy:Land
+Oracle:Landfall — Whenever a land enters the battlefield under your control, choose one —\n• Create a 2/2 white Cat Beast creature token.\n• Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn.

forge-gui/res/cardsfolder/upcoming/ZNR/nahiris_lithoforming.txt

@@ -0,0 +1,15 @@
+Name:Nahiri's Lithoforming
+ManaCost:X R R
+Types:Sorcery
+A:SP$ Sacrifice | Cost$ X R R | SacValid$ Land | Amount$ X | References$ X | RememberSacrificed$ True | SubAbility$ DBDraw | StackDescription$ SpellDescription | SpellDescription$ Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter the battlefield tapped this turn.
+SVar:DBDraw:DB$ Draw | NumCards$ Y | References$ Y | SubAbility$ DBStoreSVar | StackDescription$ None
+SVar:DBStoreSVar:DB$ StoreSVar | SVar$ XLands | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayMoreLand,LandETBTapped | SVars$ XLands | SubAbility$ DBCleanup
+SVar:PlayMoreLand:Mode$ Continuous | Affected$ You | AdjustLandPlays$ XLands | References$ XLands | EffectZone$ Command | Description$ You may play X additional lands this turn.
+SVar:LandETBTapped:Mode$ ETBTapped | EffectZone$ Command | ValidCard$ Land.YouCtrl | Description$ Lands you control enter the battlefield tapped this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+SVar:Y:Count$RememberedSize
+SVar:XLands:Number$0
+DeckHas:Ability$Sacrifice
+Oracle:Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter the battlefield tapped this turn.

forge-gui/res/cardsfolder/upcoming/ZNR/roil_eruption.txt

@@ -0,0 +1,7 @@
+Name:Roil Eruption
+ManaCost:1 R
+Types:Sorcery
+K:Kicker:5
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals 3 damage to any target. If this spell was kicked, it deals 5 damage instead.
+SVar:X:Count$Kicked.5.3
+Oracle:Kicker {5} (You may pay an additional {5} as you cast this spell.)\nRoil Eruption deals 3 damage to any target. If this spell was kicked, it deals 5 damage instead.

forge-gui/res/cardsfolder/upcoming/ZNR/scavenged_blade.txt

@@ -0,0 +1,9 @@
+Name:Scavenged Blade
+ManaCost:1 R
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters the battlefield, attach it to target creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+SVar:NeedsToPlay:Creature.YouCtrl+inZoneBattlefield
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
+K:Equip:2 R
+Oracle:When Scavenged Blade enters the battlefield, attach it to target creature you control.\nEquipped creature gets +2/+0.\nEquip {2}{R} ({2}{R}: Attach to target creature you control. Equip only as a sorcery.)

forge-gui/res/cardsfolder/upcoming/ZNR/scorch_rider.txt

@@ -0,0 +1,9 @@
+Name:Scorch Rider
+ManaCost:3 R
+Types:Creature Human Warrior
+PT:4/3
+K:Kicker:1 R
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, it gains haste until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Haste
+SVar:PlayMain1:TRUE
+Oracle:Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.)\nWhen Scorch Rider enters the battlefield, if it was kicked, it gains haste until end of turn.

forge-gui/res/cardsfolder/upcoming/ZNR/shatterskull_charger.txt

@@ -0,0 +1,14 @@
+Name:Shatterskull Charger
+ManaCost:1 R R
+Types:Creature Giant Warrior
+PT:4/3
+K:Kicker:2
+K:Trample
+K:Haste
+K:etbCounter:P1P1:1:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with a +1/+1 counter on it.
+SVar:WasKicked:Count$Kicked.1.0
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigReturn | IsPresent$ Card.Self+counters_EQ0_P1P1 | TriggerDescription$ At the beginning of the end step, return Shatterskull Charger to its owner's hand unless it has a +1/+1 counter on it.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
+Oracle:Kicker {2}\nTrample, haste\nIf Shatterskull Charger was kicked, it enters the battlefield with a +1/+1 counter on it.\nAt the beginning of the end step, return Shatterskull Charger to its owner's hand unless it has a +1/+1 counter on it.

forge-gui/res/cardsfolder/upcoming/ZNR/synchronized_spellcraft.txt

@@ -0,0 +1,9 @@
+Name:Synchronized Spellcraft
+ManaCost:4 R
+Types:Instant
+A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 4 damage to target creature and X damage to that creature's controller, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
+SVar:DBDealDamage:DB$ DealDamage | NumDmg$ X | Defined$ TargetedController | References$ X
+SVar:X:Count$Party
+DeckHas:Ability$Party
+DeckHints:Type$Cleric|Rogue|Warrior|Wizard
+Oracle:Synchronized Spellcraft deals 4 damage to target creature and X damage to that creature's controller, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)

forge-gui/res/tokenscripts/w_2_2_cat_beast.txt

@@ -0,0 +1,6 @@
+Name:Cat Beast
+ManaCost:no cost
+Types:Creature Cat Beast
+Colors:white
+PT:2/2
+Oracle: