Erwan

- removed blinking spirit from ICE
- changed display order in MTGGuiPlay (auras should be under creatures most of the time...)

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}

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

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
+momir/overcost.txt

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]

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<mCount;i++){
+  for (int i=mCount-1;i>=0;i--){
     if (mObjects[i]!=NULL && i!=mCurr){
       mObjects[i]->Render();
     }