Merge branch 'Williams-master-patch-29065' into 'master'

MH2/AFR Contributions

See merge request core-developers/forge!4740

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

@@ -0,0 +1,11 @@
+Name:Dakkon, Shadow Slayer
+ManaCost:W U B
+Types:Legendary Planeswalker Dakkon
+Loyalty:0
+K:etbCounter:LOYALTY:X:no Condition:CARDNAME enters the battlefield with a number of loyalty counters on him equal to the number of lands you control.
+SVar:X:Count$Valid Land.YouCtrl
+A:AB$ Surveil | Cost$ AddCounter<1/LOYALTY> | Amount$ 2 | Planeswalker$ True | SpellDescription$ 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.)
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+A:AB$ ChangeZone | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ChangeType$ Artifact.YouOwn | ChangeNum$ 1 | Origin$ Hand,Graveyard | Destination$ Battlefield | StackDescription$ SpellDescription | SpellDescription$ You may put an artifact card from your hand or graveyard onto the battlefield.
+DeckHints:Type$Artifact
+Oracle:Dakkon, Shadow Slayer enters the battlefield with a number of loyalty counters on him equal to the number of lands you control.\n[+1]: Surveil 2.\n[−3]: Exile target creature.\n[-6]: You may put an artifact card from your hand or graveyard onto the battlefield.

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

@@ -0,0 +1,13 @@
+Name:Flametongue Yearling
+ManaCost:R R
+Types:Creature Kavu
+PT:2/1
+K:Multikicker:2
+K:etbCounter:P1P1:XKicked:no condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each time it was kicked.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals damage equal to its power to target creature.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ Y
+SVar:X:Count$CardCounters.P1P1
+SVar:XKicked:Count$TimesKicked
+SVar:Y:Count$CardPower
+DeckHas:Ability$Counters
+Oracle:Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.)\nFlametongue Yearling enters the battlefield with a +1/+1 counter on it for each time it was kicked.\nWhen Flametongue Yearling enters the battlefield, it deals damage equal to its power to target creature.

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

@@ -0,0 +1,9 @@
+Name:Grief
+ManaCost:2 B B
+Types:Creature Elemental Incarnation
+PT:3/2
+K:Menace
+K:Evoke:ExileFromHand<1/Card.Black+Other>
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRemove | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals their hand. You choose a nonland card from it. That player discards that card.
+SVar:TrigRemove:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | SpellDescription$ Target opponent reveals their hand. You choose a nonland card from it. That player discards that card.
+Oracle:Menace\nWhen Grief enters the battlefield, target opponent reveals their hand. You choose a nonland card from it. That player discards that card.\nEvoke — Exile a black card from your hand.

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

@@ -0,0 +1,16 @@
+Name:Lolth, Spider Queen
+ManaCost:3 B B
+Types:Legendary Planeswalker Lolth
+Loyalty:4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control dies, put a loyalty counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ LOYALTY | CounterNum$ 1
+A:AB$ Draw | Cost$ AddCounter<0/LOYALTY> | NumCards$ 1 | SubAbility$ DBLoseLife1 | Planeswalker$ True | SpellDescription$ You draw a card and you lose 1 life.
+SVar:DBLoseLife1:DB$ LoseLife | LifeAmount$ 1
+A:AB$ Token | Cost$ SubCounter<3/LOYALTY> | TokenAmount$ 2 | TokenScript$ b_2_1_spider_menace_reach | TokenOwner$ You | Planeswalker$ True | SpellDescription$ Create two 2/1 black Spider creature tokens with menace and reach.
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Emblem - Lolth, Spider Queen | Triggers$ TrigLoseLife | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Main1 | SpellDescription$ You get an emblem with "Whenever an opponent is dealt combat damage by one or more creatures you control, if that player lost less than 8 life this turn, they lose life equal to the difference."
+SVar:TrigLoseLife:Mode$ DamageDoneOnce | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | CheckSVar$ X | SVarCompare$ LT8 | Execute$ LoseLife | TriggerZones$ Command | TriggerDescription$ Whenever an opponent is dealt combat damage by one or more creatures you control, if that player lost less than 8 life this turn, they lose life equal to the difference.
+SVar:LoseLife:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ Y | SubAbility$ Cleanup
+SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:TriggeredTarget$LifeLostThisTurn
+SVar:Y:SVar$X/NMinus.8
+Oracle:Whenever a creature you control dies, put a loyalty counter on Lolth, Spider Queen.\n[0]: You draw a card and you lose 1 life.\n[−3]: Create two 2/1 black Spider creature tokens with menace and reach.\n[−8]: You get an emblem with "Whenever an opponent is dealt combat damage by one or more creatures you control, if that player lost less than 8 life this turn, they lose life equal to the difference."

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

@@ -0,0 +1,8 @@
+Name:Prismatic Ending
+ManaCost:X W
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ X W | ValidTgts$ Permanent.nonLand | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nonland permanent | ConditionDefined$ Targeted | ConditionPresent$ Permanent.nonLand+cmcLEY | ConditionCompare$ EQ1 | SpellDescription$ Exile target nonland permanent if its mana value is less than or equal to the number of colors of mana spent to cast this spell.
+SVar:X:Count$xPaid
+SVar:Y:Count$Converge
+AI:RemoveDeck:All
+Oracle:Converge — Exile target nonland permanent if its mana value is less than or equal to the number of colors of mana spent to cast this spell.

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

@@ -0,0 +1,7 @@
+Name:Profane Tutor
+ManaCost:no cost
+Types:Sorcery
+Colors:black
+K:Suspend:2:1 B
+A:SP$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ Search your library for a card, put that card into your hand, then shuffle.
+Oracle:Suspend 2—{1}{B} (Rather than cast this card from your hand, pay {1}{B} and exile it with two time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nSearch your library for a card, put that card into your hand, then shuffle.

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

@@ -0,0 +1,7 @@
+Name:Rishadan Dockhand
+ManaCost:U
+Types:Creature Merfolk
+PT:1/2
+K:Islandwalk
+A:AB$ Tap | Cost$ 1 T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Tap target land.
+Oracle:Islandwalk\n{1}, {T}: Tap target land.

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

@@ -0,0 +1,9 @@
+Name:Timeless Dragon
+ManaCost:3 W W
+Types:Creature Dragon
+PT:5/5
+K:Flying
+K:TypeCycling:Plains:2
+K:Eternalize:2 W W
+DeckHas:Ability$Token
+Oracle:Flying\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffle.)\nEternalize {2}{W}{W} ({2}{W}{W}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a 4/4 black Zombie Dragon with no mana cost. Eternalize only as a sorcery.)

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

@@ -0,0 +1,7 @@
+Name:Unmarked Grave
+ManaCost:1 B
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ 1 B | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.nonLegendary | ChangeNum$ 1 | SpellDescription$ Search your library for a nonlegendary card, put that card into your graveyard, then shuffle.
+DeckHas:Ability$Graveyard
+AI:RemoveDeck:Random
+Oracle:Search your library for a nonlegendary card, put that card into your graveyard, then shuffle.

forge-gui/res/lists/TypeLists.txt

@@ -317,6 +317,7 @@ Bolas
 Calix
 Chandra
 Dack
+Dakkon
 Daretti
 Davriel
 Domri