Merge branch 'master' into 'master'

- DOM: Added a few cards

See merge request core-developers/forge!288

forge-gui/res/cardsfolder/d/deepchannel_mentor.txt

@@ -2,7 +2,7 @@ Name:Deepchannel Mentor
 ManaCost:5 U
 Types:Creature Merfolk Rogue
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Blue+YouCtrl | AddKeyword$ Unblockable | Description$ Blue creatures you control can't be blocked.
+S:Mode$ Continuous | Affected$ Creature.Blue+YouCtrl | AddHiddenKeyword$ Unblockable | Description$ Blue creatures you control can't be blocked.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deepchannel_mentor.jpg
 Oracle:Blue creatures you control can't be blocked.

forge-gui/res/cardsfolder/h/hada_spy_patrol.txt

@@ -4,8 +4,8 @@ Types:Creature Human Rogue
 PT:1/1
 K:Level up:2 U
 SVar:maxLevel:3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-2 2/2 CARDNAME can't be blocked
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-2 2/2 CARDNAME can't be blocked
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Shroud & Unblockable | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 3+ 3/3 CARDNAME can't be blocked and has Shroud
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Shroud | AddHiddenKeyword$ Unblockable | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 3+ 3/3 CARDNAME can't be blocked and has Shroud
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE3_LEVEL
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hada_spy_patrol.jpg

forge-gui/res/cardsfolder/h/herald_of_secret_streams.txt

@@ -2,6 +2,6 @@ Name:Herald of Secret Streams
 ManaCost:3 U
 Types:Creature Merfolk Warrior
 PT:2/3
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Unblockable | Description$ Creatures you control with +1/+1 counters on them can't be blocked.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddHiddenKeyword$ Unblockable | Description$ Creatures you control with +1/+1 counters on them can't be blocked.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/herald_of_secret_streams.jpg
 Oracle:Creatures you control with +1/+1 counters on them can't be blocked.

forge-gui/res/cardsfolder/j/jeskai_infiltrator.txt

@@ -2,7 +2,7 @@ Name:Jeskai Infiltrator
 ManaCost:2 U
 Types:Creature Human Monk
 PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as you control no other creatures.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as you control no other creatures.
 SVar:X:Count$Valid Creature.YouCtrl+Other
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. You may turn it face up at any time for its mana cost if it is a creature card.)
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBExileTopCard

forge-gui/res/cardsfolder/l/lookouts_dispersal.txt

@@ -2,7 +2,7 @@ Name:Lookout's Dispersal
 ManaCost:2 U
 Types:Instant
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ Piracy | SVarCompare$ GE1 | References$ Piracy | Description$ CARDNAME costs {1} less to cast if you control a Pirate.
-SVar:Piracy:Count$Valid Creature.Pirate+YouCtrl+inZoneBattlefield
+SVar:Piracy:Count$Valid Pirate.YouCtrl
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays {4}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lookouts_dispersal.jpg
 Oracle:Lookout's Dispersal costs {1} less to cast if you control a Pirate.\nCounter target spell unless its controller pays {4}.

forge-gui/res/cardsfolder/m/metathran_elite.txt

@@ -2,7 +2,7 @@ Name:Metathran Elite
 ManaCost:1 U U
 Types:Creature Metathran Soldier
 PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self+enchanted | AddKeyword$ Unblockable | Description$ CARDNAME can't be blocked as long as it's enchanted.
+S:Mode$ Continuous | Affected$ Card.Self+enchanted | AddHiddenKeyword$ Unblockable | Description$ CARDNAME can't be blocked as long as it's enchanted.
 SVar:EnchantMe:Once
 SVar:Picture:http://www.wizards.com/global/images/magic/general/metathran_elite.jpg
 Oracle:Metathran Elite can't be blocked as long as it's enchanted.

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

@@ -0,0 +1,10 @@
+Name:Kwende, Pride of Femeref
+ManaCost:3 W
+Types:Legendary Creature Human Knight
+PT:2/2
+K:Double Strike
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+withFirst Strike | AddKeyword$ Double Strike | Description$ Creatures you control with first strike have double strike.
+SVar:NonStackingEffect:True
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kwende_pride_of_femeref.jpg
+Oracle:Double strike\nCreatures you control with first strike have double strike.

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

@@ -0,0 +1,12 @@
+Name:Lyra Dawnbriger
+ManaCost:3 W W
+Types:Legendary Creature Angel
+PT:5/5
+K:Flying
+K:First Strike
+K:Lifelink
+S:Mode$ Continuous | Affected$ Angel.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | Description$ Other Angels you control get +1/+1 and have lifelink.
+SVar:BuffedBy:Angel
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lyra_dawnbriger.jpg
+Oracle:Flying, first strike, lifelink\nOther Angels you control get +1/+1 and have lifelink.

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

@@ -0,0 +1,7 @@
+Name:Tetsuko Umezawa, Fugitive
+ManaCost:1 U
+Types:Legendary Creature Human Rogue
+PT:1/3
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+powerLE1,Creature.YouCtrl+toughnessLE1 | AddHiddenKeyword$ Unblockable | Description$ Creatures you control with power or toughness 1 or less can't be blocked.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tetsuko_umezawa_fugitive.jpg
+Oracle:Creatures you control with power or toughness 1 or less can't be blocked.

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

@@ -0,0 +1,8 @@
+Name:Wizard's Retort
+ManaCost:1 U U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ Wizard | SVarCompare$ GE1 | References$ Wizard | Description$ This spell costs {1} less to cast if you control a Wizard.
+SVar:Wizard:Count$Valid Wizard.YouCtrl
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wizards_retort.jpg
+Oracle:This spell costs {1} less to cast if you control a Wizard.\nCounter target spell.