Erwan
-fix issue 47 (all creatures have haste)
This commit is contained in:
@@ -20,6 +20,7 @@ generic/phases.txt
|
|||||||
generic/rampage.txt
|
generic/rampage.txt
|
||||||
generic/regenerate.txt
|
generic/regenerate.txt
|
||||||
generic/sacrifice.txt
|
generic/sacrifice.txt
|
||||||
|
generic/summoning_sickness.txt
|
||||||
generic/wither.txt
|
generic/wither.txt
|
||||||
########################
|
########################
|
||||||
#Specific Cards
|
#Specific Cards
|
||||||
|
|||||||
@@ -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]
|
||||||
@@ -166,7 +166,6 @@ class MTGPlayerCards {
|
|||||||
void showHand();
|
void showHand();
|
||||||
MTGCardInstance * putInGraveyard(MTGCardInstance * card);
|
MTGCardInstance * putInGraveyard(MTGCardInstance * card);
|
||||||
MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
|
MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
|
||||||
MTGCardInstance * putInPlay(MTGCardInstance * card);
|
|
||||||
int isInPlay(MTGCardInstance * card);
|
int isInPlay(MTGCardInstance * card);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ void MTGCardInstance::initMTGCI(){
|
|||||||
tapped = 0;
|
tapped = 0;
|
||||||
untapBlockers = NULL;
|
untapBlockers = NULL;
|
||||||
untapping = 0;
|
untapping = 0;
|
||||||
summoningSickness = 0;
|
summoningSickness = 1;
|
||||||
target = NULL;
|
target = NULL;
|
||||||
nbprotections = 0;
|
nbprotections = 0;
|
||||||
type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE;
|
type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE;
|
||||||
|
|||||||
@@ -101,26 +101,6 @@ void MTGPlayerCards::showHand(){
|
|||||||
hand->debugPrint();
|
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 * MTGPlayerCards::putInGraveyard(MTGCardInstance * card){
|
||||||
MTGCardInstance * copy = NULL;
|
MTGCardInstance * copy = NULL;
|
||||||
MTGGraveyard * grave = card->owner->game->graveyard;
|
MTGGraveyard * grave = card->owner->game->graveyard;
|
||||||
|
|||||||
Reference in New Issue
Block a user