Merge branch 'develop' into action_rewrite

cmake/FindMySQL.cmake

@@ -82,6 +82,7 @@ find_path(MYSQL_INCLUDE_DIR
     /usr/local/mysql/include
     "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
     "${PROGRAM_FILES_64}/MySQL/include"
+    "${PROGRAM_FILES_64}/MariaDB 10.3/include/mysql"
     "C:/MySQL/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include"
     "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include"
@@ -113,11 +114,13 @@ if( WIN32 )
   find_library( MYSQL_LIBRARY
     NAMES
       libmysql
+      libmariadb
     PATHS
       ${MYSQL_ADD_LIBRARIES_PATH}
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
       "${PROGRAM_FILES_64}/MySQL/lib"
+      "${PROGRAM_FILES_64}/MariaDB 10.3/lib"
       "C:/MySQL/lib/debug"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt"
@@ -170,6 +173,7 @@ if( WIN32 )
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
         "${PROGRAM_FILES_64}/MySQL/bin"
+        "${PROGRAM_FILES_64}/MariaDB 10.3/bin"
         "C:/MySQL/bin/debug"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"

src/scripts/CMakeLists.txt

@@ -32,12 +32,12 @@ foreach(_scriptDir ${children})
 
             if(NOT ${_scriptname} MATCHES "ScriptLoader")
                 if(ScriptIncludes)
-                    set(ScriptIncludes "${ScriptIncludes}\n#include \"${_script}\"")
+                    set(ScriptIncludes "${ScriptIncludes}\nextern Sapphire::ScriptAPI::ScriptObject* makeScript${_scriptname}();")
                 else()
-                    set(ScriptIncludes "#include \"${_script}\"")
+                    set(ScriptIncludes "extern Sapphire::ScriptAPI::ScriptObject* makeScript${_scriptname}();")
                 endif()
 
-                set(ScriptNames "${ScriptNames}   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ${_scriptname} ),\n")
+                set(ScriptNames "${ScriptNames}   makeScript${_scriptname}(),\n")
             endif()
         endforeach()
 

src/scripts/ScriptObject.h

@@ -6,4 +6,6 @@
 
 #include <Event/EventDefs.h>
 
+#define EXPOSE_SCRIPT( className ) Sapphire::ScriptAPI::ScriptObject* makeScript##className() { return new className; }
+
 #endif //SAPPHIRE_SCRIPTOBJECT_H

src/scripts/action/common/ActionReturn6.cpp

@@ -20,3 +20,5 @@ public:
     currentAction.getSourceChara()->getAsPlayer()->returnToHomepoint();
   }
 };
+
+EXPOSE_SCRIPT( ActionReturn6 );

src/scripts/action/common/ActionSprint3.cpp

@@ -21,3 +21,5 @@ public:
     sourceChara->getAsPlayer()->addStatusEffectByIdIfNotExist( 50, 20000, *sourceChara, 30 );
   }
 };
+
+EXPOSE_SCRIPT( ActionSprint3 );

src/scripts/common/CmnDefCutSceneReplay.cpp

@@ -40,3 +40,6 @@ public:
     Scene00000( player );
   }
 };
+
+
+EXPOSE_SCRIPT( CmnDefCutSceneReplay );

src/scripts/common/CmnDefInnBed.cpp

@@ -60,3 +60,5 @@ public:
     Scene00100( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefInnBed );

src/scripts/common/CmnDefLinkShell.cpp

@@ -62,3 +62,5 @@ public:
     Scene00001( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefLinkShell );

src/scripts/common/CmnDefMarketBoardGridania.cpp

@@ -22,3 +22,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefMarketBoardGridania );

src/scripts/common/CmnDefMogLetter.cpp

@@ -25,3 +25,5 @@ public:
                       } );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefMogLetter );

src/scripts/common/CmnDefNpcRepair.cpp

@@ -22,3 +22,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefNpcRepair );

src/scripts/common/CmnDefWeatherForeCast.cpp

@@ -25,3 +25,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefWeatherForeCast );

src/scripts/common/ComDefMobHuntBoard.cpp

@@ -22,3 +22,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( ComDefMobHuntBoard );

src/scripts/common/GilShop.cpp

@@ -56,3 +56,5 @@ private:
     player.playGilShop( result.eventId, SCENE_FLAGS, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
   }
 };
+
+EXPOSE_SCRIPT( GilShop );

src/scripts/common/HouFurOrchestrion.cpp

@@ -22,3 +22,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( HouFurOrchestrion );

src/scripts/common/aethernet/Aetheryte.cpp

@@ -122,3 +122,5 @@ public:
       aethernet( eventId, player, actorId );
   }
 };
+
+EXPOSE_SCRIPT( Aetheryte );

src/scripts/common/aethernet/HousingAethernet.cpp

@@ -40,3 +40,5 @@ public:
     } );
   }
 };
+
+EXPOSE_SCRIPT( HousingAethernet );

src/scripts/common/eobj/HousingEstateEntrance.cpp

@@ -83,3 +83,5 @@ public:
     } );
   }
 };
+
+EXPOSE_SCRIPT( HousingEstateEntrance );

src/scripts/common/housing/CmnDefHousingPersonalRoomEntrance.cpp

@@ -19,3 +19,5 @@ public:
     } );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefHousingPersonalRoomEntrance );

src/scripts/common/housing/CmnDefHousingSignboard.cpp

@@ -91,3 +91,5 @@ public:
     Scene00000( player );
   }
 };
+
+EXPOSE_SCRIPT( CmnDefHousingSignboard );

src/scripts/common/warptaxi/HousingWarpTaxiExitEstate.cpp

@@ -23,3 +23,5 @@ public:
     } );
   }
 };
+
+EXPOSE_SCRIPT( HousingWarpTaxiExitEstate );

src/scripts/common/warptaxi/WarpTaxi.cpp

@@ -66,3 +66,5 @@ public:
     player.playScene( warp->conditionSuccessEvent, 0, HIDE_HOTBAR, 0, 0, 7, nullptr );
   }
 };
+
+EXPOSE_SCRIPT( WarpTaxi );

src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors110 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors110() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7394359, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors110 );

src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors1120 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors1120() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7394576, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors1120 );

src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors2130 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors2130() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7385164, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors2130 );

src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors3140 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors3140() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7385164, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors3140 );

src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors4150 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors4150() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7376353, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors4150 );

src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors5160 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors5160() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60026 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7376353, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors5160 );

src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors6170 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors6170() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60027 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7375355, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors6170 );

src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors7180 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors7180() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60028 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7375355, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors7180 );

src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors8190 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors8190() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60029 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7359374, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors8190 );

src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp

@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors91100 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors91100() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60030 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7359374, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors91100 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp

@@ -9,29 +9,28 @@ class ThePalaceoftheDeadFloors101110 :
 public:
   ThePalaceoftheDeadFloors101110() :
     Sapphire::ScriptAPI::InstanceContentScript( 60011 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors101110 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors110 :
 public:
   ThePalaceoftheDeadFloors110() :
     Sapphire::ScriptAPI::InstanceContentScript( 60001 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors110 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors111120 :
 public:
   ThePalaceoftheDeadFloors111120() :
     Sapphire::ScriptAPI::InstanceContentScript( 60012 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors111120 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors1120 :
 public:
   ThePalaceoftheDeadFloors1120() :
     Sapphire::ScriptAPI::InstanceContentScript( 60002 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors1120 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors121130 :
 public:
   ThePalaceoftheDeadFloors121130() :
     Sapphire::ScriptAPI::InstanceContentScript( 60013 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors121130 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors131140 :
 public:
   ThePalaceoftheDeadFloors131140() :
     Sapphire::ScriptAPI::InstanceContentScript( 60014 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors131140 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors141150 :
 public:
   ThePalaceoftheDeadFloors141150() :
     Sapphire::ScriptAPI::InstanceContentScript( 60015 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors141150 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors151160 :
 public:
   ThePalaceoftheDeadFloors151160() :
     Sapphire::ScriptAPI::InstanceContentScript( 60016 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors151160 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors161170 :
 public:
   ThePalaceoftheDeadFloors161170() :
     Sapphire::ScriptAPI::InstanceContentScript( 60017 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors161170 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors171180 :
 public:
   ThePalaceoftheDeadFloors171180() :
     Sapphire::ScriptAPI::InstanceContentScript( 60018 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors171180 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors181190 :
 public:
   ThePalaceoftheDeadFloors181190() :
     Sapphire::ScriptAPI::InstanceContentScript( 60019 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors181190 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors191200 :
 public:
   ThePalaceoftheDeadFloors191200() :
     Sapphire::ScriptAPI::InstanceContentScript( 60020 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors191200 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors2130 :
 public:
   ThePalaceoftheDeadFloors2130() :
     Sapphire::ScriptAPI::InstanceContentScript( 60003 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors2130 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp

@@ -9,41 +9,34 @@ class ThePalaceoftheDeadFloors3140 :
 public:
   ThePalaceoftheDeadFloors3140() :
     Sapphire::ScriptAPI::InstanceContentScript( 60004 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f,
+    instance.registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f,
+    instance.registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors3140 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp

@@ -9,41 +9,34 @@ class ThePalaceoftheDeadFloors4150 :
 public:
   ThePalaceoftheDeadFloors4150() :
     Sapphire::ScriptAPI::InstanceContentScript( 60005 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f,
+    instance.registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f,
+    instance.registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors4150 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors5160 :
 public:
   ThePalaceoftheDeadFloors5160() :
     Sapphire::ScriptAPI::InstanceContentScript( 60006 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors5160 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors6170 :
 public:
   ThePalaceoftheDeadFloors6170() :
     Sapphire::ScriptAPI::InstanceContentScript( 60007 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors6170 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp

@@ -9,26 +9,26 @@ class ThePalaceoftheDeadFloors7180 :
 public:
   ThePalaceoftheDeadFloors7180() :
     Sapphire::ScriptAPI::InstanceContentScript( 60008 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors7180 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp

@@ -9,29 +9,28 @@ class ThePalaceoftheDeadFloors8190 :
 public:
   ThePalaceoftheDeadFloors8190() :
     Sapphire::ScriptAPI::InstanceContentScript( 60009 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors8190 );

src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp

@@ -9,29 +9,28 @@ class ThePalaceoftheDeadFloors91100 :
 public:
   ThePalaceoftheDeadFloors91100() :
     Sapphire::ScriptAPI::InstanceContentScript( 60010 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ThePalaceoftheDeadFloors91100 );

src/scripts/instances/dungeons/AlaMhigo.cpp

@@ -9,23 +9,61 @@ class AlaMhigo :
 public:
   AlaMhigo() :
     Sapphire::ScriptAPI::InstanceContentScript( 56 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_1", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f, 0.000048f ); 
+    // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( AlaMhigo );

src/scripts/instances/dungeons/AmdaporKeep.cpp

@@ -9,225 +9,147 @@ class AmdaporKeep :
 public:
   AmdaporKeep() :
     Sapphire::ScriptAPI::InstanceContentScript( 14 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-    // States -> on off vfx_on
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f, 0.000000f ); 
-    // States -> on off vfx_on
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-    // States -> on off vfx_on
+    instance.registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f },
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f, 0.000000f ); 
-    // States -> on off vfx_on
+    instance.registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f,
+    // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f, 0.000000f ); 
-    // States -> vf_lock_on vf_lock_of
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    instance->registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    // States -> vf_htras1_on vf_htras1_of
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f },
+    instance.registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f },
+    instance.registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f,
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f,
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f,
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f, 0.000048f ); 
-    // States -> vf_baria1_off vf_baria_on
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
-    // States -> on off vfx_on
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f },
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-    // States -> on off vfx_on
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f },
+    // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f, 0.000000f ); 
-    // States -> on off vfx_on
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> on off vfx_on
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f, -1.570451f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> on off vfx_on
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> on off vfx_on
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f },
+    instance.registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f, 0.000048f ); 
-    // States -> on off vfx_on
+    instance.registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f },
+    instance.registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f, 0.000048f ); 
-    // States -> on off vfx_on
+    instance.registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f },
+    instance.registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f, 0.000048f ); 
-    // States -> on off vfx_on
+    instance.registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f },
-                            1.000000f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f },
-                            0.991760f, 0.000048f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( AmdaporKeep );

src/scripts/instances/dungeons/AmdaporKeepHard.cpp

@@ -9,89 +9,64 @@ class AmdaporKeepHard :
 public:
   AmdaporKeepHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 29 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d7_a4_scy01", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d7_a4_scy01", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f },
+    instance.registerEObj( "unknown_1", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_2", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d7_a1_evl01", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f }, 1.000000f, -0.000000f ); 
-                            0.000000f );
+    // States -> evils_def (id: 17) evils_off_anim (id: 22) evils_on (id: 23) evils_on_anim (id: 24) 
-    instance->registerEObj( "unknown_2", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f,
+    instance.registerEObj( "sgvf_f1d7_b0574", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
-    instance->registerEObj( "sgbg_f1d7_a1_evl01", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f },
+    instance.registerEObj( "unknown_3", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f, 0.000000f ); 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "unknown_4", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f, 0.005971f ); 
-    // States -> evils_def evils_off_anim evils_on evils_on_anim
+    instance.registerEObj( "unknown_5", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_f1d7_b0574", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f,
+    instance.registerEObj( "unknown_6", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgbg_f1d7_a1_evl01_1", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f }, 1.000000f, 0.000000f ); 
-    // States -> vf_baria1_off vf_baria_on
+    // States -> evils_def (id: 17) evils_off_anim (id: 22) evils_on (id: 23) evils_on_anim (id: 24) 
-    instance->registerEObj( "unknown_3", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "unknown_4", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f,
+    instance.registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f, 0.000000f ); 
-                            0.005971f );
+    instance.registerEObj( "Aetherialflow_1", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "unknown_5", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_7", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_6", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f,
+    instance.registerEObj( "unknown_8", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_9", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d7_a1_evl01_1", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> evils_def evils_off_anim evils_on evils_on_anim
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            -0.000000f );
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f,
+    instance.registerEObj( "sgpl_f1d7_a1_gar0", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f }, 1.000000f, 0.785314f ); 
-                            0.000000f );
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_1", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f }, 1.000000f, 0.785457f ); 
-    instance->registerEObj( "Aetherialflow_1", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f,
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_2", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f }, 1.000000f, -0.785410f ); 
-                            -0.000000f );
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_3", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f }, 1.000000f, -0.785398f ); 
-    instance->registerEObj( "unknown_7", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f }, 1.000000f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_8", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f }, 1.000000f, -0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_9", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f,
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f, -0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f },
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_10", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f },
-                            1.000000f, 0.785314f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_1", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f },
-                            1.000000f, 0.785457f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_2", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f },
-                            1.000000f, -0.785410f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_3", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f },
-                            1.000000f, -0.785398f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f },
-                            1.000000f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_11", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( AmdaporKeepHard );

src/scripts/instances/dungeons/BaelsarsWall.cpp

