Reorganized the Action enumeration to be flexible and have script overrides

1 files changed, 13 insertions, 2 deletions

diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index 67cdea3f..403cce2d 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -22,6 +22,7 @@
 #include "Arena.h"
 #include "Containment.h"
 #include "Player.h"
+#include "RunScript.h"
 
 // Sigscript includes
 #include "../sigscript/AbilityWrapper.h"
@@ -78,9 +79,19 @@ int Sigencore::actionPriority(TeamMember* teamMember, const TeamMember::Action&
         case TeamMember::Timeout:
             priority = INT_MAX;
             break;
-        case TeamMember::Invalid:
-            priority = INT_MAX - 1;
+        default:
+        {
+            bool ok;
+            ObjectMap objects;
+            objects["arena"] = teamMember->arena();
+            objects["owner"] = teamMember;
+            objects["sigmod"] = teamMember->sigmod();
+            Kross::Action* kaction = globalScript(teamMember->sigmod(), QString("battleaction-priority-%1").arg(action.first), QUuid::createUuid().toString());
+            priority = kaction->callFunction("priority").toInt(&ok);
+            if (!ok)
+                priority = 0;
             break;
+        }
     }
     return priority;
 }