Merge branch 'patch' into 'master'

Modern Horizons cards

See merge request core-developers/forge!1657

forge-gui/res/cardsfolder/b/bant_sojourners.txt

@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 PT:2/4
 K:Cycling:2 W
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME or it dies, you may create a 1/1 white Soldier creature token.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | OptionalDecider$ You | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it dies, you may create a 1/1 white Soldier creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | OptionalDecider$ You | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it dies, you may create a 1/1 white Soldier creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier | TokenOwner$ You | LegacyImage$ w 1 1 soldier arb
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bant_sojourners.jpg
 Oracle:When you cycle Bant Sojourners or it dies, you may create a 1/1 white Soldier creature token.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)

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

@@ -8,5 +8,4 @@ SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ NameCard | TriggerDescri
 SVar:NameCard:DB$ NameCard | Defined$ You | ValidCards$ Card.nonLand | ValidDesc$ nonland | SubAbility$ DBDiscard | SpellDescription$ Choose a nonland card name. Target player reveals their hand and discards all cards with that name.
 SVar:DBDiscard:DB$ Discard | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ RevealDiscardAll | DiscardValid$ Card.NamedCard
 AI:RemoveDeck:All
-SVar:https://i.imgur.com/ZLMSgWt.jpg
-Oracle:Menace \nAt the beginning of your precombat main phase, you may sacrifice a creature. When you do, choose a nonland card name, then target player reveals their hand and discards all cards with that name.
+Oracle:Menace\nAt the beginning of your precombat main phase, you may sacrifice a creature. When you do, choose a nonland card name, then target player reveals their hand and discards all cards with that name.

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

@@ -0,0 +1,6 @@
+Name:Savage Swipe
+ManaCost:G
+Types:Sorcery
+A:SP$ Pump | Cost$ G | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | AITgts$ Creature.YouCtrl+powerEQ2 | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | NumAtt$ +2 | NumDef$ +2 | ConditionDefined$ Targeted | ConditionPresent$ Creature.powerEQ2 | SpellDescription$ Target creature you control gets +2/+2 until end of turn. It fights target creature you don't control.
+SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control
+Oracle:Target creature you control gets +2/+2 until end of turn if its power is 2. Then it fights target creature you don't control. (Each deals damage equal to its power to the other.)

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

@@ -0,0 +1,11 @@
+Name:Serra the Benevolent
+ManaCost:2 W W
+Types:Legendary Planeswalker Serra
+Loyalty:4
+A:AB$ PumpAll | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.withFlying+YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control with flying get +1/+1 until end of turn.
+A:AB$ Token | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | TokenScript$ w_4_4_angel_flying_vigilance | TokenOwner$ You | LegacyImage$ w 4 4 angel flying vigilance mh1 | SpellDescription$ Create a 4/4 white Angel creature token with flying and vigilance.
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Name$ Emblem - Serra the Benevolent | Image$ emblem_serra_the_benevolent | StaticAbilities$ STWorship | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead."
+SVar:STWorship:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ DamageLifeThreshold:1 | IsPresent$ Creature.YouCtrl | Description$ If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead.
+DeckHas:Ability$Token
+SVar:Picture:http://www.wizards.com/global/images/magic/general/serra_the_benevolent.jpg
+Oracle:[+2]: Creatures you control with flying get +1/+1 until end of turn.\n[-3]: Create a 4/4 white Angel creature token with flying and vigilance.\n[-6]: You get an emblem with "If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead."

forge-gui/res/editions/Modern Horizons.txt

@@ -0,0 +1,38 @@
+[metadata]
+Code=MH1
+Date=2019-6-14
+Name=Modern Horizons
+Code2=MH1
+MciCode=mh1
+Type=Other
+
+[cards]
+14 C Impostor of the Sixth Pride
+19 C Martyr's Soul
+26 M Serra the Benevolent
+36 C Wall of One Thousand Cuts
+38 U Wing Shards
+44 C Choking Tethers
+52 R Force of Negation
+64 C Prohibit
+71 C Stream of Thought
+80 R Cabal Therapist
+95 C Headless Specter
+114 C Venomous Changling
+122 U Firebolt
+129 U Goblin Matron
+131 C Goblin War Party
+134 C Lava Dart
+161 R Deep Forest Hermit
+162 C Elvish Fury
+178 C Savage Swipe
+250 L Plains
+251 L Island
+252 L Swamp
+253 L Mountain
+254 L Forest
+255 R Flusterstorm
+
+
+[tokens]
+w_4_4_angel_flying_vigilance