Merge branch 'M21.9' into 'master'

M21 - 9 June

See merge request core-developers/forge!2865

forge-gui/res/cardsfolder/upcoming/gadrak_the_crown_scourge.txt

@@ -0,0 +1,14 @@
+Name:Gadrak, the Crown-Scourge
+ManaCost:2 R
+Types:Legendary Creature Dragon
+PT:5/4
+K:Flying
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LE3 | Description$ CARDNAME can't attack unless you control four or more artifacts.
+SVar:X:Count$Valid Artifact.YouCtrl
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a Treasure token for each nontoken creature that died this turn.
+SVar:TrigToken:DB$ Token | TokenAmount$ Y | References$ Y | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+SVar:Y:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken
+DeckHas:Ability$Token
+DeckHints:Type$Artifact
+SVar:BuffedBy:Artifact
+Oracle:Flying\nGadrak, the Crown-Scourge can't attack unless you control four or more artifacts.\nAt the beginning of your end step, create a Treasure token for each nontoken creature that died this turn. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

forge-gui/res/cardsfolder/upcoming/garruk_savage_herald.txt

@@ -0,0 +1,10 @@
+Name:Garruk, Savage Herald
+ManaCost:4 G G
+Types:Legendary Planeswalker Garruk
+Loyalty:5
+A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition2$ -1 | StackDescription$ SpellDescription | SpellDescription$ Reveal the top card of your library. If it's a creature card, put it into your hand. Otherwise, put it on the bottom of your library.
+A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True  | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage | AILogic$ PowerDmg | SpellDescription$ Target creature you control deals damage equal to its power to another target creature.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature to damage | TargetUnique$ True | AILogic$ PowerDmg | NumDmg$ X | References$ X | DamageSource$ ParentTarget
+SVar:X:ParentTargeted$CardPower
+A:AB$ PumpAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | KW$ HIDDEN You may have CARDNAME assign its combat damage as though it weren't blocked. | SpellDescription$ Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."
+Oracle:[+1]: Reveal the top card of your library. If it's a creature card, put it into your hand. Otherwise, put it on the bottom of your library.\n−2: Target creature you control deals damage equal to its power to another target creature.\n−7: Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."

forge-gui/res/cardsfolder/upcoming/garruks_warsteed.txt

@@ -0,0 +1,9 @@
+Name:Garruk's Warsteed
+ManaCost:3 G G
+Types:Creature Rhino
+PT:3/5
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library and/or graveyard for a card named Garruk, Savage Herald, reveal it, and put it into your hand. If you search your library this way, shuffle it.
+SVar:TrigSearch:DB$ ChangeZone | Optional$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Hand | ChangeType$ Card.namedGarruk; Savage Herald | ChangeNum$ 1
+DeckHints:Name$Garruk, Savage Herald
+Oracle:Vigilance\nWhen Garruk's Warsteed enters the battlefield, you may search your library and/or graveyard for a card named Garruk, Savage Herald, reveal it, and put it into your hand. If you search your library this way, shuffle it.

forge-gui/res/cardsfolder/upcoming/historian_of_zhalfir.txt

@@ -0,0 +1,8 @@
+Name:Historian of Zhalfir
+ManaCost:2 U U
+Types:Creature Human Wizard
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | IsPresent$ Planeswalker.Teferi+YouCtrl | TriggerDescription$ Whenever CARDNAME attacks, if you control a Teferi planeswalker, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+DeckNeeds:Type$Teferi
+Oracle:Whenever Historian of Zhalfir attacks, if you control a Teferi planeswalker, draw a card.

forge-gui/res/cardsfolder/upcoming/indulging_patrician.txt

@@ -0,0 +1,11 @@
+Name:Indulging Patrician
+ManaCost:1 W B
+Types:Creature Vampire Noble
+PT:1/4
+K:Flying
+K:Lifelink
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ LifeGained | SVarCompare$ GE3 | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, if you gained 3 or more life this turn, each opponent loses 3 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 3
+SVar:LifeGained:Count$LifeYouGainedThisTurn
+DeckHints:Ability$LifeGain
+Oracle:Flying\nLifelink (Damage dealt by this creature also causes you to gain that much life.)\nAt the beginning of your end step, if you gained 3 or more life this turn, each opponent loses 3 life.

forge-gui/res/cardsfolder/upcoming/lilianas_scorn.txt

@@ -0,0 +1,7 @@
+Name:Liliana's Scorn
+ManaCost:3 B B
+Types:Sorcery
+A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBSearch | SSpellDescription$ Destroy target creature. You may search your library and/or graveyard for a card named Liliana, Death Mage, reveal it, and put it into your hand. If you search your library this way, shuffle it.
+SVar:DBSearch:DB$ ChangeZone | Optional$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Hand | ChangeType$ Card.namedLiliana; Death Mage | ChangeNum$ 1
+DeckHints:Name$Liliana, Death Mage
+Oracle:Destroy target creature. You may search your library and/or graveyard for a card named Liliana, Death Mage, reveal it, and put it into your hand. If you search your library this way, shuffle it.

forge-gui/res/cardsfolder/upcoming/lilianas_scrounger.txt

@@ -0,0 +1,9 @@
+Name:Liliana's Scrounger
+ManaCost:2 B
+Types:Creature Human Wizard
+PT:3/2
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | References$ X | TriggerDescription$ At the beginning of each end step, if a creature died this turn, you may put a loyalty counter on a Liliana planeswalker you control.
+SVar:TrigPutCounter:DB$ PutCounter | Choices$ Planeswalker.Liliana+YouCtrl | CounterType$ LOYALTY | CounterNum$ 1
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
+DeckNeeds:Type$Liliana
+Oracle:At the beginning of each end step, if a creature died this turn, you may put a loyalty counter on a Liliana planeswalker you control.

forge-gui/res/cardsfolder/upcoming/llanowar_visionary.txt

@@ -0,0 +1,8 @@
+Name:Llanowar Visionary
+ManaCost:2 G
+Types:Creature Elf Druid
+PT:2/2
+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
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+Oracle:When Llanowar Visionary enters the battlefield, draw a card.\n{T}: Add {G}.