diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 98c8e102b..32885cb0e 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -20,6 +20,7 @@ generic/phases.txt generic/rampage.txt generic/regenerate.txt generic/sacrifice.txt +generic/summoning_sickness.txt generic/wither.txt ######################## #Specific Cards diff --git a/projects/mtg/bin/Res/test/generic/summoning_sickness.txt b/projects/mtg/bin/Res/test/generic/summoning_sickness.txt new file mode 100644 index 000000000..ac2a166ce --- /dev/null +++ b/projects/mtg/bin/Res/test/generic/summoning_sickness.txt @@ -0,0 +1,23 @@ +#Bug: all creatures have haste +SummoningSickness +[INIT] +FIRSTMAIN +[PLAYER1] +hand:grizzly bears +manapool:{1}{G} +[PLAYER2] +[DO] +grizzly bears +next +#begin +next +#attackers +grizzly bears +next +#combat end +[ASSERT] +COMBATEND +[PLAYER1] +inplay:grizzly bears +[PLAYER2] +[END] \ No newline at end of file diff --git a/projects/mtg/include/MTGGameZones.h b/projects/mtg/include/MTGGameZones.h index a893797d6..c667601c1 100644 --- a/projects/mtg/include/MTGGameZones.h +++ b/projects/mtg/include/MTGGameZones.h @@ -166,7 +166,6 @@ class MTGPlayerCards { void showHand(); MTGCardInstance * putInGraveyard(MTGCardInstance * card); MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to); - MTGCardInstance * putInPlay(MTGCardInstance * card); int isInPlay(MTGCardInstance * card); }; diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 4157376b1..5b1e02a6e 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -92,7 +92,7 @@ void MTGCardInstance::initMTGCI(){ tapped = 0; untapBlockers = NULL; untapping = 0; - summoningSickness = 0; + summoningSickness = 1; target = NULL; nbprotections = 0; type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE; diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 9162d6edd..c7a13fd41 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -101,26 +101,6 @@ void MTGPlayerCards::showHand(){ hand->debugPrint(); } - -MTGCardInstance * MTGPlayerCards::putInPlay(MTGCardInstance * card){ - MTGGameZone * from = hand; - MTGCardInstance * copy = hand->removeCard(card); - if(!copy){ - copy = stack->removeCard(card); //Which one is it ??? - from = stack; - } - inPlay->addCard(copy); - copy->summoningSickness = 1; - copy->changedZoneRecently = 1.f; - - GameObserver *g = GameObserver::GetInstance(); - WEvent * e = NEW WEventZoneChange(copy, from, inPlay); - g->receiveEvent(e); - //delete e; - - return copy; -} - MTGCardInstance * MTGPlayerCards::putInGraveyard(MTGCardInstance * card){ MTGCardInstance * copy = NULL; MTGGraveyard * grave = card->owner->game->graveyard;