Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite

2025-04-26 22:37:45 +00:00 · 2018-03-02 02:55:08 +11:00 · 2018-03-02 02:55:08 +11:00 · edebe804f1
commit edebe804f1
parent 416269dc63 78b5ed525d
292 changed files with 331 additions and 12 deletions
--- a/cmake/boost.cmake
+++ b/cmake/boost.cmake
@ -14,10 +14,10 @@ if(UNIX)
  endif()
 else()

-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
    message(STATUS "Using boost in /libraries/external")
-	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
-    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
+	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
+    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
  else()
      find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS system)
      if(Boost_FOUND)
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@ -21,6 +21,10 @@ else()
    # incremental linking
    message(STATUS "Enabling Incremental Linking..")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL")
+
+    # enable building with multiple processes
+    message(STATUS "Enabling Build with Multiple Processes..")
+    add_definitions(/MP)
  endif()
 endif()

--- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
+++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
@ -1,11 +1,7 @@
 #ifndef SAPPHIRE_SCRIPTOBJECT_H
 #define SAPPHIRE_SCRIPTOBJECT_H

-#include <Script/NativeScriptApi.h>
 #include <Forwards.h>
-#include <Actor/Chara.h>
-#include <Actor/Player.h>
-#include <Event/EventHelper.h>

 enum EventFlags
 {
--- a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 class ActionSprint3 : public ActionScript
 {
--- a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 #define ACTION_ATTUNE 0x13

--- a/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
@ -1,4 +1,7 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
+

 #define ACTION_ATTUNE 0x13
 #define ACTION_TELEPORT 0x4
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 class CmnDefCutSceneReplay : public EventScript
 {
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 class CmnDefInnBed : public EventScript
 {
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 #define ACTION_CREATE 2
 #define ACTION_RENAME 3
--- a/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>

 class HouFurOrchestrion : public EventScript
 {
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 #include <Actor/EventObject.h>
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>

--- a/Show more
+++ b/Show more