added M15 cards :)

added M15 cards and support for cards that use startinglife
keyword(Resolute Archangel)
This commit is contained in:
Anthony Calosa
2015-09-21 12:00:34 +08:00
parent b16b37e757
commit 7b3da0e2c2
4 changed files with 1076 additions and 12 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -546,6 +546,16 @@ private:
{ {
intValue = target->controller()->life; 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") else if (s == "highestlifetotal")
{ {
intValue = target->controller()->life <= target->controller()->opponent()->life? target->controller()->opponent()->life:target->controller()->life; intValue = target->controller()->life <= target->controller()->opponent()->life? target->controller()->opponent()->life:target->controller()->life;

View File

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

View File

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