Merge pull request #3 from SapphireServer/develop

Develop

.appveyor.yml

@@ -24,8 +24,6 @@ before_build:
   - cmake --build . --target ALL_BUILD --config Release
 
 build_script:
-  - cd ..
   - cd bin  
   - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll
-  - cd ..  
   - sh sql_import.sh

.gitignore

@@ -141,5 +141,5 @@ doxygen/generated/
 doxygen/*.tmp
 
 # ignore config directory contents except the default file
-bin/config/*.ini
-!bin/config/config.ini.default
+config/*.ini
+!config/config.ini.default

.travis.yml

@@ -38,5 +38,5 @@ script:
   - mkdir -p build
   - cd build
   - cmake .. && make -j 3
-  - cd ..
+  - cd bin
   - bash sql_import.sh

CMakeLists.txt

@@ -2,18 +2,23 @@ cmake_policy( SET CMP0014 NEW )
 cmake_minimum_required( VERSION 3.0.2 )
 project( Sapphire )
 
-set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin )
-
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin )
-set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
-
 set( CMAKE_MODULE_PATH
        ${CMAKE_MODULE_PATH}
        ${CMAKE_SOURCE_DIR}/cmake )
 
+#####################################
+# Copy needed files to build-folder #
+#####################################
+add_custom_target( copy_runtime_files ALL
+                     COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/config ${CMAKE_BINARY_DIR}/bin/config 
+                     COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/bin/sql 
+                     COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web 
+                     COMMAND cmake -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh )
+
 ######################################
 # Dependencies and compiler settings #
 ######################################
+include( "cmake/paths.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
 include( "cmake/cotire.cmake" )
@@ -53,11 +58,4 @@ add_subdirectory( "src/dbm" )
 ##############################
 #           Tools            #
 ##############################
-add_subdirectory( "src/tools/exd_common_gen" )
-add_subdirectory( "src/tools/exd_struct_gen" )
-add_subdirectory( "src/tools/exd_struct_test" )
-add_subdirectory( "src/tools/quest_parser" )
-add_subdirectory( "src/tools/discovery_parser" )
-add_subdirectory( "src/tools/mob_parse" )
-add_subdirectory( "src/tools/pcb_reader" )
-add_subdirectory( "src/tools/event_object_parser" )
+add_subdirectory( "src/tools" )

CMakeSettings.json

@@ -1,22 +1,6 @@
 {
   // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
   "configurations": [
-    {
-      "name": "x86-Debug",
-      "generator": "Visual Studio 15 2017",
-      "configurationType": "Debug",
-      "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
-      "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"Debug\"",
-      "buildCommandArgs": "-m -v:minimal"
-    },
-    {
-      "name": "x86-Release",
-      "generator": "Visual Studio 15 2017",
-      "configurationType": "Release",
-      "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-m -v:minimal"
-    },
     {
       "name": "x64-Debug",
       "generator": "Visual Studio 15 2017 Win64",

cmake/FindMySQL.cmake

@@ -64,12 +64,6 @@ if( UNIX )
 endif( UNIX )
 
 if( WIN32 )
-  # read environment variables and change \ to /
-  SET(PROGRAM_FILES_32 $ENV{ProgramFiles})
-  if (${PROGRAM_FILES_32})
-    STRING(REPLACE "\\\\" "/" PROGRAM_FILES_32 ${PROGRAM_FILES_32})
-  endif(${PROGRAM_FILES_32})
-
   SET(PROGRAM_FILES_64 $ENV{ProgramW6432})
   if (${PROGRAM_FILES_64})
      STRING(REPLACE "\\\\" "/" PROGRAM_FILES_64 ${PROGRAM_FILES_64})
@@ -86,33 +80,12 @@ find_path(MYSQL_INCLUDE_DIR
     /usr/local/include
     /usr/local/include/mysql
     /usr/local/mysql/include
-    "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/include"
-    "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/include"
-    "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/include"
-    "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/include"
-    "${PROGRAM_FILES_32}/MySQL/include"
     "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/include"
     "${PROGRAM_FILES_64}/MySQL/include"
     "C:/MySQL/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
     "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include"
-    "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/include"
-    "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/include"
-    "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/include"
     "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include"
-    "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/include"
-    "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/include"
-    "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/include"
     "c:/msys/local/include"
     "$ENV{MYSQL_ROOT}/include"
   DOC
@@ -142,53 +115,24 @@ if( WIN32 )
       libmysql
     PATHS
       ${MYSQL_ADD_LIBRARIES_PATH}
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib/opt"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib/opt"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib/opt"
-      "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib/opt"
-      "${PROGRAM_FILES_32}/MySQL/lib"
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib"
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib/opt"
       "${PROGRAM_FILES_64}/MySQL/lib"
       "C:/MySQL/lib/debug"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
       "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/lib/opt"
-      "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/lib/opt"
-      "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/lib/opt"
-      "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/lib/opt"
       "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt"
-      "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/lib/opt"
-      "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/lib/opt"
-      "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/lib/opt"
       "c:/msys/local/include"
       "$ENV{MYSQL_ROOT}/lib"
     DOC "Specify the location of the mysql library here."
   )
+
+  STRING( REGEX REPLACE "(.lib)$" ".dll" MYSQL_DLL ${MYSQL_LIBRARY} )
+
+  file(COPY ${MYSQL_DLL}
+            DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+
 endif( WIN32 )
 
 # On Windows you typically don't need to include any extra libraries
@@ -223,49 +167,14 @@ endif( UNIX )
 if( WIN32 )
     find_program(MYSQL_EXECUTABLE mysql
       PATHS
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin/opt"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin/opt"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin/opt"
-        "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin/opt"
-        "${PROGRAM_FILES_32}/MySQL/bin"
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin"
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin/opt"
         "${PROGRAM_FILES_64}/MySQL/bin"
         "C:/MySQL/bin/debug"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
         "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/bin/opt"
-        "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/bin/opt"
-        "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/bin/opt"
-        "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/bin/opt"
         "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt"
-        "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/bin/opt"
-        "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/bin/opt"
-        "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/bin/opt"
         "c:/msys/local/include"
         "$ENV{MYSQL_ROOT}/bin"
      DOC

cmake/compiler.cmake

@@ -7,19 +7,13 @@ else()
   add_definitions( -DNOMINMAX )
       
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc" )
+  message( STATUS "Enabling Build with Multiple Processes.." )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP" )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" )
   set( CMAKE_CXX_STANDARD 17 )
   set( CMAKE_CXX_STANDARD_REQUIRED ON )
   set( CMAKE_CXX_EXTENSIONS ON )
 
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/bin/" )
-
-  set( VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/" )
-
   if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
     # disabling SAFESEH
     message( STATUS "Disabling Safe Exception Handlers.." )
@@ -32,10 +26,6 @@ else()
     # incremental linking
     message( STATUS "Enabling Incremental Linking.." )
     set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL" )
-
-    # enable building with multiple processes
-    message( STATUS "Enabling Build with Multiple Processes.." )
-    add_definitions( /MP )
   endif()
 endif()
 

cmake/paths.cmake

@@ -0,0 +1,14 @@
+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
+set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
+
+if( WIN32 )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+endif()
+
+# Create log folder
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/log )

src/common/CMakeLists.txt

@@ -13,14 +13,13 @@ file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
 
-set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 
 add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
 
 target_link_libraries( common
                          PUBLIC
-			   xivdat
-			   mysqlConnector
+                           xivdat
+                           mysqlConnector
                            mysql )
 if( UNIX )
   target_link_libraries( common 
@@ -34,7 +33,5 @@ target_include_directories( common
                                 "${CMAKE_CURRENT_SOURCE_DIR}/"
                                 "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/"
                                 "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/asio/asio/include/"
-                                "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/"
-                              PRIVATE
-                                "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/")
+                                "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/" )
 

src/scripts/CMakeLists.txt

@@ -10,6 +10,13 @@ set(EXECUTABLE_OUTPUT_PATH "${SCRIPT_LIB_DIR}")
 set(LIBRARY_OUTPUT_PATH "${SCRIPT_LIB_DIR}")
 set(RUNTIME_OUTPUT_DIRECTORY "${SCRIPT_LIB_DIR}")
 
+if( WIN32 )
+    set( LIBRARY_OUTPUT_DIRECTORY_DEBUG "${SCRIPT_LIB_DIR}" )
+    set( LIBRARY_OUTPUT_DIRECTORY_RELEASE "${SCRIPT_LIB_DIR}" )
+    set( LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SCRIPT_LIB_DIR}" )
+    set( LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${SCRIPT_LIB_DIR}" )
+endif()
+
 file(GLOB children "${CMAKE_CURRENT_SOURCE_DIR}/*" )
 foreach(_scriptDir ${children})
     get_filename_component(_name "${_scriptDir}" NAME_WE)
@@ -34,18 +41,14 @@ foreach(_scriptDir ${children})
             endif()
         endforeach()
 
-        add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
+        add_library( "script_${_name}"
+                       MODULE 
+                         ${SCRIPT_BUILD_FILES} 
+                         "${SCRIPT_INCLUDE_FILES}"
+                         "${_scriptDir}/ScriptLoader.cpp" )
+
         target_link_libraries( "script_${_name}" world )
 
-        if(MSVC)
-            set_target_properties( "script_${_name}" PROPERTIES
-                LIBRARY_OUTPUT_DIRECTORY_DEBUG "${SCRIPT_LIB_DIR}"
-                LIBRARY_OUTPUT_DIRECTORY_RELEASE "${SCRIPT_LIB_DIR}"
-                LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SCRIPT_LIB_DIR}"
-                LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${SCRIPT_LIB_DIR}"
-            )
-        endif()
-        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/world/")
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/scripts")
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
         target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Scripts")

src/tools/CMakeLists.txt

@@ -0,0 +1,26 @@
+cmake_policy( SET CMP0014 NEW )
+cmake_minimum_required( VERSION 3.0.2 )
+project( Sapphire )
+
+set( EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/tools )
+set( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/tools )
+
+if( WIN32 )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/tools" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/tools" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}/tools" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}/tools" )
+  set( VS_DEBUGGER_WORKING_DIRECTORY "${VS_DEBUGGER_WORKING_DIRECTORY}/tools" )
+endif()
+
+##############################
+#           Tools            #
+##############################
+add_subdirectory( "exd_common_gen" )
+add_subdirectory( "exd_struct_gen" )
+add_subdirectory( "exd_struct_test" )
+add_subdirectory( "quest_parser" )
+add_subdirectory( "discovery_parser" )
+add_subdirectory( "mob_parse" )
+add_subdirectory( "pcb_reader" )
+add_subdirectory( "event_object_parser" )

src/tools/discovery_parser/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_discovery_parser)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
+#set( CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_BINARY_DIR}/bin/tools")
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES 
   "${CMAKE_CURRENT_SOURCE_DIR}/*"
@@ -16,12 +16,12 @@ file(GLOB SERVER_SOURCE_FILES
 #set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(discovery_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(discovery_parser PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
+#set_target_properties(discovery_parser PROPERTIES
+#    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+#    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+#    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+#    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+#)
 
 if (UNIX)
     target_link_libraries (discovery_parser common xivdat pthread mysqlclient dl z stdc++fs)

src/tools/event_object_parser/CMakeLists.txt

@@ -2,23 +2,12 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_event_object_parser)
 
-set(SAPPHIRE_BOOST_VER 1.63.0)
-set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 #set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(event_object_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(event_object_parser PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
 
 if (UNIX)
     target_link_libraries (event_object_parser common xivdat pthread mysqlclient dl z stdc++fs)

src/tools/exd_common_gen/CMakeLists.txt

@@ -2,21 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_ExdCommonGen)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 add_executable(exd_common_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(exd_common_gen PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
     target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z stdc++fs)
 else()

src/tools/exd_struct_gen/CMakeLists.txt

@@ -2,24 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_ExdStructGen)
 
-set(SAPPHIRE_BOOST_VER 1.63.0)
-set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(exd_struct_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(exd_struct_gen PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
   target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z stdc++fs)
 else()

src/tools/exd_struct_test/CMakeLists.txt

@@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_ExdStructTest)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(exd_struct_test ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(exd_struct_test PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
   target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z stdc++fs )
 else()

src/tools/mob_parse/CMakeLists.txt

@@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_mob_parse)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(mob_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(mob_parse PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
     target_link_libraries (mob_parse common xivdat pthread mysqlclient dl z stdc++fs )
 else()

src/tools/pcb_reader/CMakeLists.txt

@@ -2,22 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_pcb_reader2)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(pcb_reader2 PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
     target_link_libraries (pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs )
 else()

src/tools/quest_parser/CMakeLists.txt

@@ -2,30 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Tool_QuestParser)
 
-set(SAPPHIRE_BOOST_VER 1.63.0)
-set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
-
-include_directories("../../lib/ChaiScript-6.0.0/include/")
-
-include_directories("../../sapphire/datReader/")
-include_directories("../../sapphire/")
-include_directories("../")
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
 add_executable(quest_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-set_target_properties(quest_parse PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-)
-
 if (UNIX)
   target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z stdc++fs)
 else()

src/world/Actor/SpawnGroup.cpp

@@ -0,0 +1,8 @@
+#include "ForwardsZone.h"
+#include "SpawnGroup.h"
+
+Sapphire::Entity::SpawnGroup::SpawnGroup( uint32_t bNpcTemplateId, uint32_t level ) :
+  m_level( level )
+{
+
+}

src/world/Actor/SpawnGroup.h

@@ -17,7 +17,7 @@ namespace Sapphire::Entity
     std::vector< SpawnPointPtr > m_spawnPoints;
 
   public:
-    SpawnGroup();
+    SpawnGroup( uint32_t bNpcTemplateId, uint32_t level );
 
   };
 

src/world/Territory/Zone.cpp

@@ -76,6 +76,7 @@ Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId,
   m_territoryTypeInfo = pExdData->get< Sapphire::Data::TerritoryType >( territoryTypeId );
 
   loadWeatherRates();
+  loadSpawnGroups();
 
   m_currentWeather = getNextWeather();
 }