Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

forge-gui/res/cardsfolder/k/kaldra_compleat.txt

@@ -4,7 +4,7 @@ Types:Legendary Artifact Equipment
 K:Living Weapon
 K:Indestructible
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 5 | AddToughness$ 5 | AddKeyword$ First Strike & Trample & Indestructible & Haste | AddTrigger$ TrigDamageDone | Description$ Equipped creature gets +5/+5 and has first strike, trample, indestructible, haste, and "Whenever this creature deals combat damage to a creature, exile that creature."
-SVar:TrigDamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | Execute$ TrigChangeZone | TriggerDescription$ Whenever this creature deals combat damage to a creature, exile that creature.
+SVar:TrigDamageDone:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | ValidTarget$ Creature | Execute$ TrigChangeZone | TriggerDescription$ Whenever this creature deals combat damage to a creature, exile that creature.
 SVar:TrigChangeZone:DB$ ChangeZone | Defined$ TriggeredTarget | Origin$ Battlefield | Destination$ Exile
 K:Equip:7
 Oracle:Living weapon\nIndestructible\nEquipped creature gets +5/+5 and has first strike, trample, indestructible, haste, and "Whenever this creature deals combat damage to a creature, exile that creature."\nEquip {7}

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

@@ -0,0 +1,8 @@
+Name:Blood Servitor
+ManaCost:3
+Types:Artifact Creature Construct
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBlood | TriggerDescription$ When CARDNAME enters the battlefield, create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
+SVar:TrigBlood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_blood_draw | TokenOwner$ You
+DeckHas:Ability$Token & Ability$Sacrifice & Type$Blood
+Oracle:When Blood Servitor enters the battlefield, create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")

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

@@ -0,0 +1,9 @@
+Name:Ceremonial Knife
+ManaCost:1
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddTrigger$ TrigDamageDone | Description$ Equipped creature gets +1/+0 and has "Whenever this creature deals combat damage, create a Blood token." (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
+SVar:TrigDamageDone:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | Execute$ TrigBlood | TriggerDescription$ Whenever this creature deals combat damage, create a Blood token." (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
+SVar:TrigBlood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_blood_draw | TokenOwner$ You
+K:Equip:2
+DeckHas:Ability$Token & Ability$Sacrifice & Type$Blood
+Oracle:Equipped creature gets +1/+0 and has "Whenever this creature deals combat damage, create a Blood token." (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")\nEquip {2}

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

@@ -0,0 +1,9 @@
+Name:Rural Recruit
+ManaCost:3 G
+Types:Creature Human Peasant
+PT:1/1
+K:Training
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 3/1 green Boar creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_1_boar | TokenOwner$ You
+DeckHas:Ability$Token & Ability$Counters
+Oracle:Training\nWhen Rural Recruit enters the battlefield, create a 3/1 green Boar creature token.

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

@@ -0,0 +1,9 @@
+Name:Sheltering Boughs
+ManaCost:2 G
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 3 | Description$ Enchanted creature gets +1/+3.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:Enchant creature\nWhen Sheltering Boughs enters the battlefield, draw a card.\nEnchanted creature gets +1/+3.

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

@@ -0,0 +1,8 @@
+Name:Spore Crawler
+ManaCost:2 G
+Types:Creature Fungus
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ TriggeredCardController
+SVar:SacMe:1
+Oracle:When Spore Crawler dies, draw a card.

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

@@ -0,0 +1,6 @@
+Name:Sporeback Wolf
+ManaCost:1 G
+Types:Creature Wolf
+PT:2/2
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 0 | AddToughness$ 2 | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME gets +0/+2.
+Oracle:As long as it's your turn, Sporeback Wolf gets +0/+2.

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

@@ -0,0 +1,8 @@
+Name:Toxic Scorpion
+ManaCost:1 G
+Types:Creature Scorpion
+PT:1/1
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target creature you control gains deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | KW$ Deathtouch
+Oracle:Deathtouch\nWhen Toxic Scorpion enters the battlefield, another target creature you control gains deathtouch until end of turn.

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

@@ -0,0 +1,6 @@
+Name:Witch's Web
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | Cost$ 1 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | KW$ Reach | SubAbility$ DBUntap | SpellDescription$ Target creature gets +3/+3 and gains reach until end of turn. Untap it.
+SVar:DBUntap:DB$ Untap | Defined$ Targeted
+Oracle:Target creature gets +3/+3 and gains reach until end of turn. Untap it.

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

@@ -0,0 +1,8 @@
+Name:Wolf Strike
+ManaCost:2 G
+Types:Instant
+A:SP$ Pump | Cost$ 2 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | NumAtt$ +X | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage | StackDescription$ {c:ThisTargetedCard} gets +2/+0 until end of turn if it's night. | SpellDescription$ Target creature you control gets +2/+0 until end of turn if it's night. Then it deals damage equal to its power to target creature you don't control.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ Y | DamageSource$ ParentTarget | StackDescription$ Then it deals damage equal to its power to {c:ThisTargetedCard}.
+SVar:X:Count$Night.2.0
+SVar:Y:ParentTargeted$CardPower
+Oracle:Target creature you control gets +2/+0 until end of turn if it's night. Then it deals damage equal to its power to target creature you don't control.

forge-gui/res/tokenscripts/g_3_1_boar.txt

@@ -0,0 +1,6 @@
+Name:Boar
+Colors:green
+ManaCost:no cost
+PT:3/1
+Types:Creature Boar
+Oracle: