Erwan

- new Ability : ALifeGiver (bottle gnomes)
- Added a few cards from Tempest
- Hybrid mana fix for hybrid mana involving uncolored mana costs (see tests/generic/hybridmana2.txt - spectral possession)
- Fixed bugs with targetting for TargetAbilities
- Fixed multiple sacrifice abilities cost (Siege gang commander, see tests)
- Fixed a small font issue

projects/mtg/bin/Res/sets/SHM/_cards.dat

@@ -40,6 +40,7 @@ toughness=4
 [card]
 text=Plainswalk     {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains.
 auto={2}{R}{S}:destroy target(scarecrow,plains)
+abilities=plainswalk
 id=158684
 name=Boggart Arsonists
 rarity=C

projects/mtg/bin/Res/sets/TMP/_cards.dat

@@ -27,6 +27,14 @@ mana={2}{R}{R}
 type=Sorcery
 [/card]
 [card]
+text={T}: Add {2} to your mana pool. Ancient Tomb deals 2 damage to you.
+auto={T}: Add {2} && Damage 1 controller
+id=4636
+name=Ancient Tomb
+rarity=U
+type=Land
+[/card]
+[card]
 text=Flying
 id=4861
 name=Armored Pegasus
@@ -283,6 +291,15 @@ mana={2}{U}{U}
 type=Instant
 [/card]
 [card]
+text=White creatures get -1/-1.
+auto=lord(creature[white]) -1/-1
+id=4658
+name=Dread of Night
+rarity=U
+type=Enchantment
+mana={B}
+[/card]
+[card]
 text=Legendary       Other Elf creatures have forestwalk.   Other Elves have shroud. (They can't be the targets of spells or abilities.)
 id=4757
 name=Eladamri, Lord of Leaves
@@ -619,6 +636,19 @@ toughness=1
 abilities=Haste
 [/card]
 [card]
+text={T}, Sacrifice Lotus Petal: Add one mana of any color to your mana pool.
+auto={T},{S}:Add{G}
+auto={T},{S}:Add{R}
+auto={T},{S}:Add{U}
+auto={T},{S}:Add{B}
+auto={T},{S}:Add{W}
+id=4614
+name=Lotus Petal
+rarity=C
+type=Artifact
+mana={0}
+[/card]
+[card]
 id=4829
 name=Lowland Giant
 colour=Red

projects/mtg/bin/Res/sets/TMP/todo.dat

@@ -49,13 +49,7 @@ rarity=U
 type=Enchantment
 mana={2}{R}
 [/card]
-[card]
-text={T}: Add {2} to your mana pool. Ancient Tomb deals 2 damage to you.
-id=4636
-name=Ancient Tomb
-rarity=U
-type=Land
-[/card]
+
 [card]
 text=Flying     Whenever Angelic Protector becomes the target of a spell or ability, Angelic Protector gets +0/+3 until end of turn.
 id=4858
@@ -696,14 +690,7 @@ power=0
 subtype=Shapeshifter
 toughness=0
 [/card]
-[card]
-text=White creatures get -1/-1.
-id=4658
-name=Dread of Night
-rarity=U
-type=Enchantment
-mana={B}
-[/card]
+
 [card]
 text=Draw three cards, then put two cards from your hand both on top of your library or both on the bottom of your library.
 id=4696
@@ -1515,14 +1502,7 @@ rarity=U
 type=Sorcery
 mana={2}{U}{B}
 [/card]
-[card]
-text={T}, Sacrifice Lotus Petal: Add one mana of any color to your mana pool.
-id=4614
-name=Lotus Petal
-rarity=C
-type=Artifact
-mana={0}
-[/card]
+
 [card]
 text=
 id=4829

projects/mtg/bin/Res/test/_tests.txt

@@ -5,6 +5,7 @@ generic/first_strike.txt
 generic/first_strike2.txt
 generic/first_strike3.txt
 generic/hybrid_mana.txt
+generic/hybrid_mana_2.txt
 generic/legendary.txt
 generic/persist.txt
 generic/wither.txt
@@ -18,6 +19,8 @@ animate_dead2.txt
 ardakar_wastes.txt
 ascendant_evincar.txt
 ascendant_evincar2.txt
+bottle_gnomes.txt
+boggart_arsonists.txt
 brass_man.txt
 castle.txt
 celestial_purge.txt
@@ -52,9 +55,11 @@ nantuko_husk.txt
 orcish_lumberjack.txt
 paralysis.txt
 paralysis2.txt
+protomatter_powder.txt
 resurrection.txt
 rootwalla.txt
 royal_assassin.txt
+siege_gang_commander.txt
 shivan_hellkite.txt
 shock.txt
 spark_elemental.txt

projects/mtg/bin/Res/test/boggart_arsonists.txt

@@ -0,0 +1,19 @@
+#  {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:158684
+manapool:{2}{R}
+[PLAYER2]
+inplay:154395
+[DO]
+158684
+154395
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:158684
+manapool:{0}
+[PLAYER2]
+graveyard:154395
+[END]

projects/mtg/bin/Res/test/bottle_gnomes.txt

@@ -0,0 +1,15 @@
+#Do we get 3 life when sacrificing bottle gnomes ?
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:129495
+[PLAYER2]
+[DO]
+129495
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+life:23
+graveyard:129495
+[PLAYER2]
+[END]

projects/mtg/bin/Res/test/composite_golem.txt

@@ -1,4 +1,5 @@
 #Composite golem sacrifice ability subject to summoning Sickness ?
+# Sacrifice composite Golem : Add {W}{U}{B}{R}{G}
 SummoningSickness
 [INIT]
 FIRSTMAIN

projects/mtg/bin/Res/test/generic/hybrid_mana_2.txt

@@ -0,0 +1,18 @@
+#Testing Hybrid Mana
+# Spectral possession: text=({2W} can be paid with any two mana or with {W}. This card's converted mana cost is 6.)  Put three 1/1 white Spirit creature tokens with flying into play.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:152070
+manapool:{W}{W}{W}
+[PLAYER2]
+[DO]
+152070
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:152070
+inplay:-152070,-152070,-152070
+manapool:{0}
+[PLAYER2]
+[END]

projects/mtg/bin/Res/test/protomatter_powder.txt

@@ -0,0 +1,19 @@
+#text={4}{W}, {T}, Sacrifice Protomatter Powder: Return target artifact card from your graveyard to play.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:174833
+graveyard:1099
+manapool:{4}{W}
+[PLAYER2]
+[DO]
+174833
+1099
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:174833
+manapool:{0}
+inplay:1099
+[PLAYER2]
+[END]

projects/mtg/bin/Res/test/siege_gang_commander.txt

@@ -0,0 +1,25 @@
+#TestingSiege-Gang Commander Sacrifice goblin ability
+#text=When Siege-Gang Commander comes into play, put three 1/1 red Goblin creature tokens into play.     {1}{R}, Sacrifice a Goblin: Siege-Gang Commander deals 2 damage to target creature or player.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:130539,130378,129578
+manapool:{2}{R}{R}
+[PLAYER2]
+inplay:129586,129600
+[DO]
+130539
+129586
+129578
+130539
+129600
+130378
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:130378,129578
+inplay:130539,-130539,-130539,-130539
+manapool:{0}
+[PLAYER2]
+graveyard:129586,129600
+[END]