Merge branch 'khm21' into 'master'

KHM - 21 Dec

See merge request core-developers/forge!3524

forge-gui/release-files/CONTRIBUTORS.txt

@@ -28,6 +28,7 @@ nefigah
 Northmoc
 OgreBattlecruiser
 pfps
+Ral
 Ryan1729
 Seravy
 Sirspud

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

@@ -0,0 +1,14 @@
+Name:Armed and Armored
+ManaCost:1 W
+Types:Instant
+A:SP$ AnimateAll | Cost$ 1 W | Types$ Creature,Artifact | ValidCards$ Vehicle.YouCtrl | SubAbility$ ChooseDwarf | StackDescription$ Vehicles {p:You} controls become artifact creatures until end of turn. | SpellDescription$ Vehicles you control become artifact creatures until end of turn. Choose a Dwarf you control. Attach any number of Equipment you control to it.
+SVar:ChooseDwarf:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Dwarf.YouCtrl | ChoiceTitle$ Choose a Dwarf you control | StackDescription$ {p:You} chooses a Dwarf they control and attaches any number of Equipment they control to it. | ImprintChosen$ True | SubAbility$ ChooseEquipment
+SVar:ChooseEquipment:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ X | References$ X | Choices$ Equipment.YouCtrl | StackDescription$ None | ChoiceTitle$ Choose any number of Equipment you control | ForgetChosen$ True | SubAbility$ DeployDwarf
+SVar:DeployDwarf:DB$ RepeatEach | RepeatSubAbility$ ArmDwarf | RepeatCards$ Card.ChosenCard | SubAbility$ DBCleanup
+SVar:ArmDwarf:DB$ Attach | Object$ Remembered | Defined$ Imprinted | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True | ClearImprinted$ True
+SVar:X:Count$Valid Equipment.YouCtrl
+DeckNeeds:Type$Vehicle|Dwarf
+DeckHints:Type$Equipment
+AI:RemoveDeck:All
+Oracle:Vehicles you control become artifact creatures until end of turn. Choose a Dwarf you control. Attach any number of Equipment you control to it.

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

@@ -0,0 +1,8 @@
+Name:Canopy Tactician
+ManaCost:3 G
+Types:Creature Elf Warrior
+PT:3/3
+S:Mode$ Continuous | Affected$ Elf.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Elves you control get +1/+1.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 3 | SpellDescription$ Add {G}{G}{G}.
+DeckHints:Type$Elf
+Oracle:Other Elves you control get +1/+1.\n{T}: Add {G}{G}{G}.

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

@@ -0,0 +1,9 @@
+Name:Giant's Grasp
+ManaCost:2 U U
+Types:Enchantment Aura
+K:Enchant Giant you control
+A:SP$ Attach | Cost$ 2 U U | ValidTgts$ Giant.YouCtrl | TgtPrompt$ Select Giant you control
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, gain control of target nonland permanent for as long as CARDNAME remains on the battlefield.
+SVar:TrigChange:DB$ GainControl | TgtPrompt$ Choose target nonland permanent | ValidTgts$ Permanent.nonLand | LoseControl$ LeavesPlay
+DeckNeeds:Type$Giant
+Oracle:Enchant Giant you control\nWhen Giant's Grasp enters the battlefield, gain control of target nonland permanent for as long as Giant's Grasp remains on the battlefield.

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

@@ -0,0 +1,10 @@
+Name:Pyre of Heroes
+ManaCost:2
+Types:Artifact
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/Creature> | RememberCostCards$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX+sharesCreatureTypeWith Remembered | References$ X | ChangeNum$ 1 | SorcerySpeed$ True | AILogic$ SacAndUpgrade | StackDescription$ Search your library for a creature card that shares a creature type with the sacrificed creature and has converted mana cost equal to 1 plus that creature's converted mana cost. Put that card onto the battlefield, then shuffle your library. | SubAbility$ DBCleanup | SpellDescription$ Search your library for a creature card that shares a creature type with the sacrificed creature and has converted mana cost equal to 1 plus that creature's converted mana cost. Put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost/Plus.1
+SVar:AIPreference:SacCost$Creature
+DeckHas:Ability$Sacrifice
+DeckNeeds:Type$Creature
+Oracle:{2}, {T}, Sacrifice a creature: Search your library for a creature card that shares a creature type with the sacrificed creature and has converted mana cost equal to 1 plus that creature's converted mana cost. Put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.

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

@@ -0,0 +1,7 @@
+Name:Starnheim Aspirant
+ManaCost:2 W
+Types:Creature Human Cleric
+PT:2/2
+S:Mode$ ReduceCost | EffectZone$ Battlefield | ValidCard$ Angel | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Angel spells you cast cost {2} less to cast.
+DeckNeeds:Type$Angel
+Oracle:Angel spells you cast cost {2} less to cast.

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

@@ -0,0 +1,10 @@
+Name:Surtland Elementalist
+ManaCost:5 U U
+Types:Creature Giant Wizard
+PT:8/8
+K:AlternateAdditionalCost:Reveal<1/Giant/Giant>:2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ Whenever CARDNAME attacks, you may cast an instant or sorcery spell from your hand without paying its mana cost.
+SVar:TrigPlay:DB$ Play | ValidZone$ Hand | Valid$ Instant.YouOwn,Sorcery.YouOwn | Controller$ You | WithoutManaCost$ True | Optional$ True
+SVar:HasAttackEffect:TRUE
+DeckHints:Type$Instant|Sorcery|Giant
+Oracle:As an additional cost to cast this spell, reveal a Giant card from your hand or pay {2}.\nWhenever Surtland Elementalist attacks, you may cast an instant or sorcery spell from your hand without paying its mana cost.

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

@@ -0,0 +1,11 @@
+Name:Warchanter Skald
+ManaCost:2 W
+Types:Creature Dwarf Cleric
+PT:2/3
+T:Mode$ Taps | ValidCard$ Card.Self+enchanted,Card.Self+equipped | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever Warchanter Skald becomes tapped, if it's enchanted or equipped, create a 2/1 red Dwarf Berserker creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_2_1_dwarf_berserker | TokenOwner$ You
+SVar:EnchantMe:Once
+SVar:EquipMe:Once
+DeckNeeds:Type$Enchantment|Equipment
+DeckHas:Ability$Token
+Oracle:Whenever Warchanter Skald becomes tapped, if it's enchanted or equipped, create a 2/1 red Dwarf Berserker creature token.

forge-gui/res/tokenscripts/r_2_1_dwarf_berserker.txt

@@ -0,0 +1,6 @@
+Name:Dwarf Berserker
+ManaCost:no cost
+Types:Creature Dwarf Berserker
+Colors:red
+PT:2/1
+Oracle: