diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp index f73e2013..a20ba512 100644 --- a/src/common/Exd/ExdDataGenerated.cpp +++ b/src/common/Exd/ExdDataGenerated.cpp @@ -2909,6 +2909,10 @@ Sapphire::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Sapphire::D Sapphire::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_HousingMapMarkerInfoDat.get_row( row_id, subRow ); + x = exdData->getField< float >( row, 0 ); + y = exdData->getField< float >( row, 1 ); + z = exdData->getField< float >( row, 2 ); + plotNumberDistance = exdData->getField< float >( row, 3 ); map = exdData->getField< uint16_t >( row, 4 ); } diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h index 2099dc91..25913570 100644 --- a/src/common/Exd/ExdDataGenerated.h +++ b/src/common/Exd/ExdDataGenerated.h @@ -3048,6 +3048,10 @@ struct HousingFurniture struct HousingMapMarkerInfo { uint16_t map; + float x; + float y; + float z; + float plotNumberDistance; HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index f91268dd..1e8efb03 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1794,7 +1794,7 @@ struct FFXIVIpcObjectSpawn : int16_t unknown24b; uint16_t unknown28a; int16_t unknown28c; - uint32_t unknown2C; + uint32_t housingLink; Common::FFXIVARR_POSITION3 position; int16_t unknown3C; int16_t unknown3E; diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp index a037349e..a7f77b4d 100644 --- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp +++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp @@ -1,8 +1,8 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include "Framework.h" @@ -12,6 +12,7 @@ using namespace Sapphire; using namespace Network; using namespace Packets; using namespace Server; +using namespace Sapphire::World::Manager; class CmnDefHousingSignboard : public Sapphire::ScriptAPI::EventScript { @@ -26,7 +27,7 @@ public: { auto pFw = getFramework(); if( !pFw ) - return LandPurchaseResult::ERR_INTERNAL; + return LandPurchaseResult::ERR_INTERNAL; // Purchase Land if( result.param2 == 2 ) { @@ -35,8 +36,8 @@ public: auto pTerritory = player.getCurrentZone(); auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory ); - auto pHouMgr = pFw->get< Sapphire::HousingMgr >(); - + auto pHouMgr = pFw->get< HousingMgr >(); + LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot, static_cast< uint8_t >( result.param2 ) ); diff --git a/src/servers/Scripts/common/aethernet/HousingAethernet.cpp b/src/servers/Scripts/common/aethernet/HousingAethernet.cpp index 9a159349..012bf5ee 100644 --- a/src/servers/Scripts/common/aethernet/HousingAethernet.cpp +++ b/src/servers/Scripts/common/aethernet/HousingAethernet.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp b/src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp new file mode 100644 index 00000000..ce3fa0c7 --- /dev/null +++ b/src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp @@ -0,0 +1,30 @@ +#include +#include + +#include "Actor/EventObject.h" + +using namespace Sapphire; + +class HousingEstateEntrance : + public Sapphire::ScriptAPI::EventObjectScript +{ +public: + HousingEstateEntrance() : + Sapphire::ScriptAPI::EventObjectScript( 2002737 ) + { + } + + void onTalk( uint32_t eventId, Entity::Player& player, Entity::EventObject& eobj ) override + { + player.sendDebug( "Found plot entrance for plot: " + std::to_string( eobj.getHousingLink() >> 8 ) ); + + player.playScene( eventId, 0, 0, []( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 != 1 ) + return; + + // param2 == 1, zone into instance + + } ); + } +}; \ No newline at end of file diff --git a/src/servers/Scripts/common/WarpTaxi.cpp b/src/servers/Scripts/common/warptaxi/WarpTaxi.cpp similarity index 100% rename from src/servers/Scripts/common/WarpTaxi.cpp rename to src/servers/Scripts/common/warptaxi/WarpTaxi.cpp diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp index 6e5e34d9..12d9343a 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp index d2c95441..28aaaf71 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp index 01c56163..93e0ef2f 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp index a60180f3..53c470d3 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp index a410a7c2..b3f7c912 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp index 0bfa21ab..20369d35 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp index ef73f13c..04db3f1c 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp index 87d560f5..b559b04f 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp index 3cdb5c17..5b6635dc 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp index e047273b..2a6c4a2b 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp index e62879cb..2b9a1c2f 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp index ad581254..bb089b93 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp index 51a293b0..6b479bea 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp index 75b07a30..42197100 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp index b1232eaa..53aa1e14 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp index d3acd3ef..1bcb41b5 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp index def4bd97..1827ad72 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp index 0a4d6ca8..2309e4e4 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp index 46127f4d..cf29fd1b 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp index 867c7b45..7721f8d5 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp index eaeab694..6dd88b65 100644 --- a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp +++ b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp index 79c21ecb..23f8ebbd 100644 --- a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp +++ b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp index 07ddb36d..2e2895fd 100644 --- a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp +++ b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp index cc058d0a..5f21f0cc 100644 --- a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp +++ b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp index 384f2c3d..0f9cb8c9 100644 --- a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp +++ b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp index e8cc5ae4..42ad5145 100644 --- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp +++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp index 4dde97ef..d0187a39 100644 --- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp +++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp index 8b2ee8b3..71cb3741 100644 --- a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp +++ b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp index 2d80787f..a5dae312 100644 --- a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp +++ b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp index f14d71bb..baddef38 100644 --- a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp +++ b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp index fd052be4..473d3cae 100644 --- a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp +++ b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp index 507b4ca8..d6ac68ab 100644 --- a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp +++ b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp index 4554ce07..fc2ad814 100644 --- a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp +++ b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp index ba8f1642..73de7150 100644 --- a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp +++ b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/Halatali.cpp b/src/servers/Scripts/instances/dungeons/Halatali.cpp index 667c110f..aec21557 100644 --- a/src/servers/Scripts/instances/dungeons/Halatali.cpp +++ b/src/servers/Scripts/instances/dungeons/Halatali.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp index 012e9c3d..63cdcf0c 100644 --- a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp index 05bf63aa..e49764d2 100644 --- a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp +++ b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp index aa1071ec..24f82868 100644 --- a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/Scripts/instances/dungeons/HellsLid.cpp index faa38b51..47721cf0 100644 --- a/src/servers/Scripts/instances/dungeons/HellsLid.cpp +++ b/src/servers/Scripts/instances/dungeons/HellsLid.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp index f38db5e4..9cadd763 100644 --- a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp +++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp index 13cd76c0..5c3b3775 100644 --- a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp index a1e0b73e..e300bdbc 100644 --- a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp +++ b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/Scripts/instances/dungeons/Neverreap.cpp index 7152ce44..8c7d8c4f 100644 --- a/src/servers/Scripts/instances/dungeons/Neverreap.cpp +++ b/src/servers/Scripts/instances/dungeons/Neverreap.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp index a30dd45a..02f25f80 100644 --- a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp +++ b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp index 86901f72..9f73bf5b 100644 --- a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp +++ b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp index 150954f7..6d55aa56 100644 --- a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp +++ b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp index fd466b95..ce8f5a48 100644 --- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp +++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp index 73129e05..c38eb696 100644 --- a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp +++ b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp index 4ca48f1a..c57ef0e1 100644 --- a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp +++ b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp index f71bf4bb..5e559481 100644 --- a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp +++ b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/Scripts/instances/dungeons/SohmAl.cpp index c3775916..17694ea0 100644 --- a/src/servers/Scripts/instances/dungeons/SohmAl.cpp +++ b/src/servers/Scripts/instances/dungeons/SohmAl.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp index 27f27cad..fa716b7b 100644 --- a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp +++ b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp index 0649f1a6..5f241f08 100644 --- a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp +++ b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheAery.cpp b/src/servers/Scripts/instances/dungeons/TheAery.cpp index 1f3ddd71..da5e53cb 100644 --- a/src/servers/Scripts/instances/dungeons/TheAery.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAery.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp index aa6baeb3..ef92c9d0 100644 --- a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp index 6e64d73d..71cccc56 100644 --- a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp index 4d44c343..da39ea64 100644 --- a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp index cfa8f269..471f8a5b 100644 --- a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp +++ b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp index 594b7dd7..811b56da 100644 --- a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp +++ b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp index fb407215..f060e9ff 100644 --- a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp +++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp index cc5284d0..cb7b4123 100644 --- a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp index 43aeb7b0..83bff3cb 100644 --- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp +++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp index 857b46c5..36284c6b 100644 --- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp index 42f86b90..18418587 100644 --- a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp +++ b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp index db82d09f..18f6e5f3 100644 --- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp +++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp index dbff517b..cccce72f 100644 --- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp index 8c84d685..d0383ded 100644 --- a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp +++ b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp index c7ddd5d7..15e1d428 100644 --- a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp index 6185305f..faddf675 100644 --- a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp +++ b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp index b90fa464..a34bf5d5 100644 --- a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp index 30c0fdba..133d0292 100644 --- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp index 4c8e4336..4318e099 100644 --- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp index efffdfac..32f17678 100644 --- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp index d6fb7640..9460358a 100644 --- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp index 170c179c..1620899b 100644 --- a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp index c57651b2..e5b48b75 100644 --- a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp +++ b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheVault.cpp b/src/servers/Scripts/instances/dungeons/TheVault.cpp index 80848fec..014d1d59 100644 --- a/src/servers/Scripts/instances/dungeons/TheVault.cpp +++ b/src/servers/Scripts/instances/dungeons/TheVault.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp index 23bd854f..e0a1155a 100644 --- a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp +++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp index 87649edf..d4b6c060 100644 --- a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp index 50800ec9..4f5aa8e3 100644 --- a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp +++ b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/Scripts/instances/events/TheHauntedManor.cpp index 36ceea06..f80f39ac 100644 --- a/src/servers/Scripts/instances/events/TheHauntedManor.cpp +++ b/src/servers/Scripts/instances/events/TheHauntedManor.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp index 662bba88..f7d403c8 100644 --- a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp +++ b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp index 6372860c..b4bfc0e9 100644 --- a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp +++ b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp index eba6136b..d87ae4b9 100644 --- a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp +++ b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp index 2b628bb9..5a5a86af 100644 --- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp +++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp index 4fd6cecc..e1620171 100644 --- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp +++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp index 808b7c80..6389c270 100644 --- a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp +++ b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp index cff97d5f..1f5fb408 100644 --- a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp +++ b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp index d5b03c71..9f1a8023 100644 --- a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp +++ b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp index f9e30f97..afd8908c 100644 --- a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp +++ b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp index e48bfcd4..038f5d6e 100644 --- a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp +++ b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp index 4cc2d298..d61fd56a 100644 --- a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp +++ b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp index 432b5e23..7fbce9b3 100644 --- a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp +++ b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/Scripts/instances/guildhests/StingingBack.cpp index 906c2c95..052dfdc9 100644 --- a/src/servers/Scripts/instances/guildhests/StingingBack.cpp +++ b/src/servers/Scripts/instances/guildhests/StingingBack.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp index 5379f9bc..262e6ee8 100644 --- a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp +++ b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/guildhests/WardUp.cpp b/src/servers/Scripts/instances/guildhests/WardUp.cpp index 970e54c8..f39c9740 100644 --- a/src/servers/Scripts/instances/guildhests/WardUp.cpp +++ b/src/servers/Scripts/instances/guildhests/WardUp.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp index 5ac0b32c..8df920d9 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp index dc64211e..41764695 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp index 97537b97..ee34b857 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp index 7f95e54e..8af68973 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp index b100decf..50418e6f 100644 --- a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp index eb8aa38a..69bff9df 100644 --- a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp index 0f0925fa..d4f8871c 100644 --- a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp index 94ff639d..1e9c98bd 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp index ec52f532..4929cabb 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp index 16cda58d..2ad446b6 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp index 106e95b2..1d9083bb 100644 --- a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp index b5fcd5d9..db2fe0d3 100644 --- a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp index 87f2a97d..6f35c3b9 100644 --- a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp index eea766d9..ea029f1f 100644 --- a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/Astragalos.cpp b/src/servers/Scripts/instances/pvp/Astragalos.cpp index 8c4d8de1..61711426 100644 --- a/src/servers/Scripts/instances/pvp/Astragalos.cpp +++ b/src/servers/Scripts/instances/pvp/Astragalos.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp index b1efa7dd..d8c5e853 100644 --- a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp +++ b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp index a6ec9ac8..54546c25 100644 --- a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp +++ b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp index 519aac3c..dadefffb 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp index a71516b9..b2db2c17 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp index 34043bc3..3bba122c 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp index 100ba852..1f47c37b 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp index 161e2b6c..1768f851 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp index 1d9e491a..21b9e414 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp index be0348ff..532f0af6 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp index 6e1dbffb..1dcab4f4 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp index a3aac623..9d3369b4 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp index c3dc287d..884355cc 100644 --- a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp +++ b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp index fe15d51d..7969a9df 100644 --- a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp +++ b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp index 66a74b21..920fe2b9 100644 --- a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp +++ b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp index 170f689a..2348cd71 100644 --- a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp +++ b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp index 6c7e665a..08938c12 100644 --- a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp +++ b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp index 1ee71fde..e057c948 100644 --- a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp +++ b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp index 29d57183..03a22f3f 100644 --- a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp +++ b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/Scripts/instances/questbattles/InThalsName.cpp index ac4d87c3..57902193 100644 --- a/src/servers/Scripts/instances/questbattles/InThalsName.cpp +++ b/src/servers/Scripts/instances/questbattles/InThalsName.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp index 324e6162..5ecc9d40 100644 --- a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp +++ b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp index 808a9ad2..dc5c23cc 100644 --- a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp +++ b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp index 4b535e4b..11c73e75 100644 --- a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp +++ b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/Naadam.cpp b/src/servers/Scripts/instances/questbattles/Naadam.cpp index 57c3bfb6..49b08a92 100644 --- a/src/servers/Scripts/instances/questbattles/Naadam.cpp +++ b/src/servers/Scripts/instances/questbattles/Naadam.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp index f1299596..b3e07df4 100644 --- a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp +++ b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp index 0a8e24f7..c5b86d7b 100644 --- a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp +++ b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp index 8af495da..09645855 100644 --- a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp +++ b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp index a93ce442..71d04eda 100644 --- a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp +++ b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp index 3b78b442..eebb3d93 100644 --- a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp +++ b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp index b722dbca..31a71cbf 100644 --- a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp +++ b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp index 0d9ca6a7..55b84ab0 100644 --- a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp +++ b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp index f1343594..fd5aa930 100644 --- a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp +++ b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp index c68ef053..30db1b02 100644 --- a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp +++ b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp index ac159b51..c8e799d8 100644 --- a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp +++ b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/Scripts/instances/questbattles/TheResonant.cpp index 6c9358a5..0f6b5840 100644 --- a/src/servers/Scripts/instances/questbattles/TheResonant.cpp +++ b/src/servers/Scripts/instances/questbattles/TheResonant.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp index 6a8e7791..417cc4dd 100644 --- a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp +++ b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp index 16bae070..5afda29b 100644 --- a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp +++ b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp index b3124ca8..c35177e9 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp index ca4e6eee..f5bb0663 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp index 952bfa8e..13301dd2 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp index b6f677ad..b42b477f 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp index 92f71afb..2e39d834 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp index 86e2e353..a71c96a3 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp index 36779b87..30db7b2c 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp index 49416462..14e79ad4 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp index bcb0e0a1..47abde44 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp index 0958d702..7e3e1fde 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp index 83d7a3d7..57a860e0 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp index ce4d8868..4f7c7650 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp index e0009b2b..a97f4b07 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp index 6d895dab..01858364 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp index 5aeaee83..be8a133c 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp index 662e11cc..4ec126c6 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp index fb984a7a..2625c607 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp index 9c67e0e0..ce8c20bf 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp index df385fe0..4f311401 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp index 177cfe71..74265757 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp index de5114be..4f4a4c9f 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp index c448dd00..3574934a 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp index 4de86a8a..11f231d6 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp index e28013da..46b003fe 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp index 6ce0bbd0..3e4a2764 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp index 90355626..2ef47131 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp index 091b80ae..bcb18b2b 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp index 4bdb703b..87ee740c 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp index 359a5006..e0ecb441 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp index 15da8045..d827d235 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp index cb8bba6b..d38a909c 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp index feb2bea5..2082e625 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/DunScaith.cpp b/src/servers/Scripts/instances/raids/DunScaith.cpp index 3f35df35..dca07553 100644 --- a/src/servers/Scripts/instances/raids/DunScaith.cpp +++ b/src/servers/Scripts/instances/raids/DunScaith.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp index f0fe4820..2357a6db 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp index 25648e9c..1709dac6 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp index e9a2474d..e2e50633 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp index ae51396f..81df3061 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp index 9e27d9dd..1735afac 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp index 2a8c9f30..c6bac4a5 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp index 3dab868b..b8e8262d 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp index 121cb8f6..0175be2f 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/Scripts/instances/raids/SyrcusTower.cpp index 8765ecd4..d06c12fd 100644 --- a/src/servers/Scripts/instances/raids/SyrcusTower.cpp +++ b/src/servers/Scripts/instances/raids/SyrcusTower.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp index 913242d0..b5235a49 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp index 1857a95a..10f336b7 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp index 9627dea1..491a5e6a 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp index 1d25869f..53df15ee 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp index fda3a6a1..4c16fe29 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp index adf01465..6a111deb 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp index d20322c2..251dabd4 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp index e97e6e9c..88543a0e 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp index a75576d2..e47b9252 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp index 5c180590..9f8a9f1e 100644 --- a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp +++ b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp index b2cf9842..001a7404 100644 --- a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp +++ b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp index c46e1bff..617df4c9 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp index 37ab7ff6..19f47eb7 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp index f5f6ae38..370e6602 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp index 0f03e032..c2d4c647 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp index 2283673f..b81771dd 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp index 13e6481e..bebd903b 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp index e29ba451..0ab380c6 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp index a853df26..de22738e 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp index dda7c9b8..759c4429 100644 --- a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp +++ b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/Scripts/instances/raids/TheVoidArk.cpp index c1eff79b..7672a4a2 100644 --- a/src/servers/Scripts/instances/raids/TheVoidArk.cpp +++ b/src/servers/Scripts/instances/raids/TheVoidArk.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp index 7a3a6a88..9c8bcd85 100644 --- a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp +++ b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp index f335841f..e45e2f48 100644 --- a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp +++ b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp index 43abeaf4..5cee89f5 100644 --- a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp +++ b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp index c298bbc9..2d228933 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp index 34783087..87b4b381 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp index 73c2eb16..35f9ddaf 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp index e723ce21..22e59083 100644 --- a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp +++ b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp index 943dc3bd..264acd1d 100644 --- a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp +++ b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp index 113102bd..215e96f4 100644 --- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp +++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp index 0369c236..443d0c2e 100644 --- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp +++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp index e7664c65..cf220436 100644 --- a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp +++ b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp index d45d1660..a455b57c 100644 --- a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp +++ b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/Scripts/instances/trials/CapeWestwind.cpp index 031c54d9..0ff92302 100644 --- a/src/servers/Scripts/instances/trials/CapeWestwind.cpp +++ b/src/servers/Scripts/instances/trials/CapeWestwind.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp index 50a6a203..7a9df30e 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp index 5f25e2d6..1b5f6010 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp index 6b68e282..a02390fc 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp index 2b5985a5..f6ef42fb 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp index 14b73206..569639ad 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp index ec54c2c2..408e425a 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/Emanation.cpp b/src/servers/Scripts/instances/trials/Emanation.cpp index c5789df5..bc430985 100644 --- a/src/servers/Scripts/instances/trials/Emanation.cpp +++ b/src/servers/Scripts/instances/trials/Emanation.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp index 359e9302..46855657 100644 --- a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp +++ b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/Scripts/instances/trials/SpecialEventI.cpp index 943212d2..dd008d31 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventI.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventI.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/Scripts/instances/trials/SpecialEventII.cpp index f1ffca66..699eb447 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventII.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventII.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp index 9b5e370f..16b861f9 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp index e802a901..8dc82904 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp index 496d6d47..6fc72acd 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp index d6743f4d..c3d3fae8 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/Scripts/instances/trials/TheChrysalis.cpp index c986cf1c..3ad89b36 100644 --- a/src/servers/Scripts/instances/trials/TheChrysalis.cpp +++ b/src/servers/Scripts/instances/trials/TheChrysalis.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp index a07a73e6..b3836668 100644 --- a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp +++ b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp index 1fb8d69f..e9c9e3ca 100644 --- a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp +++ b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp index 3daf3251..874d27c8 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp index 3f6d66d8..a050ee9d 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp index 7dd4dbeb..2a57708f 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp index 99436ffc..48aca9bd 100644 --- a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp +++ b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp index f43329d5..77c7a919 100644 --- a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp index 4b4eb5ee..a08ab854 100644 --- a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp index bcb090e0..df6280d2 100644 --- a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp +++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp index b28494b4..d9ef0b4a 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp index 74b8c11e..78e9fe50 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp index 966bd77f..01fbf42b 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp index 79fa4e89..0f58e3fa 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheNavel.cpp b/src/servers/Scripts/instances/trials/TheNavel.cpp index cab03b0c..349352da 100644 --- a/src/servers/Scripts/instances/trials/TheNavel.cpp +++ b/src/servers/Scripts/instances/trials/TheNavel.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp index 191aa768..a4213b25 100644 --- a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/Scripts/instances/trials/TheNavelHard.cpp index 22ae7441..f7e4692e 100644 --- a/src/servers/Scripts/instances/trials/TheNavelHard.cpp +++ b/src/servers/Scripts/instances/trials/TheNavelHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp index 203a34b7..0b61db7d 100644 --- a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp +++ b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp index e9141ff0..bbe59ff9 100644 --- a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp index e7581de5..5bae7602 100644 --- a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp +++ b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp index 23afa8e6..4cae1dc7 100644 --- a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp +++ b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp index 4c394631..9810b69f 100644 --- a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp +++ b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp index a8977105..9b08f5ac 100644 --- a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp index 794d6ffe..51cae324 100644 --- a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp +++ b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp index 30008db5..f9e3458f 100644 --- a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp index d7e5c897..80711c39 100644 --- a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp +++ b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp index badfd17f..50b28fcb 100644 --- a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp index 370e7186..c04883a6 100644 --- a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp +++ b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp index 20bf9a9d..9fbe70b2 100644 --- a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp index bf3706e5..3999c9d1 100644 --- a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp +++ b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/Scripts/instances/trials/UrthsFount.cpp b/src/servers/Scripts/instances/trials/UrthsFount.cpp index f206105b..aae7dc94 100644 --- a/src/servers/Scripts/instances/trials/UrthsFount.cpp +++ b/src/servers/Scripts/instances/trials/UrthsFount.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace Sapphire; diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp index 62664869..dcec0c82 100644 --- a/src/servers/sapphire_zone/Actor/Actor.cpp +++ b/src/servers/sapphire_zone/Actor/Actor.cpp @@ -9,7 +9,7 @@ #include "Action/Action.h" #include "Action/ActionCollision.h" -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/GameConnection.h" @@ -21,7 +21,7 @@ #include "ServerMgr.h" #include "Session.h" -#include "Zone/TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "StatusEffect/StatusEffect.h" diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/servers/sapphire_zone/Actor/BNpc.cpp index 125235b3..fee7bc56 100644 --- a/src/servers/sapphire_zone/Actor/BNpc.cpp +++ b/src/servers/sapphire_zone/Actor/BNpc.cpp @@ -9,7 +9,7 @@ #include "Forwards.h" #include "Action/Action.h" -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/GameConnection.h" #include "Network/PacketWrappers/ActorControlPacket142.h" @@ -27,7 +27,7 @@ #include "Player.h" #include "BNpc.h" #include "BNpcTemplate.h" -#include "Zone/TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "Framework.h" #include "Common.h" diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp index 92495e14..b90a81ee 100644 --- a/src/servers/sapphire_zone/Actor/Chara.cpp +++ b/src/servers/sapphire_zone/Actor/Chara.cpp @@ -9,7 +9,7 @@ #include "Forwards.h" #include "Action/Action.h" -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/GameConnection.h" #include "Network/PacketWrappers/ActorControlPacket142.h" @@ -25,7 +25,7 @@ #include "Math/CalcBattle.h" #include "Chara.h" #include "Player.h" -#include "Zone/TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "Framework.h" #include "Common.h" diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp index 5dea822f..9fa0d54e 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.cpp +++ b/src/servers/sapphire_zone/Actor/EventObject.cpp @@ -1,6 +1,6 @@ #include "EventObject.h" -#include "Zone/InstanceContent.h" +#include "Territory/InstanceContent.h" #include "Actor/Player.h" #include "Network/PacketWrappers/ActorControlPacket142.h" @@ -29,7 +29,8 @@ Sapphire::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, m_gimmickId( gimmickId ), m_state( initialState ), m_objectId( objectId ), - m_name( givenName ) + m_name( givenName ), + m_housingLink( 0 ) { m_id = actorId; m_pos.x = pos.x; @@ -96,6 +97,16 @@ void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t an } } +void Sapphire::Entity::EventObject::setHousingLink( uint32_t housingLink ) +{ + m_housingLink = housingLink; +} + +uint32_t Sapphire::Entity::EventObject::getHousingLink() const +{ + return m_housingLink; +} + void Sapphire::Entity::EventObject::setParentInstance( Sapphire::InstanceContentPtr instance ) { m_parentInstance = instance; @@ -125,6 +136,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget ) eobjStatePacket->data().position = getPos(); eobjStatePacket->data().scale = getScale(); eobjStatePacket->data().actorId = getId(); + eobjStatePacket->data().housingLink = getHousingLink(); eobjStatePacket->data().rotation = Math::Util::floatToUInt16Rot( getRot() ); pTarget->queuePacket( eobjStatePacket ); } diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h index ad7382ce..ad6d8bc0 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.h +++ b/src/servers/sapphire_zone/Actor/EventObject.h @@ -45,7 +45,12 @@ namespace Sapphire::Entity void setAnimationFlag( uint32_t flag, uint32_t animationFlag ); + void setHousingLink( uint32_t housingLink ); + + uint32_t getHousingLink() const; + protected: + uint32_t m_housingLink; uint32_t m_gimmickId; uint32_t m_objectId; uint8_t m_state; diff --git a/src/servers/sapphire_zone/Actor/Npc.cpp b/src/servers/sapphire_zone/Actor/Npc.cpp index cd79d2c7..341dd5c5 100644 --- a/src/servers/sapphire_zone/Actor/Npc.cpp +++ b/src/servers/sapphire_zone/Actor/Npc.cpp @@ -9,7 +9,7 @@ #include "Forwards.h" #include "Action/Action.h" -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/GameConnection.h" #include "Network/PacketWrappers/ActorControlPacket142.h" @@ -26,7 +26,7 @@ #include "Chara.h" #include "Player.h" #include "Npc.h" -#include "Zone/TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "Framework.h" #include "Common.h" diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index 3d7010c5..36d2d47b 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -11,12 +11,12 @@ #include "Session.h" #include "Player.h" -#include "Zone/TerritoryMgr.h" -#include "Zone/Zone.h" -#include "Zone/ZonePosition.h" +#include "Manager/TerritoryMgr.h" +#include "Territory/Zone.h" +#include "Territory/ZonePosition.h" -#include "Zone//HousingMgr.h" -#include "Zone/Land.h" +#include "Manager/HousingMgr.h" +#include "Territory/Land.h" #include "Network/GameConnection.h" #include "Network/PacketWrappers/ActorControlPacket142.h" @@ -49,6 +49,7 @@ using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; +using namespace Sapphire::World::Manager; using InventoryMap = std::map< uint16_t, Sapphire::ItemContainerPtr >; using InvSlotPair = std::pair< uint16_t, int8_t >; diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp index 013b6824..935a9e92 100644 --- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp @@ -15,7 +15,7 @@ #include "Action/EventAction.h" #include "Action/EventItemAction.h" -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "ServerMgr.h" #include "Framework.h" diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp index 2c37e108..d7c78044 100644 --- a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp @@ -3,7 +3,7 @@ #include #include -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp index 62fea9fe..b19fc331 100644 --- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp @@ -12,8 +12,8 @@ #include "Network/GameConnection.h" #include "Network/PacketWrappers/InitUIPacket.h" -#include "Zone/TerritoryMgr.h" -#include "Zone/Zone.h" +#include "Manager/TerritoryMgr.h" +#include "Territory/Zone.h" #include "Inventory/Item.h" #include "Inventory/ItemContainer.h" #include "Inventory/ItemUtil.h" @@ -26,6 +26,7 @@ extern Sapphire::Framework g_fw; using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::World::Manager; // load player from the db bool Sapphire::Entity::Player::load( uint32_t charId, SessionPtr pSession ) diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index c22229c8..56a53413 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -19,7 +19,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Network/PacketWrappers/*.c* Script/*.c* StatusEffect/*.c* - Zone/*.c*) + Territory/*.c*) add_executable( sapphire_zone ${SERVER_SOURCE_FILES} ) diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp index 79d4960e..5e9de090 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp @@ -26,10 +26,10 @@ #include "Actor/EventObject.h" #include "Actor/BNpc.h" -#include "Zone/Zone.h" -#include "Zone/HousingZone.h" -#include "Zone/InstanceContent.h" -#include "Zone/TerritoryMgr.h" +#include "Territory/Zone.h" +#include "Territory/HousingZone.h" +#include "Territory/InstanceContent.h" +#include "Manager/TerritoryMgr.h" #include "Event/EventDefs.h" #include "ServerMgr.h" @@ -42,6 +42,7 @@ extern Sapphire::Framework g_fw; using namespace Sapphire::Network; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::World::Manager; // instanciate and initialize commands Sapphire::DebugCommandHandler::DebugCommandHandler() diff --git a/src/servers/sapphire_zone/ForwardsZone.h b/src/servers/sapphire_zone/ForwardsZone.h index b3783830..66f61e8a 100644 --- a/src/servers/sapphire_zone/ForwardsZone.h +++ b/src/servers/sapphire_zone/ForwardsZone.h @@ -20,7 +20,6 @@ namespace Sapphire { TYPE_FORWARD( Cell ); TYPE_FORWARD( Zone ); TYPE_FORWARD( HousingZone ); -TYPE_FORWARD( HousingMgr ); TYPE_FORWARD( House ); TYPE_FORWARD( InstanceContent ); TYPE_FORWARD( Item ); @@ -29,6 +28,11 @@ TYPE_FORWARD( Session ); TYPE_FORWARD( ZonePosition ); TYPE_FORWARD( Land ) +namespace World::Manager +{ +TYPE_FORWARD( HousingMgr ); +} + namespace StatusEffect { TYPE_FORWARD( StatusEffect ); TYPE_FORWARD( StatusEffectContainer ); diff --git a/src/servers/sapphire_zone/Zone/HousingMgr.cpp b/src/servers/sapphire_zone/Manager/HousingMgr.cpp similarity index 84% rename from src/servers/sapphire_zone/Zone/HousingMgr.cpp rename to src/servers/sapphire_zone/Manager/HousingMgr.cpp index 2824eb4f..e58922b2 100644 --- a/src/servers/sapphire_zone/Zone/HousingMgr.cpp +++ b/src/servers/sapphire_zone/Manager/HousingMgr.cpp @@ -12,15 +12,16 @@ #include #include "Actor/Player.h" +#include "Actor/EventObject.h" #include "TerritoryMgr.h" -#include "Zone.h" -#include "HousingZone.h" +#include "Territory/Zone.h" +#include "Territory/HousingZone.h" #include "HousingMgr.h" -#include "Land.h" +#include "Territory/Land.h" #include "Framework.h" #include "ServerMgr.h" -#include "House.h" +#include "Territory/House.h" using namespace Sapphire::Common; using namespace Sapphire::Network; @@ -29,34 +30,34 @@ using namespace Sapphire::Network::Packets::Server; extern Sapphire::Framework g_fw; -Sapphire::HousingMgr::HousingMgr() +Sapphire::World::Manager::HousingMgr::HousingMgr() { } -Sapphire::HousingMgr::~HousingMgr() +Sapphire::World::Manager::HousingMgr::~HousingMgr() { } -bool Sapphire::HousingMgr::init() +bool Sapphire::World::Manager::HousingMgr::init() { return true; } -uint32_t Sapphire::HousingMgr::toLandSetId( uint16_t territoryTypeId, uint8_t wardId ) const +uint32_t Sapphire::World::Manager::HousingMgr::toLandSetId( uint16_t territoryTypeId, uint8_t wardId ) const { return ( static_cast< uint32_t >( territoryTypeId ) << 16 ) | wardId; } -Sapphire::Data::HousingZonePtr Sapphire::HousingMgr::getHousingZoneByLandSetId( uint32_t id ) +Sapphire::Data::HousingZonePtr Sapphire::World::Manager::HousingMgr::getHousingZoneByLandSetId( uint32_t id ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); return std::dynamic_pointer_cast< HousingZone >( pTeriMgr->getZoneByLandSetId( id ) ); } -Sapphire::LandPtr Sapphire::HousingMgr::getLandByOwnerId( uint32_t id ) +Sapphire::LandPtr Sapphire::World::Manager::HousingMgr::getLandByOwnerId( uint32_t id ) { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto res = pDb->query( "SELECT LandSetId, LandId FROM land WHERE OwnerId = " + std::to_string( id ) ); @@ -72,7 +73,7 @@ Sapphire::LandPtr Sapphire::HousingMgr::getLandByOwnerId( uint32_t id ) return hZone->getLand( res->getUInt( 2 ) ); } -void Sapphire::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) +void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) { player.setActiveLand( plotId, wardId ); @@ -113,7 +114,7 @@ void Sapphire::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wa player.queuePacket( landInfoSignPacket ); } -void Sapphire::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) +void Sapphire::World::Manager::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) { player.setActiveLand( plotId, wardId ); @@ -130,7 +131,7 @@ void Sapphire::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t war player.queuePacket( plotPricePacket ); } -Sapphire::LandPurchaseResult Sapphire::HousingMgr::purchaseLand( Entity::Player& player, uint8_t plot, uint8_t state ) +Sapphire::LandPurchaseResult Sapphire::World::Manager::HousingMgr::purchaseLand( Entity::Player& player, uint8_t plot, uint8_t state ) { auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ); @@ -185,7 +186,7 @@ Sapphire::LandPurchaseResult Sapphire::HousingMgr::purchaseLand( Entity::Player& } -bool Sapphire::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot ) +bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot ) { // TODO: Fix "permissions" being sent incorrectly // TODO: Add checks for land state before relinquishing @@ -231,7 +232,7 @@ bool Sapphire::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot return true; } -void Sapphire::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId ) +void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -283,7 +284,7 @@ void Sapphire::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t war player.queuePacket( wardInfoPacket ); } -void Sapphire::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetItem ) +void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetItem ) { auto hZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ); @@ -321,9 +322,12 @@ void Sapphire::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t pl player.setLandFlags( LandFlagsSlot::Private, EstateBuilt, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() ); player.sendLandFlagsSlot( LandFlagsSlot::Private ); + + auto eobj = hZone->registerEObj( "entrance", 2002737, 0, 4, pLand->getMapMarkerPosition(), 1.f, 0.f ); + eobj->setHousingLink( plotNum << 8 ); } -void Sapphire::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::World::Manager::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -348,7 +352,7 @@ void Sapphire::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t player.queuePacket( landRenamePacket ); } -void Sapphire::HousingMgr::requestEstateEditGreeting( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::World::Manager::HousingMgr::requestEstateEditGreeting( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -375,7 +379,7 @@ void Sapphire::HousingMgr::requestEstateEditGreeting( Entity::Player& player, ui player.queuePacket( estateGreetingPacket ); } -void Sapphire::HousingMgr::updateEstateGreeting( Entity::Player& player, const Common::LandIdent& ident, const std::string& greeting ) +void Sapphire::World::Manager::HousingMgr::updateEstateGreeting( Entity::Player& player, const Common::LandIdent& ident, const std::string& greeting ) { auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum ); auto zone = getHousingZoneByLandSetId( landSetId ); @@ -401,7 +405,7 @@ void Sapphire::HousingMgr::updateEstateGreeting( Entity::Player& player, const C player.sendLogMessage( 3381 ); } -void Sapphire::HousingMgr::requestEstateEditGuestAccess( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); diff --git a/src/servers/sapphire_zone/Zone/HousingMgr.h b/src/servers/sapphire_zone/Manager/HousingMgr.h similarity index 95% rename from src/servers/sapphire_zone/Zone/HousingMgr.h rename to src/servers/sapphire_zone/Manager/HousingMgr.h index d10a0325..73e67125 100644 --- a/src/servers/sapphire_zone/Zone/HousingMgr.h +++ b/src/servers/sapphire_zone/Manager/HousingMgr.h @@ -2,7 +2,7 @@ #define SAPPHIRE_HOUSINGMGR_H #include "Forwards.h" -#include "HousingZone.h" +#include "Territory/HousingZone.h" #include #include @@ -11,7 +11,7 @@ namespace Sapphire::Data using HousingZonePtr = std::shared_ptr< HousingZone >; } -namespace Sapphire +namespace Sapphire::World::Manager { class HousingMgr { diff --git a/src/servers/sapphire_zone/Manager/PlayerMgr.cpp b/src/servers/sapphire_zone/Manager/PlayerMgr.cpp index bcb0a2ce..0c030e82 100644 --- a/src/servers/sapphire_zone/Manager/PlayerMgr.cpp +++ b/src/servers/sapphire_zone/Manager/PlayerMgr.cpp @@ -3,19 +3,20 @@ #include #include -#include -#include +#include +#include -#include +#include #include extern Sapphire::Framework g_fw; +using namespace Sapphire::World::Manager; void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param ) { // check if we have one in the db first - auto terriMgr = g_fw.get< Sapphire::TerritoryMgr >(); + auto terriMgr = g_fw.get< TerritoryMgr >(); if( !terriMgr ) return; @@ -27,7 +28,7 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire: // check if its a housing zone, zoning is different here if( terriMgr->isHousingTerritory( terriPos->getTargetZoneId() ) ) { - auto housingMgr = g_fw.get< Sapphire::HousingMgr >(); + auto housingMgr = g_fw.get< HousingMgr >(); auto landSetId = housingMgr->toLandSetId( terriPos->getTargetZoneId(), param ); auto housingZone = housingMgr->getHousingZoneByLandSetId( landSetId ); diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Manager/TerritoryMgr.cpp similarity index 80% rename from src/servers/sapphire_zone/Zone/TerritoryMgr.cpp rename to src/servers/sapphire_zone/Manager/TerritoryMgr.cpp index 29d61afe..46ca2fe3 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp +++ b/src/servers/sapphire_zone/Manager/TerritoryMgr.cpp @@ -6,22 +6,22 @@ #include "Actor/Player.h" -#include "Zone.h" -#include "HousingZone.h" -#include "ZonePosition.h" -#include "InstanceContent.h" +#include "Territory/Zone.h" +#include "Territory/HousingZone.h" +#include "Territory/ZonePosition.h" +#include "Territory/InstanceContent.h" #include "TerritoryMgr.h" #include "Framework.h" extern Sapphire::Framework g_fw; -Sapphire::TerritoryMgr::TerritoryMgr() : +Sapphire::World::Manager::TerritoryMgr::TerritoryMgr() : m_lastInstanceId( 10000 ) { } -void Sapphire::TerritoryMgr::loadTerritoryTypeDetailCache() +void Sapphire::World::Manager::TerritoryMgr::loadTerritoryTypeDetailCache() { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto idList = pExdData->getTerritoryTypeIdList(); @@ -35,12 +35,12 @@ void Sapphire::TerritoryMgr::loadTerritoryTypeDetailCache() } } -bool Sapphire::TerritoryMgr::isValidTerritory( uint32_t territoryTypeId ) const +bool Sapphire::World::Manager::TerritoryMgr::isValidTerritory( uint32_t territoryTypeId ) const { return !( m_territoryTypeDetailCacheMap.find( territoryTypeId ) == m_territoryTypeDetailCacheMap.end() ); } -bool Sapphire::TerritoryMgr::init() +bool Sapphire::World::Manager::TerritoryMgr::init() { loadTerritoryTypeDetailCache(); loadTerritoryPositionMap(); @@ -51,12 +51,12 @@ bool Sapphire::TerritoryMgr::init() return true; } -uint32_t Sapphire::TerritoryMgr::getNextInstanceId() +uint32_t Sapphire::World::Manager::TerritoryMgr::getNextInstanceId() { return ++m_lastInstanceId; } -Sapphire::Data::TerritoryTypePtr Sapphire::TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const +Sapphire::Data::TerritoryTypePtr Sapphire::World::Manager::TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const { auto tIt = m_territoryTypeDetailCacheMap.find( territoryTypeId ); if( tIt == m_territoryTypeDetailCacheMap.end() ) @@ -65,7 +65,7 @@ Sapphire::Data::TerritoryTypePtr Sapphire::TerritoryMgr::getTerritoryDetail( uin return tIt->second; } -bool Sapphire::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId ) const +bool Sapphire::World::Manager::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -86,7 +86,7 @@ bool Sapphire::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeI intendedUse == TerritoryIntendedUse::EventTrial; } -bool Sapphire::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const +bool Sapphire::World::Manager::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -100,7 +100,7 @@ bool Sapphire::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) cons pTeri->territoryIntendedUse == TerritoryIntendedUse::MSQPrivateArea; } -bool Sapphire::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) const +bool Sapphire::World::Manager::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -114,7 +114,7 @@ bool Sapphire::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) cons } -bool Sapphire::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const +bool Sapphire::World::Manager::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -124,7 +124,7 @@ bool Sapphire::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) cons return pTeri->territoryIntendedUse == TerritoryIntendedUse::HousingArea; } -bool Sapphire::TerritoryMgr::createDefaultTerritories() +bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories() { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pLog = g_fw.get< Logger >(); @@ -165,7 +165,7 @@ bool Sapphire::TerritoryMgr::createDefaultTerritories() return true; } -bool Sapphire::TerritoryMgr::createHousingTerritories() +bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories() { //separate housing zones from default auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -213,7 +213,7 @@ bool Sapphire::TerritoryMgr::createHousingTerritories() return true; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId ) +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId ) { if( !isValidTerritory( territoryTypeId ) ) return nullptr; @@ -242,7 +242,7 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::createTerritoryInstance( uint32_t terr return pZone; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId ) +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -278,7 +278,12 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::createInstanceContent( uint32_t conten return pZone; } -bool Sapphire::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createHousingInterior( const Common::LandIdent& landIdent ) +{ + +} + +bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) { ZonePtr pZone; if( ( pZone = getInstanceZonePtr( instanceId ) ) == nullptr ) @@ -301,7 +306,7 @@ bool Sapphire::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) return true; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) const +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) const { auto it = m_instanceIdToZonePtrMap.find( instanceId ); if( it == m_instanceIdToZonePtrMap.end() ) @@ -310,7 +315,7 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::getInstanceZonePtr( uint32_t instanceI return it->second; } -void Sapphire::TerritoryMgr::loadTerritoryPositionMap() +void Sapphire::World::Manager::TerritoryMgr::loadTerritoryPositionMap() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pQR = pDb->query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" ); @@ -330,7 +335,7 @@ void Sapphire::TerritoryMgr::loadTerritoryPositionMap() } } -Sapphire::ZonePositionPtr Sapphire::TerritoryMgr::getTerritoryPosition( uint32_t territoryPositionId ) const +Sapphire::ZonePositionPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryPosition( uint32_t territoryPositionId ) const { auto it = m_territoryPositionMap.find( territoryPositionId ); @@ -340,7 +345,7 @@ Sapphire::ZonePositionPtr Sapphire::TerritoryMgr::getTerritoryPosition( uint32_t return nullptr; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const { auto zoneMap = m_territoryTypeIdToInstanceGuidMap.find( territoryTypeId ); if( zoneMap == m_territoryTypeIdToInstanceGuidMap.end() ) @@ -350,7 +355,7 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t ter return zoneMap->second.begin()->second; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const { auto zoneMap = m_landSetIdToZonePtrMap.find( landSetId ); if( zoneMap == m_landSetIdToZonePtrMap.end() ) @@ -359,7 +364,7 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId return zoneMap->second; } -void Sapphire::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) +void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) { for( auto& zone : m_zoneSet ) { @@ -372,7 +377,7 @@ void Sapphire::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) } } -Sapphire::TerritoryMgr::InstanceIdList Sapphire::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const +Sapphire::World::Manager::TerritoryMgr::InstanceIdList Sapphire::World::Manager::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const { std::vector< uint32_t > idList; auto zoneMap = m_instanceContentToInstanceMap.find( instanceContentId ); @@ -387,14 +392,14 @@ Sapphire::TerritoryMgr::InstanceIdList Sapphire::TerritoryMgr::getInstanceConten return idList; } -bool Sapphire::TerritoryMgr::movePlayer( uint32_t territoryTypeId, Sapphire::Entity::PlayerPtr pPlayer ) +bool Sapphire::World::Manager::TerritoryMgr::movePlayer( uint32_t territoryTypeId, Sapphire::Entity::PlayerPtr pPlayer ) { auto pZone = getZoneByTerritoryTypeId( territoryTypeId ); assert( pZone ); return movePlayer( pZone, pPlayer ); } -bool Sapphire::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire::Entity::PlayerPtr pPlayer ) +bool Sapphire::World::Manager::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire::Entity::PlayerPtr pPlayer ) { auto pLog = g_fw.get< Logger >(); if( !pZone ) @@ -437,7 +442,7 @@ bool Sapphire::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire::Entity::Player return true; } -Sapphire::ZonePtr Sapphire::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const +Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const { auto it = m_playerIdToInstanceMap.find( playerId ); if( it != m_playerIdToInstanceMap.end() ) @@ -447,12 +452,12 @@ Sapphire::ZonePtr Sapphire::TerritoryMgr::getLinkedInstance( uint32_t playerId ) return nullptr; } -const std::pair< uint16_t, uint16_t >& Sapphire::TerritoryMgr::getCurrentFestival() const +const std::pair< uint16_t, uint16_t >& Sapphire::World::Manager::TerritoryMgr::getCurrentFestival() const { return m_currentFestival; } -void Sapphire::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestival ) +void Sapphire::World::Manager::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestival ) { m_currentFestival = { festivalId, additionalFestival }; @@ -462,7 +467,7 @@ void Sapphire::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t a } } -void Sapphire::TerritoryMgr::disableCurrentFestival() +void Sapphire::World::Manager::TerritoryMgr::disableCurrentFestival() { setCurrentFestival( 0 ); } diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Manager/TerritoryMgr.h similarity index 98% rename from src/servers/sapphire_zone/Zone/TerritoryMgr.h rename to src/servers/sapphire_zone/Manager/TerritoryMgr.h index 1e4dd85c..d9c51df9 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h +++ b/src/servers/sapphire_zone/Manager/TerritoryMgr.h @@ -5,7 +5,7 @@ #include #include -namespace Sapphire::Data +namespace Sapphire::Data { // TODO: this should actually not be here but should be generated in exdData aswell struct PlaceName; @@ -17,7 +17,7 @@ namespace Sapphire::Data using InstanceContentPtr = std::shared_ptr< InstanceContent >; } -namespace Sapphire +namespace Sapphire::World::Manager { /*! \class TerritoryMgr_c @@ -99,6 +99,8 @@ public: ZonePtr createInstanceContent( uint32_t contentFinderConditionId ); + ZonePtr createHousingInterior( const Common::LandIdent& landIdent ); + /*! removes instance by instanceId, return true if successful */ bool removeTerritoryInstance( uint32_t territoryTypeId ); @@ -117,7 +119,7 @@ public: /*! returns a default Zone by territoryTypeId TODO: Mind multiple instances?! */ ZonePtr getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const; - + /*! returns a Zone by landSetId */ ZonePtr getZoneByLandSetId( uint32_t landSetId ) const; diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index acc5296c..25c42c9b 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -8,7 +8,7 @@ #include #include -#include "Zone/Zone.h" +#include "Territory/Zone.h" #include "Network/PacketWrappers/InitUIPacket.h" diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp index 8727bfb9..f8816e5f 100644 --- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp @@ -5,8 +5,8 @@ #include #include -#include "Zone/TerritoryMgr.h" -#include "Zone/InstanceContent.h" +#include "Manager/TerritoryMgr.h" +#include "Territory/InstanceContent.h" #include "Network/GameConnection.h" #include "Network/PacketWrappers/ServerNoticePacket.h" @@ -21,6 +21,7 @@ extern Sapphire::Framework g_fw; using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::World::Manager; void Sapphire::Network::GameConnection::cfDutyInfoRequest( const Packets::FFXIVARR_PACKET_RAW& inPacket, diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp index f1be2d0c..c1160246 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp @@ -8,9 +8,9 @@ #include #include -#include "Zone/Zone.h" -#include "Zone/ZonePosition.h" -#include "Zone/HousingMgr.h" +#include "Territory/Zone.h" +#include "Territory/ZonePosition.h" +#include "Manager/HousingMgr.h" #include "Network/GameConnection.h" @@ -42,6 +42,7 @@ using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; +using namespace Sapphire::World::Manager; void examineHandler( Sapphire::Entity::Player& player, uint32_t targetId ) { diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index f02ea7ef..0ce1a9a9 100644 --- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -20,7 +20,7 @@ #include "Event/EventHandler.h" #include "Event/EventHelper.h" -#include "Zone/InstanceContent.h" +#include "Territory/InstanceContent.h" #include "Session.h" diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index a6beaf1d..ce9992ea 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -13,9 +13,9 @@ #include "Session.h" -#include "Zone/TerritoryMgr.h" -#include "Zone/Zone.h" -#include "Zone/InstanceContent.h" +#include "Manager/TerritoryMgr.h" +#include "Territory/Zone.h" +#include "Territory/InstanceContent.h" #include "Network/PacketWrappers/InitUIPacket.h" #include "Network/PacketWrappers/PingPacket.h" @@ -38,6 +38,7 @@ using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; +using namespace Sapphire::World::Manager; enum GmCommand { diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp index a0925f98..370d0d75 100644 --- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp @@ -8,8 +8,8 @@ #include "Network/GameConnection.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Zone/Zone.h" -#include "Zone/ZonePosition.h" +#include "Territory/Zone.h" +#include "Territory/ZonePosition.h" #include "DebugCommand/DebugCommandHandler.h" #include "Actor/Player.h" diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index 3de70b02..2e86da9d 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -14,13 +14,13 @@ #include "Network/GameConnection.h" -#include "Zone/TerritoryMgr.h" -#include "Zone/Zone.h" -#include "Zone/HousingZone.h" -#include "Zone/HousingMgr.h" -#include "Zone/Land.h" -#include "Zone/ZonePosition.h" -#include "Zone/House.h" +#include "Manager/TerritoryMgr.h" +#include "Territory/Zone.h" +#include "Territory/HousingZone.h" +#include "Manager/HousingMgr.h" +#include "Territory/Land.h" +#include "Territory/ZonePosition.h" +#include "Territory/House.h" #include "Network/PacketWrappers/InitUIPacket.h" #include "Network/PacketWrappers/PingPacket.h" @@ -52,6 +52,7 @@ using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; +using namespace Sapphire::World::Manager; void Sapphire::Network::GameConnection::fcInfoReqHandler( const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp index 49b78d9f..5c99828a 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp +++ b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp @@ -143,6 +143,17 @@ namespace Sapphire::ScriptAPI /////////////////////////////////////////////////////////////////// + EventObjectScript::EventObjectScript( uint32_t eobjId ) : + ScriptObject( eobjId, typeid( EventObjectScript ).hash_code() ) + { + } + + void EventObjectScript::onTalk( uint32_t eventId, Sapphire::Entity::Player& player, Entity::EventObject& eobj ) + { + } + + /////////////////////////////////////////////////////////////////// + BattleNpcScript::BattleNpcScript( uint32_t npcId ) : ScriptObject( npcId, typeid( BattleNpcScript ).hash_code() ) { diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h index 05329528..c5c35166 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptApi.h +++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h @@ -182,6 +182,16 @@ namespace Sapphire::ScriptAPI uint32_t catalogId ); }; + /*! + * @brief The base class for scripts that implement behaviour related to Event Objects (EObjs) + */ + class EventObjectScript : public ScriptObject + { + public: + explicit EventObjectScript( uint32_t eobjId ); + + virtual void onTalk( uint32_t eventId, Sapphire::Entity::Player& player, Entity::EventObject& eobj ); + }; /*! * @brief The base class for any scripts that implement behaviour related to BattleNPCs diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp index b84c17c1..68432a9d 100644 --- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp +++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp @@ -4,9 +4,10 @@ #include -#include "Zone/Zone.h" -#include "Zone/InstanceContent.h" +#include "Territory/Zone.h" +#include "Territory/InstanceContent.h" #include "Actor/Player.h" +#include "Actor/EventObject.h" #include "ServerMgr.h" #include "Event/EventHandler.h" #include "Event/EventHelper.h" @@ -168,6 +169,19 @@ void Sapphire::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& pl bool Sapphire::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId ) { + // check if the actor is an eobj and call its script if we have one + auto zone = player.getCurrentZone(); + if( auto eobj = zone->getEObj( actorId ) ) + { + auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventObjectScript >( eobj->getObjectId() ); + if( script ) + { + script->onTalk( eventId, player, *eobj ); + return true; + } + } + + // check for a direct eventid match first, otherwise default to base type auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); if( script ) { diff --git a/src/servers/sapphire_zone/ServerMgr.cpp b/src/servers/sapphire_zone/ServerMgr.cpp index 9870b975..caab736b 100644 --- a/src/servers/sapphire_zone/ServerMgr.cpp +++ b/src/servers/sapphire_zone/ServerMgr.cpp @@ -21,13 +21,15 @@ #include "Session.h" -#include "Zone/TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "Script/ScriptMgr.h" #include "Linkshell/LinkshellMgr.h" extern Sapphire::Framework g_fw; +using namespace Sapphire::World::Manager; + Sapphire::ServerMgr::ServerMgr( const std::string& configName ) : m_configName( configName ), m_bRunning( true ), diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Territory/Cell.cpp similarity index 100% rename from src/servers/sapphire_zone/Zone/Cell.cpp rename to src/servers/sapphire_zone/Territory/Cell.cpp diff --git a/src/servers/sapphire_zone/Zone/Cell.h b/src/servers/sapphire_zone/Territory/Cell.h similarity index 100% rename from src/servers/sapphire_zone/Zone/Cell.h rename to src/servers/sapphire_zone/Territory/Cell.h diff --git a/src/servers/sapphire_zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Territory/CellHandler.h similarity index 100% rename from src/servers/sapphire_zone/Zone/CellHandler.h rename to src/servers/sapphire_zone/Territory/CellHandler.h diff --git a/src/servers/sapphire_zone/Zone/House.cpp b/src/servers/sapphire_zone/Territory/House.cpp similarity index 100% rename from src/servers/sapphire_zone/Zone/House.cpp rename to src/servers/sapphire_zone/Territory/House.cpp diff --git a/src/servers/sapphire_zone/Zone/House.h b/src/servers/sapphire_zone/Territory/House.h similarity index 100% rename from src/servers/sapphire_zone/Zone/House.h rename to src/servers/sapphire_zone/Territory/House.h diff --git a/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.cpp b/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.h b/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.h new file mode 100644 index 00000000..d52f102a --- /dev/null +++ b/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.h @@ -0,0 +1,18 @@ +#include "Zone.h" + +namespace Sapphire::World::Territory::Housing +{ + class HousingInteriorTerritory : public Zone + { + public: + HousingInteriorTerritory( uint64_t ident, uint16_t territoryTypeId, + uint32_t guId, + const std::string& internalName, + const std::string& contentName ); + + bool init() override; + + void onPlayerZoneIn( Entity::Player& player ) override; + void onUpdate( uint32_t currTime ) override; + } +} \ No newline at end of file diff --git a/src/servers/sapphire_zone/Zone/HousingZone.cpp b/src/servers/sapphire_zone/Territory/HousingZone.cpp similarity index 92% rename from src/servers/sapphire_zone/Zone/HousingZone.cpp rename to src/servers/sapphire_zone/Territory/HousingZone.cpp index 99ed7404..a4f6e49c 100644 --- a/src/servers/sapphire_zone/Zone/HousingZone.cpp +++ b/src/servers/sapphire_zone/Territory/HousingZone.cpp @@ -9,12 +9,13 @@ #include "Actor/Player.h" #include "Actor/Actor.h" +#include "Actor/EventObject.h" #include "Land.h" #include "House.h" #include "Forwards.h" #include "HousingZone.h" -#include "HousingMgr.h" +#include "Manager/HousingMgr.h" #include "Framework.h" extern Sapphire::Framework g_fw; @@ -22,6 +23,7 @@ extern Sapphire::Framework g_fw; using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::World::Manager; Sapphire::HousingZone::HousingZone( uint8_t wardNum, uint16_t territoryTypeId, @@ -62,8 +64,14 @@ bool Sapphire::HousingZone::init() uint32_t landId; for( landId = 0; landId < 60; landId++ ) { - auto pObject = make_Land( m_territoryTypeId, getWardNum(), landId, m_landSetId, info ); - m_landPtrMap[ landId ] = pObject; + auto pLand = make_Land( m_territoryTypeId, getWardNum(), landId, m_landSetId, info ); + m_landPtrMap[ landId ] = pLand; + + if( auto house = pLand->getHouse() ) + { + auto eobj = registerEObj( "entrance", 2002737, 0, 4, pLand->getMapMarkerPosition(), 1.f, 0.f ); + eobj->setHousingLink( landId << 8 ); + } } return true; @@ -134,7 +142,6 @@ void Sapphire::HousingZone::sendLandSet( Entity::Player& player ) landData.plotSize = pLand->getSize(); landData.houseState = pLand->getState(); - landData.flags = 1; landData.iconAddIcon = pLand->getSharing(); landData.fcId = pLand->getFcId(); landData.fcIcon = pLand->getFcIcon(); @@ -142,6 +149,8 @@ void Sapphire::HousingZone::sendLandSet( Entity::Player& player ) if( auto house = pLand->getHouse() ) { + landData.flags = 1; + auto& parts = house->getHouseParts(); for( auto i = 0; i != parts.size(); i++ ) @@ -169,7 +178,6 @@ void Sapphire::HousingZone::sendLandUpdate( uint8_t landId ) landData.plotSize = pLand->getSize(); landData.houseState = pLand->getState(); - landData.flags = 1; landData.iconAddIcon = pLand->getSharing(); landData.fcId = pLand->getFcId(); landData.fcIcon = pLand->getFcIcon(); @@ -178,6 +186,8 @@ void Sapphire::HousingZone::sendLandUpdate( uint8_t landId ) if( auto house = pLand->getHouse() ) { + landData.flags = 1; + auto& parts = house->getHouseParts(); for( auto i = 0; i != parts.size(); i++ ) @@ -221,4 +231,4 @@ Sapphire::LandPtr Sapphire::HousingZone::getLand( uint8_t id ) return nullptr; return it->second; -} +} \ No newline at end of file diff --git a/src/servers/sapphire_zone/Zone/HousingZone.h b/src/servers/sapphire_zone/Territory/HousingZone.h similarity index 94% rename from src/servers/sapphire_zone/Zone/HousingZone.h rename to src/servers/sapphire_zone/Territory/HousingZone.h index 1c86d9dd..9f0ab003 100644 --- a/src/servers/sapphire_zone/Zone/HousingZone.h +++ b/src/servers/sapphire_zone/Territory/HousingZone.h @@ -42,6 +42,8 @@ namespace Sapphire void sendLandUpdate( uint8_t landId ); bool isPlayerSubInstance( Entity::Player& player ); + bool onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ); + /* returns current ward number for this zone */ uint8_t getWardNum() const; diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Territory/InstanceContent.cpp similarity index 100% rename from src/servers/sapphire_zone/Zone/InstanceContent.cpp rename to src/servers/sapphire_zone/Territory/InstanceContent.cpp diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Territory/InstanceContent.h similarity index 100% rename from src/servers/sapphire_zone/Zone/InstanceContent.h rename to src/servers/sapphire_zone/Territory/InstanceContent.h diff --git a/src/servers/sapphire_zone/Zone/Land.cpp b/src/servers/sapphire_zone/Territory/Land.cpp similarity index 95% rename from src/servers/sapphire_zone/Zone/Land.cpp rename to src/servers/sapphire_zone/Territory/Land.cpp index 187d2759..4efe3de7 100644 --- a/src/servers/sapphire_zone/Zone/Land.cpp +++ b/src/servers/sapphire_zone/Territory/Land.cpp @@ -88,6 +88,16 @@ void Sapphire::Land::load() m_pHouse = make_House( houseId, m_landSetId, m_landId, m_wardNum, m_territoryTypeId ); } + + auto pExdData = g_fw.get< Data::ExdDataGenerated >(); + auto info = pExdData->get< Sapphire::Data::HousingMapMarkerInfo >( getTerritoryTypeId(), getLandId() ); + if( info ) + { + m_mapMarkerPosition.x = info->x; + m_mapMarkerPosition.y = info->y; + m_mapMarkerPosition.z = info->z; + } + init(); } @@ -169,6 +179,11 @@ Sapphire::HousePtr Sapphire::Land::getHouse() const return m_pHouse; } +FFXIVARR_POSITION3 Sapphire::Land::getMapMarkerPosition() +{ + return m_mapMarkerPosition; +} + Sapphire::Common::LandType Sapphire::Land::getLandType() const { return m_type; diff --git a/src/servers/sapphire_zone/Zone/Land.h b/src/servers/sapphire_zone/Territory/Land.h similarity index 95% rename from src/servers/sapphire_zone/Zone/Land.h rename to src/servers/sapphire_zone/Territory/Land.h index 82702dd9..3720354a 100644 --- a/src/servers/sapphire_zone/Zone/Land.h +++ b/src/servers/sapphire_zone/Territory/Land.h @@ -36,6 +36,7 @@ namespace Sapphire uint16_t getTerritoryTypeId() const; Common::LandType getLandType() const; Sapphire::HousePtr getHouse() const; + Common::FFXIVARR_POSITION3 getMapMarkerPosition(); //Free Comapny void setFreeCompany( uint32_t id, uint32_t icon, uint32_t color ); @@ -78,6 +79,8 @@ namespace Sapphire uint32_t m_fcIcon; uint32_t m_fcIconColor; + Common::FFXIVARR_POSITION3 m_mapMarkerPosition; + uint32_t m_ownerPlayerId; Sapphire::Data::HousingLandSetPtr m_landInfo; diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Territory/Zone.cpp similarity index 99% rename from src/servers/sapphire_zone/Zone/Zone.cpp rename to src/servers/sapphire_zone/Territory/Zone.cpp index 8a1bce65..abdb9a60 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Territory/Zone.cpp @@ -16,7 +16,7 @@ #include "Zone.h" #include "InstanceContent.h" -#include "TerritoryMgr.h" +#include "Manager/TerritoryMgr.h" #include "Session.h" #include "Actor/Chara.h" @@ -34,13 +34,13 @@ #include "ServerMgr.h" #include "CellHandler.h" #include "Zone.h" -#include "TerritoryMgr.h" #include "Framework.h" using namespace Sapphire::Common; using namespace Sapphire::Network::Packets; using namespace Sapphire::Network::Packets::Server; using namespace Sapphire::Network::ActorControl; +using namespace Sapphire::World::Manager; extern Sapphire::Framework g_fw; @@ -727,7 +727,7 @@ void Sapphire::Zone::registerEObj( Entity::EventObjectPtr object ) onRegisterEObj( object ); - pLog->debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); + //pLog->debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); } Sapphire::Entity::EventObjectPtr Sapphire::Zone::getEObj( uint32_t objId ) diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Territory/Zone.h similarity index 100% rename from src/servers/sapphire_zone/Zone/Zone.h rename to src/servers/sapphire_zone/Territory/Zone.h diff --git a/src/servers/sapphire_zone/Zone/ZonePosition.cpp b/src/servers/sapphire_zone/Territory/ZonePosition.cpp similarity index 100% rename from src/servers/sapphire_zone/Zone/ZonePosition.cpp rename to src/servers/sapphire_zone/Territory/ZonePosition.cpp diff --git a/src/servers/sapphire_zone/Zone/ZonePosition.h b/src/servers/sapphire_zone/Territory/ZonePosition.h similarity index 100% rename from src/servers/sapphire_zone/Zone/ZonePosition.h rename to src/servers/sapphire_zone/Territory/ZonePosition.h diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp index d0ac6c4c..8e15fbd6 100644 --- a/src/servers/sapphire_zone/mainGameServer.cpp +++ b/src/servers/sapphire_zone/mainGameServer.cpp @@ -8,8 +8,8 @@ #include #include #include "Linkshell/LinkshellMgr.h" -#include "Zone/TerritoryMgr.h" -#include "Zone/HousingMgr.h" +#include "Manager/TerritoryMgr.h" +#include "Manager/HousingMgr.h" #include "DebugCommand/DebugCommandHandler.h" #include "Manager/PlayerMgr.h" #include "Manager/ShopMgr.h" @@ -19,6 +19,7 @@ Sapphire::Framework g_fw; using namespace Sapphire; +using namespace Sapphire::World; bool setupFramework() { @@ -28,12 +29,12 @@ bool setupFramework() auto pScript = std::make_shared< Scripting::ScriptMgr >(); auto pDb = std::make_shared< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pLsMgr = std::make_shared< LinkshellMgr >(); - auto pHousingMgr = std::make_shared< HousingMgr >(); - auto pTeriMgr = std::make_shared< TerritoryMgr >(); + auto pHousingMgr = std::make_shared< Manager::HousingMgr >(); + auto pTeriMgr = std::make_shared< Manager::TerritoryMgr >(); auto pDebugCom = std::make_shared< DebugCommandHandler >(); auto pConfig = std::make_shared< ConfigMgr >(); - auto pPlayerMgr = std::make_shared< Sapphire::World::Manager::PlayerMgr >(); - auto pShopMgr = std::make_shared< Sapphire::World::Manager::ShopMgr >(); + auto pPlayerMgr = std::make_shared< Manager::PlayerMgr >(); + auto pShopMgr = std::make_shared< Manager::ShopMgr >(); pLogger->setLogPath( "log/SapphireZone" ); pLogger->init(); @@ -44,12 +45,12 @@ bool setupFramework() g_fw.set< Scripting::ScriptMgr >( pScript ); g_fw.set< Db::DbWorkerPool< Db::ZoneDbConnection > >( pDb ); g_fw.set< LinkshellMgr >( pLsMgr ); - g_fw.set< HousingMgr >( pHousingMgr ); - g_fw.set< TerritoryMgr >( pTeriMgr ); + g_fw.set< Manager::HousingMgr >( pHousingMgr ); + g_fw.set< Manager::TerritoryMgr >( pTeriMgr ); g_fw.set< DebugCommandHandler >( pDebugCom ); g_fw.set< ConfigMgr >( pConfig ); - g_fw.set< Sapphire::World::Manager::PlayerMgr >( pPlayerMgr ); - g_fw.set< Sapphire::World::Manager::ShopMgr >( pShopMgr ); + g_fw.set< Manager::PlayerMgr >( pPlayerMgr ); + g_fw.set< Manager::ShopMgr >( pShopMgr ); // actuall catch errors here... return true; diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl index 7544e2e9..b2913ebe 100644 --- a/src/tools/event_object_parser/instance.tmpl +++ b/src/tools/event_object_parser/instance.tmpl @@ -1,5 +1,5 @@ #include -#include +#include class INSTANCE_NAME : public InstanceContentScript {