Merge branch 'M21.22' into 'master'

M21 - 22 June

See merge request core-developers/forge!2899

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

@@ -0,0 +1,11 @@
+Name:Feline Sovereign
+ManaCost:2 G
+Types:Creature Cat
+PT:2/3
+S:Mode$ Continuous | Affected$ Cat.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Protection from Dogs | Description$ Other Cats you control get +1/+1 and have protection from Dogs.
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.Cat+YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever one or more Cats you control deal combat damage to a player, destroy up to one target artifact or enchantment that player controls.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact,Enchantment | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select up to one target artifact or enchantment that player controls
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Cat
+DeckHints:Type$Cat
+Oracle:Other Cats you control get +1/+1 and have protection from Dogs.\nWhenever one or more Cats you control deal combat damage to a player, destroy up to one target artifact or enchantment that player controls.

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

@@ -0,0 +1,8 @@
+Name:Fiery Emancipation
+ManaCost:3 R R R
+Types:Enchantment
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ Dmg3 | Description$ If a source you control would deal damage to a permanent or player, it deals triple that damage to that permanent or player instead.
+SVar:Dmg3:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
+SVar:X:ReplaceCount$DamageAmount/Thrice
+SVar:PlayMain1:TRUE
+Oracle:If a source you control would deal damage to a permanent or player, it deals triple that damage to that permanent or player instead.

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

@@ -0,0 +1,13 @@
+Name:Garruk, Unleashed
+ManaCost:2 G G
+Types:Legendary Planeswalker Garruk
+Loyalty:4
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Trample | SpellDescription$ Up to one target creature gets +3/+3 and gains trample until end of turn.
+A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ g_3_3_beast | TokenOwner$ You | SubAbility$ DBPutCounter | StackDescription$ SpellDescription | SpellDescription$ Create a 3/3 green Beast creature token. Then if an opponent controls more creatures than you, put a loyalty counter on CARDNAME.
+SVar:DBPutCounter:DB$ PutCounter | ConditionPresent$ Creature.OppCtrl | ConditionCompare$ GTX | References$ X | Defined$ Self | CounterNum$ 1 | CounterType$ LOYALTY | StackDescription$ None
+SVar:X:Count$Valid Creature.YouCtrl
+DeckHas:Ability$Token
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Garruk, Unleashed | Image$ emblem_garruk_unleashed | Triggers$ EffPhase | SVars$ EmblemTrigChangeZone | Duration$ Permanent | SpellDescription$ Create an emblem "At the beginning of your end step, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."
+SVar:EffPhase:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ EmblemTrigChangeZone | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may search your library for a creature card, put it onto the battlefield, then shuffle your library.
+SVar:EmblemTrigChangeZone:DB$ ChangeZone | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Library | Destination$ Battlefield | ShuffleNonMandatory$ True
+Oracle:[+1]: Up to one target creature gets +3/+3 and gains trample until end of turn.\n[−2]: Create a 3/3 green Beast creature token. Then if an opponent controls more creatures than you, put a loyalty counter on Garruk, Unleashed.\n[−7]: Create an emblem with "At the beginning of your end step, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."

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

@@ -0,0 +1,10 @@
+Name:Garruk's Harbinger
+ManaCost:1 G G
+Types:Creature Beast
+PT:4/3
+K:Hexproof:Card.Black:black
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | Execute$ TrigDig | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player or planeswalker, look at that many cards from the top of your library. You may reveal a creature card or Garruk planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ X | References$ X | ChangeNum$ 1 | ChangeValid$ Creature,Planeswalker.Garruk | Optional$ True | DestinationZone$ Hand | RestRandomOrder$ True
+SVar:X:TriggerCount$DamageAmount
+DeckHints:Type$Garruk
+Oracle:Hexproof from black\nWhenever Garruk's Harbinger deals combat damage to a player or planeswalker, look at that many cards from the top of your library. You may reveal a creature card or Garruk planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.

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

@@ -0,0 +1,14 @@
+Name:Hooded Blightfang
+ManaCost:2 B
+Types:Creature Snake
+PT:1/4
+K:Deathtouch
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withDeathtouch | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature you control with deathtouch attacks, each opponent loses 1 life and you gain 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl+withDeathtouch | ValidTarget$ Planeswalker | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever a creature you control with deathtouch deals damage to a planeswalker, destroy that planeswalker.
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTarget
+SVar:PlayMain1:TRUE
+DeckHas:Ability$LifeGain
+DeckHints:Keyword$Deathtouch
+Oracle:Deathtouch\nWhenever a creature you control with deathtouch attacks, each opponent loses 1 life and you gain 1 life.\nWhenever a creature you control with deathtouch deals damage to a planeswalker, destroy that planeswalker.

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

