Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
-fix bloodhall ooze
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-07-29 13:22:39 +00:00
parent 07ff992e4d
commit 7a8a17bd99
4 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -46,6 +46,7 @@ beacon_of_unrest.txt
blessed_wine.txt
#blinking_spirit.txt
bloodfire_colossus.txt
bloodhall_ooze.txt
bottle_gnomes.txt
bottle_gnomes2.txt
boggart_arsonists.txt

32
projects/mtg/bin/Res/test/bloodhall_ooze.txt Normal file
View File

@@ -0,0 +1,32 @@
#Bug:bloodhal ooze gets 2 counters each upkeep no matter what
[INIT]
SECONDMAIN
[PLAYER1]
[PLAYER2]
inplay:bloodhall ooze,grizzly bears
[DO]
eot
next
choice 0
next
#draw
next
#main
next
#being
next
#attackers
bloodhall ooze
next
#blockers
next
#damage
next
#combatend
[ASSERT]
COMBATEND
[PLAYER1]
life:18
[PLAYER2]
inplay:bloodhall ooze,grizzly bears
[END]

8
projects/mtg/src/GameStateShop.cpp
View File

@@ -160,11 +160,15 @@ void GameStateShop::Render()
JRenderer * r = JRenderer::GetInstance();
r->ClearScreen(ARGB(0,0,0,0));
if (mBg)JRenderer::GetInstance()->RenderQuad(mBg,0,0);
r->FillRect(5,SCREEN_HEIGHT-15,110,15,ARGB(200,0,0,0));
itemFont->SetColor(ARGB(255,255,255,255));
itemFont->DrawString(_("press [] to refresh").c_str(),10,SCREEN_HEIGHT-12);
if (shop)
shop->Render();
r->FillRect(5,SCREEN_HEIGHT-15,110,15,ARGB(200,0,0,0));
itemFont->DrawString(_("press [] to refresh").c_str(),10,SCREEN_HEIGHT-12);
if (mStage == STAGE_SHOP_MENU && menu){
menu->Render();
}

44
projects/mtg/src/MTGAbility.cpp
View File

@@ -220,28 +220,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return multi;
}
//When...comes into play, you may...
found = s.find("may ");
if (found != string::npos){
string s1 = s.substr(found+4);
MTGAbility * a1 = parseMagicLine(s1,id,spell, card);
if (!a1) return NULL;
TargetChooser * tc = NULL;
//Target Abilities
found = s.find("target(");
if (found != string::npos){
int end = s.find(")", found);
string starget = s.substr(found + 7,end - found - 7);
TargetChooserFactory tcf;
tc = tcf.createTargetChooser(starget, card);
}
if (tc) a1 = NEW GenericTargetAbility(id, card, tc, a1);
return NEW MayAbility(id,a1,card);
}
//Lord, foreach, aslongas
string lords[] = {"lord(","foreach(", "aslongas(", "all("};
found = string::npos;
@@ -297,7 +275,27 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return NULL;
}
//When...comes into play, you may...
found = s.find("may ");
if (found != string::npos){
string s1 = s.substr(found+4);
MTGAbility * a1 = parseMagicLine(s1,id,spell, card);
if (!a1) return NULL;
TargetChooser * tc = NULL;
//Target Abilities
found = s.find("target(");
if (found != string::npos){
int end = s.find(")", found);
string starget = s.substr(found + 7,end - found - 7);
TargetChooserFactory tcf;
tc = tcf.createTargetChooser(starget, card);
}
if (tc) a1 = NEW GenericTargetAbility(id, card, tc, a1);
return NEW MayAbility(id,a1,card);
}
//Fizzle (counterspell...)
found = s.find("fizzle");
if (found != string::npos){