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

Erwan

Browse Source 
- fixed a duplicate id in primitives (please be careful!)
- fixed issue 426
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-06-12 14:35:19 +00:00
parent 454d1af366
commit 0b1fd9359f
4 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGAbility.cpp
+6 -3
View File
@@ -2205,6 +2205,7 @@ TriggerAtPhase::TriggerAtPhase(int id, MTGCardInstance * source, Targetable * ta
}
int TriggerAtPhase::trigger(){
if (testDestroy()) return 0; // http://code.google.com/p/wagic/issues/detail?id=426
GameObserver * g = GameObserver::GetInstance();
int result = 0;
if (currentPhase != newPhase && newPhase == phaseId){
@@ -2242,8 +2243,10 @@ TriggerNextPhase::TriggerNextPhase(int id, MTGCardInstance * source, Targetable
}
int TriggerNextPhase::testDestroy(){
if (newPhase <= phaseId) destroyActivated = 1;
if ( newPhase > phaseId && destroyActivated){
//dirty hack because of http://code.google.com/p/wagic/issues/detail?id=426
if (newPhase <= phaseId && !destroyActivated) destroyActivated = 1;
if (destroyActivated > 1 || (newPhase > phaseId && destroyActivated)){
destroyActivated++;
return 1;
}
return 0;
@@ -2266,7 +2269,7 @@ GenericTriggeredAbility::GenericTriggeredAbility(int id, MTGCardInstance * _sour
ability->target = target;
if (destroyCondition){
destroyCondition->source = source;
destroyCondition->target = target;;
destroyCondition->target = target;
}
}