Erwan

- a few cards added - AddedShadowmoor Set (56/286 cards) - updated PSP makefile
2008-11-09 09:51:13 +00:00
parent 62a7a0e211
commit 163512a802
9 changed files with 3092 additions and 101 deletions
--- a/projects/mtg/Makefile.3xx
+++ b/projects/mtg/Makefile.3xx
@@ -1,5 +1,5 @@
 TARGET = template
-OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GroupOfCards.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 
+OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GroupOfCards.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 



--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -1,4 +1,16 @@
 [card]
+text={2}: Target white creature gains persist until end of turn. (When it's put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+auto={2}:persist target(creature)
+id=158293
+name=Antler Skulkin
+rarity=C
+type=Artifact Creature
+mana={5}
+power=3
+subtype=Scarecrow
+toughness=3
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {UR}, {T}: Add {U}{U}, {U}{R}, or {R}{R} to your mana pool.
 auto={T}: Add {1}
 auto={UR}{T}: Add {U}{U}
@@ -30,6 +42,17 @@ type=Instant
 mana={1}{RW}
 [/card]
 [card]
+text=Destroy target land. You gain 2 life.
+target=land
+auto=destroy
+auto=life:2
+id=151079
+name=Drain the Well
+rarity=C
+type=Sorcery
+mana={2}{BG}{BG}
+[/card]
+[card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)  {RW}: Duergar Cave-Guard gets +1/+0 until end of turn.
 abilities=wither
 auto={RW}:1/0
@@ -55,6 +78,18 @@ subtype=Wurm
 toughness=7
 [/card]
 [card]
+text={2}: Target black creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.)
+auto={2}:wither target(creature[black])
+id=158296
+name=Fang Skulkin
+rarity=C
+type=Artifact Creature
+mana={2}
+power=2
+subtype=Scarecrow
+toughness=1
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {WB}, {T}: Add {W}{W}, {W}{B}, or {B}{B} to your mana pool.
 auto={T}: Add {1}
 auto={WB}{T}: Add {W}{W}
@@ -124,6 +159,30 @@ subtype=Goblin Knight
 toughness=2
 [/card]
 [card]
+text={3}: Target green creature gets +1/+1 until end of turn.
+auto={3}:1/1 target(creature[green])
+id=158294
+name=Hoof Skulkin
+rarity=C
+type=Artifact Creature
+mana={3}
+power=2
+subtype=Scarecrow
+toughness=2
+[/card]
+[card]
+text={2}: Target red creature gains haste until end of turn.
+auto={2}:haste target(creature[red])
+id=158295
+name=Jawbone Skulkin
+rarity=C
+type=Artifact Creature
+mana={1}
+power=1
+subtype=Scarecrow
+toughness=1
+[/card]
+[card]
 text=Fear     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=fear,persist
 id=147437
@@ -218,6 +277,18 @@ rarity=R
 type=Land
 [/card]
 [card]
