added abilities=split second
This commit is contained in:
@@ -181,8 +181,9 @@ NONBASICWALK = 92,
|
|||||||
STRONG = 93,
|
STRONG = 93,
|
||||||
WEAK = 94,
|
WEAK = 94,
|
||||||
PHASING = 95,
|
PHASING = 95,
|
||||||
|
SPLITSECOND = 96,
|
||||||
|
|
||||||
NB_BASIC_ABILITIES = 96,
|
NB_BASIC_ABILITIES = 97,
|
||||||
|
|
||||||
|
|
||||||
RARITY_S = 'S', //Special Rarity
|
RARITY_S = 'S', //Special Rarity
|
||||||
|
|||||||
@@ -685,7 +685,6 @@ int ActionStack::resolve()
|
|||||||
}
|
}
|
||||||
if (action->type == ACTION_DAMAGE)
|
if (action->type == ACTION_DAMAGE)
|
||||||
((Damage *) action)->target->afterDamage();
|
((Damage *) action)->target->afterDamage();
|
||||||
|
|
||||||
if (!getNext(NULL, NOT_RESOLVED))
|
if (!getNext(NULL, NOT_RESOLVED))
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 2; i++)
|
for (int i = 0; i < 2; i++)
|
||||||
@@ -849,6 +848,14 @@ void ActionStack::Update(float dt)
|
|||||||
{
|
{
|
||||||
modal = 0;
|
modal = 0;
|
||||||
if (getLatest(NOT_RESOLVED))
|
if (getLatest(NOT_RESOLVED))
|
||||||
|
{
|
||||||
|
Interruptible * currentSpell = (Interruptible *)getLatest(NOT_RESOLVED);
|
||||||
|
MTGCardInstance * card = currentSpell->source;
|
||||||
|
if(card && card->has(Constants::SPLITSECOND))
|
||||||
|
{
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
int currentPlayerId = 0;
|
int currentPlayerId = 0;
|
||||||
int otherPlayerId = 1;
|
int otherPlayerId = 1;
|
||||||
@@ -887,6 +894,7 @@ void ActionStack::Update(float dt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else if (mode == ACTIONSTACK_TARGET)
|
else if (mode == ACTIONSTACK_TARGET)
|
||||||
{
|
{
|
||||||
GuiLayer::Update(dt);
|
GuiLayer::Update(dt);
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ const char* Constants::MTGBasicAbilities[] = {
|
|||||||
"strong",//cant be blocked by creature with less power
|
"strong",//cant be blocked by creature with less power
|
||||||
"weak",//cant block creatures with more power
|
"weak",//cant block creatures with more power
|
||||||
"phasing",
|
"phasing",
|
||||||
|
"split second",
|
||||||
};
|
};
|
||||||
|
|
||||||
map<string,int> Constants::MTGBasicAbilitiesMap;
|
map<string,int> Constants::MTGBasicAbilitiesMap;
|
||||||
|
|||||||
Reference in New Issue
Block a user