Core/Spells: Fixes errors in scriptstate for spells

2018-06-15 12:36:03 -04:00
parent 7aa494d5dd
commit b8b0ff0fba
2 changed files with 52 additions and 56 deletions
@@ -17,14 +17,38 @@

 namespace Framework.Constants
 {
-    // AuraScript interface - enum used for runtime checks of script function calls
-    public enum AuraScriptHookType
+    public enum SpellScriptState
    {
        None = 0,
        Registration,
        Loading,
        Unloading,
-        EffectApply,
+    }
+
+    // SpellScript interface - enum used for runtime checks of script function calls
+    public enum SpellScriptHookType
+    {
+        Launch = SpellScriptState.Unloading + 1,
+        LaunchTarget,
+        EffectHit,
+        EffectHitTarget,
+        EffectSuccessfulDispel,
+        BeforeHit,
+        OnHit,
+        AfterHit,
+        ObjectAreaTargetSelect,
+        ObjectTargetSelect,
+        DestinationTargetSelect,
+        CheckCast,
+        BeforeCast,
+        OnCast,
+        AfterCast
+    }
+
+    // AuraScript interface - enum used for runtime checks of script function calls
+    public enum AuraScriptHookType
+    {
+        EffectApply = SpellScriptState.Unloading + 1,
        EffectAfterApply,
        EffectRemove,
        EffectAfterRemove,
@@ -52,28 +76,4 @@ namespace Framework.Constants
        //Apply,
        //Remove
    }
-
-    // SpellScript interface - enum used for runtime checks of script function calls
-    public enum SpellScriptHookType
-    {
-        None = 0,
-        Registration,
-        Loading,
-        Unloading,
-        Launch,
-        LaunchTarget,
-        EffectHit,
-        EffectHitTarget,
-        EffectSuccessfulDispel,
-        BeforeHit,
-        OnHit,
-        AfterHit,
-        ObjectAreaTargetSelect,
-        ObjectTargetSelect,
-        DestinationTargetSelect,
-        CheckCast,
-        BeforeCast,
-        OnCast,
-        AfterCast
-    }
 }