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

Merge branch 'master' into cmake

Browse Source
This commit is contained in:
xawotihs
2016-06-26 11:25:23 +02:00
parent 47704f7591 0b1be02c38
commit a23b96ba75
18 changed files with 4664 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+1 -1
View File
@@ -4856,7 +4856,7 @@ public:
{
if ((isManaProduced->card == source) && isManaProduced->color == Constants::GetColorStringIndex(colorname))
{
source->controller()->getManaPool()->add(Constants::GetColorStringIndex(colorname),1);
source->controller()->getManaPool()->add(Constants::GetColorStringIndex(colorname),1,source,true);
}
}
return 1;
projects/mtg/include/ManaCost.h
+1 -1
View File
@@ -150,7 +150,7 @@ public:
ManaPool(Player * player);
ManaPool(ManaCost * _manaCost, Player * player);
int remove (int color, int value);
int add(int color, int value, MTGCardInstance * source = NULL);
int add(int color, int value, MTGCardInstance * source = NULL, bool extra = false);
int add(ManaCost * _cost, MTGCardInstance * source = NULL);
int pay (ManaCost * _cost);
};
projects/mtg/include/WEvent.h
+8
View File
@@ -248,6 +248,14 @@ struct WEventCombatStepChange : public WEvent
WEventCombatStepChange(CombatStep);
};
//Event when a mana is engaged
//color : color
struct WEventEngageManaExtra : public WEvent {
int color;
MTGCardInstance* card;
ManaPool * destination;
WEventEngageManaExtra(int color, MTGCardInstance* card, ManaPool * destination);
};
//Event when a mana is engaged
//color : color