diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat index 3461ca240..410f5fb70 100644 --- a/projects/mtg/bin/Res/sets/ICE/_cards.dat +++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat @@ -114,18 +114,6 @@ type=Instant mana={1}{W} [/card] [card] -text={0}: Return Blinking Spirit to its owner's hand. -id=2668 -name=Blinking Spirit -auto={0}:moveto(ownerhand) -rarity=R -type=Creature -mana={3}{W} -power=2 -subtype=Spirit -toughness=2 -[/card] -[card] text={T}: Add {1} to your mana pool. {T}: Add {G} or {W} to your mana pool. Brushland deals 1 damage to you. id=2751 auto={T}:add {1} diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat index 016affb3a..ad1359538 100644 --- a/projects/mtg/bin/Res/sets/ICE/todo.dat +++ b/projects/mtg/bin/Res/sets/ICE/todo.dat @@ -194,6 +194,18 @@ mana={W} subtype=Aura [/card] [card] +text={0}: Return Blinking Spirit to its owner's hand. +id=2668 +name=Blinking Spirit +auto={0}:moveto(ownerhand) +rarity=R +type=Creature +mana={3}{W} +power=2 +subtype=Spirit +toughness=2 +[/card] +[card] text=Play Blizzard only if you control a snow land. Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) Creatures with flying don't untap during their controllers' untap steps. id=2551 name=Blizzard diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 37f3ce4c7..c0817594f 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -33,6 +33,7 @@ ashen_firebeast.txt ashen_firebeast2.txt #befoul.txt blessed_wine.txt +#blinking_spirit.txt bloodfire_colossus.txt bottle_gnomes.txt boggart_arsonists.txt @@ -132,4 +133,4 @@ zombify.txt #Momir Basic Tests ######################## momir/keldon_warlord.txt -momir/overcost.txt \ No newline at end of file +momir/overcost.txt diff --git a/projects/mtg/bin/Res/test/blinking_spirit.txt b/projects/mtg/bin/Res/test/blinking_spirit.txt new file mode 100644 index 000000000..1b4f5aa2a --- /dev/null +++ b/projects/mtg/bin/Res/test/blinking_spirit.txt @@ -0,0 +1,24 @@ +#Bug:blinking spirit goes directly to graveyard +[INIT] +COMBATATTACKERS +[PLAYER1] +inplay:Blinking Spirit +[PLAYER2] +[DO] +Blinking Spirit +choice 0 +next +#blockers +next +#damage +next +#combatend +next +Blinking Spirit +[ASSERT] +SECONDMAIN +[PLAYER1] +hand:Blinking Spirit +[PLAYER2] +life:18 +[END] \ No newline at end of file diff --git a/projects/mtg/src/MTGGuiPlay.cpp b/projects/mtg/src/MTGGuiPlay.cpp index edcb66cc9..3721416ef 100644 --- a/projects/mtg/src/MTGGuiPlay.cpp +++ b/projects/mtg/src/MTGGuiPlay.cpp @@ -291,9 +291,9 @@ void MTGGuiPlay::RenderPlayerInfo(int playerid){ JRenderer * r = JRenderer::GetInstance(); Player * player = GameObserver::GetInstance()->players[playerid]; - //Avatar - GuiAvatar * avatar = (GuiAvatar *)mObjects[3*playerid]; - avatar->Render(); + //Avatar - already done in main Render phase + //GuiAvatar * avatar = (GuiAvatar *)mObjects[3*playerid]; + //avatar->Render(); @@ -362,7 +362,7 @@ void MTGGuiPlay::Render(){ renderer->RenderQuad(mBg,0,0); - for (int i=0;i=0;i--){ if (mObjects[i]!=NULL && i!=mCurr){ mObjects[i]->Render(); }