added abilities=poisonshroud

"you can not get poison counters"
This commit is contained in:
omegablast2002@yahoo.com
2012-01-31 19:41:43 +00:00
parent 81c90f0440
commit a248cb7423
4 changed files with 22 additions and 14 deletions
+2 -1
View File
@@ -211,8 +211,9 @@ class Constants
CANATTACK = 91, CANATTACK = 91,
HYDRA = 92, HYDRA = 92,
UNDYING = 93, UNDYING = 93,
POISONSHROUD = 94,
NB_BASIC_ABILITIES = 94, NB_BASIC_ABILITIES = 95,
RARITY_S = 'S', //Special Rarity RARITY_S = 'S', //Special Rarity
+3 -1
View File
@@ -85,7 +85,9 @@ int AAAlterPoison::resolve()
Damageable * _target = (Damageable *) getTarget(); Damageable * _target = (Damageable *) getTarget();
if (_target) if (_target)
{ {
_target->poisonCount += poison; Player * pTarget = (Player*)_target;
if(!pTarget->inPlay()->hasAbility(Constants::POISONSHROUD) || poison < 0)
_target->poisonCount += poison;
} }
return 0; return 0;
} }
+15 -11
View File
@@ -150,7 +150,8 @@ int Damage::resolve()
{ {
// Poison on player // Poison on player
Player * _target = (Player *) target; Player * _target = (Player *) target;
_target->poisonCount += damage;//this will be changed to poison counters. if(!_target->inPlay()->hasAbility(Constants::POISONSHROUD))
_target->poisonCount += damage;//this will be changed to poison counters.
_target->damageCount += damage; _target->damageCount += damage;
} }
else if (target->type_as_damageable == DAMAGEABLE_PLAYER && (source->has(Constants::POISONTOXIC) || else if (target->type_as_damageable == DAMAGEABLE_PLAYER && (source->has(Constants::POISONTOXIC) ||
@@ -160,17 +161,20 @@ int Damage::resolve()
Player * _target = (Player *) target; Player * _target = (Player *) target;
a = target->dealDamage(damage); a = target->dealDamage(damage);
target->damageCount += damage; target->damageCount += damage;
if (source->has(Constants::POISONTOXIC)) if(!_target->inPlay()->hasAbility(Constants::POISONSHROUD))
{ {
_target->poisonCount += 1; if (source->has(Constants::POISONTOXIC))
} {
else if (source->has(Constants::POISONTWOTOXIC)) _target->poisonCount += 1;
{ }
_target->poisonCount += 2; else if (source->has(Constants::POISONTWOTOXIC))
} {
else _target->poisonCount += 2;
{ }
_target->poisonCount += 3; else
{
_target->poisonCount += 3;
}
} }
} }
+2 -1
View File
@@ -122,7 +122,8 @@ const char* Constants::MTGBasicAbilities[] = {
"snowswamplandwalk", "snowswamplandwalk",
"canattack", "canattack",
"hydra", "hydra",
"undying" "undying",
"poisonshroud"
}; };
map<string,int> Constants::MTGBasicAbilitiesMap; map<string,int> Constants::MTGBasicAbilitiesMap;