@@ -0,0 +1,9 @@
+Name:Leafkin Avenger
+ManaCost:2 R G
+Types:Creature Elemental Druid
+PT:4/3
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each Creature you control with power 4 or greater.
+SVar:X:Count$Valid Creature.YouCtrl+powerGE4
+A:AB$ DealDamage | Cost$ 7 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ Y | References$ Y | SpellDescription$ CARDNAME deals damage equal to its power to target player or planeswalker.
+SVar:Y:Count$CardPower
+Oracle:{T}: Add {G} for each creature you control with power 4 or greater.\n{7}{R}: Leafkin Avenger deals damage equal to its power to target player or planeswalker.

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

@@ -0,0 +1,12 @@
+Name:Liliana's Devotee
+ManaCost:2 B
+Types:Creature Human Warlock
+PT:2/3
+S:Mode$ Continuous | Affected$ Zombie.YouCtrl | AddPower$ 1 | Description$ Zombies you control get +1/+0.
+SVar:PlayMain1:TRUE
+DeckHints:Type$Zombie
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if a creature died this turn, you may pay {1}{B}. If you do, create a 2/2 black Zombie creature token.
+SVar:TrigToken:AB$ Token | Cost$ 1 B | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
+DeckHas:Ability$Token
+Oracle:Zombies you control get +1/+0.\nAt the beginning of your end step, if a creature died this turn, you may pay {1}{B}. If you do, create a 2/2 black Zombie creature token.

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

@@ -0,0 +1,9 @@
+Name:Liliana's Standard Bearer
+ManaCost:2 B
+Types:Creature Zombie Knight
+PT:3/1
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw X cards, where X is the number of creatures that died under your control this turn.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
+Oracle:Flash\nWhen Liliana's Standard Bearer enters the battlefield, draw X cards, where X is the number of creatures that died under your control this turn.

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

@@ -0,0 +1,8 @@
+Name:Lofty Denial
+ManaCost:1 U
+Types:Instant
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X,Y | SpellDescription$ Counter target spell unless its controller pays {1}. If you control a creature with flying, counter that spell unless its controller pays {4} instead.
+SVar:Y:Count$Valid Creature.YouCtrl+withFlying
+SVar:X:Count$Compare Y GE1.4.1
+DeckHints:Keyword$Flying
+Oracle:Counter target spell unless its controller pays {1}. If you control a creature with flying, counter that spell unless its controller pays {4} instead.

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

@@ -0,0 +1,13 @@
+Name:Niambi, Esteemed Speaker
+ManaCost:W U
+Types:Legendary Creature Human Cleric
+PT:2/1
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's converted mana cost.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another creature you control | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
+SVar:X:Targeted$CardManaCost
+DeckHas:Ability$LifeGain
+A:AB$ Draw | Cost$ 1 W U T Discard<1/Card.Legendary> | NumCards$ 2 | SpellDescription$ Draw two cards.
+DeckHints:Type$Legendary
+Oracle:Flash\nWhen Niambi, Esteemed Speaker enters the battlefield, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's converted mana cost.\n{1}{W}{U}, {T}, Discard a legendary card: Draw two cards.

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

@@ -7,4 +7,5 @@ S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library |
 S:Mode$ Continuous | Affected$ Land.TopLibrary+YouCtrl | AffectedZone$ Library | MayPlay$ True | Description$ You may play the top card of your library if it's a land card.
 A:AB$ Pump | Cost$ 4 R G | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ CARDNAME gets +X/+X until end of turn, where X is the number of lands you control.
 SVar:X:Count$TypeYouCtrl.Land
+SVar:BuffedBy:Land
 Oracle:As long as it's your turn, Radha, Heart of Keld has first strike.\nYou may look at the top card of your library any time, and you may play lands from the top of your library.\n{4}{R}{G}: Radha gets +X/+X until end of turn, where X is the number of lands you control.

forge-gui/res/editions/Magic 2021.txt

@@ -416,6 +416,7 @@ g_1_1_saproling
 g_2_2_cat
 g_3_3_beast
 r_1_1_goblin_wizard_prowess
+r_1_1_pirate_noblock_all_attack
 ur_x_x_weird
 w_1_1_bird_flying
 w_1_1_dog