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

Erwan

Browse Source 
- fix issue 226 (holy day)
- fix issue 213 (random deck NB of cards)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-12-03 13:40:48 +00:00
parent 8b8abafe59
commit a58e414a5f
4 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,6 +182,7 @@ gravedigger.txt
hannas_custody.txt
harpoon_sniper.txt
hellfire.txt
holy_day_i226.txt
howl_from_beyond.txt
howl_of_the_night_pack.txt
hurricane.txt

43
projects/mtg/bin/Res/test/holy_day_i226.txt Normal file
View File

@@ -0,0 +1,43 @@
#Bug: Holy day lasts after end of turn
[INIT]
FIRSTMAIN
[PLAYER1]
hand:holy day
manapool:{W}
inplay:grizzly bears
[PLAYER2]
[DO]
holy day
next
#begin
next
#attackers
grizzly bears
eot
eot
next
#upkeep
next
#draw
next
#firstmain
next
#begin
next
#attackers
grizzly bears
next
#blockers
next
#damage
next
#end combat
[ASSERT]
COMBATEND
[PLAYER1]
life:20
graveyard:holy day
inplay:grizzly bears
[PLAYER2]
life:18
[END]

2
projects/mtg/include/AllAbilities.h
View File

@@ -2208,7 +2208,7 @@ class APreventAllCombatDamage:public MTGAbility{
return 1;
}
int Destroy(){
int destroy(){
game->replacementEffects->remove(re);
delete re;
return 1;

4
projects/mtg/src/GameStateDuel.cpp
View File

@@ -118,8 +118,8 @@ void GameStateDuel::loadPlayerRandom(int playerId, int isAI, int mode){
MTGDeck * tempDeck = NEW MTGDeck(mParent->collection);
tempDeck->addRandomCards(9,0,0,-1,lands[color1].c_str());
tempDeck->addRandomCards(9,0,0,-1,lands[color2].c_str());
tempDeck->addRandomCards(1,0,0,'U',"land",colors,nbcolors);
tempDeck->addRandomCards(1,0,0,'R',"land",colors,nbcolors);
tempDeck->addRandomCards(1,0,0,'U',"land");
tempDeck->addRandomCards(1,0,0,'R',"land");
tempDeck->addRandomCards(12,0,0,-1,"creature",colors,nbcolors);
tempDeck->addRandomCards(2,0,0,-1,"sorcery",colors,nbcolors);
tempDeck->addRandomCards(2,0,0,-1,"enchantment",colors,nbcolors);