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

add nonCombatDamage count

Browse Source
This commit is contained in:
Anthony Calosa
2016-08-04 09:56:53 +08:00
parent 8ba97b8a74
commit 1ab88940f9
6 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -11382,7 +11382,7 @@ toughness=2
[/card]
[card]
name=Bloodcrazed Goblin
auto=this(opponentdamagecount <1) cantattack
auto=this(variable{odnoncount}<1) cantattack
text=Bloodcrazed Goblin can't attack unless an opponent was dealt noncombat damage this turn.
mana={R}
type=Creature

8
projects/mtg/include/AllAbilities.h
View File

@@ -690,6 +690,14 @@ private:
{
intValue = target->controller()->opponent()->damageCount;
}
else if (s == "pdnoncount")
{
intValue = target->controller()->nonCombatDamage;
}
else if (s == "odnoncount")
{
intValue = target->controller()->opponent()->nonCombatDamage;
}
else if (s == "playerpoisoncount")
{
intValue = target->controller()->poisonCount;

1
projects/mtg/include/Damage.h
View File

@@ -24,6 +24,7 @@ public:
int handsize;
int poisonCount;
int damageCount;
int nonCombatDamage;
int preventable;
int thatmuch;
int lifeLostThisTurn;

6
projects/mtg/src/Damage.cpp
View File

@@ -184,6 +184,8 @@ int Damage::resolve()
if(!_target->inPlay()->hasAbility(Constants::POISONSHROUD))
_target->poisonCount += damage;//this will be changed to poison counters.
_target->damageCount += damage;
if(typeOfDamage == 2)
target->nonCombatDamage += damage;
if ( typeOfDamage == 1 && target == source->controller()->opponent() )//add vector prowledtypes.
{
vector<string> values = MTGAllCards::getCreatureValuesById();
@@ -202,6 +204,8 @@ int Damage::resolve()
if(!_target->inPlay()->hasAbility(Constants::CANTCHANGELIFE))
a = target->dealDamage(damage);
target->damageCount += damage;
if(typeOfDamage == 2)
target->nonCombatDamage += damage;
if ( typeOfDamage == 1 && target == source->controller()->opponent() )//add vector prowledtypes.
{
vector<string> values = MTGAllCards::getCreatureValuesById();
@@ -237,6 +241,8 @@ int Damage::resolve()
else
a = target->dealDamage(damage);
target->damageCount += damage;//the amount must be the actual damage so i changed this from 1 to damage, this fixes pdcount and odcount
if(typeOfDamage == 2)
target->nonCombatDamage += damage;
if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE){
((MTGCardInstance*)target)->wasDealtDamage = true;
((MTGCardInstance*)source)->damageToCreature = true;

2
projects/mtg/src/GameObserver.cpp
View File

@@ -211,11 +211,13 @@ void GameObserver::nextGamePhase()
{
cleanupPhase();
currentPlayer->damageCount = 0;
currentPlayer->nonCombatDamage = 0;
currentPlayer->drawCounter = 0;
currentPlayer->raidcount = 0;
currentPlayer->opponent()->raidcount = 0;
currentPlayer->prowledTypes.clear();
currentPlayer->opponent()->damageCount = 0; //added to clear odcount
currentPlayer->opponent()->nonCombatDamage = 0;
currentPlayer->preventable = 0;
mLayers->actionLayer()->cleanGarbage(); //clean abilities history for this turn;
mLayers->stackLayer()->garbageCollect(); //clean stack history for this turn;

1
projects/mtg/src/Player.cpp
View File

@@ -26,6 +26,7 @@ Player::Player(GameObserver *observer, string file, string fileSmall, MTGDeck *
nomaxhandsize = false;
poisonCount = 0;
damageCount = 0;
nonCombatDamage = 0;
preventable = 0;
mAvatarTex = NULL;
type_as_damageable = DAMAGEABLE_PLAYER;