+text={3}: Target blue creature gains shroud until end of turn.
+auto={3}:shroud target(creature[blue])
+id=158297
+name=Shell Skulkin
+rarity=C
+type=Artifact Creature
+mana={4}
+power=3
+subtype=Scarecrow
+toughness=2
+[/card]
+[card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
 abilities=wither
 id=157211
@@ -330,3 +401,27 @@ power=1
 subtype=Elf Warrior
 toughness=1
 [/card]
+[card]
+text={T}: Target red or green creature gets -2/-0 until end of turn.
+auto={T}:-2/0 target(creature[red])
+id=153476
+name=Wilderness Hypnotist
+rarity=C
+type=Creature
+mana={2}{U}{U}
+power=1
+subtype=Merfolk Wizard
+toughness=3
+[/card]
+[card]
+text=When Wistful Selkie comes into play, draw a card.
+auto=draw:1
+id=151143
+name=Wistful Selkie
+rarity=U
+type=Creature
+mana={GU}{GU}{GU}
+power=2
+subtype=Merfolk Wizard
+toughness=2
+[/card]
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -21,17 +21,6 @@ subtype=Golem
 toughness=*
 [/card]
 [card]
-text={2}: Target white creature gains persist until end of turn. (When it's put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
-id=158293
-name=Antler Skulkin
-rarity=C
-type=Artifact Creature
-mana={5}
-power=3
-subtype=Scarecrow
-toughness=3
-[/card]
-[card]
 text=Flying     When Archon of Justice is put into a graveyard from play, remove target permanent from the game.
 abilities=flying
 id=146006
@@ -356,15 +345,6 @@ subtype=Elemental
 toughness=10
 [/card]
 [card]
-text=Destroy target land. You gain 2 life.
-target=land
-id=151079
-name=Drain the Well
-rarity=C
-type=Sorcery
-mana={2}{BG}{BG}
-[/card]
-[card]
 text=Counter target spell. Its controller draws a card.     Draw a card.
 id=153036
 name=Dream Fracture
@@ -464,17 +444,6 @@ type=Enchantment
 mana={3}{GU}{GU}{GU}
 [/card]
 [card]
-text={2}: Target black creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.)
-id=158296
-name=Fang Skulkin
-rarity=C
-type=Artifact Creature
-mana={2}
-power=2
-subtype=Scarecrow
-toughness=1
-[/card]
-[card]
 text=Enchant creature     As long as enchanted creature is green, it gets +1/+1 and has vigilance.     As long as enchanted creature is blue, it gets +1/+1 and has flying.
 target=creature
 id=151118
@@ -662,17 +631,6 @@ type=Enchantment
 mana={G}
 [/card]
 [card]
-text={3}: Target green creature gets +1/+1 until end of turn.
-id=158294
-name=Hoof Skulkin
-rarity=C
-type=Artifact Creature
-mana={3}
-power=2
-subtype=Scarecrow
-toughness=2
-[/card]
-[card]
 text=Haste     Hotheaded Giant comes into play with two -1/-1 counters on it unless you played another red spell this turn.
 abilities=haste
 id=153426
@@ -741,17 +699,6 @@ type=Instant
 mana={3}{GU}
 [/card]
 [card]
-text={2}: Target red creature gains haste until end of turn.
-id=158295
-name=Jawbone Skulkin
-rarity=C
-type=Artifact Creature
-mana={1}
-power=1
-subtype=Scarecrow
-toughness=1
-[/card]
-[card]
 text=Flying     {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=flying
 id=152096
@@ -1222,17 +1169,6 @@ subtype=Merfolk Wizard
 toughness=2
 [/card]
 [card]
-text={3}: Target blue creature gains shroud until end of turn.
-id=158297
-name=Shell Skulkin
-rarity=C
-type=Artifact Creature
-mana={4}
-power=3
-subtype=Scarecrow
-toughness=2
-[/card]
-[card]
 text=Whenever you play a spell that's both green and blue, Shorecrasher Mimic becomes 5/3 and gains trample until end of turn.
 id=151147
 name=Shorecrasher Mimic
@@ -1535,28 +1471,6 @@ subtype=Treefolk Shaman
 toughness=4
 [/card]
 [card]
-text={T}: Target red or green creature gets -2/-0 until end of turn.
-id=153476
-name=Wilderness Hypnotist
-rarity=C
-type=Creature
-mana={2}{U}{U}
-power=1
-subtype=Merfolk Wizard
-toughness=3
-[/card]
-[card]
-text=When Wistful Selkie comes into play, draw a card.
-id=151143
-name=Wistful Selkie
-rarity=U
-type=Creature
-mana={GU}{GU}{GU}
-power=2
-subtype=Merfolk Wizard
-toughness=2
-[/card]
-[card]
 text=Whenever you play a spell that's both black and green, Woodlurker Mimic becomes 4/5 and gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.)
 id=158599
 name=Woodlurker Mimic
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -2,6 +2,18 @@
 #VERSION: 1.6
 #Number of playable cards: 132
 [card]
+text={T}: Centaur Archer deals 1 damage to target creature with flying.
+id=2718
+name=Centaur Archer
+rarity=U
+auto={T}:damage:1 target(creature[flying])
+type=Creature 
+mana={1}{R}{G}
+power=3
+subtype=Centaur
+toughness=2
+[/card]
+[card]
 text={1}: Prevent all damage against you from one black source. If a source deals damage to you more than once in a turn, you may pay 1 each time to prevent the damage.
 id=2672
 alias=1335
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -1605,18 +1605,6 @@ subtype=Mammoths
 toughness=2
 [/card]
 [card]
-text={T}: Centaur Archer deals 1 damage to target creature with flying.
-id=2718
-name=Centaur Archer
-rarity=U
-auto={T}:damage:1 target(creature)
-type=Creature 
-mana={1}{R}{G}
-power=3
-subtype=Centaur
-toughness=2
-[/card]
-[card]
 text=Cannot be declared as a blocking creature.{B}: Pay 1 life to return Foul Familiar to owner's hand.Effects that prevent or redirect damage cannot be used to counter this loss of life.
 id=2450
 name=Foul Familiar
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -0,0 +1,611 @@
+[card]
+text=Flying     {BR}: Blistering Dieflyn gets +1/+0 until end of turn.
+abilities=flying
+auto={BR}:1/0
+id=141988
+name=Blistering Dieflyn
+rarity=C
+type=Creature
+mana={3}{R}
+power=0
+subtype=Imp
+toughness=1
+[/card]
+[card]
+text=Haste     Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=haste,wither
+id=153970
+name=Boggart Ram-Gang
+rarity=U
+type=Creature
+mana={RG}{RG}{RG}
+power=3
+subtype=Goblin Warrior
+toughness=3
+[/card]
+[card]
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.)  {1}{B}: Regenerate Cinderbones.
+abilities=wither
+auto={1}{B}:regenerate
+id=142051
+name=Cinderbones
+rarity=C
+type=Creature
+mana={2}{B}
+power=1
+subtype=Elemental Skeleton
+toughness=1
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {RG}, {T}: Add {R}{R}, {R}{G}, or {G}{G} to your mana pool.
+auto={T}:Add{1}
+auto={RG}{T}:Add{R}{R}
+auto={RG}{T}:Add{R}{G}
+auto={RG}{T}:Add{G}{G}
+id=146753
+name=Fire-Lit Thicket
+rarity=R
+type=Land
+[/card]
+[card]
+text=({2R} can be paid with any two mana or with {R}. This card's converted mana cost is 6.)  Flame Javelin deals 4 damage to target creature or player.
+target=creature,player
+auto=damage:4
+id=146017
+name=Flame Javelin
+rarity=U
+type=Instant
+mana={2R}{2R}{2R}
+[/card]
+[card]
+text={T}: Add {G} to your mana pool.
+auto={T}:Add{G}
+id=157877
+name=Forest
+rarity=L
+type=Basic Land
+subtype=Forest
+[/card]
+[card]
+text={T}: Add {G} to your mana pool.
+auto={T}:Add{G}
+id=158241
+name=Forest
+rarity=L
+type=Basic Land
+subtype=Forest
+[/card]
+[card]
+text={T}: Add {G} to your mana pool.
+auto={T}:Add{G}
+id=157870
+name=Forest
+rarity=L
+type=Basic Land
+subtype=Forest
+[/card]
+[card]
+text={T}: Add {G} to your mana pool.
+auto={T}:Add{G}
+id=158242
+name=Forest
+rarity=L
+type=Basic Land
+subtype=Forest
+[/card]
+[card]
+text={RG}{RG}{RG}: Foxfire Oak gets +3/+0 until end of turn.
+auto={RG}{RG}{RG}:3/0
+id=141998
+name=Foxfire Oak
+rarity=C
+type=Creature
+mana={5}{G}
+power=3
+subtype=Treefolk Shaman
+toughness=6
+[/card]
+[card]
+text=Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=persist
+id=141935
+name=Gravelgill Axeshark
+rarity=C
+type=Creature
+mana={4}{UB}
+power=3
+subtype=Merfolk Soldier
+toughness=3
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {BR}, {T}: Add {B}{B}, {B}{R}, or {R}{R} to your mana pool.
+auto={T}:Add{1}
+auto={RB}{T}:Add{B}{B}
+auto={RB}{T}:Add{B}{R}
+auto={RB}{T}:Add{R}{R}
+id=146764
+name=Graven Cairns
+rarity=R
+type=Land
+[/card]
+[card]
+text={T}: Add {U} to your mana pool.
+auto={T}:Add{U}
+id=158237
+name=Island
+rarity=L
+type=Basic Land
+subtype=Island
+[/card]
+[card]
+text={T}: Add {U} to your mana pool.
+auto={T}:Add{U}
+id=157875
+name=Island
+rarity=L
+type=Basic Land
+subtype=Island
+[/card]
+[card]
+text={T}: Add {U} to your mana pool.
+auto={T}:Add{U}
+id=157883
+name=Island
+rarity=L
+type=Basic Land
+subtype=Island
+[/card]
+[card]
+text={T}: Add {U} to your mana pool.
+auto={T}:Add{U}
+id=157874
+name=Island
+rarity=L
+type=Basic Land
+subtype=Island
+[/card]
+[card]
+text=Reach (This can block creatures with flying.)  Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=reach,wither
+id=153976
+name=Juvenile Gloomwidow
+rarity=C
+type=Creature
+mana={G}{G}
+power=1
+subtype=Spider
+toughness=3
+[/card]
+[card]
+text=When Kitchen Finks comes into play, you gain 2 life.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=persist
+auto=life:2
+id=141976
+name=Kitchen Finks
+rarity=U
+type=Creature
+mana={1}{GW}{GW}
+power=3
+subtype=Ouphe
+toughness=2
+[/card]
+[card]
+text={W}, {T}: Target blocking creature gets +2/+2 until end of turn.
+auto={W}{T}:2/2 target(creature[blocking])
+id=158238
+name=Kithkin Shielddare
+rarity=C
+type=Creature
+mana={1}{W}
+power=1
+subtype=Kithkin Soldier
+toughness=1
+[/card]
+[card]
+text=
+id=142001
+name=Loamdragger Giant
+rarity=C
+type=Creature
+mana={4}{RG}{RG}{RG}
+power=7
+subtype=Giant Warrior
+toughness=6
+[/card]
+[card]
+text={UB}: Loch Korrigan gets +1/+1 until end of turn.
+auto={UB}:1/1
+id=147414
+name=Loch Korrigan
+rarity=C
+type=Creature
+mana={3}{B}
+power=1
+subtype=Spirit
+toughness=1
+[/card]
+[card]
+text={T}: Add {R} to your mana pool.
+auto={T}:Add{R}
+id=157888
+name=Mountain
+rarity=L
+type=Basic Land
+subtype=Mountain
+[/card]
+[card]
+text={T}: Add {R} to your mana pool.
+auto={T}:Add{R}
+id=157885
+name=Mountain
+rarity=L
+type=Basic Land
+subtype=Mountain
+[/card]
+[card]
+text={T}: Add {R} to your mana pool.
+auto={T}:Add{R}
+id=157882
+name=Mountain
+rarity=L
+type=Basic Land
+subtype=Mountain
+[/card]
+[card]
+text={T}: Add {R} to your mana pool.
+auto={T}:Add{R}
+id=158240
+name=Mountain
+rarity=L
+type=Basic Land
+subtype=Mountain
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {WU}, {T}: Add {W}{W}, {W}{U}, or {U}{U} to your mana pool.
+auto={T}:Add{1}
+auto={WU}{T}:Add{W}{W}
+auto={WU}{T}:Add{W}{U}
+auto={WU}{T}:Add{U}{U}
+id=146746
+name=Mystic Gate
+rarity=R
+type=Land
+[/card]
+[card]
+text=
+id=142007
+name=Old Ghastbark
+rarity=C
+type=Creature
+mana={3}{GW}{GW}
+power=3
+subtype=Treefolk Warrior
+toughness=6
+[/card]
+[card]
+text=Flying, defender     Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=flying,defender,wither
+id=141975
+name=Oona's Gatewarden
+rarity=C
+type=Creature
+mana={UB}
+power=2
+subtype=Faerie Soldier
+toughness=1
+[/card]
+[card]
+text=Protection from blue, from black, and from red
+abilities=protection from blue, protection from black, protection from red
+id=146735
+name=Oversoul of Dusk
+rarity=R
+type=Creature
+mana={GW}{GW}{GW}{GW}{GW}
+power=5
+subtype=Spirit Avatar
+toughness=5
+[/card]
+[card]
+text={WU}: Parapet Watchers gets +0/+1 until end of turn.
+auto={WU}:0/1
+id=152059
+name=Parapet Watchers
+rarity=C
+type=Creature
+mana={2}{U}
+power=2
+subtype=Kithkin Soldier
+toughness=2
+[/card]
+[card]
+text=Flying     {2}, {T}: Add one mana of any color to your mana pool. ({T} is the untap symbol.)
+abilities=flying
+auto={2}{T}:Add{R}
+auto={2}{T}:Add{G}
+auto={2}{T}:Add{B}
+auto={2}{T}:Add{U}
+auto={2}{T}:Add{W}
+id=147381
+name=Pili-Pala
+rarity=C
+type=Artifact Creature
+mana={2}
+power=1
+subtype=Scarecrow
+toughness=1
+[/card]
+[card]
+text={T}: Add {W} to your mana pool.
+auto={T}:Add{W}
+id=158236
+name=Plains
+rarity=L
+type=Basic Land
+subtype=Plains
+[/card]
+[card]
+text={T}: Add {W} to your mana pool.
+auto={T}:Add{W}
+id=157887
+name=Plains
+rarity=L
+type=Basic Land
+subtype=Plains
+[/card]
+[card]
+text={T}: Add {W} to your mana pool.
+auto={T}:Add{W}
+id=157873
+name=Plains
+rarity=L
+type=Basic Land
+subtype=Plains
+[/card]
+[card]
+text={T}: Add {W} to your mana pool.
+auto={T}:Add{W}
+id=158235
+name=Plains
+rarity=L
+type=Basic Land
+subtype=Plains
+[/card]
+[card]
+text=Flash     Flying, defender
+abilities=flash,flying,defender
+id=153980
+name=Plumeveil
+rarity=U
+type=Creature
+mana={WU}{WU}{WU}
+power=4
+subtype=Elemental
+toughness=4
+[/card]
+[card]
+text=Haste     {R}: Pyre Charger gets +1/+0 until end of turn.
+abilities=haste
+auto={R}:1/0
+id=159399
+name=Pyre Charger
+rarity=U
+type=Creature
+mana={R}{R}
+power=1
+subtype=Elemental Warrior
+toughness=1
+[/card]
+[card]
+text=Regenerate target permanent.
+target=*
+auto=regenerate
+id=154403
+name=Reknit
+rarity=U
+type=Instant
+mana={1}{GW}
+[/card]
+[card]
+text=Flying     {GW}{GW}: Rune-Cervin Rider gets +1/+1 until end of turn.
+abilities=flying
+auto={GW}{GW}:1/1
+id=142003
+name=Rune-Cervin Rider
+rarity=C
+type=Creature
+mana={3}{W}
+power=2
+subtype=Elf Knight
+toughness=2
+[/card]
+[card]
+text=First strike     Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=first strike, wither
+id=147389
+name=Rustrazor Butcher
+rarity=C
+type=Creature
+mana={1}{R}
+power=1
+subtype=Goblin Warrior
+toughness=2
+[/card]
+[card]
+text=Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=persist
+id=146077
+name=Safehold Elite
+rarity=C
+type=Creature
+mana={1}{GW}
+power=2
+subtype=Elf Scout
+toughness=2
+[/card]
+[card]
+text=Trample     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=trample,persist
+id=152078
+name=Scuzzback Marauders
+rarity=C
+type=Creature
+mana={4}{RG}
+power=5
+subtype=Goblin Warrior
+toughness=2
+[/card]
+[card]
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=wither
+id=142052
+name=Scuzzback Scrapper
+rarity=C
+type=Creature
+mana={RG}
+power=1
+subtype=Goblin Warrior
+toughness=1
+[/card]
+[card]
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=wither
+id=154010
+name=Sickle Ripper
+rarity=C
+type=Creature
+mana={1}{B}
+power=2
+subtype=Elemental Warrior
+toughness=1
+[/card]
+[card]
+text=Haste     {T}: Target black or red creature gains haste until end of turn.
+abilities=haste
+auto={T}:haste target(creature[black;red])
+id=153989
+name=Sootstoke Kindler
+rarity=C
+type=Creature
+mana={1}{BR}
+power=1
+subtype=Elemental Shaman
+toughness=1
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {UB}, {T}: Add {U}{U}, {U}{B}, or {B}{B} to your mana pool.
+auto={T}:Add{1}
+auto={UB}{T}:Add{U}{U}
+auto={UB}{T}:Add{U}{B}
+auto={UB}{T}:Add{B}{B}
+id=146729
+name=Sunken Ruins
+rarity=R
+type=Land
+[/card]
+[card]
+text={T}: Add {B} to your mana pool.
+auto={T}:Add{B}
+id=157886
+name=Swamp
+rarity=L
+type=Basic Land
+subtype=Swamp
+[/card]
+[card]
+text={T}: Add {B} to your mana pool.
+auto={T}:Add{B}
+id=157871
+name=Swamp
+rarity=L
+type=Basic Land
+subtype=Swamp
+[/card]
+[card]
+text={T}: Add {B} to your mana pool.
+auto={T}:Add{B}
+id=158239
+name=Swamp
+rarity=L
+type=Basic Land
+subtype=Swamp
+[/card]
+[card]
+text={T}: Add {B} to your mana pool.
+auto={T}:Add{B}
+id=157889
+name=Swamp
+rarity=L
+type=Basic Land
+subtype=Swamp
+[/card]
+[card]
+text=Flash     Enchant creature     Enchanted creature gets -3/-0.
+abilities=flash
+auto=-3/0
+id=142053
+name=Torpor Dust
+rarity=C
+type=Enchantment
+mana={2}{UB}
+subtype=Aura
+[/card]
+[card]
+text=Flying
+abilities=flying
+id=153967
+name=Wasp Lancer
+rarity=U
+type=Creature
+mana={UB}{UB}{UB}
+power=3
+subtype=Faerie Soldier
+toughness=2
+[/card]
+[card]
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
+abilities=wither
+id=135436
+name=Wildslayer Elves
+rarity=C
+type=Creature
+mana={3}{G}
+power=3
+subtype=Elf Warrior
+toughness=3
+[/card]
+[card]
+text=Vigilance
+abilities=vigilance
+id=153962
+name=Wilt-Leaf Cavaliers
+rarity=U
+type=Creature
+mana={GW}{GW}{GW}
+power=3
+subtype=Elf Knight
+toughness=4
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {GW}, {T}: Add {G}{G}, {G}{W}, or {W}{W} to your mana pool.
+auto={T}:Add{1}
+auto={GW}{T}:Add{G}{G}
+auto={GW}{T}:Add{G}{W}
+auto={GW}{T}:Add{G}{W}
+id=146747
+name=Wooded Bastion
+rarity=R
+type=Land
+[/card]
+[card]
+text=Flash
+abilities=flash
+id=142028
+name=Zealous Guardian
+rarity=C
+type=Creature
+mana={WU}
+power=1
+subtype=Kithkin Soldier
+toughness=1
+[/card]
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
--- a/projects/mtg/tools/gatherer/gatherer-builder.py
+++ b/projects/mtg/tools/gatherer/gatherer-builder.py
@@ -19,7 +19,7 @@ import os
 import os.path
 from mtgCommon import *

-setinfo=sets['EVE']
+setinfo=sets['SHM']
 stripReminderText = False
 conffile = open(setinfo['dir'] + ".conf", 'w')

@@ -61,7 +61,7 @@ for cardRow in soup.find(id="_gridResults").findAll('tr',onmouseover="this.style
    name = cardRow('b')[0].string
    name = name.replace('"','')
    name = name.replace(u'\xe2', 'a')
-    
+    name = name.replace(u'\xc6', 'AE')

    manaCost = replaceSymbols(cardRow('td')[1]('font')[0])
    manaCost = ''.join(manaCost.contents)
--- a/projects/mtg/tools/gatherer/mtgCommon.py
+++ b/projects/mtg/tools/gatherer/mtgCommon.py
@@ -72,6 +72,13 @@ sets ={'BE':{'name':'Beta',
             'gathabbrev': 'EVE',
             'gathname':'Eventide',
             },
+       'SHM':{'name':'Shadowmoor',
+             'dir':'SHM',
+             'abbrev':'SHM',
+             'gathdirs':['SHM/EN'],
+             'gathabbrev': 'SHM',
+             'gathname':'Shadowmoor',
+             },       
        'ALA':{'name':'Shards of Alara',
             'dir':'ALA',
             'abbrev':'ALA',