Erwan

- some code cleanup in Damage.cpp (the test suite passes)

projects/mtg/include/AllAbilities.h

@@ -112,6 +112,8 @@ public:
 //Triggers
 //
 
+
+// Triggers When a card gets added to a zone (@movedTo)
 class TrCardAddedToZone:public TriggeredAbility{
 public:
   TargetChooser * toTc;

projects/mtg/src/Damage.cpp

@@ -49,11 +49,11 @@ int Damage::resolve(){
 
 //reserved for culmulitive absorb ability coding
 
-//prevent next damage-----------------------------
+  //prevent next damage-----------------------------
   if((target)->preventable >= 1) {
 	  int preventing =(target)->preventable;
 	  for(int k = preventing; k > 0;k--){
-//the following keeps preventable from ADDING toughness/life if damage was less then preventable amount.
+    //the following keeps preventable from ADDING toughness/life if damage was less then preventable amount.
       for (int i = damage; i >= 1; i--){
         (target)->preventable -= 1;
 			  damage -= 1;	 
@@ -61,11 +61,13 @@ int Damage::resolve(){
 	    }
 	  }
 	}
-//set prevent next damage back to 0 if it is equal to less then 0
+
+  //set prevent next damage back to 0 if it is equal to less then 0
 	if((target)->preventable < 0){
 		(target)->preventable = 0;
 	}
-//-------------------------------------------------
+
+  //-------------------------------------------------
   if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE){
     MTGCardInstance * _target = (MTGCardInstance *)target;
     if ((_target)->protectedAgainst(source)) damage = 0;
@@ -79,21 +81,17 @@ int Damage::resolve(){
 	    damage -= 1;
     }
     if ((_target)->has(Constants::WILTING)) {
-		 for (int i = 0; i < damage; i++){
+	    for (int j = damage; j > 0; j--){
-			for (int i = damage; i > 0; i--){
         (_target)->counters->addCounter(-1,-1); 
       }
       damage = 0;
     }
-	}
     if ((_target)->has(Constants::VIGOR)){
-		 for (int i = 0; i < damage; i++){
+	    for (int j = damage; j > 0; j--){
-			for (int i = damage; i > 0; i--){
         (_target)->counters->addCounter(1,1); 
       }
       damage = 0;
     }  
-	}  
     if (!damage){
       state = RESOLVED_NOK;
       delete (e);
@@ -103,56 +101,41 @@ int Damage::resolve(){
   }
   
   int a = damage;
-  // Damage for WITHER on creatures. This should probably go in replacement effects
+
-  if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE && source->has(Constants::WITHER)){
+  if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE && 
+    (source->has(Constants::WITHER) || source->has(Constants::INFECT))){
+    // Damage for WITHER or poison on creatures. This should probably go in replacement effects
     MTGCardInstance * _target = (MTGCardInstance *)target;
     for (int i = 0; i < damage; i++){
       _target->counters->addCounter(-1, -1);
     }
-  }else{//infect damage---------------------------------------------
+
-	 while(target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE && source->has(Constants::INFECT)){
+  } else if (target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::INFECT)) {
-    MTGCardInstance * _target = (MTGCardInstance *)target;
+    // Poison on player
-    for (int i = 0; i < damage; i++){
+    Player * _target = (Player *)target;
-      _target->counters->addCounter(-1, -1);
+	  _target->poisonCount += damage;//this will be changed to poison counters.
-	}return a;
+
-     }while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::INFECT)){
+  } else if (target->type_as_damageable == DAMAGEABLE_PLAYER && 
-    MTGCardInstance * _target = (MTGCardInstance *)target;
+   ( source->has(Constants::POISONTOXIC) || source->has(Constants::POISONTWOTOXIC) || source->has(Constants::POISONTHREETOXIC) )) {
-    for (int i = 0; i < damage; i++){
+     //Damage + 1, 2, or 3 poison counters on player
-		_target->poisonCount += 1;//this will be changed to poison counters.
+    Player * _target = (Player *)target;
-	 }return a;
+    a = target->dealDamage(damage);	 
-	 }//--------------------------------------------------
+    target->damageCount += damage;
-	 //poison AND damage----------------------------------
+    if (source->has(Constants::POISONTOXIC)) {
-	 while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONTOXIC)){
-    MTGCardInstance * _target = (MTGCardInstance *)target;
-    for (int i = 0; i < damage; i++){
-	 a = target->dealDamage(1);	 
-	target->damageCount += 1;
-	 }
       _target->poisonCount += 1;
-	 return a;
+    }else if (source->has(Constants::POISONTWOTOXIC)) {
-     }
-	 	while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONTWOTOXIC)){
-    MTGCardInstance * _target = (MTGCardInstance *)target;
-    for (int i = 0; i < damage; i++){
-	 a = target->dealDamage(1);
-	 target->damageCount += 1;
-	 }
       _target->poisonCount += 2;
-	 return a;
+    } else {
-		 }
-		 while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONTHREETOXIC)){
-    MTGCardInstance * _target = (MTGCardInstance *)target;
-    for (int i = 0; i < damage; i++){
-	 a = target->dealDamage(1);
-	 target->damageCount += 1;
-	 }
       _target->poisonCount += 3;
-	 return a;
+    }
-     }//----------------------------------------------------------
+
+  } else {
+    // "Normal" case, 
     //return the left over amount after effects have been applied to them.
      a = target->dealDamage(damage);
 	   target->damageCount += 1;
   }
+
   //Send (Damage/Replaced effect) event to listeners
   g->receiveEvent(e);
   return a;
@@ -211,7 +194,7 @@ int DamageStack::resolve(){
 }
 
 void DamageStack::Render(){
-  int currenty = y;
+  float currenty = y;
   for (int i= 0; i < mCount; i++){
     Damage * damage = (Damage*)mObjects[i];
     if (damage->state == NOT_RESOLVED){

projects/mtg/src/DamagerDamaged.cpp

@@ -69,21 +69,9 @@ void DamagerDamaged::Render(CombatStep mode)
     }
 
   char buf[6];
-  //  if (currentPlayer != damageSelecter){
-    /*    if (hasLethalDamage()){
-      mFont->DrawString("X",x,y);
-      }*/
     sprintf(buf, "%i", sumDamages());
     mFont->DrawString(buf, actX - 14 * actZ + 5, actY - 14 * actZ);
 
-    /*
-  }else{
-    mFont->SetColor(ARGB(255,0,0,255));
-    sprintf(buf, "%i", damageToDeal);
-    mFont->DrawString(buf,x+5, y+5);
-  }
-  mFont->SetColor(ARGB(255,255,255,255));
-  */
 }