Merge branch 'patch' into 'master'

MH1: add some cards

See merge request core-developers/forge!1761

forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt

@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Domri
 Loyalty:5
 A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ Combo R G | Amount$ 1 | AddsKeywords$ Riot | AddsKeywordsType$ Creature | SpellDescription$ Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)
 A:AB$ Dig | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ForceRevealToController$ True | DigNum$ 4 | ChangeNum$ 2 | Optional$ True | ChangeValid$ Creature | RestRandomOrder$ True | SpellDescription$ Look at the top four cards of your library. You may reveal up to two creature cards from among them and put them into your hand. Put the rest on the bottom of your library in a random order.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Domri, Chaos Bringer | Image$ emblem_domri_chaos_bringer | Triggers$ EffPhase | SVars$ EmblemTrigToken | Duration$ Permanent | SpellDescription$ You get an emblem with “At the beginning of each end step, create a 4/4 red and green Beast creature token with trample.”
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Domri, Chaos Bringer | Image$ emblem_domri_chaos_bringer | Triggers$ EffPhase | SVars$ EmblemTrigToken | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of each end step, create a 4/4 red and green Beast creature token with trample."
 SVar:EffPhase:Mode$ Phase | Phase$ End of Turn | Execute$ EmblemTrigToken | TriggerDescription$ At the beginning of each end step, create a 4/4 red and green Beast creature token with trample.
 SVar:EmblemTrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ rg_4_4_beast_trample | LegacyImage$ rg 4 4 beast trample rna
 Oracle:+1: Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)\n−3: Look at the top four cards of your library. You may reveal up to two creature cards from among them and put them into your hand. Put the rest on the bottom of your library in a random order.\n−8: You get an emblem with “At the beginning of each end step, create a 4/4 red and green Beast creature token with trample.”

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

@@ -0,0 +1,11 @@
+Name:Fallen Shinobi
+ManaCost:3 U B
+Types:Creature Zombie Ninja
+PT:5/4
+K:Ninjutsu:2 U B
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles the top two cards of their library. Until end of turn, you may play those cards without paying their mana cost.
+SVar:TrigMill:DB$ Mill | Defined$ TriggeredTarget | NumCards$ 2 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of turn, you may play those cards without paying their mana cost.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Ninjutsu {2}{U}{B} ({2}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Fallen Shinobi deals combat damage to a player, that player exiles the top two cards of their library. Until end of turn, you may play those cards without paying their mana cost.

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

@@ -0,0 +1,10 @@
+Name:Wrenn and Six
+ManaCost:R G
+Types:Legendary Planeswalker Wrenn
+Loyalty:3
+A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Land.YouOwn | TgtPrompt$ Select target land card in your graveyard | SpellDescription$ Return up to one target land card from your graveyard to your hand.
+A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | NumDmg$ 1 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | SpellDescription$ CARDNAME deals 1 damage to any target. 
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem - Wrenn and Six | Image$ emblem_wrenn_and_six | StaticAbilities$ STWrenn | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Instant and sorcery cards in your graveyard have retrace."
+SVar:STWrenn:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Graveyard | Affected$ Instant.YouOwn,Sorcery.YouOwn | AddKeyword$ Retrace | Description$ You get an emblem with "Instant and sorcery cards in your graveyard have retrace."
+DeckHas:Ability$Token
+Oracle:[+1]: Return up to one target land card from your graveyard to your hand.\n[-1]: Wrenn and Six deals 1 damage to any target.\n[-7]: You get an emblem with "Instant and sorcery cards in your graveyard have retrace."

forge-gui/res/lists/TypeLists.txt

@@ -307,6 +307,7 @@ Rowan
 Saheeli
 Samut
 Sarkhan
+Serra
 Sorin
 Tamiyo
 Teferi
@@ -319,6 +320,7 @@ Vivien
 Vraska
 Will
 Windgrace
+Wrenn
 Xenagos
 Yanggu
 Yanling