add "abilitycontroller" for dynamicability

for use inside ability$! dynamicability<who> !$ who
2016-08-26 11:23:52 +08:00
parent a93dd6586d
commit 2a1bacdfa4
3 changed files with 20 additions and 4 deletions
@@ -4708,7 +4708,8 @@ DYNAMIC_ABILITY_WHO_TARGETOPPONENT = 4,
 DYNAMIC_ABILITY_WHO_TOSOURCE = 5,
 DYNAMIC_ABILITY_WHO_SOURCECONTROLLER = 6,
 DYNAMIC_ABILITY_WHO_SOURCEOPPONENT = 7,
-DYNAMIC_ABILITY_WHO_NB = 8,
+DYNAMIC_ABILITY_WHO_ABILITYCONTROLLER = 8,
+DYNAMIC_ABILITY_WHO_NB = 9,

 };
 int type;
@@ -6277,6 +6278,14 @@ public:
                    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(!applied)