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

add "abilitycontroller" for dynamicability

Browse Source 
for use inside ability$! dynamicability<who> !$ who
This commit is contained in:
Anthony Calosa
2016-08-26 11:23:52 +08:00
parent a93dd6586d
commit 2a1bacdfa4
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+10 -1
View File
@@ -4708,7 +4708,8 @@ DYNAMIC_ABILITY_WHO_TARGETOPPONENT = 4,
DYNAMIC_ABILITY_WHO_TOSOURCE = 5, DYNAMIC_ABILITY_WHO_TOSOURCE = 5,
DYNAMIC_ABILITY_WHO_SOURCECONTROLLER = 6, DYNAMIC_ABILITY_WHO_SOURCECONTROLLER = 6,
DYNAMIC_ABILITY_WHO_SOURCEOPPONENT = 7, DYNAMIC_ABILITY_WHO_SOURCEOPPONENT = 7,
DYNAMIC_ABILITY_WHO_NB = 8, DYNAMIC_ABILITY_WHO_ABILITYCONTROLLER = 8,
DYNAMIC_ABILITY_WHO_NB = 9,
}; };
int type; int type;
@@ -6277,6 +6278,14 @@ public:
who = source->owner; who = source->owner;
} }
if (after == "postbattle")
{
if(game->getCurrentGamePhase() < MTG_PHASE_COMBATEND)
after = "secondmain";
else
after = "this";
}
if (after == "this")//apply it right now. if (after == "this")//apply it right now.
{ {
if(!applied) if(!applied)
projects/mtg/src/AllAbilities.cpp
+8 -1
View File
@@ -3464,10 +3464,17 @@ int AADynamic::resolve()
tosrc = true; tosrc = true;
break; break;
case DYNAMIC_ABILITY_WHO_SOURCECONTROLLER: case DYNAMIC_ABILITY_WHO_SOURCECONTROLLER:
secondaryTarget = ((MTGCardInstance *) OriginalSrc)->controller(); secondaryTarget = OriginalSrc->controller();
break; break;
case DYNAMIC_ABILITY_WHO_SOURCEOPPONENT: case DYNAMIC_ABILITY_WHO_SOURCEOPPONENT:
secondaryTarget = OriginalSrc->controller()->opponent(); secondaryTarget = OriginalSrc->controller()->opponent();
case DYNAMIC_ABILITY_WHO_ABILITYCONTROLLER:
{
if(OriginalSrc->storedSourceCard)
secondaryTarget = OriginalSrc->storedSourceCard->controller();
else
secondaryTarget = OriginalSrc->controller();
}
break; break;
default: default:
break; break;
projects/mtg/src/MTGAbility.cpp
+2 -2
View File
@@ -77,10 +77,10 @@ const int kDynamicEffectIds[] = {
}; };
const string kDynamicWhoKeywords[] = {"eachother", "itself", "targetcontroller", "targetopponent", "tosrc", "srccontroller", "srcopponent" }; const string kDynamicWhoKeywords[] = {"eachother", "itself", "targetcontroller", "targetopponent", "tosrc", "srccontroller", "srcopponent" , "abilitycontroller" };
const int kDynamicWhoIds[] = { const int kDynamicWhoIds[] = {
AADynamic::DYNAMIC_ABILITY_WHO_EACHOTHER, AADynamic::DYNAMIC_ABILITY_WHO_ITSELF, AADynamic::DYNAMIC_ABILITY_WHO_TARGETCONTROLLER, AADynamic::DYNAMIC_ABILITY_WHO_TARGETOPPONENT, AADynamic::DYNAMIC_ABILITY_WHO_EACHOTHER, AADynamic::DYNAMIC_ABILITY_WHO_ITSELF, AADynamic::DYNAMIC_ABILITY_WHO_TARGETCONTROLLER, AADynamic::DYNAMIC_ABILITY_WHO_TARGETOPPONENT,
AADynamic::DYNAMIC_ABILITY_WHO_TOSOURCE, AADynamic::DYNAMIC_ABILITY_WHO_SOURCECONTROLLER, AADynamic::DYNAMIC_ABILITY_WHO_SOURCEOPPONENT AADynamic::DYNAMIC_ABILITY_WHO_TOSOURCE, AADynamic::DYNAMIC_ABILITY_WHO_SOURCECONTROLLER, AADynamic::DYNAMIC_ABILITY_WHO_SOURCEOPPONENT, AADynamic::DYNAMIC_ABILITY_WHO_ABILITYCONTROLLER
}; };
int MTGAbility::allowedToCast(MTGCardInstance * card,Player * player) int MTGAbility::allowedToCast(MTGCardInstance * card,Player * player)