Merge pull request #425 from NotAdam/housing

move all script classes to Sapphire::ScriptAPI namespace

src/servers/Scripts/CMakeLists.txt

@@ -31,7 +31,7 @@ foreach(_scriptDir ${children})
                     set(ScriptIncludes "#include \"${_script}\"")
                 endif()
 
-                set(ScriptNames "${ScriptNames}   static_cast< ScriptObject* >( new ${_scriptname} ),\n")
+                set(ScriptNames "${ScriptNames}   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ${_scriptname} ),\n")
             endif()
         endforeach()
 

src/servers/Scripts/ScriptLoader.cpp.in

@@ -2,13 +2,13 @@
 
 @ScriptIncludes@
 
-const ScriptObject* ptrs[] =
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
 {
 @ScriptNames@
    nullptr
 };
 
-extern "C" EXPORT const ScriptObject** getScripts()
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
 {
    return ptrs;
 }

src/servers/Scripts/action/ActionReturn6.cpp

@@ -3,11 +3,11 @@
 #include <Actor/Player.h>
 
 class ActionReturn6 :
-  public ActionScript
+  public Sapphire::ScriptAPI::ActionScript
 {
 public:
   ActionReturn6() :
-    ActionScript( 6 )
+    Sapphire::ScriptAPI::ActionScript( 6 )
   {
   }
 

src/servers/Scripts/action/ActionSprint3.cpp

@@ -2,11 +2,11 @@
 #include <Actor/Player.h>
 
 class ActionSprint3 :
-  public ActionScript
+  public Sapphire::ScriptAPI::ActionScript
 {
 public:
   ActionSprint3() :
-    ActionScript( 3 )
+    Sapphire::ScriptAPI::ActionScript( 3 )
   {
   }
 

src/servers/Scripts/common/Aethernet.cpp

@@ -13,11 +13,11 @@
 using namespace Core;
 
 class Aethernet :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   Aethernet() :
-    EventScript( EVENTSCRIPT_AETHERNET_ID )
+    Sapphire::ScriptAPI::EventScript( EVENTSCRIPT_AETHERNET_ID )
   {
   }
 

src/servers/Scripts/common/Aetheryte.cpp

@@ -15,11 +15,11 @@
 using namespace Core;
 
 class Aetheryte :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   Aetheryte() :
-    EventScript( EVENTSCRIPT_AETHERYTE_ID )
+    Sapphire::ScriptAPI::EventScript( EVENTSCRIPT_AETHERYTE_ID )
   {
   }
 

src/servers/Scripts/common/CmnDefCutSceneReplay.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefCutSceneReplay :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefCutSceneReplay() :
-    EventScript( 721028 )
+    Sapphire::ScriptAPI::EventScript( 721028 )
   {
   }
 

src/servers/Scripts/common/CmnDefHousingSignboard.cpp

@@ -11,10 +11,10 @@ using namespace Network;
 using namespace Packets;
 using namespace Server;
 
-class CmnDefHousingSignboard : public EventScript
+class CmnDefHousingSignboard : public Sapphire::ScriptAPI::EventScript
 {
 public:
-  CmnDefHousingSignboard() : EventScript( 721031 )
+  CmnDefHousingSignboard() : Sapphire::ScriptAPI::EventScript( 721031 )
   {
   }
 

src/servers/Scripts/common/CmnDefInnBed.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefInnBed :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefInnBed() :
-    EventScript( 720916 )
+    Sapphire::ScriptAPI::EventScript( 720916 )
   {
   }
 

src/servers/Scripts/common/CmnDefLinkShell.cpp

@@ -8,11 +8,11 @@
 using namespace Core;
 
 class CmnDefLinkShell :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefLinkShell() :
-    EventScript( 0xB0006 )
+    Sapphire::ScriptAPI::EventScript( 0xB0006 )
   {
   }
 

src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefMarketBoardGridania :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefMarketBoardGridania() :
-    EventScript( 0xB0027 )
+    Sapphire::ScriptAPI::EventScript( 0xB0027 )
   {
   }
 

src/servers/Scripts/common/CmnDefMogLetter.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefMogLetter :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefMogLetter() :
-    EventScript( 720898 )
+    Sapphire::ScriptAPI::EventScript( 720898 )
   {
   }
 

src/servers/Scripts/common/CmnDefNpcRepair.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefNpcRepair :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefNpcRepair() :
-    EventScript( 0xB0013 )
+    Sapphire::ScriptAPI::EventScript( 0xB0013 )
   {
   }
 

src/servers/Scripts/common/CmnDefWeatherForeCast.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CmnDefWeatherForeCast :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   CmnDefWeatherForeCast() :
-    EventScript( 721100 )
+    Sapphire::ScriptAPI::EventScript( 721100 )
   {
   }
 

src/servers/Scripts/common/ComDefMobHuntBoard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ComDefMobHuntBoard :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   ComDefMobHuntBoard() :
-    EventScript( 0xB00CA )
+    Sapphire::ScriptAPI::EventScript( 0xB00CA )
   {
   }
 

src/servers/Scripts/common/GilShop.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class GilShop :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   GilShop() :
-    EventScript( 0x00040001 )
+    Sapphire::ScriptAPI::EventScript( 0x00040001 )
   {
   }
 

src/servers/Scripts/common/HouFurOrchestrion.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HouFurOrchestrion :
-  public EventScript
+  public Sapphire::ScriptAPI::EventScript
 {
 public:
   HouFurOrchestrion() :
-    EventScript( 721226 )
+    Sapphire::ScriptAPI::EventScript( 721226 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors101110 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors101110() :
-    InstanceContentScript( 60011 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60011 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors110 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors110() :
-    InstanceContentScript( 60001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60001 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors111120 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors111120() :
-    InstanceContentScript( 60012 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60012 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors1120 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors1120() :
-    InstanceContentScript( 60002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60002 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors121130 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors121130() :
-    InstanceContentScript( 60013 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60013 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors131140 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors131140() :
-    InstanceContentScript( 60014 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60014 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors141150 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors141150() :
-    InstanceContentScript( 60015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60015 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors151160 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors151160() :
-    InstanceContentScript( 60016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60016 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors161170 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors161170() :
-    InstanceContentScript( 60017 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60017 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors171180 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors171180() :
-    InstanceContentScript( 60018 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60018 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors181190 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors181190() :
-    InstanceContentScript( 60019 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60019 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors191200 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors191200() :
-    InstanceContentScript( 60020 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60020 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors2130 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors2130() :
-    InstanceContentScript( 60003 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60003 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors3140 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors3140() :
-    InstanceContentScript( 60004 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60004 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors4150 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors4150() :
-    InstanceContentScript( 60005 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60005 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors5160 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors5160() :
-    InstanceContentScript( 60006 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60006 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors6170 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors6170() :
-    InstanceContentScript( 60007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60007 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors7180 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors7180() :
-    InstanceContentScript( 60008 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60008 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors8190 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors8190() :
-    InstanceContentScript( 60009 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60009 )
   {
   }
 

src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePalaceoftheDeadFloors91100 :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePalaceoftheDeadFloors91100() :
-    InstanceContentScript( 60010 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60010 )
   {
   }
 

src/servers/Scripts/instances/dungeons/AlaMhigo.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AlaMhigo :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AlaMhigo() :
-    InstanceContentScript( 56 )
+    Sapphire::ScriptAPI::InstanceContentScript( 56 )
   {
   }
 

src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AmdaporKeep :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AmdaporKeep() :
-    InstanceContentScript( 14 )
+    Sapphire::ScriptAPI::InstanceContentScript( 14 )
   {
   }
 

src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AmdaporKeepHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AmdaporKeepHard() :
-    InstanceContentScript( 29 )
+    Sapphire::ScriptAPI::InstanceContentScript( 29 )
   {
   }
 

src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BaelsarsWall :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BaelsarsWall() :
-    InstanceContentScript( 48 )
+    Sapphire::ScriptAPI::InstanceContentScript( 48 )
   {
   }
 

src/servers/Scripts/instances/dungeons/BardamsMettle.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BardamsMettle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BardamsMettle() :
-    InstanceContentScript( 53 )
+    Sapphire::ScriptAPI::InstanceContentScript( 53 )
   {
   }
 

src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BrayfloxsLongstop :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BrayfloxsLongstop() :
-    InstanceContentScript( 8 )
+    Sapphire::ScriptAPI::InstanceContentScript( 8 )
   {
   }
 

src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class BrayfloxsLongstopHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   BrayfloxsLongstopHard() :
-    InstanceContentScript( 20 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20 )
   {
   }
 

src/servers/Scripts/instances/dungeons/CastrumAbania.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CastrumAbania :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CastrumAbania() :
-    InstanceContentScript( 55 )
+    Sapphire::ScriptAPI::InstanceContentScript( 55 )
   {
   }
 

src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CastrumMeridianum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CastrumMeridianum() :
-    InstanceContentScript( 15 )
+    Sapphire::ScriptAPI::InstanceContentScript( 15 )
   {
   }
 

src/servers/Scripts/instances/dungeons/CopperbellMines.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CopperbellMines :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CopperbellMines() :
-    InstanceContentScript( 3 )
+    Sapphire::ScriptAPI::InstanceContentScript( 3 )
   {
   }
 

src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CopperbellMinesHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CopperbellMinesHard() :
-    InstanceContentScript( 18 )
+    Sapphire::ScriptAPI::InstanceContentScript( 18 )
   {
   }
 

src/servers/Scripts/instances/dungeons/CuttersCry.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class CuttersCry :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   CuttersCry() :
-    InstanceContentScript( 12 )
+    Sapphire::ScriptAPI::InstanceContentScript( 12 )
   {
   }
 

src/servers/Scripts/instances/dungeons/DomaCastle.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DomaCastle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DomaCastle() :
-    InstanceContentScript( 54 )
+    Sapphire::ScriptAPI::InstanceContentScript( 54 )
   {
   }
 

src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class DzemaelDarkhold :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   DzemaelDarkhold() :
-    InstanceContentScript( 13 )
+    Sapphire::ScriptAPI::InstanceContentScript( 13 )
   {
   }
 

src/servers/Scripts/instances/dungeons/Halatali.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Halatali :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Halatali() :
-    InstanceContentScript( 7 )
+    Sapphire::ScriptAPI::InstanceContentScript( 7 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HalataliHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HalataliHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HalataliHard() :
-    InstanceContentScript( 21 )
+    Sapphire::ScriptAPI::InstanceContentScript( 21 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HaukkeManor.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HaukkeManor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HaukkeManor() :
-    InstanceContentScript( 6 )
+    Sapphire::ScriptAPI::InstanceContentScript( 6 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HaukkeManorHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HaukkeManorHard() :
-    InstanceContentScript( 19 )
+    Sapphire::ScriptAPI::InstanceContentScript( 19 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HellsLid.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HellsLid :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HellsLid() :
-    InstanceContentScript( 59 )
+    Sapphire::ScriptAPI::InstanceContentScript( 59 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HullbreakerIsle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HullbreakerIsle() :
-    InstanceContentScript( 23 )
+    Sapphire::ScriptAPI::InstanceContentScript( 23 )
   {
   }
 

src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class HullbreakerIsleHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   HullbreakerIsleHard() :
-    InstanceContentScript( 45 )
+    Sapphire::ScriptAPI::InstanceContentScript( 45 )
   {
   }
 

src/servers/Scripts/instances/dungeons/KuganeCastle.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class KuganeCastle :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   KuganeCastle() :
-    InstanceContentScript( 57 )
+    Sapphire::ScriptAPI::InstanceContentScript( 57 )
   {
   }
 

src/servers/Scripts/instances/dungeons/Neverreap.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Neverreap :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Neverreap() :
-    InstanceContentScript( 33 )
+    Sapphire::ScriptAPI::InstanceContentScript( 33 )
   {
   }
 

src/servers/Scripts/instances/dungeons/PharosSirius.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class PharosSirius :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   PharosSirius() :
-    InstanceContentScript( 17 )
+    Sapphire::ScriptAPI::InstanceContentScript( 17 )
   {
   }
 

src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class PharosSiriusHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   PharosSiriusHard() :
-    InstanceContentScript( 40 )
+    Sapphire::ScriptAPI::InstanceContentScript( 40 )
   {
   }
 

src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SaintMociannesArboretum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SaintMociannesArboretum() :
-    InstanceContentScript( 41 )
+    Sapphire::ScriptAPI::InstanceContentScript( 41 )
   {
   }
 

src/servers/Scripts/instances/dungeons/Sastasha.cpp

@@ -5,11 +5,11 @@
 using namespace Core;
 
 class Sastasha :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Sastasha() :
-    InstanceContentScript( 4 )
+    Sapphire::ScriptAPI::InstanceContentScript( 4 )
   {
   }
 

src/servers/Scripts/instances/dungeons/SastashaHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SastashaHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SastashaHard() :
-    InstanceContentScript( 28 )
+    Sapphire::ScriptAPI::InstanceContentScript( 28 )
   {
   }
 

src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ShisuioftheVioletTides :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ShisuioftheVioletTides() :
-    InstanceContentScript( 50 )
+    Sapphire::ScriptAPI::InstanceContentScript( 50 )
   {
   }
 

src/servers/Scripts/instances/dungeons/Snowcloak.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Snowcloak :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Snowcloak() :
-    InstanceContentScript( 27 )
+    Sapphire::ScriptAPI::InstanceContentScript( 27 )
   {
   }
 

src/servers/Scripts/instances/dungeons/SohmAl.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohmAl :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohmAl() :
-    InstanceContentScript( 37 )
+    Sapphire::ScriptAPI::InstanceContentScript( 37 )
   {
   }
 

src/servers/Scripts/instances/dungeons/SohmAlHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohmAlHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohmAlHard() :
-    InstanceContentScript( 49 )
+    Sapphire::ScriptAPI::InstanceContentScript( 49 )
   {
   }
 

src/servers/Scripts/instances/dungeons/SohrKhai.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class SohrKhai :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   SohrKhai() :
-    InstanceContentScript( 44 )
+    Sapphire::ScriptAPI::InstanceContentScript( 44 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheAery.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAery :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAery() :
-    InstanceContentScript( 39 )
+    Sapphire::ScriptAPI::InstanceContentScript( 39 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAetherochemicalResearchFacility :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAetherochemicalResearchFacility() :
-    InstanceContentScript( 38 )
+    Sapphire::ScriptAPI::InstanceContentScript( 38 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheAntitower.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAntitower :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAntitower() :
-    InstanceContentScript( 43 )
+    Sapphire::ScriptAPI::InstanceContentScript( 43 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheAurumVale.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheAurumVale :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheAurumVale() :
-    InstanceContentScript( 5 )
+    Sapphire::ScriptAPI::InstanceContentScript( 5 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheDrownedCityofSkalla :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheDrownedCityofSkalla() :
-    InstanceContentScript( 58 )
+    Sapphire::ScriptAPI::InstanceContentScript( 58 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheDuskVigil :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheDuskVigil() :
-    InstanceContentScript( 36 )
+    Sapphire::ScriptAPI::InstanceContentScript( 36 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFractalContinuum :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFractalContinuum() :
-    InstanceContentScript( 35 )
+    Sapphire::ScriptAPI::InstanceContentScript( 35 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheFractalContinuumHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheFractalContinuumHard() :
-    InstanceContentScript( 60 )
+    Sapphire::ScriptAPI::InstanceContentScript( 60 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheGreatGubalLibrary :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheGreatGubalLibrary() :
-    InstanceContentScript( 31 )
+    Sapphire::ScriptAPI::InstanceContentScript( 31 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheGreatGubalLibraryHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheGreatGubalLibraryHard() :
-    InstanceContentScript( 47 )
+    Sapphire::ScriptAPI::InstanceContentScript( 47 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheKeeperoftheLake :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheKeeperoftheLake() :
-    InstanceContentScript( 32 )
+    Sapphire::ScriptAPI::InstanceContentScript( 32 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLostCityofAmdapor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLostCityofAmdapor() :
-    InstanceContentScript( 22 )
+    Sapphire::ScriptAPI::InstanceContentScript( 22 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheLostCityofAmdaporHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheLostCityofAmdaporHard() :
-    InstanceContentScript( 42 )
+    Sapphire::ScriptAPI::InstanceContentScript( 42 )
   {
   }
 

src/servers/Scripts/instances/dungeons/ThePraetorium.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class ThePraetorium :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   ThePraetorium() :
-    InstanceContentScript( 16 )
+    Sapphire::ScriptAPI::InstanceContentScript( 16 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSirensongSea :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSirensongSea() :
-    InstanceContentScript( 52 )
+    Sapphire::ScriptAPI::InstanceContentScript( 52 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStoneVigil :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStoneVigil() :
-    InstanceContentScript( 11 )
+    Sapphire::ScriptAPI::InstanceContentScript( 11 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheStoneVigilHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheStoneVigilHard() :
-    InstanceContentScript( 25 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSunkenTempleofQarn :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSunkenTempleofQarn() :
-    InstanceContentScript( 9 )
+    Sapphire::ScriptAPI::InstanceContentScript( 9 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheSunkenTempleofQarnHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheSunkenTempleofQarnHard() :
-    InstanceContentScript( 26 )
+    Sapphire::ScriptAPI::InstanceContentScript( 26 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTamTaraDeepcroft :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTamTaraDeepcroft() :
-    InstanceContentScript( 2 )
+    Sapphire::ScriptAPI::InstanceContentScript( 2 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTamTaraDeepcroftHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTamTaraDeepcroftHard() :
-    InstanceContentScript( 24 )
+    Sapphire::ScriptAPI::InstanceContentScript( 24 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheTempleoftheFist :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheTempleoftheFist() :
-    InstanceContentScript( 51 )
+    Sapphire::ScriptAPI::InstanceContentScript( 51 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheThousandMawsofTotoRak :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheThousandMawsofTotoRak() :
-    InstanceContentScript( 1 )
+    Sapphire::ScriptAPI::InstanceContentScript( 1 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheVault.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheVault :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheVault() :
-    InstanceContentScript( 34 )
+    Sapphire::ScriptAPI::InstanceContentScript( 34 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWanderersPalace :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWanderersPalace() :
-    InstanceContentScript( 10 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10 )
   {
   }
 

src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheWanderersPalaceHard :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheWanderersPalaceHard() :
-    InstanceContentScript( 30 )
+    Sapphire::ScriptAPI::InstanceContentScript( 30 )
   {
   }
 

src/servers/Scripts/instances/dungeons/Xelphatol.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class Xelphatol :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   Xelphatol() :
-    InstanceContentScript( 46 )
+    Sapphire::ScriptAPI::InstanceContentScript( 46 )
   {
   }
 

src/servers/Scripts/instances/events/TheHauntedManor.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheHauntedManor :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheHauntedManor() :
-    InstanceContentScript( 25001 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25001 )
   {
   }
 

src/servers/Scripts/instances/events/TheValentionesCeremony.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class TheValentionesCeremony :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   TheValentionesCeremony() :
-    InstanceContentScript( 25002 )
+    Sapphire::ScriptAPI::InstanceContentScript( 25002 )
   {
   }
 

src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp

@@ -4,11 +4,11 @@
 using namespace Core;
 
 class AllsWellthatEndsintheWell :
-  public InstanceContentScript
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
   AllsWellthatEndsintheWell() :
-    InstanceContentScript( 10007 )
+    Sapphire::ScriptAPI::InstanceContentScript( 10007 )
   {
   }