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

MH2 Contributions 30/05

See merge request core-developers/forge!4801

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

@@ -0,0 +1,8 @@
+Name:Combine Chrysalis
+ManaCost:G U
+Types:Artifact
+S:Mode$ Continuous | Affected$ Creature.token | AddKeyword$ Flying | Description$ Creature tokens you control have flying.
+A:AB$ Token | Cost$ 2 G U T Sac<1/Permanent.token/token> | SorcerySpeed$ True | TokenScript$ g_4_4_beast | SpellDescription$ Create a 4/4 green Beast creature token. Activate only as a sorcery.
+DeckNeeds:Ability$Token
+DeckHas:Ability$Token
+Oracle:Creature tokens you control have flying.\n{2}{G}{U}, {T}, Sacrifice a token: Create a 4/4 green Beast creature token. Activate only as a sorcery.

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

@@ -0,0 +1,10 @@
+Name:Raving Visionary
+ManaCost:1 U
+Types:Creature Merfolk Wizard
+PT:1/1
+A:AB$ Draw | Cost$ U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+A:AB$ Draw | Cost$ 2 U T | NumCards$ 1 | Activation$ Delirium | PrecostDesc$ Delirium — | SpellDescription$ Draw a card. Activate this ability only if there are four or more card types among cards in your graveyard.
+DeckHints:Ability$Graveyard & Ability$Discard
+DeckHas:Ability$Delirium
+Oracle:{U}{T}: Draw a card, then discard a card.\nDelirium — {2}{U}, {T}: Draw a card. Activate this ability only if there are four or more card types among cards in your graveyard.

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

@@ -0,0 +1,10 @@
+Name:Skyblade's Boon
+ManaCost:1 W
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+1 and has flying.
+A:AB$ ChangeZone | Cost$ 2 W | Origin$ Battlefield | Destination$ Hand | ActivationZone$ Battlefield,Graveyard |SpellDescription$ Return CARDNAME to its owner's hand. Activate only if CARDNAME is on the battlefield or in your graveyard.
+A:AB$ ChangeZone | Cost$ 2 W | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | Secondary$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate only if CARDNAME is on the battlefield or in your graveyard.
+SVar:DiscardMe:1
+Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has flying.\n{2}{W}: Return Skyblade's Boon to its owner's hand. Activate only if Skyblade's Boon is on the battlefield or in your graveyard.

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

@@ -0,0 +1,10 @@
+Name:Thought Monitor
+ManaCost:6 U
+Types:Artifact Creature Construct
+PT:2/2
+K:Flying
+K:Affinity:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards.
+SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 2
+DeckHints:Type$Artifact
+Oracle:Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)\nFlying\nWhen Thought Monitor enters the battlefield, draw two cards.

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

@@ -0,0 +1,10 @@
+Name:Tide Shaper
+ManaCost:U
+Types:Creature Merfolk Wizard
+PT:1/1
+K:Kicker:1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, target land becomes an Island for as long as CARDNAME remains on the battlefield.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | IsPresent$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as an opponent controls an Island.
+SVar:X:Count$Valid Island.OppCtrl
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land | AITgts$ Land.OppCtrl | Types$ Island | RemoveLandTypes$ True | Duration$ UntilHostLeavesPlay | IsCurse$ True
+Oracle:Kicker {1} (You may pay an additional {1} as you cast this spell.)\nWhen Tide Shaper enters the battlefield, if it was kicked, target land becomes an Island for as long as Tide Shaper remains on the battlefield.\nTide Shaper gets +1/+1 as long as an opponent controls an Island.

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

@@ -0,0 +1,10 @@
+Name:Tireless Provisioner
+ManaCost:2 G
+Types:Creature Elf Scout
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTokenChoice | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, create a Food token or a Treasure token. (Food is an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life." Treasure is an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigTokenChoice:DB$ GenericChoice | Defined$ You | Choices$ Food,Treasure | SpellDescription$ Whenever a land enters the battlefield under your control, create a Food token or a Treasure token.
+SVar:Food:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Food
+SVar:Treasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Treasure
+DeckHas:Ability$Token & Ability$LifeGain
+Oracle:Landfall — Whenever a land enters the battlefield under your control, create a Food token or a Treasure token. (Food is an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life." Treasure is an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")