@@ -9,79 +9,56 @@ class BaelsarsWall :
 public:
   BaelsarsWall() :
     Sapphire::ScriptAPI::InstanceContentScript( 48 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f, -1.570451f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f }, 1.000000f, -1.570451f ); 
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            -1.570451f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, -1.570451f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f }, 1.000000f, -0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f },
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f, -1.570451f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f },
+    instance.registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f, 0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f,
+    instance.registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f }, 1.000000f, 0.000000f ); 
-                            -1.570451f );
+    instance.registerEObj( "unknown_3", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f,
+    instance.registerEObj( "Imperialidentificationkey_1", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Securityterminal_1", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_4", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f,
+    instance.registerEObj( "unknown_5", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f, 0.000048f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Controlpanel_1", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f },
+    instance.registerEObj( "Controlpanel_2", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_6", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f },
+    instance.registerEObj( "Imperialidentificationkey_2", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Securityterminal_2", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f,
+    instance.registerEObj( "unknown_7", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_8", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Imperialidentificationkey_1", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Securityterminal_1", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f,
-                            0.000048f );
-    instance->registerEObj( "Controlpanel_1", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Controlpanel_2", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey_2", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Securityterminal_2", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_7", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( BaelsarsWall );

src/scripts/instances/dungeons/BardamsMettle.cpp

@@ -9,23 +9,54 @@ class BardamsMettle :
 public:
   BardamsMettle() :
     Sapphire::ScriptAPI::InstanceContentScript( 53 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent04", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3d2_d2_mete1", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f, -0.000000f ); 
+    // States -> b4_mete_off_01 (id: 1) b4_mete_off_02 (id: 2) b4_mete_on_01 (id: 3) b4_mete_off_03 (id: 4) b4_mete_on_02 (id: 5) b4_mete_on_03 (id: 6) b4_mete_on_04 (id: 7) b4_mete_on_05 (id: 8) b4_mete_on_06 (id: 9) b4_mete_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( BardamsMettle );

src/scripts/instances/dungeons/BrayfloxsLongstop.cpp

@@ -9,59 +9,47 @@ class BrayfloxsLongstop :
 public:
   BrayfloxsLongstop() :
     Sapphire::ScriptAPI::InstanceContentScript( 8 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f,
+    instance.registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f,
+    instance.registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f },
+    instance.registerEObj( "unknown_2", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f, 0.214809f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_3", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f, -0.788830f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_4", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f, -0.043989f ); 
-    instance->registerEObj( "unknown_2", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f, 0.214809f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_5", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f, -1.318638f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f, -0.788830f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f },
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f,
-                            -0.043989f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f,
-                            -1.318638f );
-    instance->registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f, 0.000048f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( BrayfloxsLongstop );

src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp

@@ -9,70 +9,53 @@ class BrayfloxsLongstopHard :
 public:
   BrayfloxsLongstopHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f,
+    instance.registerEObj( "unknown_0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f,
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_1", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f,
+    instance.registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f }, 0.991760f, 0.000048f ); 
-    // States -> vf_lock_on vf_lock_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_1", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f, 0.000000f ); 
-    instance->registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_3", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f },
+    instance.registerEObj( "unknown_4", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_5", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_6", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f, 0.000000f );
+    instance.registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f, -0.000527f ); 
-    instance->registerEObj( "unknown_3", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f, -0.532325f ); 
-    instance->registerEObj( "unknown_4", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_5", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f,
+    instance.registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f,
+    instance.registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "SwiftmakeCheckgate_1", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f,
+    instance.registerEObj( "SwiftmakeCheckgate_2", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f }, 0.991760f, 0.000048f ); 
-                            -0.000527f );
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_7", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f,
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f, -1.497719f ); 
-                            -0.532325f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "SwiftmakeCheckgate_1", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "SwiftmakeCheckgate_2", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_8", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f,
-                            -1.497719f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( BrayfloxsLongstopHard );

src/scripts/instances/dungeons/CastrumAbania.cpp

@@ -9,23 +9,86 @@ class CastrumAbania :
 public:
   CastrumAbania() :
     Sapphire::ScriptAPI::InstanceContentScript( 55 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 277.157013f, 20.000000f, -7.932621f }, 1.000000f, 0.305963f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6841714, 4, { 276.710388f, 20.000000f, -6.315289f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 286.855713f, 20.000000f, -43.546181f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6777074, 4, { 281.592285f, 20.000000f, -45.737782f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6828612, 5, { -406.401794f, -17.924580f, 314.141907f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -414.573212f, -18.000120f, 306.364807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2008027, 6738153, 4, { -362.172913f, -10.025270f, 237.292999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2008029, 6739981, 4, { -291.220795f, -6.000043f, 108.329102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2008030, 6739980, 4, { -298.753113f, -6.000044f, 108.051498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008031, 6739979, 4, { -305.840515f, -6.000044f, 107.763603f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008032, 6739982, 4, { -281.123505f, -6.000060f, 118.299301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008033, 6739984, 4, { -280.565704f, -6.000067f, 125.491203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2008034, 6739983, 4, { -280.552185f, -6.000068f, 132.687302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008035, 6869663, 4, { -273.854889f, -6.000038f, 100.620499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008036, 6740009, 4, { -213.504593f, -6.129103f, 82.266739f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2008037, 6740016, 4, { -213.045807f, -1.999959f, 131.946198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008038, 6914793, 4, { -179.395294f, 2.138688f, 279.671387f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2008041, 6752603, 4, { -167.801697f, 2.138688f, 273.763214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2008042, 6752604, 4, { -167.091507f, 2.138688f, 278.924805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2008043, 6752601, 4, { -180.179504f, 2.138688f, 292.024200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008044, 6752602, 4, { -184.772797f, 2.138688f, 291.367188f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2008047, 6752608, 4, { -166.154602f, 2.000032f, 293.249298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2008039, 6914794, 4, { -101.486900f, 6.138662f, 311.254791f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2008050, 6752644, 4, { -81.520500f, 6.000006f, 290.652313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2008051, 6752643, 4, { -81.142883f, 6.000006f, 332.866211f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2008048, 6752633, 4, { -80.650719f, 6.138662f, 311.338989f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2008040, 6914795, 4, { -22.122820f, 10.138660f, 278.146912f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2008045, 6752689, 4, { -27.394449f, 10.138660f, 265.483795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2008046, 6752679, 4, { -16.694490f, 10.138650f, 265.926208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2008070, 6752690, 4, { -9.852131f, 10.138650f, 272.919403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2008089, 6752691, 4, { -9.914229f, 10.138650f, 283.758392f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2008052, 6752695, 4, { -21.991831f, 9.999999f, 250.500702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2008053, 6752694, 4, { 5.133811f, 9.999997f, 278.283295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2008049, 6752681, 4, { -8.415267f, 9.999998f, 264.128204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2008320, 6869673, 4, { -84.465187f, 6.000006f, 311.371613f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2008054, 6785102, 4, { 22.499630f, 14.184900f, 175.166702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2008056, 6741815, 4, { 110.871597f, 26.000059f, 144.405807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2008055, 6698733, 4, { 178.971298f, 20.000139f, 81.701027f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2008057, 6717638, 4, { 154.867996f, 20.000160f, 106.733902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2008058, 6717639, 4, { 165.172699f, 20.000019f, 86.256683f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2008059, 6717640, 4, { 195.091507f, 20.000170f, 51.864651f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2008060, 6717641, 4, { 200.323502f, 20.000179f, 46.925930f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2008061, 6717642, 4, { 203.790298f, 20.000200f, 59.565971f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2008062, 6717643, 4, { 209.140793f, 20.000191f, 54.901482f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2008063, 6772873, 4, { 172.971100f, 20.100290f, 82.304329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_41", 2008064, 6773603, 4, { 267.862396f, 20.100000f, 30.848459f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2008455, 6790661, 4, { 294.476715f, 20.000000f, -39.619999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2008527, 6914797, 4, { 21.803070f, 14.184900f, 182.260696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6842146, 4, { 205.204193f, 20.000271f, 41.332821f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6842148, 4, { 214.202393f, 20.000271f, 49.597000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2002735, 0, 4, { -212.960007f, -2.000000f, 167.038193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6841858, 4, { -212.643799f, -2.000000f, 164.712097f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2008071, 6841865, 4, { -212.474792f, -1.815126f, 204.927307f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6841875, 4, { 10.483370f, 14.000030f, 208.476395f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_47", 2002735, 0, 4, { 10.447360f, 14.000030f, 206.708298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2008072, 6841959, 4, { 28.276699f, 14.184900f, 186.737000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( CastrumAbania );

src/scripts/instances/dungeons/CastrumMeridianum.cpp

@@ -9,146 +9,94 @@ class CastrumMeridianum :
 public:
   CastrumMeridianum() :
     Sapphire::ScriptAPI::InstanceContentScript( 15 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f },
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406840f ); 
-    instance->registerEObj( "unknown_0", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f,
+    instance.registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f, -0.605074f ); 
-                            1.406840f );
+    instance.registerEObj( "Magitekmissile_1", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f, -0.849513f ); 
-    instance->registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f,
+    instance.registerEObj( "unknown_1", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406839f ); 
-                            -0.605074f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Magitekmissile_1", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            -0.849513f );
+    instance.registerEObj( "unknown_2", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f,
+    instance.registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f }, 1.000000f, 0.000000f ); 
-                            1.406839f );
+    instance.registerEObj( "unknown_3", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f, 1.543478f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Imperialidentificationkey_1", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f,
+    instance.registerEObj( "unknown_4", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f, -0.213036f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f }, 1.000000f, 1.045186f ); 
-    instance->registerEObj( "unknown_3", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f, 1.543478f );
+    // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f },
+    instance.registerEObj( "sgbg_w_emp_015_01a", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Imperialidentificationkey_1", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f },
+    instance.registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f, 1.191010f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_5", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f, -0.213036f );
+    instance.registerEObj( "unknown_6", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f },
+    instance.registerEObj( "Searchlightterminal_1", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f }, 1.000000f, 1.466079f ); 
-                            1.000000f, 0.000000f );
+    // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_7", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f },
+    instance.registerEObj( "Searchlightterminal_2", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 1.045186f );
+    instance.registerEObj( "unknown_8", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f, 0.000000f ); 
-    // States -> blue_on red_on white_on
+    instance.registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_w_emp_015_01a", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f },
+    instance.registerEObj( "unknown_9", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_10", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f, 0.000000f ); 
-    // States -> blue_on red_on light_off
+    instance.registerEObj( "Unstablepaneling_1", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_11", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f,
+    instance.registerEObj( "unknown_12", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f, 0.000000f ); 
-                            1.191010f );
+    instance.registerEObj( "unknown_13", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f,
+    instance.registerEObj( "unknown_14", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f,
+    instance.registerEObj( "Incendiary#37_1", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_15", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Searchlightterminal_1", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f },
+    instance.registerEObj( "unknown_16", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 1.466079f );
+    instance.registerEObj( "unknown_17", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f, 0.000000f ); 
-    // States -> blue_on red_on white_on
+    instance.registerEObj( "unknown_18", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f,
+    instance.registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f, 0.261981f ); 
-                            0.000000f );
+    instance.registerEObj( "Magitekterminal_1", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f, 0.271375f ); 
-    instance->registerEObj( "Searchlightterminal_2", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f },
+    instance.registerEObj( "unknown_19", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_20", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_8", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f,
+    instance.registerEObj( "Searchlightterminal_3", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f }, 0.991760f, 0.795709f ); 
-                            0.000000f );
+    // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
-    instance->registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f,
+    instance.registerEObj( "sgbg_w_emp_015_01a_1", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
-    instance->registerEObj( "unknown_9", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f,
+    instance.registerEObj( "unknown_21", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_22", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f,
+    instance.registerEObj( "unknown_23", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f }, 0.991760f, 1.356260f ); 
-    instance->registerEObj( "Unstablepaneling_1", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f },
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon_1", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f }, 0.991760f, 0.891590f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon_2", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f }, 0.991760f, 1.490808f ); 
-    instance->registerEObj( "unknown_11", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f,
+    instance.registerEObj( "unknown_24", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_25", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_12", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f,
+    instance.registerEObj( "Searchlightterminal_4", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f }, 0.991760f, 1.557559f ); 
-                            0.000000f );
+    // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
-    instance->registerEObj( "unknown_13", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f,
+    instance.registerEObj( "Searchlightterminal_5", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
-    instance->registerEObj( "unknown_14", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f,
+    instance.registerEObj( "sgbg_w_emp_015_01a_2", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
-    instance->registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f,
+    instance.registerEObj( "Entrance", 2000562, 4247977, 5, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "Incendiary#37_1", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f,
+    instance.registerEObj( "unknown_26", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_15", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f,
-                            0.261981f );
-    instance->registerEObj( "Magitekterminal_1", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f,
-                            0.271375f );
-    instance->registerEObj( "unknown_19", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_3", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f },
-                            0.991760f, 0.795709f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "sgbg_w_emp_015_01a_1", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f },
-                            1.000000f, 0.000000f );
-    // States -> blue_on red_on light_off
-    instance->registerEObj( "unknown_21", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f },
-                            0.991760f, 1.356260f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon_1", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f },
-                            0.991760f, 0.891590f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon_2", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f },
-                            0.991760f, 1.490808f );
-    instance->registerEObj( "unknown_24", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_4", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f },
-                            0.991760f, 1.557559f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "Searchlightterminal_5", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f },
-                            0.991760f, 0.000048f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "sgbg_w_emp_015_01a_2", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f },
-                            1.000000f, 0.000000f );
-    // States -> blue_on red_on light_off
-    instance->registerEObj( "Entrance", 2000562, 4247977, 5, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_26", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( CastrumMeridianum );

src/scripts/instances/dungeons/CopperbellMines.cpp

@@ -9,123 +9,78 @@ class CopperbellMines :
 public:
   CopperbellMines() :
     Sapphire::ScriptAPI::InstanceContentScript( 3 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_1", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_2", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f },
+    instance.registerEObj( "unknown_3", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_4", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f,
+    instance.registerEObj( "unknown_5", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f,
+    instance.registerEObj( "unknown_6", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_4", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f,
+    instance.registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_7", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f },
+    instance.registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Liftlever_1", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f, 1.570451f ); 
-    instance->registerEObj( "unknown_5", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f,
+    instance.registerEObj( "unknown_8", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "unknown_6", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f,
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_9", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f,
+    instance.registerEObj( "unknown_10", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f },
+    instance.registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Firesand_1", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f, 0.901467f ); 
-    instance->registerEObj( "unknown_7", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f,
+    instance.registerEObj( "Sealedblastingdoor_1", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Liftlever_2", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f,
+    instance.registerEObj( "Liftlever_3", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Liftlever_4", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f, -1.570451f ); 
-    instance->registerEObj( "Liftlever_1", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f,
+    instance.registerEObj( "Liftlever_5", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f, 0.000048f ); 
-                            1.570451f );
+    instance.registerEObj( "Tinykey_1", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_8", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f,
+    instance.registerEObj( "unknown_11", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_13", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f, 0.000048f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_14", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f,
+    instance.registerEObj( "Liftlever_6", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Liftlever_7", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_9", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f,
+    instance.registerEObj( "Firesand_2", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Blastingdevice_1", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_10", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f,
+    instance.registerEObj( "Firesand_3", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Firesand_4", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f,
+    instance.registerEObj( "Firesand_5", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f, -1.263692f ); 
-                            0.000048f );
+    instance.registerEObj( "Blastingdevice_2", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f,
+    instance.registerEObj( "unknown_15", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Powderchamber_1", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Firesand_1", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f,
+    instance.registerEObj( "Powderchamber_2", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f, 0.000048f ); 
-                            0.901467f );
+    instance.registerEObj( "unknown_16", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Sealedblastingdoor_1", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f },
+    instance.registerEObj( "unknown_17", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_18", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "Liftlever_2", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever_3", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Liftlever_4", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "Liftlever_5", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Tinykey_1", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_11", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever_6", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_7", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Firesand_2", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Blastingdevice_1", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Firesand_3", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Firesand_4", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Firesand_5", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f,
-                            -1.263692f );
-    instance->registerEObj( "Blastingdevice_2", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_15", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Powderchamber_1", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Powderchamber_2", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f,
-                            0.000048f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( CopperbellMines );

src/scripts/instances/dungeons/CopperbellMinesHard.cpp

@@ -9,108 +9,70 @@ class CopperbellMinesHard :
 public:
   CopperbellMinesHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 18 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Crystallizedrock_1", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f, -0.745382f ); 
-    instance->registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f,
+    instance.registerEObj( "Crystallizedrock_2", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f, 1.004150f ); 
-                            0.000000f );
+    instance.registerEObj( "Crystallizedrock_3", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f, 0.098224f ); 
-    instance->registerEObj( "Crystallizedrock_1", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f,
+    instance.registerEObj( "Crystallizedrock_4", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f, 0.000048f ); 
-                            -0.745382f );
+    instance.registerEObj( "Crystallizedrock_5", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f, 0.703581f ); 
-    instance->registerEObj( "Crystallizedrock_2", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f,
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f, -1.570451f ); 
-                            1.004150f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Crystallizedrock_3", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.098224f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Crystallizedrock_4", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000048f );
+    instance.registerEObj( "unknown_2", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Crystallizedrock_5", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f,
+    instance.registerEObj( "unknown_3", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f, 0.000000f ); 
-                            0.703581f );
+    instance.registerEObj( "unknown_4", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f,
+    instance.registerEObj( "unknown_5", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f, 0.000000f ); 
-                            -1.570451f );
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f, -1.554668f ); 
-    instance->registerEObj( "unknown_2", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f,
+    instance.registerEObj( "Liftlever_1", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f, 1.545402f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_7", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f,
+    instance.registerEObj( "unknown_8", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Liftlever_2", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f,
+    instance.registerEObj( "Liftlever_3", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_9", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f,
+    instance.registerEObj( "unknown_10", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_11", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f, 0.000000f ); 
-                            -0.000000f );
+    instance.registerEObj( "unknown_13", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f },
+    instance.registerEObj( "unknown_14", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_15", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_16", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f },
+    instance.registerEObj( "unknown_17", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_18", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f },
+    instance.registerEObj( "unknown_19", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f,
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
-                            -1.554668f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Liftlever_1", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f,
+    instance.registerEObj( "unknown_20", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f, 0.000000f ); 
-                            1.545402f );
-    instance->registerEObj( "unknown_7", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_2", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_3", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_20", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( CopperbellMinesHard );

src/scripts/instances/dungeons/CuttersCry.cpp

@@ -9,90 +9,64 @@ class CuttersCry :
 public:
   CuttersCry() :
     Sapphire::ScriptAPI::InstanceContentScript( 12 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f },
+    instance.registerEObj( "sgvf_w_btl_b0221_1", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_2", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_1", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f },
+    instance.registerEObj( "sgvf_w_btl_b0221_3", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_4", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_2", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f },
+    instance.registerEObj( "sgvf_w_btl_b0221_5", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_6", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_3", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f },
+    instance.registerEObj( "sgvf_w_btl_b0221_7", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_8", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_4", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f },
+    instance.registerEObj( "sgvf_w_btl_b0221_9", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_10", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_5", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f },
+    instance.registerEObj( "sgvf_w_btl_b0221_11", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0221_12", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_6", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f },
+    instance.registerEObj( "sgvf_w_btl_b0221_13", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_7", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f },
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_8", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f },
+    instance.registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-    instance->registerEObj( "sgvf_w_btl_b0221_9", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f },
+    instance.registerEObj( "Shiftingsands_1", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-    instance->registerEObj( "sgvf_w_btl_b0221_10", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f },
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_btl_b0221_11", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f },
+    instance.registerEObj( "unknown_1", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shiftingsands_2", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_12", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f },
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shiftingsands_3", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_btl_b0221_13", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f },
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shiftingsands_4", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f,
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f }, 1.000000f, 0.000000f ); 
-    // States -> vf_lock_on vf_lock_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_2", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f,
+    instance.registerEObj( "Shiftingsands_5", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
-    // States -> vf_on disp_on disp_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shiftingsands_1", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000048f );
+    instance.registerEObj( "unknown_3", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f, 0.000000f ); 
-    // States -> vf_on disp_on disp_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shiftingsands_2", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "Shiftingsands_3", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f },
-                            0.991760f, 0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "Shiftingsands_4", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shiftingsands_5", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f },
-                            0.991760f, 0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( CuttersCry );

src/scripts/instances/dungeons/DomaCastle.cpp

@@ -9,23 +9,59 @@ class DomaCastle :
 public:
   DomaCastle() :
     Sapphire::ScriptAPI::InstanceContentScript( 54 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6889640, 4, { -239.375000f, 67.999496f, -175.164597f }, 0.991760f, 1.326264f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2007791, 0, 4, { -240.158905f, 67.039032f, -177.843399f }, 0.750000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 6889642, 4, { -241.910706f, 67.000000f, -215.185699f }, 1.000000f, 1.326214f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 6794570, 4, { 287.722412f, 21.499981f, 115.300598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6739699, 4, { 262.936493f, 21.500010f, 110.142799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6777815, 4, { 261.315491f, 25.500010f, -10.943810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6851198, 4, { 248.248901f, 20.000000f, 78.568604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6928399, 4, { 264.958405f, 24.750000f, 121.939598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6952007, 4, { 285.857391f, 24.500000f, 90.541313f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6973643, 4, { 189.428497f, 36.749840f, 50.824680f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6735489, 4, { 33.135330f, 40.000000f, 88.297363f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6679193, 4, { -183.423004f, 44.000000f, 125.024200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6735529, 4, { -193.153900f, 46.551128f, 128.625107f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6732692, 4, { -240.779297f, 64.000023f, -93.377197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6732698, 4, { -240.802704f, 66.000023f, -140.615494f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6880936, 4, { -243.716507f, 48.000000f, 37.417641f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6739904, 4, { -239.397202f, 45.467159f, 60.631378f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6901296, 4, { -239.515396f, 44.299999f, 93.293831f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6928755, 4, { -243.442398f, 56.000000f, -37.595749f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_2", 2002872, 6889553, 4, { 148.284103f, 41.499981f, 20.913610f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_17", 2007791, 0, 4, { 145.028793f, 40.575001f, 21.644630f }, 1.000000f, -1.335177f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_3", 2007457, 6889570, 4, { 110.384399f, 41.489140f, 13.189620f }, 0.991760f, 0.063599f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_4", 2002872, 6889631, 4, { -222.430801f, 45.500000f, 129.655899f }, 0.991760f, -0.233408f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_18", 2007791, 0, 4, { -219.254501f, 45.500000f, 130.342697f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_5", 2007457, 6889633, 4, { -242.418503f, 45.500000f, 113.102501f }, 1.000000f, -0.233499f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 6881291, 5, { 341.375793f, 13.500000f, 180.479599f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 336.598785f, 16.739140f, 178.515305f }, 0.991760f, 0.158242f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -239.781799f, 67.000000f, -212.105698f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( DomaCastle );

src/scripts/instances/dungeons/DzemaelDarkhold.cpp

@@ -9,187 +9,124 @@ class DzemaelDarkhold :
 public:
   DzemaelDarkhold() :
     Sapphire::ScriptAPI::InstanceContentScript( 13 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f,
+    instance.registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f, -0.706750f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            -0.706750f );
+    instance.registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f },
+    instance.registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f,
+    // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
-                            0.000000f );
+    instance.registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f,
+    // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0173", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f, 0.000000f ); 
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-    instance->registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f },
+    instance.registerEObj( "sgvf_r1r1_b0173_1", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
+    instance.registerEObj( "sgvf_r1r1_b0173_2", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f },
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0173_3", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f }, 1.000000f, 0.000000f ); 
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-    instance->registerEObj( "sgvf_r1r1_b0173", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f,
+    instance.registerEObj( "sgvf_r1r1_b0173_4", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "sgvf_r1r1_b0173_5", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1r1_b0173_1", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f },
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0173_6", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f }, 1.000000f, 0.000000f ); 
-    // States -> vfbright_b_on vfbright_b_off
+    // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
-    instance->registerEObj( "sgvf_r1r1_b0173_2", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f },
+    instance.registerEObj( "unknown_1", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_2", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f, 0.000000f ); 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "unknown_3", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1r1_b0173_3", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f },
+    instance.registerEObj( "unknown_4", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_5", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f, 0.000000f ); 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "unknown_6", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1r1_b0173_4", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f },
+    instance.registerEObj( "unknown_7", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Magitektransporter_1", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f, 0.000000f ); 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "unknown_8", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f, 0.737616f ); 
-    instance->registerEObj( "sgvf_r1r1_b0173_5", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "unknown_9", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1r1_b0173_6", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f },
+    instance.registerEObj( "sgvf_r1r1_b0174", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    // States -> vfbright_b_on vfbright_b_off
+    instance.registerEObj( "sgvf_r1r1_b0174_1", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_2", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_3", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_4", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_5", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_6", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_6", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_7", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f,
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "unknown_10", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Magitektransporter_1", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f,
+    instance.registerEObj( "unknown_11", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_12", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_8", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f,
+    instance.registerEObj( "unknown_13", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f, 0.000000f ); 
-                            0.737616f );
+    instance.registerEObj( "unknown_14", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f },
+    instance.registerEObj( "unknown_15", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_16", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_17", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_9", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_emp_b0021", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_baria_on (id: 1) vf_baria_off (id: 2) 
-    instance->registerEObj( "sgvf_r1r1_b0174", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f },
+    instance.registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
-    // States -> vfbright_o_on vfbright_o_off
+    instance.registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1r1_b0174_1", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f },
+    // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_18", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f, 0.957075f ); 
-    // States -> vfbright_o_on vfbright_o_off
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_r1r1_b0174_2", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_8", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f }, 0.991760f, 0.000048f ); 
-    // States -> vfbright_o_on vfbright_o_off
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    instance->registerEObj( "sgvf_r1r1_b0174_3", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f },
+    instance.registerEObj( "sgvf_r1r1_b0174_9", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    // States -> vfbright_o_on vfbright_o_off
+    instance.registerEObj( "sgvf_r1r1_b0174_10", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_r1r1_b0174_4", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f },
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_11", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f }, 0.991760f, 0.000048f ); 
-    // States -> vfbright_o_on vfbright_o_off
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    instance->registerEObj( "sgvf_r1r1_b0174_5", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f },
+    instance.registerEObj( "sgvf_r1r1_b0174_12", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    // States -> vfbright_o_on vfbright_o_off
+    instance.registerEObj( "sgvf_r1r1_b0174_13", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_r1r1_b0174_6", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f },
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_r1r1_b0174_14", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f }, 0.991760f, 0.000048f ); 
-    // States -> vfbright_o_on vfbright_o_off
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    instance->registerEObj( "sgvf_r1r1_b0174_7", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f },
+    instance.registerEObj( "sgvf_r1r1_b0174_15", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
-    // States -> vfbright_o_on vfbright_o_off
+    instance.registerEObj( "unknown_19", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f,
+    instance.registerEObj( "unknown_20", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_21", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_11", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f,
+    instance.registerEObj( "unknown_22", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_23", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_12", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f,
+    instance.registerEObj( "unknown_24", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_25", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_13", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f,
+    instance.registerEObj( "unknown_26", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_14", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f,
+    instance.registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "unknown_15", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f,
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_emp_b0021", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f },
-                            1.000000f, 0.000000f );
-    // States -> vf_baria_on vf_baria_off
-    instance->registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f },
-                            0.991760f, 0.000048f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f },
-                            1.000000f, 0.000000f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "unknown_18", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f,
-                            0.957075f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_r1r1_b0174_8", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_9", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_10", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_11", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_12", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_13", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_14", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_15", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "unknown_19", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( DzemaelDarkhold );

src/scripts/instances/dungeons/Halatali.cpp

@@ -9,112 +9,75 @@ class Halatali :
 public:
   Halatali() :
     Sapphire::ScriptAPI::InstanceContentScript( 7 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f,
+    instance.registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f,
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            0.000000f );
+    instance.registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f, 0.000000f ); 
-    // States -> vf_lock_on vf_lock_of
+    // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
-    instance->registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    // States -> vf_htras1_on vf_htras1_of
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f, 0.000000f ); 
-    // States -> vf_line_on vf_line_of
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f },
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f },
+    instance.registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f },
+    instance.registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000048f );
+    instance.registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f },
+    instance.registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000048f );
+    instance.registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f,
+    instance.registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f,
+    instance.registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f,
+    instance.registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f,
+    instance.registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f,
+    instance.registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f,
+    instance.registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f,
+    instance.registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f,
+    instance.registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f,
+    // States -> tornade_off (id: 2) tornade_on (id: 3) 
-                            0.000000f );
+    instance.registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f,
+    instance.registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f,
+    instance.registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f },
-                            0.991760f, 0.000048f );
-    // States -> tornade_off tornade_on
-    instance->registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( Halatali );

src/scripts/instances/dungeons/HalataliHard.cpp

@@ -9,126 +9,80 @@ class HalataliHard :
 public:
   HalataliHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 21 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f,
+    instance.registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f,
+    instance.registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f,
+    instance.registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f,
+    instance.registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f,
+    instance.registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f,
+    instance.registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f },
+    instance.registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
-    instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f,
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f,
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            0.000048f );
+    instance.registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f, -1.265160f ); 
-    instance->registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f,
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f, -1.005012f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f, -1.062825f ); 
-    instance->registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f ); 
-    instance->registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f,
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f, -1.486617f ); 
-                            0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f, 0.000048f ); 
-    // States -> vf_htras1_on vf_htras1_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f,
+    instance.registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f, 0.000048f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f,
+    instance.registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f, 0.000048f ); 
-                            -1.265160f );
+    instance.registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f,
+    instance.registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f, 0.000000f ); 
-                            -1.005012f );
+    instance.registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f },
+    instance.registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f, 0.000048f ); 
-                            0.991760f, -1.062825f );
+    instance.registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f );
+    instance.registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f },
+    instance.registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f,
+    instance.registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f, 0.000048f ); 
-                            -1.486617f );
+    instance.registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f },
+    instance.registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f,
+    instance.registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f,
+    instance.registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f,
+    instance.registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f,
+    instance.registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f,
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HalataliHard );

src/scripts/instances/dungeons/HaukkeManor.cpp

@@ -9,95 +9,68 @@ class HaukkeManor :
 public:
   HaukkeManor() :
     Sapphire::ScriptAPI::InstanceContentScript( 6 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f,
+    instance.registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f, 0.785398f ); 
-                            0.785398f );
+    // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
-    // States -> vf_slamp_on vf_slamp_of
+    instance.registerEObj( "Voidlamp_1", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f, -0.785398f ); 
-    instance->registerEObj( "Voidlamp_1", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f,
+    // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
-                            -0.785398f );
+    instance.registerEObj( "Voidlamp_2", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f, 0.785398f ); 
-    // States -> vf_slamp_on vf_slamp_of
+    // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
-    instance->registerEObj( "Voidlamp_2", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f,
+    instance.registerEObj( "Voidlamp_3", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f, -0.785398f ); 
-                            0.785398f );
+    // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
-    // States -> vf_slamp_on vf_slamp_of
+    instance.registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f, 0.000240f ); 
-    instance->registerEObj( "Voidlamp_3", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f, 0.000336f ); 
-                            -0.785398f );
+    instance.registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f, 0.932147f ); 
-    // States -> vf_slamp_on vf_slamp_of
+    instance.registerEObj( "Tinykey_1", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f, -0.528574f ); 
-    instance->registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f, 0.000240f );
+    instance.registerEObj( "Tinykey_2", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f, 0.987942f ); 
-    instance->registerEObj( "unknown_0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f, 0.000336f );
+    instance.registerEObj( "Tinykey_3", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f, 1.115077f ); 
-    instance->registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f, 0.932147f );
+    instance.registerEObj( "Tinykey_4", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f, 0.549108f ); 
-    instance->registerEObj( "Tinykey_1", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f,
+    instance.registerEObj( "Tinykey_5", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f, 0.868678f ); 
-                            -0.528574f );
+    instance.registerEObj( "Tinykey_6", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f, 0.312732f ); 
-    instance->registerEObj( "Tinykey_2", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f, 0.987942f );
+    instance.registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "Tinykey_3", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f,
+    instance.registerEObj( "Lockeddoor_1", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f, 0.000144f ); 
-                            1.115077f );
+    instance.registerEObj( "Lockeddoor_2", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "Tinykey_4", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f,
+    instance.registerEObj( "Lockeddoor_3", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f, 0.000240f ); 
-                            0.549108f );
+    instance.registerEObj( "Lockeddoor_4", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f, 0.000144f ); 
-    instance->registerEObj( "Tinykey_5", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f,
+    instance.registerEObj( "Lockeddoor_5", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f, 0.000144f ); 
-                            0.868678f );
+    instance.registerEObj( "Lockeddoor_6", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f, 0.000240f ); 
-    instance->registerEObj( "Tinykey_6", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f,
+    instance.registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f, 0.000144f ); 
-                            0.312732f );
+    instance.registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f, 0.000240f ); 
-    instance->registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f,
+    instance.registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f, -1.570451f ); 
-    instance->registerEObj( "Lockeddoor_1", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f,
+    instance.registerEObj( "unknown_2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f, 0.000000f ); 
-                            0.000144f );
+    instance.registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor_2", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f,
+    // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
-                            0.000048f );
+    instance.registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f, -0.839410f ); 
-    instance->registerEObj( "Lockeddoor_3", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f,
+    instance.registerEObj( "Lockeddoor_7", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f, 0.000240f ); 
-                            0.000240f );
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor_4", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f,
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-                            0.000144f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor_5", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000144f );
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor_6", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f,
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-                            0.000240f );
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000144f );
+    instance.registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f,
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            0.000240f );
+    instance.registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f, 0.638080f ); 
-    instance->registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f, -1.570451f );
-    instance->registerEObj( "unknown_2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_baria1_off vf_baria_on
-    instance->registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f,
-                            -0.839410f );
-    instance->registerEObj( "Lockeddoor_7", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f, 0.638080f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HaukkeManor );

src/scripts/instances/dungeons/HaukkeManorHard.cpp

@@ -9,133 +9,94 @@ class HaukkeManorHard :
 public:
   HaukkeManorHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 19 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f, -1.570451f ); 
-                            -1.570451f );
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d4_c1_ori01", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_fire_on0 (id: 9) vf_fire_on (id: 10) vf_fire_oｆ0 (id: 11) vf_fire_oｆ (id: 12) 
-    instance->registerEObj( "sgbg_f1d4_c1_ori01", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f },
+    instance.registerEObj( "sgbg_f1d4_c1_ori01_1", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_fire_on0 (id: 9) vf_fire_on (id: 10) vf_fire_oｆ0 (id: 11) vf_fire_oｆ (id: 12) 
-    // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ
+    instance.registerEObj( "unknown_1", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_f1d4_c1_ori01_1", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f },
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f, -1.570451f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f, -1.570796f ); 
-    // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_1", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f, -1.570451f );
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f, -1.551983f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f }, 0.991760f, 0.000048f ); 
-                            -1.570796f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_4", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f },
+    instance.registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_f1d4_d1_gago1", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> bg_gago1_on (id: 2) bg_gago1_oｆｆ (id: 3) bg_gago1_out (id: 4) 
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f,
+    instance.registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f, 0.811345f ); 
-                            -1.551983f );
+    instance.registerEObj( "sgbg_f1d4_d1_gago1_1", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f },
+    // States -> bg_gago1_on (id: 2) bg_gago1_oｆｆ (id: 3) bg_gago1_out (id: 4) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Lockeddoor_1", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f,
+    instance.registerEObj( "Lockeddoor_2", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Tinykey_1", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d4_d1_gago1", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f },
+    instance.registerEObj( "Tinykey_2", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_5", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f, 0.000000f ); 
-    // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out
+    instance.registerEObj( "Crystalball_1", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f, -1.392958f ); 
-    instance->registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f,
+    instance.registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f ); 
-                            0.811345f );
+    instance.registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f, -0.000345f ); 
-    instance->registerEObj( "sgbg_f1d4_d1_gago1_1", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f },
+    instance.registerEObj( "unknown_6", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_7", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f, 0.000000f ); 
-    // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out
+    instance.registerEObj( "unknown_8", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f,
+    instance.registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f, 1.074421f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Voidlamp_1", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f, -1.569551f ); 
-    instance->registerEObj( "Lockeddoor_1", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f,
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-                            0.000000f );
+    instance.registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Lockeddoor_2", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f,
+    // States -> bg_barrier1_on (id: 3) bg_barrier1_off (id: 4) bg_barrier1_out (id: 5) 
-                            0.000000f );
+    instance.registerEObj( "Lockeddoor_3", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Tinykey_1", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Tinykey_3", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Tinykey_2", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "unknown_5", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_1", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "Crystalball_1", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_2", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f }, 1.000000f, 0.000000f ); 
-                            -1.392958f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_3", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f, -0.000345f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "unknown_6", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_4", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f }, 1.000000f, 0.010569f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "unknown_7", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_5", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f }, 1.000000f, 0.009430f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "unknown_8", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_6", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
-    instance->registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f,
+    instance.registerEObj( "unknown_9", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f, 0.000000f ); 
-                            1.074421f );
+    instance.registerEObj( "unknown_10", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f, 0.000000f ); 
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
+    instance.registerEObj( "unknown_11", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Voidlamp_1", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f, 0.000000f ); 
-                            -1.569551f );
+    instance.registerEObj( "Sealedbarrier_1", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f, 0.000000f ); 
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
+    // States -> bg_barrier1_on (id: 3) bg_barrier1_off (id: 4) bg_barrier1_out (id: 5) 
-    instance->registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f,
+    instance.registerEObj( "unknown_13", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
-    // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "Lockeddoor_3", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f,
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f, 0.000335f ); 
-                            0.000048f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Tinykey_3", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_14", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_1", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_2", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_3", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_4", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f },
-                            1.000000f, 0.010569f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_5", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f },
-                            1.000000f, 0.009430f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_6", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "unknown_9", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealedbarrier_1", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f,
-                            0.000000f );
-    // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out
-    instance->registerEObj( "unknown_13", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f, 0.000335f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_14", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HaukkeManorHard );

src/scripts/instances/dungeons/HellsLid.cpp

@@ -9,23 +9,73 @@ class HellsLid :
 public:
   HellsLid() :
     Sapphire::ScriptAPI::InstanceContentScript( 59 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 7170401, 4, { -71.824219f, 36.942020f, 308.278015f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7170402, 4, { -74.204651f, 2.975464f, 288.624390f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7170403, 4, { -74.725868f, 2.999996f, 204.499496f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364", 2007457, 7253595, 4, { -82.098160f, 3.000000f, 259.118103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_1", 2007457, 7253596, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_2", 2007457, 7253597, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_3", 2007457, 7253612, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_4", 2007457, 7253613, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_5", 2007457, 7253614, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_6", 2007457, 7253621, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_7", 2007457, 7253622, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_8", 2007457, 7253623, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_9", 2007457, 7253630, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_10", 2007457, 7253631, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_11", 2007457, 7253632, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -70.236214f, -2.994005f, 150.513504f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7173420, 4, { -67.025093f, -3.000000f, 145.419205f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7173423, 4, { -67.025078f, -2.956286f, 106.833702f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc05", 2007457, 7229619, 4, { -78.515167f, -3.000000f, 126.046402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc05_1", 2007457, 7229620, 4, { -65.781677f, -3.006042f, 126.756599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc06", 2007457, 7229622, 4, { -78.080513f, -3.006042f, 134.996597f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc06_1", 2007457, 7229623, 4, { -63.370731f, -3.006042f, 134.752396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1365", 2007457, 7242616, 4, { -45.700809f, -8.255188f, 23.636169f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1365_1", 2007457, 7245584, 4, { 26.736940f, -16.665211f, 27.040310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7167237, 4, { 55.466431f, -16.525570f, 30.044920f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7167239, 4, { 57.053471f, -25.528379f, -52.079102f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 59.280998f, -26.000000f, -100.623596f }, 1.250000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7173646, 4, { 63.367290f, -26.500000f, -104.259499f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7173648, 4, { 61.874378f, -26.500059f, -136.133804f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2007457, 7167248, 4, { 60.837650f, -96.757507f, -322.591003f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7167249, 4, { 61.997311f, -93.000023f, -421.408386f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { 62.119381f, -88.000000f, -455.242706f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7174030, 4, { 62.878109f, -88.000000f, -458.344788f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2007457, 7207905, 4, { 57.755989f, -88.029297f, -476.778687f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2009378, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2009379, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2009380, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2009381, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2009382, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2009383, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7167443, 5, { -121.331703f, 65.000000f, 474.948303f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 62.058472f, -88.000000f, -489.921387f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -113.603500f, 65.000000f, 469.016510f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HellsLid );

src/scripts/instances/dungeons/HullbreakerIsle.cpp

@@ -9,136 +9,92 @@ class HullbreakerIsle :
 public:
   HullbreakerIsle() :
     Sapphire::ScriptAPI::InstanceContentScript( 23 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_btl_b0485", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_btl_b0485", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f, -0.000000f ); 
-                            -0.000000f );
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_btl_b0485_1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f },
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0485_2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f }, 1.000000f, -0.000000f ); 
-    // States -> omen fukidasi end_0f end_anm omen1
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    instance->registerEObj( "sgvf_w_btl_b0485_2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f },
+    instance.registerEObj( "sgvf_w_btl_b0485_3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_btl_b0485_4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f },
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0485_5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f }, 1.000000f, -0.000000f ); 
-    // States -> omen fukidasi end_0f end_anm omen1
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    instance->registerEObj( "sgvf_w_btl_b0485_4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f },
+    instance.registerEObj( "sgvf_w_btl_b0485_6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_btl_b0485_7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f },
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0485_8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f }, 1.000000f, -0.000000f ); 
-    // States -> omen fukidasi end_0f end_anm omen1
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    instance->registerEObj( "sgvf_w_btl_b0485_6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f },
+    instance.registerEObj( "sgvf_w_btl_b0485_9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f }, 1.000000f, -0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_btl_b0485_10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f },
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0485_11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f }, 1.000000f, -0.000000f ); 
-    // States -> omen fukidasi end_0f end_anm omen1
+    // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
-    instance->registerEObj( "sgvf_w_btl_b0485_8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f },
+    instance.registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f, 0.000048f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f },
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f, 0.000000f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, -0.000000f );
+    instance.registerEObj( "sgpl_w_transparent05", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f }, 0.991760f, 0.000048f ); 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f, -1.570451f ); 
-    instance->registerEObj( "sgvf_w_btl_b0485_11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f }, 1.000000f, -1.570451f ); 
-                            1.000000f, -0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> omen fukidasi end_0f end_anm omen1
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000048f );
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f, -1.184874f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f,
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_3", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f },
+    instance.registerEObj( "unknown_4", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Stonepedestal_1", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Stonepedestal_2", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgpl_w_transparent05", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f },
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f,
+    instance.registerEObj( "Treasurecoffer_1", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f, 0.000000f ); 
-                            -1.570451f );
+    instance.registerEObj( "Treasurecoffer_2", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f },
+    instance.registerEObj( "Treasurecoffer_3", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f, 0.000000f ); 
-                            1.000000f, -1.570451f );
+    instance.registerEObj( "Treasurecoffer_4", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Treasurecoffer_5", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f },
+    instance.registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Wildbananatree_1", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Wildbananatree_2", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f,
+    instance.registerEObj( "Wildbananatree_3", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f }, 0.991760f, 0.000048f ); 
-                            -1.184874f );
+    instance.registerEObj( "unknown_5", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f, -1.260904f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f },
+    instance.registerEObj( "unknown_6", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f, -0.736456f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_7", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f, -0.921409f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_8", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f, 0.613842f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_9", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f,
+    instance.registerEObj( "unknown_10", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Wildbananatree_4", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f,
+    instance.registerEObj( "Wildbananatree_5", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_11", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f, 0.600320f ); 
-    instance->registerEObj( "unknown_4", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f, 0.684586f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_13", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Stonepedestal_1", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Stonepedestal_2", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_2", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_3", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_4", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_5", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_1", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wildbananatree_2", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_3", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_5", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f,
-                            -1.260904f );
-    instance->registerEObj( "unknown_6", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f,
-                            -0.736456f );
-    instance->registerEObj( "unknown_7", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f, -0.921409f );
-    instance->registerEObj( "unknown_8", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f,
-                            0.613842f );
-    instance->registerEObj( "unknown_9", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_4", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Wildbananatree_5", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f,
-                            0.600320f );
-    instance->registerEObj( "unknown_12", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f, 0.684586f );
-    instance->registerEObj( "unknown_13", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HullbreakerIsle );

src/scripts/instances/dungeons/HullbreakerIsleHard.cpp

@@ -9,76 +9,55 @@ class HullbreakerIsleHard :
 public:
   HullbreakerIsleHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 45 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f, 0.498864f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f, 0.498864f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6253922, 4, { -342.837006f, 6.196667f, 36.610142f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6253922, 4, { -343.716888f, 7.647682f, 38.636318f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f,
+    instance.registerEObj( "Treasurecoffer_1", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_1", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Treasurecoffer_1", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f,
+    instance.registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "unknown_1", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f,
+    instance.registerEObj( "unknown_2", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_3", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f, 0.000000f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_4", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_5", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f,
+    instance.registerEObj( "unknown_6", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_7", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f,
+    instance.registerEObj( "unknown_8", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_9", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f,
+    instance.registerEObj( "unknown_10", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_11", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_7", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f,
+    instance.registerEObj( "unknown_14", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f, -1.570451f ); 
-    instance->registerEObj( "unknown_8", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_9", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_10", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f,
+    instance.registerEObj( "unknown_16", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_14", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_16", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( HullbreakerIsleHard );

src/scripts/instances/dungeons/KuganeCastle.cpp

@@ -9,23 +9,91 @@ class KuganeCastle :
 public:
   KuganeCastle() :
     Sapphire::ScriptAPI::InstanceContentScript( 57 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6891156, 4, { 280.110413f, -75.860001f, 341.057800f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 280.000000f, -75.860001f, 338.900696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 280.000000f, -75.860001f, 375.299988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 0, 4, { 280.179993f, -75.859993f, 363.578888f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Pileofgold", 2007814, 0, 4, { 289.943695f, -75.859993f, 360.566986f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007815, 0, 4, { 279.957306f, -75.883118f, 375.295685f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -110.000000f, 0.000003f, 0.000000f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6886643, 4, { -108.904198f, 0.000003f, -0.184188f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6886655, 4, { -147.474503f, 0.100000f, -0.110550f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 280.000000f, -90.771896f, 28.200001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6795321, 4, { 294.636414f, -90.775902f, 64.530403f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6795322, 4, { 284.810699f, -90.771896f, 64.853622f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6795323, 4, { 275.195496f, -90.771896f, 64.375351f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6795324, 4, { 264.569000f, -90.771896f, 65.125214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6795325, 4, { 295.691193f, -90.771896f, 55.563641f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6795326, 4, { 284.563385f, -90.771896f, 57.046230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6795327, 4, { 274.879486f, -90.771896f, 57.698601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6795328, 4, { 264.951508f, -90.771896f, 57.270260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6795329, 4, { 294.813904f, -90.771896f, 45.369381f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6795330, 4, { 284.412811f, -90.775940f, 44.846191f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6795331, 4, { 274.009003f, -90.771896f, 44.232479f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6795332, 4, { 264.546387f, -90.771896f, 44.505569f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6795333, 4, { 294.721802f, -90.771896f, 35.522999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6795334, 4, { 284.550293f, -90.771896f, 35.573021f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 6795335, 4, { 274.647095f, -90.775940f, 36.026489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2007457, 6795336, 4, { 265.028992f, -90.771896f, 35.466030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6972248, 4, { 279.929291f, -90.862122f, 25.802130f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6972249, 4, { 279.425995f, -90.862122f, 73.752983f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_21", 2007457, 6795811, 4, { -18.923059f, -4.000000f, -47.771740f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007457, 6795812, 4, { -82.884247f, 0.000003f, -0.161598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007457, 6795813, 4, { -179.231201f, 4.000000f, -0.161991f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007812, 0, 4, { -60.365211f, -6.291489f, 11.147480f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_25", 2007812, 0, 4, { -60.697491f, -6.291489f, -12.243330f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_26", 2007812, 0, 4, { -64.355148f, -6.291490f, 11.308300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_27", 2007812, 0, 4, { -64.521027f, -6.291490f, -11.570270f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_28", 2007812, 0, 4, { -55.949509f, -6.291489f, 9.962895f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_29", 2007812, 0, 4, { -56.575081f, -6.291490f, -10.074280f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgbg_e3d4_a1_leav1", 2007457, 6993778, 4, { -11.244300f, -5.961200f, -57.744499f }, 1.000000f, -0.872665f ); 
+    instance.registerEObj( "sgbg_e3d4_a1_leav1_1", 2007457, 6994112, 4, { -17.911301f, -5.796600f, -65.317596f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_30", 2007812, 0, 4, { -49.310871f, -6.291489f, 10.600000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_31", 2007812, 0, 4, { -49.310860f, -6.291490f, -10.674300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_32", 2007457, 6795420, 4, { 248.664993f, -94.824402f, -117.732498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007457, 6795421, 4, { 279.489410f, -92.996399f, 3.845758f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2007457, 6795419, 4, { 280.175507f, -92.998596f, 93.664139f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2007813, 0, 4, { 248.706802f, -94.834801f, -131.982498f }, 1.000000f, -3.141593f ); 
+    instance.registerEObj( "unknown_36", 2007813, 0, 4, { 286.988312f, -92.855598f, -10.582000f }, 1.000000f, 0.785398f ); 
+    instance.registerEObj( "unknown_37", 2007813, 0, 4, { 273.011108f, -92.855598f, -10.581000f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_38", 2007813, 0, 4, { 279.995697f, -92.851196f, -21.638639f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2007813, 0, 4, { 279.987701f, -92.881706f, -7.278625f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_40", 2007457, 6795337, 4, { 279.713104f, -83.786652f, 143.480499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2007457, 6795422, 4, { 280.061096f, -73.914101f, 313.413391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007457, 6795342, 4, { 289.140198f, -73.914101f, 284.393890f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2007457, 6795343, 4, { 288.888214f, -73.914200f, 303.585907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6795341, 4, { 271.105591f, -73.914101f, 284.355804f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6795345, 4, { 271.048309f, -73.914200f, 302.845795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2007457, 6795344, 4, { 289.058899f, -73.914101f, 291.958588f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_47", 2007457, 6795346, 4, { 288.715912f, -73.914299f, 310.894012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_48", 2007457, 6795338, 4, { 271.824585f, -73.914101f, 292.335999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_49", 2007457, 6795339, 4, { 271.103790f, -73.914299f, 311.710388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6881046, 5, { 66.323036f, -6.000000f, -68.720047f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 49.699169f, -6.000000f, -60.817249f }, 1.000000f, 1.570796f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( KuganeCastle );

src/scripts/instances/dungeons/Neverreap.cpp

@@ -9,23 +9,78 @@ class Neverreap :
 public:
   Neverreap() :
     Sapphire::ScriptAPI::InstanceContentScript( 33 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Vanutotem", 2005373, 0, 4, { 171.495407f, 64.000000f, -17.861130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_1", 2005374, 0, 4, { 172.963303f, 64.000000f, -17.254971f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_2", 2005375, 0, 4, { 173.628693f, 64.000000f, -16.836420f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_3", 2005376, 0, 4, { 173.837097f, 64.000000f, -15.707030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_4", 2005377, 0, 4, { 172.736298f, 64.000000f, -15.517540f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_5", 2005378, 0, 4, { 172.030807f, 64.000000f, -15.895150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_6", 2005379, 0, 4, { 171.188904f, 64.000000f, -16.423241f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_7", 2005380, 0, 4, { 170.423996f, 64.000000f, -18.803040f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_8", 2005381, 0, 4, { 169.871201f, 64.000000f, -17.785959f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_9", 2005382, 0, 4, { 170.450607f, 64.000000f, -15.978460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_10", 2005383, 0, 4, { 169.593307f, 64.000000f, -15.827410f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_11", 2005384, 0, 4, { 170.206100f, 64.000000f, -15.102260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Cloudaltar", 2005130, 5786938, 4, { -160.917892f, 5.000000f, 291.800598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636", 2005135, 5887646, 4, { -160.814896f, 4.989685f, 291.432007f }, 0.991760f, 0.000048f ); 
+    // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "Cloudaltar_1", 2005131, 5786940, 4, { -87.421448f, 21.000000f, 290.602692f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636_1", 2005136, 5887670, 4, { -97.348267f, 21.000000f, 290.468292f }, 1.000000f, 0.000000f ); 
+    // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "sgvf_a2d2_b0636_2", 2005137, 5887709, 4, { -1.889378f, 43.351429f, 215.919601f }, 1.000000f, 0.000000f ); 
+    // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "Cloudaltar_2", 2005132, 5786943, 4, { -4.570463f, 44.541019f, 216.505707f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5778078, 4, { 74.175919f, 38.000000f, 213.378998f }, 1.000000f, 0.179771f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Cloudaltar_3", 2005133, 5786946, 4, { 77.225830f, 37.979610f, 211.596802f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5789280, 4, { -5.153300f, 43.220901f, 215.814102f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002587, 0, 4, { -5.153300f, 43.138199f, 214.261093f }, 1.000000f, 1.561701f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636_3", 2005137, 5887710, 4, { 79.964493f, 38.000000f, 209.654800f }, 1.000000f, 0.000000f ); 
+    // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "unknown_1", 2005139, 5606925, 4, { 132.122696f, 55.455528f, 135.050995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005140, 5606936, 4, { 142.889496f, 67.000000f, 67.840523f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5777608, 4, { 165.085007f, 63.500000f, 10.671380f }, 1.000000f, 0.065608f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5777614, 4, { 178.430206f, 64.000000f, -23.500389f }, 1.000000f, 0.154718f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 163.308899f, 63.926491f, 9.173799f }, 1.000000f, 0.342174f ); 
+    instance.registerEObj( "unknown_4", 2005142, 0, 4, { 177.194199f, 60.250000f, -155.280502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 172.014893f, 58.670898f, -358.327606f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 5615523, 4, { 175.494003f, 59.281250f, -305.348297f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002587, 0, 4, { 175.127701f, 59.281250f, -310.170197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Cloudaltar_4", 2005134, 5786958, 4, { 164.310806f, 60.349369f, -127.550201f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_a2d2_b0711", 2005143, 5900091, 4, { 164.190903f, 61.358318f, -219.399506f }, 1.000000f, 0.000000f ); 
+    // States -> bub_init (id: 1) bub_loop (id: 2) 
+    instance.registerEObj( "sgvf_a2d2_b0642", 2005146, 5894450, 4, { 175.280396f, 59.281250f, -309.102112f }, 0.991760f, 0.000048f ); 
+    // States -> wind_on (id: 2) wind_off (id: 3) 
+    instance.registerEObj( "sgvf_a2d2_b0645", 2005144, 5893679, 4, { 158.342804f, 60.440922f, -191.393906f }, 0.991760f, 0.000048f ); 
+    // States -> init (id: 2) loop2init (id: 3) loop (id: 4) init2loop (id: 5) 
+    instance.registerEObj( "sgvf_a2d2_b0645_1", 2005145, 5893776, 4, { 162.635193f, 59.999939f, -271.153412f }, 1.000000f, 0.000000f ); 
+    // States -> init (id: 2) loop2init (id: 3) loop (id: 4) init2loop (id: 5) 
+    instance.registerEObj( "unknown_6", 2005141, 5764461, 4, { 165.941803f, 60.440899f, -205.985107f }, 1.000000f, 0.000047f ); 
+    instance.registerEObj( "Entrance", 2000182, 5614672, 5, { -195.491302f, -0.022185f, 305.059296f }, 1.000000f, -0.128295f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -179.874603f, 2.417616f, 306.529602f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( Neverreap );

src/scripts/instances/dungeons/PharosSirius.cpp

@@ -9,79 +9,59 @@ class PharosSirius :
 public:
   PharosSirius() :
     Sapphire::ScriptAPI::InstanceContentScript( 17 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2002718, 4378108, 5, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f,
+    instance.registerEObj( "Entrance", 2002718, 4378108, 5, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_0", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_0", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_2", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 21.744020f, 89.982422f, -0.015320f }, 0.991760f, -1.570451f ); 
-    instance->registerEObj( "unknown_2", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002721, 4378121, 4, { 20.279169f, 89.982422f, -0.015320f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { 21.750000f, 90.008011f, 0.000000f }, 1.000000f, -1.570796f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002721, 4378121, 4, { 20.298759f, 90.000008f, 0.000000f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f, -1.570451f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_5", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f, -1.570451f );
+    instance.registerEObj( "unknown_6", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f },
+    instance.registerEObj( "unknown_7", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_8", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_9", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_6", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_7", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f,
+    instance.registerEObj( "unknown_11", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_8", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f,
+    instance.registerEObj( "Aethervalve_1", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_12", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_9", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f,
+    instance.registerEObj( "unknown_13", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_14", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_15", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f },
+    instance.registerEObj( "unknown_16", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_11", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aethervalve_1", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( PharosSirius );

src/scripts/instances/dungeons/PharosSiriusHard.cpp

@@ -9,76 +9,56 @@ class PharosSiriusHard :
 public:
   PharosSiriusHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 40 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f, 0.000048f ); 
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f, 0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_1", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f },
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f, -1.570451f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f,
+    instance.registerEObj( "unknown_3", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f, 0.000048f ); 
-                            -1.570451f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f, -0.005750f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f, 0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f },
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f, 0.000048f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_5", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f,
+    instance.registerEObj( "unknown_6", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f, 0.000000f ); 
-                            -0.005750f );
+    instance.registerEObj( "unknown_7", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f,
+    instance.registerEObj( "unknown_8", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f, 0.000048f ); 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_9", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_10", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f,
+    instance.registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_6", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f,
+    instance.registerEObj( "unknown_11", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_12", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f,
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f },
-                            1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( PharosSiriusHard );

src/scripts/instances/dungeons/SaintMociannesArboretum.cpp

@@ -9,23 +9,55 @@ class SaintMociannesArboretum :
 public:
   SaintMociannesArboretum() :
     Sapphire::ScriptAPI::InstanceContentScript( 41 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6038834, 4, { -14.984150f, -350.000000f, -10.860330f }, 1.000000f, 0.622420f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 10.788090f, -350.026703f, 7.522644f }, 0.991760f, 0.609911f ); 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -16.401690f, -350.000000f, -11.633360f }, 1.000000f, -0.981437f ); 
+    instance.registerEObj( "unknown_1", 2006520, 6041801, 4, { 113.481300f, 2.975464f, 19.363649f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006521, 6047538, 4, { 67.640343f, 0.000000f, -71.112350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006586, 0, 4, { 85.017906f, -0.020000f, -58.585030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2006522, 5966533, 4, { -125.780197f, -12.375120f, -188.891495f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006523, 6037786, 4, { -234.627304f, -29.692921f, -182.589401f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006594, 6068325, 4, { -244.373505f, -37.105370f, -163.858002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006524, 6046538, 4, { -102.066101f, -349.342285f, 55.198681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006526, 6046053, 4, { -86.535728f, -356.521301f, -4.785355f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006527, 6046055, 4, { -104.847900f, -356.059692f, 4.146202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006525, 6046572, 4, { -47.545761f, -359.815613f, -33.600189f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006596, 6058396, 4, { -262.334015f, -39.551819f, -111.790802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006597, 6077036, 4, { -248.226898f, -46.000000f, -133.086304f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006598, 6077035, 4, { -283.791992f, -46.000000f, -122.796700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006609, 6084794, 4, { -242.938904f, -44.861469f, -84.336670f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6037810, 4, { 15.731990f, 3.000000f, -89.860413f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 18.234501f, 3.097534f, -90.928528f }, 0.991760f, 1.130897f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2006531, 6037814, 4, { -17.876730f, 3.000000f, -82.649872f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6041100, 4, { -245.545395f, -36.853828f, -164.052200f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2002735, 0, 4, { -245.869705f, -36.958050f, -162.887695f }, 0.991760f, 0.541627f ); 
+    instance.registerEObj( "unknown_17", 2006532, 6082449, 4, { -260.975098f, -44.815800f, -108.476402f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006566, 0, 4, { -263.891296f, -44.889751f, -114.578796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6034530, 5, { 0.231333f, 0.000002f, 140.623901f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.219861f, 0.000001f, 131.545197f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( SaintMociannesArboretum );

src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp

@@ -0,0 +1,68 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class SaintMociannesArboretumHard :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  SaintMociannesArboretumHard() :
+    Sapphire::ScriptAPI::InstanceContentScript( 62 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7559255, 4, { 17.974501f, 3.000000f, -90.677597f }, 1.000000f, 1.125737f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7559254, 4, { -0.052845f, 2.999999f, -62.073700f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 17.974501f, 3.000000f, -90.677597f }, 1.000000f, 1.125738f ); 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 70.045998f, -358.660889f, -67.820099f }, 1.688311f, 0.785398f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7559344, 4, { 70.045998f, -358.660889f, -67.820099f }, 1.000000f, 0.785398f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7559345, 4, { 102.958000f, -358.631592f, -100.732101f }, 1.000000f, 0.785398f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7559351, 4, { 338.763000f, -345.520905f, -336.862915f }, 1.000000f, 0.785398f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 338.763000f, -345.520905f, -336.862915f }, 1.400000f, 0.785398f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7515300, 4, { 102.128502f, 2.975464f, 35.873901f }, 0.991760f, 1.004917f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7400978, 4, { 65.087173f, -0.256883f, -77.312302f }, 1.000000f, -0.647398f ); 
+    instance.registerEObj( "unknown_5", 2009584, 0, 4, { 86.116272f, -3.500000f, -58.246311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2009584, 0, 4, { 87.258659f, -3.500000f, -55.799931f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009584, 0, 4, { 87.003143f, -3.500000f, -64.240150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2009584, 0, 4, { 85.276199f, -3.500000f, -62.320759f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2009584, 0, 4, { 69.948387f, -3.500000f, -54.553860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2009584, 0, 4, { 71.547699f, -3.500000f, -53.240009f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2009584, 0, 4, { 70.050743f, -3.500000f, -57.845982f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2009584, 0, 4, { 69.676193f, -3.500000f, -61.626770f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7447179, 4, { -44.805130f, -358.181885f, -123.967300f }, 1.000000f, 1.080362f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7447178, 4, { 34.771999f, -359.432800f, -63.961380f }, 1.000000f, 1.325989f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7509045, 4, { 221.466904f, -355.000092f, -183.157898f }, 1.000000f, 1.483875f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7509048, 4, { 290.509186f, -355.000000f, -247.817902f }, 1.000000f, 0.479966f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7515074, 4, { 242.213501f, -355.000000f, -209.642807f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7515073, 4, { 283.367798f, -355.000000f, -227.097702f }, 1.000000f, 0.427606f ); 
+    instance.registerEObj( "Waterconduit", 2009585, 7515078, 4, { 248.199799f, -353.799988f, -211.263702f }, 1.000000f, -0.358281f ); 
+    instance.registerEObj( "Waterconduit_1", 2009586, 7515076, 4, { 287.357208f, -353.810913f, -230.909302f }, 0.991760f, 0.573861f ); 
+    instance.registerEObj( "Entrance", 2000182, 7403516, 5, { -0.091100f, 0.000000f, 140.477798f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.219900f, 0.000000f, 131.545197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 363.235107f, -345.525208f, -361.334991f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7575616, 4, { 352.620697f, -345.510101f, -350.728607f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( SaintMociannesArboretumHard );

src/scripts/instances/dungeons/Sastasha.cpp

@@ -1,6 +1,5 @@
 #include <ScriptObject.h>
 #include <Territory/InstanceContent.h>
-#include <Actor/Player.h>
 
 using namespace Sapphire;
 
@@ -10,113 +9,75 @@ class Sastasha :
 public:
   Sastasha() :
     Sapphire::ScriptAPI::InstanceContentScript( 4 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f,
+    instance.registerEObj( "unknown_0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f, 0.000432f ); 
-                            0.000432f );
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f,
+    instance.registerEObj( "unknown_1", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    instance->registerEObj( "unknown_1", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f,
+    instance.registerEObj( "unknown_2", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f,
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-                            0.000048f );
+    instance.registerEObj( "sgpl_s1d1_bosswall", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f }, 1.000000f, 0.000000f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "sgpl_s1d1_bossline", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f,
+    instance.registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f },
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f, 0.000336f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f, 0.000240f ); 
-    instance->registerEObj( "sgpl_s1d1_bosswall", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f },
+    instance.registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f, 0.000240f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "sgpl_s1d1_bossline", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f },
+    instance.registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f, -1.396264f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f, -2.007129f ); 
-    instance->registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f,
+    instance.registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f, -0.862350f ); 
-                            0.000000f );
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "sgbg_s1d1_p1_shel1", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f, 0.481030f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f,
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-                            0.000048f );
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_1", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f, 1.471638f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f, 0.000336f );
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-    instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f },
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_2", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f, -0.375975f ); 
-                            0.930753f, 0.000240f );
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-    instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f },
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_3", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f, 0.020540f ); 
-                            0.930753f, 0.000240f );
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-    instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f },
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_4", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f, -0.618915f ); 
-                            0.991789f, 0.000048f );
+    // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
-    instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f },
+    instance.registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
-                            1.000000f, -1.396264f );
+    instance.registerEObj( "Bloodymemo_1", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
-    instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f,
+    instance.registerEObj( "Bloodymemo_2", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
-                            -2.007129f );
+    instance.registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f, -2.007129f ); 
-    instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f,
+    instance.registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f, 0.000048f ); 
-                            -0.862350f );
+    instance.registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f, -2.007129f ); 
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
+    instance.registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f, 1.047198f ); 
-    instance->registerEObj( "sgbg_s1d1_p1_shel1", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f },
+    instance.registerEObj( "Rambadedoor_1", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f, -2.443461f ); 
-                            0.991789f, 0.481030f );
+    instance.registerEObj( "unknown_3", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f, 1.134464f ); 
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
+    instance.registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_1", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f },
+    instance.registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f, 1.561760f ); 
-                            0.991789f, 1.471638f );
+    instance.registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f, 0.000000f ); 
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
+    instance.registerEObj( "sgpl_s1d1_sghit_ctrl", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_2", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f },
+    instance.registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f }, 0.991789f, 0.000048f ); 
-                            0.991789f, -0.375975f );
+    instance.registerEObj( "Unnaturalripples_1", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f }, 1.000000f, 0.000000f ); 
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
+    instance.registerEObj( "Unnaturalripples_2", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f }, 0.991789f, 0.000048f ); 
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_3", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f },
+    instance.registerEObj( "Unnaturalripples_3", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.020540f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_4", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f },
-                            0.991789f, -0.618915f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Bloodymemo_1", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Bloodymemo_2", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f,
-                            -2.007129f );
-    instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f,
-                            -2.007129f );
-    instance->registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f,
-                            1.047198f );
-    instance->registerEObj( "Rambadedoor_1", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f,
-                            -2.443461f );
-    instance->registerEObj( "unknown_3", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f,
-                            1.134464f );
-    instance->registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f,
-                            1.561760f );
-    instance->registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_s1d1_sghit_ctrl", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "Unnaturalripples_1", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Unnaturalripples_2", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "Unnaturalripples_3", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f },
-                            1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( Sastasha );

src/scripts/instances/dungeons/SastashaHard.cpp

@@ -9,97 +9,64 @@ class SastashaHard :
 public:
   SastashaHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 28 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f, 0.443513f ); 
-                            0.443513f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f },
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f,
+    instance.registerEObj( "unknown_2", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f, -0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f },
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_4", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f,
+    instance.registerEObj( "unknown_5", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_6", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f,
+    instance.registerEObj( "unknown_7", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f, 0.000000f ); 
-                            -0.000000f );
+    instance.registerEObj( "unknown_8", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_9", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f,
+    instance.registerEObj( "unknown_10", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_11", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_13", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f,
+    instance.registerEObj( "unknown_14", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_15", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_6", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f,
+    instance.registerEObj( "unknown_16", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_17", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f,
+    instance.registerEObj( "unknown_18", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_19", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_8", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f,
+    instance.registerEObj( "unknown_20", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_21", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_9", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f,
+    instance.registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_22", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f,
+    instance.registerEObj( "unknown_23", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_24", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_11", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f,
+    instance.registerEObj( "unknown_25", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "sgpl_w_lvd_board_col_on_off", 2004428, 4890021, 4, { -295.493286f, 5.576687f, 275.610901f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_12", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f,
+    // States -> col_on (id: 17) col_off (id: 18) 
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_13", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f,
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_14", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_22", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_board_col_on_off", 2004428, 4890021, 4,
-                            { -295.493286f, 5.576687f, 275.610901f }, 1.000000f, 0.000000f );
-    // States -> col_on col_off
-    instance->registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( SastashaHard );

src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp

@@ -9,23 +9,72 @@ class ShisuioftheVioletTides :
 public:
   ShisuioftheVioletTides() :
     Sapphire::ScriptAPI::InstanceContentScript( 50 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 6526609, 5, { 8.208527f, 11.171570f, 362.661407f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 12.390300f, 9.221273f, 350.790100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6709633, 4, { 0.322443f, 45.921879f, -411.857788f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.011370f, 45.921879f, -412.896698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.069154f, 45.921871f, -447.611115f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008110, 6865017, 4, { -0.060144f, 45.921879f, -430.535889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6890670, 4, { 5.646293f, 45.921879f, -440.096588f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6709518, 4, { -0.364792f, 18.299490f, 91.107010f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 0.033326f, 18.500010f, 89.883667f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007771, 6709586, 4, { -0.180471f, 18.500010f, 50.377258f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2008311, 0, 4, { -7.074059f, 18.500019f, 72.067329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008312, 0, 4, { 5.212873f, 18.500019f, 72.435066f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6709598, 4, { 0.399389f, 26.954840f, -187.217804f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007772, 6709615, 4, { -17.157890f, 27.250010f, -208.294098f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.044392f, 27.249910f, -188.679199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008106, 6869249, 4, { -8.237946f, 27.250010f, -216.909500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2008107, 6869206, 4, { -7.564978f, 27.250010f, -199.660095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008108, 6869244, 4, { 8.748951f, 27.249981f, -199.725601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008109, 6869228, 4, { 8.554644f, 27.250010f, -216.964706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007745, 6496157, 4, { 6.118062f, 6.997511f, 335.203186f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007746, 6502056, 4, { 29.832279f, -1.756603f, 291.307404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007747, 6502057, 4, { 0.594021f, -3.646973f, 227.895996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007748, 6502133, 4, { 19.059891f, -3.462188f, 230.198303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007749, 6502058, 4, { -3.533240f, -5.778060f, 244.420105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007750, 6502145, 4, { -55.424740f, 7.160790f, 138.440201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007751, 6502143, 4, { -40.800652f, 6.339986f, 152.161407f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007752, 6502138, 4, { -42.255699f, 6.735332f, 144.687607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007762, 6502139, 4, { -58.166401f, 3.768957f, 197.653702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007763, 6502141, 4, { -46.675800f, 6.647403f, 136.313400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007764, 0, 4, { -25.192690f, 6.973328f, 142.992203f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2007753, 6502709, 4, { -9.730975f, -4.657778f, 229.435501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007754, 6502794, 4, { -19.627199f, 7.090509f, 140.629501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007767, 6526733, 4, { -52.219410f, 6.701191f, 142.932297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007770, 6514679, 4, { 0.421847f, 21.000000f, 23.917980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007768, 6708902, 4, { -42.045250f, 6.286057f, 150.394806f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2007769, 6708901, 4, { -56.005989f, 6.588723f, 144.949600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007755, 6504391, 4, { 0.527385f, 26.000010f, -18.338779f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007756, 6504406, 4, { 0.118717f, 26.000010f, -49.912861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007757, 6504429, 4, { 0.465194f, 26.078131f, -80.333969f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007758, 6504452, 4, { -0.073714f, 26.078131f, -165.829300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007759, 6517284, 4, { 9.887736f, 30.921881f, -285.783295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007760, 6517285, 4, { 0.046282f, 40.921879f, -372.485901f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( ShisuioftheVioletTides );

src/scripts/instances/dungeons/Snowcloak.cpp

@@ -9,101 +9,70 @@ class Snowcloak :
 public:
   Snowcloak() :
     Sapphire::ScriptAPI::InstanceContentScript( 27 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f, -1.570451f ); 
-                            -1.570451f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_1", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f,
+    instance.registerEObj( "sgbg_r1d3_t2_ball1", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
-    instance->registerEObj( "unknown_1", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f,
+    instance.registerEObj( "sgbg_r1d3_t2_ball1_1", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
-    instance->registerEObj( "sgbg_r1d3_t2_ball1", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f },
+    instance.registerEObj( "sgvf_r1d3_b0435", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
-    // States -> s_ball_def s_ball_anim
+    instance.registerEObj( "unknown_2", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_r1d3_t2_ball1_1", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f },
+    instance.registerEObj( "sgvf_r1d3_b0435_1", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
-    // States -> s_ball_def s_ball_anim
+    instance.registerEObj( "unknown_3", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1d3_b0435", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f },
+    instance.registerEObj( "sgbg_r1d3_t2_ball1_2", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
+    instance.registerEObj( "sgvf_r1d3_b0435_2", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f,
+    // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
-                            0.000000f );
+    instance.registerEObj( "unknown_4", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1d3_b0435_1", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f },
+    instance.registerEObj( "unknown_5", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_6", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f, 0.000000f ); 
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
+    instance.registerEObj( "unknown_7", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f,
+    instance.registerEObj( "unknown_8", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_9", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_r1d3_t2_ball1_2", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f },
+    instance.registerEObj( "unknown_10", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_11", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f, 0.000000f ); 
-    // States -> s_ball_def s_ball_anim
+    instance.registerEObj( "unknown_12", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_r1d3_b0435_2", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f },
+    instance.registerEObj( "unknown_13", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f, 0.000000f ); 
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
+    instance.registerEObj( "unknown_14", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f, 0.554992f ); 
-    instance->registerEObj( "unknown_4", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_5", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f }, 0.991760f, 0.126302f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_6", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f,
+    instance.registerEObj( "sgvf_r1d3_b0498", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> ring_off (id: 2) ring_off_anim (id: 3) ring_pop (id: 4) ring_pop_anim (id: 5) 
-    instance->registerEObj( "unknown_7", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f,
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f, -1.195699f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_8", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_9", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f,
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            0.000000f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_11", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f,
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f,
-                            0.554992f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f },
-                            0.991760f, 0.126302f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_r1d3_b0498", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f,
-                            0.000000f );
-    // States -> ring_off ring_off_anim ring_pop ring_pop_anim
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f,
-                            -1.195699f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f, 0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( Snowcloak );

src/scripts/instances/dungeons/SohmAl.cpp

@@ -9,23 +9,52 @@ class SohmAl :
 public:
   SohmAl() :
     Sapphire::ScriptAPI::InstanceContentScript( 37 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -142.306107f, 11.741690f, 188.300797f }, 1.000000f, 0.660768f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5777776, 4, { -146.759598f, 9.382987f, 191.177994f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5777778, 4, { -126.024696f, 11.736150f, 144.580200f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 165.208603f, 137.478806f, -62.228100f }, 1.000000f, -0.155188f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5777792, 4, { 166.178696f, 137.607697f, -62.706631f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 5777793, 4, { 180.090302f, 138.237793f, -115.812103f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -112.464798f, 348.165985f, -368.176514f }, 1.000000f, 0.335726f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5777990, 4, { -112.426399f, 348.165985f, -371.392487f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5777991, 4, { -89.965149f, 348.204498f, -416.112213f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -92.610641f, 348.164886f, -410.511993f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2005284, 5773453, 4, { -274.538086f, -4.016628f, 191.237701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2005278, 5772621, 4, { -253.212296f, -2.894600f, 189.267303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005285, 5773460, 4, { -196.123306f, 3.106796f, 187.990906f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005286, 5773461, 4, { -171.931305f, 2.815973f, 206.485794f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005279, 5772623, 4, { -165.063995f, 4.074061f, 197.945007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005280, 5852453, 4, { 335.063385f, 114.335999f, -89.093300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005281, 5777403, 4, { 247.495102f, 126.954300f, -30.577419f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005282, 5773504, 4, { -173.859894f, 324.834686f, -273.653503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005283, 5773503, 4, { -191.639694f, 329.656799f, -321.158691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5777084, 5, { -267.602997f, -18.376320f, 282.751190f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -278.421387f, -17.669189f, 277.700714f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( SohmAl );

src/scripts/instances/dungeons/SohmAlHard.cpp

@@ -9,23 +9,72 @@ class SohmAlHard :
 public:
   SohmAlHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 49 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6610531, 4, { 171.484497f, 137.748795f, 239.483704f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 174.120697f, 137.590607f, 236.701706f }, 0.991760f, 0.698132f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007599, 6610540, 4, { 162.998398f, 137.748596f, 274.239502f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6613704, 4, { 299.153107f, 111.986000f, 138.189499f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 301.151306f, 112.000000f, 141.222107f }, 0.991760f, -0.556715f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007600, 6613798, 4, { 284.901794f, 112.000000f, 109.136398f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2007648, 6621383, 4, { 128.328293f, 107.293800f, -303.903107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007649, 0, 4, { 169.258698f, 106.695999f, -298.126007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007650, 0, 4, { 168.423599f, 108.900002f, -315.103485f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007651, 0, 4, { 167.744797f, 109.165802f, -335.555908f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6631462, 4, { 128.893707f, 107.000000f, -274.034393f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 127.962402f, 107.223801f, -277.597412f }, 0.991760f, -0.000000f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031", 2007706, 6653690, 4, { -198.779297f, 329.243896f, 33.463009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_1", 2007706, 6653700, 4, { -206.605194f, 329.253998f, 59.786411f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_2", 2007706, 6653718, 4, { -190.572800f, 329.253998f, 54.758789f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_3", 2007706, 6653721, 4, { -169.511398f, 324.396088f, 88.214813f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_4", 2007706, 6653723, 4, { -154.978302f, 324.396088f, 84.108612f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_5", 2007706, 6653726, 4, { -115.709198f, 318.959412f, 108.811996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007735, 6572900, 4, { -188.843201f, 329.253998f, 66.614899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007736, 6572901, 4, { -95.983841f, 318.012787f, 134.955994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007765, 0, 4, { -166.002899f, 324.396088f, 99.648300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1096", 2007785, 6735263, 4, { -113.389900f, 346.242401f, -11.429080f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007784, 0, 4, { -185.825699f, 329.150208f, 67.756607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007784, 0, 4, { -95.353699f, 317.812805f, 138.109406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007737, 6572914, 4, { 271.778503f, 120.866699f, 247.657700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007738, 6572915, 4, { 318.409912f, 114.000099f, 174.170197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007784, 0, 4, { 271.381592f, 121.015800f, 246.143295f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007784, 0, 4, { 317.092896f, 114.000000f, 172.080200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2007739, 6583747, 4, { 170.824707f, 125.108597f, -116.025803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007740, 6583766, 4, { 87.968140f, 114.976700f, -165.190399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2007741, 6583828, 4, { 128.564804f, 107.608704f, -252.169403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007761, 0, 4, { 107.591301f, 114.427399f, -119.840599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2007773, 6583797, 4, { 137.386398f, 120.578796f, -148.604599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007774, 6583799, 4, { 91.874512f, 115.007202f, -129.728394f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2007775, 6648314, 4, { 79.667358f, 113.878098f, -201.079605f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2007776, 6648318, 4, { 104.478500f, 109.971703f, -225.310898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1096_1", 2007785, 6735374, 4, { 202.686295f, 126.422096f, -89.904701f }, 0.991760f, 0.698132f ); 
+    instance.registerEObj( "unknown_24", 2007784, 0, 4, { 87.159088f, 115.000000f, -167.944199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007784, 0, 4, { 128.283905f, 106.994301f, -255.937302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6610262, 5, { -108.575996f, 348.171692f, -39.539310f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -115.366699f, 348.201599f, -26.746000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 127.929398f, 107.364899f, -323.381989f }, 0.991760f, -0.017306f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( SohmAlHard );

src/scripts/instances/dungeons/SohrKhai.cpp

@@ -9,23 +9,58 @@ class SohrKhai :
 public:
   SohrKhai() :
     Sapphire::ScriptAPI::InstanceContentScript( 44 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6258645, 4, { 400.881195f, -19.484011f, -332.214996f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 400.118713f, -18.543800f, -338.582886f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007078, 6220718, 4, { -400.506195f, 0.390429f, 82.229874f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007079, 6220719, 4, { -400.289886f, 0.381470f, -77.470093f }, 0.991760f, -1.567142f ); 
+    instance.registerEObj( "unknown_3", 2007189, 0, 4, { -425.070587f, -0.015320f, 5.569519f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007084, 6241486, 4, { 377.864990f, 0.390429f, 352.375702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007087, 6242639, 4, { 399.851196f, -58.700001f, -128.611893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007088, 6242640, 4, { 363.607697f, -38.700001f, -242.258194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007089, 6242641, 4, { 400.331604f, -18.700001f, -336.562897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007090, 6229304, 4, { 423.391998f, -40.024479f, -205.523697f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6258669, 4, { -400.654388f, 9.235634f, -135.696106f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007082, 6258670, 4, { -400.434387f, 8.000000f, -177.220200f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { -400.177612f, 8.431900f, -137.820801f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007083, 6238460, 4, { -401.279297f, 9.299995f, -184.260300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6258680, 4, { 399.753113f, 9.358741f, 161.151505f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 400.071198f, 9.620000f, 156.602402f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007085, 6242340, 4, { 397.968506f, 9.664823f, 157.574600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007086, 6241485, 4, { 398.938812f, 24.959961f, 85.423576f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007158, 6241490, 4, { 407.500000f, 24.959999f, 89.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_15", 2007159, 6241491, 4, { 407.500000f, 24.959999f, 99.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_16", 2007160, 6241492, 4, { 407.500000f, 24.959999f, 109.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_17", 2007161, 6241493, 4, { 407.500000f, 24.959999f, 119.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_18", 2007162, 6241489, 4, { 392.500000f, 24.959999f, 89.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_19", 2007163, 6241488, 4, { 392.500000f, 24.959999f, 99.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2007164, 6241487, 4, { 392.500000f, 24.959999f, 109.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_21", 2007165, 6241484, 4, { 392.500000f, 24.959999f, 119.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Entrance", 2000182, 6258660, 5, { -406.742615f, -8.000000f, 164.927795f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -393.089386f, -8.000000f, 150.811401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 399.538910f, -50.000011f, -494.319092f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( SohrKhai );

src/scripts/instances/dungeons/TheAery.cpp

@@ -9,23 +9,50 @@ class TheAery :
 public:
   TheAery() :
     Sapphire::ScriptAPI::InstanceContentScript( 39 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5754325, 4, { 346.791687f, 93.919189f, -178.606903f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005233, 5754326, 4, { 317.558105f, 93.945251f, -180.372498f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 345.215607f, 93.945251f, -178.963303f }, 1.000000f, -0.581172f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 5795105, 4, { 40.665161f, 59.433842f, 65.873169f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2005234, 5795134, 4, { -14.039410f, 61.140190f, 54.695210f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002587, 0, 4, { 39.169510f, 59.433949f, 66.247253f }, 1.300000f, -1.500298f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5762428, 4, { 37.260880f, 148.068100f, -236.237595f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 35.001831f, 148.194504f, -233.032303f }, 1.000000f, -0.002372f ); 
+    instance.registerEObj( "unknown_3", 2005542, 0, 4, { 36.301151f, 148.393906f, -242.999893f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2006454, 0, 4, { 32.698120f, 148.397095f, -251.838501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5724494, 5, { 136.459106f, 67.985649f, 171.436401f }, 1.000000f, -1.570451f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 144.406906f, 67.985611f, 177.100906f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 21.307430f, 148.274002f, -283.827087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005222, 5685356, 4, { 267.117188f, 64.682983f, 47.219650f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2005223, 5685357, 4, { 358.511414f, 81.162720f, -120.381798f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2005224, 5821951, 4, { 131.793304f, 5.889650f, -103.881500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005225, 5821943, 4, { 50.821239f, 55.531479f, 63.561810f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2005438, 5851315, 4, { -77.756859f, 91.481842f, -15.425310f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi_1", 2005439, 5851342, 4, { 82.891663f, 108.510201f, -49.804409f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi_2", 2005540, 5864523, 4, { 33.827099f, 134.430405f, -194.964005f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheAery );

src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp

@@ -9,23 +9,62 @@ class TheAetherochemicalResearchFacility :
 public:
   TheAetherochemicalResearchFacility() :
     Sapphire::ScriptAPI::InstanceContentScript( 38 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Liftterminal_1", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftterminal_2", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheAetherochemicalResearchFacility );

src/scripts/instances/dungeons/TheAntitower.cpp

@@ -9,23 +9,81 @@ class TheAntitower :
 public:
   TheAntitower() :
     Sapphire::ScriptAPI::InstanceContentScript( 43 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 252.045807f, -9.475893f, -181.933304f }, 0.991760f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6169321, 4, { 255.394501f, -8.467778f, -179.715897f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6169306, 4, { -367.917297f, 325.000000f, -225.755905f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -365.057709f, 325.000000f, -230.778107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2006816, 6169309, 4, { -367.727386f, 325.000000f, -267.544891f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2006858, 0, 4, { -364.583893f, 324.971405f, -250.263199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2006817, 6169316, 4, { 207.573303f, -22.000000f, 137.064407f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6169315, 4, { 163.478195f, -21.493710f, 135.478806f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 165.865494f, -22.000000f, 137.572006f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_4", 2006767, 6215870, 4, { -319.905396f, 220.000000f, 144.542892f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2006771, 6215871, 4, { -351.689087f, 255.000000f, 14.809160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2006778, 6215872, 4, { -361.023285f, 290.000000f, -120.754402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006781, 6112286, 4, { 202.549393f, 2.000032f, 188.466202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006782, 6112287, 4, { 190.864197f, 1.999979f, 180.727493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006783, 6112293, 4, { 181.429306f, 1.899876f, 187.239197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006786, 6112290, 4, { 138.231400f, -16.006710f, 145.799896f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2006787, 6112291, 4, { 125.191902f, -16.000000f, 143.181503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006788, 6112288, 4, { 124.527199f, -16.000000f, 132.912994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006789, 6112289, 4, { 137.132797f, -16.006710f, 128.862396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc08", 2006790, 6168912, 4, { 143.049393f, -16.000000f, 136.666702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc01", 2006994, 6220274, 4, { 156.748901f, -3.960001f, 175.039703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc01_1", 2006995, 6220275, 4, { 151.476196f, -3.952148f, 182.940308f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc02", 2006996, 6220281, 4, { 154.570801f, -3.951959f, 179.952393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc02_1", 2006997, 6220282, 4, { 132.225601f, -15.960000f, 142.602600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007012, 6107601, 4, { 215.289795f, -22.099991f, 137.138306f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006791, 6215456, 4, { 141.712997f, 22.840740f, -75.213570f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006792, 6215659, 4, { 143.769394f, 22.262880f, -82.780273f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2006793, 6215458, 4, { 176.529694f, 12.734810f, -76.608017f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006794, 6215660, 4, { 175.971298f, 13.065370f, -83.629440f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2006795, 6140680, 4, { 262.401794f, -0.700000f, -74.295052f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2006796, 6140674, 4, { 262.532196f, -0.700000f, -86.662819f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2006797, 6123756, 4, { 262.633514f, -0.700000f, -79.584007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2006798, 0, 4, { 291.762695f, -2.200014f, -76.847649f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2006799, 0, 4, { 298.066406f, -2.151550f, -76.649200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2006800, 0, 4, { 298.579895f, -2.037392f, -84.721710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2006801, 6215463, 4, { 298.707794f, -2.062215f, -111.243301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2006802, 6215464, 4, { 291.473785f, -2.200000f, -111.318298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2006803, 6215465, 4, { 298.705597f, -2.065336f, -116.301102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2006804, 6215466, 4, { 291.648193f, -2.200000f, -116.725502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2006805, 6215467, 4, { 303.031708f, -0.700000f, -133.974594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2006806, 6215468, 4, { 286.195709f, -0.700000f, -132.797195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2006807, 6215469, 4, { 303.791687f, -0.717224f, -138.384094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2006808, 6215470, 4, { 286.152313f, -0.717224f, -136.736099f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_33", 2006809, 6215471, 4, { 303.913788f, -0.717224f, -142.473495f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_34", 2006810, 6215472, 4, { 286.518585f, -0.717224f, -140.550903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_35", 2006811, 6140683, 4, { 300.845215f, -0.700000f, -149.810699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2006812, 6140685, 4, { 289.275787f, -0.700000f, -149.729401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2006813, 6123759, 4, { 294.959503f, -0.700000f, -149.563904f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6168791, 5, { -303.646912f, 230.000000f, 280.401703f }, 1.000000f, -0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -293.381012f, 230.000000f, 269.617188f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 216.878998f, -9.458686f, -181.220200f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheAntitower );

src/scripts/instances/dungeons/TheAurumVale.cpp

@@ -9,56 +9,46 @@ class TheAurumVale :
 public:
   TheAurumVale() :
     Sapphire::ScriptAPI::InstanceContentScript( 5 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f,
+    instance.registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f, 1.503130f ); 
-                            1.503130f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_0", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_0", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f, 0.000048f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_1", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f, 0.000048f ); 
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-    instance->registerEObj( "unknown_1", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f },
+    // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheAurumVale );

src/scripts/instances/dungeons/TheBurn.cpp

@@ -0,0 +1,64 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheBurn :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheBurn() :
+    Sapphire::ScriptAPI::InstanceContentScript( 63 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7562183, 4, { -295.336395f, 19.206579f, -349.383911f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -299.301788f, 19.167589f, -351.730499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7359163, 4, { 259.879608f, 82.591408f, 308.727203f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7359164, 4, { 240.794296f, 81.018692f, 315.201813f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7359165, 4, { 213.139801f, 80.655479f, 309.588501f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7371780, 4, { 180.792404f, 65.073128f, 298.607605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7359160, 4, { 344.319214f, 96.692558f, 375.705902f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7359161, 4, { 326.647186f, 92.636917f, 388.177490f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7359162, 4, { 301.141815f, 90.127007f, 384.239014f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7371782, 4, { 277.238098f, 77.736717f, 361.668091f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7390924, 4, { 43.728119f, 20.060129f, 106.101601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7390916, 4, { 0.052692f, 36.060131f, -24.711960f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7384891, 4, { -169.030502f, 28.326990f, -242.422897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7393691, 4, { -171.168304f, 28.175030f, -240.856293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7384892, 4, { -306.576202f, 20.664431f, -338.984406f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7393692, 4, { -293.959106f, 20.483391f, -340.855804f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7561681, 4, { 177.235596f, 12.985350f, 195.044403f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7561686, 4, { 176.322296f, 13.041980f, 159.747299f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 174.092300f, 12.950240f, 197.852005f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7562060, 4, { 2.190432f, 34.066490f, -57.807091f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7562061, 4, { 1.902058f, 34.159721f, -82.991417f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2002735, 0, 4, { 0.000000f, 34.176800f, -59.299999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7546643, 4, { 0.000000f, 34.000000f, -70.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7558759, 5, { 428.524994f, 88.401329f, 447.618286f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 423.779907f, 86.908783f, 424.929901f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -300.334290f, 10.000000f, -414.183411f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheBurn );

src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp

@@ -9,23 +9,59 @@ class TheDrownedCityofSkalla :
 public:
   TheDrownedCityofSkalla() :
     Sapphire::ScriptAPI::InstanceContentScript( 58 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7068116, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 491.000000f, -14.000000f, 4.000000f }, 1.000000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7068596, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7068599, 4, { -194.500000f, -2.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 7072874, 4, { -220.044601f, -2.000000f, 3.151932f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009045, 0, 4, { -224.806396f, -2.000000f, 8.647594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.400000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7068491, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7068496, 4, { 135.000000f, 9.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2009046, 0, 4, { 111.907600f, 9.000000f, 4.017264f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04", 2007457, 7075163, 4, { -335.663391f, 1.815782f, -38.379379f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_1", 2007457, 7075164, 4, { -324.520203f, 1.008244f, -28.697809f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7032771, 4, { -380.099701f, 5.500000f, -16.441790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_2", 2007457, 7075174, 4, { -298.365204f, 1.706293f, -25.538429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_3", 2007457, 7075175, 4, { -290.733002f, 1.250000f, -27.983721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7065309, 4, { -273.437195f, 1.281705f, 3.216716f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_4", 2007457, 7132450, 4, { -322.497589f, 1.008244f, -34.442020f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_5", 2007457, 7132455, 4, { -293.498108f, 1.972912f, -19.170090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_6", 2007457, 7132456, 4, { -287.911407f, 1.972912f, -26.723471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7034067, 4, { -67.254761f, 3.500000f, -34.435638f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7065310, 4, { 68.873291f, 7.500000f, 3.740700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 0, 4, { 133.644806f, 9.000000f, 3.453697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7029084, 4, { 272.652802f, -12.000000f, 48.014309f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7032009, 4, { 276.325592f, -12.008910f, -34.378601f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7034222, 4, { 433.853088f, -15.937500f, 3.644273f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7042417, 5, { -488.282501f, -3.750000f, 2.201033f }, 1.000000f, 0.000000f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -457.918304f, -3.860892f, 14.784940f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheDrownedCityofSkalla );

src/scripts/instances/dungeons/TheDuskVigil.cpp

@@ -9,23 +9,71 @@ class TheDuskVigil :
 public:
   TheDuskVigil() :
     Sapphire::ScriptAPI::InstanceContentScript( 36 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5658893, 4, { -0.378468f, -0.000006f, 19.173130f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.473083f, -0.015320f, 21.194759f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005189, 5658883, 4, { 0.051215f, 0.000000f, -19.347589f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 191.935699f, -8.000000f, -97.548279f }, 1.143130f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5670058, 4, { 191.873398f, -8.000000f, -94.706589f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005190, 5670071, 4, { 192.629501f, -8.000000f, -145.825104f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2005319, 0, 4, { 191.294998f, -8.000000f, -126.640503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -69.815361f, 32.171459f, -368.314209f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5670105, 4, { -69.864067f, 32.000050f, -370.484314f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2005395, 0, 4, { -72.186203f, 32.000000f, -389.922302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -119.582703f, -47.846481f, 223.251007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -69.846916f, 32.000000f, -403.795990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5653670, 5, { -135.662598f, -48.859058f, 229.988297f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2005169, 5674328, 4, { -66.894547f, -5.577260f, 129.660202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005170, 5674333, 4, { -28.173691f, -5.988469f, 165.738907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005171, 5674334, 4, { 32.157242f, -8.242720f, 98.301018f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Coldsteellever", 2005172, 0, 4, { 9.864166f, -0.650611f, 48.260380f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Damagedwinch", 2005173, 5660757, 4, { -3.958177f, 1.907400f, 32.349579f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2005174, 5584415, 4, { -0.076084f, -0.115606f, 34.058880f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006185, 5912762, 4, { -131.761703f, -48.569462f, 225.451996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornjournalpage", 2005180, 0, 4, { 66.788696f, -3.996225f, -52.994629f }, 0.991760f, 1.343069f ); 
+    instance.registerEObj( "Tornjournalpage_1", 2005181, 0, 4, { 96.351990f, -8.050000f, -30.383080f }, 1.000000f, 1.112220f ); 
+    instance.registerEObj( "Tornjournalpage_2", 2005182, 0, 4, { 151.468704f, -7.345456f, -48.435421f }, 1.000000f, -0.025044f ); 
+    instance.registerEObj( "Tornjournalpage_3", 2005183, 0, 4, { 170.853394f, -7.671008f, -20.209290f }, 1.000000f, 0.034435f ); 
+    instance.registerEObj( "Tornjournalpage_4", 2005184, 0, 4, { 208.382401f, -8.050000f, -58.810051f }, 0.991760f, 0.103443f ); 
+    instance.registerEObj( "Barracksdoor", 2005177, 5584421, 4, { 158.730606f, -8.011047f, -24.266649f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Lordcommandersseat", 2005178, 5584424, 4, { 192.164307f, -8.050052f, -70.690117f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2005179, 5584425, 4, { 191.948196f, -8.000000f, -159.505096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005185, 5584476, 4, { 96.173714f, 24.000000f, -222.821701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005186, 5584485, 4, { 21.875490f, 28.000000f, -217.942505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005187, 5584486, 4, { -35.156700f, 32.000000f, -286.161285f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r2d1_b0622", 2005320, 5800343, 4, { 179.680298f, 16.000111f, -261.236206f }, 1.000000f, 0.000000f ); 
+    // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_1", 2005321, 5800818, 4, { 127.707603f, 20.323111f, -262.321411f }, 1.000000f, 0.000000f ); 
+    // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_2", 2005322, 5800840, 4, { 5.201134f, 28.557409f, -289.850006f }, 1.000000f, 0.000000f ); 
+    // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_3", 2005323, 5800842, 4, { -21.532181f, 32.000061f, -289.092407f }, 1.000000f, 0.000000f ); 
+    // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "unknown_14", 2005353, 5584312, 4, { -73.144119f, 32.000000f, -405.536011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chapeldoor", 2005357, 5584428, 4, { -69.550163f, 31.950060f, -291.505493f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheDuskVigil );

src/scripts/instances/dungeons/TheFractalContinuum.cpp

@@ -9,23 +9,93 @@ class TheFractalContinuum :
 public:
   TheFractalContinuum() :
     Sapphire::ScriptAPI::InstanceContentScript( 35 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5777077, 4, { 140.603302f, 2.700000f, 34.720928f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005259, 5777078, 4, { 106.765198f, 2.700000f, 53.335590f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 138.876297f, 2.700000f, 35.495899f }, 1.000000f, -1.051032f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5777135, 4, { -185.039200f, -0.000010f, 97.665123f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005260, 5777136, 4, { -143.174301f, -0.000001f, 86.487961f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -179.727097f, -0.015191f, 96.334610f }, 0.790818f, 1.311814f ); 
+    instance.registerEObj( "Biomassincubator", 2005480, 5627459, 4, { -143.238602f, 2.285363f, 101.305000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_1", 2005481, 5632316, 4, { -150.372604f, 2.650113f, 73.551849f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_2", 2005482, 5627460, 4, { -170.712601f, 2.379743f, 108.801201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_3", 2005483, 5632317, 4, { -178.309097f, 2.550030f, 81.099091f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005476, 5852048, 4, { -143.988998f, 0.000000f, 100.704399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005477, 5852047, 4, { -150.881500f, 0.000000f, 74.554863f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005478, 5852050, 4, { -170.231705f, 0.000000f, 108.158203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005479, 5852049, 4, { -177.203705f, 0.000000f, 81.434868f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -0.027993f, 46.596539f, -329.937805f }, 1.701462f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5777412, 4, { -0.735815f, 46.585819f, -331.464386f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.587201f, 0.167401f, 228.424301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.198364f, 46.585819f, -364.727509f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5615534, 5, { 1.419067f, -0.015320f, 234.058105f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganteleporter", 2005242, 5722042, 4, { 36.979809f, 1.210160f, 215.020599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005251, 5754030, 4, { 0.697166f, -0.000000f, 210.678497f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guidepanel", 2005252, 0, 4, { 189.739594f, 2.452829f, 125.865196f }, 0.991760f, 0.993538f ); 
+    instance.registerEObj( "Guidepanel_1", 2005253, 0, 4, { 225.485703f, 3.355857f, 61.434238f }, 1.000000f, -0.867772f ); 
+    instance.registerEObj( "Guidepanel_2", 2005254, 0, 4, { 158.995697f, 4.255857f, 31.260679f }, 1.000000f, -0.732914f ); 
+    instance.registerEObj( "unknown_8", 2005246, 5607049, 4, { 230.547394f, 0.900000f, 95.770508f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005247, 5607052, 4, { 228.780106f, 1.800000f, 59.805061f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005248, 5607058, 4, { 184.888702f, 1.800000f, 26.321140f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_1", 2005243, 5722173, 4, { 65.541313f, 3.869573f, 77.942459f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_2", 2005261, 5722056, 4, { 1.617853f, 1.549526f, 178.122406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2005257, 5581056, 4, { 130.087601f, 2.694753f, 39.807980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005425, 5829636, 4, { 124.304901f, 2.666066f, 55.191471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005250, 5810989, 4, { 2.160641f, 0.030060f, 207.184006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005249, 5614162, 4, { -211.984406f, 0.000000f, 104.404701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_3", 2005244, 5722174, 4, { -103.539803f, 1.217043f, 76.015160f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2005358, 5763607, 4, { -352.642700f, 1.499993f, 119.149300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005359, 5763630, 4, { -351.399994f, 1.480042f, 110.398903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2005360, 5763608, 4, { -349.473907f, 1.499977f, 99.800461f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005364, 5650881, 4, { -352.015686f, 1.499995f, 116.202499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005365, 5650883, 4, { -350.711609f, 1.499995f, 107.232002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2005366, 5819525, 4, { -348.442902f, 1.499981f, 98.183548f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2005361, 5814450, 4, { -288.068115f, -2.700021f, 113.654198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2005362, 5814433, 4, { -272.828888f, -2.700021f, 111.659203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2005363, 5814516, 4, { -268.089691f, -2.700021f, 117.225700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2005367, 5819526, 4, { -286.325989f, -2.700022f, 113.195000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2005368, 5650635, 4, { -271.312897f, -2.700021f, 112.812401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2005369, 5819527, 4, { -266.722595f, -2.700022f, 118.620300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Informationpanel", 2005255, 0, 4, { -230.635101f, 1.639121f, 176.464996f }, 1.000000f, 0.397825f ); 
+    instance.registerEObj( "Informationpanel_1", 2005256, 0, 4, { -348.181610f, 1.613136f, 135.909897f }, 0.991760f, -1.475439f ); 
+    instance.registerEObj( "Informationpanel_2", 2005674, 0, 4, { -345.653900f, 1.626497f, 98.636726f }, 0.991760f, -0.932389f ); 
+    instance.registerEObj( "Informationpanel_3", 2005675, 0, 4, { -324.880798f, 1.642515f, 68.081039f }, 1.000000f, -0.418331f ); 
+    instance.registerEObj( "unknown_27", 2005268, 5652510, 4, { -51.865479f, 53.147091f, -208.636703f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2005269, 5652511, 4, { 54.518261f, 53.147091f, -208.602707f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_29", 2005270, 5643840, 4, { -149.095901f, 53.147091f, -378.377991f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_30", 2005271, 5652506, 4, { -96.421806f, 53.147091f, -467.216003f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_31", 2005272, 5652515, 4, { 149.401093f, 53.147091f, -378.561096f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2005273, 5652509, 4, { 98.842590f, 53.164989f, -466.923706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2005318, 0, 4, { -8.227161f, 53.165001f, -195.021896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2005329, 5670473, 4, { 130.894806f, 53.165001f, -422.856415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2005330, 5670424, 4, { 3.461859f, 53.165001f, -200.625595f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2005331, 5670459, 4, { -131.889603f, 53.165001f, -421.513885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Emeraldcontrolunit", 2005262, 5819696, 4, { 127.567200f, 55.922291f, -423.497711f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Violetcontrolunit", 2005263, 5819695, 4, { -0.232653f, 56.361301f, -203.010300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Crimsoncontrolunit", 2005264, 5819698, 4, { -126.342796f, 55.969429f, -423.260895f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheFractalContinuum );

src/scripts/instances/dungeons/TheFractalContinuumHard.cpp

@@ -9,23 +9,63 @@ class TheFractalContinuumHard :
 public:
   TheFractalContinuumHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 60 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.015320f, 46.585819f, -330.098389f }, 1.693726f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7178420, 4, { 0.000000f, 46.597000f, -330.000000f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 7154681, 4, { -336.809601f, -4.091716f, 270.330200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7154670, 4, { -356.951599f, -4.091716f, 262.314697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7154683, 4, { -357.732788f, -4.091716f, 240.942001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7178527, 4, { -322.993408f, -14.000000f, 237.739197f }, 1.000000f, 0.942478f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -323.681213f, -13.915580f, 238.152405f }, 0.520000f, 0.942478f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7178530, 4, { -363.058411f, -14.000000f, 250.964600f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2009284, 0, 4, { -334.828705f, -13.901060f, 251.636505f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2009285, 0, 4, { -348.204712f, -13.892940f, 243.150803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009286, 0, 4, { -341.067108f, -13.892940f, 237.005600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7178955, 4, { -0.015300f, -0.015300f, 318.593109f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { -0.015320f, -0.015320f, 318.593109f }, 1.388489f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7170984, 5, { -168.370193f, 53.116581f, -447.149506f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -165.940704f, 53.142620f, -435.801300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, 285.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7141324, 4, { -0.193053f, 53.508301f, -157.354904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7174264, 4, { 57.117458f, 53.142620f, -213.119202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7170395, 4, { -0.015320f, 46.597000f, -350.082092f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter", 2009278, 0, 4, { 0.002865f, 46.599701f, -377.001007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7141398, 4, { -147.123795f, 53.529110f, -369.004913f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7141397, 4, { -82.715157f, 42.516201f, -199.536606f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7141396, 4, { 57.117241f, 53.527908f, -213.116699f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornnavigatorslogpage", 2009412, 0, 4, { -132.524704f, 53.177608f, -407.217499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7141895, 4, { -305.774811f, -0.751164f, 94.720772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7167075, 4, { -291.432098f, -0.015320f, 191.088593f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornnavigatorslogpage_1", 2009413, 0, 4, { -202.481003f, 0.052476f, 171.440704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7170446, 4, { 78.733200f, 20.000000f, 245.622299f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7170445, 4, { 29.878000f, 12.000000f, 404.197998f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal", 2009276, 7188820, 4, { 67.426903f, 12.000000f, 331.441711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal_1", 2009277, 7188819, 4, { 0.000000f, 12.000000f, 370.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7336140, 4, { 69.068199f, 12.000000f, 332.207001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007457, 7336141, 4, { 0.000000f, 12.000000f, 371.396515f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 7548894, 4, { -291.105286f, 0.234064f, 193.068497f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheFractalContinuumHard );

src/scripts/instances/dungeons/TheGhimlytDark.cpp

@@ -0,0 +1,78 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheGhimlytDark :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheGhimlytDark() :
+    Sapphire::ScriptAPI::InstanceContentScript( 64 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_g3d5_b1487", 2007457, 7721506, 4, { -175.569107f, 59.999989f, 59.862808f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_1", 2007457, 7721519, 4, { -170.569107f, 59.999989f, 68.526520f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_2", 2007457, 7721520, 4, { -175.569107f, 59.999989f, 77.183289f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_3", 2007457, 7721521, 4, { -185.569199f, 59.999989f, 77.183327f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_4", 2007457, 7721522, 4, { -190.569000f, 59.999989f, 68.526497f }, 1.000000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_5", 2007457, 7721523, 4, { -185.569107f, 59.999989f, 59.862801f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7724516, 4, { -163.378296f, 59.999989f, 64.744011f }, 0.991760f, 1.347288f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7724515, 4, { -180.569107f, 60.037628f, 90.162064f }, 1.000000f, -0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -180.569107f, 59.999989f, 88.463638f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7705901, 4, { 139.729706f, 30.000000f, -48.877701f }, 1.000000f, 0.392699f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7705900, 4, { 147.847595f, 30.000000f, -40.759789f }, 1.000000f, 1.178098f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7705899, 4, { 147.847595f, 30.000000f, -29.279261f }, 1.000000f, 1.178097f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7705898, 4, { 139.729706f, 30.000000f, -21.161320f }, 1.000000f, 0.392699f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7705897, 4, { 128.249207f, 30.000000f, -21.161289f }, 1.000000f, -0.392699f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7705896, 4, { 120.131203f, 30.000000f, -29.279249f }, 1.000000f, -1.178097f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7705895, 4, { 120.131203f, 30.000000f, -40.759762f }, 1.000000f, -1.178097f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7705892, 4, { 128.249100f, 30.000000f, -48.877689f }, 1.000000f, -0.392699f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7706030, 4, { 133.989395f, 29.983999f, -35.019501f }, 1.000000f, 0.000047f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7724537, 4, { 159.954803f, 30.000000f, -60.694111f }, 0.991760f, 0.795487f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7724536, 4, { 134.000000f, 30.475479f, 7.876453f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 134.000000f, 29.999981f, 4.287893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7730799, 4, { 370.999512f, -15.000000f, -265.005005f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7724557, 4, { 370.229187f, 13.917020f, -237.466904f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_12", 2002735, 0, 4, { 370.229187f, 13.833620f, -238.717896f }, 0.600000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7598910, 4, { -291.394592f, 86.251953f, 197.855392f }, 0.991760f, -1.569070f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7691067, 4, { -192.308197f, 66.698097f, 120.723701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7604094, 4, { 20.660540f, 60.425789f, 43.816551f }, 1.000000f, 0.947097f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7604733, 4, { 131.345901f, 35.000259f, 25.139370f }, 1.000000f, 0.296706f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7603911, 4, { -116.000000f, 53.488338f, 59.999962f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7604084, 4, { -86.049500f, 57.959660f, 64.131699f }, 1.000000f, 0.959931f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7604086, 4, { -86.437569f, 56.909809f, 30.212589f }, 1.000000f, -0.645772f ); 
+    instance.registerEObj( "unknown_20", 2007457, 7638321, 4, { -42.599991f, 55.776421f, 14.799990f }, 1.000000f, -1.361357f ); 
+    instance.registerEObj( "unknown_21", 2007457, 7686957, 4, { -15.355400f, 57.836029f, 16.085300f }, 1.000000f, -0.191754f ); 
+    instance.registerEObj( "unknown_22", 2007457, 7686959, 4, { -19.532499f, 58.489460f, 44.765591f }, 1.000000f, -1.529152f ); 
+    instance.registerEObj( "unknown_23", 2007457, 7820490, 4, { 317.389313f, 14.592110f, -118.072304f }, 1.000000f, 1.235276f ); 
+    instance.registerEObj( "unknown_24", 2007457, 7733551, 4, { 371.195312f, 5.036287f, -161.166000f }, 1.000000f, 1.235276f ); 
+    instance.registerEObj( "sgvf_g3d5_b1617", 2007457, 7842118, 4, { 233.771500f, 20.000000f, -93.090919f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7705976, 5, { -414.021515f, 106.963402f, 158.088501f }, 1.000000f, 0.354109f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 371.029907f, -15.000000f, -278.640900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -410.192993f, 107.021599f, 165.150101f }, 0.991760f, 0.354115f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheGhimlytDark );

src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp

@@ -9,23 +9,64 @@ class TheGreatGubalLibrary :
 public:
   TheGreatGubalLibrary() :
     Sapphire::ScriptAPI::InstanceContentScript( 31 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 353.541412f, -39.250000f, -59.553089f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5419624, 4, { 350.673187f, -39.000000f, -60.588070f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "OnGarleanHierarchyVolume1", 2005891, 0, 4, { -199.611694f, 6.900000f, -56.354649f }, 1.000000f, -0.298927f ); 
+    instance.registerEObj( "OnGarleanHierarchyVolume2", 2005892, 0, 4, { -72.116417f, 0.900000f, -9.577726f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Essences&Permutations", 2005893, 0, 4, { 54.309052f, -8.099999f, 62.262531f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "OvertheHorizon", 2005894, 0, 4, { 113.656601f, -8.153534f, 83.276863f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leatherbounddiary", 2005895, 0, 4, { 253.342499f, -24.000000f, -16.578369f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leatherbounddiary_1", 2005896, 0, 4, { 252.532898f, -40.000000f, -78.517921f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5419606, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2005019, 5419607, 4, { 22.309731f, 0.000000f, -0.124082f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_2", 2005316, 5774736, 4, { -11.221270f, 0.000000f, -6.534676f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2d3_dbook01", 2005328, 5815254, 4, { -10.516900f, 0.000000f, -1.875240f }, 1.000000f, 0.000000f ); 
+    // States -> step_all_off (id: 15) step1_all_on (id: 16) step1_side_off (id: 17) step2_all_on (id: 18) step2_side_off (id: 19) step3_all_on (id: 20) step3_side_off (id: 21) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5419612, 4, { 178.337997f, -8.000000f, 53.739559f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2005020, 5419614, 4, { 179.630203f, -8.000000f, 0.354116f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 177.873505f, -8.000000f, 52.121300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d3_a0_gmc17", 2005354, 5852274, 4, { 177.539993f, -7.995000f, 32.977421f }, 1.000000f, 0.000000f ); 
+    // States -> bk03_def (id: 5) bk03_on (id: 6) bk03_on_anim (id: 8) bk03_brt (id: 11) bk03_brt_anim (id: 12) bk03_brt_ofanim (id: 14) bk03_dead (id: 15) bk03_dead_anim (id: 16) 
+    instance.registerEObj( "unknown_4", 2004942, 5033535, 4, { -316.612915f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2004949, 5033537, 4, { -173.408096f, 12.000000f, -33.362572f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2004956, 5033536, 4, { -48.355900f, -0.015320f, 0.747620f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2004957, 5033538, 4, { 43.900150f, -0.015320f, -1.083435f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2004958, 5004619, 4, { 82.139282f, -8.011047f, 69.748901f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004959, 5004620, 4, { 117.387604f, -9.018127f, 69.291138f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d3_a0_gmc04", 2004960, 5336977, 4, { 138.888000f, -9.018127f, 87.533859f }, 0.991760f, 0.000048f ); 
+    // States -> book_def (id: 3) book_off (id: 4) book_off_anim (id: 5) 
+    instance.registerEObj( "unknown_10", 2004962, 5033543, 4, { 156.328598f, -9.018127f, 95.628304f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2004963, 5004621, 4, { 176.257004f, -8.011047f, -9.414856f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2004964, 5773506, 4, { 297.779785f, -24.002501f, -43.308731f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2004965, 5004586, 4, { 325.666107f, -39.017399f, -59.098209f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5330520, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 393.697998f, -39.047909f, -59.586491f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheGreatGubalLibrary );

src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp

@@ -9,23 +9,74 @@ class TheGreatGubalLibraryHard :
 public:
   TheGreatGubalLibraryHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 47 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6493754, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f, -1.570451f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 381.624786f, 0.033357f, -154.061295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007511, 6493828, 4, { 387.818298f, 0.057078f, -146.448898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007513, 6401215, 4, { 361.552795f, 0.056058f, -150.124802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007512, 0, 4, { 375.502197f, 0.033357f, -161.256607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "TheBoyandtheDragonGay", 2007490, 0, 4, { -171.036804f, 11.988180f, -36.461899f }, 0.991760f, -0.298891f ); 
+    instance.registerEObj( "OfLovesUnrequited", 2007491, 0, 4, { -59.891842f, 0.931515f, 7.942907f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "OvertheHorizonRedux", 2007492, 0, 4, { 61.203861f, -8.102600f, 81.803589f }, 0.991760f, 0.364949f ); 
+    instance.registerEObj( "OntheCulinaryApplicationsofCoblyns", 2007493, 0, 4, { 148.354507f, -20.004641f, 27.979099f }, 0.991760f, 0.799271f ); 
+    instance.registerEObj( "ProceedingsoftheCouncilofMagi", 2007494, 0, 4, { 91.658020f, -14.648220f, -87.438591f }, 0.991760f, 1.229280f ); 
+    instance.registerEObj( "TheBoyandtheDragonGayALiteraryAnalysis", 2007495, 0, 4, { 261.494995f, -2.524073f, -175.726593f }, 0.991760f, 0.697643f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6331565, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007475, 6331566, 4, { 23.113720f, 0.000000f, -0.647191f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6331601, 4, { 178.337997f, -8.000000f, -0.391663f }, 1.000000f, 0.000000f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 177.825394f, -8.000000f, 2.100500f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007479, 6331602, 4, { 178.545807f, -8.011047f, 54.734009f }, 0.991760f, 0.000048f ); 
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2007510, 6402810, 4, { 172.105392f, -7.900000f, 35.499100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0998", 2007509, 6545426, 4, { 177.732605f, -7.900000f, 35.055210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007546, 0, 4, { 177.791000f, -7.900000f, 27.118000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007473, 6399834, 4, { -172.812195f, 12.000000f, -33.611160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007474, 6399835, 4, { -49.912289f, -0.015320f, 0.167786f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007478, 6400099, 4, { 162.976501f, -20.000000f, -2.988169f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007477, 6399813, 4, { 76.753242f, -8.000000f, 70.675980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007476, 6399648, 4, { 80.002747f, -4.000000f, -0.293232f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007486, 6403597, 4, { 182.834000f, -7.950000f, -154.079605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007480, 6400740, 4, { 167.797897f, -7.950000f, -161.345093f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007481, 6400741, 4, { 166.957901f, -7.949998f, -145.330505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007482, 6400744, 4, { 168.266495f, -7.950000f, -153.578705f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007483, 6400763, 4, { 171.314407f, -7.950000f, -162.037598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007484, 6400774, 4, { 171.048599f, -7.950000f, -145.992599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007485, 6400779, 4, { 171.229401f, -7.950000f, -153.966995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007487, 6401038, 4, { 249.953903f, -3.950001f, -153.130600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007488, 6400896, 4, { 278.625397f, -3.950001f, -153.498093f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007489, 6485974, 4, { 378.746613f, 0.033356f, -154.978699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007552, 6573181, 4, { 365.530090f, 0.056058f, -151.957199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007553, 6573293, 4, { 163.576996f, -7.950000f, -161.503799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007554, 6573290, 4, { 167.881699f, -7.950000f, -147.169601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007555, 6573294, 4, { 163.131195f, -7.950000f, -146.200302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2007558, 6573550, 4, { 138.722900f, -7.950000f, -161.914902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007559, 6573551, 4, { 138.516602f, -7.950000f, -145.595200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6331751, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f, 0.000048f ); 
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheGreatGubalLibraryHard );

src/scripts/instances/dungeons/TheKeeperoftheLake.cpp

@@ -9,82 +9,59 @@ class TheKeeperoftheLake :
 public:
   TheKeeperoftheLake() :
     Sapphire::ScriptAPI::InstanceContentScript( 32 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f,
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f, -0.000000f ); 
-                            -0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f },
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_1", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f, 0.000000f ); 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "sgbg_l1d1_q1_arm04", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f,
+    // States -> arm04_def (id: 2) arm04_def_anim (id: 3) arm04_down (id: 4) arm04_down_anim (id: 5) 
-                            0.000000f );
+    instance.registerEObj( "unknown_2", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_l1d1_q1_arm04", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f },
+    instance.registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_3", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f, 0.000048f ); 
-    // States -> arm04_def arm04_def_anim arm04_down arm04_down_anim
+    instance.registerEObj( "unknown_4", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f,
+    instance.registerEObj( "unknown_5", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_6", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f },
+    instance.registerEObj( "Magitekterminal_1", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f }, 0.991760f, 0.000048f ); 
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_7", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_3", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f,
+    instance.registerEObj( "unknown_8", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "unknown_9", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_4", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f,
+    instance.registerEObj( "unknown_10", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f, 0.000048f ); 
-                            0.000000f );
+    instance.registerEObj( "sgbg_l1d1_q1_arm02", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_5", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f,
+    // States -> arm02_def (id: 2) arm02_def_anim (id: 3) arm02_des (id: 4) arm02_des_anim (id: 5) 
-                            0.000000f );
+    instance.registerEObj( "sgbg_l1d1_q1_arm03", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_6", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f,
+    // States -> arm03_def (id: 2) arm03_def_anim (id: 3) arm03_des (id: 4) arm03_des_anim (id: 5) 
-                            0.000000f );
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f, 1.175128f ); 
-    instance->registerEObj( "Magitekterminal_1", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f }, 1.000000f, 0.000000f ); 
-                            0.991760f, 0.000048f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_7", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_8", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f,
+    instance.registerEObj( "unknown_12", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f, -0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_9", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_10", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f, 0.079727f ); 
-    instance->registerEObj( "sgbg_l1d1_q1_arm02", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f },
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f, 0.000000f ); 
-    // States -> arm02_def arm02_def_anim arm02_des arm02_des_anim
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgbg_l1d1_q1_arm03", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f },
-                            1.000000f, 0.000000f );
-    // States -> arm03_def arm03_def_anim arm03_des arm03_des_anim
-    instance->registerEObj( "unknown_11", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f,
-                            1.175128f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_12", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f,
-                            0.079727f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f, 0.000048f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheKeeperoftheLake );

src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp

@@ -9,119 +9,79 @@ class TheLostCityofAmdapor :
 public:
   TheLostCityofAmdapor() :
     Sapphire::ScriptAPI::InstanceContentScript( 22 )
-  {
+  { }
-  }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f,
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f, -0.494801f ); 
-                            -0.494801f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f, -0.407391f ); 
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f,
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f, 0.000000f ); 
-                            -0.407391f );
+    instance.registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f, -0.357945f ); 
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Diabolicalgate_1", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f, -0.579334f ); 
-    instance->registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f,
+    instance.registerEObj( "Diabolicalgate_2", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f, -0.499409f ); 
-                            -0.357945f );
+    instance.registerEObj( "Diabolicalgate_3", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f, -0.520267f ); 
-    instance->registerEObj( "Diabolicalgate_1", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f,
+    instance.registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f, 0.406471f ); 
-                            -0.579334f );
+    instance.registerEObj( "Dubiouscoffer_1", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f, 1.180338f ); 
-    instance->registerEObj( "Diabolicalgate_2", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f,
+    instance.registerEObj( "Dubiouscoffer_2", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f, -1.160291f ); 
-                            -0.499409f );
+    instance.registerEObj( "Dubiouscoffer_3", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f, -1.185745f ); 
-    instance->registerEObj( "Diabolicalgate_3", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f,
+    instance.registerEObj( "Dubiouscoffer_4", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f, 1.247274f ); 
-                            -0.520267f );
+    instance.registerEObj( "Dubiouscoffer_5", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f, -0.423025f ); 
-    instance->registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f,
+    instance.registerEObj( "unknown_1", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f, 0.000048f ); 
-                            0.406471f );
+    instance.registerEObj( "unknown_2", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Dubiouscoffer_1", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f,
+    instance.registerEObj( "unknown_3", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f, 0.000000f ); 
-                            1.180338f );
+    instance.registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f, -1.568190f ); 
-    instance->registerEObj( "Dubiouscoffer_2", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f,
+    instance.registerEObj( "unknown_4", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f, 0.000048f ); 
-                            -1.160291f );
+    instance.registerEObj( "unknown_5", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "Dubiouscoffer_3", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d5_a3_kin03", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f }, 1.000000f, 0.000000f ); 
-                            -1.185745f );
+    // States -> plant_def (id: 2) plant_action_anim (id: 3) 
-    instance->registerEObj( "Dubiouscoffer_4", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f,
+    instance.registerEObj( "sgvf_f1d5_b0360", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f, 0.000000f ); 
-                            1.247274f );
+    // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
-    instance->registerEObj( "Dubiouscoffer_5", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f,
+    instance.registerEObj( "unknown_6", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f, 0.000000f ); 
-                            -0.423025f );
+    instance.registerEObj( "sgbg_f1d5_a3_kin03_1", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_1", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f,
+    // States -> plant_def (id: 2) plant_action_anim (id: 3) 
-                            0.000048f );
+    instance.registerEObj( "sgvf_f1d5_b0359", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_2", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f,
+    // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
-                            0.000000f );
+    instance.registerEObj( "unknown_7", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "unknown_3", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f,
+    instance.registerEObj( "sgbg_f1d5_a3_kin03_2", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    // States -> plant_def (id: 2) plant_action_anim (id: 3) 
-    instance->registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f,
+    instance.registerEObj( "sgvf_f1d5_b0358", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f, 0.000000f ); 
-                            -1.568190f );
+    // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
-    instance->registerEObj( "unknown_4", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f,
+    instance.registerEObj( "unknown_8", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    instance.registerEObj( "Treasurecoffer_1", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f, -0.789868f ); 
-    instance->registerEObj( "unknown_5", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f,
+    instance.registerEObj( "unknown_9", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_10", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d5_a3_kin03", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f },
+    instance.registerEObj( "unknown_11", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f, 0.000048f ); 
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_12", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f, 0.000048f ); 
-    // States -> plant_def plant_action_anim
+    instance.registerEObj( "unknown_13", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f, 0.000048f ); 
-    instance->registerEObj( "sgvf_f1d5_b0360", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f,
+    instance.registerEObj( "unknown_14", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f }, 1.000000f, 0.000000f ); 
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    instance->registerEObj( "unknown_6", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f,
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f, 0.000000f ); 
-                            0.000000f );
+    instance.registerEObj( "unknown_16", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgbg_f1d5_a3_kin03_1", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f },
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-    // States -> plant_def plant_action_anim
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "sgvf_f1d5_b0359", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f,
+    // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
-                            0.000000f );
+    instance.registerEObj( "unknown_17", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f, -1.570451f ); 
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
+    instance.registerEObj( "unknown_18", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f, 0.000000f ); 
-    instance->registerEObj( "unknown_7", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f,
+    instance.registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f, 0.000000f ); 
-                            0.000048f );
+    // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
-    instance->registerEObj( "sgbg_f1d5_a3_kin03_2", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f },
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f, 0.000000f ); 
-                            1.000000f, 0.000000f );
-    // States -> plant_def plant_action_anim
-    instance->registerEObj( "sgvf_f1d5_b0358", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f,
-                            0.000000f );
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
-    instance->registerEObj( "unknown_8", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f,
-                            -0.789868f );
-    instance->registerEObj( "unknown_9", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f, 0.000000f );
-    instance->registerEObj( "unknown_16", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_17", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "unknown_18", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f,
-                            0.000000f );
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
   }
 
 };
+
+EXPOSE_SCRIPT( TheLostCityofAmdapor );