diff --git a/sql/schema/schema.sql b/sql/schema/schema.sql index aca5718b..b0a5c6e7 100644 --- a/sql/schema/schema.sql +++ b/sql/schema/schema.sql @@ -517,17 +517,6 @@ CREATE TABLE `uniqueiddata` ( PRIMARY KEY(`NextId`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `zonepositions` ( - `id` int(11) NOT NULL, - `target_zone_id` int(11) NOT NULL, - `pos_x` float NOT NULL, - `pos_y` float NOT NULL, - `pos_z` float NOT NULL, - `pos_o` float NOT NULL, - `radius` int(11) NOT NULL DEFAULT '2', - PRIMARY KEY(`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; - CREATE TABLE `landplaceditems` ( `ItemId` INT(20) UNSIGNED NOT NULL, `PosX` FLOAT NOT NULL, diff --git a/src/scripts/action/common/ActionReturn6.cpp b/src/scripts/action/common/ActionReturn6.cpp index aedb0a38..539ba1a0 100644 --- a/src/scripts/action/common/ActionReturn6.cpp +++ b/src/scripts/action/common/ActionReturn6.cpp @@ -17,7 +17,7 @@ public: if( !action.getSourceChara()->isPlayer() ) return; - action.getSourceChara()->getAsPlayer()->returnToHomepoint(); + action.getSourceChara()->getAsPlayer()->teleport( action.getSourceChara()->getAsPlayer()->getHomepoint(), 3 ); } }; diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp index 7d9f835e..f849dc2a 100644 --- a/src/scripts/common/warptaxi/WarpTaxi.cpp +++ b/src/scripts/common/warptaxi/WarpTaxi.cpp @@ -22,7 +22,7 @@ public: void inner( Entity::Player& player, const Event::SceneResult& result ) { - if( result.numOfResults == 1 ) // exit +/* if( result.numOfResults == 1 ) // exit { eventMgr().eventFinish( player, 1310721, 0 ); eventMgr().eventFinish( player, getId(), 1 ); @@ -59,24 +59,24 @@ public: { eventMgr().playScene( player, 1310721, 0, HIDE_HOTBAR, { 1, 341 }, std::bind( &WarpTaxi::inner, this, std::placeholders::_1, std::placeholders::_2 ) ); - } + }*/ } void inner2( Entity::Player& player, uint64_t actorId ) { - eventMgr().playScene( player, getId(), 0, HIDE_HOTBAR, { 32529 }, + /* eventMgr().playScene( player, getId(), 0, HIDE_HOTBAR, { 32529 }, [this, actorId]( Entity::Player& player, const Event::SceneResult& result ) { eventMgr().eventStart( player, actorId, 1310721, Event::EventHandler::Nest, 1, 0 ); eventMgr().playScene( player, 1310721, 0, HIDE_HOTBAR, { 1, 341 }, std::bind( &WarpTaxi::inner, this, std::placeholders::_1, std::placeholders::_2 ) ); - } ); + } );*/ } void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); +/* auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); auto warp = exdData.getRow< Component::Excel::Warp >( eventId ); if( !warp ) @@ -85,7 +85,7 @@ public: // EXD TODO: Not sure Warpcondition is correct here eventMgr().eventStart( player, actorId, warp->data().WarpCondition, Event::EventHandler::Nest, 0, 0, std::bind( &WarpTaxi::inner2, this, std::placeholders::_1, std::placeholders::_2 ) ); - eventMgr().playScene( player, warp->data().WarpCondition, 0, HIDE_HOTBAR, { 7 }, nullptr ); + eventMgr().playScene( player, warp->data().WarpCondition, 0, HIDE_HOTBAR, { 7 }, nullptr );*/ } }; diff --git a/src/scripts/instances/raids/AlphascapeV10.cpp b/src/scripts/instances/raids/AlphascapeV10.cpp deleted file mode 100644 index 28ac27be..00000000 --- a/src/scripts/instances/raids/AlphascapeV10.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV10 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV10() : - Sapphire::ScriptAPI::InstanceContentScript( 30069 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7575331, 4, { 96.398201f, 0.000000f, 100.555702f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7575332, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 7575333, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7575334, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 7586460, 4, { 101.415100f, -0.000000f, 101.219002f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2007457, 7574103, 5, { 105.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7575443, 4, { 100.300003f, 0.000000f, 100.300003f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV10 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV10Savage.cpp b/src/scripts/instances/raids/AlphascapeV10Savage.cpp deleted file mode 100644 index b1a36d8d..00000000 --- a/src/scripts/instances/raids/AlphascapeV10Savage.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV10Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV10Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30073 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7575331, 4, { 96.398201f, 0.000000f, 100.555702f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7575332, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 7575333, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7575334, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 7586460, 4, { 101.415100f, -0.000000f, 101.219002f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2007457, 7574103, 5, { 105.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7575443, 4, { 100.300003f, 0.000000f, 100.300003f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV10Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV20.cpp b/src/scripts/instances/raids/AlphascapeV20.cpp deleted file mode 100644 index 6e59e502..00000000 --- a/src/scripts/instances/raids/AlphascapeV20.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV20 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV20() : - Sapphire::ScriptAPI::InstanceContentScript( 30070 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7684588, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7581179, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV20 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV20Savage.cpp b/src/scripts/instances/raids/AlphascapeV20Savage.cpp deleted file mode 100644 index d623839a..00000000 --- a/src/scripts/instances/raids/AlphascapeV20Savage.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV20Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV20Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30074 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7684588, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7581179, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV20Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV30.cpp b/src/scripts/instances/raids/AlphascapeV30.cpp deleted file mode 100644 index be25bae7..00000000 --- a/src/scripts/instances/raids/AlphascapeV30.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV30 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV30() : - Sapphire::ScriptAPI::InstanceContentScript( 30071 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2009609, 0, 4, { 92.761772f, 0.000000f, 106.354897f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009610, 0, 4, { 93.034180f, -0.015320f, 106.645302f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_2", 2007457, 7604877, 4, { 103.128403f, 0.000000f, 107.047600f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7624116, 4, { 105.371498f, 0.000000f, 104.860802f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2009653, 0, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2007457, 7593474, 5, { 104.466499f, 0.000000f, 114.605797f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV30 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV30Savage.cpp b/src/scripts/instances/raids/AlphascapeV30Savage.cpp deleted file mode 100644 index 148902e5..00000000 --- a/src/scripts/instances/raids/AlphascapeV30Savage.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV30Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV30Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30075 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2009609, 0, 4, { 92.761772f, 0.000000f, 106.354897f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009610, 0, 4, { 93.034180f, -0.015320f, 106.645302f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_2", 2007457, 7604877, 4, { 103.128403f, 0.000000f, 107.047600f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7624116, 4, { 105.371498f, 0.000000f, 104.860802f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2009653, 0, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2007457, 7593474, 5, { 104.466499f, 0.000000f, 114.605797f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV30Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV40.cpp b/src/scripts/instances/raids/AlphascapeV40.cpp deleted file mode 100644 index d2db0c14..00000000 --- a/src/scripts/instances/raids/AlphascapeV40.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV40 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV40() : - Sapphire::ScriptAPI::InstanceContentScript( 30072 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7570953, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7624865, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 7624868, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7624869, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 7624870, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7624871, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 7624872, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 7624873, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 7672994, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7581279, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 84.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV40 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/AlphascapeV40Savage.cpp b/src/scripts/instances/raids/AlphascapeV40Savage.cpp deleted file mode 100644 index 278bdc75..00000000 --- a/src/scripts/instances/raids/AlphascapeV40Savage.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class AlphascapeV40Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - AlphascapeV40Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30076 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7570953, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7624865, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 7624868, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 7624869, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 7624870, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7624871, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 7624872, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 7624873, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 7672994, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7581279, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 84.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( AlphascapeV40Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV10.cpp b/src/scripts/instances/raids/DeltascapeV10.cpp deleted file mode 100644 index 6e1e33fc..00000000 --- a/src/scripts/instances/raids/DeltascapeV10.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV10 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV10() : - Sapphire::ScriptAPI::InstanceContentScript( 30049 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV10 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV10Savage.cpp b/src/scripts/instances/raids/DeltascapeV10Savage.cpp deleted file mode 100644 index d078b33c..00000000 --- a/src/scripts/instances/raids/DeltascapeV10Savage.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV10Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV10Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30053 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV10Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV20.cpp b/src/scripts/instances/raids/DeltascapeV20.cpp deleted file mode 100644 index e1d38780..00000000 --- a/src/scripts/instances/raids/DeltascapeV20.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV20 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV20() : - Sapphire::ScriptAPI::InstanceContentScript( 30050 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV20 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV20Savage.cpp b/src/scripts/instances/raids/DeltascapeV20Savage.cpp deleted file mode 100644 index ecc5dd8f..00000000 --- a/src/scripts/instances/raids/DeltascapeV20Savage.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV20Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV20Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30054 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV20Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV30.cpp b/src/scripts/instances/raids/DeltascapeV30.cpp deleted file mode 100644 index 57afdc5e..00000000 --- a/src/scripts/instances/raids/DeltascapeV30.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV30 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV30() : - Sapphire::ScriptAPI::InstanceContentScript( 30051 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o4_a1_mto01", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f, -0.000000f ); - // States -> mete_hide (id: 19) mete_pre (id: 20) mete_phase_1 (id: 21) mete_phase_2 (id: 22) mete_phase_3 (id: 23) mete_phase_4 (id: 24) mete_fade (id: 25) mete_phase_5 (id: 26) - instance.registerEObj( "unknown_3", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_10", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_11", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV30 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV30Savage.cpp b/src/scripts/instances/raids/DeltascapeV30Savage.cpp deleted file mode 100644 index 805b003f..00000000 --- a/src/scripts/instances/raids/DeltascapeV30Savage.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV30Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV30Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30055 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o4_a1_mto01", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f, -0.000000f ); - // States -> mete_hide (id: 19) mete_pre (id: 20) mete_phase_1 (id: 21) mete_phase_2 (id: 22) mete_phase_3 (id: 23) mete_phase_4 (id: 24) mete_fade (id: 25) mete_phase_5 (id: 26) - instance.registerEObj( "unknown_3", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_10", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_11", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV30Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV40.cpp b/src/scripts/instances/raids/DeltascapeV40.cpp deleted file mode 100644 index c2699501..00000000 --- a/src/scripts/instances/raids/DeltascapeV40.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV40 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV40() : - Sapphire::ScriptAPI::InstanceContentScript( 30052 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV40 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/DeltascapeV40Savage.cpp b/src/scripts/instances/raids/DeltascapeV40Savage.cpp deleted file mode 100644 index 9aaf42c2..00000000 --- a/src/scripts/instances/raids/DeltascapeV40Savage.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class DeltascapeV40Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - DeltascapeV40Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30056 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( DeltascapeV40Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV10.cpp b/src/scripts/instances/raids/SigmascapeV10.cpp deleted file mode 100644 index 87fe1625..00000000 --- a/src/scripts/instances/raids/SigmascapeV10.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV10 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV10() : - Sapphire::ScriptAPI::InstanceContentScript( 30059 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgbg_z3o7_a0_ghr01", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b1256", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3o7_b1346", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_0", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3o7_b1359", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f, 0.000046f ); - instance.registerEObj( "Aetherialstream_1", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_2", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_3", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_4", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_5", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_6", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_7", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_z3o7_b1359_1", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2007457, 7181869, 5, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f, 0.000048f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV10 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV10Savage.cpp b/src/scripts/instances/raids/SigmascapeV10Savage.cpp deleted file mode 100644 index e4e07d31..00000000 --- a/src/scripts/instances/raids/SigmascapeV10Savage.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV10Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV10Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30063 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgbg_z3o7_a0_ghr01", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3o7_a0_ghr01_3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b1256", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3o7_b1346", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_0", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3o7_b1359", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f, 0.000046f ); - instance.registerEObj( "Aetherialstream_1", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_2", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_3", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_4", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_5", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_6", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Aetherialstream_7", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_z3o7_b1359_1", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2007457, 7181869, 5, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f, 0.000048f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV10Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV20.cpp b/src/scripts/instances/raids/SigmascapeV20.cpp deleted file mode 100644 index c4f95c7e..00000000 --- a/src/scripts/instances/raids/SigmascapeV20.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV20 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV20() : - Sapphire::ScriptAPI::InstanceContentScript( 30060 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_15", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV20 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV20Savage.cpp b/src/scripts/instances/raids/SigmascapeV20Savage.cpp deleted file mode 100644 index 6fea178c..00000000 --- a/src/scripts/instances/raids/SigmascapeV20Savage.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV20Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV20Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30064 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_15", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV20Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV30.cpp b/src/scripts/instances/raids/SigmascapeV30.cpp deleted file mode 100644 index 2305ea66..00000000 --- a/src/scripts/instances/raids/SigmascapeV30.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV30 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV30() : - Sapphire::ScriptAPI::InstanceContentScript( 30061 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_0", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_8", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_10", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV30 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV30Savage.cpp b/src/scripts/instances/raids/SigmascapeV30Savage.cpp deleted file mode 100644 index 4ff275a8..00000000 --- a/src/scripts/instances/raids/SigmascapeV30Savage.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV30Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV30Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30065 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_0", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_4", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_8", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_10", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV30Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV40.cpp b/src/scripts/instances/raids/SigmascapeV40.cpp deleted file mode 100644 index e67b4eeb..00000000 --- a/src/scripts/instances/raids/SigmascapeV40.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV40 : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV40() : - Sapphire::ScriptAPI::InstanceContentScript( 30062 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgbg_z3oa_a0_gmc01", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_0", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_1", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_4", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_5", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_6", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_z3oa_b1351", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_7", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_8", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_9", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_10", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_11", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_12", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_13", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV40 ); \ No newline at end of file diff --git a/src/scripts/instances/raids/SigmascapeV40Savage.cpp b/src/scripts/instances/raids/SigmascapeV40Savage.cpp deleted file mode 100644 index 17bbaa75..00000000 --- a/src/scripts/instances/raids/SigmascapeV40Savage.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class SigmascapeV40Savage : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - SigmascapeV40Savage() : - Sapphire::ScriptAPI::InstanceContentScript( 30066 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgbg_z3oa_a0_gmc01", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_0", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_1", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_3", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_4", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_5", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_6", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_z3oa_b1351", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_7", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_8", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_9", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_10", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_11", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_12", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_13", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( SigmascapeV40Savage ); \ No newline at end of file diff --git a/src/scripts/instances/raids/TheOrbonneMonastery.cpp b/src/scripts/instances/raids/TheOrbonneMonastery.cpp deleted file mode 100644 index c09bcd30..00000000 --- a/src/scripts/instances/raids/TheOrbonneMonastery.cpp +++ /dev/null @@ -1,106 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class TheOrbonneMonastery : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - TheOrbonneMonastery() : - Sapphire::ScriptAPI::InstanceContentScript( 30077 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgvf_w_lvd_b0250", 2007457, 7725374, 4, { 599.697021f, 0.000000f, 384.788696f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_0", 2007791, 0, 4, { 600.046814f, 0.000000f, 384.120605f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009696, 0, 4, { 581.460022f, 0.000000f, 283.458313f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2002735, 0, 4, { 599.877808f, -31.021669f, -23.567789f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7742069, 4, { 599.994080f, -31.000000f, -20.984110f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgbg_z3r3_a2_swrd1", 2007457, 7746896, 4, { 589.026978f, -31.000000f, -64.958076f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r3_a2_swrd1_1", 2007457, 7746909, 4, { 609.340027f, -31.000000f, -43.261929f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r3_a2_shld1", 2007457, 7746912, 4, { 608.816589f, -31.000000f, -67.144180f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r3_a2_shld1_1", 2007457, 7746914, 4, { 592.940430f, -31.000000f, -41.502899f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7749814, 4, { 605.816284f, -31.000000f, -87.291206f }, 0.991760f, 0.000048f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_z3r3_b1616", 2007457, 7842482, 4, { 600.000000f, -30.000000f, -54.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r3_a2_swrd1_2", 2007457, 7844508, 4, { 300.000000f, 0.000000f, -50.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r3_a2_shld3", 2007457, 7845647, 4, { 600.000000f, -31.000000f, -49.000000f }, 1.000000f, 0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_1", 2007457, 7845648, 4, { 600.000000f, -31.000000f, -29.000000f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_2", 2007457, 7845649, 4, { 592.929016f, -31.000000f, -31.928900f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_3", 2007457, 7845650, 4, { 607.070984f, -31.000000f, -31.928900f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_4", 2007457, 7845651, 4, { 594.642517f, -31.000000f, -26.065701f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_5", 2007457, 7845652, 4, { 605.357483f, -31.000000f, -26.065701f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_6", 2007457, 7845653, 4, { 587.065674f, -31.000000f, -33.642399f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "sgbg_z3r3_a2_shld3_7", 2007457, 7845654, 4, { 612.934326f, -31.000000f, -33.642399f }, 1.000000f, -0.000000f ); - // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) - instance.registerEObj( "unknown_3", 2007791, 0, 4, { -600.000000f, -600.000000f, -545.500000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 7740888, 4, { -606.228577f, -600.000000f, -543.124695f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_4", 2007457, 7741247, 4, { -611.437622f, -602.000000f, -586.861023f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2009684, 0, 4, { -613.782715f, -602.000000f, -582.841614f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2009685, 0, 4, { -611.078125f, -602.014221f, -583.093018f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_7", 2009681, 0, 4, { 600.000000f, -600.000000f, -630.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_8", 2009682, 0, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_9", 2009683, 0, 4, { 605.004822f, -600.000000f, -594.049011f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_10", 2007457, 7718602, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_11", 2007457, 7718606, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 7718605, 4, { 600.000000f, -600.000000f, -605.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2007457, 7739045, 4, { 600.000000f, -600.000000f, -620.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2009697, 0, 4, { 599.816895f, -600.000000f, -610.040405f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_15", 2009698, 0, 4, { 593.438599f, -600.000000f, -600.488281f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_16", 2009699, 0, 4, { 605.523682f, -600.000000f, -596.581970f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_17", 2009700, 0, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_18", 2002735, 0, 4, { -600.000000f, -624.000000f, -779.170715f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7826278, 4, { -600.000000f, -624.000000f, -779.051880f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_z3r1_b1258", 2009735, 7790960, 4, { 600.000000f, 0.000000f, 388.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258_1", 2009736, 7790961, 4, { 600.000000f, 0.000000f, 258.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258_2", 2009737, 7790972, 4, { -599.687073f, -599.483093f, -542.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258_3", 2009738, 7790976, 4, { -600.000000f, -602.000000f, -623.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_19", 2002735, 0, 4, { 504.093506f, -27.491249f, 699.526611f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7791941, 4, { 503.957397f, -27.061510f, 699.645325f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7792069, 4, { 503.000000f, -25.234091f, 659.863281f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_20", 2002735, 0, 4, { -645.511597f, -587.562500f, -431.000000f }, 1.000000f, -1.570796f ); - instance.registerEObj( "sgvf_w_lvd_b0118_5", 2007457, 7792412, 4, { -646.396729f, -587.562500f, -431.310394f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_w_lvd_b0118_6", 2007457, 7792413, 4, { -606.465515f, -587.562500f, -431.000000f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "Teleportationcrystal", 2009717, 7790245, 4, { 494.000000f, -36.900440f, 764.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_1", 2009718, 7790248, 4, { 595.000000f, -2.896687f, 404.905212f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_2", 2009719, 7790262, 4, { 597.404175f, -31.000000f, -16.571730f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_3", 2009720, 7790602, 4, { -650.538818f, -588.000000f, -436.780487f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_4", 2009721, 7790603, 4, { -604.447327f, -599.975830f, -519.493408f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Teleportationcrystal_5", 2009722, 7790604, 4, { -604.814819f, -624.000000f, -771.833679f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0286", 2007457, 7724970, 4, { 500.022797f, -38.986820f, 782.467285f }, 0.991760f, 0.000048f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 600.027710f, -600.000000f, -620.645081f }, 1.000000f, 0.000000f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( TheOrbonneMonastery ); \ No newline at end of file diff --git a/src/scripts/instances/raids/TheRidoranaLighthouse.cpp b/src/scripts/instances/raids/TheRidoranaLighthouse.cpp deleted file mode 100644 index 51781840..00000000 --- a/src/scripts/instances/raids/TheRidoranaLighthouse.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class TheRidoranaLighthouse : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - TheRidoranaLighthouse() : - Sapphire::ScriptAPI::InstanceContentScript( 30068 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7377897, 4, { -200.000305f, 5.000000f, 101.000000f }, 1.000000f, -0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_0", 2007791, 0, 4, { -200.000305f, 5.000000f, 101.000000f }, 0.880000f, -0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7377900, 4, { -200.000107f, 4.999996f, 30.600080f }, 1.000000f, -0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_1", 2009485, 0, 4, { -211.062103f, 5.000000f, 63.169151f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r2_b1409", 2007457, 7379112, 4, { -210.250793f, 5.000000f, 72.932854f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2002735, 0, 4, { -200.002106f, 584.000000f, -510.574188f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7388431, 4, { -200.002106f, 584.000000f, -509.807709f }, 1.000000f, -0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_3", 2009508, 0, 4, { -200.000000f, 584.000000f, -541.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_4", 2009509, 0, 4, { -200.000000f, 584.000000f, -541.000000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7448801, 4, { -200.002106f, 584.000000f, -570.796204f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7387054, 4, { 800.000000f, -968.000000f, -110.439796f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_w_lvd_b0118_5", 2007457, 7387076, 4, { 800.000000f, -968.000000f, -171.377106f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_5", 2007457, 7387494, 4, { 777.444885f, -440.500000f, 812.995483f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_6", 2007457, 7387496, 4, { 800.000000f, -440.500000f, 774.175781f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007457, 7387498, 4, { 822.724609f, -440.500000f, 812.995483f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2007457, 7370829, 4, { 800.000000f, -968.000000f, -141.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_9", 2007457, 7401445, 4, { 800.000000f, -440.000000f, 800.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r2_b1444", 2007457, 7409377, 4, { 800.000000f, -968.000000f, -141.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_10", 2002735, 0, 4, { 800.000000f, -968.000000f, -109.954399f }, 1.200000f, -0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_6", 2007457, 7380261, 4, { 799.984619f, -815.518372f, -369.771912f }, 0.991760f, 0.000048f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_11", 2002735, 0, 4, { 800.000000f, -815.500000f, -370.055695f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7359055, 5, { -181.813400f, 14.312280f, 237.000000f }, 1.000000f, 0.000000f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 800.146179f, -815.500000f, -417.868286f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgbg_col_wall_02", 2007457, 7447710, 4, { -200.061096f, 12.985350f, -21.103331f }, 0.991760f, 0.000048f ); - // States -> col_on (id: 24) col_off (id: 25) - instance.registerEObj( "Ancientclockworkdevice", 2009544, 7334375, 4, { -269.105011f, 122.000000f, -438.046509f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2007457, 7404715, 4, { -268.778900f, 123.000000f, -449.397705f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_13", 2007457, 7447787, 4, { -269.825287f, 278.980713f, -520.805725f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgbg_col_wall_02_1", 2007457, 7447840, 4, { -226.977997f, 429.983887f, -438.986786f }, 0.991760f, 0.000048f ); - // States -> col_on (id: 24) col_off (id: 25) - instance.registerEObj( "unknown_14", 2007457, 7447789, 4, { -199.398300f, 432.999908f, -475.179199f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Ancientclockworkdevice_1", 2009545, 7371810, 4, { -199.628098f, 584.000000f, -585.090027f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_15", 2007457, 7404716, 4, { -199.364105f, 584.999817f, -599.228027f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Ancientclockworkdevice_2", 2009546, 7377745, 4, { 837.565613f, -984.000000f, 96.709007f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Ancientclockworkdevice_3", 2009547, 7377746, 4, { 772.549072f, -979.951721f, -38.537811f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_col_wall_02_2", 2007457, 7447954, 4, { 840.023987f, -984.000000f, 103.811798f }, 1.000000f, 0.000000f ); - // States -> col_on (id: 24) col_off (id: 25) - instance.registerEObj( "sgbg_col_wall_02_3", 2007457, 7447962, 4, { 770.034485f, -979.851624f, -46.041550f }, 1.000000f, 0.000000f ); - // States -> col_on (id: 24) col_off (id: 25) - instance.registerEObj( "unknown_16", 2007457, 7447790, 4, { 800.592407f, -967.000000f, -202.262695f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r1_a4_stn03", 2007457, 7450744, 4, { 798.167419f, -815.500000f, -404.830505f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Ancientengraving", 2009579, 0, 4, { -194.500000f, 15.000000f, -19.750000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Crudescrawling", 2009580, 0, 4, { 835.500000f, -986.500000f, 68.750000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Crudescrawling_1", 2009581, 0, 4, { 764.500000f, -983.000000f, -16.250000f }, 1.000000f, -0.000000f ); - instance.registerEObj( "Teleportationcrystal", 2009534, 7359613, 4, { -187.989700f, 14.788980f, 218.822296f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_1", 2009535, 7359705, 4, { -204.159302f, 112.000000f, -395.631805f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_2", 2009536, 7359716, 4, { -251.343994f, 428.000000f, -517.234192f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_3", 2009537, 7359767, 4, { -203.934204f, 582.000122f, -493.438599f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_4", 2009538, 7359772, 4, { 844.205322f, -988.006409f, 73.136467f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Teleportationcrystal_5", 2009539, 7359776, 4, { 767.945312f, -968.000000f, 90.974548f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_6", 2009540, 7359779, 4, { 795.302795f, -972.000000f, -95.739433f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_7", 2009541, 7359782, 4, { 792.833984f, -806.109985f, -299.344299f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_17", 2002735, 0, 4, { 769.949524f, -964.000000f, 77.562500f }, 0.700000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_7", 2007457, 7407058, 4, { 769.975586f, -964.000000f, 76.127197f }, 0.991760f, 0.000048f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgbg_col_wall_02_4", 2007457, 7445782, 4, { 770.168579f, -964.019226f, 37.949100f }, 0.991760f, 0.000048f ); - // States -> col_on (id: 24) col_off (id: 25) - instance.registerEObj( "unknown_18", 2007457, 7409325, 4, { 761.133728f, -964.000000f, 38.468330f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_19", 2007457, 7409326, 4, { 766.931396f, -964.000000f, 38.589489f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_20", 2007457, 7409327, 4, { 772.973328f, -964.000000f, 38.480419f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_21", 2007457, 7409328, 4, { 779.146301f, -964.000000f, 38.587101f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_22", 2007457, 7407517, 4, { 751.235291f, -964.000000f, 66.028107f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_23", 2007457, 7408156, 4, { 751.337280f, -964.000000f, 59.946270f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_24", 2007457, 7409322, 4, { 751.462219f, -964.000000f, 53.939960f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_25", 2007457, 7409323, 4, { 751.451477f, -964.000000f, 47.949421f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_26", 2007457, 7409332, 4, { 788.401917f, -963.999878f, 65.974800f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_27", 2007457, 7409331, 4, { 788.503784f, -963.999878f, 59.892960f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_28", 2007457, 7409330, 4, { 788.601318f, -964.019226f, 53.879639f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_29", 2007457, 7409329, 4, { 788.618225f, -964.000000f, 47.896111f }, 0.991760f, 0.000048f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( TheRidoranaLighthouse ); \ No newline at end of file diff --git a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp deleted file mode 100644 index 9ea78eb9..00000000 --- a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp +++ /dev/null @@ -1,133 +0,0 @@ -#include -#include - -using namespace Sapphire; - -class TheRoyalCityofRabanastre : - public Sapphire::ScriptAPI::InstanceContentScript -{ -public: - TheRoyalCityofRabanastre() : - Sapphire::ScriptAPI::InstanceContentScript( 30058 ) - { } - - void onInit( InstanceContent& instance ) override - { - instance.registerEObj( "unknown_0", 2002735, 0, 4, { -319.173004f, 9.994568f, 320.515686f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7069100, 4, { -319.896515f, 10.000000f, 325.206085f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_z3r1_b1269", 2007457, 7075766, 4, { -320.000000f, 1.230700f, 221.199997f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1269_1", 2007457, 7075769, 4, { -320.351501f, 1.230694f, 262.307892f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1269_2", 2007457, 7075770, 4, { -346.200012f, 1.229800f, 238.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_1", 2009060, 0, 4, { -311.306702f, 1.230747f, 242.805496f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_2", 2009061, 0, 4, { -316.517914f, 1.205444f, 246.509399f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7069107, 4, { -319.661407f, 10.000000f, -11.625690f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_3", 2009055, 0, 4, { -336.110504f, 9.964111f, -51.682369f }, 1.000000f, -0.000000f ); - instance.registerEObj( "unknown_4", 2009057, 0, 4, { -306.355408f, 9.964111f, -48.539001f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7075611, 4, { -320.081390f, 10.000000f, -69.048653f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgbg_z3r1_a2_lc01a", 2007457, 7075799, 4, { -320.000702f, 10.000000f, -56.500000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r1_a2_lc01a_1", 2007457, 7075800, 4, { -310.799988f, 10.000000f, -41.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r1_a2_lc01a_2", 2007457, 7075801, 4, { -329.200012f, 10.000000f, -41.000000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_5", 2007457, 7076220, 4, { -315.688690f, 10.000000f, -47.888401f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_btl_b0527", 2007457, 7075820, 4, { -316.520996f, 10.000000f, -31.534470f }, 1.000000f, 0.000000f ); - // States -> hadokyu_off_a (id: 7) hadokyu_on_a (id: 8) hadokyu_on_b (id: 9) hadokyu_on_c (id: 10) - instance.registerEObj( "unknown_6", 2007457, 7077538, 4, { -338.909393f, 10.000000f, -32.073681f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_7", 2007791, 0, 4, { -319.963013f, 10.052400f, -16.952101f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_8", 2009242, 0, 4, { -332.255402f, 10.108630f, -33.994350f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0250", 2007457, 7080565, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_9", 2007791, 0, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_btl_b1275", 2007457, 7082088, 4, { 108.221199f, -694.000000f, -208.120697f }, 1.000000f, 0.000000f ); - // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) - instance.registerEObj( "sgvf_w_btl_b1275_1", 2007457, 7082089, 4, { 121.728897f, -694.000000f, -183.748199f }, 1.000000f, 0.000000f ); - // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) - instance.registerEObj( "sgvf_w_btl_b1275_2", 2007457, 7082090, 4, { 94.008781f, -694.000000f, -182.456207f }, 1.000000f, 0.000000f ); - // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) - instance.registerEObj( "Darkcircle", 2009076, 0, 4, { 83.147507f, -694.000000f, -193.267899f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_1", 2009203, 0, 4, { 83.057159f, -694.000000f, -182.946304f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_2", 2009204, 0, 4, { 89.546783f, -694.000000f, -172.278000f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_3", 2009205, 0, 4, { 96.837830f, -694.000000f, -165.190094f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_4", 2009206, 0, 4, { 105.990601f, -694.000000f, -164.696304f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_5", 2009207, 0, 4, { 117.216599f, -694.000000f, -169.060196f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_6", 2009208, 0, 4, { 125.204498f, -694.000000f, -175.811493f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_7", 2009209, 0, 4, { 130.969604f, -694.000000f, -185.265594f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_8", 2009210, 0, 4, { 130.999893f, -694.000000f, -195.328003f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_9", 2009211, 0, 4, { 124.798302f, -694.000000f, -204.280807f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_10", 2009212, 0, 4, { 114.994301f, -694.000000f, -210.576996f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Darkcircle_11", 2009213, 0, 4, { 103.221703f, -694.000000f, -213.151794f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 7079402, 4, { 104.478500f, -679.000000f, -322.819489f }, 0.991760f, 0.000048f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "unknown_10", 2007791, 0, 4, { 106.449997f, -679.000000f, -328.250000f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_11", 2009068, 0, 4, { 97.794479f, -679.000000f, -387.672394f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_12", 2009069, 0, 4, { 101.213097f, -679.000000f, -388.533600f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_13", 2009070, 0, 4, { 104.362602f, -679.000000f, -388.768097f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1284", 2007457, 7081152, 4, { 101.446701f, -679.000000f, -398.626587f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1278", 2007457, 7081153, 4, { 114.988701f, -679.000000f, -399.119598f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1277", 2007457, 7081154, 4, { 105.230202f, -679.000000f, -389.831512f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgbg_z3r1_a4_stn03", 2007457, 7151392, 4, { 105.983803f, -679.025024f, -386.058899f }, 1.000000f, -0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258", 2009221, 7094307, 4, { -323.781189f, 9.994568f, 322.467499f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_z3r1_b1258_1", 2009222, 7094363, 4, { -325.789886f, 1.230697f, 217.839005f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_14", 2007457, 7041438, 4, { -274.571594f, 2.310245f, 37.022179f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Waterwaygatelever", 2009184, 7080218, 4, { 338.918091f, -262.287415f, 267.698608f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Waterwaygatelever_1", 2009186, 7080217, 4, { 337.924988f, -322.267212f, 299.494385f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Waterwaygatelever_2", 2009188, 7080216, 4, { 338.580200f, -292.267212f, 331.283905f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_15", 2007457, 7080221, 4, { 323.797211f, -262.267395f, 275.364105f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_16", 2007457, 7080220, 4, { 324.137909f, -322.267303f, 308.012604f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_17", 2007457, 7080219, 4, { 325.866394f, -292.267212f, 339.968201f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_18", 2007457, 7080213, 4, { 205.647507f, -374.000092f, 339.617889f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_19", 2007457, 7080215, 4, { 164.959000f, -374.000092f, 324.108002f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Passagecontrols", 2009200, 0, 4, { 189.533096f, -373.602295f, 305.302490f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Passagecontrols_1", 2009201, 0, 4, { 162.416901f, -373.621887f, 283.383911f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Passagecontrols_2", 2009202, 0, 4, { 167.371002f, -373.190186f, 332.672913f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Scratchedlettering", 2009271, 0, 4, { 272.859009f, -490.182709f, 293.584595f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Scratchedlettering_1", 2009272, 0, 4, { 212.923599f, -491.264191f, 290.957306f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Scratchedlettering_2", 2009273, 0, 4, { 211.674301f, -491.485199f, 242.033600f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Skypiratesscrawlings", 2009435, 0, 4, { 222.766403f, -333.455414f, 360.799591f }, 0.991760f, 0.000048f ); - instance.registerEObj( "sgvf_z3r1_b1258_2", 2009223, 7102857, 4, { 101.048698f, -694.000000f, -122.909698f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258_3", 2009224, 7102858, 4, { 99.562241f, -694.000000f, -216.590393f }, 1.000000f, 0.000000f ); - instance.registerEObj( "sgvf_z3r1_b1258_4", 2009225, 7102860, 4, { 99.290398f, -679.011230f, -323.639587f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_20", 2009190, 0, 4, { -298.663086f, -4.197479f, 44.907139f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_21", 2009191, 0, 4, { -301.684296f, -4.350000f, 41.550209f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_22", 2009192, 0, 4, { -304.369995f, -4.219625f, 44.113739f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_23", 2009193, 0, 4, { -316.182190f, -4.226807f, 42.099609f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_24", 2009194, 0, 4, { -319.364990f, -4.219666f, 44.197979f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_25", 2009195, 0, 4, { -322.700989f, -4.219666f, 42.268631f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_26", 2009196, 0, 4, { -331.298615f, -4.379395f, 42.587891f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_27", 2009197, 0, 4, { -334.136810f, -4.379395f, 39.322510f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_28", 2009198, 0, 4, { -337.097107f, -4.379391f, 41.112068f }, 0.991760f, 0.000048f ); - instance.registerEObj( "unknown_29", 2009199, 0, 4, { -320.000000f, 19.928169f, -182.845596f }, 1.000000f, 0.000000f ); - instance.registerEObj( "unknown_30", 2002735, 0, 4, { -320.106812f, 19.946039f, -144.699493f }, 1.750000f, 0.000000f ); - instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7099082, 4, { -320.132294f, 19.899990f, -145.586395f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7099092, 4, { -319.884003f, 19.900000f, -202.859207f }, 1.000000f, 0.000000f ); - // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) - instance.registerEObj( "Teleportationcrystal", 2009176, 7102798, 4, { -326.309998f, 5.729747f, 406.047699f }, 0.991760f, 0.000048f ); - instance.registerEObj( "Teleportationcrystal_1", 2009177, 7102799, 4, { -326.251099f, 9.753006f, 115.489799f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_2", 2009178, 7102800, 4, { -326.389801f, 10.000000f, -10.478860f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_3", 2009179, 7102801, 4, { -312.818115f, 19.899851f, -141.350296f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_4", 2009180, 7102802, 4, { 439.169189f, -229.561905f, 292.789886f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_5", 2009181, 7102803, 4, { 133.837006f, -374.000092f, 311.904785f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_6", 2009182, 7102804, 4, { 114.414299f, -694.000000f, -113.204399f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Teleportationcrystal_7", 2009183, 7102805, 4, { 97.279610f, -679.000000f, -305.258087f }, 1.000000f, 0.000000f ); - instance.registerEObj( "Entrance", 2000182, 7069095, 5, { -328.378906f, 0.730057f, 439.144012f }, 0.991760f, 0.000048f ); - // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) - instance.registerEObj( "Exit", 2000139, 0, 4, { 106.318901f, -679.000000f, -398.354614f }, 0.991760f, 0.000048f ); - - } - - void onUpdate( InstanceContent& instance, uint64_t tickCount ) override - { - - } - - void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) override - { - - } - -}; - -EXPOSE_SCRIPT( TheRoyalCityofRabanastre ); \ No newline at end of file diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index cfe2ba6a..ceab1ebc 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -21,7 +21,6 @@ #include "Manager/PartyMgr.h" #include "Territory/Territory.h" -#include "Territory/ZonePosition.h" #include "Territory/InstanceContent.h" #include "Territory/InstanceObjectCache.h" #include "Territory/Land.h" @@ -474,31 +473,6 @@ void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId ) m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, getPos(), Util::getTimeMs(), 0.f ); } -void Sapphire::Entity::Player::returnToHomepoint() -{ - setZoningType( Common::ZoneingType::Return ); - teleport( getHomepoint(), 3 ); -} - -void Sapphire::Entity::Player::setZone( uint32_t zoneId ) -{ - auto& teriMgr = Common::Service< TerritoryMgr >::ref(); - m_onEnterEventDone = false; - - auto pZone = teriMgr.getZoneByTerritoryTypeId( zoneId ); - if( !teriMgr.movePlayer( pZone, *this ) ) - { - // todo: this will require proper handling, for now just return the player to their previous area - m_pos = m_prevPos; - m_rot = m_prevRot; - m_territoryTypeId = m_prevTerritoryTypeId; - - auto pZone1 = teriMgr.getZoneByTerritoryTypeId( m_territoryTypeId ); - if( !teriMgr.movePlayer( pZone1, *this ) ) - return; - } -} - bool Sapphire::Entity::Player::setInstance( const TerritoryPtr& instance, Common::FFXIVARR_POSITION3 pos ) { m_onEnterEventDone = false; @@ -1234,7 +1208,22 @@ void Sapphire::Entity::Player::performZoning( uint16_t zoneId, const Common::FFX m_territoryTypeId = zoneId; m_bMarkedForZoning = true; setRot( rotation ); - setZone( zoneId ); + + auto& teriMgr = Common::Service< TerritoryMgr >::ref(); + m_onEnterEventDone = false; + + auto pZone = teriMgr.getZoneByTerritoryTypeId( zoneId ); + if( !teriMgr.movePlayer( pZone, *this ) ) + { + // todo: this will require proper handling, for now just return the player to their previous area + m_pos = m_prevPos; + m_rot = m_prevRot; + m_territoryTypeId = m_prevTerritoryTypeId; + + auto pZone1 = teriMgr.getZoneByTerritoryTypeId( m_territoryTypeId ); + if( !teriMgr.movePlayer( pZone1, *this ) ) + return; + } } bool Sapphire::Entity::Player::isMarkedForZoning() const diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h index d96d756b..3c072ed9 100644 --- a/src/world/Actor/Player.h +++ b/src/world/Actor/Player.h @@ -302,9 +302,6 @@ namespace Sapphire::Entity /*! return current online status depending on current state / activity */ Common::OnlineStatus getOnlineStatus() const; - /*! sets the players zone, initiating a zoning process */ - void setZone( uint32_t zoneId ); - /*! sets the players instance & initiates zoning process */ bool setInstance( const Sapphire::TerritoryPtr& instance, Sapphire::Common::FFXIVARR_POSITION3 pos ); @@ -316,9 +313,6 @@ namespace Sapphire::Entity void forceZoneing( uint32_t zoneId ); - /*! return player to preset homepoint */ - void returnToHomepoint(); - /*! change position, sends update too */ void changePosition( float x, float y, float z, float o ); diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h index 311b3265..420f2290 100644 --- a/src/world/ForwardsZone.h +++ b/src/world/ForwardsZone.h @@ -26,7 +26,6 @@ TYPE_FORWARD( InstanceContent ); TYPE_FORWARD( QuestBattle ); TYPE_FORWARD( Item ); TYPE_FORWARD( ItemContainer ); -TYPE_FORWARD( ZonePosition ); TYPE_FORWARD( Land ); TYPE_FORWARD( Linkshell ); diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index e1c83661..3efa62b3 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -4,7 +4,6 @@ #include -#include #include #include @@ -30,6 +29,7 @@ #include "Network/PacketWrappers/HudParamPacket.h" #include +#include "Territory/InstanceObjectCache.h" using namespace Sapphire::World::Manager; using namespace Sapphire::Network::Packets; @@ -37,61 +37,6 @@ using namespace Sapphire::Network::Packets::WorldPackets::Server; using namespace Sapphire::Network::ActorControl; using namespace Sapphire::Common; -void PlayerMgr::movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param ) -{ - // check if we have one in the db first - auto& terriMgr = Common::Service< TerritoryMgr >::ref(); - - Sapphire::TerritoryPtr destinationZone; - - auto terriPos = terriMgr.getTerritoryPosition( landId ); - if( terriPos ) - { - // check if its a housing zone, zoning is different here - if( terriMgr.isHousingTerritory( terriPos->getTargetZoneId() ) ) - { - auto& housingMgr = Common::Service< HousingMgr >::ref(); - auto landSetId = housingMgr.toLandSetId( terriPos->getTargetZoneId(), param ); - - auto housingZone = housingMgr.getHousingZoneByLandSetId( landSetId ); - - if( !housingZone ) - return; - - destinationZone = housingZone; - } - else if( terriMgr.isInstanceContentTerritory( terriPos->getTargetZoneId() ) ) - { - // todo: instance dungeon handling - // will need to use setInstance so old pos gets set - return; - } - else - { - // normal zones - destinationZone = terriMgr.getZoneByTerritoryTypeId( terriPos->getTargetZoneId() ); - } - } - else - { - // todo: lookup land.exd and see if it's in there if its not in our db - return; - } - - if( !destinationZone ) - { - PlayerMgr::sendDebug( player, "Unable to find applicable territory for Warp#{0}. " - "Check that it exists inside zonepositions table.", - landId ); - return; - } - - player.setPos( terriPos->getTargetPosition() ); - player.setRot( terriPos->getTargetRotation() ); - - terriMgr.movePlayer( destinationZone, player ); -} - void PlayerMgr::onOnlineStatusChanged( Sapphire::Entity::Player& player, bool updateProfile ) { auto& server = Common::Service< World::WorldServer >::ref(); diff --git a/src/world/Manager/PlayerMgr.h b/src/world/Manager/PlayerMgr.h index ba43c7af..27d2e019 100644 --- a/src/world/Manager/PlayerMgr.h +++ b/src/world/Manager/PlayerMgr.h @@ -10,8 +10,6 @@ class PlayerMgr public: PlayerMgr() = default; - void movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param = 0 ); - void onOnlineStatusChanged( Sapphire::Entity::Player& player, bool updateProfile = true ); void onEquipDisplayFlagsChanged( Sapphire::Entity::Player& player ); diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp index a76ef480..f1f2da8e 100644 --- a/src/world/Manager/TerritoryMgr.cpp +++ b/src/world/Manager/TerritoryMgr.cpp @@ -11,7 +11,6 @@ #include "Actor/Player.h" #include "Territory/Territory.h" -#include "Territory/ZonePosition.h" #include "Territory/InstanceContent.h" #include "Territory/QuestBattle.h" #include "TerritoryMgr.h" @@ -69,7 +68,6 @@ bool Sapphire::World::Manager::TerritoryMgr::init() try { loadTerritoryTypeDetailCache(); - loadTerritoryPositionMap(); createDefaultTerritories(); createHousingTerritories(); @@ -495,36 +493,6 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryByGuI return it->second; } -void Sapphire::World::Manager::TerritoryMgr::loadTerritoryPositionMap() -{ - auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref(); - auto pQR = db.query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" ); - - while( pQR->next() ) - { - uint32_t id = pQR->getUInt( 1 ); - uint32_t targetZoneId = pQR->getUInt( 2 ); - Common::FFXIVARR_POSITION3 pos{}; - pos.x = pQR->getFloat( 3 ); - pos.y = pQR->getFloat( 4 ); - pos.z = pQR->getFloat( 5 ); - float posO = pQR->getFloat( 6 ); - uint32_t radius = pQR->getUInt( 7 ); - - m_territoryPositionMap[ id ] = make_ZonePosition( id, targetZoneId, pos, radius, posO ); - } -} - -Sapphire::ZonePositionPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryPosition( uint32_t territoryPositionId ) const -{ - auto it = m_territoryPositionMap.find( territoryPositionId ); - - if( it != m_territoryPositionMap.end() ) - return it->second; - - return nullptr; -} - Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const { auto zoneMap = m_territoryTypeIdToInstanceGuidMap.find( territoryTypeId ); diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h index f9e70546..2c77f926 100644 --- a/src/world/Manager/TerritoryMgr.h +++ b/src/world/Manager/TerritoryMgr.h @@ -70,9 +70,6 @@ namespace Sapphire::World::Manager /*! caches TerritoryType details into m_territoryTypeMap */ void loadTerritoryTypeDetailCache(); - /*! List of positions for zonelines */ - void loadTerritoryPositionMap(); - bool joinWorld( Entity::Player& player ); /*! returns true if the given territoryTypeId is in fact a valid zone @@ -126,9 +123,6 @@ namespace Sapphire::World::Manager /*! loop for processing territory logic, iterating all existing instances */ void updateTerritoryInstances( uint64_t tickCount ); - /*! returns a ZonePositionPtr if found, else nullptr */ - ZonePositionPtr getTerritoryPosition( uint32_t territoryPositionId ) const; - /*! returns a default Zone by territoryTypeId TODO: Mind multiple instances?! */ TerritoryPtr getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const; @@ -170,7 +164,6 @@ namespace Sapphire::World::Manager using QuestBattleIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >; using QuestBattleIdToContentFinderCondMap = std::unordered_map< uint16_t, uint16_t >; using PlayerIdToInstanceIdMap = std::unordered_map< uint32_t, uint32_t >; - using PositionMap = std::unordered_map< int32_t, ZonePositionPtr >; using InstanceIdList = std::vector< uint32_t >; using LandIdentToTerritoryPtrMap = std::unordered_map< uint64_t, TerritoryPtr >; @@ -192,9 +185,6 @@ namespace Sapphire::World::Manager /*! flat map for easier lookup of instances by guid */ InstanceIdToTerritoryPtrMap m_guIdToTerritoryPtrMap; - /*! map holding positions for zonelines */ - PositionMap m_territoryPositionMap; - /*! map storing playerIds to instanceIds, used for instanceContent */ PlayerIdToInstanceIdMap m_playerIdToInstanceMap; diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp index 9e6c8bdd..3bb4b9e5 100644 --- a/src/world/Network/Handlers/GMCommandHandlers.cpp +++ b/src/world/Network/Handlers/GMCommandHandlers.cpp @@ -194,9 +194,9 @@ void Sapphire::Network::GameConnection::gmCommandHandler( const Packets::FFXIVAR case GmCommand::Call: { if( targetPlayer->getTerritoryTypeId() != player.getTerritoryTypeId() ) - targetPlayer->setZone( player.getTerritoryTypeId() ); - - targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() ); + targetPlayer->performZoning( player.getTerritoryTypeId(), { player.getPos().x, player.getPos().y, player.getPos().z }, player.getRot() ); + else + targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() ); PlayerMgr::sendServerNotice( player, "Calling {0}", targetPlayer->getName() ); break; } diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp index a7cf662b..f23bf976 100644 --- a/src/world/Network/Handlers/PacketCommandHandler.cpp +++ b/src/world/Network/Handlers/PacketCommandHandler.cpp @@ -237,10 +237,10 @@ void Sapphire::Network::GameConnection::commandHandler( const Packets::FFXIVARR_ { case ResurrectType::RaiseSpell: // todo: handle raise case (set position to raiser, apply weakness status, set hp/mp/tp as well as packet) - player.returnToHomepoint(); + player.teleport( player.getHomepoint(), 3 ); break; case ResurrectType::Return: - player.returnToHomepoint(); + player.teleport( player.getHomepoint(), 3 ); break; default: break; diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index 3047a94d..3b46a137 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -22,7 +22,6 @@ #include "Territory/Territory.h" #include "Territory/HousingZone.h" #include "Territory/Land.h" -#include "Territory/ZonePosition.h" #include "Territory/House.h" #include "Territory/InstanceObjectCache.h" diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h index 64b7e7f1..95a36cfa 100644 --- a/src/world/Territory/Territory.h +++ b/src/world/Territory/Territory.h @@ -19,9 +19,6 @@ namespace Sapphire { - - class ZonePosition; - using FestivalPair = std::pair< uint16_t, uint16_t >; namespace Data diff --git a/src/world/Territory/ZonePosition.cpp b/src/world/Territory/ZonePosition.cpp deleted file mode 100644 index 2b017d78..00000000 --- a/src/world/Territory/ZonePosition.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "ZonePosition.h" - -Sapphire::ZonePosition::ZonePosition() - : - m_id( 0 ), m_targetZoneId( 0 ), m_radius( 0 ) -{ -} - -Sapphire::ZonePosition::ZonePosition( uint32_t id, uint32_t targetZoneId, const Common::FFXIVARR_POSITION3& targetPosition, - uint32_t radius, float rotation ) -{ - m_id = id; - m_targetZoneId = targetZoneId; - m_targetPos = targetPosition; - m_radius = radius; - m_rotation = rotation; -} - -Sapphire::ZonePosition::~ZonePosition() -{ -} - -uint32_t Sapphire::ZonePosition::getId() const -{ - return m_id; -} - -uint32_t Sapphire::ZonePosition::getTargetZoneId() const -{ - return m_targetZoneId; -} - -const Sapphire::Common::FFXIVARR_POSITION3& Sapphire::ZonePosition::getTargetPosition() const -{ - return m_targetPos; -} - -float Sapphire::ZonePosition::getTargetRotation() const -{ - return m_rotation; -} - - diff --git a/src/world/Territory/ZonePosition.h b/src/world/Territory/ZonePosition.h deleted file mode 100644 index cdbc887e..00000000 --- a/src/world/Territory/ZonePosition.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _ZONELINE_H -#define _ZONELINE_H - -#include - -namespace Sapphire { - -class ZonePosition -{ -protected: - uint32_t m_id; - uint32_t m_targetZoneId; - Common::FFXIVARR_POSITION3 m_targetPos; - float m_rotation; - uint32_t m_radius; - -public: - ZonePosition(); - - ZonePosition( uint32_t id, uint32_t targetZoneId, const Common::FFXIVARR_POSITION3& targetPosition, uint32_t radius, - float rotation ); - - virtual ~ZonePosition(); - - uint32_t getId() const; - - uint32_t getTargetZoneId() const; - - const Common::FFXIVARR_POSITION3& getTargetPosition() const; - - float getTargetRotation() const; - -}; - -} -#endif