Merge branch 'M21.8' into 'master'

M21 - 8 June

See merge request core-developers/forge!2861

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

@@ -0,0 +1,9 @@
+Name:Adherent of Hope
+ManaCost:1 W
+Types:Creature Human Soldier
+PT:2/1
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | IsPresent$ Planeswalker.Basri+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, if you control a Basri planeswalker, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckNeeds:Type$Basri
+DeckHas:Ability$Counters
+Oracle:At the beginning of combat on your turn, if you control a Basri planeswalker, put a +1/+1 counter on Adherent of Hope.

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

@@ -0,0 +1,7 @@
+Name:Bad Deal
+ManaCost:4 B B
+Types:Sorcery
+A:SP$ Draw | Cost$ 4 B B | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ You draw two cards and each opponent discards two cards. Each player loses 2 life.
+SVar:DBDiscard:DB$ Discard | Defined$ Opponent | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ Player
+Oracle:You draw two cards and each opponent discards two cards. Each player loses 2 life.

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

@@ -0,0 +1,12 @@
+Name:Basri, Devoted Paladin
+ManaCost:4 W W
+Types:Legendary Planeswalker Basri
+Loyalty:4
+A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | CounterNum$ 1 | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on up to one target creature. It gains vigilance until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Vigilance
+A:AB$ Effect | Cost$ SubCounter<1/LOYALTY> | Triggers$ TrigAttack | SVars$ TrigPutCounter | SpellDescription$ Whenever a creature attacks this turn, put a +1/+1 counter on it.
+SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature attacks this turn, put a +1/+1 counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ PumpAll | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Flying | SpellDescription$ Creatures you control get +2/+2 and gain flying until end of turn.
+DeckHas:Ability$Counters
+Oracle:[+1]: Put a +1/+1 counter on up to one target creature. It gains vigilance until end of turn.\n[−1]: Whenever a creature attacks this turn, put a +1/+1 counter on it.\n[−6]: Creatures you control get +2/+2 and gain flying until end of turn.

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

@@ -0,0 +1,8 @@
+Name:Basri's Aegis
+ManaCost:2 W W
+Types:Sorcery
+A:SP$ PutCounter | Cost$ 2 W W | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBSearch | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures. You may search your library and/or graveyard for a card named Basri, Devoted Paladin, 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.namedBasri; Devoted Paladin | ChangeNum$ 1
+DeckHints:Name$Basri, Devoted Paladin
+DeckHas:Ability$Counters
+Oracle:Put a +1/+1 counter on each of up to two target creatures. You may search your library and/or graveyard for a card named Basri, Devoted Paladin, reveal it, and put it into your hand. If you search your library this way, shuffle it.

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

@@ -0,0 +1,9 @@
+Name:Chandra's Firemaw
+ManaCost:3 R R
+Types:Creature Hellion
+PT:4/2
+K:Haste
+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 Chandra, Flame's Catalyst, 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.namedChandra; Flame's Catalyst | ChangeNum$ 1
+DeckHints:Name$Chandra, Flame's Catalyst
+Oracle:Haste\nWhen Chandra's Firemaw enters the battlefield, you may search your library and/or graveyard for a card named Chandra, Flame's Catalyst, reveal it, and put it into your hand. If you search your library this way, shuffle it.

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

@@ -0,0 +1,9 @@
+Name:Chromatic Orrery
+ManaCost:7
+Types:Legendary Artifact
+S:Mode$ Continuous | Affected$ You | ManaColorConversion$ Additive | WhiteConversion$ All | BlueConversion$ All | BlackConversion$ All | RedConversion$ All | GreenConversion$ All | ColorlessConversion$ All | Description$ You may spend mana as though it were mana of any color.
+SVar:NonStackingEffect:True
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 5 | SpellDescription$ Add {C}{C}{C}{C}{C}.
+A:AB$ Draw | Cost$ 5 T | NumCards$ X | References$ X | SpellDescription$ Draw a card for each color among permanents you control.
+SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield
+Oracle:You may spend mana as though it were mana of any color.\n{T}: Add {C}{C}{C}{C}{C}.\n{5}, {T}: Draw a card for each color among permanents you control.

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

@@ -12,6 +12,6 @@ SVar:X:Count$InYourYard
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Liliana, Waker of the Dead | Image$ emblem_liliana_waker_of_the_dead | Triggers$ EffPhase | SVars$ EmblemTrigChangeZone,DBPump | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of combat on your turn, put target creature card from a graveyard onto the battlefield under your control. It gains haste."
 SVar:EffPhase:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ EmblemTrigChangeZone | TriggerDescription$ At the beginning of combat on your turn, put target creature card from a graveyard onto the battlefield under your control. It gains haste.
 SVar:EmblemTrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste | Permanent$ True
 DeckHas:Ability$Discard & Ability$Graveyard
 Oracle:[+1]: Each player discards a card. Each opponent who can’t loses 3 life.\n[−3]: Target creature gets -X/-X until end of turn, where X is the number of cards in your graveyard.\n[−7]: You get an emblem with "At the beginning of combat on your turn, put target creature card from a graveyard onto the battlefield under your control. It gains haste."

forge-gui/res/lists/TypeLists.txt

@@ -66,6 +66,7 @@ Deserter:Deserters
 Devil:Devils
 Dinosaur:Dinosaurs
 Djinn:Djinns
+Dog:Dogs
 Dragon:Dragons
 Drake:Drakes
 Dreadnought:Dreadnoughts
@@ -290,6 +291,7 @@ Aminatou
 Angrath
 Arlinn
 Ashiok
+Basri
 Bolas
 Calix
 Chandra