Organize dScripts (#814)

* Organize dScripts whitespace Remove parent scope Remove parent scope from initial setter Remove debug Remove helper programs * Fix NtImagimeterVisibility script Co-authored-by: aronwk-aaron <[email protected]>
DarkflameUniverse · Nov 3, 2022 · 8d37d9b · 8d37d9b
1 parent b974eed
commit 8d37d9b
Show file tree

Hide file tree

Showing 567 changed files with 886 additions and 252 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -165,6 +165,74 @@ set(INCLUDED_DIRECTORIES
 	"dDatabase/Tables"
 	"dNet"
 	"dScripts"
+	"dScripts/02_server"
+	"dScripts/ai"
+	"dScripts/client"
+	"dScripts/EquipmentScripts"
+	"dScripts/zone"
+	"dScripts/02_server/DLU"
+	"dScripts/02_server/Enemy"
+	"dScripts/02_server/Equipment"
+	"dScripts/02_server/Map"
+	"dScripts/02_server/Minigame"
+	"dScripts/02_server/Objects"
+	"dScripts/02_server/Pets"
+	"dScripts/02_server/Enemy/AG"
+	"dScripts/02_server/Enemy/AM"
+	"dScripts/02_server/Enemy/FV"
+	"dScripts/02_server/Enemy/General"
+	"dScripts/02_server/Enemy/Survival"
+	"dScripts/02_server/Enemy/VE"
+	"dScripts/02_server/Enemy/Waves"
+	"dScripts/02_server/Map/AG"
+	"dScripts/02_server/Map/AG_Spider_Queen"
+	"dScripts/02_server/Map/AM"
+	"dScripts/02_server/Map/FV"
+	"dScripts/02_server/Map/General"
+	"dScripts/02_server/Map/GF"
+	"dScripts/02_server/Map/njhub"
+	"dScripts/02_server/Map/NS"
+	"dScripts/02_server/Map/NT"
+	"dScripts/02_server/Map/PR"
+	"dScripts/02_server/Map/Property"
+	"dScripts/02_server/Map/SS"
+	"dScripts/02_server/Map/VE"
+	"dScripts/02_server/Map/FV/Racing"
+	"dScripts/02_server/Map/General/Ninjago"
+	"dScripts/02_server/Map/njhub/boss_instance"
+	"dScripts/02_server/Map/NS/Waves"
+	"dScripts/02_server/Map/Property/AG_Med"
+	"dScripts/02_server/Map/Property/AG_Small"
+	"dScripts/02_server/Map/Property/NS_Med"
+	"dScripts/02_server/Minigame/General"
+	"dScripts/ai/ACT"
+	"dScripts/ai/AG"
+	"dScripts/ai/FV"
+	"dScripts/ai/GENERAL"
+	"dScripts/ai/GF"
+	"dScripts/ai/MINIGAME"
+	"dScripts/ai/NP"
+	"dScripts/ai/NS"
+	"dScripts/ai/PETS"
+	"dScripts/ai/PROPERTY"
+	"dScripts/ai/RACING"
+	"dScripts/ai/SPEC"
+	"dScripts/ai/WILD"
+	"dScripts/ai/ACT/FootRace"
+	"dScripts/ai/MINIGAME/SG_GF"
+	"dScripts/ai/MINIGAME/SG_GF/SERVER"
+	"dScripts/ai/NS/NS_PP_01"
+	"dScripts/ai/NS/WH"
+	"dScripts/ai/PROPERTY/AG"
+	"dScripts/ai/RACING/OBJECTS"
+	"dScripts/client/ai"
+	"dScripts/client/ai/PR"
+	"dScripts/zone/AG"
+	"dScripts/zone/LUPs"
+	"dScripts/zone/PROPERTY"
+	"dScripts/zone/PROPERTY/FV"
+	"dScripts/zone/PROPERTY/GF"
+	"dScripts/zone/PROPERTY/NS"
 
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"

diff --git a/dGame/CMakeLists.txt b/dGame/CMakeLists.txt
@@ -50,14 +50,13 @@ foreach(file ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dPropertyBehaviors/${file}")
 endforeach()
 
-
 add_subdirectory(dUtilities)
 
 foreach(file ${DGAME_DUTILITIES_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dUtilities/${file}")
 endforeach()
 
-foreach(file ${DSCRIPT_SOURCES})
+foreach(file ${DSCRIPTS_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "${PROJECT_SOURCE_DIR}/dScripts/${file}")
 endforeach()
 

diff --git a/dScripts/02_server/CMakeLists.txt b/dScripts/02_server/CMakeLists.txt
@@ -0,0 +1,45 @@
+set(DSCRIPTS_SOURCES_02_SERVER)
+
+add_subdirectory(DLU)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_DLU})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "DLU/${file}")
+endforeach()
+
+add_subdirectory(Enemy)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Enemy/${file}")
+endforeach()
+
+add_subdirectory(Equipment)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_EQUIPMENT})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Equipment/${file}")
+endforeach()
+
+add_subdirectory(Map)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Map/${file}")
+endforeach()
+
+add_subdirectory(Minigame)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MINIGAME})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Minigame/${file}")
+endforeach()
+
+add_subdirectory(Objects)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_OBJECTS})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Objects/${file}")
+endforeach()
+
+add_subdirectory(Pets)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_PETS})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Pets/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} PARENT_SCOPE)
diff --git a/dScripts/02_server/DLU/CMakeLists.txt b/dScripts/02_server/DLU/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_DLU 
+	"DLUVanityNPC.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/DLUVanityNPC.cpp → dScripts/02_server/DLU/DLUVanityNPC.cpp b/dScripts/DLUVanityNPC.cpp → dScripts/02_server/DLU/DLUVanityNPC.cpp
diff --git a/dScripts/DLUVanityNPC.h → dScripts/02_server/DLU/DLUVanityNPC.h b/dScripts/DLUVanityNPC.h → dScripts/02_server/DLU/DLUVanityNPC.h
diff --git a/dScripts/BossSpiderQueenEnemyServer.cpp → ...r/Enemy/AG/BossSpiderQueenEnemyServer.cpp b/dScripts/BossSpiderQueenEnemyServer.cpp → ...r/Enemy/AG/BossSpiderQueenEnemyServer.cpp
diff --git a/dScripts/BossSpiderQueenEnemyServer.h → ...ver/Enemy/AG/BossSpiderQueenEnemyServer.h b/dScripts/BossSpiderQueenEnemyServer.h → ...ver/Enemy/AG/BossSpiderQueenEnemyServer.h
diff --git a/dScripts/02_server/Enemy/AG/CMakeLists.txt b/dScripts/02_server/Enemy/AG/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_AG 
+	"BossSpiderQueenEnemyServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/AmDarklingDragon.cpp → ...s/02_server/Enemy/AM/AmDarklingDragon.cpp b/dScripts/AmDarklingDragon.cpp → ...s/02_server/Enemy/AM/AmDarklingDragon.cpp
diff --git a/dScripts/AmDarklingDragon.h → ...pts/02_server/Enemy/AM/AmDarklingDragon.h b/dScripts/AmDarklingDragon.h → ...pts/02_server/Enemy/AM/AmDarklingDragon.h
diff --git a/dScripts/AmDarklingMech.cpp → ...pts/02_server/Enemy/AM/AmDarklingMech.cpp b/dScripts/AmDarklingMech.cpp → ...pts/02_server/Enemy/AM/AmDarklingMech.cpp
diff --git a/dScripts/AmDarklingMech.h → dScripts/02_server/Enemy/AM/AmDarklingMech.h b/dScripts/AmDarklingMech.h → dScripts/02_server/Enemy/AM/AmDarklingMech.h
diff --git a/dScripts/AmSkeletonEngineer.cpp → ...02_server/Enemy/AM/AmSkeletonEngineer.cpp b/dScripts/AmSkeletonEngineer.cpp → ...02_server/Enemy/AM/AmSkeletonEngineer.cpp
diff --git a/dScripts/AmSkeletonEngineer.h → ...s/02_server/Enemy/AM/AmSkeletonEngineer.h b/dScripts/AmSkeletonEngineer.h → ...s/02_server/Enemy/AM/AmSkeletonEngineer.h
diff --git a/dScripts/02_server/Enemy/AM/CMakeLists.txt b/dScripts/02_server/Enemy/AM/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_AM 
+	"AmDarklingMech.cpp"
+	"AmSkeletonEngineer.cpp"
+	"AmDarklingDragon.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/CMakeLists.txt b/dScripts/02_server/Enemy/CMakeLists.txt
@@ -0,0 +1,45 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY)
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_AG})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "AG/${file}")
+endforeach()
+
+add_subdirectory(AM)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_AM})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "AM/${file}")
+endforeach()
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_FV})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "FV/${file}")
+endforeach()
+
+add_subdirectory(General)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_GENERAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "General/${file}")
+endforeach()
+
+add_subdirectory(Survival)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_SURVIVAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "Survival/${file}")
+endforeach()
+
+add_subdirectory(VE)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_VE})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "VE/${file}")
+endforeach()
+
+add_subdirectory(Waves)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_WAVES})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "Waves/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/FV/CMakeLists.txt b/dScripts/02_server/Enemy/FV/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_FV 
+	"FvMaelstromCavalry.cpp"
+	"FvMaelstromDragon.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/FvMaelstromCavalry.cpp → ...02_server/Enemy/FV/FvMaelstromCavalry.cpp b/dScripts/FvMaelstromCavalry.cpp → ...02_server/Enemy/FV/FvMaelstromCavalry.cpp
diff --git a/dScripts/FvMaelstromCavalry.h → ...s/02_server/Enemy/FV/FvMaelstromCavalry.h b/dScripts/FvMaelstromCavalry.h → ...s/02_server/Enemy/FV/FvMaelstromCavalry.h
diff --git a/dScripts/FvMaelstromDragon.cpp → .../02_server/Enemy/FV/FvMaelstromDragon.cpp b/dScripts/FvMaelstromDragon.cpp → .../02_server/Enemy/FV/FvMaelstromDragon.cpp
diff --git a/dScripts/FvMaelstromDragon.h → ...ts/02_server/Enemy/FV/FvMaelstromDragon.h b/dScripts/FvMaelstromDragon.h → ...ts/02_server/Enemy/FV/FvMaelstromDragon.h
diff --git a/dScripts/BaseEnemyApe.cpp → .../02_server/Enemy/General/BaseEnemyApe.cpp b/dScripts/BaseEnemyApe.cpp → .../02_server/Enemy/General/BaseEnemyApe.cpp
diff --git a/dScripts/BaseEnemyApe.h → ...ts/02_server/Enemy/General/BaseEnemyApe.h b/dScripts/BaseEnemyApe.h → ...ts/02_server/Enemy/General/BaseEnemyApe.h
diff --git a/dScripts/BaseEnemyMech.cpp → ...02_server/Enemy/General/BaseEnemyMech.cpp b/dScripts/BaseEnemyMech.cpp → ...02_server/Enemy/General/BaseEnemyMech.cpp
diff --git a/dScripts/BaseEnemyMech.h → ...s/02_server/Enemy/General/BaseEnemyMech.h b/dScripts/BaseEnemyMech.h → ...s/02_server/Enemy/General/BaseEnemyMech.h
diff --git a/dScripts/02_server/Enemy/General/CMakeLists.txt b/dScripts/02_server/Enemy/General/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_GENERAL 
+	"BaseEnemyMech.cpp"
+	"BaseEnemyApe.cpp"
+	"GfApeSmashingQB.cpp"
+	"TreasureChestDragonServer.cpp"
+	"EnemyNjBuff.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/EnemyNjBuff.cpp → ...s/02_server/Enemy/General/EnemyNjBuff.cpp b/dScripts/EnemyNjBuff.cpp → ...s/02_server/Enemy/General/EnemyNjBuff.cpp
diff --git a/dScripts/EnemyNjBuff.h → ...pts/02_server/Enemy/General/EnemyNjBuff.h b/dScripts/EnemyNjBuff.h → ...pts/02_server/Enemy/General/EnemyNjBuff.h
diff --git a/dScripts/GfApeSmashingQB.cpp → ..._server/Enemy/General/GfApeSmashingQB.cpp b/dScripts/GfApeSmashingQB.cpp → ..._server/Enemy/General/GfApeSmashingQB.cpp
diff --git a/dScripts/GfApeSmashingQB.h → ...02_server/Enemy/General/GfApeSmashingQB.h b/dScripts/GfApeSmashingQB.h → ...02_server/Enemy/General/GfApeSmashingQB.h
diff --git a/dScripts/TreasureChestDragonServer.cpp → ...emy/General/TreasureChestDragonServer.cpp b/dScripts/TreasureChestDragonServer.cpp → ...emy/General/TreasureChestDragonServer.cpp
diff --git a/dScripts/TreasureChestDragonServer.h → ...Enemy/General/TreasureChestDragonServer.h b/dScripts/TreasureChestDragonServer.h → ...Enemy/General/TreasureChestDragonServer.h
diff --git a/dScripts/AgSurvivalMech.cpp → ..._server/Enemy/Survival/AgSurvivalMech.cpp b/dScripts/AgSurvivalMech.cpp → ..._server/Enemy/Survival/AgSurvivalMech.cpp
diff --git a/dScripts/AgSurvivalMech.h → ...02_server/Enemy/Survival/AgSurvivalMech.h b/dScripts/AgSurvivalMech.h → ...02_server/Enemy/Survival/AgSurvivalMech.h
diff --git a/dScripts/AgSurvivalSpiderling.cpp → ...r/Enemy/Survival/AgSurvivalSpiderling.cpp b/dScripts/AgSurvivalSpiderling.cpp → ...r/Enemy/Survival/AgSurvivalSpiderling.cpp
diff --git a/dScripts/AgSurvivalSpiderling.h → ...ver/Enemy/Survival/AgSurvivalSpiderling.h b/dScripts/AgSurvivalSpiderling.h → ...ver/Enemy/Survival/AgSurvivalSpiderling.h
diff --git a/dScripts/AgSurvivalStromling.cpp → ...er/Enemy/Survival/AgSurvivalStromling.cpp b/dScripts/AgSurvivalStromling.cpp → ...er/Enemy/Survival/AgSurvivalStromling.cpp
diff --git a/dScripts/AgSurvivalStromling.h → ...rver/Enemy/Survival/AgSurvivalStromling.h b/dScripts/AgSurvivalStromling.h → ...rver/Enemy/Survival/AgSurvivalStromling.h
diff --git a/dScripts/02_server/Enemy/Survival/CMakeLists.txt b/dScripts/02_server/Enemy/Survival/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_SURVIVAL 
+	"AgSurvivalStromling.cpp"
+	"AgSurvivalMech.cpp"
+	"AgSurvivalSpiderling.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/VE/CMakeLists.txt b/dScripts/02_server/Enemy/VE/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_VE 
+	"VeMech.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/VeMech.cpp → dScripts/02_server/Enemy/VE/VeMech.cpp b/dScripts/VeMech.cpp → dScripts/02_server/Enemy/VE/VeMech.cpp
diff --git a/dScripts/VeMech.h → dScripts/02_server/Enemy/VE/VeMech.h b/dScripts/VeMech.h → dScripts/02_server/Enemy/VE/VeMech.h
diff --git a/dScripts/02_server/Enemy/Waves/CMakeLists.txt b/dScripts/02_server/Enemy/Waves/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_WAVES 
+	"WaveBossHammerling.cpp"
+	"WaveBossApe.cpp"
+	"WaveBossSpiderling.cpp"
+	"WaveBossHorsemen.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/WaveBossApe.cpp → ...pts/02_server/Enemy/Waves/WaveBossApe.cpp b/dScripts/WaveBossApe.cpp → ...pts/02_server/Enemy/Waves/WaveBossApe.cpp
diff --git a/dScripts/WaveBossApe.h → dScripts/02_server/Enemy/Waves/WaveBossApe.h b/dScripts/WaveBossApe.h → dScripts/02_server/Enemy/Waves/WaveBossApe.h
diff --git a/dScripts/WaveBossHammerling.cpp → ...server/Enemy/Waves/WaveBossHammerling.cpp b/dScripts/WaveBossHammerling.cpp → ...server/Enemy/Waves/WaveBossHammerling.cpp
diff --git a/dScripts/WaveBossHammerling.h → ...2_server/Enemy/Waves/WaveBossHammerling.h b/dScripts/WaveBossHammerling.h → ...2_server/Enemy/Waves/WaveBossHammerling.h
diff --git a/dScripts/WaveBossHorsemen.cpp → ...2_server/Enemy/Waves/WaveBossHorsemen.cpp b/dScripts/WaveBossHorsemen.cpp → ...2_server/Enemy/Waves/WaveBossHorsemen.cpp
diff --git a/dScripts/WaveBossHorsemen.h → .../02_server/Enemy/Waves/WaveBossHorsemen.h b/dScripts/WaveBossHorsemen.h → .../02_server/Enemy/Waves/WaveBossHorsemen.h
diff --git a/dScripts/WaveBossSpiderling.cpp → ...server/Enemy/Waves/WaveBossSpiderling.cpp b/dScripts/WaveBossSpiderling.cpp → ...server/Enemy/Waves/WaveBossSpiderling.cpp
diff --git a/dScripts/WaveBossSpiderling.h → ...2_server/Enemy/Waves/WaveBossSpiderling.h b/dScripts/WaveBossSpiderling.h → ...2_server/Enemy/Waves/WaveBossSpiderling.h
diff --git a/dScripts/BootyDigServer.cpp → ...ts/02_server/Equipment/BootyDigServer.cpp b/dScripts/BootyDigServer.cpp → ...ts/02_server/Equipment/BootyDigServer.cpp
diff --git a/dScripts/BootyDigServer.h → ...ipts/02_server/Equipment/BootyDigServer.h b/dScripts/BootyDigServer.h → ...ipts/02_server/Equipment/BootyDigServer.h
diff --git a/dScripts/02_server/Equipment/CMakeLists.txt b/dScripts/02_server/Equipment/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_EQUIPMENT 
+	"MaestromExtracticatorServer.cpp"
+	"BootyDigServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/MaestromExtracticatorServer.cpp → ...Equipment/MaestromExtracticatorServer.cpp b/dScripts/MaestromExtracticatorServer.cpp → ...Equipment/MaestromExtracticatorServer.cpp
diff --git a/dScripts/MaestromExtracticatorServer.h → ...r/Equipment/MaestromExtracticatorServer.h b/dScripts/MaestromExtracticatorServer.h → ...r/Equipment/MaestromExtracticatorServer.h
diff --git a/dScripts/AgBugsprayer.cpp → dScripts/02_server/Map/AG/AgBugsprayer.cpp b/dScripts/AgBugsprayer.cpp → dScripts/02_server/Map/AG/AgBugsprayer.cpp
diff --git a/dScripts/AgBugsprayer.h → dScripts/02_server/Map/AG/AgBugsprayer.h b/dScripts/AgBugsprayer.h → dScripts/02_server/Map/AG/AgBugsprayer.h
diff --git a/dScripts/AgCagedBricksServer.cpp → .../02_server/Map/AG/AgCagedBricksServer.cpp b/dScripts/AgCagedBricksServer.cpp → .../02_server/Map/AG/AgCagedBricksServer.cpp
diff --git a/dScripts/AgCagedBricksServer.h → ...ts/02_server/Map/AG/AgCagedBricksServer.h b/dScripts/AgCagedBricksServer.h → ...ts/02_server/Map/AG/AgCagedBricksServer.h
diff --git a/dScripts/AgLaserSensorServer.cpp → .../02_server/Map/AG/AgLaserSensorServer.cpp b/dScripts/AgLaserSensorServer.cpp → .../02_server/Map/AG/AgLaserSensorServer.cpp
diff --git a/dScripts/AgLaserSensorServer.h → ...ts/02_server/Map/AG/AgLaserSensorServer.h b/dScripts/AgLaserSensorServer.h → ...ts/02_server/Map/AG/AgLaserSensorServer.h
diff --git a/dScripts/AgMonumentBirds.cpp → ...ipts/02_server/Map/AG/AgMonumentBirds.cpp b/dScripts/AgMonumentBirds.cpp → ...ipts/02_server/Map/AG/AgMonumentBirds.cpp
diff --git a/dScripts/AgMonumentBirds.h → dScripts/02_server/Map/AG/AgMonumentBirds.h b/dScripts/AgMonumentBirds.h → dScripts/02_server/Map/AG/AgMonumentBirds.h
diff --git a/dScripts/AgMonumentLaserServer.cpp → ...2_server/Map/AG/AgMonumentLaserServer.cpp b/dScripts/AgMonumentLaserServer.cpp → ...2_server/Map/AG/AgMonumentLaserServer.cpp
diff --git a/dScripts/AgMonumentLaserServer.h → .../02_server/Map/AG/AgMonumentLaserServer.h b/dScripts/AgMonumentLaserServer.h → .../02_server/Map/AG/AgMonumentLaserServer.h
diff --git a/dScripts/AgMonumentRaceCancel.cpp → ...02_server/Map/AG/AgMonumentRaceCancel.cpp b/dScripts/AgMonumentRaceCancel.cpp → ...02_server/Map/AG/AgMonumentRaceCancel.cpp
diff --git a/dScripts/AgMonumentRaceCancel.h → ...s/02_server/Map/AG/AgMonumentRaceCancel.h b/dScripts/AgMonumentRaceCancel.h → ...s/02_server/Map/AG/AgMonumentRaceCancel.h
diff --git a/dScripts/AgMonumentRaceGoal.cpp → ...s/02_server/Map/AG/AgMonumentRaceGoal.cpp b/dScripts/AgMonumentRaceGoal.cpp → ...s/02_server/Map/AG/AgMonumentRaceGoal.cpp
diff --git a/dScripts/AgMonumentRaceGoal.h → ...pts/02_server/Map/AG/AgMonumentRaceGoal.h b/dScripts/AgMonumentRaceGoal.h → ...pts/02_server/Map/AG/AgMonumentRaceGoal.h
diff --git a/dScripts/02_server/Map/AG/CMakeLists.txt b/dScripts/02_server/Map/AG/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG 
+	"AgCagedBricksServer.cpp"
+	"NpcWispServer.cpp"
+	"NpcEpsilonServer.cpp"
+	"AgLaserSensorServer.cpp"
+	"AgMonumentLaserServer.cpp"
+	"AgMonumentBirds.cpp"
+	"RemoveRentalGear.cpp"
+	"NpcNjAssistantServer.cpp"
+	"AgBugsprayer.cpp"
+	"NpcAgCourseStarter.cpp"
+	"AgMonumentRaceGoal.cpp"
+	"AgMonumentRaceCancel.cpp"
+	"NpcCowboyServer.cpp"
+	"NpcPirateServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NpcAgCourseStarter.cpp → ...s/02_server/Map/AG/NpcAgCourseStarter.cpp b/dScripts/NpcAgCourseStarter.cpp → ...s/02_server/Map/AG/NpcAgCourseStarter.cpp
diff --git a/dScripts/NpcAgCourseStarter.h → ...pts/02_server/Map/AG/NpcAgCourseStarter.h b/dScripts/NpcAgCourseStarter.h → ...pts/02_server/Map/AG/NpcAgCourseStarter.h
diff --git a/dScripts/NpcCowboyServer.cpp → ...ipts/02_server/Map/AG/NpcCowboyServer.cpp b/dScripts/NpcCowboyServer.cpp → ...ipts/02_server/Map/AG/NpcCowboyServer.cpp
diff --git a/dScripts/NpcCowboyServer.h → dScripts/02_server/Map/AG/NpcCowboyServer.h b/dScripts/NpcCowboyServer.h → dScripts/02_server/Map/AG/NpcCowboyServer.h
diff --git a/dScripts/NpcEpsilonServer.cpp → ...pts/02_server/Map/AG/NpcEpsilonServer.cpp b/dScripts/NpcEpsilonServer.cpp → ...pts/02_server/Map/AG/NpcEpsilonServer.cpp
diff --git a/dScripts/NpcEpsilonServer.h → dScripts/02_server/Map/AG/NpcEpsilonServer.h b/dScripts/NpcEpsilonServer.h → dScripts/02_server/Map/AG/NpcEpsilonServer.h
diff --git a/dScripts/NpcNjAssistantServer.cpp → ...02_server/Map/AG/NpcNjAssistantServer.cpp b/dScripts/NpcNjAssistantServer.cpp → ...02_server/Map/AG/NpcNjAssistantServer.cpp
diff --git a/dScripts/NpcNjAssistantServer.h → ...s/02_server/Map/AG/NpcNjAssistantServer.h b/dScripts/NpcNjAssistantServer.h → ...s/02_server/Map/AG/NpcNjAssistantServer.h
diff --git a/dScripts/NpcPirateServer.cpp → ...ipts/02_server/Map/AG/NpcPirateServer.cpp b/dScripts/NpcPirateServer.cpp → ...ipts/02_server/Map/AG/NpcPirateServer.cpp
diff --git a/dScripts/NpcPirateServer.h → dScripts/02_server/Map/AG/NpcPirateServer.h b/dScripts/NpcPirateServer.h → dScripts/02_server/Map/AG/NpcPirateServer.h
diff --git a/dScripts/NpcWispServer.cpp → dScripts/02_server/Map/AG/NpcWispServer.cpp b/dScripts/NpcWispServer.cpp → dScripts/02_server/Map/AG/NpcWispServer.cpp
diff --git a/dScripts/NpcWispServer.h → dScripts/02_server/Map/AG/NpcWispServer.h b/dScripts/NpcWispServer.h → dScripts/02_server/Map/AG/NpcWispServer.h
diff --git a/dScripts/RemoveRentalGear.cpp → ...pts/02_server/Map/AG/RemoveRentalGear.cpp b/dScripts/RemoveRentalGear.cpp → ...pts/02_server/Map/AG/RemoveRentalGear.cpp
diff --git a/dScripts/RemoveRentalGear.h → dScripts/02_server/Map/AG/RemoveRentalGear.h b/dScripts/RemoveRentalGear.h → dScripts/02_server/Map/AG/RemoveRentalGear.h
diff --git a/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt b/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN 
+	"ZoneAgSpiderQueen.cpp"
+	"SpiderBossTreasureChestServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/SpiderBossTreasureChestServer.cpp → ...r_Queen/SpiderBossTreasureChestServer.cpp b/dScripts/SpiderBossTreasureChestServer.cpp → ...r_Queen/SpiderBossTreasureChestServer.cpp
diff --git a/dScripts/SpiderBossTreasureChestServer.h → ...der_Queen/SpiderBossTreasureChestServer.h b/dScripts/SpiderBossTreasureChestServer.h → ...der_Queen/SpiderBossTreasureChestServer.h
diff --git a/dScripts/ZoneAgSpiderQueen.cpp → ...Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp b/dScripts/ZoneAgSpiderQueen.cpp → ...Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
diff --git a/dScripts/ZoneAgSpiderQueen.h → ...r/Map/AG_Spider_Queen/ZoneAgSpiderQueen.h b/dScripts/ZoneAgSpiderQueen.h → ...r/Map/AG_Spider_Queen/ZoneAgSpiderQueen.h
diff --git a/dScripts/AmBlueX.cpp → dScripts/02_server/Map/AM/AmBlueX.cpp b/dScripts/AmBlueX.cpp → dScripts/02_server/Map/AM/AmBlueX.cpp
diff --git a/dScripts/AmBlueX.h → dScripts/02_server/Map/AM/AmBlueX.h b/dScripts/AmBlueX.h → dScripts/02_server/Map/AM/AmBlueX.h
diff --git a/dScripts/AmBridge.cpp → dScripts/02_server/Map/AM/AmBridge.cpp b/dScripts/AmBridge.cpp → dScripts/02_server/Map/AM/AmBridge.cpp
diff --git a/dScripts/AmBridge.h → dScripts/02_server/Map/AM/AmBridge.h b/dScripts/AmBridge.h → dScripts/02_server/Map/AM/AmBridge.h
diff --git a/dScripts/AmConsoleTeleportServer.cpp → ...server/Map/AM/AmConsoleTeleportServer.cpp b/dScripts/AmConsoleTeleportServer.cpp → ...server/Map/AM/AmConsoleTeleportServer.cpp
diff --git a/dScripts/AmConsoleTeleportServer.h → ...2_server/Map/AM/AmConsoleTeleportServer.h b/dScripts/AmConsoleTeleportServer.h → ...2_server/Map/AM/AmConsoleTeleportServer.h
diff --git a/dScripts/AmDrawBridge.cpp → dScripts/02_server/Map/AM/AmDrawBridge.cpp b/dScripts/AmDrawBridge.cpp → dScripts/02_server/Map/AM/AmDrawBridge.cpp
diff --git a/dScripts/AmDrawBridge.h → dScripts/02_server/Map/AM/AmDrawBridge.h b/dScripts/AmDrawBridge.h → dScripts/02_server/Map/AM/AmDrawBridge.h
diff --git a/dScripts/AmDropshipComputer.cpp → ...s/02_server/Map/AM/AmDropshipComputer.cpp b/dScripts/AmDropshipComputer.cpp → ...s/02_server/Map/AM/AmDropshipComputer.cpp
diff --git a/dScripts/AmDropshipComputer.h → ...pts/02_server/Map/AM/AmDropshipComputer.h b/dScripts/AmDropshipComputer.h → ...pts/02_server/Map/AM/AmDropshipComputer.h
diff --git a/dScripts/AmScrollReaderServer.cpp → ...02_server/Map/AM/AmScrollReaderServer.cpp b/dScripts/AmScrollReaderServer.cpp → ...02_server/Map/AM/AmScrollReaderServer.cpp
diff --git a/dScripts/AmScrollReaderServer.h → ...s/02_server/Map/AM/AmScrollReaderServer.h b/dScripts/AmScrollReaderServer.h → ...s/02_server/Map/AM/AmScrollReaderServer.h
diff --git a/dScripts/AmShieldGenerator.cpp → ...ts/02_server/Map/AM/AmShieldGenerator.cpp b/dScripts/AmShieldGenerator.cpp → ...ts/02_server/Map/AM/AmShieldGenerator.cpp
diff --git a/dScripts/AmShieldGenerator.h → ...ipts/02_server/Map/AM/AmShieldGenerator.h b/dScripts/AmShieldGenerator.h → ...ipts/02_server/Map/AM/AmShieldGenerator.h
diff --git a/dScripts/AmShieldGeneratorQuickbuild.cpp → ...er/Map/AM/AmShieldGeneratorQuickbuild.cpp b/dScripts/AmShieldGeneratorQuickbuild.cpp → ...er/Map/AM/AmShieldGeneratorQuickbuild.cpp
diff --git a/dScripts/AmShieldGeneratorQuickbuild.h → ...rver/Map/AM/AmShieldGeneratorQuickbuild.h b/dScripts/AmShieldGeneratorQuickbuild.h → ...rver/Map/AM/AmShieldGeneratorQuickbuild.h
diff --git a/dScripts/AmSkullkinDrill.cpp → ...ipts/02_server/Map/AM/AmSkullkinDrill.cpp b/dScripts/AmSkullkinDrill.cpp → ...ipts/02_server/Map/AM/AmSkullkinDrill.cpp
diff --git a/dScripts/AmSkullkinDrill.h → dScripts/02_server/Map/AM/AmSkullkinDrill.h b/dScripts/AmSkullkinDrill.h → dScripts/02_server/Map/AM/AmSkullkinDrill.h
diff --git a/dScripts/AmSkullkinDrillStand.cpp → ...02_server/Map/AM/AmSkullkinDrillStand.cpp b/dScripts/AmSkullkinDrillStand.cpp → ...02_server/Map/AM/AmSkullkinDrillStand.cpp
diff --git a/dScripts/AmSkullkinDrillStand.h → ...s/02_server/Map/AM/AmSkullkinDrillStand.h b/dScripts/AmSkullkinDrillStand.h → ...s/02_server/Map/AM/AmSkullkinDrillStand.h
diff --git a/dScripts/AmSkullkinTower.cpp → ...ipts/02_server/Map/AM/AmSkullkinTower.cpp b/dScripts/AmSkullkinTower.cpp → ...ipts/02_server/Map/AM/AmSkullkinTower.cpp
diff --git a/dScripts/AmSkullkinTower.h → dScripts/02_server/Map/AM/AmSkullkinTower.h b/dScripts/AmSkullkinTower.h → dScripts/02_server/Map/AM/AmSkullkinTower.h
diff --git a/dScripts/AmTeapotServer.cpp → dScripts/02_server/Map/AM/AmTeapotServer.cpp b/dScripts/AmTeapotServer.cpp → dScripts/02_server/Map/AM/AmTeapotServer.cpp
diff --git a/dScripts/AmTeapotServer.h → dScripts/02_server/Map/AM/AmTeapotServer.h b/dScripts/AmTeapotServer.h → dScripts/02_server/Map/AM/AmTeapotServer.h
diff --git a/dScripts/AmTemplateSkillVolume.cpp → ...2_server/Map/AM/AmTemplateSkillVolume.cpp b/dScripts/AmTemplateSkillVolume.cpp → ...2_server/Map/AM/AmTemplateSkillVolume.cpp
diff --git a/dScripts/AmTemplateSkillVolume.h → .../02_server/Map/AM/AmTemplateSkillVolume.h b/dScripts/AmTemplateSkillVolume.h → .../02_server/Map/AM/AmTemplateSkillVolume.h
diff --git a/dScripts/02_server/Map/AM/CMakeLists.txt b/dScripts/02_server/Map/AM/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM 
+	"AmConsoleTeleportServer.cpp"
+	"RandomSpawnerFin.cpp"
+	"RandomSpawnerPit.cpp"
+	"RandomSpawnerStr.cpp"
+	"RandomSpawnerZip.cpp"
+	"AmBridge.cpp"
+	"AmDrawBridge.cpp"
+	"AmShieldGenerator.cpp"
+	"AmShieldGeneratorQuickbuild.cpp"
+	"AmDropshipComputer.cpp"
+	"AmScrollReaderServer.cpp"
+	"AmTemplateSkillVolume.cpp"
+	"AmSkullkinDrill.cpp"
+	"AmSkullkinDrillStand.cpp"
+	"AmSkullkinTower.cpp"
+	"AmBlueX.cpp"
+	"AmTeapotServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/RandomSpawnerFin.cpp → ...pts/02_server/Map/AM/RandomSpawnerFin.cpp b/dScripts/RandomSpawnerFin.cpp → ...pts/02_server/Map/AM/RandomSpawnerFin.cpp
diff --git a/dScripts/RandomSpawnerFin.h → dScripts/02_server/Map/AM/RandomSpawnerFin.h b/dScripts/RandomSpawnerFin.h → dScripts/02_server/Map/AM/RandomSpawnerFin.h
diff --git a/dScripts/RandomSpawnerPit.cpp → ...pts/02_server/Map/AM/RandomSpawnerPit.cpp b/dScripts/RandomSpawnerPit.cpp → ...pts/02_server/Map/AM/RandomSpawnerPit.cpp
diff --git a/dScripts/RandomSpawnerPit.h → dScripts/02_server/Map/AM/RandomSpawnerPit.h b/dScripts/RandomSpawnerPit.h → dScripts/02_server/Map/AM/RandomSpawnerPit.h
diff --git a/dScripts/RandomSpawnerStr.cpp → ...pts/02_server/Map/AM/RandomSpawnerStr.cpp b/dScripts/RandomSpawnerStr.cpp → ...pts/02_server/Map/AM/RandomSpawnerStr.cpp
diff --git a/dScripts/RandomSpawnerStr.h → dScripts/02_server/Map/AM/RandomSpawnerStr.h b/dScripts/RandomSpawnerStr.h → dScripts/02_server/Map/AM/RandomSpawnerStr.h
diff --git a/dScripts/RandomSpawnerZip.cpp → ...pts/02_server/Map/AM/RandomSpawnerZip.cpp b/dScripts/RandomSpawnerZip.cpp → ...pts/02_server/Map/AM/RandomSpawnerZip.cpp
diff --git a/dScripts/RandomSpawnerZip.h → dScripts/02_server/Map/AM/RandomSpawnerZip.h b/dScripts/RandomSpawnerZip.h → dScripts/02_server/Map/AM/RandomSpawnerZip.h
diff --git a/dScripts/02_server/Map/CMakeLists.txt b/dScripts/02_server/Map/CMakeLists.txt
@@ -0,0 +1,81 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP)
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AG/${file}")
+endforeach()
+
+add_subdirectory(AG_Spider_Queen)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AG_Spider_Queen/${file}")
+endforeach()
+
+add_subdirectory(AM)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AM/${file}")
+endforeach()
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "FV/${file}")
+endforeach()
+
+add_subdirectory(General)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "General/${file}")
+endforeach()
+
+add_subdirectory(GF)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GF})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "GF/${file}")
+endforeach()
+
+add_subdirectory(njhub)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "njhub/${file}")
+endforeach()
+
+add_subdirectory(NS)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "NS/${file}")
+endforeach()
+
+add_subdirectory(NT)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NT})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "NT/${file}")
+endforeach()
+
+add_subdirectory(PR)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PR})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "PR/${file}")
+endforeach()
+
+add_subdirectory(Property)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "Property/${file}")
+endforeach()
+
+add_subdirectory(SS)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_SS})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "SS/${file}")
+endforeach()
+
+add_subdirectory(VE)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_VE})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "VE/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} PARENT_SCOPE)
diff --git a/dScripts/02_server/Map/FV/CMakeLists.txt b/dScripts/02_server/Map/FV/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV
+	"EnemyRoninSpawner.cpp"
+	"FvCandle.cpp"
+	"FvFong.cpp"
+	"FvHorsemenTrigger.cpp"
+	"ImgBrickConsoleQB.cpp")
+
+add_subdirectory(Racing)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV} "Racing/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV} PARENT_SCOPE)
diff --git a/dScripts/EnemyRoninSpawner.cpp → ...ts/02_server/Map/FV/EnemyRoninSpawner.cpp b/dScripts/EnemyRoninSpawner.cpp → ...ts/02_server/Map/FV/EnemyRoninSpawner.cpp
diff --git a/dScripts/EnemyRoninSpawner.h → ...ipts/02_server/Map/FV/EnemyRoninSpawner.h b/dScripts/EnemyRoninSpawner.h → ...ipts/02_server/Map/FV/EnemyRoninSpawner.h
diff --git a/dScripts/FvCandle.cpp → dScripts/02_server/Map/FV/FvCandle.cpp b/dScripts/FvCandle.cpp → dScripts/02_server/Map/FV/FvCandle.cpp
diff --git a/dScripts/FvCandle.h → dScripts/02_server/Map/FV/FvCandle.h b/dScripts/FvCandle.h → dScripts/02_server/Map/FV/FvCandle.h
diff --git a/dScripts/FvFong.cpp → dScripts/02_server/Map/FV/FvFong.cpp b/dScripts/FvFong.cpp → dScripts/02_server/Map/FV/FvFong.cpp
diff --git a/dScripts/FvFong.h → dScripts/02_server/Map/FV/FvFong.h b/dScripts/FvFong.h → dScripts/02_server/Map/FV/FvFong.h
diff --git a/dScripts/FvHorsemenTrigger.cpp → ...ts/02_server/Map/FV/FvHorsemenTrigger.cpp b/dScripts/FvHorsemenTrigger.cpp → ...ts/02_server/Map/FV/FvHorsemenTrigger.cpp
diff --git a/dScripts/FvHorsemenTrigger.h → ...ipts/02_server/Map/FV/FvHorsemenTrigger.h b/dScripts/FvHorsemenTrigger.h → ...ipts/02_server/Map/FV/FvHorsemenTrigger.h
diff --git a/dScripts/ImgBrickConsoleQB.cpp → ...ts/02_server/Map/FV/ImgBrickConsoleQB.cpp b/dScripts/ImgBrickConsoleQB.cpp → ...ts/02_server/Map/FV/ImgBrickConsoleQB.cpp
diff --git a/dScripts/ImgBrickConsoleQB.h → ...ipts/02_server/Map/FV/ImgBrickConsoleQB.h b/dScripts/ImgBrickConsoleQB.h → ...ipts/02_server/Map/FV/ImgBrickConsoleQB.h
diff --git a/dScripts/02_server/Map/FV/Racing/CMakeLists.txt b/dScripts/02_server/Map/FV/Racing/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING 
+	"RaceMaelstromGeiser.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/RaceMaelstromGeiser.cpp → ...ver/Map/FV/Racing/RaceMaelstromGeiser.cpp b/dScripts/RaceMaelstromGeiser.cpp → ...ver/Map/FV/Racing/RaceMaelstromGeiser.cpp
diff --git a/dScripts/RaceMaelstromGeiser.h → ...erver/Map/FV/Racing/RaceMaelstromGeiser.h b/dScripts/RaceMaelstromGeiser.h → ...erver/Map/FV/Racing/RaceMaelstromGeiser.h
diff --git a/dScripts/02_server/Map/GF/CMakeLists.txt b/dScripts/02_server/Map/GF/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_GF 
+	"GfTikiTorch.cpp"
+	"GfCaptainsCannon.cpp"
+	"MastTeleport.cpp"
+	"SpawnLionServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/GfCaptainsCannon.cpp → ...pts/02_server/Map/GF/GfCaptainsCannon.cpp b/dScripts/GfCaptainsCannon.cpp → ...pts/02_server/Map/GF/GfCaptainsCannon.cpp
diff --git a/dScripts/GfCaptainsCannon.h → dScripts/02_server/Map/GF/GfCaptainsCannon.h b/dScripts/GfCaptainsCannon.h → dScripts/02_server/Map/GF/GfCaptainsCannon.h
diff --git a/dScripts/GfTikiTorch.cpp → dScripts/02_server/Map/GF/GfTikiTorch.cpp b/dScripts/GfTikiTorch.cpp → dScripts/02_server/Map/GF/GfTikiTorch.cpp
diff --git a/dScripts/GfTikiTorch.h → dScripts/02_server/Map/GF/GfTikiTorch.h b/dScripts/GfTikiTorch.h → dScripts/02_server/Map/GF/GfTikiTorch.h
diff --git a/dScripts/MastTeleport.cpp → dScripts/02_server/Map/GF/MastTeleport.cpp b/dScripts/MastTeleport.cpp → dScripts/02_server/Map/GF/MastTeleport.cpp
diff --git a/dScripts/MastTeleport.h → dScripts/02_server/Map/GF/MastTeleport.h b/dScripts/MastTeleport.h → dScripts/02_server/Map/GF/MastTeleport.h
diff --git a/dScripts/SpawnLionServer.cpp → ...ipts/02_server/Map/GF/SpawnLionServer.cpp b/dScripts/SpawnLionServer.cpp → ...ipts/02_server/Map/GF/SpawnLionServer.cpp
diff --git a/dScripts/SpawnLionServer.h → dScripts/02_server/Map/GF/SpawnLionServer.h b/dScripts/SpawnLionServer.h → dScripts/02_server/Map/GF/SpawnLionServer.h
diff --git a/dScripts/BankInteractServer.cpp → ...server/Map/General/BankInteractServer.cpp b/dScripts/BankInteractServer.cpp → ...server/Map/General/BankInteractServer.cpp
diff --git a/dScripts/BankInteractServer.h → ...2_server/Map/General/BankInteractServer.h b/dScripts/BankInteractServer.h → ...2_server/Map/General/BankInteractServer.h
diff --git a/dScripts/BaseInteractDropLootServer.cpp → ...ap/General/BaseInteractDropLootServer.cpp b/dScripts/BaseInteractDropLootServer.cpp → ...ap/General/BaseInteractDropLootServer.cpp
diff --git a/dScripts/BaseInteractDropLootServer.h → .../Map/General/BaseInteractDropLootServer.h b/dScripts/BaseInteractDropLootServer.h → .../Map/General/BaseInteractDropLootServer.h
diff --git a/dScripts/Binoculars.cpp → ...ipts/02_server/Map/General/Binoculars.cpp b/dScripts/Binoculars.cpp → ...ipts/02_server/Map/General/Binoculars.cpp
diff --git a/dScripts/Binoculars.h → dScripts/02_server/Map/General/Binoculars.h b/dScripts/Binoculars.h → dScripts/02_server/Map/General/Binoculars.h