Merge branch 'master' into master2

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

@@ -0,0 +1,10 @@
+Name:Conductive Machete
+ManaCost:4
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread, then attach CARDNAME to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)
+SVar:TrigDread:DB$ Manifest | Dread$ True | Defined$ You | RememberManifested$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 1 | Description$ Equipped creature gets +2/+1.
+K:Equip:4
+Oracle:When Conductive Machete enters, manifest dread, then attach Conductive Machete to that creature. (Look at the top two cards of your library. Put one onto the battlefield face down as a 2/2 creature and the other into your graveyard. Turn it face up any time for its mana cost if it's a creature card.)\nEquipped creature gets +2/+1.\nEquip {4}

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

@@ -0,0 +1,10 @@
+Name:Enduring Courage
+ManaCost:2 R R
+Types:Enchantment Creature Dog Glimmer
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredCardLKICopy | NumAtt$ +2 | KW$ Haste
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Whenever another creature you control enters, it gets +2/+0 and gains haste until end of turn.\nWhen Enduring Courage dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)

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

@@ -0,0 +1,7 @@
+Name:Found Footage
+ManaCost:1
+Types:Artifact Clue
+S:Mode$ Continuous | Affected$ Creature.faceDown+OppCtrl | AffectedZone$ Battlefield | MayLookAt$ You | Description$ You may look at face-down creatures your opponents control any time.
+A:AB$ Surveil | Cost$ 2 Sac<1/CARDNAME> | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw a card. (To surveil 2, look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+SVar:DBDraw:DB$ Draw
+Oracle:You may look at face-down creatures your opponents control any time.\n{2}, Sacrifice Found Footage: Surveil 2, then draw a card. (To surveil 2, look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)

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

@@ -0,0 +1,7 @@
+Name:Friendly Teddy
+ManaCost:2
+Types:Artifact Creature Bear Toy
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, each player draws a card.
+SVar:TrigDraw:DB$ Draw | Defined$ Player
+Oracle:When Friendly Teddy enters, each player draws a card.

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

@@ -0,0 +1,10 @@
+Name:Gremlin Tamer
+ManaCost:W U
+Types:Creature Human Scout
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_gremlin | TokenOwner$ You
+DeckHas:Ability$Token
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, create a 1/1 red Gremlin creature token.

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

@@ -0,0 +1,6 @@
+Name:Marvin, Murderous Mimic
+ManaCost:2
+Types:Legendary Artifact Creature Toy
+PT:4/6
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature.YouCtrl+!sharesNameWith Self | Description$ CARDNAME has all activated abilities of creatures you control that don't have the same name as this creature.
+Oracle:Marvin, Murderous Mimic has all activated abilities of creatures you control that don't have the same name as this creature.

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

@@ -0,0 +1,10 @@
+Name:Optimistic Scavenger
+ManaCost:W
+Types:Creature Human Scout
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
+T:Mode$ FullyUnlock | ValidCard$ Card.Room | ValidPlayer$ You | Secondary$ True | Execute$ TrigPutCounter | TriggerDescription$ Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+DeckNeeds:Type$Enchantment
+Oracle:Eerie — Whenever an enchantment you control enters and whenever you fully unlock a Room, put a +1/+1 counter on target creature.

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

@@ -0,0 +1,10 @@
+Name:Rootwise Survivor
+Types:Creature Human Survivor
+ManaCost:3 G G
+PT:3/4
+K:Haste
+T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | PresentDefined$ Self | IsPresent$ Card.tapped | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Survival — At the beginning of your second main phase, if CARDNAME is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 0 | Toughness$ 0 | Types$ Creature,Elemental | Duration$ Permanent | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Keywords$ Haste | Defined$ Targeted | Duration$ UntilYourNextTurn
+Oracle:Survival — At the beginning of your second main phase, if Rootwise Survivor is tapped, put three +1/+1 counters on up to one target land you control. That land becomes a 0/0 Elemental creature in addition to its other types. It gains haste until your next turn.

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

@@ -0,0 +1,6 @@
+Name:Withering Torment
+ManaCost:2 B
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature,Enchantment | TgtPrompt$ Select target creature or enchantment | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature or enchantment. You lose 2 life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
+Oracle:Destroy target creature or enchantment. You lose 2 life.

forge-gui/res/editions/Duskmourn House of Horror.txt

@@ -94,6 +94,7 @@ ScryfallCode=DSK
 120 M Valgavoth, Terror Eater @Antonio José Manzanedo
 121 U Valgavoth's Faithful @Jodie Muir
 122 U Vile Mutilator @Néstor Ossandón Leal
+124 U Withering Torment @Inkognit
 126 U Betrayer's Bargain @Billy Christian
 127 C Boilerbilges Ripper @Kai Carpenter
 128 R Chainsaw @J.P. Targete
@@ -101,6 +102,7 @@ ScryfallCode=DSK
 130 C Clockwork Percussionist @Eric Wilkerson
 131 R Cursed Recording @Kim Sokol
 132 U Diversion Specialist @Tuan Duong Chu
+133 R Enduring Courage @Yigit Koroglu
 134 U Fear of Being Hunted @Maxime Minard
 135 U Fear of Burning Alive @J.P. Targete
 136 R Fear of Missing Out @John Stanko
@@ -132,7 +134,7 @@ ScryfallCode=DSK
 169 C Bashful Beastie @Aaron Miller
 170 U Break Down the Door @Ralph Horsley
 172 C Cautious Survivor @Jodie Muir
-173 C Coordinated Clobbering @Fajareka Setiawan
+173 U Coordinated Clobbering @Fajareka Setiawan
 174 C Cryptid Inspector @Kim Sokol
 175 U Defiant Survivor @Jessica Fong
 178 C Flesh Burrower @Maxime Minard
@@ -148,6 +150,7 @@ ScryfallCode=DSK
 193 U Overgrown Zealot @Tyler Walpole
 194 M Overlord of the Hauntwoods @Tiffany Turrill
 195 U Patchwork Beastie @John Tedrick
+196 U Rootwise Survivor @Joseph Weston
 197 C Say Its Name @Sam Wolfe Connelly
 198 C Slavering Branchsnapper @John Tedrick
 199 C Spineseeker Centipede @Dave Kendall
@@ -163,6 +166,7 @@ ScryfallCode=DSK
 212 U Disturbing Mirth @Nino Vecia
 213 U Drag to the Roots @Deruchenko Alexander
 214 U Fear of Infinity @Fernando Falcone
+215 U Gremlin Tamer @Billy Christian
 216 U Growing Dread @Maxime Minard
 217 U Inquisitive Glimmer @Julie Dillon
 218 U Intruding Soulrager @Jeremy Wilson
@@ -191,6 +195,7 @@ ScryfallCode=DSK
 248 R Ghost Vacuum @David Szabo
 249 C Glimmerlight @Wero Gallo
 250 U Haunted Screen @Sean Murray
+253 R Marvin, Murderous Mimic @Mirko Failoni
 254 U Saw @Jarel Threat
 255 C Abandoned Campground @Cristi Balanescu
 256 R Blazemire Verge @Andrew Mar
@@ -224,6 +229,7 @@ ScryfallCode=DSK
 284 L Mountain @Néstor Ossandón Leal
 285 L Forest @Martin de Diego Sádaba
 286 L Forest @Josu Hernaiz
+287 C Grand Entryway @Carlos Palma Cruchaga
 289 R Reluctant Role Model @Chris Rallis
 291 U Stay Hidden, Stay Silent @Josu Hernaiz
 292 R Come Back Wrong @David Auden Nash
@@ -243,6 +249,7 @@ ScryfallCode=DSK
 310 R Demonic Counsel @Bastien Grivet
 311 M Meathook Massacre II @SchmandrewART
 312 R Unstoppable Slasher @SchmandrewART
+313 U Withering Torment @Ivan Shavrin
 314 R Chainsaw @Alexis Ziritt
 315 R Cursed Recording @Alexis Ziritt
 316 R Fear of Missing Out @Cacho Rubione
@@ -268,6 +275,7 @@ ScryfallCode=DSK
 338 M Funeral Room @Alexandre Chaudret
 339 R Unholy Annex @Alexis Ziritt
 340 M Charred Foyer @Oliver Barrett
+345 R Silent Hallcreeper @Inkognit
 346 R Doomsday Excruciator @Jarel Threat
 347 R Razorkin Needlehead @Loïc Canavaggia
 348 M Screaming Nemesis @Inkognit
@@ -286,6 +294,7 @@ ScryfallCode=DSK
 364 R Victor, Valgavoth's Seneschal @Ashley Mackenzie
 365 R Winter, Misanthropic Guide @Sam Wolfe Connelly
 366 R Zimone, All-Questioning @Sam Wolfe Connelly
+367 R Marvin, Murderous Mimic @Sam Wolfe Connelly
 368 R Enduring Innocence @Liiga Smilshkalne
 369 R Leyline of Hope @Sergey Glushakov
 370 M Overlord of the Mistmoors @Steven Belledin
@@ -295,16 +304,18 @@ ScryfallCode=DSK
 374 R Enduring Tenacity @Isis
 375 R Grievous Wound @Martina Fačková
 376 R Leyline of the Void @Sergey Glushakov
+378 R Enduring Courage @Yigit Koroglu
 379 R Leyline of Resonance @Sergey Glushakov
 380 M Overlord of the Boilerbilges @Helge C. Balzer
 382 R Leyline of Mutation @Sergey Glushakov
 383 M Overlord of the Hauntwoods @Tiffany Turrill
 384 R Twitching Doll @Warren Mahy
-386 R Enduring Innocence @Kawasumi
+386 M Enduring Innocence @Kawasumi
 387 M Overlord of the Mistmoors @Takeuchi Moto
 388 R Enduring Curiosity @D-suzuki
 389 M Overlord of the Floodpits @Sansyu
 390 M Enduring Tenacity @TAPIOCA
+392 M Enduring Courage @Nuisuke
 393 M Overlord of the Boilerbilges @akio
 395 M Overlord of the Hauntwoods @Aogachou
 396 R Enduring Innocence @Kawasumi