diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h index da4569fab..770232280 100644 --- a/projects/mtg/include/MTGDefinitions.h +++ b/projects/mtg/include/MTGDefinitions.h @@ -104,9 +104,9 @@ class Constants CANTREGEN = 46, ONEBLOCKER = 47, INFECT = 48, - POISONDAMAGE = 49, - POISONTWODAMAGE = 50, - POISONTHREEDAMAGE = 51, + POISONTOXIC = 49, + POISONTWOTOXIC = 50, + POISONTHREETOXIC = 51, PHANTOM = 52, COUNTERASDAMAGE = 53, VIGOR = 54, diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp index 161c3a354..bd554a439 100644 --- a/projects/mtg/src/Damage.cpp +++ b/projects/mtg/src/Damage.cpp @@ -115,7 +115,7 @@ int Damage::resolve(){ }return a; }//-------------------------------------------------- //poison AND damage---------------------------------- - while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONDAMAGE)){ + 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); @@ -124,7 +124,7 @@ int Damage::resolve(){ _target->poisonCount += 1; return a; } - while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONTWODAMAGE)){ + 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); @@ -133,7 +133,7 @@ int Damage::resolve(){ _target->poisonCount += 2; return a; } - while(target->type_as_damageable == DAMAGEABLE_PLAYER && source->has(Constants::POISONTHREEDAMAGE)){ + 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); diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp index 74239204f..2ae1451f9 100644 --- a/projects/mtg/src/MTGDefinitions.cpp +++ b/projects/mtg/src/MTGDefinitions.cpp @@ -57,9 +57,9 @@ const char* Constants::MTGBasicAbilities[] = { "cantregen", "oneblocker", "infect", -"poisondamage", -"poisontwodamage", -"poisonthreedamage", +"poisontoxic", +"poisontwotoxic", +"poisonthreetoxic", "phantom",//prevents damage and remove 1 +1/+1 counter "counterasdamage",//source takes damage in the form of -1/-1 counters. "vigor",//instead of taking damage the source gains +1/+1 counters