rework cmake - removed old implementation where files were included in manual "mode"

2026-06-13 03:02:22 -04:00 · 2023-04-22 14:59:08 +03:00
parent 3375f45db2
commit 8ac4b4b110
193 changed files with 529 additions and 3035 deletions
--- a/cmake/CheckSystem.cmake
+++ b/cmake/CheckSystem.cmake
@@ -1,4 +1,5 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
+include_guard(GLOBAL)

 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 20)
--- a/cmake/Modules/AEConfigureArch.cmake
+++ b/cmake/Modules/AEConfigureArch.cmake
@@ -1,4 +1,5 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
+include_guard(GLOBAL)

 # get architecture type and set architecture identifier
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
--- a/cmake/Modules/AEConfigureFiles.cmake
+++ b/cmake/Modules/AEConfigureFiles.cmake
@@ -1,4 +1,5 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
+include_guard(GLOBAL)

 # ASCEMU_NUMBER - for including scripts
 # ASC_VERSION_MAX_LEVEL - for setting the maximum level
--- a/cmake/Modules/AEGitRevision.cmake
+++ b/cmake/Modules/AEGitRevision.cmake
@@ -1,4 +1,5 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
+include_guard(GLOBAL)

 # mark variables as advanced to not get them in gui
 mark_as_advanced(
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -1,4 +1,5 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
+include_guard(GLOBAL)

 if (NOT USE_PCH)
    set(ASCEMU_COMMENT_PCH //)
--- a/dep/bzip2/CMakeLists.txt
+++ b/dep/bzip2/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(bzip2 C)

-set(sources
+set(SRC_BZIP2
    blocksort.c
    bzlib.c
    compress.c
@@ -14,9 +14,7 @@ set(sources
 )

 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(${PROJECT_NAME} STATIC ${sources})
+add_library(${PROJECT_NAME} STATIC ${SRC_BZIP2})
 target_link_libraries(${PROJECT_NAME})
 set(BZIP2_LIBRARIES ${PROJECT_NAME} CACHE INTERNAL "Bzip2 libraries." FORCE)
 set(BZIP2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Bzip2 include dirs." FORCE)
-
-unset(sources)
--- a/dep/dbcfile/CMakeLists.txt
+++ b/dep/dbcfile/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(dbcfile CXX)

-set(sources
+set(SRC_DBCFILE
    dbcfile.cpp
 )

@@ -13,7 +13,5 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-add_library(${PROJECT_NAME} STATIC ${sources})
+add_library(${PROJECT_NAME} STATIC ${SRC_DBCFILE})
 target_link_libraries( ${PROJECT_NAME} loadlib libmpq)
-
-unset(sources)
--- a/dep/g3dlite/CMakeLists.txt
+++ b/dep/g3dlite/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(g3dlite CXX)

-set(sources
+set(SRC_G3DLITE
    AABox.cpp
    Any.cpp
    AnyTableReader.cpp
@@ -54,11 +54,9 @@ include_directories(
    ${ZLIB_INCLUDE_DIRS}
 )

-add_library(${PROJECT_NAME} STATIC ${sources})
+add_library(${PROJECT_NAME} STATIC ${SRC_G3DLITE})

 target_link_libraries(${PROJECT_NAME} 
    ${ZLIB_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
 )
-
-unset(sources)
--- a/dep/loadlib/CMakeLists.txt
+++ b/dep/loadlib/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(loadlib CXX)
-file(GLOB loadlib_source *cpp *.h)
+file(GLOB SRC_LOADLIB *cpp *.h)

 include_directories(
    ${CMAKE_SOURCE_DIR}/dep/libmpq/libmpq
@@ -10,7 +10,5 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-add_library(${PROJECT_NAME} STATIC ${loadlib_source})
+add_library(${PROJECT_NAME} STATIC ${SRC_LOADLIB})
 target_link_libraries(${PROJECT_NAME} libmpq)
-
-unset(loadlib_source)
--- a/dep/zlib/CMakeLists.txt
+++ b/dep/zlib/CMakeLists.txt
@@ -1,8 +1,9 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(zlib C)
-set(sources
+
+set(SRC_ZLIB
    adler32.c
    compress.c
    crc32.c
@@ -23,9 +24,8 @@ set(sources
 )

 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(${PROJECT_NAME} STATIC ${sources} )
+add_library(${PROJECT_NAME} STATIC ${SRC_ZLIB})

 #set it to the project name.
 set(ZLIB_LIBRARIES ${PROJECT_NAME} CACHE INTERNAL "Zlib Libraries")
 set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Zlib include dir" FORCE)
-unset(sources)
--- a/src/collision/CMakeLists.txt
+++ b/src/collision/CMakeLists.txt
@@ -1,19 +1,19 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(collision CXX)

-file(GLOB sources_Management Management/*.cpp Management/*.h)
-file(GLOB sources_Maps Maps/*.cpp Maps/*.h)
-file(GLOB sources_Models Models/*.cpp Models/*.h)
-file(GLOB sources_localdir *.cpp *.h)
+file(GLOB SRC_MANAGEMENT Management/*.cpp Management/*.h)
+file(GLOB SRC_MAPS Maps/*.cpp Maps/*.h)
+file(GLOB SRC_MODELS Models/*.cpp Models/*.h)
+file(GLOB SRC_LOCAL_DIR *.cpp *.h)

-set(COLLISION_STAT_SRCS
-    ${COLLISION_STAT_SRCS}
-    ${sources_Management}
-    ${sources_Maps}
-    ${sources_Models}
-    ${sources_localdir}
+set(COLLISION_SRCS
+    ${COLLISION_SRCS}
+    ${SRC_MANAGEMENT}
+    ${SRC_MAPS}
+    ${SRC_MODELS}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -30,7 +30,7 @@ include_directories(
    ${ZLIB_INCLUDE_DIRS}
 )

-add_library(collision STATIC ${COLLISION_STAT_SRCS})
+add_library(${PROJECT_NAME} STATIC ${COLLISION_SRCS})
 target_link_libraries(collision g3dlite shared)

 # generate precompiled header.
--- a/src/logonserver/Auth/CMakeLists.txt
+++ b/src/logonserver/Auth/CMakeLists.txt
@@ -1,15 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Auth)
-
-set(SRC_AUTH_FILES
-    ${PATH_PREFIX}/AuthSocket.Legacy.cpp
-    ${PATH_PREFIX}/AuthSocket.cpp
-    ${PATH_PREFIX}/AuthSocket.h
-    ${PATH_PREFIX}/AuthStructs.h
-    ${PATH_PREFIX}/AutoPatcher.cpp
-    ${PATH_PREFIX}/AutoPatcher.h
-)
-
-source_group(Auth FILES ${SRC_AUTH_FILES})
-unset(PATH_PREFIX)
--- a/src/logonserver/CMakeLists.txt
+++ b/src/logonserver/CMakeLists.txt
@@ -1,27 +1,23 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(logon CXX)

-include(Auth/CMakeLists.txt)
-include(Console/CMakeLists.txt)
-include(LogonCommServer/CMakeLists.txt)
-include(Realm/CMakeLists.txt)
-include(Server/CMakeLists.txt)
+file(GLOB SRC_AUTH_FILES Auth/*.cpp Auth/*.h Auth/*.hpp)
+file(GLOB SRC_CONSOLE_FILES Console/*.cpp Console/*.h Console/*.hpp)
+file(GLOB SRC_LOGON_COMM_SERVER_FILES LogonCommServer/*.cpp LogonCommServer/*.h LogonCommServer/*.hpp)
+file(GLOB SRC_REALM_FILES Realm/*.cpp Realm/*.h Realm/*.hpp)
+file(GLOB SRC_SERVER_FILES Server/*.cpp Server/*.h Server/*.hpp)
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)

-if (WIN32)
-    set(SRC_LOGON_PROJECT ${SRC_LOGON_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/resources.rc)
-endif ()
-
-source_group(logon FILES ${SRC_LOGON_PROJECT})
-
-set(sources
+set(LOGON_SRCS
    ${SRC_AUTH_FILES}
    ${SRC_CONSOLE_FILES}
    ${SRC_LOGON_COMM_SERVER_FILES}
    ${SRC_REALM_FILES}
    ${SRC_SERVER_FILES}
    ${SRC_LOGON_PROJECT}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -34,9 +30,17 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

+# source group.
+source_group(logon FILES ${SRC_LOGON_PROJECT})
+source_group(Auth FILES ${SRC_AUTH_FILES})
+source_group(Console FILES ${SRC_CONSOLE_FILES})
+source_group(LogonCommServer FILES ${SRC__LOGON_COMM_SERVER_FILES})
+source_group(Realm FILES ${SRC_REALM_FILES})
+source_group(Server FILES ${SRC_SERVER_FILES})
+
 link_directories(${EXTRA_LIBS_PATH} ${DEPENDENCY_LIBS})

-add_executable(${PROJECT_NAME} ${sources})
+add_executable(${PROJECT_NAME} ${LOGON_SRCS})

 if (APPLE)
    target_link_libraries(${PROJECT_NAME} c++)
@@ -44,6 +48,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "kFre
    target_link_libraries(${PROJECT_NAME} c++experimental)
 endif ()

+if (WIN32)
+    set(SRC_LOGON_PROJECT ${SRC_LOGON_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/resources.rc)
+endif ()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/LogonConf.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/LogonConf.hpp)

 # link our shared lib.
@@ -57,6 +65,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchLogon.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/logonserver/Console/CMakeLists.txt
+++ b/src/logonserver/Console/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Console)
-
-set(SRC_CONSOLE_FILES
-    ${PATH_PREFIX}/LogonConsole.cpp
-    ${PATH_PREFIX}/LogonConsole.h
-)
-
-source_group(Console FILES ${SRC_CONSOLE_FILES})
-unset(PATH_PREFIX)
--- a/src/logonserver/LogonCommServer/CMakeLists.txt
+++ b/src/logonserver/LogonCommServer/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX LogonCommServer)
-
-set(SRC_LOGON_COMM_SERVER_FILES
-    ${PATH_PREFIX}/LogonCommServer.cpp
-    ${PATH_PREFIX}/LogonCommServer.h
-)
-
-source_group(LogonCommServer FILES ${SRC_LOGON_COMM_SERVER_FILES})
-unset(PATH_PREFIX)
--- a/src/logonserver/Realm/CMakeLists.txt
+++ b/src/logonserver/Realm/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Realm)
-
-set(SRC_REALM_FILES
-    ${PATH_PREFIX}/RealmFlag.hpp
-    ${PATH_PREFIX}/RealmManager.cpp
-    ${PATH_PREFIX}/RealmManager.hpp
-)
-
-source_group(Realm FILES ${SRC_REALM_FILES})
-unset(PATH_PREFIX)
--- a/src/logonserver/Server/CMakeLists.txt
+++ b/src/logonserver/Server/CMakeLists.txt
@@ -1,21 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Server)
-
-set(SRC_SERVER_FILES
-    ${PATH_PREFIX}/AccountMgr.cpp
-    ${PATH_PREFIX}/AccountMgr.h
-    ${PATH_PREFIX}/IpBanMgr.cpp
-    ${PATH_PREFIX}/IpBanMgr.h
-    ${PATH_PREFIX}/Logon.cpp
-    ${PATH_PREFIX}/Logon.h
-    ${PATH_PREFIX}/LogonConfig.cpp
-    ${PATH_PREFIX}/LogonConfig.h
-    ${PATH_PREFIX}/LogonServerDefines.hpp
-    ${PATH_PREFIX}/Main.cpp
-    ${PATH_PREFIX}/Master.cpp
-    ${PATH_PREFIX}/Master.hpp
-)
-
-source_group(Server FILES ${SRC_SERVER_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/AlteracValley/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/AlteracValley/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX AlteracValley)
-
-set(SRC_AlteracValley
-    ${PATH_PREFIX}/AlteracValley.cpp
-    ${PATH_PREFIX}/AlteracValley.h
-    ${PATH_PREFIX}/AlteracValleyDefinitions.h
-)
-
-source_group(AlteracValley FILES ${SRC_AlteracValley})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/ArathiBasin/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/ArathiBasin/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX ArathiBasin)
-
-set(SRC_ArathiBasin
-    ${PATH_PREFIX}/ArathiBasin.cpp
-    ${PATH_PREFIX}/ArathiBasin.h
-    ${PATH_PREFIX}/ArathiBasinDefinitions.h
-)
-
-source_group(ArathiBasin FILES ${SRC_ArathiBasin})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/CMakeLists.txt
@@ -1,43 +1,42 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-# set up our project name
+# set up our project name.
 project(Battlegrounds CXX)

-include(AlteracValley/CMakeLists.txt)
-include(ArathiBasin/CMakeLists.txt)
-include(CircleOfBlood/CMakeLists.txt)
-include(DalaranSewers/CMakeLists.txt)
-include(EyeOfTheStorm/CMakeLists.txt)
-include(IsleOfConquest/CMakeLists.txt)
-include(RingOfTrials/CMakeLists.txt)
-include(RingOfValor/CMakeLists.txt)
-include(RuinsOfLordaeron/CMakeLists.txt)
-include(StrandOfTheAncient/CMakeLists.txt)
-include(WarsongGulch/CMakeLists.txt)
+file(GLOB SRC_ALTERAC_VALLEY AlteracValley/*.cpp AlteracValley/*.h)
+file(GLOB SRC_ARATHI_BASIN ArathiBasin/*.cpp ArathiBasin/*.h)
+file(GLOB SRC_CIRCLE_OF_BLOOD CircleOfBlood/*.cpp CircleOfBlood/*.h)
+file(GLOB SRC_DALARAN_SEWERS DalaranSewers/*.cpp DalaranSewers/*.h)
+file(GLOB SRC_EYE_OF_THE_STORM EyeOfTheStorm/*.cpp EyeOfTheStorm/*.h)
+file(GLOB SRC_ISLE_OF_CONQUEST IsleOfConquest/*.cpp IsleOfConquest/*.h)
+file(GLOB SRC_RING_OF_TRIALS RingOfTrials/*.cpp RingOfTrials/*.h)
+file(GLOB SRC_RING_OF_VALOR RingOfValor/*.cpp RingOfValor/*.h)
+file(GLOB SRC_RUINS_OF_LORDAERON RuinsOfLordaeron/*.cpp RuinsOfLordaeron/*.h)
+file(GLOB SRC_STRAND_OF_THE_ANCIENT StrandOfTheAncient/*.cpp StrandOfTheAncient/*.h)
+file(GLOB SRC_WARSONG_GULCH WarsongGulch/*.cpp WarsongGulch/*.h)
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)

+# required for linker.
 set(SRC_BATTLEGROUNDS
-    Setup.cpp
-    Setup.h
-    # required for linker
    ../../world/Server/ServerState.cpp
    ../../world/Spell/SpellCastTargets.cpp
 )

-source_group(Battlegrounds FILES ${SRC_BATTLEGROUNDS})
-
-set(SRC_BGS
-    ${SRC_AlteracValley}
-    ${SRC_ArathiBasin}
-    ${SRC_CircleOfBlood}
-    ${SRC_DalaranSewers}
-    ${SRC_EyeOfTheStorm}
-    ${SRC_IsleOfConquest}
-    ${SRC_RingOfTrials}
-    ${SRC_RingOfValor}
-    ${SRC_RuinsOfLordaeron}
-    ${SRC_StrandOfTheAncient}
-    ${SRC_WarsongGulch}
+set(BATTLEGROUNDS_SRCS
+    ${BATTLEGROUNDS_SRCS}
+    ${SRC_ALTERAC_VALLEY}
+    ${SRC_ARATHI_BASIN}
+    ${SRC_CIRCLE_OF_BLOOD}
+    ${SRC_DALARAN_SEWERS}
+    ${SRC_EYE_OF_THE_STORM}
+    ${SRC_ISLE_OF_CONQUEST}
+    ${SRC_RING_OF_TRIALS}
+    ${SRC_RING_OF_VALOR}
+    ${SRC_RUINS_OF_LORDAERON}
+    ${SRC_STRAND_OF_THE_ANCIENT}
+    ${SRC_WARSONG_GULCH}
    ${SRC_BATTLEGROUNDS}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -55,7 +54,21 @@ include_directories(
    ${ZLIB_INCLUDE_DIRS}
 )

-add_library(${PROJECT_NAME} SHARED ${SRC_BGS})
+# source group.
+source_group(Battlegrounds FILES ${SRC_BATTLEGROUNDS})
+source_group(AlteracValley FILES ${SRC_ALTERAC_VALLEY})
+source_group(ArathiBasin FILES ${SRC_ARATHI_BASIN})
+source_group(CircleOfBlood FILES ${SRC_CIRCLE_OF_BLOOD})
+source_group(DalaranSewers FILES ${SRC_DALARAN_SEWERS})
+source_group(EyeOfTheStorm FILES ${SRC_EYE_OF_THE_STORM})
+source_group(IsleOfConquest FILES ${SRC_ISLE_OF_CONQUEST})
+source_group(RingOfTrials FILES ${SRC_RING_OF_TRIALS})
+source_group(RingOfValor FILES ${SRC_RING_OF_VALOR})
+source_group(RuinsOfLordaeron FILES ${SRC_RUINS_OF_LORDAERON})
+source_group(StrandOfTheAncient FILES ${SRC_STRAND_OF_THE_ANCIENT})
+source_group(WarsongGulch FILES ${SRC_WARSONG_GULCH})
+
+add_library(${PROJECT_NAME} SHARED ${BATTLEGROUNDS_SRCS})

 target_link_libraries(${PROJECT_NAME} world)

@@ -66,6 +79,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchBattleGrounds.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/scripts/Battlegrounds/CircleOfBlood/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/CircleOfBlood/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX CircleOfBlood)
-
-set(SRC_CircleOfBlood
-    ${PATH_PREFIX}/CircleOfBlood.cpp
-    ${PATH_PREFIX}/CircleOfBlood.h
-)
-
-source_group(CircleOfBlood FILES ${SRC_CircleOfBlood})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/DalaranSewers/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/DalaranSewers/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX DalaranSewers)
-
-set(SRC_DalaranSewers
-    ${PATH_PREFIX}/DalaranSewers.cpp
-    ${PATH_PREFIX}/DalaranSewers.h
-)
-
-source_group(DalaranSewers FILES ${SRC_DalaranSewers})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/EyeOfTheStorm/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/EyeOfTheStorm/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX EyeOfTheStorm)
-
-set(SRC_EyeOfTheStorm
-    ${PATH_PREFIX}/EyeOfTheStorm.cpp
-    ${PATH_PREFIX}/EyeOfTheStorm.h
-    ${PATH_PREFIX}/EyeOfTheStormDefinitions.h
-)
-
-source_group(EyeOfTheStorm FILES ${SRC_EyeOfTheStorm})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/IsleOfConquest/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/IsleOfConquest/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX IsleOfConquest)
-
-set(SRC_IsleOfConquest
-    ${PATH_PREFIX}/IsleOfConquest.cpp
-    ${PATH_PREFIX}/IsleOfConquest.h
-    ${PATH_PREFIX}/IsleOfConquestDefinitions.h
-)
-
-source_group(IsleOfConquest FILES ${SRC_IsleOfConquest})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/RingOfTrials/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/RingOfTrials/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX RingOfTrials)
-
-set(SRC_RingOfTrials
-    ${PATH_PREFIX}/RingOfTrials.cpp
-    ${PATH_PREFIX}/RingOfTrials.h
-)
-
-source_group(RingOfTrials FILES ${SRC_RingOfTrials})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/RingOfValor/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/RingOfValor/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX RingOfValor)
-
-set(SRC_RingOfValor
-    ${PATH_PREFIX}/RingOfValor.cpp
-    ${PATH_PREFIX}/RingOfValor.h
-)
-
-source_group(RingOfValor FILES ${SRC_RingOfValor})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/RuinsOfLordaeron/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/RuinsOfLordaeron/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX RuinsOfLordaeron)
-
-set(SRC_RuinsOfLordaeron
-    ${PATH_PREFIX}/RuinsOfLordaeron.cpp
-    ${PATH_PREFIX}/RuinsOfLordaeron.h
-)
-
-source_group(RuinsOfLordaeron FILES ${SRC_RuinsOfLordaeron})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/StrandOfTheAncient/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/StrandOfTheAncient/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX StrandOfTheAncient)
-
-set(SRC_StrandOfTheAncient
-    ${PATH_PREFIX}/StrandOfTheAncient.cpp
-    ${PATH_PREFIX}/StrandOfTheAncient.h
-    ${PATH_PREFIX}/StrandOfTheAncientDefinitions.h
-)
-
-source_group(StrandOfTheAncient FILES ${SRC_StrandOfTheAncient})
-unset(PATH_PREFIX)
--- a/src/scripts/Battlegrounds/StrandOfTheAncient/StrandOfTheAncient.h
+++ b/src/scripts/Battlegrounds/StrandOfTheAncient/StrandOfTheAncient.h
@@ -55,8 +55,8 @@ public:
    void HookGenerateLoot(Player* plr, Object* pOCorpse) override;
    void HookOnUnitKill(Player* plr, Unit* pVictim) override;
    void HookOnUnitDied(Unit* victim) override;
-    bool HookSlowLockOpen(GameObject* go, Player* player, Spell* spell ) override;
-    bool HookQuickLockOpen(GameObject* go, Player* player, Spell* spell ) override;
+    bool HookSlowLockOpen(GameObject* go, Player* player, Spell* spell) override;
+    bool HookQuickLockOpen(GameObject* go, Player* player, Spell* spell) override;
    void HookOnPlayerDeath(Player* plr) override;
    void HookOnMount(Player* plr) override;
    bool HookHandleRepop(Player* plr) override;
--- a/src/scripts/Battlegrounds/WarsongGulch/CMakeLists.txt
+++ b/src/scripts/Battlegrounds/WarsongGulch/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX WarsongGulch)
-
-set(SRC_WarsongGulch
-    ${PATH_PREFIX}/WarsongGulch.cpp
-    ${PATH_PREFIX}/WarsongGulch.h
-    ${PATH_PREFIX}/WarsongGulchDefinitions.h
-)
-
-source_group(WarsongGulch FILES ${SRC_WarsongGulch})
-unset(PATH_PREFIX)
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -3,11 +3,11 @@
 # all script libraries have SCRIPTLIB defined.
 add_definitions(-DSCRIPTLIB -DSKIP_ALLOCATOR_SHARING)

-# add our modules
+# add our modules.
 add_subdirectory(Battlegrounds)
 add_subdirectory(SpellHandlers)

-# check if scripts are selected
+# check if scripts are selected.
 if (NOT ${BUILD_ASCEMUSCRIPTS})
    message(WARNING, "BUILD_ASCEMUSCRIPTS option is set to false. Script libraries will not be built.")
    return()
@@ -20,3 +20,4 @@ add_subdirectory(InstanceScripts)
 add_subdirectory(LuaEngine)
 add_subdirectory(MiscScripts)
 add_subdirectory(QuestScripts)
+#add_subdirectory(WorldPvPScripts)
--- a/src/scripts/EventScripts/CMakeLists.txt
+++ b/src/scripts/EventScripts/CMakeLists.txt
@@ -5,49 +5,22 @@ if (NOT BUILD_EVENTSCRIPTS)
    return()
 endif ()

-# set up our project name
+# set up our project name.
 project(EventScripts CXX)

-# sources - contains source files for our library.
-set(sources
-    Event_Arena_Seasons.cpp
-    Event_Brewfest.cpp
-    Event_Call_to_Arms.cpp
-    Event_Childrens_Week.cpp
-    Event_Darkmoon_Faire.cpp
-    Event_Day_of_the_Dead.cpp
-    Event_Edge_of_Madness.cpp
-    Event_Fishing_Extravaganza.cpp
-    Event_Fishing_Seasons.cpp
-    Event_Hallows_End.cpp
-    Event_Harvest_Festival.cpp
-    Event_Kaluak_Fishing_Derby.cpp
-    Event_L70ETC_Concert.cpp
-    Event_Leader_of_JinAlai.cpp
-    Event_Love_is_in_the_Air.cpp
-    Event_Lunar_Festival.cpp
-    Event_Midsummer_Fire_Festival.cpp
-    Event_New_Years_Eve.cpp
-    Event_Nights.cpp
-    Event_Night_Elf_Mohawk.cpp
-    Event_Operation_Gnomeregan.cpp
-    Event_Pilgrims_Bounty.cpp
-    Event_Pirates_Day.cpp
-    Event_Wintergrasp.cpp
-    Event_WinterVeil.cpp
-    Event_World_PvP.cpp
-    Event_Worlds_End_Tavern.cpp
-    Event_Zalzanes_Fall.cpp
-    Setup.cpp
-    # required for linker
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)
+
+# required for linker.
+set(SRC_EVENTSCRIPTS
    ../../world/Server/ServerState.cpp
+    ../../world/Spell/SpellCastTargets.cpp
    ../../shared/Utilities/Util.cpp
 )

-set(headers
-    Event_Darkmoon_Faire.h
-    Event_Nights.h
-    Setup.h
+set(EVENTSCRIPTS_SRCS
+    ${EVENTSCRIPTS_SRCS}
+    ${SRC_EVENTSCRIPTS}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -66,7 +39,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/dep/utf8cpp
 )

-add_library(${PROJECT_NAME} SHARED ${sources} ${headers})
+add_library(${PROJECT_NAME} SHARED ${EVENTSCRIPTS_SRCS})

 target_link_libraries(${PROJECT_NAME} world)

@@ -77,6 +50,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchEventScripts.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/scripts/ExtraScripts/CMakeLists.txt
+++ b/src/scripts/ExtraScripts/CMakeLists.txt
@@ -1,23 +1,24 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-if (NOT BUILD_EXTRASCRIPTS )
+if (NOT BUILD_EXTRASCRIPTS)
    message("\tExtraScripts was skipped because BUILD_EXTRASCRIPTS is unchecked.")
    return()
-endif (NOT BUILD_EXTRASCRIPTS)
+endif ()

-# set up our project name
+# set up our project name.
 project(ExtraScripts CXX)

-# sources - contains source files for our library.
-set(sources
-    Setup.cpp
-    NeutralGuards.cpp
-    # required for linker
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)
+
+# required for linker.
+set(SRC_EXTRASCRIPTS
    ../../world/Server/ServerState.cpp
 )

-set(headers
-    Setup.h
+set(EXTRASCRIPTS_SRCS
+    ${EXTRASCRIPTS_SRCS}
+    ${SRC_EXTRASCRIPTS}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -34,7 +35,8 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ZLIB_INCLUDE_DIRS}
 )
-add_library(${PROJECT_NAME} SHARED ${sources} ${headers})
+
+add_library(${PROJECT_NAME} SHARED ${EXTRASCRIPTS_SRCS})

 target_link_libraries(${PROJECT_NAME} world)

@@ -45,6 +47,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchExtraScripts.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/scripts/GossipScripts/CMakeLists.txt
+++ b/src/scripts/GossipScripts/CMakeLists.txt
@@ -1,26 +1,24 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-if (NOT BUILD_GOSSIPSCRIPTS )
+if (NOT BUILD_GOSSIPSCRIPTS)
    message("\tGossipScripts was skipped because BUILD_GOSSIPSCRIPTS is unchecked.")
    return()
-endif (NOT BUILD_GOSSIPSCRIPTS)
+endif ()

-# set up our project name
+# set up our project name.
 project(GossipScripts CXX)

-# sources - contains source files for our library.
-set(sources
-    Gossip_Dalaran.cpp
-    Gossip_Innkeepers.cpp
-    Gossip_Trainer.cpp
-    Gossip_Moonglade.cpp
-    Setup.cpp
-    # required for linker
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)
+
+# required for linker.
+set(SRC_GOSSIPSCRIPTS
    ../../world/Server/ServerState.cpp
 )

-set(headers
-   Setup.h
+set(GOSSIPSCRIPTS_SRCS
+    ${GOSSIPSCRIPTS_SRCS}
+    ${SRC_GOSSIPSCRIPTS}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -37,7 +35,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ZLIB_INCLUDE_DIRS}
 )
-add_library(${PROJECT_NAME} SHARED ${sources} ${headers})
+add_library(${PROJECT_NAME} SHARED ${GOSSIPSCRIPTS_SRCS})

 target_link_libraries(${PROJECT_NAME} world)

@@ -48,6 +46,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchGossipScripts.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/scripts/GossipScripts/Gossip_Trainer.cpp
+++ b/src/scripts/GossipScripts/Gossip_Trainer.cpp
@@ -41,7 +41,7 @@ public:
                    textid = 20005;
                else
                {
-                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge." );
+                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge.");
                    textid = 20006;
                    dynamic_cast<Creature*>(pObject)->castSpell(plr, 39099, true);
                    plr->modCoinage(-600);
@@ -107,7 +107,7 @@ public:
                    textid = 20005;
                else
                {
-                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge." );
+                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge.");
                    textid = 20006;
                    dynamic_cast<Creature*>(pObject)->castSpell(plr, 39097, true);
                    plr->modCoinage(-600);
@@ -170,7 +170,7 @@ public:
                    textid = 20005;
                else
                {
-                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge." );
+                    //pCreature->SendChatMessage(CHAT_MSG_MONSTER_SAY, LANG_UNIVERSAL, "Make good use of this knowledge.");
                    textid = 20006;
                    dynamic_cast<Creature*>(pObject)->castSpell(plr, 39098, true);
                    plr->modCoinage(-600);
--- a/src/scripts/InstanceScripts/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/CMakeLists.txt
@@ -1,107 +1,109 @@
 # Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>

-if (NOT BUILD_INSTANCESCRIPTS )
+if (NOT BUILD_INSTANCESCRIPTS)
    message("\tInstanceScripts was skipped because BUILD_INSTANCESCRIPTS is unchecked.")
    return()
 endif ()

-# set up our project name
+# set up our project name.
 project(InstanceScripts CXX)

-include(Classic/CMakeLists.txt)
-include(Classic/BlackfathomDeeps/CMakeLists.txt)
-include(Classic/BlackrockMountain/BlackrockDepths/CMakeLists.txt)
-include(Classic/BlackrockMountain/BlackrockSpire/CMakeLists.txt)
-include(Classic/BlackrockMountain/BlackwingLair/CMakeLists.txt)
-include(Classic/BlackrockMountain/MoltenCore/CMakeLists.txt)
-include(Classic/Deadmines/CMakeLists.txt)
-include(Classic/DireMaul/CMakeLists.txt)
-include(Classic/Gnomeregan/CMakeLists.txt)
-include(Classic/Maraudon/CMakeLists.txt)
-include(Classic/OnyxiasLair/CMakeLists.txt)
-include(Classic/RagefireChasm/CMakeLists.txt)
-include(Classic/RazorfenDowns/CMakeLists.txt)
-include(Classic/RazorfenKraul/CMakeLists.txt)
-include(Classic/ScarletMonestary/CMakeLists.txt)
-include(Classic/Scholomance/CMakeLists.txt)
-include(Classic/ShadowfangKeep/CMakeLists.txt)
-include(Classic/Stratholme/CMakeLists.txt)
-include(Classic/SunkenTemple/CMakeLists.txt)
-include(Classic/TheStockade/CMakeLists.txt)
-include(Classic/Uldaman/CMakeLists.txt)
-include(Classic/WailingCaverns/CMakeLists.txt)
-include(Classic/ZulFarak/CMakeLists.txt)
-include(Classic/ZulGurub/CMakeLists.txt)
+file(GLOB SRC_LOCAL_DIR *.cpp *.h *.hpp)

-if ("${ASCEMU_NUMBER}" GREATER_EQUAL 1)
-include(Tbc/CMakeLists.txt)
-include(Tbc/Auchindoun/AuchenauCrypts/CMakeLists.txt)
-include(Tbc/Auchindoun/ManaTombs/CMakeLists.txt)
-include(Tbc/Auchindoun/SethekkHalls/CMakeLists.txt)
-include(Tbc/Auchindoun/ShadowLabyrinth/CMakeLists.txt)
-include(Tbc/BlackTemple/CMakeLists.txt)
-include(Tbc/CavensOfTime/BattleOfMountHyjal/CMakeLists.txt)
-include(Tbc/CavensOfTime/BlackMorass/CMakeLists.txt)
-include(Tbc/CavensOfTime/OldHillsbradFoothills/CMakeLists.txt)
-include(Tbc/CoilfangReservoir/SerpentShrine/CMakeLists.txt)
-include(Tbc/CoilfangReservoir/SlavePens/CMakeLists.txt)
-include(Tbc/CoilfangReservoir/SteamVault/CMakeLists.txt)
-include(Tbc/CoilfangReservoir/Underbog/CMakeLists.txt)
-include(Tbc/GruulsLair/CMakeLists.txt)
-include(Tbc/HellfireCitadel/BloodFurnace/CMakeLists.txt)
-include(Tbc/HellfireCitadel/HellfireRamparts/CMakeLists.txt)
-include(Tbc/HellfireCitadel/MagtheridonsLair/CMakeLists.txt)
-include(Tbc/HellfireCitadel/ShatteredHalls/CMakeLists.txt)
-include(Tbc/Karazhan/CMakeLists.txt)
-include(Tbc/Sunwell/MagistersTerrace/CMakeLists.txt)
-include(Tbc/Sunwell/SunwellPlateau/CMakeLists.txt)
-include(Tbc/TempestKeep/Arcatraz/CMakeLists.txt)
-include(Tbc/TempestKeep/Botanica/CMakeLists.txt)
-include(Tbc/TempestKeep/Mechanar/CMakeLists.txt)
-include(Tbc/TempestKeep/TheEye/CMakeLists.txt)
-include(Tbc/ZulAman/CMakeLists.txt)
+file(GLOB SRC_CLASSIC_SCRIPTS_FILES Classic/*.cpp Classic/*.h)
+file(GLOB SRC_CLASSIC_BLACKFATHOM_SCRIPTS_FILES Classic/BlackfathomDeeps/*.cpp Classic/BlackfathomDeeps/*.h)
+file(GLOB SRC_CLASSIC_BLACKROCK_DEPTHS_SCRIPTS_FILES Classic/BlackrockMountain/BlackrockDepths/*.cpp Classic/BlackrockMountain/BlackrockDepths/*.h)
+file(GLOB SRC_CLASSIC_BLACKROCK_SPIRE_SCRIPTS_FILES Classic/BlackrockMountain/BlackrockSpire/*.cpp Classic/BlackrockMountain/BlackrockSpire/*.h)
+file(GLOB SRC_CLASSIC_BLACKWING_LAIR_SCRIPTS_FILES Classic/BlackrockMountain/BlackwingLair/*.cpp Classic/BlackrockMountain/BlackwingLair/*.h)
+file(GLOB SRC_CLASSIC_MOLTENCORE_SCRIPTS_FILES Classic/BlackrockMountain/MoltenCore/*.cpp Classic/BlackrockMountain/MoltenCore/*.h)
+file(GLOB SRC_CLASSIC_DEADMINES_SCRIPTS_FILES Classic/Deadmines/*.cpp Classic/Deadmines/*.h)
+file(GLOB SRC_CLASSIC_DIREMAUL_SCRIPTS_FILES Classic/DireMaul/*.cpp Classic/DireMaul/*.h)
+file(GLOB SRC_CLASSIC_GNOME_SCRIPTS_FILES Classic/Gnomeregan/*.cpp Classic/Gnomeregan/*.h)
+file(GLOB SRC_CLASSIC_MARAUDON_SCRIPTS_FILES Classic/Maraudon/*.cpp Classic/Maraudon/*.h)
+file(GLOB SRC_CLASSIC_ONYXIA_SCRIPTS_FILES Classic/OnyxiasLair/*.cpp Classic/OnyxiasLair/*.h)
+file(GLOB SRC_CLASSIC_RAGEFIRECHASM_SCRIPTS_FILES Classic/RagefireChasm/*.cpp Classic/RagefireChasm/*.h)
+file(GLOB SRC_CLASSIC_RAZORFEN_SCRIPTS_FILES Classic/RazorfenDowns/*.cpp Classic/RazorfenDowns/*.h)
+file(GLOB SRC_CLASSIC_RAZORFENKRAUL_SCRIPTS_FILES Classic/RazorfenKraul/*.cpp Classic/RazorfenKraul/*.h)
+file(GLOB SRC_CLASSIC_SCARLETMONES_SCRIPTS_FILES Classic/ScarletMonestary/*.cpp Classic/ScarletMonestary/*.h)
+file(GLOB SRC_CLASSIC_SCHOLO_SCRIPTS_FILES Classic/Scholomance/*.cpp Classic/Scholomance/*.h)
+file(GLOB SRC_CLASSIC_SHADOWFANG_SCRIPTS_FILES Classic/ShadowfangKeep/*.cpp Classic/ShadowfangKeep/*.h)
+file(GLOB SRC_CLASSIC_STRATHOLME_SCRIPTS_FILES Classic/Stratholme/*.cpp Classic/Stratholme/*.h)
+file(GLOB SRC_CLASSIC_SUNKENTEMPLE_SCRIPTS_FILES Classic/SunkenTemple/*.cpp Classic/SunkenTemple/*.h)
+file(GLOB SRC_CLASSIC_STOCKADE_SCRIPTS_FILES Classic/TheStockade/*.cpp Classic/TheStockade/*.h)
+file(GLOB SRC_CLASSIC_ULDAMAN_SCRIPTS_FILES Classic/Uldaman/*.cpp Classic/Uldaman/*.h)
+file(GLOB SRC_CLASSIC_WAILING_SCRIPTS_FILES Classic/WailingCaverns/*.cpp Classic/WailingCaverns/*.h)
+file(GLOB SRC_CLASSIC_ZUL_FARAK_SCRIPTS_FILES Classic/ZulFarak/*.cpp Classic/ZulFarak/*.h)
+file(GLOB SRC_CLASSIC_ZUL_GURUB_SCRIPTS_FILES Classic/ZulGurub/*.cpp Classic/ZulGurub/*.h)
+
+if ("${ASCEMU_NUMBER}" GREATER_EQUAL 1) # Tbc
+file(GLOB SRC_TBC_SCRIPTS_FILES Tbc/*.cpp Tbc/*.h)
+file(GLOB SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES Tbc/Auchindoun/AuchenauCrypts/*.cpp Tbc/Auchindoun/AuchenauCrypts/*.h)
+file(GLOB SRC_TBC_MANATOMBS_SCRIPTS_FILES Tbc/Auchindoun/ManaTombs/*.cpp Tbc/Auchindoun/ManaTombs/*.h)
+file(GLOB SRC_TBC_SETHEKKHALLS_SCRIPTS_FILES Tbc/Auchindoun/SethekkHalls/*.cpp Tbc/Auchindoun/SethekkHalls/*.h)
+file(GLOB SRC_TBC_BLACKTEMPLE_SCRIPTS_FILES Tbc/BlackTemple/*.cpp Tbc/BlackTemple/*.h)
+file(GLOB SRC_TBC_COTBOFHYJAL_SCRIPTS_FILES Tbc/CavensOfTime/BattleOfMountHyjal/*.cpp Tbc/CavensOfTime/BattleOfMountHyjal/*.h)
+file(GLOB SRC_TBC_COTBLACKMORASS_SCRIPTS_FILES Tbc/CavensOfTime/BlackMorass/*.cpp Tbc/CavensOfTime/BlackMorass/*.h)
+file(GLOB SRC_TBC_COTOLDHILLS_SCRIPTS_FILES Tbc/CavensOfTime/OldHillsbradFoothills/*.cpp Tbc/CavensOfTime/OldHillsbradFoothills/*.h)
+file(GLOB SRC_TBC_COILFANGSERPENTSHRINE_SCRIPTS_FILES Tbc/CoilfangReservoir/SerpentShrine/*.cpp Tbc/CoilfangReservoir/SerpentShrine/*.h)
+file(GLOB SRC_TBC_COILFANGSLAVEPENS_SCRIPTS_FILES Tbc/CoilfangReservoir/SlavePens/*.cpp Tbc/CoilfangReservoir/SlavePens/*.h)
+file(GLOB SRC_TBC_COILFANGSTEAMVAULT_SCRIPTS_FILES Tbc/CoilfangReservoir/SteamVault/*.cpp Tbc/CoilfangReservoir/SteamVault/*.h)
+file(GLOB SRC_TBC_COILFANGUNDERBOG_SCRIPTS_FILES Tbc/CoilfangReservoir/Underbog/*.cpp Tbc/CoilfangReservoir/Underbog/*.h)
+file(GLOB SRC_TBC_GRUULSLAIR_SCRIPTS_FILES Tbc/GruulsLair/*.cpp Tbc/GruulsLair/*.h)
+file(GLOB SRC_TBC_BLOODFURNACE_SCRIPTS_FILES Tbc/HellfireCitadel/BloodFurnace/*.cpp Tbc/HellfireCitadel/BloodFurnace/*.h)
+file(GLOB SRC_TBC_HELLFIRERAMPARTS_SCRIPTS_FILES Tbc/HellfireCitadel/HellfireRamparts/*.cpp Tbc/HellfireCitadel/HellfireRamparts/*.h Tbc/HellfireCitadel/HellfireRamparts/*.hpp)
+file(GLOB SRC_TBC_MAGTHERIDONSLAIR_SCRIPTS_FILES Tbc/HellfireCitadel/MagtheridonsLair/*.cpp Tbc/HellfireCitadel/MagtheridonsLair/*.h Tbc/HellfireCitadel/MagtheridonsLair/*.hpp)
+file(GLOB SRC_TBC_SHATTREDHALLS_SCRIPTS_FILES Tbc/HellfireCitadel/ShatteredHalls/*.cpp Tbc/HellfireCitadel/ShatteredHalls/*.h)
+file(GLOB SRC_TBC_KARAZHAN_SCRIPTS_FILES Tbc/Karazhan/*.cpp Tbc/Karazhan/*.h)
+file(GLOB SRC_TBC_MAGISTERSTERRACE_SCRIPTS_FILES Tbc/Sunwell/MagistersTerrace/*.cpp Tbc/Sunwell/MagistersTerrace/*.h)
+file(GLOB SRC_TBC_SUNWELLPLATEAU_SCRIPTS_FILES Tbc/Sunwell/SunwellPlateau/*.cpp Tbc/Sunwell/SunwellPlateau/*.h)
+file(GLOB SRC_TBC_ARCATRAZ_SCRIPTS_FILES Tbc/TempestKeep/Arcatraz/*.cpp Tbc/TempestKeep/Arcatraz/*.h)
+file(GLOB SRC_TBC_BOTANICA_SCRIPTS_FILES Tbc/TempestKeep/Botanica/*.cpp Tbc/TempestKeep/Botanica/*.h)
+file(GLOB SRC_TBC_MECHANAR_SCRIPTS_FILES Tbc/TempestKeep/Mechanar/*.cpp Tbc/TempestKeep/Mechanar/*.h)
+file(GLOB SRC_TBC_THEEYE_SCRIPTS_FILES Tbc/TempestKeep/TheEye/*.cpp Tbc/TempestKeep/TheEye/*.h)
+file(GLOB SRC_TBC_ZULAMAN_SCRIPTS_FILES Tbc/ZulAman/*.cpp Tbc/ZulAman/*.h)
 endif ()

-if ("${ASCEMU_NUMBER}" GREATER_EQUAL 2)
-include(Wotlk/CMakeLists.txt)
-include(Wotlk/AzjolNerub/Ahnkahet/CMakeLists.txt)
-include(Wotlk/AzjolNerub/AzjolNerub/CMakeLists.txt)
-include(Wotlk/CavernsOfTime/CMakeLists.txt)
-include(Wotlk/ChamberOfAspects/ObsidianSanctum/CMakeLists.txt)
-include(Wotlk/ChamberOfAspects/RubySanctum/CMakeLists.txt)
-include(Wotlk/CrusadersColiseum/TrialOfTheChampion/CMakeLists.txt)
-include(Wotlk/CrusadersColiseum/TrialOfTheCrusader/CMakeLists.txt)
-include(Wotlk/DraktharonKeep/CMakeLists.txt)
-include(Wotlk/FrozenHalls/ForgeOfSouls/CMakeLists.txt)
-include(Wotlk/FrozenHalls/HallsOfReflection/CMakeLists.txt)
-include(Wotlk/FrozenHalls/PitOfSaron/CMakeLists.txt)
-include(Wotlk/Gundrak/CMakeLists.txt)
-include(Wotlk/IcecrownCitadel/CMakeLists.txt)
-include(Wotlk/Naxxramas/CMakeLists.txt)
-include(Wotlk/Nexus/EyeOfEternity/CMakeLists.txt)
-include(Wotlk/Nexus/Nexus/CMakeLists.txt)
-include(Wotlk/Nexus/Oculus/CMakeLists.txt)
-include(Wotlk/Ulduar/HallsOfLightning/CMakeLists.txt)
-include(Wotlk/Ulduar/HallsOfStone/CMakeLists.txt)
-include(Wotlk/Ulduar/Ulduar/CMakeLists.txt)
-include(Wotlk/UtgardeKeep/UtgardeKeep/CMakeLists.txt)
-include(Wotlk/UtgardeKeep/UtgradePinnacle/CMakeLists.txt)
-include(Wotlk/VaultOfArchavon/CMakeLists.txt)
-include(Wotlk/VioletHold/CMakeLists.txt)
-include(Cata/CMakeLists.txt)
+if ("${ASCEMU_NUMBER}" GREATER_EQUAL 2) # Wotlk
+file(GLOB SRC_WOTLK_SCRIPTS_FILES Wotlk/*.cpp Wotlk/*.h Wotlk/*.hpp)
+file(GLOB SRC_WOTLK_AHNKAHETOLDK_SCRIPTS_FILES Wotlk/AzjolNerub/Ahnkahet/*.cpp Wotlk/AzjolNerub/Ahnkahet/*.h)
+file(GLOB SRC_WOTLK_AZJOLNERUB_SCRIPTS_FILES Wotlk/AzjolNerub/AzjolNerub/*.cpp Wotlk/AzjolNerub/AzjolNerub/*.h)
+file(GLOB SRC_WOTLK_COTCULLINGOFSTRAT_SCRIPTS_FILES Wotlk/CavernsOfTime/*.cpp Wotlk/CavernsOfTime/*.h)
+file(GLOB SRC_WOTLK_OBSIDUANSANCTUM_SCRIPTS_FILES Wotlk/ChamberOfAspects/ObsidianSanctum/*.cpp Wotlk/ChamberOfAspects/ObsidianSanctum/*.h)
+file(GLOB SRC_WOTLK_RUBYSANCTUM_SCRIPTS_FILES Wotlk/ChamberOfAspects/RubySanctum/*.cpp Wotlk/ChamberOfAspects/RubySanctum/*.h)
+file(GLOB SRC_WOTLK_TRIALOFCHAMPION_SCRIPTS_FILES Wotlk/CrusadersColiseum/TrialOfTheChampion/*.cpp Wotlk/CrusadersColiseum/TrialOfTheChampion/*.h)
+file(GLOB SRC_WOTLK_TRIALOFCRUSADER_SCRIPTS_FILES Wotlk/CrusadersColiseum/TrialOfTheCrusader/*.cpp Wotlk/CrusadersColiseum/TrialOfTheCrusader/*.h)
+file(GLOB SRC_WOTLK_DRAKTHARON_SCRIPTS_FILES Wotlk/DraktharonKeep/*.cpp Wotlk/DraktharonKeep/*.h)
+file(GLOB SRC_WOTLK_FORGEOFSOULS_SCRIPTS_FILES Wotlk/FrozenHalls/ForgeOfSouls/*.cpp Wotlk/FrozenHalls/ForgeOfSouls/*.h)
+file(GLOB SRC_WOTLK_HALLSOFREFLECTION_SCRIPTS_FILES Wotlk/FrozenHalls/HallsOfReflection/*.cpp Wotlk/FrozenHalls/HallsOfReflection/*.h)
+file(GLOB SRC_WOTLK_PITOFSARON_SCRIPTS_FILES Wotlk/FrozenHalls/PitOfSaron/*.cpp Wotlk/FrozenHalls/PitOfSaron/*.h)
+file(GLOB SRC_WOTLK_GUNDRAK_SCRIPTS_FILES Wotlk/Gundrak/*.cpp Wotlk/Gundrak/*.h)
+file(GLOB SRC_WOTLK_ICECROWNCITADEL_SCRIPTS_FILES Wotlk/IcecrownCitadel/*.cpp Wotlk/IcecrownCitadel/*.h Wotlk/IcecrownCitadel/*.hpp)
+file(GLOB SRC_WOTLK_NAXXRAMAS_SCRIPTS_FILES Wotlk/Naxxramas/*.cpp Wotlk/Naxxramas/*.h)
+file(GLOB SRC_WOTLK_EYEOFETERNITY_SCRIPTS_FILES Wotlk/Nexus/EyeOfEternity/*.cpp Wotlk/Nexus/EyeOfEternity/*.h)
+file(GLOB SRC_WOTLK_NEXUS_SCRIPTS_FILES Wotlk/Nexus/Nexus/*.cpp Wotlk/Nexus/Nexus/*.h)
+file(GLOB SRC_WOTLK_OCULUS_SCRIPTS_FILES Wotlk/Nexus/Oculus/*.cpp Wotlk/Nexus/Oculus/*.h)
+file(GLOB SRC_WOTLK_HALLSOFLIGHTNING_SCRIPTS_FILES Wotlk/Ulduar/HallsOfLightning/*.cpp Wotlk/Ulduar/HallsOfLightning/*.h)
+file(GLOB SRC_WOTLK_HALLSOFSTONE_SCRIPTS_FILES Wotlk/Ulduar/HallsOfStone/*.cpp Wotlk/Ulduar/HallsOfStone/*.h)
+file(GLOB SRC_WOTLK_ULDUAR_SCRIPTS_FILES Wotlk/Ulduar/Ulduar/*.cpp Wotlk/Ulduar/Ulduar/*.h)
+file(GLOB SRC_WOTLK_UTGARDEKEEP_SCRIPTS_FILES Wotlk/UtgardeKeep/UtgardeKeep/*.cpp Wotlk/UtgardeKeep/UtgardeKeep/*.h)
+file(GLOB SRC_WOTLK_UTGARDEPINACLE_SCRIPTS_FILES Wotlk/UtgardeKeep/UtgradePinnacle/*.cpp Wotlk/UtgardeKeep/UtgradePinnacle/*.h)
+file(GLOB SRC_WOTLK_VAULTOFARCHAVON_SCRIPTS_FILES Wotlk/VaultOfArchavon/*.cpp Wotlk/VaultOfArchavon/*.h)
+file(GLOB SRC_WOTLK_VIOLETHOLD_SCRIPTS_FILES Wotlk/VioletHold/*.cpp Wotlk/VioletHold/*.h Wotlk/VioletHold/*.hpp)
 endif ()

-set(SRC_BASIC
-    Setup.cpp
-    Setup.h
-    # required for linker
+if ("${ASCEMU_NUMBER}" GREATER_EQUAL 3) # Cata
+file(GLOB SRC_CATA_SCRIPTS_FILES Cata/*.cpp Cata/*.h Cata/*.hpp)
+endif ()
+
+# required for linker.
+set(SRC_INSTANCESCRIPTS
    ../../world/Server/ServerState.cpp
    ../../shared/Utilities/Util.cpp
 )

-#sources - contains source files for our library.
-set(sources
-    ${SRC_BASIC}
+set(INSTANCESCRIPTS_SRCS
+    ${INSTANCESCRIPTS_SRCS}
+    ${SRC_INSTANCESCRIPTS}
    ${SRC_CLASSIC_SCRIPTS_FILES}
    ${SRC_CLASSIC_BLACKFATHOM_SCRIPTS_FILES}
    ${SRC_CLASSIC_BLACKROCK_DEPTHS_SCRIPTS_FILES}
@@ -177,7 +179,8 @@ set(sources
    ${SRC_WOTLK_UTGARDEPINACLE_SCRIPTS_FILES}
    ${SRC_WOTLK_VAULTOFARCHAVON_SCRIPTS_FILES}
    ${SRC_WOTLK_VIOLETHOLD_SCRIPTS_FILES}
-    ${SRC_CATA_SCRIPTS_FILES}	
+    ${SRC_CATA_SCRIPTS_FILES}
+    ${SRC_LOCAL_DIR}
 )

 include_directories(
@@ -196,7 +199,88 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/dep/utf8cpp
 )

-add_library(${PROJECT_NAME} SHARED ${sources} ${headers})
+# source group.
+source_group(Classic FILES ${SRC_CLASSIC_SCRIPTS_FILES})
+source_group(Classic/BlackfathomDeeps FILES ${SRC_CLASSIC_BLACKFATHOM_SCRIPTS_FILES})
+source_group(Classic/BlackrockMountain/BlackrockDepths FILES ${SRC_CLASSIC_BLACKROCK_DEPTHS_SCRIPTS_FILES})
+source_group(Classic/BlackrockMountain/BlackrockSpire FILES ${SRC_CLASSIC_BLACKROCK_SPIRE_SCRIPTS_FILES})
+source_group(Classic/BlackrockMountain/BlackwingLair FILES ${SRC_CLASSIC_BLACKWING_LAIR_SCRIPTS_FILES})
+source_group(Classic/BlackrockMountain/MoltenCore FILES ${SRC_CLASSIC_MOLTENCORE_SCRIPTS_FILES})
+source_group(Classic/Deadmines FILES ${SRC_CLASSIC_DEADMINES_SCRIPTS_FILES})
+source_group(Classic/DireMaul FILES ${SRC_CLASSIC_DIREMAUL_SCRIPTS_FILES})
+source_group(Classic/Gnomeregan FILES ${SRC_CLASSIC_GNOME_SCRIPTS_FILES})
+source_group(Classic/Maraudon FILES ${SRC_CLASSIC_MARAUDON_SCRIPTS_FILES})
+source_group(Classic/OnyxiasLair FILES ${SRC_CLASSIC_ONYXIA_SCRIPTS_FILES})
+source_group(Classic/RagefireChasm FILES ${SRC_CLASSIC_RAGEFIRECHASM_SCRIPTS_FILES})
+source_group(Classic/RazorfenDowns FILES ${SRC_CLASSIC_RAZORFEN_SCRIPTS_FILES})
+source_group(Classic/RazorfenKraul FILES ${SRC_CLASSIC_RAZORFENKRAUL_SCRIPTS_FILES})
+source_group(Classic/ScarletMonestary FILES ${SRC_CLASSIC_SCARLETMONES_SCRIPTS_FILES})
+source_group(Classic/Scholomance FILES ${SRC_CLASSIC_SCHOLO_SCRIPTS_FILES})
+source_group(Classic/ShadowfangKeep FILES ${SRC_CLASSIC_SHADOWFANG_SCRIPTS_FILES})
+source_group(Classic/Stratholme FILES ${SRC_CLASSIC_STRATHOLME_SCRIPTS_FILES})
+source_group(Classic/SunkenTemple FILES ${SRC_CLASSIC_SUNKENTEMPLE_SCRIPTS_FILES})
+source_group(Classic/TheStockade FILES ${SRC_CLASSIC_STOCKADE_SCRIPTS_FILES})
+source_group(Classic/Uldaman FILES ${SRC_CLASSIC_ULDAMAN_SCRIPTS_FILES})
+source_group(Classic/WailingCaverns FILES ${SRC_CLASSIC_WAILING_SCRIPTS_FILES})
+source_group(Classic/ZulFarak FILES ${SRC_CLASSIC_ZUL_FARAK_SCRIPTS_FILES})
+source_group(Classic/ZulGurub FILES ${SRC_CLASSIC_ZUL_GURUB_SCRIPTS_FILES})
+
+source_group(Tbc FILES ${SRC_TBC_SCRIPTS_FILES})
+source_group(Tbc/Auchindoun/AuchenauCrypts FILES ${SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES})
+source_group(Tbc/Auchindoun/ManaTombs FILES ${SRC_TBC_MANATOMBS_SCRIPTS_FILES})
+source_group(Tbc/Auchindoun/SethekkHalls FILES ${SRC_TBC_SETHEKKHALLS_SCRIPTS_FILES})
+source_group(Tbc/Auchindoun/ShadowLabyrinth FILES ${SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES})
+source_group(Tbc/BlackTemple FILES ${SRC_TBC_BLACKTEMPLE_SCRIPTS_FILES})
+source_group(Tbc/CavensOfTime/BattleOfMountHyjal FILES ${SRC_TBC_COTBOFHYJAL_SCRIPTS_FILES})
+source_group(Tbc/CavensOfTime/BlackMorass FILES ${SRC_TBC_COTBLACKMORASS_SCRIPTS_FILES})
+source_group(Tbc/CavensOfTime/OldHillsbradFoothills FILES ${SRC_TBC_COTOLDHILLS_SCRIPTS_FILES})
+source_group(Tbc/CoilfangReservoir/SerpentShrine FILES ${SRC_TBC_COILFANGSERPENTSHRINE_SCRIPTS_FILES})
+source_group(Tbc/CoilfangReservoir/SlavePens FILES ${SRC_TBC_COILFANGSLAVEPENS_SCRIPTS_FILES})
+source_group(Tbc/CoilfangReservoir/SteamVault FILES ${SRC_TBC_COILFANGSTEAMVAULT_SCRIPTS_FILES})
+source_group(Tbc/CoilfangReservoir/Underbog FILES ${SRC_TBC_COILFANGUNDERBOG_SCRIPTS_FILES})
+source_group(Tbc/GruulsLair FILES ${SRC_TBC_GRUULSLAIR_SCRIPTS_FILES})
+source_group(Tbc/HellfireCitadel/BloodFurnace FILES ${SRC_TBC_BLOODFURNACE_SCRIPTS_FILES})
+source_group(Tbc/HellfireCitadel/HellfireRamparts FILES ${SRC_TBC_HELLFIRERAMPARTS_SCRIPTS_FILES})
+source_group(Tbc/HellfireCitadel/MagtheridonsLair FILES ${SRC_TBC_MAGTHERIDONSLAIR_SCRIPTS_FILES})
+source_group(Tbc/HellfireCitadel/ShatteredHalls FILES ${SRC_TBC_SHATTREDHALLS_SCRIPTS_FILES})
+source_group(Tbc/Karazhan FILES ${SRC_TBC_KARAZHAN_SCRIPTS_FILES})
+source_group(Tbc/Sunwell/MagistersTerrace FILES ${SRC_TBC_MAGISTERSTERRACE_SCRIPTS_FILES})
+source_group(Tbc/Sunwell/SunwellPlateau FILES ${SRC_TBC_SUNWELLPLATEAU_SCRIPTS_FILES})
+source_group(Tbc/TempestKeep/Arcatraz FILES ${SRC_TBC_ARCATRAZ_SCRIPTS_FILES})
+source_group(Tbc/TempestKeep/Botanica FILES ${SRC_TBC_BOTANICA_SCRIPTS_FILES})
+source_group(Tbc/TempestKeep/Mechanar FILES ${SRC_TBC_MECHANAR_SCRIPTS_FILES})
+source_group(Tbc/TempestKeep/TheEye FILES ${SRC_TBC_THEEYE_SCRIPTS_FILES})
+source_group(Tbc/ZulAman FILES ${SRC_TBC_ZULAMAN_SCRIPTS_FILES})
+
+source_group(Wotlk FILES ${SRC_WOTLK_SCRIPTS_FILES})
+source_group(Wotlk/AzjolNerub/Ahnkahet FILES ${SRC_WOTLK_AHNKAHETOLDK_SCRIPTS_FILES})
+source_group(Wotlk/AzjolNerub/AzjolNerub FILES ${SRC_WOTLK_AZJOLNERUB_SCRIPTS_FILES})
+source_group(Wotlk/CavernsOfTime FILES ${SRC_WOTLK_COTCULLINGOFSTRAT_SCRIPTS_FILES})
+source_group(Wotlk/ChamberOfAspects/ObsidianSanctum FILES ${SRC_WOTLK_OBSIDUANSANCTUM_SCRIPTS_FILES})
+source_group(Wotlk/ChamberOfAspects/RubySanctum FILES ${SRC_WOTLK_RUBYSANCTUM_SCRIPTS_FILES})
+source_group(Wotlk/CrusadersColiseum/TrialOfTheChampion FILES ${SRC_WOTLK_TRIALOFCHAMPION_SCRIPTS_FILES})
+source_group(Wotlk/CrusadersColiseum/TrialOfTheCrusader FILES ${SRC_WOTLK_TRIALOFCRUSADER_SCRIPTS_FILES})
+source_group(Wotlk/DraktharonKeep FILES ${SRC_WOTLK_DRAKTHARON_SCRIPTS_FILES})
+source_group(Wotlk/FrozenHalls/ForgeOfSouls FILES ${SRC_WOTLK_FORGEOFSOULS_SCRIPTS_FILES})
+source_group(Wotlk/FrozenHalls/HallsOfReflection FILES ${SRC_WOTLK_HALLSOFREFLECTION_SCRIPTS_FILES})
+source_group(Wotlk/FrozenHalls/PitOfSaron FILES ${SRC_WOTLK_PITOFSARON_SCRIPTS_FILES})
+source_group(Wotlk/Gundrak FILES ${SRC_WOTLK_GUNDRAK_SCRIPTS_FILES})
+source_group(Wotlk/IcecrownCitadel FILES ${SRC_WOTLK_ICECROWNCITADEL_SCRIPTS_FILES})
+source_group(Wotlk/Naxxramas FILES ${SRC_WOTLK_NAXXRAMAS_SCRIPTS_FILES})
+source_group(Wotlk/Nexus/EyeOfEternity FILES ${SRC_WOTLK_EYEOFETERNITY_SCRIPTS_FILES})
+source_group(Wotlk/Nexus/Nexus FILES ${SRC_WOTLK_NEXUS_SCRIPTS_FILES})
+source_group(Wotlk/Nexus/Oculus FILES ${SRC_WOTLK_OCULUS_SCRIPTS_FILES})
+source_group(Wotlk/Ulduar/HallsOfLightning FILES ${SRC_WOTLK_HALLSOFLIGHTNING_SCRIPTS_FILES})
+source_group(Wotlk/Ulduar/HallsOfStone FILES ${SRC_WOTLK_HALLSOFSTONE_SCRIPTS_FILES})
+source_group(Wotlk/Ulduar/Ulduar FILES ${SRC_WOTLK_ULDUAR_SCRIPTS_FILES})
+source_group(Wotlk/UtgardeKeep/UtgardeKeep FILES ${SRC_WOTLK_UTGARDEKEEP_SCRIPTS_FILES})
+source_group(Wotlk/UtgardeKeep/UtgradePinnacle FILES ${SRC_WOTLK_UTGARDEPINACLE_SCRIPTS_FILES})
+source_group(Wotlk/VaultOfArchavon FILES ${SRC_WOTLK_VAULTOFARCHAVON_SCRIPTS_FILES})
+source_group(Wotlk/VioletHold FILES ${SRC_WOTLK_VIOLETHOLD_SCRIPTS_FILES})
+
+source_group(Cata FILES ${SRC_CATA_SCRIPTS_FILES})
+
+add_library(${PROJECT_NAME} SHARED ${INSTANCESCRIPTS_SRCS})

 target_link_libraries(${PROJECT_NAME} world)

@@ -207,6 +291,3 @@ if (USE_PCH)
    message(STATUS "Generate PCH for ${PROJECT_NAME}")
    target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pchInstanceScripts.hpp)
 endif ()
-
-unset(sources)
-unset(headers)
--- a/src/scripts/InstanceScripts/Cata/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Cata/CMakeLists.txt
@@ -1,45 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Cata)
-
-if ("${ASCEMU_NUMBER}" GREATER_EQUAL 3)
-set(SRC_CATA_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Lost_City_Of_Tolvir.cpp
-    ${PATH_PREFIX}/Instance_Blackrock_Caverns.cpp
-    ${PATH_PREFIX}/Instance_Grim_Batol.cpp
-    ${PATH_PREFIX}/Instance_Halls_Of_Origination.cpp
-    ${PATH_PREFIX}/Instance_Throne_Of_Tides.cpp
-    ${PATH_PREFIX}/Instance_The_Stonecore.cpp
-    ${PATH_PREFIX}/Instance_Vortex_Pinnacle.cpp
-    ${PATH_PREFIX}/Instance_Zul_Aman_Cata.cpp
-    ${PATH_PREFIX}/Instance_Zul_Gurub_Cata.cpp
-    ${PATH_PREFIX}/Instance_Well_Of_Eternity.cpp
-    ${PATH_PREFIX}/Instance_Hour_Of_Twilight.cpp
-    ${PATH_PREFIX}/Instance_End_Time.cpp
-    ${PATH_PREFIX}/Raid_Baradin_Hold.cpp
-    ${PATH_PREFIX}/Raid_Bastion_Of_Twilight.cpp
-    ${PATH_PREFIX}/Raid_Blackwing_Descent.cpp
-    ${PATH_PREFIX}/Raid_DragonSoul.cpp
-    ${PATH_PREFIX}/Raid_Firelands.cpp
-    ${PATH_PREFIX}/Instance_Lost_City_Of_Tolvir.h
-    ${PATH_PREFIX}/Instance_Blackrock_Caverns.h
-    ${PATH_PREFIX}/Instance_Grim_Batol.h
-    ${PATH_PREFIX}/Instance_Halls_Of_Origination.h
-    ${PATH_PREFIX}/Instance_Throne_Of_Tides.h
-    ${PATH_PREFIX}/Instance_The_Stonecore.h
-    ${PATH_PREFIX}/Instance_Vortex_Pinnacle.h
-    ${PATH_PREFIX}/Instance_Zul_Aman_Cata.h
-    ${PATH_PREFIX}/Instance_Zul_Gurub_Cata.h
-    ${PATH_PREFIX}/Instance_Well_Of_Eternity.h
-    ${PATH_PREFIX}/Instance_Hour_Of_Twilight.h
-    ${PATH_PREFIX}/Instance_End_Time.h
-    ${PATH_PREFIX}/Raid_Baradin_Hold.h
-    ${PATH_PREFIX}/Raid_Bastion_Of_Twilight.h
-    ${PATH_PREFIX}/Raid_Blackwing_Descent.h
-    ${PATH_PREFIX}/Raid_DragonSoul.h
-    ${PATH_PREFIX}/Raid_Firelands.h
-)
-endif ()
-
-source_group(Cata FILES ${SRC_CATA_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/BlackfathomDeeps/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/BlackfathomDeeps/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/BlackfathomDeeps)
-
-set(SRC_CLASSIC_BLACKFATHOM_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_BlackfathomDeeps.cpp
-)
-
-source_group(Classic/BlackfathomDeeps FILES ${SRC_CLASSIC_BLACKFATHOM_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackrockDepths/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackrockDepths/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/BlackrockMountain/BlackrockDepths)
-
-set(SRC_CLASSIC_BLACKROCK_DEPTHS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_BlackrockDepths.cpp
-)
-
-source_group(Classic/BlackrockMountain/BlackrockDepths FILES ${SRC_CLASSIC_BLACKROCK_DEPTHS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackrockSpire/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackrockSpire/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/BlackrockMountain/BlackrockSpire)
-
-set(SRC_CLASSIC_BLACKROCK_SPIRE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_BlackrockSpire.cpp
-)
-
-source_group(Classic/BlackrockMountain/BlackrockSpire FILES ${SRC_CLASSIC_BLACKROCK_SPIRE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackwingLair/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/BlackrockMountain/BlackwingLair/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/BlackrockMountain/BlackwingLair)
-
-set(SRC_CLASSIC_BLACKWING_LAIR_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_BlackwingLair.cpp
-)
-
-source_group(Classic/BlackrockMountain/BlackwingLair FILES ${SRC_CLASSIC_BLACKWING_LAIR_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/BlackrockMountain/MoltenCore/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/BlackrockMountain/MoltenCore/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/BlackrockMountain/MoltenCore)
-
-set(SRC_CLASSIC_MOLTENCORE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_MoltenCore.cpp
-)
-
-source_group(Classic/BlackrockMountain/MoltenCore FILES ${SRC_CLASSIC_MOLTENCORE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic)
-
-set(SRC_CLASSIC_SCRIPTS_FILES
-	${PATH_PREFIX}/Raid_WorldBosses.cpp
-    ${PATH_PREFIX}/Raid_WorldBosses.h
-)
-
-source_group(Classic FILES ${SRC_CLASSIC_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Deadmines/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Deadmines/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Deadmines)
-
-set(SRC_CLASSIC_DEADMINES_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Deadmines.cpp
-)
-
-source_group(Classic/Deadmines FILES ${SRC_CLASSIC_DEADMINES_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/DireMaul/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/DireMaul/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/DireMaul)
-
-set(SRC_CLASSIC_DIREMAUL_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_DireMaul.cpp
-)
-
-source_group(Classic/DireMaul FILES ${SRC_CLASSIC_DIREMAUL_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Gnomeregan/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Gnomeregan/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Gnomeregan)
-
-set(SRC_CLASSIC_GNOME_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Gnomeregan.cpp
-)
-
-source_group(Classic/Gnomeregan FILES ${SRC_CLASSIC_GNOME_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Maraudon/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Maraudon/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Maraudon)
-
-set(SRC_CLASSIC_MARAUDON_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Maraudon.cpp
-)
-
-source_group(Classic/Maraudon FILES ${SRC_CLASSIC_MARAUDON_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/OnyxiasLair/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/OnyxiasLair/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/OnyxiasLair)
-
-set(SRC_CLASSIC_ONYXIA_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_OnyxiasLair.cpp
-)
-
-source_group(Classic/OnyxiasLair FILES ${SRC_CLASSIC_ONYXIA_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/RagefireChasm/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/RagefireChasm/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/RagefireChasm)
-
-set(SRC_CLASSIC_RAGEFIRECHASM_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_RagefireChasm.cpp
-)
-
-source_group(Classic/RagefireChasm FILES ${SRC_CLASSIC_RAGEFIRECHASM_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/RazorfenDowns/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/RazorfenDowns/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/RazorfenDowns)
-
-set(SRC_CLASSIC_RAZORFEN_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_RazorfenDowns.cpp
-)
-
-source_group(Classic/RazorfenDowns FILES ${SRC_CLASSIC_RAZORFEN_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/RazorfenKraul/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/RazorfenKraul/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/RazorfenKraul)
-
-set(SRC_CLASSIC_RAZORFENKRAUL_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_RazorfenKraul.cpp
-)
-
-source_group(Classic/RazorfenKraul FILES ${SRC_CLASSIC_RAZORFENKRAUL_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/ScarletMonestary/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/ScarletMonestary/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/ScarletMonestary)
-
-set(SRC_CLASSIC_SCARLETMONES_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_ScarletMonastery.cpp
-)
-
-source_group(Classic/ScarletMonestary FILES ${SRC_CLASSIC_SCARLETMONES_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Scholomance/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Scholomance/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Scholomance)
-
-set(SRC_CLASSIC_SCHOLO_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Scholomance.cpp
-)
-
-source_group(Classic/Scholomance FILES ${SRC_CLASSIC_SCHOLO_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/ShadowfangKeep/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/ShadowfangKeep/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/ShadowfangKeep)
-
-set(SRC_CLASSIC_SHADOWFANG_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_ShadowfangKeep.cpp
-)
-
-source_group(Classic/ShadowfangKeep FILES ${SRC_CLASSIC_SHADOWFANG_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Stratholme/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Stratholme/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Stratholme)
-
-set(SRC_CLASSIC_STRATHOLME_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Stratholme.cpp
-)
-
-source_group(Classic/Stratholme FILES ${SRC_CLASSIC_STRATHOLME_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/SunkenTemple/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/SunkenTemple/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/SunkenTemple)
-
-set(SRC_CLASSIC_SUNKENTEMPLE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheTempleOfAtalHakkar.cpp
-)
-
-source_group(Classic/SunkenTemple FILES ${SRC_CLASSIC_SUNKENTEMPLE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/TheStockade/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/TheStockade/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/TheStockade)
-
-set(SRC_CLASSIC_STOCKADE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheStockade.cpp
-)
-
-source_group(Classic/TheStockade FILES ${SRC_CLASSIC_STOCKADE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/Uldaman/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/Uldaman/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/Uldaman)
-
-set(SRC_CLASSIC_ULDAMAN_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Uldaman.cpp
-)
-
-source_group(Classic/Uldaman FILES ${SRC_CLASSIC_ULDAMAN_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/WailingCaverns/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/WailingCaverns/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/WailingCaverns)
-
-set(SRC_CLASSIC_WAILING_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_WailingCaverns.cpp
-)
-
-source_group(Classic/WailingCaverns FILES ${SRC_CLASSIC_WAILING_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/ZulFarak/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/ZulFarak/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/ZulFarak)
-
-set(SRC_CLASSIC_ZUL_FARAK_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_ZulFarrak.cpp
-)
-
-source_group(Classic/ZulFarak FILES ${SRC_CLASSIC_ZUL_FARAK_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Classic/ZulGurub/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Classic/ZulGurub/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Classic/ZulGurub)
-
-set(SRC_CLASSIC_ZUL_GURUB_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_ZulGurub.cpp
-)
-
-source_group(Classic/ZulGurub FILES ${SRC_CLASSIC_ZUL_GURUB_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Setup.cpp
+++ b/src/scripts/InstanceScripts/Setup.cpp
@@ -63,7 +63,7 @@ extern "C" SCRIPT_DECL void _exp_script_register(ScriptMgr* mgr)    // Comment a
    SetupManaTombs(mgr);
    SetupOldHillsbradFoothills(mgr);
    SetupSethekkHalls(mgr);
-    SetupShadowLabyrinth(mgr);
+    // SetupShadowLabyrinth(mgr);
    SetupTheMechanar(mgr);
    SetupTheShatteredHalls(mgr);
    SetupTheSlavePens(mgr);
--- a/src/scripts/InstanceScripts/Setup.h
+++ b/src/scripts/InstanceScripts/Setup.h
@@ -49,7 +49,7 @@ void SetupMagistersTerrace(ScriptMgr* mgr);
 void SetupManaTombs(ScriptMgr* mgr);
 void SetupOldHillsbradFoothills(ScriptMgr* mgr);
 void SetupSethekkHalls(ScriptMgr* mgr);
-void SetupShadowLabyrinth(ScriptMgr* mgr);
+// void SetupShadowLabyrinth(ScriptMgr* mgr);
 void SetupTheMechanar(ScriptMgr* mgr);
 void SetupTheShatteredHalls(ScriptMgr* mgr);
 void SetupTheSlavePens(ScriptMgr* mgr);
--- a/src/scripts/InstanceScripts/Tbc/Auchindoun/AuchenauCrypts/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Auchindoun/AuchenauCrypts/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Auchindoun/AuchenauCrypts)
-
-set(SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_AuchenaiCrypts.cpp
-)
-
-source_group(Tbc/Auchindoun/AuchenauCrypts FILES ${SRC_TBC_AUCHENAICRYPTS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Auchindoun/ManaTombs/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Auchindoun/ManaTombs/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Auchindoun/ManaTombs)
-
-set(SRC_TBC_MANATOMBS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_ManaTombs.cpp
-)
-
-source_group(Tbc/Auchindoun/ManaTombs FILES ${SRC_TBC_MANATOMBS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Auchindoun/SethekkHalls/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Auchindoun/SethekkHalls/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Auchindoun/SethekkHalls)
-
-set(SRC_TBC_SETHEKKHALLS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_SethekkHalls.cpp
-)
-
-source_group(Tbc/Auchindoun/SethekkHalls FILES ${SRC_TBC_SETHEKKHALLS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Auchindoun/ShadowLabyrinth/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Auchindoun/ShadowLabyrinth/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Auchindoun/ShadowLabyrinth)
-
-set(SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_ShadowLabyrinth.cpp
-)
-
-source_group(Tbc/Auchindoun/ShadowLabyrinth FILES ${SRC_TBC_SHADOWLABYRINTH_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/BlackTemple/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/BlackTemple/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/BlackTemple)
-
-set(SRC_TBC_BLACKTEMPLE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_BlackTemple.cpp
-)
-
-source_group(Tbc/BlackTemple FILES ${SRC_TBC_BLACKTEMPLE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/BlackTemple/ShadeOfAkama.cpp
+++ b/src/scripts/InstanceScripts/Tbc/BlackTemple/ShadeOfAkama.cpp
@@ -3,10 +3,9 @@ Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
 This file is released under the MIT license. See README-MIT for more information.
 */

-#include <StdAfx.h>
-#include "../Setup.h"
-#include "../Base.h"
+#include "Setup.h"

+/*
 enum
 {
    // Shade of AkamaAI
@@ -744,4 +743,5 @@ void SetupShadeOfAkama(ScriptMgr* mgr)
    mgr->register_creature_script(CN_ASHTONGUE_ROGUE, &AshtonguerogueAI::Create);
    mgr->register_creature_script(CN_ASHTONGUE_SPIRITBINDER, &AshtonguespiritbinderAI::Create);
    mgr->register_creature_script(CN_ASHTONGUE_CHANNELER, &AshtongueChannelerAI::Create);
-}
+}
+*/
--- a/src/scripts/InstanceScripts/Tbc/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc)
-
-if ("${ASCEMU_NUMBER}" GREATER_EQUAL 1)
-set(SRC_TBC_SCRIPTS_FILES
-
-)
-endif ()
-
-source_group(Tbc FILES ${SRC_TBC_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CavensOfTime/BattleOfMountHyjal/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CavensOfTime/BattleOfMountHyjal/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CavensOfTime/BattleOfMountHyjal)
-
-set(SRC_TBC_COTBOFHYJAL_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_CoT_BattleOfMountHyjal.cpp
-)
-
-source_group(Tbc/CavensOfTime/BattleOfMountHyjal FILES ${SRC_TBC_COTBOFHYJAL_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CavensOfTime/BlackMorass/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CavensOfTime/BlackMorass/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CavensOfTime/BlackMorass)
-
-set(SRC_TBC_COTBLACKMORASS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_BlackMorass.cpp
-)
-
-source_group(Tbc/CavensOfTime/BlackMorass FILES ${SRC_TBC_COTBLACKMORASS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CavensOfTime/OldHillsbradFoothills/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CavensOfTime/OldHillsbradFoothills/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CavensOfTime/OldHillsbradFoothills)
-
-set(SRC_TBC_COTOLDHILLS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_OldHillsbradFoothills.cpp
-)
-
-source_group(Tbc/CavensOfTime/OldHillsbradFoothills FILES ${SRC_TBC_COTOLDHILLS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SerpentShrine/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SerpentShrine/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CoilfangReservoir/SerpentShrine)
-
-set(SRC_TBC_COILFANGSERPENTSHRINE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_SerpentshrineCavern.cpp
-)
-
-source_group(Tbc/CoilfangReservoir/SerpentShrine FILES ${SRC_TBC_COILFANGSERPENTSHRINE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SlavePens/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SlavePens/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CoilfangReservoir/SlavePens)
-
-set(SRC_TBC_COILFANGSLAVEPENS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheSlavePens.cpp
-)
-
-source_group(Tbc/CoilfangReservoir/SlavePens FILES ${SRC_TBC_COILFANGSLAVEPENS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SteamVault/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/SteamVault/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CoilfangReservoir/SteamVault)
-
-set(SRC_TBC_COILFANGSTEAMVAULT_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheSteamvault.cpp
-)
-
-source_group(Tbc/CoilfangReservoir/SteamVault FILES ${SRC_TBC_COILFANGSTEAMVAULT_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/Underbog/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/CoilfangReservoir/Underbog/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/CoilfangReservoir/Underbog)
-
-set(SRC_TBC_COILFANGUNDERBOG_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheUnderbog.cpp
-)
-
-source_group(Tbc/CoilfangReservoir/Underbog FILES ${SRC_TBC_COILFANGUNDERBOG_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/GruulsLair/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/GruulsLair/CMakeLists.txt
@@ -1,16 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/GruulsLair)
-
-set(SRC_TBC_GRUULSLAIR_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_GruulsLair.cpp
-	${PATH_PREFIX}/GruulTheDragonKiller.cpp
-	${PATH_PREFIX}/HighKingMaulgar.cpp
-	
-	${PATH_PREFIX}/Raid_GruulsLair.hpp
-	${PATH_PREFIX}/GruulTheDragonKiller.hpp
-	${PATH_PREFIX}/HighKingMaulgar.hpp
-)
-
-source_group(Tbc/GruulsLair FILES ${SRC_TBC_GRUULSLAIR_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/GruulsLair/GruulTheDragonKiller.cpp
+++ b/src/scripts/InstanceScripts/Tbc/GruulsLair/GruulTheDragonKiller.cpp
@@ -140,7 +140,7 @@ SpellScriptEffectDamage ShatterDamage::doCalculateEffect(Spell* spell, uint8_t e
    if (distance < 1.0f)
        distance = 1.0f;

-    *dmg = float2int32(*dmg * ((radius - distance ) / radius));
+    *dmg = float2int32(*dmg * ((radius - distance) / radius));

    return SpellScriptEffectDamage::DAMAGE_FULL_RECALCULATION;
 }
--- a/src/scripts/InstanceScripts/Tbc/HellfireCitadel/BloodFurnace/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/HellfireCitadel/BloodFurnace/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/HellfireCitadel/BloodFurnace)
-
-set(SRC_TBC_BLOODFURNACE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_BloodFurnace.cpp
-)
-
-source_group(Tbc/HellfireCitadel/BloodFurnace FILES ${SRC_TBC_BLOODFURNACE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/HellfireCitadel/HellfireRamparts/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/HellfireCitadel/HellfireRamparts/CMakeLists.txt
@@ -1,17 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/HellfireCitadel/HellfireRamparts)
-
-set(SRC_TBC_HELLFIRERAMPARTS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_HellfireRamparts.cpp
-    ${PATH_PREFIX}/Instance_HellfireRamparts.hpp
-    ${PATH_PREFIX}/NazanAndVazruden.cpp
-    ${PATH_PREFIX}/NazanAndVazruden.hpp
-    ${PATH_PREFIX}/Omor.cpp
-    ${PATH_PREFIX}/Omor.hpp
-    ${PATH_PREFIX}/WatchkeeperGargolmar.cpp
-    ${PATH_PREFIX}/WatchkeeperGargolmar.hpp
-)
-
-source_group(Tbc/HellfireCitadel/HellfireRamparts FILES ${SRC_TBC_HELLFIRERAMPARTS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/HellfireCitadel/HellfireRamparts/Instance_HellfireRamparts.hpp
+++ b/src/scripts/InstanceScripts/Tbc/HellfireCitadel/HellfireRamparts/Instance_HellfireRamparts.hpp
@@ -38,7 +38,7 @@ public:

    void OnCreaturePushToWorld(Creature* /*pCreature*/) override;
    void OnGameObjectPushToWorld(GameObject* /*pGameObject*/) override;
-    void OnEncounterStateChange(uint32_t /*entry*/, uint32_t /*state*/ ) override;
+    void OnEncounterStateChange(uint32_t /*entry*/, uint32_t /*state*/) override;
    void OnSpawnGroupKilled(uint32_t /*groupId*/) override;

 protected:
--- a/src/scripts/InstanceScripts/Tbc/HellfireCitadel/MagtheridonsLair/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/HellfireCitadel/MagtheridonsLair/CMakeLists.txt
@@ -1,14 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/HellfireCitadel/MagtheridonsLair)
-
-set(SRC_TBC_MAGTHERIDONSLAIR_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_Magtheridons_Lair.cpp
-	${PATH_PREFIX}/Magtheridon.cpp
-	
-	${PATH_PREFIX}/Raid_Magtheridons_Lair.hpp
-	${PATH_PREFIX}/Magtheridon.hpp
-)
-
-source_group(Tbc/HellfireCitadel/MagtheridonsLair FILES ${SRC_TBC_MAGTHERIDONSLAIR_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/HellfireCitadel/ShatteredHalls/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/HellfireCitadel/ShatteredHalls/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/HellfireCitadel/ShatteredHalls)
-
-set(SRC_TBC_SHATTREDHALLS_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheShatteredHalls.cpp
-)
-
-source_group(Tbc/HellfireCitadel/ShatteredHalls FILES ${SRC_TBC_SHATTREDHALLS_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Karazhan/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Karazhan/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Karazhan)
-
-set(SRC_TBC_KARAZHAN_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_Karazhan.cpp
-)
-
-source_group(Tbc/Karazhan FILES ${SRC_TBC_KARAZHAN_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Sunwell/MagistersTerrace/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Sunwell/MagistersTerrace/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Sunwell/MagistersTerrace)
-
-set(SRC_TBC_MAGISTERSTERRACE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_MagistersTerrace.cpp
-)
-
-source_group(Tbc/Sunwell/MagistersTerrace FILES ${SRC_TBC_MAGISTERSTERRACE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/Sunwell/SunwellPlateau/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/Sunwell/SunwellPlateau/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/Sunwell/SunwellPlateau)
-
-set(SRC_TBC_SUNWELLPLATEAU_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_SunwellPlateau.cpp
-)
-
-source_group(Tbc/Sunwell/SunwellPlateau FILES ${SRC_TBC_SUNWELLPLATEAU_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/TempestKeep/Arcatraz/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/TempestKeep/Arcatraz/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/TempestKeep/Arcatraz)
-
-set(SRC_TBC_ARCATRAZ_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Arcatraz.cpp
-)
-
-source_group(Tbc/TempestKeep/Arcatraz FILES ${SRC_TBC_ARCATRAZ_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/TempestKeep/Botanica/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/TempestKeep/Botanica/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/TempestKeep/Botanica)
-
-set(SRC_TBC_BOTANICA_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_Botanica.cpp
-)
-
-source_group(Tbc/TempestKeep/Botanica FILES ${SRC_TBC_BOTANICA_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/TempestKeep/Mechanar/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/TempestKeep/Mechanar/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/TempestKeep/Mechanar)
-
-set(SRC_TBC_MECHANAR_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TheMechanar.cpp
-)
-
-source_group(Tbc/TempestKeep/Mechanar FILES ${SRC_TBC_MECHANAR_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/TempestKeep/TheEye/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/TempestKeep/TheEye/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/TempestKeep/TheEye)
-
-set(SRC_TBC_THEEYE_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_TheEye.cpp
-)
-
-source_group(Tbc/TempestKeep/TheEye FILES ${SRC_TBC_THEEYE_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Tbc/ZulAman/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Tbc/ZulAman/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Tbc/ZulAman)
-
-set(SRC_TBC_ZULAMAN_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_ZulAman.cpp
-)
-
-source_group(Tbc/ZulAman FILES ${SRC_TBC_ZULAMAN_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/AzjolNerub/Ahnkahet/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/AzjolNerub/Ahnkahet/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/AzjolNerub/Ahnkahet)
-
-set(SRC_WOTLK_AHNKAHETOLDK_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_AhnKahetTheOldKingdom.cpp
-)
-
-source_group(Wotlk/AzjolNerub/Ahnkahet FILES ${SRC_WOTLK_AHNKAHETOLDK_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/AzjolNerub/AzjolNerub/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/AzjolNerub/AzjolNerub/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/AzjolNerub/AzjolNerub)
-
-set(SRC_WOTLK_AZJOLNERUB_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_AzjolNerub.cpp
-)
-
-source_group(Wotlk/AzjolNerub/AzjolNerub FILES ${SRC_WOTLK_AZJOLNERUB_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/CMakeLists.txt
@@ -1,12 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk)
-
-if ("${ASCEMU_NUMBER}" GREATER_EQUAL 2)
-set(SRC_WOTLK_SCRIPTS_FILES
-
-)
-endif ()
-
-source_group(Wotlk FILES ${SRC_WOTLK_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/CavernsOfTime/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/CavernsOfTime/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/CavernsOfTime)
-
-set(SRC_WOTLK_COTCULLINGOFSTRAT_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_CullingOfStratholme.cpp
-)
-
-source_group(Wotlk/CavernsOfTime FILES ${SRC_WOTLK_COTCULLINGOFSTRAT_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/ChamberOfAspects/ObsidianSanctum/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/ChamberOfAspects/ObsidianSanctum/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/ChamberOfAspects/ObsidianSanctum)
-
-set(SRC_WOTLK_OBSIDUANSANCTUM_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_TheObsidianSanctum.cpp
-)
-
-source_group(Wotlk/ChamberOfAspects/ObsidianSanctum FILES ${SRC_WOTLK_OBSIDUANSANCTUM_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/ChamberOfAspects/RubySanctum/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/ChamberOfAspects/RubySanctum/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/ChamberOfAspects/RubySanctum)
-
-set(SRC_WOTLK_RUBYSANCTUM_SCRIPTS_FILES
-
-)
-
-source_group(Wotlk/ChamberOfAspects/RubySanctum FILES ${SRC_WOTLK_RUBYSANCTUM_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/CrusadersColiseum/TrialOfTheChampion/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/CrusadersColiseum/TrialOfTheChampion/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/CrusadersColiseum/TrialOfTheChampion)
-
-set(SRC_WOTLK_TRIALOFCHAMPION_SCRIPTS_FILES
-    ${PATH_PREFIX}/Instance_TrialOfTheChampion.cpp
-)
-
-source_group(Wotlk/CrusadersColiseum/TrialOfTheChampion FILES ${SRC_WOTLK_TRIALOFCHAMPION_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/src/scripts/InstanceScripts/Wotlk/CrusadersColiseum/TrialOfTheCrusader/CMakeLists.txt
+++ b/src/scripts/InstanceScripts/Wotlk/CrusadersColiseum/TrialOfTheCrusader/CMakeLists.txt
@@ -1,10 +0,0 @@
-# Copyright (c) 2014-2023 AscEmu Team <http://www.ascemu.org>
-
-set(PATH_PREFIX Wotlk/CrusadersColiseum/TrialOfTheCrusader)
-
-set(SRC_WOTLK_TRIALOFCRUSADER_SCRIPTS_FILES
-    ${PATH_PREFIX}/Raid_TrialOfTheCrusader.cpp
-)
-
-source_group(Wotlk/CrusadersColiseum/TrialOfTheCrusader FILES ${SRC_WOTLK_TRIALOFCRUSADER_SCRIPTS_FILES})
-unset(PATH_PREFIX)
--- a/Show More
+++ b/Show More