mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-15 20:52:22 -04:00
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts: src/server/game/Maps/Map.cpp src/server/game/Movement/MovementGenerator.h src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/PointMovementGenerator.h src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h src/server/game/Spells/SpellEffects.cpp
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -7,10 +7,12 @@ build*/
|
||||
*~
|
||||
.hg/
|
||||
*.kdev*
|
||||
.DS_Store
|
||||
CMakeLists.txt.user
|
||||
*.bak
|
||||
*.patch
|
||||
*.diff
|
||||
*.REMOTE.*
|
||||
*.BACKUP.*
|
||||
*.BASE.*
|
||||
*.LOCAL.*
|
||||
*.LOCAL.*
|
||||
|
||||
15
cmake/compiler/clang/settings.cmake
Normal file
15
cmake/compiler/clang/settings.cmake
Normal file
@@ -0,0 +1,15 @@
|
||||
# Set build-directive (used in core to tell which buildtype we used)
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
|
||||
|
||||
if(WITH_WARNINGS)
|
||||
set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Wfatal-errors")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
|
||||
message(STATUS "Clang: All warnings enabled")
|
||||
endif()
|
||||
|
||||
if(WITH_COREDEBUG)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
|
||||
message(STATUS "Clang: Debug-flags set (-g3)")
|
||||
endif()
|
||||
@@ -1,24 +1,24 @@
|
||||
# Set build-directive (used in core to tell which buildtype we used)
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
|
||||
|
||||
add_definitions(-fno-delete-null-pointer-checks)
|
||||
|
||||
if(PLATFORM EQUAL 32)
|
||||
# Required on 32-bit systems to enable SSE2 (standard on x64)
|
||||
add_definitions(-msse2 -mfpmath=sse)
|
||||
set(SSE_FLAGS "-msse2 -mfpmath=sse")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
|
||||
endif()
|
||||
add_definitions(-DHAVE_SSE2 -D__SSE2__)
|
||||
message(STATUS "GCC: SSE2 flags forced")
|
||||
message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
|
||||
|
||||
if( WITH_WARNINGS )
|
||||
add_definitions(-Wall -Wfatal-errors -Wextra)
|
||||
set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Winvalid-pch -Wfatal-errors")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
|
||||
message(STATUS "GCC: All warnings enabled")
|
||||
else()
|
||||
add_definitions(--no-warnings)
|
||||
message(STATUS "GCC: All warnings disabled")
|
||||
endif()
|
||||
|
||||
if( WITH_COREDEBUG )
|
||||
add_definitions(-ggdb3)
|
||||
message(STATUS "GCC: Debug-flags set (-ggdb3)")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
|
||||
message(STATUS "GCC: Debug-flags set (-g3)")
|
||||
endif()
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# Set build-directive (used in core to tell which buildtype we used)
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
|
||||
@@ -1,315 +1,104 @@
|
||||
# - Try to find precompiled headers support for GCC 3.4 and 4.x (and MSVC)
|
||||
# Once done this will define:
|
||||
#
|
||||
# Variable:
|
||||
# PCHSupport_FOUND
|
||||
#
|
||||
# Macro:
|
||||
# ADD_PRECOMPILED_HEADER _targetName _input _dowarn
|
||||
# ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use _dowarn
|
||||
# ADD_NATIVE_PRECOMPILED_HEADER _targetName _input _dowarn
|
||||
# GET_NATIVE_PRECOMPILED_HEADER _targetName _input
|
||||
FUNCTION(GET_COMMON_PCH_PARAMS PCH_HEADER PCH_FE INCLUDE_PREFIX)
|
||||
GET_FILENAME_COMPONENT(PCH_HEADER_N ${PCH_HEADER} NAME)
|
||||
GET_DIRECTORY_PROPERTY(TARGET_INCLUDES INCLUDE_DIRECTORIES)
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
FOREACH(ITEM ${TARGET_INCLUDES})
|
||||
LIST(APPEND INCLUDE_FLAGS_LIST "${INCLUDE_PREFIX}${ITEM} ")
|
||||
ENDFOREACH(ITEM)
|
||||
|
||||
EXEC_PROGRAM(
|
||||
${CMAKE_CXX_COMPILER}
|
||||
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
|
||||
OUTPUT_VARIABLE gcc_compiler_version
|
||||
)
|
||||
#MESSAGE("GCC Version: ${gcc_compiler_version}")
|
||||
IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
|
||||
SET(PCHSupport_FOUND TRUE)
|
||||
ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
|
||||
IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
|
||||
SET(PCHSupport_FOUND TRUE)
|
||||
ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
|
||||
ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
|
||||
SET(PCH_HEADER_NAME ${PCH_HEADER_N} PARENT_SCOPE)
|
||||
SET(PCH_HEADER_OUT ${CMAKE_CURRENT_BINARY_DIR}/${PCH_HEADER_N}.${PCH_FE} PARENT_SCOPE)
|
||||
SET(INCLUDE_FLAGS ${INCLUDE_FLAGS_LIST} PARENT_SCOPE)
|
||||
ENDFUNCTION(GET_COMMON_PCH_PARAMS)
|
||||
|
||||
SET(_PCH_include_prefix "-I")
|
||||
FUNCTION(GENERATE_CXX_PCH_COMMAND TARGET_NAME INCLUDE_FLAGS IN PCH_SRC OUT)
|
||||
IF (CMAKE_BUILD_TYPE)
|
||||
STRING(TOUPPER _${CMAKE_BUILD_TYPE} CURRENT_BUILD_TYPE)
|
||||
ENDIF ()
|
||||
|
||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||
SET(COMPILE_FLAGS ${CMAKE_CXX_FLAGS${CURRENT_BUILD_TYPE}})
|
||||
LIST(APPEND COMPILE_FLAGS ${CMAKE_CXX_FLAGS})
|
||||
|
||||
IF(WIN32)
|
||||
SET(PCHSupport_FOUND TRUE) # for experimental msvc support
|
||||
SET(_PCH_include_prefix "/I")
|
||||
ELSE(WIN32)
|
||||
SET(PCHSupport_FOUND FALSE)
|
||||
ENDIF(WIN32)
|
||||
IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
||||
IF (NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
|
||||
LIST(APPEND COMPILE_FLAGS "-arch ${CMAKE_OSX_ARCHITECTURES}")
|
||||
ENDIF ()
|
||||
IF (NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "")
|
||||
LIST(APPEND COMPILE_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT}")
|
||||
ENDIF ()
|
||||
IF (NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "")
|
||||
LIST(APPEND COMPILE_FLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
||||
ENDIF ()
|
||||
ENDIF ()
|
||||
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
GET_DIRECTORY_PROPERTY(TARGET_DEFINITIONS COMPILE_DEFINITIONS)
|
||||
FOREACH(ITEM ${TARGET_DEFINITIONS})
|
||||
LIST(APPEND DEFINITION_FLAGS "-D${ITEM} ")
|
||||
ENDFOREACH(ITEM)
|
||||
|
||||
MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
|
||||
SEPARATE_ARGUMENTS(COMPILE_FLAGS)
|
||||
SEPARATE_ARGUMENTS(INCLUDE_FLAGS)
|
||||
SEPARATE_ARGUMENTS(DEFINITION_FLAGS)
|
||||
|
||||
STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
|
||||
SET(${_out_compile_flags} ${${_flags_var_name}} )
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
||||
IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
|
||||
LIST(APPEND ${_out_compile_flags} -fPIC)
|
||||
ENDIF()
|
||||
|
||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||
## TODO ... ? or does it work out of the box
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
|
||||
FOREACH(item ${DIRINC})
|
||||
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}")
|
||||
ENDFOREACH(item)
|
||||
|
||||
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
|
||||
GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
|
||||
#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
|
||||
LIST(APPEND ${_out_compile_flags} ${_directory_flags})
|
||||
LIST(APPEND ${_out_compile_flags} ${_global_definitions})
|
||||
LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
|
||||
|
||||
SEPARATE_ARGUMENTS(${_out_compile_flags})
|
||||
|
||||
ENDMACRO(_PCH_GET_COMPILE_FLAGS)
|
||||
|
||||
MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp)
|
||||
|
||||
SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx)
|
||||
FILE(WRITE ${${_dephelp}}
|
||||
"#include \"${_include_file}\"
|
||||
int testfunction()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
"
|
||||
)
|
||||
|
||||
ENDMACRO(_PCH_WRITE_PCHDEP_CXX )
|
||||
|
||||
MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
|
||||
|
||||
FILE(TO_NATIVE_PATH ${_input} _native_input)
|
||||
FILE(TO_NATIVE_PATH ${_output} _native_output)
|
||||
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
IF(CMAKE_CXX_COMPILER_ARG1)
|
||||
# remove leading space in compiler argument
|
||||
STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
|
||||
|
||||
SET(${out_command}
|
||||
${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
||||
)
|
||||
ELSE(CMAKE_CXX_COMPILER_ARG1)
|
||||
SET(${out_command}
|
||||
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
||||
)
|
||||
ENDIF(CMAKE_CXX_COMPILER_ARG1)
|
||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
SET(_dummy_str "#include <${_input}>")
|
||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str})
|
||||
|
||||
SET(${out_command}
|
||||
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp
|
||||
)
|
||||
#/out:${_output}
|
||||
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
ENDMACRO(_PCH_GET_COMPILE_COMMAND )
|
||||
|
||||
|
||||
|
||||
MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn )
|
||||
|
||||
FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path)
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
# for use with distcc and gcc >4.0.1 if preprocessed files are accessible
|
||||
# on all remote machines set
|
||||
# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
|
||||
# if you want warnings for invalid header files (which is very inconvenient
|
||||
# if you have different versions of the headers for different build types
|
||||
# you may set _pch_dowarn
|
||||
IF (_dowarn)
|
||||
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch " )
|
||||
ELSE (_dowarn)
|
||||
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} " )
|
||||
ENDIF (_dowarn)
|
||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
set(${_cflags} "/Fp${_native_pch_path} /Yu${_header_name}" )
|
||||
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS )
|
||||
|
||||
MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
|
||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
||||
SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.gch")
|
||||
ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
|
||||
|
||||
|
||||
MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
|
||||
|
||||
# to do: test whether compiler flags match between target _targetName
|
||||
# and _pch_output_to_use
|
||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||
|
||||
IF( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 0)
|
||||
ELSE( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 1)
|
||||
ENDIF("${ARGN}" STREQUAL "0")
|
||||
|
||||
|
||||
_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})
|
||||
# MESSAGE("Add flags ${_target_cflags} to ${_targetName} " )
|
||||
SET_TARGET_PROPERTIES(${_targetName}
|
||||
PROPERTIES
|
||||
COMPILE_FLAGS ${_target_cflags}
|
||||
)
|
||||
|
||||
ADD_CUSTOM_TARGET(pch_Generate_${_targetName}
|
||||
DEPENDS ${_pch_output_to_use}
|
||||
)
|
||||
|
||||
ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
|
||||
|
||||
ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET)
|
||||
|
||||
MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
|
||||
|
||||
SET(_PCH_current_target ${_targetName})
|
||||
|
||||
IF(NOT CMAKE_BUILD_TYPE)
|
||||
MESSAGE(FATAL_ERROR
|
||||
"This is the ADD_PRECOMPILED_HEADER macro. "
|
||||
"You must set CMAKE_BUILD_TYPE!"
|
||||
)
|
||||
ENDIF(NOT CMAKE_BUILD_TYPE)
|
||||
|
||||
IF( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 0)
|
||||
ELSE( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 1)
|
||||
ENDIF("${ARGN}" STREQUAL "0")
|
||||
|
||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
||||
GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output)
|
||||
|
||||
GET_FILENAME_COMPONENT(_outdir ${_output} PATH )
|
||||
|
||||
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
||||
_PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx)
|
||||
|
||||
IF(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx} )
|
||||
ELSE(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx})
|
||||
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||
|
||||
FILE(MAKE_DIRECTORY ${_outdir})
|
||||
|
||||
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
|
||||
|
||||
#MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
|
||||
#message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
|
||||
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc
|
||||
DEPENDS ${_input}
|
||||
)
|
||||
|
||||
#message("_command ${_input} ${_output}")
|
||||
_PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} )
|
||||
|
||||
#message(${_input} )
|
||||
#message("_output ${_output}")
|
||||
GET_FILENAME_COMPONENT(PCH_SRC_N ${PCH_SRC} NAME)
|
||||
ADD_LIBRARY(${PCH_SRC_N}_dephelp MODULE ${PCH_SRC})
|
||||
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${_output}
|
||||
COMMAND ${_command}
|
||||
DEPENDS ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp
|
||||
OUTPUT ${OUT}
|
||||
COMMAND ${CMAKE_CXX_COMPILER}
|
||||
ARGS ${DEFINITION_FLAGS} ${COMPILE_FLAGS} ${INCLUDE_FLAGS} -x c++-header ${IN} -o ${OUT}
|
||||
DEPENDS ${IN} ${PCH_SRC_N}_dephelp
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn})
|
||||
ENDMACRO(ADD_PRECOMPILED_HEADER)
|
||||
ADD_CUSTOM_TARGET(generate_${PCH_SRC_N}
|
||||
DEPENDS ${OUT}
|
||||
)
|
||||
|
||||
# Generates the use of precompiled in a target,
|
||||
# without using depency targets (2 extra for each target)
|
||||
# Using Visual, must also add ${_targetName}_pch to sources
|
||||
# Not needed by Xcode
|
||||
ADD_DEPENDENCIES(${TARGET_NAME} generate_${PCH_SRC_N})
|
||||
ENDFUNCTION(GENERATE_CXX_PCH_COMMAND)
|
||||
|
||||
MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
||||
FUNCTION(ADD_CXX_PCH_GCC TARGET_NAME PCH_HEADER PCH_SOURCE)
|
||||
GET_COMMON_PCH_PARAMS(${PCH_HEADER} "gch" "-I")
|
||||
GENERATE_CXX_PCH_COMMAND(${TARGET_NAME} "${INCLUDE_FLAGS}" ${PCH_HEADER} ${PCH_SOURCE} ${PCH_HEADER_OUT})
|
||||
SET_TARGET_PROPERTIES(
|
||||
${TARGET_NAME} PROPERTIES
|
||||
COMPILE_FLAGS "-include ${CMAKE_CURRENT_BINARY_DIR}/${PCH_HEADER_NAME}"
|
||||
)
|
||||
ENDFUNCTION(ADD_CXX_PCH_GCC)
|
||||
|
||||
if(CMAKE_GENERATOR MATCHES Visual*)
|
||||
FUNCTION(ADD_CXX_PCH_CLANG TARGET_NAME PCH_HEADER PCH_SOURCE)
|
||||
GET_COMMON_PCH_PARAMS(${PCH_HEADER} "pch" "-I")
|
||||
GENERATE_CXX_PCH_COMMAND(${TARGET_NAME} "${INCLUDE_FLAGS}" ${PCH_HEADER} ${PCH_SOURCE} ${PCH_HEADER_OUT})
|
||||
SET_TARGET_PROPERTIES(
|
||||
${TARGET_NAME} PROPERTIES
|
||||
COMPILE_FLAGS "-include-pch ${PCH_HEADER_OUT}"
|
||||
)
|
||||
ENDFUNCTION(ADD_CXX_PCH_CLANG)
|
||||
|
||||
SET(_dummy_str "#include \"${_input}\"\n"
|
||||
"// This is required to suppress LNK4221. Very annoying.\n"
|
||||
"void *g_${_targetName}Dummy = 0\;\n")
|
||||
FUNCTION(ADD_CXX_PCH_MSVC TARGET_NAME PCH_HEADER PCH_SOURCE)
|
||||
GET_COMMON_PCH_PARAMS(${PCH_HEADER} "pch" "/I")
|
||||
SET_TARGET_PROPERTIES(
|
||||
${TARGET_NAME} PROPERTIES
|
||||
COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}"
|
||||
)
|
||||
SET_SOURCE_FILES_PROPERTIES(
|
||||
${PCH_SOURCE} PROPERTIES
|
||||
COMPILE_FLAGS "/Yc${PCH_HEADER_NAME}"
|
||||
)
|
||||
ENDFUNCTION(ADD_CXX_PCH_MSVC)
|
||||
|
||||
# Use of cxx extension for generated files (as Qt does)
|
||||
SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx)
|
||||
if(EXISTS ${${_targetName}_pch})
|
||||
# Check if contents is the same, if not rewrite
|
||||
# todo
|
||||
else(EXISTS ${${_targetName}_pch})
|
||||
FILE(WRITE ${${_targetName}_pch} ${_dummy_str})
|
||||
endif(EXISTS ${${_targetName}_pch})
|
||||
endif(CMAKE_GENERATOR MATCHES Visual*)
|
||||
|
||||
ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
|
||||
|
||||
MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
||||
|
||||
IF( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 0)
|
||||
ELSE( "${ARGN}" STREQUAL "0")
|
||||
SET(_dowarn 1)
|
||||
ENDIF("${ARGN}" STREQUAL "0")
|
||||
|
||||
if(CMAKE_GENERATOR MATCHES Visual*)
|
||||
# Auto include the precompile (useful for moc processing, since the use of
|
||||
# precompiled is specified at the target level
|
||||
# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
|
||||
|
||||
GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
|
||||
if (${oldProps} MATCHES NOTFOUND)
|
||||
SET(oldProps "")
|
||||
endif(${oldProps} MATCHES NOTFOUND)
|
||||
|
||||
SET(newProperties "${oldProps} /Yu\"${_input}.h\" /FI\"${_input}.h\"")
|
||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
|
||||
|
||||
#also inlude ${oldProps} to have the same compile options
|
||||
SET_SOURCE_FILES_PROPERTIES(${_input}.cpp PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}.h\"")
|
||||
|
||||
else(CMAKE_GENERATOR MATCHES Visual*)
|
||||
|
||||
if (CMAKE_GENERATOR MATCHES Xcode)
|
||||
# For Xcode, cmake needs my patch to process
|
||||
# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
|
||||
|
||||
GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
|
||||
if (${oldProps} MATCHES NOTFOUND)
|
||||
SET(oldProps "")
|
||||
endif(${oldProps} MATCHES NOTFOUND)
|
||||
|
||||
# When buiding out of the tree, precompiled may not be located
|
||||
# Use full path instead.
|
||||
GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE)
|
||||
|
||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
|
||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
|
||||
|
||||
else (CMAKE_GENERATOR MATCHES Xcode)
|
||||
|
||||
#Fallback to the "old" precompiled suppport
|
||||
#ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn})
|
||||
endif(CMAKE_GENERATOR MATCHES Xcode)
|
||||
endif(CMAKE_GENERATOR MATCHES Visual*)
|
||||
|
||||
ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
|
||||
FUNCTION(ADD_CXX_PCH TARGET_NAME PCH_HEADER PCH_SOURCE)
|
||||
IF (MSVC)
|
||||
ADD_CXX_PCH_MSVC(${TARGET_NAME} ${PCH_HEADER} ${PCH_SOURCE})
|
||||
ELSEIF ("${CMAKE_GENERATOR}" MATCHES "Xcode")
|
||||
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
|
||||
XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER YES
|
||||
XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${PCH_HEADER}"
|
||||
)
|
||||
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
ADD_CXX_PCH_CLANG(${TARGET_NAME} ${PCH_HEADER} ${PCH_SOURCE})
|
||||
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
|
||||
ADD_CXX_PCH_GCC(${TARGET_NAME} ${PCH_HEADER} ${PCH_SOURCE})
|
||||
ENDIF ()
|
||||
ENDFUNCTION(ADD_CXX_PCH)
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
set(MACOSX 1)
|
||||
set(OSX_LIBS /usr/lib/libcrypto.dylib)
|
||||
add_definitions(-D__ASSERTMACROS__)
|
||||
|
||||
# set default configuration directory
|
||||
if( NOT CONF_DIR )
|
||||
@@ -28,4 +26,8 @@ add_custom_target(uninstall
|
||||
)
|
||||
message(STATUS "OSX: Created uninstall target")
|
||||
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/xcode/settings.cmake)
|
||||
if (CMAKE_COMPILER_IS_GNUCC)
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
|
||||
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
|
||||
endif()
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
if (NOT NOJEM)
|
||||
set(JEMALLOC_LIBRARY "jemalloc")
|
||||
message(STATUS "UNIX: Using jemalloc")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ new file mode 100644
|
||||
index 0000000..acd3d5a
|
||||
--- /dev/null
|
||||
+++ b/dep/acelite/ace/CMakeLists.txt
|
||||
@@ -0,0 +1,337 @@
|
||||
@@ -0,0 +1,348 @@
|
||||
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
|
||||
+#
|
||||
+# This file is free software; as a special exception the author gives
|
||||
@@ -325,6 +325,11 @@ index 0000000..acd3d5a
|
||||
+ XTI_ATM_Mcast.cpp
|
||||
+)
|
||||
+
|
||||
+if (USE_COREPCH)
|
||||
+ set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h)
|
||||
+ set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp)
|
||||
+endif()
|
||||
+
|
||||
+include_directories(
|
||||
+ ${CMAKE_SOURCE_DIR}/dep/acelite
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
|
||||
@@ -336,9 +341,15 @@ index 0000000..acd3d5a
|
||||
+
|
||||
+add_definitions(-DACE_BUILD_DLL)
|
||||
+
|
||||
+add_library(ace SHARED ${ace_STAT_SRCS})
|
||||
+add_library(ace SHARED
|
||||
+ ${ace_STAT_SRCS}
|
||||
+ ${ace_PCH_SRC}
|
||||
+)
|
||||
+
|
||||
+add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH)
|
||||
+# Generate precompiled header
|
||||
+if( USE_COREPCH )
|
||||
+ add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
|
||||
+endif()
|
||||
+
|
||||
+install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
|
||||
|
||||
@@ -320,6 +320,11 @@ set(ace_STAT_SRCS
|
||||
XTI_ATM_Mcast.cpp
|
||||
)
|
||||
|
||||
if (USE_COREPCH)
|
||||
set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h)
|
||||
set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/dep/acelite
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
|
||||
@@ -331,8 +336,14 @@ set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE C
|
||||
|
||||
add_definitions(-DACE_BUILD_DLL)
|
||||
|
||||
add_library(ace SHARED ${ace_STAT_SRCS})
|
||||
add_library(ace SHARED
|
||||
${ace_STAT_SRCS}
|
||||
${ace_PCH_SRC}
|
||||
)
|
||||
|
||||
add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH)
|
||||
# Generate precompiled header
|
||||
if( USE_COREPCH )
|
||||
add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC})
|
||||
endif()
|
||||
|
||||
install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
|
||||
|
||||
@@ -10,3 +10,16 @@ index 3469b81..9fe098d 100644
|
||||
#endif
|
||||
|
||||
|
||||
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
|
||||
index c8d2f0b..11093f4 100644
|
||||
--- a/dep/g3dlite/include/G3D/platform.h
|
||||
+++ b/dep/g3dlite/include/G3D/platform.h
|
||||
@@ -57,7 +57,7 @@
|
||||
#elif defined(__linux__)
|
||||
#define G3D_LINUX
|
||||
#elif defined(__APPLE__)
|
||||
- #define G3D_OSX
|
||||
+ #define G3D_LINUX
|
||||
|
||||
// Prevent OS X fp.h header from being included; it defines
|
||||
// pi as a constant, which creates a conflict with G3D
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
#elif defined(__linux__)
|
||||
#define G3D_LINUX
|
||||
#elif defined(__APPLE__)
|
||||
#define G3D_OSX
|
||||
#define G3D_LINUX
|
||||
|
||||
// Prevent OS X fp.h header from being included; it defines
|
||||
// pi as a constant, which creates a conflict with G3D
|
||||
|
||||
@@ -237,6 +237,47 @@ LOCK TABLES `bugreport` WRITE;
|
||||
/*!40000 ALTER TABLE `bugreport` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `calendar_events`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `calendar_events`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE IF NOT EXISTS `calendar_events` (
|
||||
`id` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`creator` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`title` varchar(255) NOT NULL DEFAULT '',
|
||||
`description` varchar(255) NOT NULL DEFAULT '',
|
||||
`type` tinyint(1) unsigned NOT NULL DEFAULT '4',
|
||||
`dungeon` int(10) NOT NULL DEFAULT '-1',
|
||||
`eventtime` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`flags` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`time2` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `calendar_invites`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `calendar_invites`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE IF NOT EXISTS `calendar_invites` (
|
||||
`id` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`event` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`invitee` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`sender` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`status` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
`statustime` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`rank` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
`text` varchar(255) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `channels`
|
||||
--
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
ALTER TABLE `arena_team_member` ADD COLUMN `points_to_add` int(10) UNSIGNED NOT NULL DEFAULT '0';
|
||||
DROP TABLE IF EXISTS `saved_variables`;
|
||||
CREATE TABLE `saved_variables` (
|
||||
CREATE TABLE `saved_variables` (
|
||||
`NextArenaPointDistributionTime` timestamp NOT NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves';
|
||||
|
||||
@@ -5,7 +5,7 @@ CREATE TABLE `game_event_save` (
|
||||
PRIMARY KEY (`event_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_condition_save` (
|
||||
CREATE TABLE `game_event_condition_save` (
|
||||
`event_id` mediumint(8) unsigned NOT NULL,
|
||||
`condition_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`done` float default '0',
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--
|
||||
--
|
||||
-- NOTE: If you have temporary stored data in table `eventai_localized_texts` make sure to make backup of this before running this update!
|
||||
-- NOTE: If you have any texts in current eventai_texts and they are not using entries valid for *_texts table, you _will_ get error messages on startup.
|
||||
-- NOTE: Do not run this update twice, it may create bad data if you choose to do so.
|
||||
--
|
||||
--
|
||||
|
||||
-- drop obsolete table
|
||||
DROP TABLE eventai_localized_texts;
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
--
|
||||
--
|
||||
-- trinity_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts.
|
||||
-- valid entries for table are between -1000000 and -1999999
|
||||
--
|
||||
--
|
||||
|
||||
TRUNCATE `script_texts`;
|
||||
|
||||
--
|
||||
--
|
||||
-- -1 000 000 First 100 entries are reserved for special use, do not add regular text here.
|
||||
--
|
||||
--
|
||||
|
||||
INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
|
||||
(-1000000,'<TrinityScript Text Entry Missing!>',0,0,0,'DEFAULT_TEXT');
|
||||
|
||||
--
|
||||
--
|
||||
-- Normal text entries. Say/Yell/Whisper/Emote for any regular world object.
|
||||
--
|
||||
--
|
||||
|
||||
-- -1 000 100 GENERAL MAPS (not typical instance maps)
|
||||
|
||||
@@ -208,8 +208,8 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
|
||||
-- -1 585 000 MAGISTER'S TERRACE
|
||||
|
||||
|
||||
--
|
||||
--
|
||||
-- Below just for beautiful view in table, run at own desire
|
||||
--
|
||||
--
|
||||
|
||||
-- ALTER TABLE `script_texts` ORDER BY `entry` desc;
|
||||
|
||||
@@ -7,8 +7,8 @@ UPDATE creature_template SET minhealth = 2018275, maxhealth = minhealth = 201827
|
||||
UPDATE creature_template SET minlevel = 73, maxlevel = 73, minhealth = 828555, maxhealth = 828555, armor = 5000, mindmg = 1000, maxdmg = 2000 WHERE entry = 24891;
|
||||
UPDATE gameobject_template SET scriptname = 'kalocegos_teleporter' WHERE entry = 187055;
|
||||
|
||||
INSERT INTO creature_template_addon (entry) SELECT 24891 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24891) LIMIT 1;
|
||||
INSERT INTO creature_template_addon (entry) SELECT 24892 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24892) LIMIT 1;
|
||||
INSERT INTO creature_template_addon (entry) SELECT 24891 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24891) LIMIT 1;
|
||||
INSERT INTO creature_template_addon (entry) SELECT 24892 FROM creature_template_addon WHERE NOT EXISTS(SELECT * FROM creature_template_addon WHERE entry = 24892) LIMIT 1;
|
||||
UPDATE creature_template_addon SET auras = '45769 0 45769 1' WHERE entry = 24850;
|
||||
UPDATE creature_template_addon SET auras = '45769 0 45769 1 44801 0 44801 1 44801 2' WHERE entry = 24891;
|
||||
UPDATE creature_template_addon SET auras = '45769 0 45769 1 44801 0 44801 1 44801 2 44800 0' WHERE entry = 24892;
|
||||
|
||||
@@ -70,23 +70,23 @@ INSERT INTO trinity_string VALUES
|
||||
(251,'Text%d (ID: %i): %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
|
||||
ALTER TABLE event_scripts
|
||||
DROP datatext,
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
|
||||
ALTER TABLE gameobject_scripts
|
||||
DROP datatext,
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
|
||||
ALTER TABLE quest_end_scripts
|
||||
DROP datatext,
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
|
||||
ALTER TABLE quest_start_scripts
|
||||
DROP datatext,
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
|
||||
ALTER TABLE spell_scripts
|
||||
DROP datatext,
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
ADD COLUMN dataint int(11) NOT NULL default '0' AFTER datalong2;
|
||||
|
||||
ALTER TABLE creature_movement
|
||||
DROP `text1`,
|
||||
|
||||
@@ -18,7 +18,7 @@ CREATE TABLE `spell_proc_event` (
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records
|
||||
-- Records
|
||||
-- ----------------------------
|
||||
INSERT INTO `spell_proc_event` VALUES ('9452', '0', '0', '0', '0', '0', '3', '0', '0');
|
||||
INSERT INTO `spell_proc_event` VALUES ('34917', '32', '6', '0', '0', '0', '0', '0', '0');
|
||||
|
||||
@@ -1,74 +1,74 @@
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
(SELECT
|
||||
`attq1`.`guid` AS `b_guid`,
|
||||
`atid`, `atpr`
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1545),' ',-1) AS `atid`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1550),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1550),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
`a`.`guid` = `b`.`b_guid`;
|
||||
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
(SELECT
|
||||
`attq1`.`guid` AS `b_guid`,
|
||||
`atid`, `atpr`
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1551),' ',-1) AS `atid`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1556),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1556),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
`a`.`guid` = `b`.`b_guid`;
|
||||
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
UPDATE
|
||||
`arena_team_member` AS `a`,
|
||||
(SELECT
|
||||
`attq1`.`guid` AS `b_guid`,
|
||||
`atid`, `atpr`
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
FROM
|
||||
(SELECT
|
||||
`guid`,
|
||||
`name`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1557),' ',-1) AS `atid`,
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1562),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1562),' ',-1) AS `atpr`
|
||||
FROM
|
||||
`characters`) AS `attq1`
|
||||
INNER JOIN
|
||||
`arena_team_member` ON `arenateamid` = `atid` AND
|
||||
`arena_team_member`.`guid` = `attq1`.`guid`
|
||||
WHERE
|
||||
`atid` <> 0)
|
||||
AS `b`
|
||||
SET
|
||||
`a`.`personal_rating` = `b`.`atpr`
|
||||
WHERE
|
||||
`a`.`arenateamid` = `b`.`atid` AND
|
||||
`a`.`guid` = `b`.`b_guid`;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INSERT INTO spell_script_target VALUES
|
||||
INSERT INTO spell_script_target VALUES
|
||||
(8913,1,1200),
|
||||
(9095,1,6492),
|
||||
(33655,0,183351),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INSERT INTO `spell_script_target` VALUES
|
||||
INSERT INTO `spell_script_target` VALUES
|
||||
(3730,1,15263),
|
||||
(6955,1,4946),
|
||||
(7022,1,4945),
|
||||
@@ -22,7 +22,7 @@ INSERT INTO `spell_script_target` VALUES
|
||||
(19749,1,12352), -- used by creature script to check if all troopers are presents, NYI
|
||||
(19773,1,12018), -- used by Ragnaros to kill Majordomo
|
||||
(21556,1,13378), -- no longer in game, but still could be used for some FUN-so why not fix it ? ;)
|
||||
(21566,1,13416),
|
||||
(21566,1,13416),
|
||||
(22710,1,14349),
|
||||
(23168,1,14020),
|
||||
(24062,1,15010),
|
||||
@@ -45,7 +45,7 @@ INSERT INTO `spell_script_target` VALUES
|
||||
(30221,1,620),
|
||||
(30232,1,15691),
|
||||
(30460,1,17404),
|
||||
(30951,1,17533),
|
||||
(30951,1,17533),
|
||||
(31326,1,15608),
|
||||
(31611,1,17979),
|
||||
(31727,1,17536),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
delete from creature where id=17318;
|
||||
update creature_template set scriptname='npc_geezle' where entry=17318;
|
||||
delete from event_scripts where id=10675;
|
||||
insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554),
|
||||
insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554),
|
||||
(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
UPDATE `trinity_string` SET `content_default`='Player |cffff0000%s|r kicked by |cffff0000%s|r. Reason: |cffff0000%s|r.' WHERE (`entry`='282');
|
||||
UPDATE `trinity_string` SET `content_default`='Player |cffff0000%s|r kicked by |cffff0000%s|r. Reason: |cffff0000%s|r.' WHERE (`entry`='282');
|
||||
UPDATE `command` SET `help`='Syntax: .kick [$charactername] [$reason]\r\n\r\nKick the given character name from the world with or without reason. If no character name is provided then the selected player (except for yourself) will be kicked. If no reason is provided, default is \"No Reason\".' WHERE (`name`='kick');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
ALTER TABLE `character_ticket` RENAME TO `gm_tickets`;
|
||||
ALTER TABLE `gm_tickets` CHANGE `guid` `playerGuid` int(11) unsigned NOT NULL default '0';
|
||||
ALTER TABLE `gm_tickets` CHANGE `ticket_id` `guid` int(11) unsigned NOT NULL default '0';
|
||||
ALTER TABLE `character_ticket` RENAME TO `gm_tickets`;
|
||||
ALTER TABLE `gm_tickets` CHANGE `guid` `playerGuid` int(11) unsigned NOT NULL default '0';
|
||||
ALTER TABLE `gm_tickets` CHANGE `ticket_id` `guid` int(11) unsigned NOT NULL default '0';
|
||||
ALTER TABLE `gm_tickets` CHANGE `ticket_text` `message` text(0) NOT NULL;
|
||||
ALTER TABLE `gm_tickets` CHANGE `ticket_lastchange` `timestamp` int(10) NOT NULL default '0';
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (290,296,289);
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (290,296,289);
|
||||
DELETE FROM `trinity_string` WHERE `entry` BETWEEN 2000 AND 2016;
|
||||
INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
|
||||
(2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2003, '|cffff00ff %s|r |cff00ff00closed ticket|r |cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2004, 'Ticket %d permanently deleted by %s.', '', '', '', '', '', '', '', ''),
|
||||
(2005, 'Ticket not found.', '', '', '', '', '', '', '', ''),
|
||||
(2007, 'Please close ticket before deleting it permanently.', '', '', '', '', '', '', '', ''),
|
||||
(2008, 'Ticket %d is already assigned to GM %s.', '', '', '', '', '', '', '', ''),
|
||||
(2009, '%u Tickets succesfully reloaded from the database.', '', '', '', '', '', '', '', ''),
|
||||
(2010, 'Showing list of open tickets.', '', '', '', '', '', '', '', ''),
|
||||
(2011, 'Showing list of open tickets whose creator is online.', '', '', '', '', '', '', '', ''),
|
||||
(2012, 'Invalid name specified. Name should be that of an online Gamemaster.', '', '', '', '', '', '', '', ''),
|
||||
(2013, 'This ticket is already assigned to yourself. To unassign use .ticket unassign %d and then reassign.', '', '', '', '', '', '', '', ''),
|
||||
(2014, 'Ticket %d is not assigned, you cannot unassign it.', '', '', '', '', '', '', '', ''),
|
||||
(2015, 'You cannot unassign tickets from staffmembers with a higher security level than yourself.', '', '', '', '', '', '', '', ''),
|
||||
(2016, 'Cannot close ticket %d, it is assigned to another GM.', '', '', '', '', '', '', '', '');
|
||||
INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
|
||||
(2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2003, '|cffff00ff %s|r |cff00ff00closed ticket|r |cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2004, 'Ticket %d permanently deleted by %s.', '', '', '', '', '', '', '', ''),
|
||||
(2005, 'Ticket not found.', '', '', '', '', '', '', '', ''),
|
||||
(2007, 'Please close ticket before deleting it permanently.', '', '', '', '', '', '', '', ''),
|
||||
(2008, 'Ticket %d is already assigned to GM %s.', '', '', '', '', '', '', '', ''),
|
||||
(2009, '%u Tickets succesfully reloaded from the database.', '', '', '', '', '', '', '', ''),
|
||||
(2010, 'Showing list of open tickets.', '', '', '', '', '', '', '', ''),
|
||||
(2011, 'Showing list of open tickets whose creator is online.', '', '', '', '', '', '', '', ''),
|
||||
(2012, 'Invalid name specified. Name should be that of an online Gamemaster.', '', '', '', '', '', '', '', ''),
|
||||
(2013, 'This ticket is already assigned to yourself. To unassign use .ticket unassign %d and then reassign.', '', '', '', '', '', '', '', ''),
|
||||
(2014, 'Ticket %d is not assigned, you cannot unassign it.', '', '', '', '', '', '', '', ''),
|
||||
(2015, 'You cannot unassign tickets from staffmembers with a higher security level than yourself.', '', '', '', '', '', '', '', ''),
|
||||
(2016, 'Cannot close ticket %d, it is assigned to another GM.', '', '', '', '', '', '', '', '');
|
||||
DELETE FROM `command` WHERE (`name` LIKE '%ticket%');
|
||||
INSERT INTO `command` (`name`,`security`,`help`) VALUES
|
||||
INSERT INTO `command` (`name`,`security`,`help`) VALUES
|
||||
('ticket list','1','Displays a list of open GM tickets.'),
|
||||
('ticket onlinelist','1','Displays a list of open GM tickets whose owner is online.'),
|
||||
('ticket viewname','1','Usage: .ticket viewname $creatorname. \r\nReturns details about specified ticket. Ticket must be open and not deleted.'),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `trinity_string` WHERE `entry` BETWEEN '288' AND '295';
|
||||
DELETE FROM `trinity_string` WHERE `entry` BETWEEN '2000' AND '2029';
|
||||
INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
|
||||
INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
|
||||
(2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
(2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_grimstone' WHERE `entry`=10096;
|
||||
UPDATE `creature_template` SET `ScriptName`='mob_phalanx' WHERE `entry`=9502;
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_rocknot' WHERE `entry`=9503;
|
||||
|
||||
|
||||
DELETE FROM `areatrigger_scripts` WHERE `entry`=1526;
|
||||
INSERT INTO `areatrigger_scripts` VALUES (1526,'at_ring_of_law');
|
||||
|
||||
|
||||
@@ -37,21 +37,21 @@ INSERT INTO `script_texts` (entry, content_default, type, language, comment) VAL
|
||||
|
||||
DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000349 and -1000335;
|
||||
INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES
|
||||
(-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland
|
||||
(-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland
|
||||
- SAY_QUESTACCEPT'),
|
||||
(-1000336, 'Be careful, $N. Those wolves like to hide among the trees.', 0, 'npc_deathstalker_erland - SAY_START'),
|
||||
(-1000337, 'A $C attacks!', 0, 'npc_deathstalker_erland - SAY_AGGRO_1'),
|
||||
(-1000338, 'Beware! I am under attack!', 0, 'npc_deathstalker_erland - SAY_AGGRO_2'),
|
||||
(-1000339, 'We\'re almost there!', 0, 'npc_deathstalker_erland - SAY_LAST'),
|
||||
(-1000340, 'We made it! Thanks, $N. I couldn\'t have gotten without you.', 0, 'npc_deathstalker_erland -
|
||||
(-1000340, 'We made it! Thanks, $N. I couldn\'t have gotten without you.', 0, 'npc_deathstalker_erland -
|
||||
SAY_THANKS'),
|
||||
(-1000341, 'It\'s good to see you again, Erland. What is your report?', 0, 'npc_deathstalker_erland - SAY_RANE'),
|
||||
(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden\'s Orchard is gone.', 0,
|
||||
(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden\'s Orchard is gone.', 0,
|
||||
'npc_deathstalker_erland - SAY_ANSWER'),
|
||||
(-1000343, 'If I am excused, then I\'d like to check on Quinn...', 0, 'npc_deathstalker_erland - SAY_MOVE_QUINN'),
|
||||
(-1000344, 'Hello, Quinn. How are you faring?', 0, 'npc_deathstalker_erland - SAY_GREETINGS'),
|
||||
(-1000345, 'I\'ve been better. Ivar the Foul got the better of me...', 0, 'npc_deathstalker_erland - SAY_QUINN'),
|
||||
(-1000346, 'Try to take better care of yourself, Quinn. You were lucky this time.', 0, 'npc_deathstalker_erland -
|
||||
(-1000346, 'Try to take better care of yourself, Quinn. You were lucky this time.', 0, 'npc_deathstalker_erland -
|
||||
SAY_ON_BYE'),
|
||||
|
||||
(-1000347, 'Let\'s go before they find out I\'m free!', 0, 'npc_kaya_flathoof - SAY_START'),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `spell_script_target` WHERE `entry` IN ('44807', '32307', '32314');
|
||||
INSERT INTO `spell_script_target` (`entry`,`type`,`targetEntry`) VALUES
|
||||
('44807', '1', '24850'),
|
||||
('44807', '1', '24850'),
|
||||
('44807', '1', '24892'),
|
||||
('32307', '2', '17146'),
|
||||
('32307', '2', '17147'),
|
||||
|
||||
@@ -402,11 +402,11 @@ INSERT INTO `spell_bonus_data` VALUES
|
||||
-- 1135_mangos_7207_01_world_creature
|
||||
ALTER TABLE creature
|
||||
ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
|
||||
|
||||
|
||||
-- 1135_mangos_7207_02_world_gameobject
|
||||
ALTER TABLE gameobject
|
||||
ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
|
||||
|
||||
|
||||
-- 1140_mangos_7209_01_world_spell_bonus_data
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN (53595);
|
||||
INSERT INTO `spell_bonus_data` VALUES
|
||||
@@ -1319,7 +1319,7 @@ INSERT INTO spell_bonus_data VALUES
|
||||
(34913, 0, 0, 0, 'Mage - Molten Armor Triggered Rank 1'),
|
||||
(43043, 0, 0, 0, 'Mage - Molten Armor Triggered Rank 2'),
|
||||
(43044, 0, 0, 0, 'Mage - Molten Armor Triggered Rank 3');
|
||||
|
||||
|
||||
-- 1293_mangos_7249_01_world_spell_proc_event
|
||||
DELETE FROM `spell_proc_event` WHERE `entry`='60200';
|
||||
|
||||
@@ -2267,7 +2267,7 @@ INSERT INTO `command` VALUES
|
||||
('npc setdeathstate',2,'Syntax: .npc setdeathstate on/off\r\n\r\nSet default death state (dead/alive) for npc at spawn.');
|
||||
|
||||
-- 1426_mangos_7292_01_world_points_of_interest
|
||||
DROP TABLE IF EXISTS `points_of_interest`;
|
||||
DROP TABLE IF EXISTS `points_of_interest`;
|
||||
CREATE TABLE `points_of_interest` (
|
||||
`entry` mediumint(8) unsigned NOT NULL default '0',
|
||||
`x` float NOT NULL default '0',
|
||||
@@ -2280,7 +2280,7 @@ CREATE TABLE `points_of_interest` (
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
-- 1426_mangos_7292_02_world_locales_points_of_interest
|
||||
DROP TABLE IF EXISTS `locales_points_of_interest`;
|
||||
DROP TABLE IF EXISTS `locales_points_of_interest`;
|
||||
CREATE TABLE `locales_points_of_interest` (
|
||||
`entry` mediumint(8) unsigned NOT NULL default '0',
|
||||
`icon_name_loc1` text,
|
||||
@@ -2489,16 +2489,16 @@ ALTER TABLE spell_area
|
||||
ALTER TABLE creature_template
|
||||
ADD COLUMN unk16 float NOT NULL default '1' AFTER InhabitType,
|
||||
ADD COLUMN unk17 float NOT NULL default '1' AFTER unk16;
|
||||
|
||||
|
||||
-- 1693_world
|
||||
-- Update Proc Rate
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
('60442', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('57345', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('61356', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('54707', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60'),
|
||||
('54808', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60');
|
||||
-- Update Spell Coefficients
|
||||
-- Update Spell Coefficients
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN ('689', '18790', '172', '42223', '42224', '42225', '42226', '42218', '47817', '47818', '1949', '5857', '11681', '11682', '27214', '47822', '27243', '30108', '17962', '6789', '48181', '29722', '5676', '686', '17877', '30283', '1120', '30294', '44425', '42208', '42209', '42210', '42211', '42212', '42213', '42198', '42937', '42938', '11113', '31661', '120', '19750', '635', '25914', '25913', '25903', '27175', '33074', '48820', '48821', '58597', '31803', '53742', '31893', '32221', '53719', '53718', '20167', '20424', '31804', '53733', '31898', '32220', '53726', '53725', '20267', '20187', '20467', '53600', '596', '2944', '8092', '27813', '27817', '27818', '33619');
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
|
||||
('689', '0', '0.143', '0', 'Warlock - Drain Life'),
|
||||
@@ -2743,7 +2743,7 @@ UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354
|
||||
-- 1709_mangos_7393_01_world_game_event
|
||||
ALTER TABLE `game_event`
|
||||
ADD COLUMN `holiday` mediumint(8) unsigned NOT NULL default '0' COMMENT 'Client side holiday id' AFTER `length`;
|
||||
|
||||
|
||||
-- 1724_mangos_7399_01_world_trinity_string
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (753, 754, 755);
|
||||
INSERT INTO `trinity_string` VALUES
|
||||
@@ -2998,7 +2998,7 @@ UPDATE `command` SET `name`="ahbotoption" WHERE `name`="ahbotoptions";
|
||||
DELETE FROM `command` WHERE `name` IN ('reload tickets');
|
||||
DELETE FROM `command` WHERE `name` LIKE "path%";
|
||||
DELETE FROM `command` WHERE `name` LIKE "wp%";
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('wp load',2,'Syntax: .path load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
|
||||
('wp event',2,'Syntax: .path event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
|
||||
('wp event add',2,'Syntax: .path event add $subcommand\nAdd new waypoint action in DB.'),
|
||||
@@ -3110,7 +3110,7 @@ INSERT INTO `command` VALUES
|
||||
UPDATE `command` SET `name`="ahbotoption" WHERE `name`="ahbotoptions";
|
||||
DELETE FROM `command` WHERE `name` LIKE "path%";
|
||||
DELETE FROM `command` WHERE `name` LIKE "wp%";
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('wp load',2,'Syntax: .wp load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
|
||||
('wp event',2,'Syntax: .wp event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
|
||||
('wp unload',2,'Syntax: .wp unload\nUnload path for selected creature.'),
|
||||
@@ -3134,7 +3134,7 @@ INSERT INTO `command` VALUES
|
||||
-- 2276_mangos_7560_01_world_gameobject_template
|
||||
ALTER TABLE gameobject_template
|
||||
ADD COLUMN IconName varchar(100) NOT NULL default '' AFTER name;
|
||||
|
||||
|
||||
-- 2280_mangos_7565_01_world_trinity_string
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (1010,1011,1012,1013,1014);
|
||||
INSERT INTO `trinity_string` VALUES
|
||||
@@ -3185,7 +3185,7 @@ INSERT INTO `spell_proc_event` VALUES (24905, 0x00, 0, 0x00000000, 0x00000000, 0
|
||||
-- 2296_world
|
||||
ALTER TABLE creature_template
|
||||
ADD COLUMN `VehicleId` mediumint(8) unsigned NOT NULL default '0' AFTER `PetSpellDataId`;
|
||||
|
||||
|
||||
-- 2339_world - 2346_world
|
||||
DELETE FROM `command` WHERE `name` LIKE "ahbotoption %";
|
||||
DELETE FROM `command` WHERE `name` LIKE "ahbotoptions %";
|
||||
@@ -3338,7 +3338,7 @@ CREATE TABLE `achievement_criteria_data` (
|
||||
ALTER TABLE `achievement_criteria_data`
|
||||
DROP PRIMARY KEY,
|
||||
ADD PRIMARY KEY (`criteria_id`,`type`);
|
||||
|
||||
|
||||
-- 2551_world_spell_bonus_data
|
||||
-- Judgement
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` = 54158;
|
||||
@@ -3785,7 +3785,7 @@ INSERT INTO `spell_proc_event` VALUES
|
||||
|
||||
-- 2686_world_command
|
||||
DELETE FROM `command` WHERE `name` IN ('go ticket');
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('go ticket','1','Syntax: .go ticket #ticketid\r\nTeleports the user to the location where $ticketid was created.');
|
||||
|
||||
-- 2687_world_spell_proc_event
|
||||
@@ -4058,7 +4058,7 @@ INSERT INTO `spell_proc_event` VALUES
|
||||
INSERT INTO trinity_string (entry, content_default)VALUES (6616 , "Pet spells will reset for all players at login. Strongly recommend re-login!");
|
||||
|
||||
-- 2907_mangos_7705_01_world_command
|
||||
DELETE FROM `command` WHERE `name` IN
|
||||
DELETE FROM `command` WHERE `name` IN
|
||||
('account lock','account password','chardelete','character customize','character delete','character rename','customize','lockaccount','password','rename');
|
||||
INSERT INTO `command` VALUES
|
||||
('account lock',0,'Syntax: .account lock [on|off]\r\n\r\nAllow login from account only from current used IP or remove this requirement.'),
|
||||
@@ -4127,7 +4127,7 @@ INSERT INTO `spell_script_target` () VALUES (46589, 1, 30614);
|
||||
INSERT INTO `spell_script_target` () VALUES (45839, 1, 25653);
|
||||
|
||||
DELETE FROM `creature_template` WHERE entry in (30598, 30614);
|
||||
INSERT INTO `creature_template` () VALUES
|
||||
INSERT INTO `creature_template` () VALUES
|
||||
(30598, 0, 4449, 0, 4449, 0, 'Spike Target', '', '', 70, 70, 1, 1, 0, 0, 0, 14, 14, 0, 1, 1, 0, 0, 0, 0, 0, 2600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 0, 0, 0, 1, 0, 0, 128, ''),
|
||||
(30614, 0, 4449, 0, 4449, 0, 'Spike Target 2', '', '', 70, 70, 1, 1, 0, 0, 0, 14, 14, 0, 1, 1, 0, 0, 0, 0, 0, 2600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 0, 0, 0, 1, 0, 0, 128, '');
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7290_01_mangos_command required_7292_01_mangos_points_of_interest bit;*/
|
||||
|
||||
DROP TABLE IF EXISTS `points_of_interest`;
|
||||
DROP TABLE IF EXISTS `points_of_interest`;
|
||||
CREATE TABLE `points_of_interest` (
|
||||
`entry` mediumint(8) unsigned NOT NULL default '0',
|
||||
`x` float NOT NULL default '0',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7292_01_mangos_points_of_interest required_7292_02_mangos_locales_points_of_interest bit;*/
|
||||
|
||||
DROP TABLE IF EXISTS `locales_points_of_interest`;
|
||||
DROP TABLE IF EXISTS `locales_points_of_interest`;
|
||||
CREATE TABLE `locales_points_of_interest` (
|
||||
`entry` mediumint(8) unsigned NOT NULL default '0',
|
||||
`icon_name_loc1` text,
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
-- Update Proc Rate
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
('60442', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('57345', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('61356', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
|
||||
('54707', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60'),
|
||||
('54808', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60');
|
||||
|
||||
-- Update Spell Coefficients
|
||||
-- Update Spell Coefficients
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN ('689', '18790', '172', '42223', '42224', '42225', '42226', '42218', '47817', '47818', '1949', '5857', '11681', '11682', '27214', '47822', '27243', '30108', '17962', '6789', '48181', '29722', '5676', '686', '17877', '30283', '1120', '30294', '44425', '42208', '42209', '42210', '42211', '42212', '42213', '42198', '42937', '42938', '11113', '31661', '120', '19750', '635', '25914', '25913', '25903', '27175', '33074', '48820', '48821', '58597', '31803', '53742', '31893', '32221', '53719', '53718', '20167', '20424', '31804', '53733', '31898', '32220', '53726', '53725', '20267', '20187', '20467', '53600', '596', '2944', '8092', '27813', '27817', '27818', '33619');
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
|
||||
('689', '0', '0.143', '0', 'Warlock - Drain Life'),
|
||||
|
||||
@@ -6,7 +6,7 @@ UPDATE `command` SET `name`="ahbotoption" WHERE `name`="ahbotoptions";
|
||||
DELETE FROM `command` WHERE `name` IN ('reload tickets');
|
||||
DELETE FROM `command` WHERE `name` LIKE "path%";
|
||||
DELETE FROM `command` WHERE `name` LIKE "wp%";
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('wp load',2,'Syntax: .wp load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
|
||||
('wp event',2,'Syntax: .wp event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
|
||||
('wp event add',2,'Syntax: .wp event add $subcommand\nAdd new waypoint action in DB.'),
|
||||
|
||||
@@ -5,7 +5,7 @@ INSERT INTO `command` VALUES
|
||||
UPDATE `command` SET `name`="ahbotoption" WHERE `name`="ahbotoptions";
|
||||
DELETE FROM `command` WHERE `name` LIKE "path%";
|
||||
DELETE FROM `command` WHERE `name` LIKE "wp%";
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('wp load',2,'Syntax: .wp load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
|
||||
('wp event',2,'Syntax: .wp event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
|
||||
('wp unload',2,'Syntax: .wp unload\nUnload path for selected creature.'),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `command` WHERE `name` LIKE "ahbotoption %";
|
||||
INSERT INTO `command`(`name`,`security`,`help`) VALUES
|
||||
INSERT INTO `command`(`name`,`security`,`help`) VALUES
|
||||
('ahbotoption ahexpire', '3', '.Syntax: .ahbotoption ahexpire $ahMapID Expire all auctions started by AHbot.'),
|
||||
('ahbotoption minitems', '3', '.Syntax: .ahbotoption minitems $ahMapID $parameter Set minimum number of items to be sold in the auctionhouse. If value is 0 then minitems=maxitems. If minitems>maxitems then it will be set equal to maxitems.'),
|
||||
('ahbotoption maxitems', '3', '.Syntax: .ahbotoption maxitems $ahMapID $parameter Set maximum number of items to be sold in the auctionhouse.'),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `command` WHERE `name` LIKE "ahbotoption %";
|
||||
DELETE FROM `command` WHERE `name` LIKE "ahbotoptions %";
|
||||
INSERT INTO `command`(`name`,`security`,`help`) VALUES
|
||||
INSERT INTO `command`(`name`,`security`,`help`) VALUES
|
||||
('ahbotoptions ahexpire', '3', '.Syntax: .ahbotoptions ahexpire $ahMapID Expire all auctions started by AHbot.'),
|
||||
('ahbotoptions minitems', '3', '.Syntax: .ahbotoptions minitems $ahMapID $parameter Set minimum number of items to be sold in the auctionhouse. If value is 0 then minitems=maxitems. If minitems>maxitems then it will be set equal to maxitems.'),
|
||||
('ahbotoptions maxitems', '3', '.Syntax: .ahbotoptions maxitems $ahMapID $parameter Set maximum number of items to be sold in the auctionhouse.'),
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `command` WHERE `name` IN ('go ticket');
|
||||
INSERT INTO `command` VALUES
|
||||
INSERT INTO `command` VALUES
|
||||
('go ticket','1','Syntax: .go ticket #ticketid\r\nTeleports the user to the location where $ticketid was created.');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7662_02_mangos_spell_bonus_data required_7705_01_mangos_command bit;*/
|
||||
|
||||
DELETE FROM `command` WHERE `name` IN
|
||||
DELETE FROM `command` WHERE `name` IN
|
||||
('account lock','account password','chardelete','character customize','character delete','character rename','customize','lockaccount','password','rename');
|
||||
|
||||
INSERT INTO `command` VALUES
|
||||
|
||||
@@ -6,7 +6,7 @@ INSERT INTO `spell_script_target` () VALUES (46589, 1, 30614);
|
||||
INSERT INTO `spell_script_target` () VALUES (45839, 1, 25653);
|
||||
|
||||
DELETE FROM `creature_template` WHERE entry in (30598, 30614);
|
||||
INSERT INTO `creature_template` () VALUES
|
||||
INSERT INTO `creature_template` () VALUES
|
||||
(30598, 0, 4449, 0, 4449, 0, 'Spike Target', '', '', 70, 70, 1, 1, 0, 0, 0, 14, 14, 0, 1, 1, 0, 0, 0, 0, 0, 2600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 0, 0, 0, 1, 0, 0, 128, ''),
|
||||
(30614, 0, 4449, 0, 4449, 0, 'Spike Target 2', '', '', 70, 70, 1, 1, 0, 0, 0, 14, 14, 0, 1, 1, 0, 0, 0, 0, 0, 2600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 0, 0, 0, 1, 0, 0, 128, '');
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (20166, 32385, 32392, 32387, 32393, 32394,
|
||||
13046, 13045, 12317, 13048, 13047, -- Enrage
|
||||
29724, 29725, 29723); -- Sudden Death
|
||||
|
||||
|
||||
-- Seal of wisdom
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
(20166, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 12.000000, 0.000000, 0);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
ALTER TABLE creature_addon ADD INDEX ( `path_id` );
|
||||
ALTER TABLE waypoint_data ADD INDEX ( `id` );
|
||||
|
||||
|
||||
ALTER TABLE waypoint_data ADD COLUMN id_old int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID' AFTER wpguid;
|
||||
|
||||
UPDATE waypoint_data SET id_old=id;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
CREATE TABLE `spell_enchant_proc_data` (
|
||||
`entry` INT(10) UNSIGNED NOT NULL,
|
||||
`customChance` INT(10) UNSIGNED NOT NULL DEFAULT '0',
|
||||
`PPMChance` FLOAT UNSIGNED NOT NULL DEFAULT '0',
|
||||
`PPMChance` FLOAT UNSIGNED NOT NULL DEFAULT '0',
|
||||
`procEx` FLOAT UNSIGNED NOT NULL DEFAULT '0'
|
||||
) ENGINE=MYISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Spell enchant proc data';
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN
|
||||
(27521, 55381, 62459, 60176, 60529, 60717, 62147, 57907, 51528, 51529, 51530, 51531, 51532);
|
||||
INSERT INTO `spell_proc_event`
|
||||
INSERT INTO `spell_proc_event`
|
||||
(`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`)
|
||||
VALUES
|
||||
-- malestorm weapon
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7896_01_mangos_creature_template required_7902_01_mangos_pool_creature bit;*/
|
||||
|
||||
ALTER TABLE `pool_creature`
|
||||
ALTER TABLE `pool_creature`
|
||||
ADD INDEX `idx_guid`(`guid`);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/*ALTER TABLE db_version CHANGE COLUMN required_7902_01_mangos_pool_creature required_7902_02_mangos_pool_gameobject bit;*/
|
||||
|
||||
ALTER TABLE `pool_gameobject`
|
||||
ALTER TABLE `pool_gameobject`
|
||||
ADD INDEX `idx_guid`(`guid`);
|
||||
|
||||
@@ -29,14 +29,14 @@ UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1427' WHERE `entry`=27214;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1427' WHERE `entry`=47822;
|
||||
UPDATE `spell_bonus_data` SET `dot_bonus` = '0.0949' WHERE `entry`=1949;
|
||||
UPDATE `spell_bonus_data` SET `ap_bonus` = '0.025' WHERE `entry`=31803;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42208;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42209;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42210;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42211;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42212;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42213;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42198;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42937;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42208;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42209;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42210;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42211;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42212;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42213;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42198;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42937;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.1437' WHERE `entry`= 42938;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.2861' WHERE `entry` =49821;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.2861' WHERE `entry` =53022;
|
||||
@@ -56,7 +56,7 @@ UPDATE `spell_bonus_data` SET `direct_bonus` = '0.81' WHERE `entry`=33074;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.81' WHERE `entry`=48821;
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `entry`=33763;
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN (53742,61391,47897,50796,50590,58597,974,47757,52986,52987,52988);
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
|
||||
('53742', '0.013', '0', '0.025', 'Paladin - Blood Corruption'),
|
||||
('61391', '0.193', '0', '0', 'Druid - Typhoon'),
|
||||
('47897', '0.1064', '0.0667', '0', 'Warlock - Shadowflame'),
|
||||
@@ -80,7 +80,7 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
|
||||
|
||||
-- by nesocip
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN (48721, 55078, 52212, 47632, 55095, 49184, 45477, 50536, 51373, 51374, 51375);
|
||||
INSERT INTO spell_bonus_data( entry, ap_bonus, comments ) VALUES
|
||||
INSERT INTO spell_bonus_data( entry, ap_bonus, comments ) VALUES
|
||||
('48721', '0.04', 'DK - Blood Boil'),
|
||||
('55078', '0.055', 'DK - Blood Plague'),
|
||||
('52212', '0.0475', 'DK - Death and Decay'),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `entry`=33763;
|
||||
DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806);
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
('48714', '2', '27237'),
|
||||
('48714', '2', '27235'),
|
||||
('48714', '2', '27234'),
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `spell_script_target` WHERE `entry` IN (48743);
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
('48743', '1', '26125');
|
||||
|
||||
@@ -18,7 +18,7 @@ UPDATE `instance_template` SET `script`='instance_nexus' WHERE `map`=576;
|
||||
|
||||
UPDATE `creature_template` SET `AIName` = 'EventAI' WHERE entry IN (26796, 26798, 26929, 26928, 26930);
|
||||
DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (26796, 26798, 26929, 26928, 26930);
|
||||
INSERT INTO `creature_ai_scripts` VALUES
|
||||
INSERT INTO `creature_ai_scripts` VALUES
|
||||
-- Commander Stoutbeard
|
||||
( 2679600, 26796, 4, 0, 100, 4, 0, 0, 0, 0, 28, 0, 47543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Commander Stoutbeard - crystal prison remove'),
|
||||
( 2679601, 26796, 4, 0, 100, 4, 0, 0, 0, 0, 11, 31403, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Commander Stoutbeard - cast battle shout'),
|
||||
|
||||
@@ -2,7 +2,7 @@ DELETE FROM `spell_bonus_data` WHERE entry IN (31893, 32221, 31898, 32220, 53719
|
||||
INSERT INTO `spell_bonus_data` VALUES
|
||||
(31893, 0, 0, 0, "Paladin - Seal of Blood Proc Enemy"),
|
||||
(32221, 0, 0, 0, "Paladin - Seal of Blood Proc Self"),
|
||||
(31898, 0.25, 0, 0.16, "Paladin - Judgement of Blood Enemy"),
|
||||
(31898, 0.25, 0, 0.16, "Paladin - Judgement of Blood Enemy"),
|
||||
(32220, 0.0833, 0, 0.0533, "Paladin - Judgement of Blood Self"),
|
||||
(53719, 0, 0, 0, "Paladin - Seal of the Martyr Proc Enemy"),
|
||||
(53718, 0, 0, 0, "Paladin - Seal of the Martyr Proc Self"),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (28716, 31221, 31222, 31223, 31571, 31572, 31871, 31872, 44745, 61257, 59089, 59088, 58426, 57352, 57318, 56374, 56372, 56337, 56336, 56333, 54787, 53375, 53376, 47570, 47569, 47537, 47536, 47535, 63108);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
( 28716, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00044000, 0x00000000, 0, 0, 0), -- Rejuvenation
|
||||
( 28716, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00044000, 0x00000000, 0, 0, 0), -- Rejuvenation
|
||||
( 31221, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Master of Subtlety (Rank 1)
|
||||
( 31222, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Master of Subtlety (Rank 2)
|
||||
( 31223, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Master of Subtlety (Rank 3)
|
||||
@@ -11,9 +11,9 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
|
||||
( 44745, 0x00, 3, 0x00000000, 0x00000001, 0x00000000, 0x00000400, 0x00002000, 0, 0, 0), -- Shattered Barrier (Rank 1)
|
||||
( 59088, 0x00, 4, 0x00000000, 0x00000002, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Improved Spell Reflection (Rank 1)
|
||||
( 59089, 0x00, 4, 0x00000000, 0x00000002, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Improved Spell Reflection (Rank 2)
|
||||
( 58426, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Overkill
|
||||
( 57352, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Darkmoon Card: Death
|
||||
( 56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Glyph of Icy Veins
|
||||
( 58426, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Overkill
|
||||
( 57352, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Darkmoon Card: Death
|
||||
( 56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Glyph of Icy Veins
|
||||
( 56372, 0x00, 3, 0x00000000, 0x00000080, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Glyph of Ice Block
|
||||
( 54787, 0x00, 3, 0x00000000, 0x00000001, 0x00000000, 0x00000400, 0x00002000, 0, 0, 0), -- Shattered Barrier (Rank 2)
|
||||
( 53375, 0x00, 10, 0x00000000, 0x00002000, 0x00000000, 0x00000400, 0x00000000, 0, 0, 6), -- Sanctified Wrath (Rank 1)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
DELETE FROM spell_pet_auras where `spell` in (56314,56315,56316, 56317, 56318);
|
||||
DELETE FROM spell_pet_auras where `spell` in (56314,56315,56316, 56317, 56318);
|
||||
INSERT INTO spell_pet_auras VALUES
|
||||
(56314, 0, 0, 57447),
|
||||
(56314, 1, 0, 57485),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_enchant_proc_data` WHERE `entry` IN (703, 704, 705, 706, 2644, 3772, 3773, 323, 324, 325, 623, 624, 625, 2641, 3768, 3769);
|
||||
INSERT INTO spell_enchant_proc_data (`entry`, `customChance`, `PPMChance`,`procEx`) VALUES
|
||||
INSERT INTO spell_enchant_proc_data (`entry`, `customChance`, `PPMChance`,`procEx`) VALUES
|
||||
-- Wound Poison
|
||||
(703, 0, 21.43,0),
|
||||
(704, 0, 21.43,0),
|
||||
|
||||
@@ -18,7 +18,7 @@ DELETE FROM `creature_involvedrelation` WHERE `quest`=12727;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727);
|
||||
|
||||
DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806);
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
|
||||
('48714', '2', '27237'),
|
||||
('48714', '2', '27235'),
|
||||
('48714', '2', '27234'),
|
||||
|
||||
@@ -6,7 +6,7 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
|
||||
( 31871, 0x00, 10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Divine Purpose (Rank 1)
|
||||
( 31872, 0x00, 10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Divine Purpose (Rank 2)
|
||||
( 33076, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A22A8, 0x00000000, 0, 0, 0), -- Prayer of Mending (Rank 1)
|
||||
( 33953, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00044000, 0x00000000, 0, 0, 45), -- Essence of Life
|
||||
( 33953, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00044000, 0x00000000, 0, 0, 45), -- Essence of Life
|
||||
( 48110, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A22A8, 0x00000000, 0, 0, 0), -- Prayer of Mending (Rank 2)
|
||||
( 48111, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A22A8, 0x00000000, 0, 0, 0), -- Prayer of Mending (Rank 3)
|
||||
( 48112, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A22A8, 0x00000000, 0, 0, 0), -- Prayer of Mending (Rank 2)
|
||||
@@ -21,5 +21,5 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
|
||||
(51485, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0),
|
||||
(51486, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0),
|
||||
( 56372, 0x00, 3, 0x00000000, 0x00000080, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Glyph of Ice Block
|
||||
( 56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Glyph of Icy Veins
|
||||
( 56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Glyph of Icy Veins
|
||||
( 61356, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 90); -- Invigorating Earthsiege Diamond Passive
|
||||
|
||||
@@ -15,7 +15,7 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
|
||||
( 46949, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
|
||||
( 46945, 0x00, 4, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Safeguard
|
||||
( 64415, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Val'anyr Hammer of Ancient Kings - Equip Effect
|
||||
( 60066, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Rage of the Unraveller
|
||||
( 60066, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Rage of the Unraveller
|
||||
( 62115, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Strength of the Titans
|
||||
( 62114, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Flow of Knowledge
|
||||
( 62600, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Savage Defense
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (51483, 51485, 51486);
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (51483, 51485, 51486);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
(51483, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000001, 0.000000, 0.000000, 0),
|
||||
(51485, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000001, 0.000000, 0.000000, 0),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `playercreateinfo_spell` WHERE `spell` = 60091;
|
||||
INSERT INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) VALUES
|
||||
INSERT INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) VALUES
|
||||
(1, 2, 60091, 'Judgement Anti-Parry/Dodge Passive'),
|
||||
(3, 2, 60091, 'Judgement Anti-Parry/Dodge Passive'),
|
||||
(10, 2, 60091, 'Judgement Anti-Parry/Dodge Passive'),
|
||||
|
||||
@@ -3,11 +3,11 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
|
||||
( 31876, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 1)
|
||||
( 31877, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 2)
|
||||
( 31878, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 3)
|
||||
( 34258, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice
|
||||
( 34262, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Mercy
|
||||
( 37195, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgement Group Heal
|
||||
( 40470, 0x00, 10, 0xC0800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Paladin Tier 6 Trinket
|
||||
( 48835, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice
|
||||
( 34258, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice
|
||||
( 34262, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Mercy
|
||||
( 37195, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgement Group Heal
|
||||
( 40470, 0x00, 10, 0xC0800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Paladin Tier 6 Trinket
|
||||
( 48835, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Justice
|
||||
( 53380, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 1)
|
||||
( 53381, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 2)
|
||||
( 53382, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 3)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
UPDATE `creature_template` SET `ScriptName`='EventAI', `modelid_A` = 16925,`modelid_H` = 16925, `minmana` = 1000000,`maxmana` = 1000000, `unit_flags` = 33554434 WHERE `entry` IN(29998, 33753, 33752, 33751, 33750);
|
||||
DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (29998, 33753, 33752, 33751, 33750);
|
||||
INSERT INTO `creature_ai_scripts` VALUES
|
||||
INSERT INTO `creature_ai_scripts` VALUES
|
||||
-- Desecration
|
||||
( 2999801, 29998, 11, 0, 100, 0, 0, 0, 0, 0, 11, 55741, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Desecration'),
|
||||
( 2999800, 29998, 1, 0, 100, 0, 1, 1, 0, 0, 11, 55671, 0, 2, 11, 55710, 0, 2, 0, 0, 0, 0, 'Desecration'),
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12757);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12755;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12755);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12756;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12756);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12757);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12800;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (31082, 12800);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12801;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (31082, 12801);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12801;
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12757);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12755;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12755);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12756;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12756);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12757);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12800;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (31082, 12800);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12801;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (31082, 12801);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12801;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (29173, 12801);
|
||||
UPDATE `quest_template` SET `PrevQuestId`=13166 WHERE `entry`=13188;
|
||||
UPDATE `quest_template` SET `PrevQuestId`=13166 WHERE `entry`=13189;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (56342, 56343, 56344, 59725);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
( 59725, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0, 0, 0), -- Improved Spell Reflection
|
||||
( 59725, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0, 0, 0), -- Improved Spell Reflection
|
||||
( 56342, 0x00, 9, 0x00000018, 0x08000000, 0x00020000, 0x00000000, 0x00000000, 0, 0, 0), -- Lock and Load
|
||||
( 56343, 0x00, 9, 0x00000018, 0x08000000, 0x00020000, 0x00000000, 0x00000000, 0, 0, 0), -- Lock and Load
|
||||
( 56344, 0x00, 9, 0x00000018, 0x08000000, 0x00020000, 0x00000000, 0x00000000, 0, 0, 0); -- Lock and Load
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (53234, 53237, 53238);
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
(53234, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -- Piercing Shots (Rank 1)
|
||||
(53237, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -- Piercing Shots (Rank 2)
|
||||
(53238, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); -- Piercing Shots (Rank 3)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
DELETE FROM `command` WHERE `name` IN ('reload creature_linked_respawn', 'npc setlink');
|
||||
INSERT INTO `command` (`name`,`security`,`help`) VALUES
|
||||
INSERT INTO `command` (`name`,`security`,`help`) VALUES
|
||||
('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
|
||||
('npc setlink',2,'Syntax: .npc setlink $creatureGUID\r\n\r\nLinks respawn of selected creature to the condition that $creatureGUID defined is alive.');
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry`=779;
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
('779', '-1', '-1', '0.063', '-1', 'Druid - Swipe (Bear)');
|
||||
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry`=50256;
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
(50256, -1, -1, 0.08, -1, 'Pet Skills - Bear (Swipe)');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (56636,56637,56638);
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (56636,56637,56638);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
( 56636, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6), -- Taste for Blood (Rank 1)
|
||||
( 56637, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6), -- Taste for Blood (Rank 2)
|
||||
( 56638, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6); -- Taste for Blood (Rank 3)
|
||||
( 56638, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6); -- Taste for Blood (Rank 3)
|
||||
|
||||
@@ -41,7 +41,7 @@ INSERT INTO playercreateinfo_action VALUES
|
||||
DELETE FROM playercreateinfo_action WHERE race=2 AND class=3 AND button IN (4,9);
|
||||
INSERT INTO playercreateinfo_action VALUES (2,3,9,20572,0);
|
||||
|
||||
-- Moved Berserking to correct action bar location for Non-Heroic Troll classes
|
||||
-- Moved Berserking to correct action bar location for Non-Heroic Troll classes
|
||||
DELETE FROM playercreateinfo_action WHERE race=8 AND class IN (3,5,7,8) AND button IN (3,76);
|
||||
INSERT INTO playercreateinfo_action VALUES
|
||||
(8,3,3,20554,0),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (19574,34471);
|
||||
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`)
|
||||
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`)
|
||||
VALUES
|
||||
( 19574, 24395, 2, 'Beast Within'),
|
||||
( 19574, 24396, 2, 'Beast Within'),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
UPDATE `creature_template` SET `ScriptName` = 'npc_skywing' WHERE `entry` = 22424;
|
||||
|
||||
|
||||
replace into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','0','-3605.719971','4175.580078','-0.031817','0','START_SKYWING');
|
||||
replace into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','1','-3602.311279','4253.213867','0.562436','0','');
|
||||
replace into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','2','-3529.151367','4263.524414','-7.871151','0','');
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry`=40293;
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry`=40293;
|
||||
INSERT INTO `spell_bonus_data` VALUES
|
||||
(40293, 0, 0, 0, 0, 'Item - Siphon Essence');
|
||||
|
||||
@@ -14,14 +14,14 @@ CREATE TABLE `character_glyphs` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Get glyphs from correct field in data blob and insert into character_glyphs as spec = 0
|
||||
INSERT INTO `character_glyphs`
|
||||
INSERT INTO `character_glyphs`
|
||||
SELECT `guid`, 0,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1288), ' ', -1) AS UNSIGNED)) AS `glyph1`,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1289), ' ', -1) AS UNSIGNED)) AS `glyph2`,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1290), ' ', -1) AS UNSIGNED)) AS `glyph3`,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1291), ' ', -1) AS UNSIGNED)) AS `glyph4`,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1292), ' ', -1) AS UNSIGNED)) AS `glyph5`,
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1293), ' ', -1) AS UNSIGNED)) AS `glyph6`
|
||||
(CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1293), ' ', -1) AS UNSIGNED)) AS `glyph6`
|
||||
FROM `characters`;
|
||||
|
||||
CREATE TABLE `character_talent` (
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12755;
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12754;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12754);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12755;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12755);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12755;
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12755;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (29077, 12755);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12756;
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12756;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (29077, 12756);
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12756;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12756);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
DELETE FROM `creature_involvedrelation` WHERE `quest` = 12756;
|
||||
INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12756);
|
||||
DELETE FROM `creature_questrelation` WHERE `quest` = 12757;
|
||||
INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12757);
|
||||
|
||||
UPDATE `quest_template` SET `PrevQuestId`=12751 WHERE `entry`=12754;
|
||||
|
||||
@@ -49,8 +49,8 @@ INSERT INTO `creature_ai_scripts` VALUES ('2918103', '29181', '0', '0', '100', '
|
||||
INSERT INTO `creature_ai_scripts` VALUES ('2918104', '29181', '0', '0', '100', '3', '10000', '20000', '10000', '20000', '11', '21807', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Rayne - SPELL_WRATH');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
DELETE FROM script_texts WHERE entry BETWEEN -1609286 AND -1609201;
|
||||
INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
|
||||
-- The Light of Dawn
|
||||
|
||||
@@ -19,6 +19,6 @@ CREATE TABLE `guild_bank_eventlog` (
|
||||
KEY `guildid_key` (`guildid`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- The reason i decided for such dramatic change is that old guild_bank_eventlog table used `TabId` = 0 for Money events and
|
||||
-- The reason i decided for such dramatic change is that old guild_bank_eventlog table used `TabId` = 0 for Money events and
|
||||
-- used `LogGuid` from 0 to infinity
|
||||
-- New system uses `LogGuid` from 0 to number defined in config.
|
||||
|
||||
@@ -16,6 +16,6 @@ CREATE TABLE `guild_eventlog` (
|
||||
PRIMARY KEY (`guildid`, `LogGuid`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog';
|
||||
|
||||
-- The reason i decided for such dramatic change is that old guild_eventlog table didn't have Primary key and
|
||||
-- The reason i decided for such dramatic change is that old guild_eventlog table didn't have Primary key and
|
||||
-- used LogGuids from 0 to infinity
|
||||
-- New system uses LogGuids from 0 to number defined in config.
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `spell_dbc` WHERE `Id` IN(65142);
|
||||
INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `AttributesEx3`, `DurationIndex`, `RangeIndex`, `Effect1`, `EffectImplicitTargetA1`, `EffectApplyAuraName1`, `EffectMiscValue1`, `SpellFamilyName`, `SchoolMask`, `Comment`) VALUES
|
||||
INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `AttributesEx3`, `DurationIndex`, `RangeIndex`, `Effect1`, `EffectImplicitTargetA1`, `EffectApplyAuraName1`, `EffectMiscValue1`, `SpellFamilyName`, `SchoolMask`, `Comment`) VALUES
|
||||
(65142, 3, 22, 0x00000080, 21, 13, 6, 6, 255, 22, 15, 8, 'Crypt Fever - SPELL_AURA_LINKED');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_enchant_proc_data` WHERE `entry` IN(803, 912, 1894, 1898, 1899, 1900, 2673, 2675, 3225, 3239, 3241, 3273, 3368, 3369, 3789, 3869);
|
||||
INSERT INTO spell_enchant_proc_data (`entry`, `customChance`, `PPMChance`,`procEx`) VALUES
|
||||
INSERT INTO spell_enchant_proc_data (`entry`, `customChance`, `PPMChance`,`procEx`) VALUES
|
||||
-- Fiery Weapon
|
||||
(803, 0, 6.0,0),
|
||||
-- Demonslaying
|
||||
|
||||
@@ -37,4 +37,4 @@ INSERT INTO `script_waypoint` VALUES
|
||||
(8856, 15, -8356.65, 385.247, 122.275, 0, ''),
|
||||
(8856, 16, -8352.99, 379.932, 122.275, 0, ''),
|
||||
(8856, 17, -8335.58, 393.519, 122.275, 0, ''),
|
||||
(8856, 18, -8334.89, 394.13, 122.274, 0, '');
|
||||
(8856, 18, -8334.89, 394.13, 122.274, 0, '');
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
-- Add 20 second cooldown for Bloodworms
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (49027, 49542, 49543);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
(49027, 0, 0, 0, 0, 0, 0, 0, 0, 3, 20), -- Bloodworms rank 1
|
||||
(49542, 0, 0, 0, 0, 0, 0, 0, 0, 6, 20), -- Bloodworms rank 2
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (49027, 49542, 49543);
|
||||
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
|
||||
(49027, 0, 0, 0, 0, 0, 0, 0, 0, 3, 20), -- Bloodworms rank 1
|
||||
(49542, 0, 0, 0, 0, 0, 0, 0, 0, 6, 20), -- Bloodworms rank 2
|
||||
(49543, 0, 0, 0, 0, 0, 0, 0, 0, 9, 20); -- Bloodworms rank 3
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (16086,16544);
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
INSERT INTO `spell_proc_event` VALUES
|
||||
( 16086, 0x04, 11, 0x00000000, 0x00040000, 0x00000000, 0x00030000, 0x00000000, 0, 0, 0), -- Improved Fire Nova Totem (Rank 1)
|
||||
( 16544, 0x04, 11, 0x00000000, 0x00040000, 0x00000000, 0x00030000, 0x00000000, 0, 0, 0); -- Improved Fire Nova Totem (Rank 2)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
INSERT INTO `battleground_template` ( `id` , `MinPlayersPerTeam` , `MaxPlayersPerTeam` , `MinLvl` , `MaxLvl` , `AllianceStartLoc` , `AllianceStartO` , `HordeStartLoc` , `HordeStartO` )
|
||||
INSERT INTO `battleground_template` ( `id` , `MinPlayersPerTeam` , `MaxPlayersPerTeam` , `MinLvl` , `MaxLvl` , `AllianceStartLoc` , `AllianceStartO` , `HordeStartLoc` , `HordeStartO` )
|
||||
VALUES ( 30, 20, 40, 71, 80, 1485, 0, 1486, 0 ) ;
|
||||
INSERT INTO `battleground_template` ( `id` , `MinPlayersPerTeam` , `MaxPlayersPerTeam` , `MinLvl` , `MaxLvl` , `AllianceStartLoc` , `AllianceStartO` , `HordeStartLoc` , `HordeStartO` )
|
||||
INSERT INTO `battleground_template` ( `id` , `MinPlayersPerTeam` , `MaxPlayersPerTeam` , `MinLvl` , `MaxLvl` , `AllianceStartLoc` , `AllianceStartO` , `HordeStartLoc` , `HordeStartO` )
|
||||
VALUES ( 32, 0, 40, 0, 80, 0, 0, 0, 0 ) ;
|
||||
|
||||
@@ -148,7 +148,7 @@ INSERT INTO `creature_classlevelstats` (`exp`,`class`,`level`,`basehp`,`basemana
|
||||
(0,2,20,433,490),
|
||||
(0,2,21,464,510),
|
||||
(0,2,22,498,544),
|
||||
(0,2,23,533,581),
|
||||
(0,2,23,533,581),
|
||||
(0,2,24,571,618),
|
||||
(0,2,25,610,655),
|
||||
(0,2,26,651,693),
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
UPDATE command
|
||||
UPDATE command
|
||||
SET help = 'Syntax: .account set gmlevel [$account] #level [#realmid]\r\n\r\nSet the security level for targeted player (can\'t be used at self) or for account $name to a level of #level on the realm #realmID.\r\n\r\n#level may range from 0 to 3.\r\n\r\n#reamID may be -1 for all realms.'
|
||||
WHERE name = 'account set gmlevel';
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `trinity_string` WHERE `entry`=11001;
|
||||
INSERT INTO trinity_string (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
|
||||
INSERT INTO trinity_string (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
|
||||
(11001, 'You have not chosen -1 or the current realmID that you are on.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
|
||||
@@ -137,7 +137,7 @@ INSERT INTO `creature_classlevelstats` (`exp`,`class`,`level`,`basehp`,`basemana
|
||||
(0,2,20,433,490),
|
||||
(0,2,21,464,510),
|
||||
(0,2,22,498,544),
|
||||
(0,2,23,533,581),
|
||||
(0,2,23,533,581),
|
||||
(0,2,24,571,618),
|
||||
(0,2,25,610,655),
|
||||
(0,2,26,651,693),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `script_texts` WHERE `npc_entry` IN (25504, 25589);
|
||||
INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
|
||||
INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
|
||||
(25504, -1750040, 'My father''s aura is quite strong, he cannot be far. Could you be a doll and fight off the monsters wandering throught the mist?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
|
||||
(25504, -1750041, 'Watch out for the monsters!Which way should we go first? Let''s try this way...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
|
||||
(25504, -1750042, 'What could this be?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ALTER TABLE `character_aura`
|
||||
ALTER TABLE `character_aura`
|
||||
ADD COLUMN `base_amount0` INT(11) NOT NULL DEFAULT '0' AFTER `amount2`,
|
||||
ADD COLUMN `base_amount1` INT(11) NOT NULL DEFAULT '0' AFTER `base_amount0`,
|
||||
ADD COLUMN `base_amount2` INT(11) NOT NULL DEFAULT '0' AFTER `base_amount1`,
|
||||
|
||||
@@ -7,8 +7,8 @@ CREATE TABLE `creature_classlevelstats` (
|
||||
`level` tinyint(1) NOT NULL,
|
||||
`class` tinyint(1) NOT NULL,
|
||||
`basehp0` smallint(2) NOT NULL,
|
||||
`basehp1` smallint(2) NOT NULL,
|
||||
`basehp2` smallint(2) NOT NULL,
|
||||
`basehp1` smallint(2) NOT NULL,
|
||||
`basehp2` smallint(2) NOT NULL,
|
||||
`basemana` smallint(2) NOT NULL,
|
||||
`basearmor` smallint(2) NOT NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- cast s66747 (Totem of the Earthen Ring) after completing q14100 or q14111 (Relic of the Earthen Ring)
|
||||
DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=66744 AND `spell_effect`=66747;
|
||||
INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
|
||||
INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
|
||||
(66744,66747,0, 'totem of the earthen ring');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-- Some spell bonus data mostly for DK spells and trinket spells
|
||||
DELETE FROM `spell_bonus_data` WHERE `entry` IN (63544,54181,55078,55095,50536,52212,51460,48721,45477,54757,45055,60203,60488,45429);
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
|
||||
(63544, 0, -1, -1, -1, 'Priest - Empowered Renew'),
|
||||
(54181, 0, -1, -1, -1, 'Warlock - Fel Synergy'),
|
||||
(55078, 0, 0, -1, 0.06325, 'Death Knight - Blood Plague'),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `trinity_string` WHERE `entry` IN (5024,5025,5026,5027);
|
||||
INSERT INTO trinity_string (`entry`, `content_default`) VALUES
|
||||
INSERT INTO trinity_string (`entry`, `content_default`) VALUES
|
||||
(5024, 'Entry: %u'),
|
||||
(5025, 'Type: %u'),
|
||||
(5026, 'DisplayID: %u'),
|
||||
|
||||
@@ -25,9 +25,9 @@ INSERT INTO `vehicle_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`d
|
||||
(33113,33114,2,1, 'Flame Leviathan'),
|
||||
(33113,33114,3,1, 'Flame Leviathan'),
|
||||
(33113,33139,7,1, 'Flame Leviathan'),
|
||||
(33114,33142,1,1, 'Overload Control Device'),
|
||||
(33114,33143,2,1, 'Leviathan Defense Turret'),
|
||||
(33214,33218,1,1, 'Mechanolift 304-A'),
|
||||
(33114,33142,1,1, 'Overload Control Device'),
|
||||
(33114,33143,2,1, 'Leviathan Defense Turret'),
|
||||
(33214,33218,1,1, 'Mechanolift 304-A'),
|
||||
(35637,34705,0,0, 'Marshal Jacob Alerius'' Mount'),
|
||||
(35633,34702,0,0, 'Ambrose Boltspark''s Mount'),
|
||||
(35768,34701,0,0, 'Colosos'' Mount'),
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
DROP TABLE IF EXISTS `item_refund_instance`;
|
||||
CREATE TABLE `item_refund_instance` (
|
||||
`item_guid` int(11) unsigned NOT NULL COMMENT 'Item GUID',
|
||||
CREATE TABLE `item_refund_instance` (
|
||||
`item_guid` int(11) unsigned NOT NULL COMMENT 'Item GUID',
|
||||
`player_guid` int(11) unsigned NOT NULL COMMENT 'Player GUID',
|
||||
`paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidHonor` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidArena` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_1` mediumint(6) unsigned NOT NULL DEFAULT '0' COMMENT 'item_template.entry',
|
||||
`paidItemCount_1` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_2` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_2` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_3` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_3` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_4` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_4` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_5` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_5` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`item_guid`, `player_guid`)
|
||||
`paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidHonor` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidArena` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_1` mediumint(6) unsigned NOT NULL DEFAULT '0' COMMENT 'item_template.entry',
|
||||
`paidItemCount_1` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_2` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_2` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_3` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_3` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_4` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_4` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItem_5` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
`paidItemCount_5` mediumint(6) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`item_guid`, `player_guid`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
DELETE FROM `spell_proc_event` WHERE `entry` IN (42370);
|
||||
INSERT INTO `spell_proc_event`
|
||||
(`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`)
|
||||
(`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`)
|
||||
VALUES ( 42370, 0x00, 11, 0x00000080, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Merciless Totem of the Third Wind
|
||||
|
||||
@@ -3,7 +3,7 @@ DROP COLUMN `paidHonor`,
|
||||
DROP COLUMN `paidArena`,
|
||||
DROP COLUMN `paidItem_1`,
|
||||
DROP COLUMN `paidItemCount_1`,
|
||||
DROP COLUMN `paidItem_2`,
|
||||
DROP COLUMN `paidItem_2`,
|
||||
DROP COLUMN `paidItemCount_2`,
|
||||
DROP COLUMN `paidItem_3`,
|
||||
DROP COLUMN `paidItemCount_3`,
|
||||
|
||||
@@ -35,7 +35,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
|
||||
(26529,-1595029,'Get up! Me not done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13432,1,0,0,'meathook SAY_SLAY_3'),
|
||||
(26529,-1595030,'New toys!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13429,1,0,0,'meathook SAY_SPAWN'),
|
||||
(26529,-1595031,'This... not fun...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13433,1,0,0,'meathook SAY_DEATH'),
|
||||
-- Salramm the Fleshcrafter
|
||||
-- Salramm the Fleshcrafter
|
||||
(26530,-1595032,'Ah, the entertainment has arrived!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13472,1,0,0,'salramm SAY_AGGRO'),
|
||||
(26530,-1595033,'You are too late, champion of Lordaeron. The dead shall have their day.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13471,1,0,0,'salramm SAY_SPAWN'),
|
||||
(26530,-1595034,'The fun is just beginning!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13473,1,0,0,'salramm SAY_SLAY_1'),
|
||||
@@ -49,7 +49,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
|
||||
(26530,-1595042,'Your flesh betrays you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13482,1,0,0,'salramm SAY_STEAL_FLESH_3'),
|
||||
(26530,-1595043,'Say hello to some friends of mine.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13476,1,0,0,'salramm SAY_SUMMON_GHOULS_1'),
|
||||
(26530,-1595044,'Come, citizen of Stratholme! Meet your saviors.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13477,1,0,0,'salramm SAY_SUMMON_GHOULS_2'),
|
||||
-- The Infinite Corruptor
|
||||
-- The Infinite Corruptor
|
||||
-- Couldn't find the value from the audios for `sound` column, not added.
|
||||
(32273,-1595045,'How dare you interfere with our work here!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'infinite SAY_AGGRO'),
|
||||
(32273,-1595046,'My work here is finished!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'infinite SAY_FAIL'),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5284,5285,5286,5287,4871,4872,4873,5108);
|
||||
INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
|
||||
INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
|
||||
(5284, 'at_aldurthar_gate'),
|
||||
(5285, 'at_aldurthar_gate'),
|
||||
(5286, 'at_aldurthar_gate'),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
DELETE FROM `spell_group_stack_rules` WHERE `group_id` IN (1015,1016,1019,1022,1025,1029,1033,1036,1043,1048,1051,1054,1057,1059,1064,1068,1074,1079,1082,1085,1088,1090,1093,1096,1099,1103,1046);
|
||||
INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`) VALUES
|
||||
INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`) VALUES
|
||||
(1015,1),
|
||||
(1016,1),
|
||||
(1019,1),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user