From 3b8f5fdd7e11617fc15eaf4e83ee06d0668bda89 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Tue, 25 Aug 2009 12:50:16 +0000 Subject: [PATCH] Erwan - a few card fixes --- projects/mtg/bin/Res/sets/ALA/_cards.dat | 5 +++-- projects/mtg/bin/Res/sets/CHK/_cards.dat | 1 + projects/mtg/bin/Res/sets/LEG/_cards.dat | 2 +- projects/mtg/bin/Res/sets/M10/_cards.dat | 2 +- projects/mtg/bin/Res/sets/TMP/_cards.dat | 1 + projects/mtg/bin/Res/test/_tests.txt | 1 + projects/mtg/bin/Res/test/leveler.txt | 16 ++++++++++++++++ projects/mtg/src/MTGAbility.cpp | 4 ++-- 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 projects/mtg/bin/Res/test/leveler.txt diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat index 26480a594..5a7517518 100644 --- a/projects/mtg/bin/Res/sets/ALA/_cards.dat +++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat @@ -1116,9 +1116,10 @@ toughness=2 [card] text=Flying At the end of your turn, you gain 3 life if Sphinx Sovereign is untapped. Otherwise, each opponent loses 3 life. id=175107 -auto=@each my endofturn:aslongas(this[-tapped]|myinplay) life:3 controller -auto=@each my endofturn:aslongas(this[tapped]|myinplay) life:-3 opponent +auto=@each my endofturn:aslongas(sphinx sovereign[-tapped]|myinplay) life:3 controller +auto=@each my endofturn:aslongas(sphinx sovereign[tapped]|myinplay) life:-3 opponent name=Sphinx Sovereign +abilities=flying rarity=M type=Artifact Creature mana={4}{W}{U}{U}{B} diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat index 73caad342..ab6e61587 100644 --- a/projects/mtg/bin/Res/sets/CHK/_cards.dat +++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat @@ -572,6 +572,7 @@ rarity=R [/card] [card] text=Enchanted Creature has "{B}: This Creature gets +1/+1 until end of turn.E +target=creature auto={B}:1/1 id=50449 name=Midnight Covenant diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat index 11bc4d28b..802af96ed 100644 --- a/projects/mtg/bin/Res/sets/LEG/_cards.dat +++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat @@ -1395,7 +1395,7 @@ auto={T}: Add {B} auto={T}:-swampwalk target(creature) auto={T}:-first strike target(creature) id=1707 -name=Tolaria +name=Urborg color=Land rarity=U type=Land diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat index e037eb879..985f693eb 100644 --- a/projects/mtg/bin/Res/sets/M10/_cards.dat +++ b/projects/mtg/bin/Res/sets/M10/_cards.dat @@ -832,7 +832,7 @@ subtype=Specter power=2 toughness=2 text=Flying Whenever Hypnotic Specter deals damage to an opponent, that player discards a card at random. -rarity=U +rarity=R alias=1165 abilitites=flying [/card] diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat index 1e67af201..dcb9d03c9 100644 --- a/projects/mtg/bin/Res/sets/TMP/_cards.dat +++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat @@ -1606,6 +1606,7 @@ mana={1}{R} text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.) Enchanted creature has flying. (It can't be blocked except by creatures with flying or reach.) {U}: Return Shimmering Wings to its owner's hand. id=4726 name=Shimmering Wings +target=creature auto=flying auto={U}:moveTo(hand) rarity=C diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index d26f4fc58..e5f9466b5 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -120,6 +120,7 @@ kraken_eye2.txt kraken_eye3.txt kudzu.txt kudzu2.txt +leveler.txt lhurgoyf.txt lifeforce.txt living_lands.txt diff --git a/projects/mtg/bin/Res/test/leveler.txt b/projects/mtg/bin/Res/test/leveler.txt new file mode 100644 index 000000000..a00f1860a --- /dev/null +++ b/projects/mtg/bin/Res/test/leveler.txt @@ -0,0 +1,16 @@ +#Bug: Leveler doesn't move library to removedfromgame +[INIT] +FIRSTMAIN +[PLAYER1] +hand:leveler +library:swamp,mountain +manapool:{5} +[PLAYER2] +[DO] +leveler +[ASSERT] +FIRSTMAIN +[PLAYER1] +inplay:leveler +[PLAYER2] +[END] \ No newline at end of file diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 99a8a7f73..2514ecd66 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -2100,8 +2100,8 @@ void ListMaintainerAbility::updateTargets(){ //add new valid ones for (int i = 0; i < 2; i++){ Player * p = game->players[i]; - MTGGameZone * zones[] = {p->game->inPlay,p->game->graveyard,p->game->hand}; - for (int k = 0; k < 3; k++){ + MTGGameZone * zones[] = {p->game->inPlay,p->game->graveyard,p->game->hand,p->game->library}; + for (int k = 0; k < 4; k++){ MTGGameZone * zone = zones[k]; for (int j = 0; j < zone->nb_cards; j++){ if (canBeInList(zone->cards[j])){