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

Merge pull request #629 from kevlahnota/master

Browse Source 
added M15 cards :)
This commit is contained in:
Anthony Calosa
2015-09-21 13:59:27 +08:00
parent c3fb08da59 8543977a2f
commit 6fba81d7c8
5 changed files with 2521 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1445
projects/mtg/bin/Res/sets/M15/_cards.dat Normal file
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -546,6 +546,16 @@ private:
{
intValue = target->controller()->life;
}
else if (s == "startinglife")
{
intValue = target->controller()->initLife;
}
else if (s == "abundantlife")//current life is morethan or equal to starting life
{
intValue = 0;
if (target->controller()->life >= target->controller()->initLife)
intValue = 1;
}
else if (s == "highestlifetotal")
{
intValue = target->controller()->life <= target->controller()->opponent()->life? target->controller()->opponent()->life:target->controller()->life;

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

@@ -43,6 +43,7 @@ public:
int extraTurn;
int drawCounter;
int epic;
int initLife;
vector<string> prowledTypes;
vector<MTGCardInstance*>curses;
Player(GameObserver *observer, string deckFile, string deckFileSmall, MTGDeck * deck = NULL);

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

@@ -404,6 +404,7 @@ void Rules::initGame(GameObserver *g, bool currentPlayerSet)
{
Player * p = g->players[i];
p->life = initState.playerData[i].player->life;
p->initLife = initState.playerData[i].player->life;
p->poisonCount = initState.playerData[i].player->poisonCount;
p->damageCount = initState.playerData[i].player->damageCount;
p->preventable = initState.playerData[i].player->preventable;