From 9159ef34df18153bb4c78b7f029903b491aceae5 Mon Sep 17 00:00:00 2001 From: "wagic.laurent" Date: Fri, 22 May 2009 00:29:42 +0000 Subject: [PATCH] Laurent - added corrupt (SHM) and spitting earth (10E,TMP,MIR). --- projects/mtg/bin/Res/sets/10E/_cards.dat | 10 ++++++++++ projects/mtg/bin/Res/sets/10E/todo.dat | 10 ---------- projects/mtg/bin/Res/sets/MIR/_cards.dat | 10 ++++++++++ projects/mtg/bin/Res/sets/MIR/todo.dat | 8 -------- projects/mtg/bin/Res/sets/POR/_cards.dat | 10 ++++++++++ projects/mtg/bin/Res/sets/POR/todo.dat | 8 -------- projects/mtg/bin/Res/sets/SHM/_cards.dat | 9 +++++++++ projects/mtg/bin/Res/sets/SHM/todo.dat | 8 -------- projects/mtg/src/MTGAbility.cpp | 20 ++++++++++++++++++++ 9 files changed, 59 insertions(+), 34 deletions(-) diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index df823f638..0dbdfa7ca 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -2280,6 +2280,16 @@ subtype=Human Wizard toughness=1 [/card] [card] +text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. +id=136509 +target=creature +name=Spitting Earth +rarity=C +color=Red +type=Sorcery +mana={1}{R} +[/card] +[card] text={7}{W}: You gain 5 life. auto={7}{W}:life:5 id=130385 diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat index c1b1f3fac..194f20bde 100644 --- a/projects/mtg/bin/Res/sets/10E/todo.dat +++ b/projects/mtg/bin/Res/sets/10E/todo.dat @@ -1282,16 +1282,6 @@ power=1 subtype=Drake toughness=1 [/card] - -[card] -text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. -id=136509 -name=Spitting Earth -rarity=C -color=Red -type=Sorcery -mana={1}{R} -[/card] [card] text=At the beginning of your upkeep, you may return Squee, Goblin Nabob from your graveyard to your hand. id=106473 diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat index 2a26e8c66..a3182d69f 100644 --- a/projects/mtg/bin/Res/sets/MIR/_cards.dat +++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat @@ -733,6 +733,16 @@ mana={2} rarity=U [/card] [card] +text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. +id=3464 +alias=136509 +target=creature +name=Spitting Earth +rarity=C +type=Sorcery +mana={1}{R} +[/card] +[card] text=Destroy target land. id=3465 name=Stone Rain diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat index 60d4126c1..438b75e30 100644 --- a/projects/mtg/bin/Res/sets/MIR/todo.dat +++ b/projects/mtg/bin/Res/sets/MIR/todo.dat @@ -2613,14 +2613,6 @@ subtype=Demon Spirit toughness=5 [/card] [card] -text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. -id=3464 -name=Spitting Earth -rarity=C -type=Sorcery -mana={1}{R} -[/card] -[card] text=Stalking Tiger can't be blocked by more than one creature. id=3412 name=Stalking Tiger diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat index 0ae796290..090e87f0b 100644 --- a/projects/mtg/bin/Res/sets/POR/_cards.dat +++ b/projects/mtg/bin/Res/sets/POR/_cards.dat @@ -1109,6 +1109,16 @@ power=3 toughness=4 [/card] [card] +text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. +id=4362 +target=creature +alias=136509 +name=Spitting Earth +rarity=C +type=Sorcery +mana={1}{R} +[/card] +[card] text=Flying id=4396 name=Spotted Griffin diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat index 067eec281..51b8e03a2 100644 --- a/projects/mtg/bin/Res/sets/POR/todo.dat +++ b/projects/mtg/bin/Res/sets/POR/todo.dat @@ -582,14 +582,6 @@ type=Sorcery mana={U} [/card] [card] -text=Spitting Earth deals damage equal to the number of Mountains you control to target creature. -id=4362 -name=Spitting Earth -rarity=C -type=Sorcery -mana={1}{R} -[/card] -[card] text=Stalking Tiger can't be blocked by more than one creature. id=4318 name=Stalking Tiger diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat index 4b32fbef1..1308b88c8 100644 --- a/projects/mtg/bin/Res/sets/SHM/_cards.dat +++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat @@ -186,6 +186,15 @@ subtype=Elemental Rogue toughness=3 [/card] [card] +text=Corrupt deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way. +target=creature,player +id=146013 +name=Corrupt +rarity=U +type=Sorcery +mana={5}{B} +[/card] +[card] text=Crabapple Cohort gets +1/+1 as long as you control another green creature. auto=aslongas(creature[green]|myinplay) 1/1 other id=146009 diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat index badfe5086..c58fa3347 100644 --- a/projects/mtg/bin/Res/sets/SHM/todo.dat +++ b/projects/mtg/bin/Res/sets/SHM/todo.dat @@ -185,14 +185,6 @@ type=Instant mana={2}{U} [/card] [card] -text=Corrupt deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way. -id=146013 -name=Corrupt -rarity=U -type=Sorcery -mana={5}{B} -[/card] -[card] text=Counter target spell. Search its controller's graveyard, hand, and library for all cards with the same name as that spell and remove them from the game. Then that player shuffles his or her library. id=153966 name=Counterbore diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index fc8424591..c94379f1e 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1736,6 +1736,26 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver( NEW ASpellCastLife(_id, card, Constants::MTG_COLOR_WHITE, NEW ManaCost() , 1)); break; } + +//--- addon shm--- + case 146013: //Corrupt + { + Damageable * target = spell->getNextDamageableTarget(); + int damage_life = card->controller()->game->inPlay->countByType("swamp"); + game->mLayers->stackLayer()->addDamage(card, target, damage_life); + game->currentlyActing()->life+=damage_life; + break; + } +// --- addon Eventide --- + case 158903: //Chaotic Backlash + { + Damageable * target = spell->getNextDamageableTarget(); + // int damage1 = game->opponent()->game->inPlay->countByType(Constants::MTG_COLOR_WHITE); + // int damage2 = game->opponent()->game->inPlay->countByType(Constants::MTG_COLOR_BLUE); + // int damage = damage1 * 2 + damage2 * 2; + // game->mLayers->stackLayer()->addDamage(card, target, damage_life); + break; + } default: break; }