diff --git a/.gitignore b/.gitignore index c931620b..00f3f1c8 100644 --- a/.gitignore +++ b/.gitignore @@ -113,4 +113,4 @@ src/common/Version\.cpp .mtime_cache # generated script loader files -scripts/native/*/ScriptLoader.cpp \ No newline at end of file +src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fe6f474..ca7af689 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,5 +68,3 @@ add_subdirectory("src/tools/exd_struct_gen") add_subdirectory("src/tools/exd_struct_test") add_subdirectory("src/tools/quest_parser") #add_subdirectory("src/tools/pcb_reader") - -add_subdirectory("scripts/native") diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index c091712d..091791a7 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0015 NEW) cmake_policy(SET CMP0014 OLD) +add_subdirectory("Script/Scripts") + project(sapphire_zone) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/scripts/native/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt similarity index 100% rename from scripts/native/CMakeLists.txt rename to src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt diff --git a/scripts/native/CmnDef/CmnDefCutSceneReplay.cpp b/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefCutSceneReplay.cpp similarity index 100% rename from scripts/native/CmnDef/CmnDefCutSceneReplay.cpp rename to src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefCutSceneReplay.cpp diff --git a/scripts/native/CmnDef/CmnDefInnBed.cpp b/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefInnBed.cpp similarity index 100% rename from scripts/native/CmnDef/CmnDefInnBed.cpp rename to src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefInnBed.cpp diff --git a/scripts/native/CmnDef/CmnDefLinkShell.cpp b/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefLinkShell.cpp similarity index 100% rename from scripts/native/CmnDef/CmnDefLinkShell.cpp rename to src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefLinkShell.cpp diff --git a/scripts/native/CmnDef/HouFurOrchestrion.cpp b/src/servers/sapphire_zone/Script/Scripts/CmnDef/HouFurOrchestrion.cpp similarity index 100% rename from scripts/native/CmnDef/HouFurOrchestrion.cpp rename to src/servers/sapphire_zone/Script/Scripts/CmnDef/HouFurOrchestrion.cpp diff --git a/scripts/native/ScriptLoader.cpp.in b/src/servers/sapphire_zone/Script/Scripts/ScriptLoader.cpp.in similarity index 100% rename from scripts/native/ScriptLoader.cpp.in rename to src/servers/sapphire_zone/Script/Scripts/ScriptLoader.cpp.in diff --git a/scripts/native/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h similarity index 100% rename from scripts/native/ScriptObject.h rename to src/servers/sapphire_zone/Script/Scripts/ScriptObject.h diff --git a/scripts/native/action/ActionSprint3.cpp b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp similarity index 100% rename from scripts/native/action/ActionSprint3.cpp rename to src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp diff --git a/scripts/native/aetheryte/Aethernet.cpp b/src/servers/sapphire_zone/Script/Scripts/aetheryte/Aethernet.cpp similarity index 100% rename from scripts/native/aetheryte/Aethernet.cpp rename to src/servers/sapphire_zone/Script/Scripts/aetheryte/Aethernet.cpp diff --git a/scripts/native/aetheryte/Aetheryte.cpp b/src/servers/sapphire_zone/Script/Scripts/aetheryte/Aetheryte.cpp similarity index 100% rename from scripts/native/aetheryte/Aetheryte.cpp rename to src/servers/sapphire_zone/Script/Scripts/aetheryte/Aetheryte.cpp diff --git a/scripts/native/opening/OpeningGridania.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp similarity index 100% rename from scripts/native/opening/OpeningGridania.cpp rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp diff --git a/scripts/native/opening/OpeningLimsa.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp similarity index 100% rename from scripts/native/opening/OpeningLimsa.cpp rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp diff --git a/scripts/native/opening/OpeningUldah.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp similarity index 100% rename from scripts/native/opening/OpeningUldah.cpp rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp diff --git a/scripts/native/quest/ManFst001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp similarity index 100% rename from scripts/native/quest/ManFst001.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp diff --git a/scripts/native/quest/ManFst002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp similarity index 100% rename from scripts/native/quest/ManFst002.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp diff --git a/scripts/native/quest/ManFst003.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp similarity index 100% rename from scripts/native/quest/ManFst003.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp diff --git a/scripts/native/quest/ManFst004.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp similarity index 100% rename from scripts/native/quest/ManFst004.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp diff --git a/scripts/native/quest/ManSea001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp similarity index 100% rename from scripts/native/quest/ManSea001.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp diff --git a/scripts/native/quest/ManSea002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp similarity index 100% rename from scripts/native/quest/ManSea002.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp diff --git a/scripts/native/quest/ManWil001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp similarity index 100% rename from scripts/native/quest/ManWil001.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp diff --git a/scripts/native/quest/ManWil002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp similarity index 100% rename from scripts/native/quest/ManWil002.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp diff --git a/scripts/native/quest/subquest/gridania/SubFst001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp similarity index 100% rename from scripts/native/quest/subquest/gridania/SubFst001.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp diff --git a/scripts/native/quest/subquest/gridania/SubFst002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp similarity index 100% rename from scripts/native/quest/subquest/gridania/SubFst002.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp diff --git a/scripts/native/quest/subquest/gridania/SubFst010.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp similarity index 100% rename from scripts/native/quest/subquest/gridania/SubFst010.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp diff --git a/scripts/native/quest/subquest/gridania/SubFst013.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp similarity index 100% rename from scripts/native/quest/subquest/gridania/SubFst013.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp