From 6255df16f2ff5c43d47b8b81548374407a63a016 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Mar 2018 17:41:17 +1100 Subject: [PATCH 1/4] fix rotation in objectspawn ipc and send it too --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 +++--- src/servers/sapphire_zone/Actor/EventObject.cpp | 5 ++++- src/servers/sapphire_zone/Actor/EventObject.h | 2 +- src/servers/sapphire_zone/Zone/Zone.cpp | 4 ++-- src/servers/sapphire_zone/Zone/Zone.h | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 59ebd4ab..071ebc50 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1327,15 +1327,15 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket uint32_t hierachyId; float scale; int16_t unknown20a; - uint16_t unknown20b; + uint16_t rotation; int16_t unknown24a; int16_t unknown24b; uint16_t unknown28a; int16_t unknown28c; uint32_t unknown2C; Common::FFXIVARR_POSITION3 position; - int16_t rotation; - int16_t unknown; + int16_t unknown3C; + int16_t unknown3E; }; struct FFXIVIpcObjectDespawn : FFXIVIpcBasePacket diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp index abc5c92e..11fa13a3 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.cpp +++ b/src/servers/sapphire_zone/Actor/EventObject.cpp @@ -9,6 +9,7 @@ #include #include #include +#include using namespace Core::Common; using namespace Core::Network::Packets; @@ -19,7 +20,7 @@ extern Core::Logger g_log; Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos, - const std::string& givenName ) : + float rotation, const std::string& givenName ) : Core::Entity::Actor( ObjKind::EventObj ), m_mapLinkId( mapLinkId ), m_state( initialState ), @@ -30,6 +31,7 @@ Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uin m_pos.x = pos.x; m_pos.y = pos.y; m_pos.z = pos.z; + m_rot = rotation; } uint32_t Core::Entity::EventObject::getMapLinkId() const @@ -112,6 +114,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget ) eobjStatePacket.data().position = getPos(); eobjStatePacket.data().scale = getScale(); eobjStatePacket.data().actorId = getId(); + 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 2fd57a09..f1762b52 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.h +++ b/src/servers/sapphire_zone/Actor/EventObject.h @@ -11,7 +11,7 @@ namespace Entity { public: EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos, - const std::string& givenName = "none" ); + float rotation, const std::string& givenName = "none" ); using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >; diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp index 1c56ad10..03c42ada 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -693,9 +693,9 @@ uint32_t Core::Zone::getNextEObjId() } Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink, - uint8_t state, FFXIVARR_POSITION3 pos, float scale ) + uint8_t state, FFXIVARR_POSITION3 pos, float scale, float rotation ) { - auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, name ); + auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, rotation, name ); eObj->setScale( scale ); registerEObj( eObj ); diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h index 81170219..de83e10f 100644 --- a/src/servers/sapphire_zone/Zone/Zone.h +++ b/src/servers/sapphire_zone/Zone/Zone.h @@ -114,7 +114,7 @@ public: void updateSessions( bool changedWeather ); Entity::EventObjectPtr registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink, - uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale ); + uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale, float rotation ); void registerEObj( Entity::EventObjectPtr object ); Entity::EventObjectPtr getEObj( uint32_t objId ); From 628f01e2eb9e0c053a8ff15f3be8c744fa9079cd Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Mar 2018 17:49:18 +1100 Subject: [PATCH 2/4] use subfolders for instancecontenttype and export eobj rotation --- src/tools/event_object_parser/main.cpp | 50 +++++++++++++++++++++----- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp index 22c4b3f1..ac5633b0 100644 --- a/src/tools/event_object_parser/main.cpp +++ b/src/tools/event_object_parser/main.cpp @@ -39,6 +39,7 @@ struct instanceContent uint32_t id; std::string name; std::string zoneName; + uint8_t type; }; std::vector< instanceContent > contentList; @@ -309,6 +310,7 @@ void loadAllInstanceContentEntries() auto name = *boost::get< std::string >( &fields.at( 3 ) ); if( name.empty() ) continue; + auto type = *boost::get< uint8_t >( &fields.at( 0 ) ); auto teri = *boost::get< uint32_t >( &fields.at( 9 ) ); auto i = 0; while( ( i = name.find( ' ' ) ) != std::string::npos ) @@ -322,7 +324,7 @@ void loadAllInstanceContentEntries() name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() ); name[0] = toupper( name[0] ); - contentList.push_back( { id, name, zoneNameMap[teri] } ); + contentList.push_back( { id, name, zoneNameMap[teri], type } ); } out.close(); } @@ -367,6 +369,24 @@ int main( int argc, char* argv[] ) } } + std::map< uint8_t, std::string > contentTypeMap; + contentTypeMap[0] = ""; + contentTypeMap[1] = "raids"; + contentTypeMap[2] = "dungeons"; + contentTypeMap[3] = "guildhests"; + contentTypeMap[4] = "trials"; + contentTypeMap[5] = "pvp"; + contentTypeMap[6] = "pvp"; + contentTypeMap[7] = "questbattles"; + contentTypeMap[8] = "hallofthenovice"; + contentTypeMap[9] = "deepdungeon"; + contentTypeMap[10] = "treasurehunt"; + contentTypeMap[11] = "events"; + contentTypeMap[12] = "pvp"; + + if( !boost::filesystem::exists( "instance.tmpl" ) ) + throw std::runtime_error( "instance.tmpl is missing in working directory" ); + initExd( gamePath ); if( dumpInstances ) { @@ -578,11 +598,16 @@ int main( int argc, char* argv[] ) if( count1 > 0 ) name = name + "_" + std::to_string( count1 ); - eobjects += " instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + - ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) + ", " + - "{ " + std::to_string( pObj->header.translation.x ) + "f, " - + std::to_string( pObj->header.translation.y ) + "f, " - + std::to_string( pObj->header.translation.z ) + "f }, " + std::to_string( pObj->header.scale.x ) + "f );\n" + states; + eobjects += " instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + + ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) + + ", " + + "{ " + std::to_string( pObj->header.translation.x ) + "f, " + + std::to_string( pObj->header.translation.y ) + "f, " + + std::to_string( pObj->header.translation.z ) + "f }, " + + std::to_string( pObj->header.scale.x ) + "f, " + + + // for whatever reason, the rotation inside the sgbs is the inverse of what the game uses + std::to_string( pObj->header.rotation.y * -1.f ) + "f ); \n" + states; std::string outStr( @@ -619,8 +644,17 @@ int main( int argc, char* argv[] ) result = std::regex_replace( result, std::regex( "\\INSTANCE_ID" ), std::to_string( entry.id ) ); result = std::regex_replace( result, std::regex( "\\EOBJ_INIT" ), eobjects ); - - std::ofstream outH( entry.name + ".cpp" ); + + std::string subdir = ""; + + auto subdirIt = contentTypeMap.find( entry.type ); + if( subdirIt != contentTypeMap.end() ) + subdir = subdirIt->second + "/"; + + boost::filesystem::path outDir( "instances/" + subdir ); + boost::filesystem::create_directories( outDir ); + + std::ofstream outH( outDir.string() + entry.name + ".cpp" ); outH << result; outH.close(); From 2c6253e37c3a9ce7eb1e1110d4faec066dea0ee0 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Mar 2018 17:51:32 +1100 Subject: [PATCH 3/4] new instance scripts with eobj rotation --- .../ThePalaceoftheDeadFloors101110.cpp | 8 +- .../ThePalaceoftheDeadFloors110.cpp | 5 +- .../ThePalaceoftheDeadFloors111120.cpp | 5 +- .../ThePalaceoftheDeadFloors1120.cpp | 5 +- .../ThePalaceoftheDeadFloors121130.cpp | 5 +- .../ThePalaceoftheDeadFloors131140.cpp | 5 +- .../ThePalaceoftheDeadFloors141150.cpp | 5 +- .../ThePalaceoftheDeadFloors151160.cpp | 5 +- .../ThePalaceoftheDeadFloors161170.cpp | 5 +- .../ThePalaceoftheDeadFloors171180.cpp | 5 +- .../ThePalaceoftheDeadFloors181190.cpp | 5 +- .../ThePalaceoftheDeadFloors191200.cpp | 5 +- .../ThePalaceoftheDeadFloors2130.cpp | 5 +- .../ThePalaceoftheDeadFloors3140.cpp | 36 +++ .../ThePalaceoftheDeadFloors4150.cpp | 36 +++ .../ThePalaceoftheDeadFloors5160.cpp | 5 +- .../ThePalaceoftheDeadFloors6170.cpp | 5 +- .../ThePalaceoftheDeadFloors7180.cpp | 5 +- .../ThePalaceoftheDeadFloors8190.cpp | 8 +- .../ThePalaceoftheDeadFloors91100.cpp | 8 +- .../Scripts/instances/dungeons/AlaMhigo.cpp | 31 +-- .../instances/dungeons/AmdaporKeep.cpp | 207 +++++++++------- .../instances/dungeons/AmdaporKeepHard.cpp | 73 +++--- .../instances/dungeons/BaelsarsWall.cpp | 60 ++--- .../instances/dungeons/BardamsMettle.cpp | 26 +- .../instances/dungeons/BrayfloxsLongstop.cpp | 43 ++-- .../dungeons/BrayfloxsLongstopHard.cpp | 54 +++-- .../instances/dungeons/CastrumAbania.cpp | 58 +---- .../instances/dungeons/CastrumMeridianum.cpp | 129 +++++----- .../instances/dungeons/CopperbellMines.cpp | 106 +++++---- .../dungeons/CopperbellMinesHard.cpp | 88 +++---- .../Scripts/instances/dungeons/CuttersCry.cpp | 72 +++--- .../Scripts/instances/dungeons/DomaCastle.cpp | 30 +-- .../instances/dungeons/DzemaelDarkhold.cpp | 169 +++++++------ .../Scripts/instances/dungeons/Halatali.cpp | 94 ++++---- .../instances/dungeons/HalataliHard.cpp | 108 +++++---- .../instances/dungeons/HaukkeManor.cpp | 80 ++++--- .../instances/dungeons/HaukkeManorHard.cpp | 122 ++++++---- .../Scripts/instances/dungeons/HellsLid.cpp | 45 +--- .../instances/dungeons/HullbreakerIsle.cpp | 120 ++++++---- .../dungeons/HullbreakerIsleHard.cpp | 59 ++--- .../instances/dungeons/KuganeCastle.cpp | 63 +---- .../Scripts/instances/dungeons/Neverreap.cpp | 42 +--- .../instances/dungeons/PharosSirius.cpp | 65 ++--- .../instances/dungeons/PharosSiriusHard.cpp | 60 ++--- .../dungeons/SaintMociannesArboretum.cpp | 28 +-- .../Scripts/instances/dungeons/Sastasha.cpp | 113 ++++----- .../instances/dungeons/SastashaHard.cpp | 77 +++--- .../dungeons/ShisuioftheVioletTides.cpp | 44 +--- .../Scripts/instances/dungeons/Snowcloak.cpp | 81 ++++--- .../Scripts/instances/dungeons/SohmAl.cpp | 23 +- .../Scripts/instances/dungeons/SohmAlHard.cpp | 44 +--- .../Scripts/instances/dungeons/SohrKhai.cpp | 31 +-- .../Scripts/instances/dungeons/TheAery.cpp | 22 +- .../TheAetherochemicalResearchFacility.cpp | 34 +-- .../instances/dungeons/TheAntitower.cpp | 53 +---- .../instances/dungeons/TheAurumVale.cpp | 37 +-- .../dungeons/TheDrownedCityofSkalla.cpp | 31 +-- .../instances/dungeons/TheDuskVigil.cpp | 39 +-- .../dungeons/TheFractalContinuum.cpp | 65 +---- .../dungeons/TheFractalContinuumHard.cpp | 35 +-- .../dungeons/TheGreatGubalLibrary.cpp | 33 +-- .../dungeons/TheGreatGubalLibraryHard.cpp | 46 +--- .../instances/dungeons/TheKeeperoftheLake.cpp | 63 ++--- .../dungeons/TheLostCityofAmdapor.cpp | 101 ++++---- .../dungeons/TheLostCityofAmdaporHard.cpp | 88 +++---- .../instances/dungeons/ThePraetorium.cpp | 224 +++++++++--------- .../instances/dungeons/TheSirensongSea.cpp | 29 +-- .../instances/dungeons/TheStoneVigil.cpp | 63 +++-- .../instances/dungeons/TheStoneVigilHard.cpp | 52 ++-- .../dungeons/TheSunkenTempleofQarn.cpp | 120 +++++----- .../dungeons/TheSunkenTempleofQarnHard.cpp | 102 ++++---- .../dungeons/TheTamTaraDeepcroft.cpp | 53 +++-- .../dungeons/TheTamTaraDeepcroftHard.cpp | 131 ++++++---- .../instances/dungeons/TheTempleoftheFist.cpp | 39 +-- .../dungeons/TheThousandMawsofTotoRak.cpp | 105 ++++---- .../Scripts/instances/dungeons/TheVault.cpp | 40 +--- .../instances/dungeons/TheWanderersPalace.cpp | 102 ++++---- .../dungeons/TheWanderersPalaceHard.cpp | 64 ++--- .../Scripts/instances/dungeons/Xelphatol.cpp | 35 +-- .../instances/events/SpecialEventIII.cpp | 41 ---- .../instances/events/TheHauntedManor.cpp | 35 +-- .../events/TheValentionesCeremony.cpp | 91 +++---- .../instances/guildhest/LongLivetheQueen.cpp | 42 ---- .../instances/guildhest/ShadowandClaw.cpp | 42 ---- .../AllsWellthatEndsintheWell.cpp | 7 +- .../AnnoytheVoid.cpp | 2 +- .../BasicTrainingEnemyParties.cpp | 2 +- .../BasicTrainingEnemyStrongholds.cpp | 9 +- .../FlickingSticksandTakingNames.cpp | 4 +- .../HeroontheHalfShell.cpp | 2 +- .../instances/guildhests/LongLivetheQueen.cpp | 43 ++++ .../MorethanaFeeler.cpp | 2 +- .../PullingPoisonPosies.cpp | 2 +- .../instances/guildhests/ShadowandClaw.cpp | 43 ++++ .../SolemnTrinity.cpp | 2 +- .../StingingBack.cpp | 7 +- .../UndertheArmor.cpp | 4 +- .../{guildhest => guildhests}/WardUp.cpp | 2 +- .../AccrueEnmityfromMultipleTargets.cpp | 21 +- .../AssistAlliesinDefeatingaTarget.cpp | 21 +- .../AvoidAreaofEffectAttacks.cpp | 21 +- .../hallofthenovice/AvoidEngagedTargets.cpp | 21 +- .../DefeatanOccupiedTarget.cpp | 21 +- .../EngageEnemyReinforcements.cpp | 21 +- .../hallofthenovice/EngageMultipleTargets.cpp | 21 +- .../hallofthenovice/ExecuteaComboinBattle.cpp | 21 +- .../ExecuteaCombotoIncreaseEnmity.cpp | 21 +- .../ExecuteaRangedAttacktoIncreaseEnmity.cpp | 21 +- .../hallofthenovice/FinalExercise.cpp | 7 +- .../hallofthenovice/HealMultipleAllies.cpp | 21 +- .../instances/hallofthenovice/HealanAlly.cpp | 21 +- .../InteractwiththeBattlefield.cpp | 21 +- .../potd/ThePalaceoftheDeadFloors3140.cpp | 34 --- .../potd/ThePalaceoftheDeadFloors4150.cpp | 34 --- .../Scripts/instances/pvp/Astragalos.cpp | 30 +-- .../Scripts/instances/pvp/SealRockSeize.cpp | 35 +-- .../pvp/TheBorderlandRuinsSecure.cpp | 42 ++-- .../pvp/TheCarteneauFlatsHeliodrome.cpp | 41 ---- .../instances/pvp/TheFeast4on4LightParty.cpp | 10 +- .../instances/pvp/TheFeast4on4Ranked.cpp | 6 +- .../instances/pvp/TheFeast4on4Training.cpp | 6 +- .../pvp/TheFeastCustomMatchCrystalTower.cpp | 14 +- .../TheFeastCustomMatchFeastingGrounds.cpp | 10 +- .../pvp/TheFeastCustomMatchLichenweed.cpp | 6 +- .../Scripts/instances/pvp/TheFeastRanked.cpp | 14 +- .../instances/pvp/TheFeastTeamRanked.cpp | 14 +- .../instances/pvp/TheFeastTraining.cpp | 14 +- .../instances/pvp/TheFieldsofGloryShatter.cpp | 27 +-- .../instances/questbattle/ABloodyReunion.cpp | 58 ----- .../questbattle/ASpectaclefortheAges.cpp | 42 ---- .../instances/questbattle/BloodDragoon.cpp | 50 ---- .../instances/questbattle/DarkwingDragon.cpp | 30 --- .../questbattle/InterdimensionalRift.cpp | 36 --- .../questbattle/ItsProbablyaTrap.cpp | 34 --- .../instances/questbattle/MatsubaMayhem.cpp | 34 --- .../Scripts/instances/questbattle/Naadam.cpp | 30 --- .../instances/questbattle/OurUnsungHeroes.cpp | 66 ------ .../instances/questbattle/ReturnoftheBull.cpp | 55 ----- .../questbattle/TheHeartoftheProblem.cpp | 30 --- .../instances/questbattle/TheResonant.cpp | 32 --- .../questbattle/WhenClansCollide.cpp | 30 --- .../questbattle/WithHeartandSteel.cpp | 108 --------- .../instances/questbattles/ABloodyReunion.cpp | 26 ++ .../questbattles/ASpectaclefortheAges.cpp | 43 ++++ .../instances/questbattles/BloodDragoon.cpp | 26 ++ .../BloodontheDeck.cpp | 5 +- .../CuriousGorgeMeetsHisMatch.cpp | 7 +- .../instances/questbattles/DarkwingDragon.cpp | 26 ++ .../InThalsName.cpp | 6 +- .../questbattles/InterdimensionalRift.cpp | 26 ++ .../questbattles/ItsProbablyaTrap.cpp | 26 ++ .../instances/questbattles/MatsubaMayhem.cpp | 26 ++ .../Scripts/instances/questbattles/Naadam.cpp | 26 ++ .../OneLifeforOneWorld.cpp | 11 +- .../OurCompromise.cpp | 3 +- .../questbattles/OurUnsungHeroes.cpp | 72 ++++++ .../RaisingtheSword.cpp | 6 +- .../questbattles/ReturnoftheBull.cpp | 26 ++ .../TheBattleonBekko.cpp | 4 +- .../TheCarteneauFlatsHeliodrome.cpp | 51 ++++ .../TheFaceofTrueEvil.cpp | 2 +- .../questbattles/TheHeartoftheProblem.cpp | 26 ++ .../TheOrphansandtheBrokenBlade.cpp | 2 +- .../instances/questbattles/TheResonant.cpp | 26 ++ .../questbattles/WhenClansCollide.cpp | 26 ++ .../questbattles/WithHeartandSteel.cpp | 26 ++ .../raids/AlexanderTheArmoftheFather.cpp | 26 ++ .../AlexanderTheArmoftheFatherSavage.cpp | 26 ++ .../raids/AlexanderTheArmoftheSon.cpp | 26 ++ .../raids/AlexanderTheArmoftheSonSavage.cpp | 26 ++ .../raids/AlexanderTheBreathoftheCreator.cpp | 26 ++ .../AlexanderTheBreathoftheCreatorSavage.cpp | 26 ++ .../AlexanderTheBurdenoftheFather.cpp | 5 +- .../AlexanderTheBurdenoftheFatherSavage.cpp | 5 +- .../raids/AlexanderTheBurdenoftheSon.cpp | 26 ++ .../AlexanderTheBurdenoftheSonSavage.cpp | 26 ++ .../raids/AlexanderTheCuffoftheFather.cpp | 26 ++ .../AlexanderTheCuffoftheFatherSavage.cpp | 26 ++ .../raids/AlexanderTheCuffoftheSon.cpp | 26 ++ .../raids/AlexanderTheCuffoftheSonSavage.cpp | 26 ++ .../raids/AlexanderTheEyesoftheCreator.cpp | 26 ++ .../AlexanderTheEyesoftheCreatorSavage.cpp | 26 ++ .../raids/AlexanderTheFistoftheFather.cpp | 26 ++ .../AlexanderTheFistoftheFatherSavage.cpp | 26 ++ .../raids/AlexanderTheFistoftheSon.cpp | 26 ++ .../raids/AlexanderTheFistoftheSonSavage.cpp | 26 ++ .../raids/AlexanderTheHeartoftheCreator.cpp | 26 ++ .../AlexanderTheHeartoftheCreatorSavage.cpp | 26 ++ .../raids/AlexanderTheSouloftheCreator.cpp | 26 ++ .../AlexanderTheSouloftheCreatorSavage.cpp | 26 ++ .../Scripts/instances/raids/DeltascapeV10.cpp | 26 ++ .../instances/raids/DeltascapeV10Savage.cpp | 26 ++ .../Scripts/instances/raids/DeltascapeV20.cpp | 26 ++ .../instances/raids/DeltascapeV20Savage.cpp | 26 ++ .../Scripts/instances/raids/DeltascapeV30.cpp | 26 ++ .../instances/raids/DeltascapeV30Savage.cpp | 26 ++ .../Scripts/instances/raids/DeltascapeV40.cpp | 26 ++ .../instances/raids/DeltascapeV40Savage.cpp | 26 ++ .../Scripts/instances/raids/DunScaith.cpp | 26 ++ .../Scripts/instances/raids/SigmascapeV10.cpp | 26 ++ .../instances/raids/SigmascapeV10Savage.cpp | 26 ++ .../Scripts/instances/raids/SigmascapeV20.cpp | 26 ++ .../instances/raids/SigmascapeV20Savage.cpp | 26 ++ .../Scripts/instances/raids/SigmascapeV30.cpp | 26 ++ .../instances/raids/SigmascapeV30Savage.cpp | 26 ++ .../Scripts/instances/raids/SigmascapeV40.cpp | 26 ++ .../instances/raids/SigmascapeV40Savage.cpp | 26 ++ .../Scripts/instances/raids/SyrcusTower.cpp | 94 ++++++++ .../raids/TheBindingCoilofBahamutTurn1.cpp | 63 +++++ .../raids/TheBindingCoilofBahamutTurn2.cpp | 64 +++++ .../raids/TheBindingCoilofBahamutTurn3.cpp | 74 ++++++ .../raids/TheBindingCoilofBahamutTurn4.cpp | 43 ++++ .../raids/TheBindingCoilofBahamutTurn5.cpp | 36 +++ .../raids/TheFinalCoilofBahamutTurn1.cpp | 51 ++++ .../raids/TheFinalCoilofBahamutTurn2.cpp | 61 +++++ .../raids/TheFinalCoilofBahamutTurn3.cpp | 34 +++ .../raids/TheFinalCoilofBahamutTurn4.cpp | 34 +++ .../raids/TheLabyrinthoftheAncients.cpp | 107 +++++++++ .../raids/TheRoyalCityofRabanastre.cpp | 26 ++ .../TheSecondCoilofBahamutSavageTurn1.cpp | 42 ++++ .../TheSecondCoilofBahamutSavageTurn2.cpp | 42 ++++ .../TheSecondCoilofBahamutSavageTurn3.cpp | 105 ++++++++ .../TheSecondCoilofBahamutSavageTurn4.cpp | 41 ++++ .../raids/TheSecondCoilofBahamutTurn1.cpp | 42 ++++ .../raids/TheSecondCoilofBahamutTurn2.cpp | 42 ++++ .../raids/TheSecondCoilofBahamutTurn3.cpp | 105 ++++++++ .../raids/TheSecondCoilofBahamutTurn4.cpp | 41 ++++ .../TheUnendingCoilofBahamutUltimate.cpp | 35 +++ .../Scripts/instances/raids/TheVoidArk.cpp | 26 ++ .../instances/raids/TheWeepingCityofMhach.cpp | 26 ++ .../instances/raids/TheWorldofDarkness.cpp | 143 +++++++++++ .../alexander/AlexanderTheArmoftheFather.cpp | 40 ---- .../AlexanderTheArmoftheFatherSavage.cpp | 40 ---- .../alexander/AlexanderTheArmoftheSon.cpp | 69 ------ .../AlexanderTheArmoftheSonSavage.cpp | 69 ------ .../AlexanderTheBreathoftheCreator.cpp | 49 ---- .../AlexanderTheBreathoftheCreatorSavage.cpp | 49 ---- .../alexander/AlexanderTheBurdenoftheSon.cpp | 32 --- .../AlexanderTheBurdenoftheSonSavage.cpp | 32 --- .../alexander/AlexanderTheCuffoftheFather.cpp | 50 ---- .../AlexanderTheCuffoftheFatherSavage.cpp | 50 ---- .../alexander/AlexanderTheCuffoftheSon.cpp | 49 ---- .../AlexanderTheCuffoftheSonSavage.cpp | 49 ---- .../AlexanderTheEyesoftheCreator.cpp | 51 ---- .../AlexanderTheEyesoftheCreatorSavage.cpp | 51 ---- .../alexander/AlexanderTheFistoftheFather.cpp | 59 ----- .../AlexanderTheFistoftheFatherSavage.cpp | 59 ----- .../alexander/AlexanderTheFistoftheSon.cpp | 50 ---- .../AlexanderTheFistoftheSonSavage.cpp | 50 ---- .../AlexanderTheHeartoftheCreator.cpp | 56 ----- .../AlexanderTheHeartoftheCreatorSavage.cpp | 56 ----- .../AlexanderTheSouloftheCreator.cpp | 47 ---- .../AlexanderTheSouloftheCreatorSavage.cpp | 47 ---- .../coils/TheBindingCoilofBahamutTurn1.cpp | 59 ----- .../coils/TheBindingCoilofBahamutTurn2.cpp | 55 ----- .../coils/TheBindingCoilofBahamutTurn3.cpp | 73 ------ .../coils/TheBindingCoilofBahamutTurn4.cpp | 41 ---- .../coils/TheBindingCoilofBahamutTurn5.cpp | 35 --- .../coils/TheFinalCoilofBahamutTurn1.cpp | 49 ---- .../coils/TheFinalCoilofBahamutTurn2.cpp | 58 ----- .../coils/TheFinalCoilofBahamutTurn3.cpp | 32 --- .../coils/TheFinalCoilofBahamutTurn4.cpp | 33 --- .../TheSecondCoilofBahamutSavageTurn2.cpp | 39 --- .../TheSecondCoilofBahamutSavageTurn3.cpp | 75 ------ .../coils/TheSecondCoilofBahamutTurn3.cpp | 75 ------ .../coils/TheSecondCoilofBahamutTurn4.cpp | 39 --- .../raids/crystaltower/SyrcusTower.cpp | 79 ------ .../TheLabyrinthoftheAncients.cpp | 92 ------- .../raids/crystaltower/TheWorldofDarkness.cpp | 117 --------- .../instances/raids/omega/DeltascapeV10.cpp | 31 --- .../raids/omega/DeltascapeV10Savage.cpp | 31 --- .../instances/raids/omega/DeltascapeV20.cpp | 30 --- .../raids/omega/DeltascapeV20Savage.cpp | 30 --- .../instances/raids/omega/DeltascapeV30.cpp | 45 ---- .../raids/omega/DeltascapeV30Savage.cpp | 45 ---- .../instances/raids/omega/DeltascapeV40.cpp | 35 --- .../raids/omega/DeltascapeV40Savage.cpp | 35 --- .../instances/raids/omega/SigmascapeV10.cpp | 46 ---- .../raids/omega/SigmascapeV10Savage.cpp | 46 ---- .../instances/raids/omega/SigmascapeV20.cpp | 44 ---- .../raids/omega/SigmascapeV20Savage.cpp | 44 ---- .../instances/raids/omega/SigmascapeV30.cpp | 39 --- .../raids/omega/SigmascapeV30Savage.cpp | 39 --- .../instances/raids/omega/SigmascapeV40.cpp | 44 ---- .../raids/omega/SigmascapeV40Savage.cpp | 44 ---- .../TheRoyalCityofRabanastre.cpp | 115 --------- .../raids/shadowofmhach/DunScaith.cpp | 87 ------- .../raids/shadowofmhach/TheVoidArk.cpp | 99 -------- .../shadowofmhach/TheWeepingCityofMhach.cpp | 108 --------- .../TheUnendingCoilofBahamutUltimate.cpp | 34 --- .../instances/treasurehunt/TheAquapolis.cpp | 198 ++++++++-------- .../treasurehunt/TheHiddenCanalsofUznair.cpp | 117 +-------- .../treasurehunt/TheLostCanalsofUznair.cpp | 117 +-------- .../trials/ARelicReborntheChimera.cpp | 35 +-- .../instances/trials/ARelicReborntheHydra.cpp | 94 ++++---- .../trials/AkhAfahAmphitheatreExtreme.cpp | 24 +- .../trials/AkhAfahAmphitheatreHard.cpp | 24 +- .../instances/trials/BattleintheBigKeep.cpp | 207 +++++++++------- .../instances/trials/BattleontheBigBridge.cpp | 22 +- .../Scripts/instances/trials/CapeWestwind.cpp | 9 +- .../instances/trials/ContainmentBayP1T6.cpp | 26 ++ .../trials/ContainmentBayP1T6Extreme.cpp | 26 ++ .../instances/trials/ContainmentBayS1T7.cpp | 26 ++ .../trials/ContainmentBayS1T7Extreme.cpp | 26 ++ .../instances/trials/ContainmentBayZ1T9.cpp | 26 ++ .../trials/ContainmentBayZ1T9Extreme.cpp | 26 ++ .../Scripts/instances/trials/Emanation.cpp | 4 +- .../instances/trials/EmanationExtreme.cpp | 4 +- .../{events => trials}/SpecialEventI.cpp | 7 +- .../{events => trials}/SpecialEventII.cpp | 4 +- .../instances/trials/SpecialEventIII.cpp | 26 ++ .../instances/trials/TheBowlofEmbers.cpp | 11 +- .../trials/TheBowlofEmbersExtreme.cpp | 11 +- .../instances/trials/TheBowlofEmbersHard.cpp | 11 +- .../Scripts/instances/trials/TheChrysalis.cpp | 54 +++-- .../instances/trials/TheDragonsNeck.cpp | 108 +++++---- .../instances/trials/TheFinalStepsofFaith.cpp | 13 +- .../instances/trials/TheHowlingEye.cpp | 23 +- .../instances/trials/TheHowlingEyeExtreme.cpp | 23 +- .../instances/trials/TheHowlingEyeHard.cpp | 23 +- .../Scripts/instances/trials/TheJadeStoa.cpp | 26 ++ .../instances/trials/TheJadeStoaExtreme.cpp | 26 ++ .../trials/TheLimitlessBlueExtreme.cpp | 10 +- .../instances/trials/TheLimitlessBlueHard.cpp | 10 +- .../trials/TheMinstrelsBalladNidhoggsRage.cpp | 13 +- .../TheMinstrelsBalladShinryusDomain.cpp | 21 +- .../TheMinstrelsBalladThordansReign.cpp | 59 ----- .../trials/TheMinstrelsBalladUltimasBane.cpp | 19 +- .../Scripts/instances/trials/TheNavel.cpp | 7 +- .../instances/trials/TheNavelExtreme.cpp | 7 +- .../Scripts/instances/trials/TheNavelHard.cpp | 7 +- .../instances/trials/ThePoolofTribute.cpp | 6 +- .../trials/ThePoolofTributeExtreme.cpp | 6 +- .../instances/trials/TheRoyalMenagerie.cpp | 17 +- .../trials/TheSingularityReactor.cpp | 59 ----- .../instances/trials/TheStepsofFaith.cpp | 52 ++-- .../trials/TheStrikingTreeExtreme.cpp | 7 +- .../instances/trials/TheStrikingTreeHard.cpp | 7 +- .../instances/trials/TheWhorleaterExtreme.cpp | 17 +- .../instances/trials/TheWhorleaterHard.cpp | 17 +- .../instances/trials/ThokastThokExtreme.cpp | 48 ---- .../instances/trials/ThokastThokHard.cpp | 48 ---- .../instances/trials/ThornmarchExtreme.cpp | 7 +- .../instances/trials/ThornmarchHard.cpp | 7 +- .../Scripts/instances/trials/UrthsFount.cpp | 7 +- .../trials/thefourlords/TheJadeStoa.cpp | 31 --- .../thefourlords/TheJadeStoaExtreme.cpp | 31 --- .../warringtriad/ContainmentBayP1T6.cpp | 34 --- .../ContainmentBayP1T6Extreme.cpp | 34 --- .../warringtriad/ContainmentBayS1T7.cpp | 41 ---- .../ContainmentBayS1T7Extreme.cpp | 41 ---- .../warringtriad/ContainmentBayZ1T9.cpp | 40 ---- .../ContainmentBayZ1T9Extreme.cpp | 40 ---- 354 files changed, 6128 insertions(+), 8106 deletions(-) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors101110.cpp (55%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors110.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors111120.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors1120.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors121130.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors131140.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors141150.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors151160.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors161170.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors171180.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors181190.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors191200.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors2130.cpp (71%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors5160.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors6170.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors7180.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors8190.cpp (55%) rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors91100.cpp (55%) delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/AllsWellthatEndsintheWell.cpp (79%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/AnnoytheVoid.cpp (98%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/BasicTrainingEnemyParties.cpp (98%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/BasicTrainingEnemyStrongholds.cpp (61%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/FlickingSticksandTakingNames.cpp (80%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/HeroontheHalfShell.cpp (98%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/MorethanaFeeler.cpp (98%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/PullingPoisonPosies.cpp (98%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/SolemnTrinity.cpp (98%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/StingingBack.cpp (79%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/UndertheArmor.cpp (79%) rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/WardUp.cpp (98%) delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/BloodontheDeck.cpp (71%) rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/CuriousGorgeMeetsHisMatch.cpp (79%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/InThalsName.cpp (74%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/OneLifeforOneWorld.cpp (67%) rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/OurCompromise.cpp (79%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/RaisingtheSword.cpp (74%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheBattleonBekko.cpp (67%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheFaceofTrueEvil.cpp (98%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheOrphansandtheBrokenBlade.cpp (98%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/raids/{alexander => }/AlexanderTheBurdenoftheFather.cpp (60%) rename src/servers/sapphire_zone/Script/Scripts/instances/raids/{alexander => }/AlexanderTheBurdenoftheFatherSavage.cpp (60%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp rename src/servers/sapphire_zone/Script/Scripts/instances/{events => trials}/SpecialEventI.cpp (79%) rename src/servers/sapphire_zone/Script/Scripts/instances/{events => trials}/SpecialEventII.cpp (68%) create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp similarity index 55% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp index 7d021fcf..f2fdd991 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp @@ -10,9 +10,11 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f ); - instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp index 5e865721..af9f4768 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp index 01db987f..e2a130f0 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp index 64b9c068..e49c1e32 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp index 03a6d2dc..eb763806 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp index f1b856d7..f044bfa1 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp index 4b03e697..f4ba0593 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp index 3f480582..defb3212 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp index 17ff4666..14110134 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp index c05b73e4..57b9d6c4 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp index a6cb7e5b..9e9b6050 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp index 22f25b55..512b331c 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp similarity index 71% rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp index 2160a8f5..438a2aa5 100644 --- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp @@ -10,8 +10,9 @@ public: void onInit( InstanceContentPtr instance ) override { - - instance->registerEObj( "Unknown0", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f ); + instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f, 0.000000f ); + // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off + } void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp new file mode 100644 index 00000000..bbe7a4f2 --- /dev/null +++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp @@ -0,0 +1,36 @@ +#include