From 8dcbfa5365aee03ee48f1d389617c065f509883f Mon Sep 17 00:00:00 2001 From: mordred Date: Thu, 13 Dec 2018 12:40:42 +0100 Subject: [PATCH] Restructured project slightly --- CMakeLists.txt | 5 +- .../sapphire_api => api}/CMakeLists.txt | 20 +- src/{servers/sapphire_api => api}/Forwards.h | 0 .../sapphire_api => api}/LoginSession.cpp | 0 .../sapphire_api => api}/LoginSession.h | 0 .../sapphire_api => api}/PlayerMinimal.cpp | 0 .../sapphire_api => api}/PlayerMinimal.h | 0 .../sapphire_api => api}/SapphireAPI.cpp | 0 .../sapphire_api => api}/SapphireAPI.h | 0 src/{servers/sapphire_api => api}/Session.cpp | 0 src/{servers/sapphire_api => api}/Session.h | 0 .../sapphire_api => api}/client_http.hpp | 0 src/{servers/sapphire_api => api}/main.cpp | 0 .../sapphire_api => api}/server_http.hpp | 0 src/dbm/CMakeLists.txt | 22 +- .../sapphire_lobby => lobby}/CMakeLists.txt | 17 +- .../sapphire_lobby => lobby}/Forwards.h | 0 .../GameConnection.cpp | 0 .../sapphire_lobby => lobby}/GameConnection.h | 0 .../LobbyPacketContainer.cpp | 0 .../LobbyPacketContainer.h | 0 .../sapphire_lobby => lobby}/LobbySession.cpp | 0 .../sapphire_lobby => lobby}/LobbySession.h | 0 .../RestConnector.cpp | 0 .../sapphire_lobby => lobby}/RestConnector.h | 0 .../sapphire_lobby => lobby}/ServerLobby.cpp | 0 .../sapphire_lobby => lobby}/ServerLobby.h | 0 .../sapphire_lobby => lobby}/client_http.hpp | 0 .../mainLobbyServer.cpp | 0 .../Scripts => scripts}/CMakeLists.txt | 6 +- .../Scripts => scripts}/ScriptLoader.cpp.in | 0 .../Scripts => scripts}/ScriptObject.h | 0 .../action/ActionReturn6.cpp | 0 .../action/ActionSprint3.cpp | 0 src/scripts/action/ScriptLoader.cpp | 17 + .../common/CmnDefCutSceneReplay.cpp | 0 .../common/CmnDefInnBed.cpp | 0 .../common/CmnDefLinkShell.cpp | 0 .../common/CmnDefMarketBoardGridania.cpp | 0 .../common/CmnDefMogLetter.cpp | 0 .../common/CmnDefNpcRepair.cpp | 0 .../common/CmnDefWeatherForeCast.cpp | 0 .../common/ComDefMobHuntBoard.cpp | 0 .../Scripts => scripts}/common/GilShop.cpp | 0 .../common/HouFurOrchestrion.cpp | 0 src/scripts/common/ScriptLoader.cpp | 47 ++ .../common/aethernet/Aetheryte.cpp | 0 .../common/aethernet/HousingAethernet.cpp | 0 .../common/eobj/HousingEstateEntrance.cpp | 0 .../CmnDefHousingPersonalRoomEntrance.cpp | 0 .../common/housing/CmnDefHousingSignboard.cpp | 0 .../warptaxi/HousingWarpTaxiExitEstate.cpp | 0 .../common/warptaxi/WarpTaxi.cpp | 0 src/scripts/instances/ScriptLoader.cpp | 549 ++++++++++++++++++ .../ThePalaceoftheDeadFloors101110.cpp | 0 .../ThePalaceoftheDeadFloors110.cpp | 0 .../ThePalaceoftheDeadFloors111120.cpp | 0 .../ThePalaceoftheDeadFloors1120.cpp | 0 .../ThePalaceoftheDeadFloors121130.cpp | 0 .../ThePalaceoftheDeadFloors131140.cpp | 0 .../ThePalaceoftheDeadFloors141150.cpp | 0 .../ThePalaceoftheDeadFloors151160.cpp | 0 .../ThePalaceoftheDeadFloors161170.cpp | 0 .../ThePalaceoftheDeadFloors171180.cpp | 0 .../ThePalaceoftheDeadFloors181190.cpp | 0 .../ThePalaceoftheDeadFloors191200.cpp | 0 .../ThePalaceoftheDeadFloors2130.cpp | 0 .../ThePalaceoftheDeadFloors3140.cpp | 0 .../ThePalaceoftheDeadFloors4150.cpp | 0 .../ThePalaceoftheDeadFloors5160.cpp | 0 .../ThePalaceoftheDeadFloors6170.cpp | 0 .../ThePalaceoftheDeadFloors7180.cpp | 0 .../ThePalaceoftheDeadFloors8190.cpp | 0 .../ThePalaceoftheDeadFloors91100.cpp | 0 .../instances/dungeons/AlaMhigo.cpp | 0 .../instances/dungeons/AmdaporKeep.cpp | 0 .../instances/dungeons/AmdaporKeepHard.cpp | 0 .../instances/dungeons/BaelsarsWall.cpp | 0 .../instances/dungeons/BardamsMettle.cpp | 0 .../instances/dungeons/BrayfloxsLongstop.cpp | 0 .../dungeons/BrayfloxsLongstopHard.cpp | 0 .../instances/dungeons/CastrumAbania.cpp | 0 .../instances/dungeons/CastrumMeridianum.cpp | 0 .../instances/dungeons/CopperbellMines.cpp | 0 .../dungeons/CopperbellMinesHard.cpp | 0 .../instances/dungeons/CuttersCry.cpp | 0 .../instances/dungeons/DomaCastle.cpp | 0 .../instances/dungeons/DzemaelDarkhold.cpp | 0 .../instances/dungeons/Halatali.cpp | 0 .../instances/dungeons/HalataliHard.cpp | 0 .../instances/dungeons/HaukkeManor.cpp | 0 .../instances/dungeons/HaukkeManorHard.cpp | 0 .../instances/dungeons/HellsLid.cpp | 0 .../instances/dungeons/HullbreakerIsle.cpp | 0 .../dungeons/HullbreakerIsleHard.cpp | 0 .../instances/dungeons/KuganeCastle.cpp | 0 .../instances/dungeons/Neverreap.cpp | 0 .../instances/dungeons/PharosSirius.cpp | 0 .../instances/dungeons/PharosSiriusHard.cpp | 0 .../dungeons/SaintMociannesArboretum.cpp | 0 .../instances/dungeons/Sastasha.cpp | 0 .../instances/dungeons/SastashaHard.cpp | 0 .../dungeons/ShisuioftheVioletTides.cpp | 0 .../instances/dungeons/Snowcloak.cpp | 0 .../instances/dungeons/SohmAl.cpp | 0 .../instances/dungeons/SohmAlHard.cpp | 0 .../instances/dungeons/SohrKhai.cpp | 0 .../instances/dungeons/TheAery.cpp | 0 .../TheAetherochemicalResearchFacility.cpp | 0 .../instances/dungeons/TheAntitower.cpp | 0 .../instances/dungeons/TheAurumVale.cpp | 0 .../dungeons/TheDrownedCityofSkalla.cpp | 0 .../instances/dungeons/TheDuskVigil.cpp | 0 .../dungeons/TheFractalContinuum.cpp | 0 .../dungeons/TheFractalContinuumHard.cpp | 0 .../dungeons/TheGreatGubalLibrary.cpp | 0 .../dungeons/TheGreatGubalLibraryHard.cpp | 0 .../instances/dungeons/TheKeeperoftheLake.cpp | 0 .../dungeons/TheLostCityofAmdapor.cpp | 0 .../dungeons/TheLostCityofAmdaporHard.cpp | 0 .../instances/dungeons/ThePraetorium.cpp | 0 .../instances/dungeons/TheSirensongSea.cpp | 0 .../instances/dungeons/TheStoneVigil.cpp | 0 .../instances/dungeons/TheStoneVigilHard.cpp | 0 .../dungeons/TheSunkenTempleofQarn.cpp | 0 .../dungeons/TheSunkenTempleofQarnHard.cpp | 0 .../dungeons/TheTamTaraDeepcroft.cpp | 0 .../dungeons/TheTamTaraDeepcroftHard.cpp | 0 .../instances/dungeons/TheTempleoftheFist.cpp | 0 .../dungeons/TheThousandMawsofTotoRak.cpp | 0 .../instances/dungeons/TheVault.cpp | 0 .../instances/dungeons/TheWanderersPalace.cpp | 0 .../dungeons/TheWanderersPalaceHard.cpp | 0 .../instances/dungeons/Xelphatol.cpp | 0 .../instances/events/TheHauntedManor.cpp | 0 .../events/TheValentionesCeremony.cpp | 0 .../guildhests/AllsWellthatEndsintheWell.cpp | 0 .../instances/guildhests/AnnoytheVoid.cpp | 0 .../guildhests/BasicTrainingEnemyParties.cpp | 0 .../BasicTrainingEnemyStrongholds.cpp | 0 .../FlickingSticksandTakingNames.cpp | 0 .../guildhests/HeroontheHalfShell.cpp | 0 .../instances/guildhests/LongLivetheQueen.cpp | 0 .../instances/guildhests/MorethanaFeeler.cpp | 0 .../guildhests/PullingPoisonPosies.cpp | 0 .../instances/guildhests/ShadowandClaw.cpp | 0 .../instances/guildhests/SolemnTrinity.cpp | 0 .../instances/guildhests/StingingBack.cpp | 0 .../instances/guildhests/UndertheArmor.cpp | 0 .../instances/guildhests/WardUp.cpp | 0 .../AccrueEnmityfromMultipleTargets.cpp | 0 .../AssistAlliesinDefeatingaTarget.cpp | 0 .../AvoidAreaofEffectAttacks.cpp | 0 .../hallofthenovice/AvoidEngagedTargets.cpp | 0 .../DefeatanOccupiedTarget.cpp | 0 .../EngageEnemyReinforcements.cpp | 0 .../hallofthenovice/EngageMultipleTargets.cpp | 0 .../hallofthenovice/ExecuteaComboinBattle.cpp | 0 .../ExecuteaCombotoIncreaseEnmity.cpp | 0 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp | 0 .../hallofthenovice/FinalExercise.cpp | 0 .../hallofthenovice/HealMultipleAllies.cpp | 0 .../instances/hallofthenovice/HealanAlly.cpp | 0 .../InteractwiththeBattlefield.cpp | 0 .../instances/pvp/Astragalos.cpp | 0 .../instances/pvp/SealRockSeize.cpp | 0 .../pvp/TheBorderlandRuinsSecure.cpp | 0 .../instances/pvp/TheFeast4on4LightParty.cpp | 0 .../instances/pvp/TheFeast4on4Ranked.cpp | 0 .../instances/pvp/TheFeast4on4Training.cpp | 0 .../pvp/TheFeastCustomMatchCrystalTower.cpp | 0 .../TheFeastCustomMatchFeastingGrounds.cpp | 0 .../pvp/TheFeastCustomMatchLichenweed.cpp | 0 .../instances/pvp/TheFeastRanked.cpp | 0 .../instances/pvp/TheFeastTeamRanked.cpp | 0 .../instances/pvp/TheFeastTraining.cpp | 0 .../instances/pvp/TheFieldsofGloryShatter.cpp | 0 .../instances/questbattles/ABloodyReunion.cpp | 0 .../questbattles/ASpectaclefortheAges.cpp | 0 .../instances/questbattles/BloodDragoon.cpp | 0 .../instances/questbattles/BloodontheDeck.cpp | 0 .../CuriousGorgeMeetsHisMatch.cpp | 0 .../instances/questbattles/DarkwingDragon.cpp | 0 .../instances/questbattles/InThalsName.cpp | 0 .../questbattles/InterdimensionalRift.cpp | 0 .../questbattles/ItsProbablyaTrap.cpp | 0 .../instances/questbattles/MatsubaMayhem.cpp | 0 .../instances/questbattles/Naadam.cpp | 0 .../questbattles/OneLifeforOneWorld.cpp | 0 .../instances/questbattles/OurCompromise.cpp | 0 .../questbattles/OurUnsungHeroes.cpp | 0 .../questbattles/RaisingtheSword.cpp | 0 .../questbattles/ReturnoftheBull.cpp | 0 .../questbattles/TheBattleonBekko.cpp | 0 .../TheCarteneauFlatsHeliodrome.cpp | 0 .../questbattles/TheFaceofTrueEvil.cpp | 0 .../questbattles/TheHeartoftheProblem.cpp | 0 .../TheOrphansandtheBrokenBlade.cpp | 0 .../instances/questbattles/TheResonant.cpp | 0 .../questbattles/WhenClansCollide.cpp | 0 .../questbattles/WithHeartandSteel.cpp | 0 .../raids/AlexanderTheArmoftheFather.cpp | 0 .../AlexanderTheArmoftheFatherSavage.cpp | 0 .../raids/AlexanderTheArmoftheSon.cpp | 0 .../raids/AlexanderTheArmoftheSonSavage.cpp | 0 .../raids/AlexanderTheBreathoftheCreator.cpp | 0 .../AlexanderTheBreathoftheCreatorSavage.cpp | 0 .../raids/AlexanderTheBurdenoftheFather.cpp | 0 .../AlexanderTheBurdenoftheFatherSavage.cpp | 0 .../raids/AlexanderTheBurdenoftheSon.cpp | 0 .../AlexanderTheBurdenoftheSonSavage.cpp | 0 .../raids/AlexanderTheCuffoftheFather.cpp | 0 .../AlexanderTheCuffoftheFatherSavage.cpp | 0 .../raids/AlexanderTheCuffoftheSon.cpp | 0 .../raids/AlexanderTheCuffoftheSonSavage.cpp | 0 .../raids/AlexanderTheEyesoftheCreator.cpp | 0 .../AlexanderTheEyesoftheCreatorSavage.cpp | 0 .../raids/AlexanderTheFistoftheFather.cpp | 0 .../AlexanderTheFistoftheFatherSavage.cpp | 0 .../raids/AlexanderTheFistoftheSon.cpp | 0 .../raids/AlexanderTheFistoftheSonSavage.cpp | 0 .../raids/AlexanderTheHeartoftheCreator.cpp | 0 .../AlexanderTheHeartoftheCreatorSavage.cpp | 0 .../raids/AlexanderTheSouloftheCreator.cpp | 0 .../AlexanderTheSouloftheCreatorSavage.cpp | 0 .../instances/raids/DeltascapeV10.cpp | 0 .../instances/raids/DeltascapeV10Savage.cpp | 0 .../instances/raids/DeltascapeV20.cpp | 0 .../instances/raids/DeltascapeV20Savage.cpp | 0 .../instances/raids/DeltascapeV30.cpp | 0 .../instances/raids/DeltascapeV30Savage.cpp | 0 .../instances/raids/DeltascapeV40.cpp | 0 .../instances/raids/DeltascapeV40Savage.cpp | 0 .../instances/raids/DunScaith.cpp | 0 .../instances/raids/SigmascapeV10.cpp | 0 .../instances/raids/SigmascapeV10Savage.cpp | 0 .../instances/raids/SigmascapeV20.cpp | 0 .../instances/raids/SigmascapeV20Savage.cpp | 0 .../instances/raids/SigmascapeV30.cpp | 0 .../instances/raids/SigmascapeV30Savage.cpp | 0 .../instances/raids/SigmascapeV40.cpp | 0 .../instances/raids/SigmascapeV40Savage.cpp | 0 .../instances/raids/SyrcusTower.cpp | 0 .../raids/TheBindingCoilofBahamutTurn1.cpp | 0 .../raids/TheBindingCoilofBahamutTurn2.cpp | 0 .../raids/TheBindingCoilofBahamutTurn3.cpp | 0 .../raids/TheBindingCoilofBahamutTurn4.cpp | 0 .../raids/TheBindingCoilofBahamutTurn5.cpp | 0 .../raids/TheFinalCoilofBahamutTurn1.cpp | 0 .../raids/TheFinalCoilofBahamutTurn2.cpp | 0 .../raids/TheFinalCoilofBahamutTurn3.cpp | 0 .../raids/TheFinalCoilofBahamutTurn4.cpp | 0 .../raids/TheLabyrinthoftheAncients.cpp | 0 .../raids/TheRoyalCityofRabanastre.cpp | 0 .../TheSecondCoilofBahamutSavageTurn1.cpp | 0 .../TheSecondCoilofBahamutSavageTurn2.cpp | 0 .../TheSecondCoilofBahamutSavageTurn3.cpp | 0 .../TheSecondCoilofBahamutSavageTurn4.cpp | 0 .../raids/TheSecondCoilofBahamutTurn1.cpp | 0 .../raids/TheSecondCoilofBahamutTurn2.cpp | 0 .../raids/TheSecondCoilofBahamutTurn3.cpp | 0 .../raids/TheSecondCoilofBahamutTurn4.cpp | 0 .../TheUnendingCoilofBahamutUltimate.cpp | 0 .../instances/raids/TheVoidArk.cpp | 0 .../raids/TheWeaponsRefrainUltimate.cpp | 0 .../instances/raids/TheWeepingCityofMhach.cpp | 0 .../instances/raids/TheWorldofDarkness.cpp | 0 .../instances/treasurehunt/TheAquapolis.cpp | 0 .../treasurehunt/TheHiddenCanalsofUznair.cpp | 0 .../treasurehunt/TheLostCanalsofUznair.cpp | 0 .../trials/ARelicReborntheChimera.cpp | 0 .../instances/trials/ARelicReborntheHydra.cpp | 0 .../trials/AkhAfahAmphitheatreExtreme.cpp | 0 .../trials/AkhAfahAmphitheatreHard.cpp | 0 .../instances/trials/BattleintheBigKeep.cpp | 0 .../instances/trials/BattleontheBigBridge.cpp | 0 .../instances/trials/CapeWestwind.cpp | 0 .../instances/trials/ContainmentBayP1T6.cpp | 0 .../trials/ContainmentBayP1T6Extreme.cpp | 0 .../instances/trials/ContainmentBayS1T7.cpp | 0 .../trials/ContainmentBayS1T7Extreme.cpp | 0 .../instances/trials/ContainmentBayZ1T9.cpp | 0 .../trials/ContainmentBayZ1T9Extreme.cpp | 0 .../instances/trials/Emanation.cpp | 0 .../instances/trials/EmanationExtreme.cpp | 0 .../instances/trials/SpecialEventI.cpp | 0 .../instances/trials/SpecialEventII.cpp | 0 .../instances/trials/SpecialEventIII.cpp | 0 .../instances/trials/TheBowlofEmbers.cpp | 0 .../trials/TheBowlofEmbersExtreme.cpp | 0 .../instances/trials/TheBowlofEmbersHard.cpp | 0 .../instances/trials/TheChrysalis.cpp | 0 .../instances/trials/TheDragonsNeck.cpp | 0 .../instances/trials/TheFinalStepsofFaith.cpp | 0 .../instances/trials/TheHowlingEye.cpp | 0 .../instances/trials/TheHowlingEyeExtreme.cpp | 0 .../instances/trials/TheHowlingEyeHard.cpp | 0 .../instances/trials/TheJadeStoa.cpp | 0 .../instances/trials/TheJadeStoaExtreme.cpp | 0 .../trials/TheLimitlessBlueExtreme.cpp | 0 .../instances/trials/TheLimitlessBlueHard.cpp | 0 .../trials/TheMinstrelsBalladNidhoggsRage.cpp | 0 .../TheMinstrelsBalladShinryusDomain.cpp | 0 .../TheMinstrelsBalladThordansReign.cpp | 0 .../trials/TheMinstrelsBalladUltimasBane.cpp | 0 .../instances/trials/TheNavel.cpp | 0 .../instances/trials/TheNavelExtreme.cpp | 0 .../instances/trials/TheNavelHard.cpp | 0 .../instances/trials/ThePoolofTribute.cpp | 0 .../trials/ThePoolofTributeExtreme.cpp | 0 .../instances/trials/TheRoyalMenagerie.cpp | 0 .../trials/TheSingularityReactor.cpp | 0 .../instances/trials/TheStepsofFaith.cpp | 0 .../trials/TheStrikingTreeExtreme.cpp | 0 .../instances/trials/TheStrikingTreeHard.cpp | 0 .../instances/trials/TheWhorleaterExtreme.cpp | 0 .../instances/trials/TheWhorleaterHard.cpp | 0 .../instances/trials/ThokastThokExtreme.cpp | 0 .../instances/trials/ThokastThokHard.cpp | 0 .../instances/trials/ThornmarchExtreme.cpp | 0 .../instances/trials/ThornmarchHard.cpp | 0 .../instances/trials/UrthsFount.cpp | 0 .../opening/OpeningGridania.cpp | 0 .../opening/OpeningLimsa.cpp | 0 .../opening/OpeningUldah.cpp | 0 src/scripts/opening/ScriptLoader.cpp | 19 + .../Scripts => scripts}/quest/ManFst001.cpp | 0 .../Scripts => scripts}/quest/ManFst002.cpp | 0 .../Scripts => scripts}/quest/ManFst003.cpp | 0 .../Scripts => scripts}/quest/ManFst004.cpp | 0 .../Scripts => scripts}/quest/ManSea001.cpp | 0 .../Scripts => scripts}/quest/ManSea002.cpp | 0 .../Scripts => scripts}/quest/ManSea003.cpp | 0 .../Scripts => scripts}/quest/ManWil001.cpp | 0 .../Scripts => scripts}/quest/ManWil002.cpp | 0 src/scripts/quest/ScriptLoader.cpp | 91 +++ .../quest/subquest/gridania/SubFst001.cpp | 0 .../quest/subquest/gridania/SubFst002.cpp | 0 .../quest/subquest/gridania/SubFst003.cpp | 0 .../quest/subquest/gridania/SubFst004.cpp | 0 .../quest/subquest/gridania/SubFst008.cpp | 0 .../quest/subquest/gridania/SubFst009.cpp | 0 .../quest/subquest/gridania/SubFst010.cpp | 0 .../quest/subquest/gridania/SubFst011.cpp | 0 .../quest/subquest/gridania/SubFst013.cpp | 0 .../quest/subquest/gridania/SubFst014.cpp | 0 .../quest/subquest/gridania/SubFst015.cpp | 0 .../quest/subquest/gridania/SubFst019.cpp | 0 .../quest/subquest/gridania/SubFst026.cpp | 0 .../quest/subquest/gridania/SubFst029.cpp | 0 .../quest/subquest/gridania/SubFst030.cpp | 0 .../quest/subquest/gridania/SubFst041.cpp | 0 .../quest/subquest/limsa/SubSea001.cpp | 0 .../quest/subquest/uldah/SubWil000.cpp | 0 .../quest/subquest/uldah/SubWil001.cpp | 0 .../quest/subquest/uldah/SubWil002.cpp | 0 .../quest/subquest/uldah/SubWil004.cpp | 0 .../quest/subquest/uldah/SubWil006.cpp | 0 .../quest/subquest/uldah/SubWil007.cpp | 0 .../quest/subquest/uldah/SubWil018.cpp | 0 .../quest/subquest/uldah/SubWil019.cpp | 0 .../quest/subquest/uldah/SubWil021.cpp | 0 .../quest/subquest/uldah/SubWil022.cpp | 0 .../quest/subquest/uldah/SubWil027.cpp | 0 .../quest/subquest/uldah/SubWil028.cpp | 0 .../quest/subquest/uldah/SubWil029.cpp | 0 src/servers/CMakeLists.txt | 7 - .../sapphire_zone => world}/Action/Action.cpp | 0 .../sapphire_zone => world}/Action/Action.h | 0 .../Action/ActionCast.cpp | 0 .../Action/ActionCast.h | 0 .../Action/ActionCollision.cpp | 0 .../Action/ActionCollision.h | 0 .../Action/ActionMount.cpp | 0 .../Action/ActionMount.h | 0 .../Action/ActionTeleport.cpp | 0 .../Action/ActionTeleport.h | 0 .../Action/EventAction.cpp | 0 .../Action/EventAction.h | 0 .../Action/EventItemAction.cpp | 0 .../Action/EventItemAction.h | 0 .../sapphire_zone => world}/Actor/Actor.cpp | 0 .../sapphire_zone => world}/Actor/Actor.h | 0 .../sapphire_zone => world}/Actor/BNpc.cpp | 0 .../sapphire_zone => world}/Actor/BNpc.h | 0 .../Actor/BNpcTemplate.cpp | 0 .../Actor/BNpcTemplate.h | 0 .../sapphire_zone => world}/Actor/Chara.cpp | 0 .../sapphire_zone => world}/Actor/Chara.h | 0 .../Actor/EventObject.cpp | 0 .../Actor/EventObject.h | 0 .../sapphire_zone => world}/Actor/Npc.cpp | 0 .../sapphire_zone => world}/Actor/Npc.h | 0 .../sapphire_zone => world}/Actor/Player.cpp | 0 .../sapphire_zone => world}/Actor/Player.h | 0 .../Actor/PlayerEvent.cpp | 0 .../Actor/PlayerInventory.cpp | 0 .../Actor/PlayerQuest.cpp | 0 .../Actor/PlayerSql.cpp | 0 .../Actor/SpawnGroup.h | 0 .../Actor/SpawnPoint.cpp | 0 .../Actor/SpawnPoint.h | 0 .../sapphire_zone => world}/CMakeLists.txt | 25 +- .../ContentFinder/ContentFinder.cpp | 0 .../ContentFinder/ContentFinder.h | 0 .../DebugCommand/DebugCommand.h | 0 .../DebugCommand/DebugCommandHandler.cpp | 0 .../DebugCommand/DebugCommandHandler.h | 0 .../Event/Director.cpp | 0 .../sapphire_zone => world}/Event/Director.h | 0 .../sapphire_zone => world}/Event/EventDefs.h | 0 .../Event/EventHandler.cpp | 0 .../Event/EventHandler.h | 0 .../Event/EventHelper.cpp | 0 .../Event/EventHelper.h | 0 .../sapphire_zone => world}/ForwardsZone.h | 0 .../Inventory/Item.cpp | 0 .../sapphire_zone => world}/Inventory/Item.h | 0 .../Inventory/ItemContainer.cpp | 0 .../Inventory/ItemContainer.h | 0 .../Inventory/ItemUtil.cpp | 0 .../Inventory/ItemUtil.h | 0 .../Linkshell/Linkshell.cpp | 0 .../Linkshell/Linkshell.h | 0 .../Manager/HousingMgr.cpp | 0 .../Manager/HousingMgr.h | 0 .../Manager/LinkshellMgr.cpp | 0 .../Manager/LinkshellMgr.h | 0 .../Manager/PlayerMgr.cpp | 0 .../Manager/PlayerMgr.h | 0 .../Manager/ShopMgr.cpp | 0 .../sapphire_zone => world}/Manager/ShopMgr.h | 0 .../Manager/TerritoryMgr.cpp | 0 .../Manager/TerritoryMgr.h | 0 .../Math/CalcBattle.cpp | 0 .../sapphire_zone => world}/Math/CalcBattle.h | 0 .../Math/CalcStats.cpp | 0 .../sapphire_zone => world}/Math/CalcStats.h | 0 .../Network/GameConnection.cpp | 0 .../Network/GameConnection.h | 0 .../Network/Handlers/ActionHandler.cpp | 0 .../Network/Handlers/CFHandlers.cpp | 0 .../Network/Handlers/ClientTriggerHandler.cpp | 0 .../Network/Handlers/EventHandlers.cpp | 0 .../Network/Handlers/GMCommandHandlers.cpp | 0 .../Network/Handlers/InventoryHandler.cpp | 0 .../Network/Handlers/PacketHandlers.cpp | 0 .../PacketWrappers/ActorControlPacket142.h | 0 .../PacketWrappers/ActorControlPacket143.h | 0 .../PacketWrappers/ActorControlPacket144.h | 0 .../Network/PacketWrappers/ChatPacket.h | 0 .../PacketWrappers/DirectorPlayScenePacket.h | 0 .../Network/PacketWrappers/EffectPacket.h | 0 .../PacketWrappers/EventFinishPacket.h | 0 .../Network/PacketWrappers/EventPlayPacket.h | 0 .../Network/PacketWrappers/EventStartPacket.h | 0 .../Network/PacketWrappers/ExaminePacket.h | 0 .../Network/PacketWrappers/InitUIPacket.h | 0 .../Network/PacketWrappers/ModelEquipPacket.h | 0 .../Network/PacketWrappers/MoveActorPacket.h | 0 .../Network/PacketWrappers/NpcSpawnPacket.h | 0 .../Network/PacketWrappers/PingPacket.h | 0 .../PacketWrappers/PlayerSpawnPacket.h | 0 .../PacketWrappers/PlayerStateFlagsPacket.h | 0 .../PacketWrappers/QuestMessagePacket.h | 0 .../PacketWrappers/ServerNoticePacket.h | 0 .../PacketWrappers/UpdateHpMpTpPacket.h | 0 .../UpdateInventorySlotPacket.h | 0 .../Script/NativeScriptApi.cpp | 0 .../Script/NativeScriptApi.h | 0 .../Script/NativeScriptMgr.cpp | 0 .../Script/NativeScriptMgr.h | 0 .../Script/ScriptInfo.h | 0 .../Script/ScriptLoader.cpp | 0 .../Script/ScriptLoader.h | 0 .../Script/ScriptMgr.cpp | 0 .../Script/ScriptMgr.h | 0 .../sapphire_zone => world}/ServerMgr.cpp | 0 .../sapphire_zone => world}/ServerMgr.h | 0 .../sapphire_zone => world}/Session.cpp | 0 .../sapphire_zone => world}/Session.h | 0 .../StatusEffect/StatusEffect.cpp | 0 .../StatusEffect/StatusEffect.h | 0 .../Territory/Cell.cpp | 0 .../sapphire_zone => world}/Territory/Cell.h | 0 .../Territory/CellHandler.h | 0 .../Territory/House.cpp | 0 .../sapphire_zone => world}/Territory/House.h | 0 .../Housing/HousingInteriorTerritory.cpp | 0 .../Housing/HousingInteriorTerritory.h | 0 .../Territory/HousingZone.cpp | 0 .../Territory/HousingZone.h | 0 .../Territory/InstanceContent.cpp | 0 .../Territory/InstanceContent.h | 0 .../Territory/Land.cpp | 0 .../sapphire_zone => world}/Territory/Land.h | 0 .../Territory/Zone.cpp | 0 .../sapphire_zone => world}/Territory/Zone.h | 0 .../Territory/ZonePosition.cpp | 0 .../Territory/ZonePosition.h | 0 .../mainGameServer.cpp | 0 501 files changed, 772 insertions(+), 53 deletions(-) rename src/{servers/sapphire_api => api}/CMakeLists.txt (50%) rename src/{servers/sapphire_api => api}/Forwards.h (100%) rename src/{servers/sapphire_api => api}/LoginSession.cpp (100%) rename src/{servers/sapphire_api => api}/LoginSession.h (100%) rename src/{servers/sapphire_api => api}/PlayerMinimal.cpp (100%) rename src/{servers/sapphire_api => api}/PlayerMinimal.h (100%) rename src/{servers/sapphire_api => api}/SapphireAPI.cpp (100%) rename src/{servers/sapphire_api => api}/SapphireAPI.h (100%) rename src/{servers/sapphire_api => api}/Session.cpp (100%) rename src/{servers/sapphire_api => api}/Session.h (100%) rename src/{servers/sapphire_api => api}/client_http.hpp (100%) rename src/{servers/sapphire_api => api}/main.cpp (100%) rename src/{servers/sapphire_api => api}/server_http.hpp (100%) rename src/{servers/sapphire_lobby => lobby}/CMakeLists.txt (75%) rename src/{servers/sapphire_lobby => lobby}/Forwards.h (100%) rename src/{servers/sapphire_lobby => lobby}/GameConnection.cpp (100%) rename src/{servers/sapphire_lobby => lobby}/GameConnection.h (100%) rename src/{servers/sapphire_lobby => lobby}/LobbyPacketContainer.cpp (100%) rename src/{servers/sapphire_lobby => lobby}/LobbyPacketContainer.h (100%) rename src/{servers/sapphire_lobby => lobby}/LobbySession.cpp (100%) rename src/{servers/sapphire_lobby => lobby}/LobbySession.h (100%) rename src/{servers/sapphire_lobby => lobby}/RestConnector.cpp (100%) rename src/{servers/sapphire_lobby => lobby}/RestConnector.h (100%) rename src/{servers/sapphire_lobby => lobby}/ServerLobby.cpp (100%) rename src/{servers/sapphire_lobby => lobby}/ServerLobby.h (100%) rename src/{servers/sapphire_lobby => lobby}/client_http.hpp (100%) rename src/{servers/sapphire_lobby => lobby}/mainLobbyServer.cpp (100%) rename src/{servers/Scripts => scripts}/CMakeLists.txt (96%) rename src/{servers/Scripts => scripts}/ScriptLoader.cpp.in (100%) rename src/{servers/Scripts => scripts}/ScriptObject.h (100%) rename src/{servers/Scripts => scripts}/action/ActionReturn6.cpp (100%) rename src/{servers/Scripts => scripts}/action/ActionSprint3.cpp (100%) create mode 100644 src/scripts/action/ScriptLoader.cpp rename src/{servers/Scripts => scripts}/common/CmnDefCutSceneReplay.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefInnBed.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefLinkShell.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefMarketBoardGridania.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefMogLetter.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefNpcRepair.cpp (100%) rename src/{servers/Scripts => scripts}/common/CmnDefWeatherForeCast.cpp (100%) rename src/{servers/Scripts => scripts}/common/ComDefMobHuntBoard.cpp (100%) rename src/{servers/Scripts => scripts}/common/GilShop.cpp (100%) rename src/{servers/Scripts => scripts}/common/HouFurOrchestrion.cpp (100%) create mode 100644 src/scripts/common/ScriptLoader.cpp rename src/{servers/Scripts => scripts}/common/aethernet/Aetheryte.cpp (100%) rename src/{servers/Scripts => scripts}/common/aethernet/HousingAethernet.cpp (100%) rename src/{servers/Scripts => scripts}/common/eobj/HousingEstateEntrance.cpp (100%) rename src/{servers/Scripts => scripts}/common/housing/CmnDefHousingPersonalRoomEntrance.cpp (100%) rename src/{servers/Scripts => scripts}/common/housing/CmnDefHousingSignboard.cpp (100%) rename src/{servers/Scripts => scripts}/common/warptaxi/HousingWarpTaxiExitEstate.cpp (100%) rename src/{servers/Scripts => scripts}/common/warptaxi/WarpTaxi.cpp (100%) create mode 100644 src/scripts/instances/ScriptLoader.cpp rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp (100%) rename src/{servers/Scripts => scripts}/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/AlaMhigo.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/AmdaporKeep.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/AmdaporKeepHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/BaelsarsWall.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/BardamsMettle.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/BrayfloxsLongstop.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/BrayfloxsLongstopHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/CastrumAbania.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/CastrumMeridianum.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/CopperbellMines.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/CopperbellMinesHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/CuttersCry.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/DomaCastle.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/DzemaelDarkhold.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/Halatali.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HalataliHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HaukkeManor.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HaukkeManorHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HellsLid.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HullbreakerIsle.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/HullbreakerIsleHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/KuganeCastle.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/Neverreap.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/PharosSirius.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/PharosSiriusHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/SaintMociannesArboretum.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/Sastasha.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/SastashaHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/ShisuioftheVioletTides.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/Snowcloak.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/SohmAl.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/SohmAlHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/SohrKhai.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheAery.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheAetherochemicalResearchFacility.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheAntitower.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheAurumVale.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheDrownedCityofSkalla.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheDuskVigil.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheFractalContinuum.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheFractalContinuumHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheGreatGubalLibrary.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheGreatGubalLibraryHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheKeeperoftheLake.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheLostCityofAmdapor.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheLostCityofAmdaporHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/ThePraetorium.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheSirensongSea.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheStoneVigil.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheStoneVigilHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheSunkenTempleofQarn.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheSunkenTempleofQarnHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheTamTaraDeepcroft.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheTamTaraDeepcroftHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheTempleoftheFist.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheThousandMawsofTotoRak.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheVault.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheWanderersPalace.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/TheWanderersPalaceHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/dungeons/Xelphatol.cpp (100%) rename src/{servers/Scripts => scripts}/instances/events/TheHauntedManor.cpp (100%) rename src/{servers/Scripts => scripts}/instances/events/TheValentionesCeremony.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/AllsWellthatEndsintheWell.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/AnnoytheVoid.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/BasicTrainingEnemyParties.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/BasicTrainingEnemyStrongholds.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/FlickingSticksandTakingNames.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/HeroontheHalfShell.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/LongLivetheQueen.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/MorethanaFeeler.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/PullingPoisonPosies.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/ShadowandClaw.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/SolemnTrinity.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/StingingBack.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/UndertheArmor.cpp (100%) rename src/{servers/Scripts => scripts}/instances/guildhests/WardUp.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/AvoidEngagedTargets.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/DefeatanOccupiedTarget.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/EngageEnemyReinforcements.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/EngageMultipleTargets.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/ExecuteaComboinBattle.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/FinalExercise.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/HealMultipleAllies.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/HealanAlly.cpp (100%) rename src/{servers/Scripts => scripts}/instances/hallofthenovice/InteractwiththeBattlefield.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/Astragalos.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/SealRockSeize.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheBorderlandRuinsSecure.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeast4on4LightParty.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeast4on4Ranked.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeast4on4Training.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastCustomMatchCrystalTower.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastCustomMatchLichenweed.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastRanked.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastTeamRanked.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFeastTraining.cpp (100%) rename src/{servers/Scripts => scripts}/instances/pvp/TheFieldsofGloryShatter.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/ABloodyReunion.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/ASpectaclefortheAges.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/BloodDragoon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/BloodontheDeck.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/DarkwingDragon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/InThalsName.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/InterdimensionalRift.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/ItsProbablyaTrap.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/MatsubaMayhem.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/Naadam.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/OneLifeforOneWorld.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/OurCompromise.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/OurUnsungHeroes.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/RaisingtheSword.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/ReturnoftheBull.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheBattleonBekko.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheFaceofTrueEvil.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheHeartoftheProblem.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheOrphansandtheBrokenBlade.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/TheResonant.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/WhenClansCollide.cpp (100%) rename src/{servers/Scripts => scripts}/instances/questbattles/WithHeartandSteel.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheArmoftheFather.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheArmoftheFatherSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheArmoftheSon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheArmoftheSonSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBreathoftheCreator.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBurdenoftheFather.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBurdenoftheSon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheCuffoftheFather.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheCuffoftheSon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheCuffoftheSonSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheEyesoftheCreator.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheFistoftheFather.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheFistoftheFatherSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheFistoftheSon.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheFistoftheSonSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheHeartoftheCreator.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheSouloftheCreator.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV10.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV10Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV20.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV20Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV30.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV30Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV40.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DeltascapeV40Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/DunScaith.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV10.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV10Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV20.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV20Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV30.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV30Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV40.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SigmascapeV40Savage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/SyrcusTower.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheBindingCoilofBahamutTurn1.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheBindingCoilofBahamutTurn2.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheBindingCoilofBahamutTurn3.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheBindingCoilofBahamutTurn4.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheBindingCoilofBahamutTurn5.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheFinalCoilofBahamutTurn1.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheFinalCoilofBahamutTurn2.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheFinalCoilofBahamutTurn3.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheFinalCoilofBahamutTurn4.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheLabyrinthoftheAncients.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheRoyalCityofRabanastre.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutTurn1.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutTurn2.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutTurn3.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheSecondCoilofBahamutTurn4.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheUnendingCoilofBahamutUltimate.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheVoidArk.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheWeaponsRefrainUltimate.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheWeepingCityofMhach.cpp (100%) rename src/{servers/Scripts => scripts}/instances/raids/TheWorldofDarkness.cpp (100%) rename src/{servers/Scripts => scripts}/instances/treasurehunt/TheAquapolis.cpp (100%) rename src/{servers/Scripts => scripts}/instances/treasurehunt/TheHiddenCanalsofUznair.cpp (100%) rename src/{servers/Scripts => scripts}/instances/treasurehunt/TheLostCanalsofUznair.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ARelicReborntheChimera.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ARelicReborntheHydra.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/AkhAfahAmphitheatreExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/AkhAfahAmphitheatreHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/BattleintheBigKeep.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/BattleontheBigBridge.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/CapeWestwind.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayP1T6.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayP1T6Extreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayS1T7.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayS1T7Extreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayZ1T9.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ContainmentBayZ1T9Extreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/Emanation.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/EmanationExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/SpecialEventI.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/SpecialEventII.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/SpecialEventIII.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheBowlofEmbers.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheBowlofEmbersExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheBowlofEmbersHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheChrysalis.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheDragonsNeck.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheFinalStepsofFaith.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheHowlingEye.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheHowlingEyeExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheHowlingEyeHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheJadeStoa.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheJadeStoaExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheLimitlessBlueExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheLimitlessBlueHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheMinstrelsBalladShinryusDomain.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheMinstrelsBalladThordansReign.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheMinstrelsBalladUltimasBane.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheNavel.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheNavelExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheNavelHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThePoolofTribute.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThePoolofTributeExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheRoyalMenagerie.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheSingularityReactor.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheStepsofFaith.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheStrikingTreeExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheStrikingTreeHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheWhorleaterExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/TheWhorleaterHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThokastThokExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThokastThokHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThornmarchExtreme.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/ThornmarchHard.cpp (100%) rename src/{servers/Scripts => scripts}/instances/trials/UrthsFount.cpp (100%) rename src/{servers/Scripts => scripts}/opening/OpeningGridania.cpp (100%) rename src/{servers/Scripts => scripts}/opening/OpeningLimsa.cpp (100%) rename src/{servers/Scripts => scripts}/opening/OpeningUldah.cpp (100%) create mode 100644 src/scripts/opening/ScriptLoader.cpp rename src/{servers/Scripts => scripts}/quest/ManFst001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManFst002.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManFst003.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManFst004.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManSea001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManSea002.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManSea003.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManWil001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/ManWil002.cpp (100%) create mode 100644 src/scripts/quest/ScriptLoader.cpp rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst002.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst003.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst004.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst008.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst009.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst010.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst011.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst013.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst014.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst015.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst019.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst026.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst029.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst030.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/gridania/SubFst041.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/limsa/SubSea001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil000.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil001.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil002.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil004.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil006.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil007.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil018.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil019.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil021.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil022.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil027.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil028.cpp (100%) rename src/{servers/Scripts => scripts}/quest/subquest/uldah/SubWil029.cpp (100%) delete mode 100644 src/servers/CMakeLists.txt rename src/{servers/sapphire_zone => world}/Action/Action.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/Action.h (100%) rename src/{servers/sapphire_zone => world}/Action/ActionCast.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/ActionCast.h (100%) rename src/{servers/sapphire_zone => world}/Action/ActionCollision.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/ActionCollision.h (100%) rename src/{servers/sapphire_zone => world}/Action/ActionMount.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/ActionMount.h (100%) rename src/{servers/sapphire_zone => world}/Action/ActionTeleport.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/ActionTeleport.h (100%) rename src/{servers/sapphire_zone => world}/Action/EventAction.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/EventAction.h (100%) rename src/{servers/sapphire_zone => world}/Action/EventItemAction.cpp (100%) rename src/{servers/sapphire_zone => world}/Action/EventItemAction.h (100%) rename src/{servers/sapphire_zone => world}/Actor/Actor.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/Actor.h (100%) rename src/{servers/sapphire_zone => world}/Actor/BNpc.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/BNpc.h (100%) rename src/{servers/sapphire_zone => world}/Actor/BNpcTemplate.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/BNpcTemplate.h (100%) rename src/{servers/sapphire_zone => world}/Actor/Chara.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/Chara.h (100%) rename src/{servers/sapphire_zone => world}/Actor/EventObject.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/EventObject.h (100%) rename src/{servers/sapphire_zone => world}/Actor/Npc.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/Npc.h (100%) rename src/{servers/sapphire_zone => world}/Actor/Player.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/Player.h (100%) rename src/{servers/sapphire_zone => world}/Actor/PlayerEvent.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/PlayerInventory.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/PlayerQuest.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/PlayerSql.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/SpawnGroup.h (100%) rename src/{servers/sapphire_zone => world}/Actor/SpawnPoint.cpp (100%) rename src/{servers/sapphire_zone => world}/Actor/SpawnPoint.h (100%) rename src/{servers/sapphire_zone => world}/CMakeLists.txt (62%) rename src/{servers/sapphire_zone => world}/ContentFinder/ContentFinder.cpp (100%) rename src/{servers/sapphire_zone => world}/ContentFinder/ContentFinder.h (100%) rename src/{servers/sapphire_zone => world}/DebugCommand/DebugCommand.h (100%) rename src/{servers/sapphire_zone => world}/DebugCommand/DebugCommandHandler.cpp (100%) rename src/{servers/sapphire_zone => world}/DebugCommand/DebugCommandHandler.h (100%) rename src/{servers/sapphire_zone => world}/Event/Director.cpp (100%) rename src/{servers/sapphire_zone => world}/Event/Director.h (100%) rename src/{servers/sapphire_zone => world}/Event/EventDefs.h (100%) rename src/{servers/sapphire_zone => world}/Event/EventHandler.cpp (100%) rename src/{servers/sapphire_zone => world}/Event/EventHandler.h (100%) rename src/{servers/sapphire_zone => world}/Event/EventHelper.cpp (100%) rename src/{servers/sapphire_zone => world}/Event/EventHelper.h (100%) rename src/{servers/sapphire_zone => world}/ForwardsZone.h (100%) rename src/{servers/sapphire_zone => world}/Inventory/Item.cpp (100%) rename src/{servers/sapphire_zone => world}/Inventory/Item.h (100%) rename src/{servers/sapphire_zone => world}/Inventory/ItemContainer.cpp (100%) rename src/{servers/sapphire_zone => world}/Inventory/ItemContainer.h (100%) rename src/{servers/sapphire_zone => world}/Inventory/ItemUtil.cpp (100%) rename src/{servers/sapphire_zone => world}/Inventory/ItemUtil.h (100%) rename src/{servers/sapphire_zone => world}/Linkshell/Linkshell.cpp (100%) rename src/{servers/sapphire_zone => world}/Linkshell/Linkshell.h (100%) rename src/{servers/sapphire_zone => world}/Manager/HousingMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Manager/HousingMgr.h (100%) rename src/{servers/sapphire_zone => world}/Manager/LinkshellMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Manager/LinkshellMgr.h (100%) rename src/{servers/sapphire_zone => world}/Manager/PlayerMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Manager/PlayerMgr.h (100%) rename src/{servers/sapphire_zone => world}/Manager/ShopMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Manager/ShopMgr.h (100%) rename src/{servers/sapphire_zone => world}/Manager/TerritoryMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Manager/TerritoryMgr.h (100%) rename src/{servers/sapphire_zone => world}/Math/CalcBattle.cpp (100%) rename src/{servers/sapphire_zone => world}/Math/CalcBattle.h (100%) rename src/{servers/sapphire_zone => world}/Math/CalcStats.cpp (100%) rename src/{servers/sapphire_zone => world}/Math/CalcStats.h (100%) rename src/{servers/sapphire_zone => world}/Network/GameConnection.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/GameConnection.h (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/ActionHandler.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/CFHandlers.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/ClientTriggerHandler.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/EventHandlers.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/GMCommandHandlers.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/InventoryHandler.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/Handlers/PacketHandlers.cpp (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ActorControlPacket142.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ActorControlPacket143.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ActorControlPacket144.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ChatPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/DirectorPlayScenePacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/EffectPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/EventFinishPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/EventPlayPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/EventStartPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ExaminePacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/InitUIPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ModelEquipPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/MoveActorPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/NpcSpawnPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/PingPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/PlayerSpawnPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/PlayerStateFlagsPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/QuestMessagePacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/ServerNoticePacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/UpdateHpMpTpPacket.h (100%) rename src/{servers/sapphire_zone => world}/Network/PacketWrappers/UpdateInventorySlotPacket.h (100%) rename src/{servers/sapphire_zone => world}/Script/NativeScriptApi.cpp (100%) rename src/{servers/sapphire_zone => world}/Script/NativeScriptApi.h (100%) rename src/{servers/sapphire_zone => world}/Script/NativeScriptMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Script/NativeScriptMgr.h (100%) rename src/{servers/sapphire_zone => world}/Script/ScriptInfo.h (100%) rename src/{servers/sapphire_zone => world}/Script/ScriptLoader.cpp (100%) rename src/{servers/sapphire_zone => world}/Script/ScriptLoader.h (100%) rename src/{servers/sapphire_zone => world}/Script/ScriptMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/Script/ScriptMgr.h (100%) rename src/{servers/sapphire_zone => world}/ServerMgr.cpp (100%) rename src/{servers/sapphire_zone => world}/ServerMgr.h (100%) rename src/{servers/sapphire_zone => world}/Session.cpp (100%) rename src/{servers/sapphire_zone => world}/Session.h (100%) rename src/{servers/sapphire_zone => world}/StatusEffect/StatusEffect.cpp (100%) rename src/{servers/sapphire_zone => world}/StatusEffect/StatusEffect.h (100%) rename src/{servers/sapphire_zone => world}/Territory/Cell.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/Cell.h (100%) rename src/{servers/sapphire_zone => world}/Territory/CellHandler.h (100%) rename src/{servers/sapphire_zone => world}/Territory/House.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/House.h (100%) rename src/{servers/sapphire_zone => world}/Territory/Housing/HousingInteriorTerritory.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/Housing/HousingInteriorTerritory.h (100%) rename src/{servers/sapphire_zone => world}/Territory/HousingZone.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/HousingZone.h (100%) rename src/{servers/sapphire_zone => world}/Territory/InstanceContent.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/InstanceContent.h (100%) rename src/{servers/sapphire_zone => world}/Territory/Land.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/Land.h (100%) rename src/{servers/sapphire_zone => world}/Territory/Zone.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/Zone.h (100%) rename src/{servers/sapphire_zone => world}/Territory/ZonePosition.cpp (100%) rename src/{servers/sapphire_zone => world}/Territory/ZonePosition.h (100%) rename src/{servers/sapphire_zone => world}/mainGameServer.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0b051f8..1a53f793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,8 +36,11 @@ add_subdirectory( "deps/datReader" ) add_subdirectory( "deps/mysqlConnector" ) add_subdirectory( "src/common" ) -add_subdirectory( "src/servers" ) +add_subdirectory( "src/api" ) +add_subdirectory( "src/lobby" ) +add_subdirectory( "src/world" ) add_subdirectory( "src/dbm" ) +add_subdirectory( "src/scripts" ) add_subdirectory( "src/tools/exd_common_gen" ) add_subdirectory( "src/tools/exd_struct_gen" ) diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/api/CMakeLists.txt similarity index 50% rename from src/servers/sapphire_api/CMakeLists.txt rename to src/api/CMakeLists.txt index ab5f9d6f..c30aded2 100644 --- a/src/servers/sapphire_api/CMakeLists.txt +++ b/src/api/CMakeLists.txt @@ -1,13 +1,13 @@ -cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0015 NEW) -project(Sapphire) +cmake_minimum_required( VERSION 2.6 ) +cmake_policy( SET CMP0015 NEW ) +project( Sapphire ) -file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") -file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") +file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" ) +file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" ) -add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) +add_executable( api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) -set_target_properties(sapphire_api PROPERTIES +set_target_properties( api PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON @@ -18,10 +18,10 @@ set_target_properties(sapphire_api PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" ) -target_link_libraries( sapphire_api common ) +target_link_libraries( api common ) if( UNIX ) - target_link_libraries( sapphire_api mysqlclient stdc++fs ) + target_link_libraries( api mysqlclient stdc++fs ) else() - target_link_libraries( sapphire_api mysql ) + target_link_libraries( api mysql ) endif() diff --git a/src/servers/sapphire_api/Forwards.h b/src/api/Forwards.h similarity index 100% rename from src/servers/sapphire_api/Forwards.h rename to src/api/Forwards.h diff --git a/src/servers/sapphire_api/LoginSession.cpp b/src/api/LoginSession.cpp similarity index 100% rename from src/servers/sapphire_api/LoginSession.cpp rename to src/api/LoginSession.cpp diff --git a/src/servers/sapphire_api/LoginSession.h b/src/api/LoginSession.h similarity index 100% rename from src/servers/sapphire_api/LoginSession.h rename to src/api/LoginSession.h diff --git a/src/servers/sapphire_api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp similarity index 100% rename from src/servers/sapphire_api/PlayerMinimal.cpp rename to src/api/PlayerMinimal.cpp diff --git a/src/servers/sapphire_api/PlayerMinimal.h b/src/api/PlayerMinimal.h similarity index 100% rename from src/servers/sapphire_api/PlayerMinimal.h rename to src/api/PlayerMinimal.h diff --git a/src/servers/sapphire_api/SapphireAPI.cpp b/src/api/SapphireAPI.cpp similarity index 100% rename from src/servers/sapphire_api/SapphireAPI.cpp rename to src/api/SapphireAPI.cpp diff --git a/src/servers/sapphire_api/SapphireAPI.h b/src/api/SapphireAPI.h similarity index 100% rename from src/servers/sapphire_api/SapphireAPI.h rename to src/api/SapphireAPI.h diff --git a/src/servers/sapphire_api/Session.cpp b/src/api/Session.cpp similarity index 100% rename from src/servers/sapphire_api/Session.cpp rename to src/api/Session.cpp diff --git a/src/servers/sapphire_api/Session.h b/src/api/Session.h similarity index 100% rename from src/servers/sapphire_api/Session.h rename to src/api/Session.h diff --git a/src/servers/sapphire_api/client_http.hpp b/src/api/client_http.hpp similarity index 100% rename from src/servers/sapphire_api/client_http.hpp rename to src/api/client_http.hpp diff --git a/src/servers/sapphire_api/main.cpp b/src/api/main.cpp similarity index 100% rename from src/servers/sapphire_api/main.cpp rename to src/api/main.cpp diff --git a/src/servers/sapphire_api/server_http.hpp b/src/api/server_http.hpp similarity index 100% rename from src/servers/sapphire_api/server_http.hpp rename to src/api/server_http.hpp diff --git a/src/dbm/CMakeLists.txt b/src/dbm/CMakeLists.txt index 0736265e..f731b609 100644 --- a/src/dbm/CMakeLists.txt +++ b/src/dbm/CMakeLists.txt @@ -1,13 +1,13 @@ -cmake_minimum_required(VERSION 3.0) -cmake_policy(SET CMP0015 NEW) -project(sapphire_dbm) +cmake_minimum_required( VERSION 3.0 ) +cmake_policy( SET CMP0015 NEW ) +project( dbm ) -file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" ) -file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") +file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" ) +file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" ) -add_executable(sapphire_dbm ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) +add_executable( dbm ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) -set_target_properties(sapphire_dbm PROPERTIES +set_target_properties( dbm PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS ON @@ -17,15 +17,15 @@ set_target_properties(sapphire_dbm PROPERTIES RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" ) -target_include_directories( sapphire_dbm +target_include_directories( dbm PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../" ) - target_link_libraries( sapphire_dbm PRIVATE mysqlConnector common xivdat ) +target_link_libraries( dbm PRIVATE mysqlConnector common xivdat ) if (UNIX) - target_link_libraries( sapphire_dbm PRIVATE stdc++fs ) + target_link_libraries( dbm PRIVATE stdc++fs ) else() - target_link_libraries( sapphire_dbm PRIVATE mysql ) + target_link_libraries( dbm PRIVATE mysql ) endif() diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/lobby/CMakeLists.txt similarity index 75% rename from src/servers/sapphire_lobby/CMakeLists.txt rename to src/lobby/CMakeLists.txt index b6000a47..cc262001 100644 --- a/src/servers/sapphire_lobby/CMakeLists.txt +++ b/src/lobby/CMakeLists.txt @@ -6,9 +6,9 @@ file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" ) file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" ) -add_executable( sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) +add_executable( lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) -set_target_properties( sapphire_lobby +set_target_properties( lobby PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON @@ -18,15 +18,16 @@ set_target_properties( sapphire_lobby RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" - ) -target_link_libraries( sapphire_lobby - PRIVATE - common mysql ) +) +target_link_libraries( lobby + PRIVATE + common + mysql ) if( UNIX ) - target_link_libraries( sapphire_lobby + target_link_libraries( lobby PRIVATE stdc++fs ) endif() - #cotire( sapphire_lobby ) +#cotire( lobby ) diff --git a/src/servers/sapphire_lobby/Forwards.h b/src/lobby/Forwards.h similarity index 100% rename from src/servers/sapphire_lobby/Forwards.h rename to src/lobby/Forwards.h diff --git a/src/servers/sapphire_lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp similarity index 100% rename from src/servers/sapphire_lobby/GameConnection.cpp rename to src/lobby/GameConnection.cpp diff --git a/src/servers/sapphire_lobby/GameConnection.h b/src/lobby/GameConnection.h similarity index 100% rename from src/servers/sapphire_lobby/GameConnection.h rename to src/lobby/GameConnection.h diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp similarity index 100% rename from src/servers/sapphire_lobby/LobbyPacketContainer.cpp rename to src/lobby/LobbyPacketContainer.cpp diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h similarity index 100% rename from src/servers/sapphire_lobby/LobbyPacketContainer.h rename to src/lobby/LobbyPacketContainer.h diff --git a/src/servers/sapphire_lobby/LobbySession.cpp b/src/lobby/LobbySession.cpp similarity index 100% rename from src/servers/sapphire_lobby/LobbySession.cpp rename to src/lobby/LobbySession.cpp diff --git a/src/servers/sapphire_lobby/LobbySession.h b/src/lobby/LobbySession.h similarity index 100% rename from src/servers/sapphire_lobby/LobbySession.h rename to src/lobby/LobbySession.h diff --git a/src/servers/sapphire_lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp similarity index 100% rename from src/servers/sapphire_lobby/RestConnector.cpp rename to src/lobby/RestConnector.cpp diff --git a/src/servers/sapphire_lobby/RestConnector.h b/src/lobby/RestConnector.h similarity index 100% rename from src/servers/sapphire_lobby/RestConnector.h rename to src/lobby/RestConnector.h diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp similarity index 100% rename from src/servers/sapphire_lobby/ServerLobby.cpp rename to src/lobby/ServerLobby.cpp diff --git a/src/servers/sapphire_lobby/ServerLobby.h b/src/lobby/ServerLobby.h similarity index 100% rename from src/servers/sapphire_lobby/ServerLobby.h rename to src/lobby/ServerLobby.h diff --git a/src/servers/sapphire_lobby/client_http.hpp b/src/lobby/client_http.hpp similarity index 100% rename from src/servers/sapphire_lobby/client_http.hpp rename to src/lobby/client_http.hpp diff --git a/src/servers/sapphire_lobby/mainLobbyServer.cpp b/src/lobby/mainLobbyServer.cpp similarity index 100% rename from src/servers/sapphire_lobby/mainLobbyServer.cpp rename to src/lobby/mainLobbyServer.cpp diff --git a/src/servers/Scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt similarity index 96% rename from src/servers/Scripts/CMakeLists.txt rename to src/scripts/CMakeLists.txt index 06ea6827..dd9f0759 100644 --- a/src/servers/Scripts/CMakeLists.txt +++ b/src/scripts/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(Sapphire_Script) +project(Script) file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h") @@ -36,7 +36,7 @@ foreach(_scriptDir ${children}) endforeach() add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp") - target_link_libraries( "script_${_name}" sapphire_zone ) + target_link_libraries( "script_${_name}" world ) if(MSVC) set_target_properties( "script_${_name}" PROPERTIES @@ -56,7 +56,7 @@ foreach(_scriptDir ${children}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp") - #cotire("script_${_name}") + cotire("script_${_name}") if(MSVC) add_custom_command(TARGET "script_${_name}" POST_BUILD diff --git a/src/servers/Scripts/ScriptLoader.cpp.in b/src/scripts/ScriptLoader.cpp.in similarity index 100% rename from src/servers/Scripts/ScriptLoader.cpp.in rename to src/scripts/ScriptLoader.cpp.in diff --git a/src/servers/Scripts/ScriptObject.h b/src/scripts/ScriptObject.h similarity index 100% rename from src/servers/Scripts/ScriptObject.h rename to src/scripts/ScriptObject.h diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/scripts/action/ActionReturn6.cpp similarity index 100% rename from src/servers/Scripts/action/ActionReturn6.cpp rename to src/scripts/action/ActionReturn6.cpp diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/scripts/action/ActionSprint3.cpp similarity index 100% rename from src/servers/Scripts/action/ActionSprint3.cpp rename to src/scripts/action/ActionSprint3.cpp diff --git a/src/scripts/action/ScriptLoader.cpp b/src/scripts/action/ScriptLoader.cpp new file mode 100644 index 00000000..53a1a372 --- /dev/null +++ b/src/scripts/action/ScriptLoader.cpp @@ -0,0 +1,17 @@ +#include