diff options
618 files changed, 1896 insertions, 993 deletions
diff --git a/.travis.yml b/.travis.yml index 68008293e1..57533b8500 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,44 +1,36 @@ -# Copyright (C) -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +sudo: required +dist: trusty language: cpp +compiler: + - clang git: depth: 1 -branches: - only: - - master +before_install: + - sudo apt-get -qq install build-essential libtool make cmake cmake-data openssl + - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev + - sudo apt-get -qq install mysql-server + - git config user.email "travis@build.bot" && git config user.name "Travis CI" + - git tag -a -m "Travis build" init -compiler: - - clang - - gcc ## Uncomment when we are up to full c++11 standards. +install: + - mysql -uroot -e 'create database test_mysql;' + - cd bin + - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=0 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install + - cd .. -before_install: - - sudo add-apt-repository ppa:kalakris/cmake -y - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.7 main' - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-get update -qq - - sudo apt-get install clang-3.7 - - sudo apt-get install libace-dev - - sudo apt-get install libncurses5-dev - - sudo apt-get install build-essential autoconf libtool make cmake git-core patch wget links zip unzip unrar - - sudo apt-get install openssl libssl-dev mysql-server mysql-client libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev - - if [ "$CXX" = "clang++" ]; then sudo apt-get install -qq libstdc++-4.8-dev; fi - - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi - - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - script: - - mkdir build - - cd build - - cmake ../ -DSCRIPTS=1 -DTOOLS=1 - - make -j8
\ No newline at end of file + - $CXX --version + - mysql -uroot < data/sql/create/create_mysql.sql + - cat data/sql/base/db_auth/*.sql | mysql -uacore -pacore auth + - cat data/sql/base/db_characters/*.sql | mysql -uacore -pacore characters + - cat data/sql/base/db_world/*.sql | mysql -uacore -pacore world + - cat data/sql/updates/db_auth/*.sql | mysql -uacore -pacore auth + - cat data/sql/updates/db_characters/*.sql | mysql -uacore -pacore characters + - cat data/sql/updates/db_world/*.sql | mysql -uacore -pacore world + - mysql -uroot < data/sql/create/drop_mysql.sql + - cd bin + - make -j 8 -k && make install + - cd check_install/bin @@ -1,6 +1,6 @@ -# AzerothCore +#  AzerothCore -[](https://gitter.im/azerothcore/azerothcore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[](https://gitter.im/azerothcore/azerothcore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [](https://www.bountysource.com/teams/azerothcore/bounties) [](https://travis-ci.org/azerothcore/azerothcore-wotlk) [](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk) [](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk) ## Introduction diff --git a/bin/compiler/1-clean.sh b/bin/compiler/1-clean.sh index fc27e2bedb..558c093e3f 100755 --- a/bin/compiler/1-clean.sh +++ b/bin/compiler/1-clean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/bin/compiler/2-configure.sh b/bin/compiler/2-configure.sh index 9c610576c0..0d59b1caac 100755 --- a/bin/compiler/2-configure.sh +++ b/bin/compiler/2-configure.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/bin/compiler/3-build.sh b/bin/compiler/3-build.sh index 126da69cfa..6956f82fd3 100755 --- a/bin/compiler/3-build.sh +++ b/bin/compiler/3-build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/bin/compiler/compiler.sh b/bin/compiler/compiler.sh index 187a16ed14..f813be803b 100755 --- a/bin/compiler/compiler.sh +++ b/bin/compiler/compiler.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$CURRENT_PATH/includes/includes.sh" diff --git a/bin/compiler/includes/defines.sh b/bin/compiler/includes/defines.sh index e8324e92c4..b60a591089 100644 --- a/bin/compiler/includes/defines.sh +++ b/bin/compiler/includes/defines.sh @@ -1,5 +1,3 @@ -#!/bin/bash - # you can choose build type from cmd argument if [ ! -z $1 ] then diff --git a/bin/compiler/includes/includes.sh b/bin/compiler/includes/includes.sh index 24ccf7d78b..feafef6f63 100644 --- a/bin/compiler/includes/includes.sh +++ b/bin/compiler/includes/includes.sh @@ -10,7 +10,7 @@ fi function ac_on_after_build() { # move the run engine - cp -rvf "$AC_PATH_BIN/runners/"* "$INSTALL_PATH/bin/" + cp -rvf "$AC_PATH_MODULES/acore/startup-scripts/"* "$INSTALL_PATH/bin/" } registerHooks "ON_AFTER_BUILD" ac_on_after_build diff --git a/bin/db_assembler/db_assembler.sh b/bin/db_assembler/db_assembler.sh index c329b8db15..74902ab729 100755 --- a/bin/db_assembler/db_assembler.sh +++ b/bin/db_assembler/db_assembler.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash unamestr=`uname` if [[ "$unamestr" == 'Darwin' ]]; then @@ -19,135 +19,177 @@ else MD5_CMD="md5sum" fi -reg_file="$OUTPUT_FOLDER/.zzz_db_assembler_registry.sh" - -registry=() +reg_file="$OUTPUT_FOLDER/__db_assembler_registry" if [ -f "$reg_file" ]; then source "$reg_file" fi -echo "===== STARTING PROCESS =====" - - function assemble() { - database=$1 + # to lowercase + database=${1,,} start_sql=$2 + with_base=$3 + with_updates=$4 + with_custom=$5 - var_base="DB_"$database"_PATHS" - base=${!var_base} - - var_updates="DB_"$database"_UPDATE_PATHS" - updates=${!var_updates} - - var_custom="DB_"$database"_CUSTOM_PATHS" - custom=${!var_custom} - + uc=${database^^} - suffix_base="" - suffix_upd="" - suffix_custom="" + name="DB_"$uc"_PATHS" + v="$name[@]" + base=("${!v}") - if (( $ALL_IN_ONE == 0 )); then - suffix_base="_base" - fi; + name="DB_"$uc"_UPDATE_PATHS" + v="$name[@]" + updates=("${!v}") - echo "" > $OUTPUT_FOLDER$database$suffix_base".sql" + name='DB_'$uc'_CUSTOM_PATHS' + v="$name[@]" + custom=("${!v}") - if [ ! ${#base[@]} -eq 0 ]; then - echo "Generating $OUTPUT_FOLDER$database$suffix_base ..." + suffix_base="_base" + suffix_upd="_update" + suffix_custom="_custom" - for d in "${base[@]}" - do - if [ ! -z $d ]; then - for entry in "$d"/*.sql "$d"/**/*.sql - do - if [[ -e $entry ]]; then - cat "$entry" >> $OUTPUT_FOLDER$database$suffix_base".sql" - fi - done - fi - done - fi + curTime=`date +%Y_%m_%d_%H_%M_%S` - if (( $ALL_IN_ONE == 0 )); then - suffix_upd="_updates" + if [ $with_base = true ]; then + echo "" > $OUTPUT_FOLDER$database$suffix_base".sql" - echo "" > $OUTPUT_FOLDER$database$suffix_upd".sql" - fi; - if [ ! ${#updates[@]} -eq 0 ]; then - echo "Generating $OUTPUT_FOLDER$database$suffix_upd ..." + if [ ! ${#base[@]} -eq 0 ]; then + echo "Generating $OUTPUT_FOLDER$database$suffix_base ..." - for d in "${updates[@]}" - do - if [ ! -z $d ]; then - for entry in "$d"/*.sql "$d"/**/*.sql - do - if [[ ! -e $entry ]]; then - continue - fi - - file=$(basename "$entry") - hash=$($MD5_CMD "$entry") - hash="${hash%% *}" #remove file path - if [[ -z ${registry[$hash]} ]]; then - registry["$hash"]="$file" - echo "-- New update sql: "$file - cat "$entry" >> $OUTPUT_FOLDER$database$suffix_upd".sql" - fi - done - fi - done + for d in "${base[@]}" + do + echo "Searching on $d ..." + if [ ! -z $d ]; then + for entry in "$d"/*.sql "$d"/**/*.sql + do + if [[ -e $entry ]]; then + cat "$entry" >> $OUTPUT_FOLDER$database$suffix_base".sql" + fi + done + fi + done + fi fi - if (( $ALL_IN_ONE == 0 )); then - suffix_custom="_custom" - - echo "" > $OUTPUT_FOLDER$database$suffix_custom".sql" - fi; + if [ $with_updates = true ]; then + updFile=$OUTPUT_FOLDER$database$suffix_upd"_"$curTime".sql" + + if [ ! ${#updates[@]} -eq 0 ]; then + echo "Generating $OUTPUT_FOLDER$database$suffix_upd ..." + + for d in "${updates[@]}" + do + echo "Searching on $d ..." + if [ ! -z $d ]; then + for entry in "$d"/*.sql "$d"/**/*.sql + do + if [[ ! -e $entry ]]; then + continue + fi + + file=$(basename "$entry") + hash=$($MD5_CMD "$entry") + hash="${hash%% *}" #remove file path + n="registry__$hash" + if [[ -z ${!n} ]]; then + if [ ! -e $updFile ]; then + echo "-- assembled updates" > $updFile + fi + + printf -v "registry__${hash}" %s "$file" + echo "-- New update sql: "$file + echo "-- $file" + cat "$entry" >> $updFile + fi + done + fi + done + fi + fi + if [ $with_custom = true ]; then + custFile=$OUTPUT_FOLDER$database$suffix_custom".sql" + + if [ ! ${#custom[@]} -eq 0 ]; then + echo "Generating $OUTPUT_FOLDER$database$suffix_custom ..." + + for d in "${custom[@]}" + do + echo "Searching on $d ..." + if [ ! -z $d ]; then + for entry in "$d"/*.sql "$d"/**/*.sql + do + if [[ ! -e $entry ]]; then + continue + fi + + if [[ ! -e $custFile ]]; then + echo "-- assembled custom" > "$custFile" + fi + + echo "-- $file" >> $custFile + cat "$entry" >> $custFile + done + fi + done + fi + fi +} +function run() { + echo "===== STARTING PROCESS =====" - if [ ! ${#custom[@]} -eq 0 ]; then - echo "Generating $OUTPUT_FOLDER$database$suffix_custom ..." + mkdir -p $OUTPUT_FOLDER - for d in "${custom[@]}" + for db in ${DATABASES[@]} do - if [ ! -z $d ]; then - for entry in "$d"/*.sql "$d"/**/*.sql - do - if [[ ! -e $entry ]]; then - continue - fi - - file=$(basename "$entry") - hash=$($MD5_CMD "$entry") - hash="${hash%% *}" #remove file path - if [[ -z ${registry[$hash]} ]]; then - registry["$hash"]="$file" - echo "-- New custom sql: "$file - cat "$entry" >> $OUTPUT_FOLDER$database$suffix_custom".sql" - fi - done - fi + assemble "$db" $version".sql" $1 $2 $3 done - fi -} -mkdir -p $OUTPUT_FOLDER + echo "" > $reg_file -for db in ${DATABASES[@]} -do - assemble "$db" $version".sql" -done + for k in ${!registry__*} + do + n=$k + echo "$k='${!n}';" >> "$reg_file" + done -echo "" > $reg_file + echo "===== DONE =====" +} -for i in "${!registry[@]}" +PS3='Please enter your choice: ' +options=("Create ALL" "Create only bases" "Create only updates" "Create only customs" "Clean registry" "Quit") +select opt in "${options[@]}" do - echo "registry['"$i"']='"${registry[$i]}"'" >> "$reg_file" + case $opt in + "Create ALL") + run true true true + break #avoid loop + ;; + "Create only bases") + run true false false + break #avoid loop + ;; + "Create only updates") + run false true false + break #avoid loop + ;; + "Create only customs") + run false false true + break #avoid loop + ;; + "Clean registry") + rm "$reg_file" + break #avoid loop + ;; + "Quit") + break + ;; + *) echo invalid option;; + esac done - -echo "===== DONE =====" diff --git a/bin/db_exporter/db_export.sh b/bin/db_exporter/db_export.sh index e419d38bf2..22d73f7283 100755 --- a/bin/db_exporter/db_export.sh +++ b/bin/db_exporter/db_export.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )" diff --git a/bin/db_pendings/import.sh b/bin/db_pendings/import.sh new file mode 100755 index 0000000000..5ee63a0f65 --- /dev/null +++ b/bin/db_pendings/import.sh @@ -0,0 +1,110 @@ +#!/usr/bin/env bash + +CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +source "$CURRENT_PATH/../bash_shared/includes.sh" + +UPDATES_PATH="$AC_PATH_ROOT/data/sql/updates/" + +function import() { + db=$1 + folder="db_"$db + pendingPath="$AC_PATH_ROOT/data/sql/updates/pending_$folder" + updPath="$UPDATES_PATH/$folder" + + latestUpd=`ls $updPath/ -1 | tail -n 1` + + if [ -z $latestUpd ]; then + echo "FIRST UPDATE FILE MISSING!! DID YOU ARCHIVED IT?"; + exit; + fi + + dateToday=`date +%Y_%m_%d` + counter=0 + + dateLast=$latestUpd + tmp=${dateLast#*_*_*_} + oldCnt=${tmp%.sql} + oldDate=${dateLast%_$tmp} + + if [ "$oldDate" = "$dateToday" ]; then + ((counter=$oldCnt+1)) + fi; + + for entry in "$pendingPath"/*.sql + do + if [[ -e $entry ]]; then + oldVer=$oldDate"_"$oldCnt + + cnt=$(printf -v counter "%02d" $counter ; echo $counter) + + newVer=$dateToday"_"$cnt + + startTransaction="START TRANSACTION;"; + updHeader="ALTER TABLE version_db_"$db" CHANGE COLUMN "$oldVer" "$newVer" bit;"; + endTransaction="COMMIT;"; + + newFile="$updPath/"$dateToday"_"$cnt".sql" + + oldFile=$(basename "$entry") + prefix=${oldFile%_*.sql} + suffix=${oldFile#rev_} + rev=${suffix%.sql} + + isRev=0 + if [[ $prefix = "rev" && $rev =~ ^-?[0-9]+$ ]]; then + isRev=1 + fi + + echo "-- DB update $oldVer -> $newVer" > "$newFile"; + + if [[ $isRev -eq 1 ]]; then + echo "DROP PROCEDURE IF EXISTS \`updateDb\`;" >> "$newFile"; + echo "DELIMITER //" >> "$newFile"; + echo "CREATE PROCEDURE updateDb ()" >> "$newFile"; + echo "proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';" >> "$newFile"; + fi + + echo "$startTransaction" >> "$newFile"; + echo "$updHeader" >> "$newFile"; + + if [[ $isRev -eq 1 ]]; then + echo "SELECT sql_rev INTO OK FROM version_db_"$db" WHERE sql_rev = '$rev'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;" >> "$newFile"; + fi; + + echo "--" >> "$newFile"; + echo "-- START UPDATING QUERIES" >> "$newFile"; + echo "--" >> "$newFile"; + + cat $entry >> "$newFile"; + + echo "--" >> "$newFile"; + echo "-- END UPDATING QUERIES" >> "$newFile"; + echo "--" >> "$newFile"; + + echo "$endTransaction" >> "$newFile"; + + if [[ $isRev -eq 1 ]]; then + echo "END;" >> "$newFile"; + echo "//" >> "$newFile"; + echo "DELIMITER ;" >> "$newFile"; + echo "CALL updateDb();" >> "$newFile"; + echo "DROP PROCEDURE IF EXISTS \`updateDb\`;" >> "$newFile"; + fi; + + rm $entry; + + oldDate=$dateToday + oldCnt=$cnt + + ((counter+=1)) + fi + done + +} + +import "world" +import "characters" +import "auth" + +echo "Done." diff --git a/bin/runners/run-engine b/bin/runners/run-engine deleted file mode 100755 index 823bf0b3c6..0000000000 --- a/bin/runners/run-engine +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -function checkStatus() { - if screen -ls $1 | grep -q "No Sockets found" - then - return 0 - else - return 1 - fi -} - -function starter() { - local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - - cd $BINPATH - - mkdir -p "$LOGS_PATH" - - TRACE_BEGIN_STRING="SIGSEGV" - TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log" - ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log" - SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log" - SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err" - LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link" - - $CURRENT_PATH/starter $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" $GDB_ENABLED -} - - -function restarter() { - local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - cd $BINPATH - - mkdir -p "$LOGS_PATH" - - TRACE_BEGIN_STRING="SIGSEGV" - TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log" - ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log" - SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log" - SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err" - LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link" - - if [ ! -f $TRACE_FILE ]; then - touch $TRACE_FILE - fi - - while : - do - if checkStatus $SCREEN_NAME; then - DATE=$(date) - echo "Restarting $SCREEN_NAME Core blizz($DATE)" - echo $PID - if [ $GDB_ENABLED -eq 1 ]; then - echo "GDB enabled" - grep -B 10 -A 1800 "$TRACE_BEGIN_STRING" "$SYSLOG" >> "$TRACE_FILE" - cat "$SYSERR" > "$ERR_FILE" - screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" 1 - fi - - if [ $GDB_ENABLED -eq 0 ]; then - echo "GDB disabled" - screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN null "$CONFIG" null null 0 - fi - fi - - sleep 15 - done -} diff --git a/conf/config.sh.dist b/conf/config.sh.dist index c6e004cf77..cb36ce2a32 100644 --- a/conf/config.sh.dist +++ b/conf/config.sh.dist @@ -1,5 +1,3 @@ -#!/bin/bash - # absolute root path of your azerothshard repository SRCPATH="$AC_PATH_ROOT" # absolute path where binary files must be stored @@ -40,48 +38,13 @@ CCOREPCH=ON # you can add your custom definitions here ( -D ) CCUSTOMOPTIONS="" -############################################## -# -# RUNNER CONFIGURATION -# -############################################## - -# enable/disable GDB execution -export GDB_ENABLED=0 - -# gdb file -export GDB="" - -# directory where binary are stored -export BINPATH="" - - ### Put here the pid you configured on your worldserver.conf file ### -export SERVERPID="" - -# path to conf file -export CONFIG="" - -# path of log files -export LOGS_PATH=""; - -# exec name -export SERVERBIN="" - -# name of screen service ( for restarter ) -export SCREEN_NAME="" - ############################################## # -# DB ASSEMBLER CONFIGURATIONS +# DB ASSEMBLER / EXPORTER CONFIGURATIONS # ############################################## - -# 0 if you want create an sql for each kind of following categories -# 1 to create a single big file to import ( suggested for new installations ) -ALL_IN_ONE=0 - DATABASES=( "AUTH" "CHARACTERS" @@ -92,57 +55,70 @@ OUTPUT_FOLDER="output/" # FULL DB DB_CHARACTERS_PATHS=( - $SRCPATH"/data/sql/base/characters" + $SRCPATH"/data/sql/base/db_characters" ) -DB_CHARACTERS_NAME="characters" - -DB_CHARACTERS_CONF="MYSQL_USER='root'; \ - MYSQL_PASS='root'; \ - MYSQL_HOST='localhost';\ - " - DB_AUTH_PATHS=( - $SRCPATH"/data/sql/base/auth/" + $SRCPATH"/data/sql/base/db_auth/" ) -DB_AUTH_NAME="auth" - -DB_AUTH_CONF="MYSQL_USER='root'; \ - MYSQL_PASS='root'; \ - MYSQL_HOST='localhost';\ - " - DB_WORLD_PATHS=( - $SRCPATH"/data/sql/base/world/" + $SRCPATH"/data/sql/base/db_world/" ) -DB_WORLD_NAME="world" - -DB_WORLD_CONF="MYSQL_USER='root'; \ - MYSQL_PASS='root'; \ - MYSQL_HOST='localhost';\ - " - # UPDATES DB_CHARACTERS_UPDATE_PATHS=( - $SRCPATH"/data/sql/updates/characters/" + $SRCPATH"/data/sql/updates/db_characters/" ) DB_AUTH_UPDATE_PATHS=( - $SRCPATH"/data/sql/updates/auth/" + $SRCPATH"/data/sql/updates/db_auth/" ) DB_WORLD_UPDATE_PATHS=( - $SRCPATH"/data/sql/updates/world/" + $SRCPATH"/data/sql/updates/db_world/" ) # CUSTOM DB_CHARACTERS_CUSTOM_PATHS=( + $SRCPATH"/data/sql/custom/db_characters/" ) DB_AUTH_CUSTOM_PATHS=( + $SRCPATH"/data/sql/custom/db_auth/" ) DB_WORLD_CUSTOM_PATHS=( + $SRCPATH"/data/sql/custom/db_world/" ) + +############################################## +# +# DB EXPORTER/IMPORTER CONFIGURATIONS +# +############################################## + + + +DB_CHARACTERS_CONF="MYSQL_USER='root'; \ + MYSQL_PASS='root'; \ + MYSQL_HOST='localhost';\ + " + +DB_AUTH_CONF="MYSQL_USER='root'; \ + MYSQL_PASS='root'; \ + MYSQL_HOST='localhost';\ + " + + +DB_WORLD_CONF="MYSQL_USER='root'; \ + MYSQL_PASS='root'; \ + MYSQL_HOST='localhost';\ + " + + +DB_CHARACTERS_NAME="characters" + +DB_AUTH_NAME="auth" + +DB_WORLD_NAME="world" diff --git a/data/sql/archive/updates/auth/2016_07_09_00.sql b/data/sql/archive/updates/db_auth/2016_07_09_00.sql index b6cec06fc4..b6cec06fc4 100644 --- a/data/sql/archive/updates/auth/2016_07_09_00.sql +++ b/data/sql/archive/updates/db_auth/2016_07_09_00.sql diff --git a/data/sql/archive/updates/auth/2016_07_09_01.sql b/data/sql/archive/updates/db_auth/2016_07_09_01.sql index 88c5c51d74..88c5c51d74 100644 --- a/data/sql/archive/updates/auth/2016_07_09_01.sql +++ b/data/sql/archive/updates/db_auth/2016_07_09_01.sql diff --git a/data/sql/archive/updates/auth/2016_07_10_00.sql b/data/sql/archive/updates/db_auth/2016_07_10_00.sql index 1368ff7e75..1368ff7e75 100644 --- a/data/sql/archive/updates/auth/2016_07_10_00.sql +++ b/data/sql/archive/updates/db_auth/2016_07_10_00.sql diff --git a/data/sql/archive/updates/characters/2016_07_09_00.sql b/data/sql/archive/updates/db_characters/2016_07_09_00.sql index 508b4b66b6..508b4b66b6 100644 --- a/data/sql/archive/updates/characters/2016_07_09_00.sql +++ b/data/sql/archive/updates/db_characters/2016_07_09_00.sql diff --git a/data/sql/archive/updates/characters/2016_07_09_01.sql b/data/sql/archive/updates/db_characters/2016_07_09_01.sql index 10c2ae6bea..10c2ae6bea 100644 --- a/data/sql/archive/updates/characters/2016_07_09_01.sql +++ b/data/sql/archive/updates/db_characters/2016_07_09_01.sql diff --git a/data/sql/archive/updates/characters/2016_07_10_00.sql b/data/sql/archive/updates/db_characters/2016_07_10_00.sql index a19b6f68d0..a19b6f68d0 100644 --- a/data/sql/archive/updates/characters/2016_07_10_00.sql +++ b/data/sql/archive/updates/db_characters/2016_07_10_00.sql diff --git a/data/sql/archive/updates/characters/2016_07_30_00.sql b/data/sql/archive/updates/db_characters/2016_07_30_00.sql index d55f10ae38..d55f10ae38 100644 --- a/data/sql/archive/updates/characters/2016_07_30_00.sql +++ b/data/sql/archive/updates/db_characters/2016_07_30_00.sql diff --git a/data/sql/archive/updates/characters/2016_08_08_00.sql b/data/sql/archive/updates/db_characters/2016_08_08_00.sql index 524645b190..524645b190 100644 --- a/data/sql/archive/updates/characters/2016_08_08_00.sql +++ b/data/sql/archive/updates/db_characters/2016_08_08_00.sql diff --git a/data/sql/archive/updates/characters/2016_08_12_00.sql b/data/sql/archive/updates/db_characters/2016_08_12_00.sql index c43494ce5c..c43494ce5c 100644 --- a/data/sql/archive/updates/characters/2016_08_12_00.sql +++ b/data/sql/archive/updates/db_characters/2016_08_12_00.sql diff --git a/data/sql/archive/updates/world/2016_07_09_00.sql b/data/sql/archive/updates/db_world/2016_07_09_00.sql index 423e19c8db..423e19c8db 100644 --- a/data/sql/archive/updates/world/2016_07_09_00.sql +++ b/data/sql/archive/updates/db_world/2016_07_09_00.sql diff --git a/data/sql/archive/updates/world/2016_07_09_01.sql b/data/sql/archive/updates/db_world/2016_07_09_01.sql index c6e987315f..c6e987315f 100644 --- a/data/sql/archive/updates/world/2016_07_09_01.sql +++ b/data/sql/archive/updates/db_world/2016_07_09_01.sql diff --git a/data/sql/archive/updates/world/2016_07_10_00_.sql b/data/sql/archive/updates/db_world/2016_07_10_00_.sql index a015fd3f1c..a015fd3f1c 100644 --- a/data/sql/archive/updates/world/2016_07_10_00_.sql +++ b/data/sql/archive/updates/db_world/2016_07_10_00_.sql diff --git a/data/sql/archive/updates/world/2016_07_10_01.sql b/data/sql/archive/updates/db_world/2016_07_10_01.sql index 32d07d9699..32d07d9699 100644 --- a/data/sql/archive/updates/world/2016_07_10_01.sql +++ b/data/sql/archive/updates/db_world/2016_07_10_01.sql diff --git a/data/sql/archive/updates/world/2016_07_10_02.sql b/data/sql/archive/updates/db_world/2016_07_10_02.sql index fdb86e8cd6..fdb86e8cd6 100644 --- a/data/sql/archive/updates/world/2016_07_10_02.sql +++ b/data/sql/archive/updates/db_world/2016_07_10_02.sql diff --git a/data/sql/archive/updates/world/2016_07_14_00.sql b/data/sql/archive/updates/db_world/2016_07_14_00.sql index 18e60d4c2e..18e60d4c2e 100644 --- a/data/sql/archive/updates/world/2016_07_14_00.sql +++ b/data/sql/archive/updates/db_world/2016_07_14_00.sql diff --git a/data/sql/archive/updates/world/2016_07_28_00.sql b/data/sql/archive/updates/db_world/2016_07_28_00.sql index d5b9da3cbc..d5b9da3cbc 100644 --- a/data/sql/archive/updates/world/2016_07_28_00.sql +++ b/data/sql/archive/updates/db_world/2016_07_28_00.sql diff --git a/data/sql/archive/updates/world/2016_08_01_00.sql b/data/sql/archive/updates/db_world/2016_08_01_00.sql index 5e1676a87e..5e1676a87e 100644 --- a/data/sql/archive/updates/world/2016_08_01_00.sql +++ b/data/sql/archive/updates/db_world/2016_08_01_00.sql diff --git a/data/sql/archive/updates/world/2016_08_03_00.sql b/data/sql/archive/updates/db_world/2016_08_03_00.sql index 0408264fc1..0408264fc1 100644 --- a/data/sql/archive/updates/world/2016_08_03_00.sql +++ b/data/sql/archive/updates/db_world/2016_08_03_00.sql diff --git a/data/sql/archive/updates/world/2016_08_10_00.sql b/data/sql/archive/updates/db_world/2016_08_10_00.sql index ece8bc98e6..ece8bc98e6 100644 --- a/data/sql/archive/updates/world/2016_08_10_00.sql +++ b/data/sql/archive/updates/db_world/2016_08_10_00.sql diff --git a/data/sql/archive/updates/world/2016_08_10_01.sql b/data/sql/archive/updates/db_world/2016_08_10_01.sql index 1dfe9d2a71..1dfe9d2a71 100644 --- a/data/sql/archive/updates/world/2016_08_10_01.sql +++ b/data/sql/archive/updates/db_world/2016_08_10_01.sql diff --git a/data/sql/base/auth/account.sql b/data/sql/base/db_auth/account.sql index d2ad2b7904..d2ad2b7904 100644 --- a/data/sql/base/auth/account.sql +++ b/data/sql/base/db_auth/account.sql diff --git a/data/sql/base/auth/account_access.sql b/data/sql/base/db_auth/account_access.sql index 799f8a64af..799f8a64af 100644 --- a/data/sql/base/auth/account_access.sql +++ b/data/sql/base/db_auth/account_access.sql diff --git a/data/sql/base/auth/account_banned.sql b/data/sql/base/db_auth/account_banned.sql index e228e26f5b..e228e26f5b 100644 --- a/data/sql/base/auth/account_banned.sql +++ b/data/sql/base/db_auth/account_banned.sql diff --git a/data/sql/base/auth/auth_db_version.sql b/data/sql/base/db_auth/auth_db_version.sql index 6733d6a918..6733d6a918 100644 --- a/data/sql/base/auth/auth_db_version.sql +++ b/data/sql/base/db_auth/auth_db_version.sql diff --git a/data/sql/base/auth/autobroadcast.sql b/data/sql/base/db_auth/autobroadcast.sql index b8d5a5ea26..b8d5a5ea26 100644 --- a/data/sql/base/auth/autobroadcast.sql +++ b/data/sql/base/db_auth/autobroadcast.sql diff --git a/data/sql/base/auth/ip_banned.sql b/data/sql/base/db_auth/ip_banned.sql index abe5b6aba4..abe5b6aba4 100644 --- a/data/sql/base/auth/ip_banned.sql +++ b/data/sql/base/db_auth/ip_banned.sql diff --git a/data/sql/base/auth/realmcharacters.sql b/data/sql/base/db_auth/realmcharacters.sql index 89b6003401..89b6003401 100644 --- a/data/sql/base/auth/realmcharacters.sql +++ b/data/sql/base/db_auth/realmcharacters.sql diff --git a/data/sql/base/auth/realmlist.sql b/data/sql/base/db_auth/realmlist.sql index b451b0f329..b451b0f329 100644 --- a/data/sql/base/auth/realmlist.sql +++ b/data/sql/base/db_auth/realmlist.sql diff --git a/data/sql/base/characters/account_data.sql b/data/sql/base/db_characters/account_data.sql index 9699560e97..9699560e97 100644 --- a/data/sql/base/characters/account_data.sql +++ b/data/sql/base/db_characters/account_data.sql diff --git a/data/sql/base/characters/account_instance_times.sql b/data/sql/base/db_characters/account_instance_times.sql index 574372c2d8..574372c2d8 100644 --- a/data/sql/base/characters/account_instance_times.sql +++ b/data/sql/base/db_characters/account_instance_times.sql diff --git a/data/sql/base/characters/account_tutorial.sql b/data/sql/base/db_characters/account_tutorial.sql index f49736b0cd..f49736b0cd 100644 --- a/data/sql/base/characters/account_tutorial.sql +++ b/data/sql/base/db_characters/account_tutorial.sql diff --git a/data/sql/base/characters/addons.sql b/data/sql/base/db_characters/addons.sql index dfd79a9beb..dfd79a9beb 100644 --- a/data/sql/base/characters/addons.sql +++ b/data/sql/base/db_characters/addons.sql diff --git a/data/sql/base/characters/arena_team.sql b/data/sql/base/db_characters/arena_team.sql index 5303140c92..5303140c92 100644 --- a/data/sql/base/characters/arena_team.sql +++ b/data/sql/base/db_characters/arena_team.sql diff --git a/data/sql/base/characters/arena_team_member.sql b/data/sql/base/db_characters/arena_team_member.sql index ce78ec3728..ce78ec3728 100644 --- a/data/sql/base/characters/arena_team_member.sql +++ b/data/sql/base/db_characters/arena_team_member.sql diff --git a/data/sql/base/characters/auctionhouse.sql b/data/sql/base/db_characters/auctionhouse.sql index babae50fb8..babae50fb8 100644 --- a/data/sql/base/characters/auctionhouse.sql +++ b/data/sql/base/db_characters/auctionhouse.sql diff --git a/data/sql/base/characters/battleground_deserters.sql b/data/sql/base/db_characters/battleground_deserters.sql index a7d1893e12..5a9e58427f 100644 --- a/data/sql/base/characters/battleground_deserters.sql +++ b/data/sql/base/db_characters/battleground_deserters.sql @@ -9,9 +9,9 @@ DROP TABLE IF EXISTS `battleground_deserters`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `battleground_deserters` ( - `guid` INT(10) UNSIGNED NOT NULL COMMENT 'characters.guid', - `type` TINYINT(3) UNSIGNED NOT NULL COMMENT 'type of the desertion', - `datetime` DATETIME NOT NULL COMMENT 'datetime of the desertion' + `guid` int(10) unsigned NOT NULL COMMENT 'characters.guid', + `type` tinyint(3) unsigned NOT NULL COMMENT 'type of the desertion', + `datetime` datetime NOT NULL COMMENT 'datetime of the desertion' ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/data/sql/base/characters/bugreport.sql b/data/sql/base/db_characters/bugreport.sql index 0a7f2a83de..0a7f2a83de 100644 --- a/data/sql/base/characters/bugreport.sql +++ b/data/sql/base/db_characters/bugreport.sql diff --git a/data/sql/base/characters/calendar_events.sql b/data/sql/base/db_characters/calendar_events.sql index 48e65cda93..48e65cda93 100644 --- a/data/sql/base/characters/calendar_events.sql +++ b/data/sql/base/db_characters/calendar_events.sql diff --git a/data/sql/base/characters/calendar_invites.sql b/data/sql/base/db_characters/calendar_invites.sql index a528adbac1..a528adbac1 100644 --- a/data/sql/base/characters/calendar_invites.sql +++ b/data/sql/base/db_characters/calendar_invites.sql diff --git a/data/sql/base/characters/channels.sql b/data/sql/base/db_characters/channels.sql index e5da63c5d3..e5da63c5d3 100644 --- a/data/sql/base/characters/channels.sql +++ b/data/sql/base/db_characters/channels.sql diff --git a/data/sql/base/characters/channels_bans.sql b/data/sql/base/db_characters/channels_bans.sql index da5d5589e4..da5d5589e4 100644 --- a/data/sql/base/characters/channels_bans.sql +++ b/data/sql/base/db_characters/channels_bans.sql diff --git a/data/sql/base/characters/channels_rights.sql b/data/sql/base/db_characters/channels_rights.sql index 4f6c6151ee..4f6c6151ee 100644 --- a/data/sql/base/characters/channels_rights.sql +++ b/data/sql/base/db_characters/channels_rights.sql diff --git a/data/sql/base/characters/character_account_data.sql b/data/sql/base/db_characters/character_account_data.sql index 7b33c28777..7b33c28777 100644 --- a/data/sql/base/characters/character_account_data.sql +++ b/data/sql/base/db_characters/character_account_data.sql diff --git a/data/sql/base/characters/character_achievement.sql b/data/sql/base/db_characters/character_achievement.sql index 5cc2d96041..5cc2d96041 100644 --- a/data/sql/base/characters/character_achievement.sql +++ b/data/sql/base/db_characters/character_achievement.sql diff --git a/data/sql/base/characters/character_achievement_progress.sql b/data/sql/base/db_characters/character_achievement_progress.sql index 7c18bd5be5..7c18bd5be5 100644 --- a/data/sql/base/characters/character_achievement_progress.sql +++ b/data/sql/base/db_characters/character_achievement_progress.sql diff --git a/data/sql/base/characters/character_action.sql b/data/sql/base/db_characters/character_action.sql index 4501ee35ba..4501ee35ba 100644 --- a/data/sql/base/characters/character_action.sql +++ b/data/sql/base/db_characters/character_action.sql diff --git a/data/sql/base/characters/character_arena_stats.sql b/data/sql/base/db_characters/character_arena_stats.sql index 18ba187de6..18ba187de6 100644 --- a/data/sql/base/characters/character_arena_stats.sql +++ b/data/sql/base/db_characters/character_arena_stats.sql diff --git a/data/sql/base/characters/character_aura.sql b/data/sql/base/db_characters/character_aura.sql index 645269a31f..645269a31f 100644 --- a/data/sql/base/characters/character_aura.sql +++ b/data/sql/base/db_characters/character_aura.sql diff --git a/data/sql/base/characters/character_banned.sql b/data/sql/base/db_characters/character_banned.sql index e89d4b0865..e89d4b0865 100644 --- a/data/sql/base/characters/character_banned.sql +++ b/data/sql/base/db_characters/character_banned.sql diff --git a/data/sql/base/characters/character_battleground_random.sql b/data/sql/base/db_characters/character_battleground_random.sql index 901ee8e24e..901ee8e24e 100644 --- a/data/sql/base/characters/character_battleground_random.sql +++ b/data/sql/base/db_characters/character_battleground_random.sql diff --git a/data/sql/base/characters/character_brew_of_the_month.sql b/data/sql/base/db_characters/character_brew_of_the_month.sql index 6126e6720c..6126e6720c 100644 --- a/data/sql/base/characters/character_brew_of_the_month.sql +++ b/data/sql/base/db_characters/character_brew_of_the_month.sql diff --git a/data/sql/base/characters/character_declinedname.sql b/data/sql/base/db_characters/character_declinedname.sql index 9009fc4c38..9009fc4c38 100644 --- a/data/sql/base/characters/character_declinedname.sql +++ b/data/sql/base/db_characters/character_declinedname.sql diff --git a/data/sql/base/characters/character_entry_point.sql b/data/sql/base/db_characters/character_entry_point.sql index 7359d8fc20..7359d8fc20 100644 --- a/data/sql/base/characters/character_entry_point.sql +++ b/data/sql/base/db_characters/character_entry_point.sql diff --git a/data/sql/base/characters/character_equipmentsets.sql b/data/sql/base/db_characters/character_equipmentsets.sql index 71527e3fc6..71527e3fc6 100644 --- a/data/sql/base/characters/character_equipmentsets.sql +++ b/data/sql/base/db_characters/character_equipmentsets.sql diff --git a/data/sql/base/characters/character_gifts.sql b/data/sql/base/db_characters/character_gifts.sql index 7d6f9d2d74..7d6f9d2d74 100644 --- a/data/sql/base/characters/character_gifts.sql +++ b/data/sql/base/db_characters/character_gifts.sql diff --git a/data/sql/base/characters/character_glyphs.sql b/data/sql/base/db_characters/character_glyphs.sql index 9786a0c225..9786a0c225 100644 --- a/data/sql/base/characters/character_glyphs.sql +++ b/data/sql/base/db_characters/character_glyphs.sql diff --git a/data/sql/base/characters/character_homebind.sql b/data/sql/base/db_characters/character_homebind.sql index 26a12b2ae7..26a12b2ae7 100644 --- a/data/sql/base/characters/character_homebind.sql +++ b/data/sql/base/db_characters/character_homebind.sql diff --git a/data/sql/base/characters/character_instance.sql b/data/sql/base/db_characters/character_instance.sql index c724c29ca7..c724c29ca7 100644 --- a/data/sql/base/characters/character_instance.sql +++ b/data/sql/base/db_characters/character_instance.sql diff --git a/data/sql/base/characters/character_inventory.sql b/data/sql/base/db_characters/character_inventory.sql index e96198728c..e96198728c 100644 --- a/data/sql/base/characters/character_inventory.sql +++ b/data/sql/base/db_characters/character_inventory.sql diff --git a/data/sql/base/characters/character_pet.sql b/data/sql/base/db_characters/character_pet.sql index d99577e739..d99577e739 100644 --- a/data/sql/base/characters/character_pet.sql +++ b/data/sql/base/db_characters/character_pet.sql diff --git a/data/sql/base/characters/character_pet_declinedname.sql b/data/sql/base/db_characters/character_pet_declinedname.sql index 1aed8571d5..1aed8571d5 100644 --- a/data/sql/base/characters/character_pet_declinedname.sql +++ b/data/sql/base/db_characters/character_pet_declinedname.sql diff --git a/data/sql/base/characters/character_queststatus.sql b/data/sql/base/db_characters/character_queststatus.sql index 8c90f3d1e3..8c90f3d1e3 100644 --- a/data/sql/base/characters/character_queststatus.sql +++ b/data/sql/base/db_characters/character_queststatus.sql diff --git a/data/sql/base/characters/character_queststatus_daily.sql b/data/sql/base/db_characters/character_queststatus_daily.sql index 45a7017369..45a7017369 100644 --- a/data/sql/base/characters/character_queststatus_daily.sql +++ b/data/sql/base/db_characters/character_queststatus_daily.sql diff --git a/data/sql/base/characters/character_queststatus_monthly.sql b/data/sql/base/db_characters/character_queststatus_monthly.sql index 1d1a8c5076..1d1a8c5076 100644 --- a/data/sql/base/characters/character_queststatus_monthly.sql +++ b/data/sql/base/db_characters/character_queststatus_monthly.sql diff --git a/data/sql/base/characters/character_queststatus_rewarded.sql b/data/sql/base/db_characters/character_queststatus_rewarded.sql index 3e9dfdb420..3e9dfdb420 100644 --- a/data/sql/base/characters/character_queststatus_rewarded.sql +++ b/data/sql/base/db_characters/character_queststatus_rewarded.sql diff --git a/data/sql/base/characters/character_queststatus_seasonal.sql b/data/sql/base/db_characters/character_queststatus_seasonal.sql index a10701458e..a10701458e 100644 --- a/data/sql/base/characters/character_queststatus_seasonal.sql +++ b/data/sql/base/db_characters/character_queststatus_seasonal.sql diff --git a/data/sql/base/characters/character_queststatus_weekly.sql b/data/sql/base/db_characters/character_queststatus_weekly.sql index 48db64b592..48db64b592 100644 --- a/data/sql/base/characters/character_queststatus_weekly.sql +++ b/data/sql/base/db_characters/character_queststatus_weekly.sql diff --git a/data/sql/base/characters/character_reputation.sql b/data/sql/base/db_characters/character_reputation.sql index eb89db14a9..eb89db14a9 100644 --- a/data/sql/base/characters/character_reputation.sql +++ b/data/sql/base/db_characters/character_reputation.sql diff --git a/data/sql/base/characters/character_skills.sql b/data/sql/base/db_characters/character_skills.sql index 07214ae883..07214ae883 100644 --- a/data/sql/base/characters/character_skills.sql +++ b/data/sql/base/db_characters/character_skills.sql diff --git a/data/sql/base/characters/character_social.sql b/data/sql/base/db_characters/character_social.sql index 2d6aba5c4d..2d6aba5c4d 100644 --- a/data/sql/base/characters/character_social.sql +++ b/data/sql/base/db_characters/character_social.sql diff --git a/data/sql/base/characters/character_spell.sql b/data/sql/base/db_characters/character_spell.sql index 200313786d..200313786d 100644 --- a/data/sql/base/characters/character_spell.sql +++ b/data/sql/base/db_characters/character_spell.sql diff --git a/data/sql/base/characters/character_spell_cooldown.sql b/data/sql/base/db_characters/character_spell_cooldown.sql index d6b75cc6ef..d6b75cc6ef 100644 --- a/data/sql/base/characters/character_spell_cooldown.sql +++ b/data/sql/base/db_characters/character_spell_cooldown.sql diff --git a/data/sql/base/characters/character_stats.sql b/data/sql/base/db_characters/character_stats.sql index c34cac6f4a..c34cac6f4a 100644 --- a/data/sql/base/characters/character_stats.sql +++ b/data/sql/base/db_characters/character_stats.sql diff --git a/data/sql/base/characters/character_talent.sql b/data/sql/base/db_characters/character_talent.sql index 25b3c9b222..25b3c9b222 100644 --- a/data/sql/base/characters/character_talent.sql +++ b/data/sql/base/db_characters/character_talent.sql diff --git a/data/sql/base/characters/characters.sql b/data/sql/base/db_characters/characters.sql index 2bfaa055a1..2bfaa055a1 100644 --- a/data/sql/base/characters/characters.sql +++ b/data/sql/base/db_characters/characters.sql diff --git a/data/sql/base/characters/characters_db_version.sql b/data/sql/base/db_characters/characters_db_version.sql index 082e41fe32..082e41fe32 100644 --- a/data/sql/base/characters/characters_db_version.sql +++ b/data/sql/base/db_characters/characters_db_version.sql diff --git a/data/sql/base/characters/cheaters.sql b/data/sql/base/db_characters/cheaters.sql index b7e25ea03b..b7e25ea03b 100644 --- a/data/sql/base/characters/cheaters.sql +++ b/data/sql/base/db_characters/cheaters.sql diff --git a/data/sql/base/characters/corpse.sql b/data/sql/base/db_characters/corpse.sql index a025365d1b..a025365d1b 100644 --- a/data/sql/base/characters/corpse.sql +++ b/data/sql/base/db_characters/corpse.sql diff --git a/data/sql/base/characters/creature_respawn.sql b/data/sql/base/db_characters/creature_respawn.sql index 63bf006d0f..63bf006d0f 100644 --- a/data/sql/base/characters/creature_respawn.sql +++ b/data/sql/base/db_characters/creature_respawn.sql diff --git a/data/sql/base/characters/game_event_condition_save.sql b/data/sql/base/db_characters/game_event_condition_save.sql index 86f5c8ed5c..86f5c8ed5c 100644 --- a/data/sql/base/characters/game_event_condition_save.sql +++ b/data/sql/base/db_characters/game_event_condition_save.sql diff --git a/data/sql/base/characters/game_event_save.sql b/data/sql/base/db_characters/game_event_save.sql index 9852b44f14..9852b44f14 100644 --- a/data/sql/base/characters/game_event_save.sql +++ b/data/sql/base/db_characters/game_event_save.sql diff --git a/data/sql/base/characters/gameobject_respawn.sql b/data/sql/base/db_characters/gameobject_respawn.sql index e83b28b728..e83b28b728 100644 --- a/data/sql/base/characters/gameobject_respawn.sql +++ b/data/sql/base/db_characters/gameobject_respawn.sql diff --git a/data/sql/base/characters/gm_subsurvey.sql b/data/sql/base/db_characters/gm_subsurvey.sql index 745571a1ad..745571a1ad 100644 --- a/data/sql/base/characters/gm_subsurvey.sql +++ b/data/sql/base/db_characters/gm_subsurvey.sql diff --git a/data/sql/base/characters/gm_survey.sql b/data/sql/base/db_characters/gm_survey.sql index 7366c40e50..7366c40e50 100644 --- a/data/sql/base/characters/gm_survey.sql +++ b/data/sql/base/db_characters/gm_survey.sql diff --git a/data/sql/base/characters/gm_ticket.sql b/data/sql/base/db_characters/gm_ticket.sql index 95646ca114..9db70e9515 100644 --- a/data/sql/base/characters/gm_ticket.sql +++ b/data/sql/base/db_characters/gm_ticket.sql @@ -30,7 +30,7 @@ CREATE TABLE `gm_ticket` `needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0', `resolvedBy` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of GM who resolved the ticket', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=10572 DEFAULT CHARSET=utf8 COMMENT='Player System'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System'; /*!40101 SET character_set_client = @saved_cs_client */; LOCK TABLES `gm_ticket` WRITE; diff --git a/data/sql/base/characters/group_member.sql b/data/sql/base/db_characters/group_member.sql index caa456c378..caa456c378 100644 --- a/data/sql/base/characters/group_member.sql +++ b/data/sql/base/db_characters/group_member.sql diff --git a/data/sql/base/characters/groups.sql b/data/sql/base/db_characters/groups.sql index 4bb2a7670a..4bb2a7670a 100644 --- a/data/sql/base/characters/groups.sql +++ b/data/sql/base/db_characters/groups.sql diff --git a/data/sql/base/characters/guild.sql b/data/sql/base/db_characters/guild.sql index 4decd49767..4decd49767 100644 --- a/data/sql/base/characters/guild.sql +++ b/data/sql/base/db_characters/guild.sql diff --git a/data/sql/base/characters/guild_bank_eventlog.sql b/data/sql/base/db_characters/guild_bank_eventlog.sql index 5a272cf5e9..5a272cf5e9 100644 --- a/data/sql/base/characters/guild_bank_eventlog.sql +++ b/data/sql/base/db_characters/guild_bank_eventlog.sql diff --git a/data/sql/base/characters/guild_bank_item.sql b/data/sql/base/db_characters/guild_bank_item.sql index 7428bee26e..7428bee26e 100644 --- a/data/sql/base/characters/guild_bank_item.sql +++ b/data/sql/base/db_characters/guild_bank_item.sql diff --git a/data/sql/base/characters/guild_bank_right.sql b/data/sql/base/db_characters/guild_bank_right.sql index 53afec9980..53afec9980 100644 --- a/data/sql/base/characters/guild_bank_right.sql +++ b/data/sql/base/db_characters/guild_bank_right.sql diff --git a/data/sql/base/characters/guild_bank_tab.sql b/data/sql/base/db_characters/guild_bank_tab.sql index 941c3756d2..941c3756d2 100644 --- a/data/sql/base/characters/guild_bank_tab.sql +++ b/data/sql/base/db_characters/guild_bank_tab.sql diff --git a/data/sql/base/characters/guild_eventlog.sql b/data/sql/base/db_characters/guild_eventlog.sql index 12c220b403..12c220b403 100644 --- a/data/sql/base/characters/guild_eventlog.sql +++ b/data/sql/base/db_characters/guild_eventlog.sql diff --git a/data/sql/base/characters/guild_member.sql b/data/sql/base/db_characters/guild_member.sql index 838cc7e532..838cc7e532 100644 --- a/data/sql/base/characters/guild_member.sql +++ b/data/sql/base/db_characters/guild_member.sql diff --git a/data/sql/base/characters/guild_member_withdraw.sql b/data/sql/base/db_characters/guild_member_withdraw.sql index 3b5b330542..3b5b330542 100644 --- a/data/sql/base/characters/guild_member_withdraw.sql +++ b/data/sql/base/db_characters/guild_member_withdraw.sql diff --git a/data/sql/base/characters/guild_rank.sql b/data/sql/base/db_characters/guild_rank.sql index 321aff0c40..321aff0c40 100644 --- a/data/sql/base/characters/guild_rank.sql +++ b/data/sql/base/db_characters/guild_rank.sql diff --git a/data/sql/base/characters/instance.sql b/data/sql/base/db_characters/instance.sql index 3350bb3813..3350bb3813 100644 --- a/data/sql/base/characters/instance.sql +++ b/data/sql/base/db_characters/instance.sql diff --git a/data/sql/base/characters/instance_reset.sql b/data/sql/base/db_characters/instance_reset.sql index 925fedef1e..925fedef1e 100644 --- a/data/sql/base/characters/instance_reset.sql +++ b/data/sql/base/db_characters/instance_reset.sql diff --git a/data/sql/base/characters/item_instance.sql b/data/sql/base/db_characters/item_instance.sql index 5d1d1f0c93..5d1d1f0c93 100644 --- a/data/sql/base/characters/item_instance.sql +++ b/data/sql/base/db_characters/item_instance.sql diff --git a/data/sql/base/characters/item_loot_storage.sql b/data/sql/base/db_characters/item_loot_storage.sql index 15cbb3e76a..15cbb3e76a 100644 --- a/data/sql/base/characters/item_loot_storage.sql +++ b/data/sql/base/db_characters/item_loot_storage.sql diff --git a/data/sql/base/characters/item_refund_instance.sql b/data/sql/base/db_characters/item_refund_instance.sql index 6108221390..6108221390 100644 --- a/data/sql/base/characters/item_refund_instance.sql +++ b/data/sql/base/db_characters/item_refund_instance.sql diff --git a/data/sql/base/characters/item_soulbound_trade_data.sql b/data/sql/base/db_characters/item_soulbound_trade_data.sql index 7c6d477ab7..7c6d477ab7 100644 --- a/data/sql/base/characters/item_soulbound_trade_data.sql +++ b/data/sql/base/db_characters/item_soulbound_trade_data.sql diff --git a/data/sql/base/characters/lag_reports.sql b/data/sql/base/db_characters/lag_reports.sql index 48af8d335a..48af8d335a 100644 --- a/data/sql/base/characters/lag_reports.sql +++ b/data/sql/base/db_characters/lag_reports.sql diff --git a/data/sql/base/characters/lfg_data.sql b/data/sql/base/db_characters/lfg_data.sql index 163e24769d..163e24769d 100644 --- a/data/sql/base/characters/lfg_data.sql +++ b/data/sql/base/db_characters/lfg_data.sql diff --git a/data/sql/base/characters/log_arena_fights.sql b/data/sql/base/db_characters/log_arena_fights.sql index 7f540befc3..7f540befc3 100644 --- a/data/sql/base/characters/log_arena_fights.sql +++ b/data/sql/base/db_characters/log_arena_fights.sql diff --git a/data/sql/base/characters/log_arena_memberstats.sql b/data/sql/base/db_characters/log_arena_memberstats.sql index ca9462abb6..ca9462abb6 100644 --- a/data/sql/base/characters/log_arena_memberstats.sql +++ b/data/sql/base/db_characters/log_arena_memberstats.sql diff --git a/data/sql/base/characters/log_encounter.sql b/data/sql/base/db_characters/log_encounter.sql index 1dbefd7fb2..1dbefd7fb2 100644 --- a/data/sql/base/characters/log_encounter.sql +++ b/data/sql/base/db_characters/log_encounter.sql diff --git a/data/sql/base/characters/log_money.sql b/data/sql/base/db_characters/log_money.sql index 94f57ce0b7..94f57ce0b7 100644 --- a/data/sql/base/characters/log_money.sql +++ b/data/sql/base/db_characters/log_money.sql diff --git a/data/sql/base/characters/mail.sql b/data/sql/base/db_characters/mail.sql index b331dffc32..b331dffc32 100644 --- a/data/sql/base/characters/mail.sql +++ b/data/sql/base/db_characters/mail.sql diff --git a/data/sql/base/characters/mail_items.sql b/data/sql/base/db_characters/mail_items.sql index d785500282..d785500282 100644 --- a/data/sql/base/characters/mail_items.sql +++ b/data/sql/base/db_characters/mail_items.sql diff --git a/data/sql/base/characters/pet_aura.sql b/data/sql/base/db_characters/pet_aura.sql index ec17761094..ec17761094 100644 --- a/data/sql/base/characters/pet_aura.sql +++ b/data/sql/base/db_characters/pet_aura.sql diff --git a/data/sql/base/characters/pet_spell.sql b/data/sql/base/db_characters/pet_spell.sql index bf3557252d..bf3557252d 100644 --- a/data/sql/base/characters/pet_spell.sql +++ b/data/sql/base/db_characters/pet_spell.sql diff --git a/data/sql/base/characters/pet_spell_cooldown.sql b/data/sql/base/db_characters/pet_spell_cooldown.sql index ec12dc25a8..ec12dc25a8 100644 --- a/data/sql/base/characters/pet_spell_cooldown.sql +++ b/data/sql/base/db_characters/pet_spell_cooldown.sql diff --git a/data/sql/base/characters/petition.sql b/data/sql/base/db_characters/petition.sql index 2ec67c5ec5..2ec67c5ec5 100644 --- a/data/sql/base/characters/petition.sql +++ b/data/sql/base/db_characters/petition.sql diff --git a/data/sql/base/characters/petition_sign.sql b/data/sql/base/db_characters/petition_sign.sql index 1c6d568000..1c6d568000 100644 --- a/data/sql/base/characters/petition_sign.sql +++ b/data/sql/base/db_characters/petition_sign.sql diff --git a/data/sql/base/characters/pool_quest_save.sql b/data/sql/base/db_characters/pool_quest_save.sql index b9f54c160f..b9f54c160f 100644 --- a/data/sql/base/characters/pool_quest_save.sql +++ b/data/sql/base/db_characters/pool_quest_save.sql diff --git a/data/sql/base/characters/pvpstats_battlegrounds.sql b/data/sql/base/db_characters/pvpstats_battlegrounds.sql index 34f7f166bb..34f7f166bb 100644 --- a/data/sql/base/characters/pvpstats_battlegrounds.sql +++ b/data/sql/base/db_characters/pvpstats_battlegrounds.sql diff --git a/data/sql/base/characters/pvpstats_players.sql b/data/sql/base/db_characters/pvpstats_players.sql index c5e8547a8f..c5e8547a8f 100644 --- a/data/sql/base/characters/pvpstats_players.sql +++ b/data/sql/base/db_characters/pvpstats_players.sql diff --git a/data/sql/base/characters/reserved_name.sql b/data/sql/base/db_characters/reserved_name.sql index e146711a49..e146711a49 100644 --- a/data/sql/base/characters/reserved_name.sql +++ b/data/sql/base/db_characters/reserved_name.sql diff --git a/data/sql/base/characters/uptime.sql b/data/sql/base/db_characters/uptime.sql index 2c1301e9e3..2c1301e9e3 100644 --- a/data/sql/base/characters/uptime.sql +++ b/data/sql/base/db_characters/uptime.sql diff --git a/data/sql/base/characters/warden_action.sql b/data/sql/base/db_characters/warden_action.sql index 84bc37e95f..84bc37e95f 100644 --- a/data/sql/base/characters/warden_action.sql +++ b/data/sql/base/db_characters/warden_action.sql diff --git a/data/sql/base/characters/worldstates.sql b/data/sql/base/db_characters/worldstates.sql index 86f6d2ddb3..86f6d2ddb3 100644 --- a/data/sql/base/characters/worldstates.sql +++ b/data/sql/base/db_characters/worldstates.sql diff --git a/data/sql/base/world/access_requirement.sql b/data/sql/base/db_world/access_requirement.sql index f56f84d7d3..f56f84d7d3 100644 --- a/data/sql/base/world/access_requirement.sql +++ b/data/sql/base/db_world/access_requirement.sql diff --git a/data/sql/base/world/achievement_criteria_data.sql b/data/sql/base/db_world/achievement_criteria_data.sql index 48182ec237..48182ec237 100644 --- a/data/sql/base/world/achievement_criteria_data.sql +++ b/data/sql/base/db_world/achievement_criteria_data.sql diff --git a/data/sql/base/world/achievement_dbc.sql b/data/sql/base/db_world/achievement_dbc.sql index b8260e8d93..b8260e8d93 100644 --- a/data/sql/base/world/achievement_dbc.sql +++ b/data/sql/base/db_world/achievement_dbc.sql diff --git a/data/sql/base/world/achievement_reward.sql b/data/sql/base/db_world/achievement_reward.sql index 581428bee2..581428bee2 100644 --- a/data/sql/base/world/achievement_reward.sql +++ b/data/sql/base/db_world/achievement_reward.sql diff --git a/data/sql/base/world/areatrigger_involvedrelation.sql b/data/sql/base/db_world/areatrigger_involvedrelation.sql index 15c0fda44e..15c0fda44e 100644 --- a/data/sql/base/world/areatrigger_involvedrelation.sql +++ b/data/sql/base/db_world/areatrigger_involvedrelation.sql diff --git a/data/sql/base/world/areatrigger_scripts.sql b/data/sql/base/db_world/areatrigger_scripts.sql index abf5470667..abf5470667 100644 --- a/data/sql/base/world/areatrigger_scripts.sql +++ b/data/sql/base/db_world/areatrigger_scripts.sql diff --git a/data/sql/base/world/areatrigger_tavern.sql b/data/sql/base/db_world/areatrigger_tavern.sql index db0aabff25..db0aabff25 100644 --- a/data/sql/base/world/areatrigger_tavern.sql +++ b/data/sql/base/db_world/areatrigger_tavern.sql diff --git a/data/sql/base/world/areatrigger_teleport.sql b/data/sql/base/db_world/areatrigger_teleport.sql index 710aacde31..710aacde31 100644 --- a/data/sql/base/world/areatrigger_teleport.sql +++ b/data/sql/base/db_world/areatrigger_teleport.sql diff --git a/data/sql/base/world/battleground_template.sql b/data/sql/base/db_world/battleground_template.sql index aa0a1d234d..aa0a1d234d 100644 --- a/data/sql/base/world/battleground_template.sql +++ b/data/sql/base/db_world/battleground_template.sql diff --git a/data/sql/base/world/battlemaster_entry.sql b/data/sql/base/db_world/battlemaster_entry.sql index aa662eb9ef..aa662eb9ef 100644 --- a/data/sql/base/world/battlemaster_entry.sql +++ b/data/sql/base/db_world/battlemaster_entry.sql diff --git a/data/sql/base/world/command.sql b/data/sql/base/db_world/command.sql index ba761e486d..ba761e486d 100644 --- a/data/sql/base/world/command.sql +++ b/data/sql/base/db_world/command.sql diff --git a/data/sql/base/world/conditions.sql b/data/sql/base/db_world/conditions.sql index 033bcc5902..033bcc5902 100644 --- a/data/sql/base/world/conditions.sql +++ b/data/sql/base/db_world/conditions.sql diff --git a/data/sql/base/world/creature.sql b/data/sql/base/db_world/creature.sql index 80744c7c65..80744c7c65 100644 --- a/data/sql/base/world/creature.sql +++ b/data/sql/base/db_world/creature.sql diff --git a/data/sql/base/world/creature_addon.sql b/data/sql/base/db_world/creature_addon.sql index aa6823e760..aa6823e760 100644 --- a/data/sql/base/world/creature_addon.sql +++ b/data/sql/base/db_world/creature_addon.sql diff --git a/data/sql/base/world/creature_classlevelstats.sql b/data/sql/base/db_world/creature_classlevelstats.sql index b2df59e11c..b2df59e11c 100644 --- a/data/sql/base/world/creature_classlevelstats.sql +++ b/data/sql/base/db_world/creature_classlevelstats.sql diff --git a/data/sql/base/world/creature_equip_template.sql b/data/sql/base/db_world/creature_equip_template.sql index 26f858be88..26f858be88 100644 --- a/data/sql/base/world/creature_equip_template.sql +++ b/data/sql/base/db_world/creature_equip_template.sql diff --git a/data/sql/base/world/creature_formations.sql b/data/sql/base/db_world/creature_formations.sql index 00414b3435..00414b3435 100644 --- a/data/sql/base/world/creature_formations.sql +++ b/data/sql/base/db_world/creature_formations.sql diff --git a/data/sql/base/world/creature_loot_template.sql b/data/sql/base/db_world/creature_loot_template.sql index 64907e7839..0f5dbabab3 100644 --- a/data/sql/base/world/creature_loot_template.sql +++ b/data/sql/base/db_world/creature_loot_template.sql @@ -281144,13 +281144,14 @@ INSERT INTO `creature_loot_template` VALUES (26536,26011,1,1,1,-26011,1), (26536,26012,1,1,1,-26012,1), (26536,26040,21.4,1,0,-26040,1), -(26536,33370,3.6,1,0,1,1), -(26536,33399,3.6,1,0,1,1), -(26536,33454,7.1,1,0,1,1), -(26536,36034,3.6,1,0,1,1), -(26536,36359,3.6,1,0,1,1), -(26536,37068,3.6,1,0,1,1), -(26536,45912,0.1,1,0,1,1), +(26536,33370,3.6,1,1,1,1), +(26536,33399,3.6,1,1,1,1), +(26536,33454,35.5,1,0,1,1), +(26536,33470,10.7,1,0,1,7), +(26536,37068,0.69,1,1,1,1), +(26536,37069,0.69,1,1,1,1), +(26536,37070,0.69,1,1,1,1), +(26536,45912,0.1,1,1,1,1), (26544,24727,1.5,1,0,-24727,1), (26544,26000,3,1,1,-26000,1), (26544,26001,3,1,1,-26001,1), @@ -304676,9 +304677,9 @@ INSERT INTO `creature_loot_template` VALUES (28124,33369,0.05,1,0,1,1), (28124,33371,0.05,1,0,1,1), (28124,33372,0.05,1,0,1,1), -(28124,33373,0.1,1,0,1,1), -(28124,33374,0.05,1,0,1,1); +(28124,33373,0.1,1,0,1,1); INSERT INTO `creature_loot_template` VALUES +(28124,33374,0.05,1,0,1,1), (28124,33375,0.1,1,0,1,1), (28124,33376,0.1,1,0,1,1), (28124,33377,0.1,1,0,1,1), diff --git a/data/sql/base/world/creature_model_info.sql b/data/sql/base/db_world/creature_model_info.sql index 106521b815..106521b815 100644 --- a/data/sql/base/world/creature_model_info.sql +++ b/data/sql/base/db_world/creature_model_info.sql diff --git a/data/sql/base/world/creature_onkill_reputation.sql b/data/sql/base/db_world/creature_onkill_reputation.sql index c28fd78e1b..c28fd78e1b 100644 --- a/data/sql/base/world/creature_onkill_reputation.sql +++ b/data/sql/base/db_world/creature_onkill_reputation.sql diff --git a/data/sql/base/world/creature_questender.sql b/data/sql/base/db_world/creature_questender.sql index 3ec81b5b3a..3ec81b5b3a 100644 --- a/data/sql/base/world/creature_questender.sql +++ b/data/sql/base/db_world/creature_questender.sql diff --git a/data/sql/base/world/creature_queststarter.sql b/data/sql/base/db_world/creature_queststarter.sql index fb8364f869..fb8364f869 100644 --- a/data/sql/base/world/creature_queststarter.sql +++ b/data/sql/base/db_world/creature_queststarter.sql diff --git a/data/sql/base/world/creature_summon_groups.sql b/data/sql/base/db_world/creature_summon_groups.sql index 84b830e401..84b830e401 100644 --- a/data/sql/base/world/creature_summon_groups.sql +++ b/data/sql/base/db_world/creature_summon_groups.sql diff --git a/data/sql/base/world/creature_template.sql b/data/sql/base/db_world/creature_template.sql index 07940434b8..a43aafa01f 100644 --- a/data/sql/base/world/creature_template.sql +++ b/data/sql/base/db_world/creature_template.sql @@ -27558,7 +27558,7 @@ INSERT INTO `creature_template` VALUES (34653,0,0,0,0,0,29341,0,0,0,'Bountiful Table Hostess','','',10575,80,80,0,534,3,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34654,0,0,0,0,0,29330,0,0,0,'Bountiful Feast Hostess','','',10575,80,80,0,714,3,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,33536,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34655,0,0,0,0,0,29344,0,0,0,'Magic Rooster','','',0,80,80,2,35,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340), -(34657,36086,0,0,0,0,28735,0,0,0,'Jaelyne Evensong','Grand Champion of Darnassus','',0,80,80,2,1076,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(34657,36086,0,0,0,0,28735,0,0,0,'Jaelyne Evensong','Grand Champion of Darnassus','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), (34658,0,0,0,0,0,9991,0,0,0,'Jaelyne Evensong\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34660,0,0,0,0,0,17612,0,0,0,'Anub\'arak','','',0,83,83,2,16,0,1,0.5,1,3,1,1,0,1,1,0,0,1,33587200,2048,8,0,0,0,0,0,371,535,135,6,1036,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,76,1,650854271,2097152,'npc_anubarak_spike',12340), (34675,0,0,0,0,0,29337,0,0,0,'Gregory Tabor','','',0,40,40,0,534,2,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,0,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), @@ -27574,11 +27574,11 @@ INSERT INTO `creature_template` VALUES (34686,0,0,0,0,0,4587,0,0,0,'Healing Stream Totem','','',0,80,80,0,58,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,0.05,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34687,0,0,0,0,0,4589,0,0,0,'Searing Totem','','',0,80,80,0,58,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,0.7,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34694,0,0,0,0,0,29348,0,0,0,'Grunty','','',0,1,1,0,188,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,121,1,0,0,'',12340), -(34701,36083,0,0,0,0,28736,0,0,0,'Colosos','Grand Champion of the Exodar','',0,80,80,2,1694,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), -(34702,36082,0,0,0,0,28586,0,0,0,'Ambrose Boltspark','Grand Champion of Gnomeregan','',0,80,80,2,64,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), -(34703,36087,0,0,0,0,28564,0,0,0,'Lana Stouthammer','Grand Champion of Ironforge','',0,80,80,2,2155,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340), +(34701,36083,0,0,0,0,28736,0,0,0,'Colosos','Grand Champion of the Exodar','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(34702,36082,0,0,0,0,28586,0,0,0,'Ambrose Boltspark','Grand Champion of Gnomeregan','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(34703,36087,0,0,0,0,28564,0,0,0,'Lana Stouthammer','Grand Champion of Ironforge','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340), (34704,0,0,0,0,0,1126,11686,0,0,'Val\'kyr Twins Bullet Stalker Dark','','',0,80,80,2,35,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,256,2048,0,0,0,0,0,0,345,509,103,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340), -(34705,36088,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius','Grand Champion of Stormwind','',0,80,80,2,1078,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(34705,36088,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius','Grand Champion of Stormwind','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), (34708,0,0,0,0,0,29324,0,0,0,'Caitrin Ironkettle','Cooking Trainer','',10568,40,40,0,534,83,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,2,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34709,0,0,0,0,0,29362,0,0,0,'Silver Riding Dragonhawk','','',0,40,40,0,2091,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1.15,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (34710,0,0,0,0,0,29400,0,0,0,'Ellen Moore','Cooking Trainer','',10568,40,40,0,534,83,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,2,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), @@ -27907,12 +27907,12 @@ INSERT INTO `creature_template` VALUES (35293,0,0,0,0,0,29742,0,0,0,'Anmarie','Moonbell\'s Pet','',0,75,75,2,2027,0,1,1.14286,1,0,342,485,0,392,1,2000,2000,1,832,2048,0,26,0,0,0,0,295,438,68,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340), (35297,0,0,0,0,0,4449,26241,0,0,'Icecrown Cultist Proxy','',NULL,0,80,80,2,35,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340), (35299,0,0,0,0,0,17759,0,0,0,'Royal Gryphon','','',0,75,75,2,1892,16777216,1,3.42857,1,0,2,2,0,24,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,241,1,0,0,'',12340), -(35305,35306,0,0,0,0,29758,29759,0,0,'Argent Monk','','',0,80,80,2,16,0,1,1.14286,1,1,422,586,0,642,7.5,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), -(35306,0,0,0,0,0,29758,29759,0,0,'Argent Monk (1)','','',0,80,80,2,16,0,1,1.14286,1,1,422,586,0,642,13,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), -(35307,35308,0,0,0,0,29760,29761,0,0,'Argent Priestess','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,8,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), -(35308,0,0,0,0,0,29760,29761,0,0,'Argent Priestess (1)','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,12,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), -(35309,35310,0,0,0,0,29762,29763,0,0,'Argent Lightwielder','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,5,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), -(35310,0,0,0,0,0,29762,29763,0,0,'Argent Lightwielder (1)','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,10,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), +(35305,35306,0,0,0,0,29758,29759,0,0,'Argent Monk','','',0,80,80,2,14,0,1,1.14286,1,1,422,586,0,642,7.5,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), +(35306,0,0,0,0,0,29758,29759,0,0,'Argent Monk (1)','','',0,80,80,2,14,0,1,1.14286,1,1,422,586,0,642,13,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), +(35307,35308,0,0,0,0,29760,29761,0,0,'Argent Priestess','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,8,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), +(35308,0,0,0,0,0,29760,29761,0,0,'Argent Priestess (1)','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,12,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), +(35309,35310,0,0,0,0,29762,29763,0,0,'Argent Lightwielder','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,5,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340), +(35310,0,0,0,0,0,29762,29763,0,0,'Argent Lightwielder (1)','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,10,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (35311,36135,0,0,0,0,27769,0,0,0,'Fountain of Light','','',0,79,80,0,16,0,1,0.992063,1,0,1,1,0,1,1,0,0,1,131076,2048,8,0,0,0,0,0,1,1,1,11,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'NullCreatureAI',0,3,1,1,1,1,0,0,0,0,0,0,0,0,0,650854271,2097154,'',12340), (35314,0,0,0,0,0,29090,0,0,0,'Orgrimmar Champion','','',0,80,80,2,14,0,1,2,1,1,422,586,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,5.95238,1,0,0,0,0,0,0,0,0,0,1,0,0,'npc_toc5_grand_champion_minion',12340), (35318,0,0,0,0,0,29688,29689,29682,29687,'Crimson Dawn Sailor','','',0,79,80,2,2123,0,1,1.14286,1,0,417,582,0,608,1,2000,2000,2,2,2048,0,0,0,0,0,0,341,506,80,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340), @@ -28078,10 +28078,10 @@ INSERT INTO `creature_template` VALUES (35560,0,0,0,0,0,21300,0,0,0,'The Black Knight (1)','','',0,80,80,2,14,0,1,1.14286,1,1,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,20,1,1,0,0,0,0,0,0,0,0,1,8388624,0,'',12340), (35564,35568,0,0,0,0,25528,0,0,0,'Risen Arelas Brightstar','Black Knight\'s Minion','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,3,2400,0,1,0,2048,8,0,0,0,0,0,345,509,103,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2.5,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_black_knight_ghoul',12340), (35568,0,0,0,0,0,25528,0,0,0,'Risen Arelas Brightstar (1)','Black Knight\'s Minion','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,6,2400,0,1,0,2048,8,0,0,0,0,0,345,509,0,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,4,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), -(35569,36085,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger','Grand Champion of Silvermoon','',0,80,80,2,1604,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), -(35570,36091,0,0,0,0,28588,0,0,0,'Zul\'tore','Grand Champion of Sen\'jin','',0,80,80,2,126,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), -(35571,36090,0,0,0,0,28597,0,0,0,'Runok Wildmane','Grand Champion of the Thunder Bluff','',0,80,80,2,104,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), -(35572,36089,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher','Grand Champion of Orgrimmar','',0,80,80,2,29,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340), +(35569,36085,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger','Grand Champion of Silvermoon','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(35570,36091,0,0,0,0,28588,0,0,0,'Zul\'tore','Grand Champion of Sen\'jin','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(35571,36090,0,0,0,0,28597,0,0,0,'Runok Wildmane','Grand Champion of the Thunder Bluff','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(35572,36089,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher','Grand Champion of Orgrimmar','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340), (35573,0,0,0,0,0,29850,0,0,0,'Arcanist Asarina','Emblem of Triumph Quartermaster','',0,80,80,2,2027,128,1,1.14286,1,0,346,499,0,287,1,2000,2000,8,256,2048,0,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340), (35574,0,0,0,0,0,29851,0,0,0,'Magistrix Iruvia','Emblem of Triumph Quartermaster','',0,80,80,2,2123,128,1,1.14286,1,0,346,499,0,287,1,2000,2000,8,256,2048,0,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340), (35575,0,0,0,0,0,29853,0,0,0,'Champion Isimode','Triumphant Armor Vendor','',0,80,80,2,2027,128,1,1.14286,1,0,417,582,0,608,1,2000,2000,2,256,2048,0,0,0,0,0,0,341,506,80,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340), @@ -28113,7 +28113,7 @@ INSERT INTO `creature_template` VALUES (35614,0,0,0,0,0,21955,11686,0,0,'Desecration Stalker','','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340), (35615,0,0,0,0,0,29268,0,0,0,'Anub\'arak (2)','','',0,83,83,2,14,0,1,1.3,1,3,1200,1300,0,805,60,0,0,1,0,2048,8,0,0,0,0,0,371,535,135,6,108,35615,0,70214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569703,569703,'',0,3,1,390,1,1,0,0,0,0,0,0,0,191,1,650854271,2097153,'',12340), (35616,0,0,0,0,0,29268,0,0,0,'Anub\'arak (3)','','',0,83,83,2,14,0,1,1.3,1,3,1200,1300,0,805,90,0,0,1,0,2048,8,0,0,0,0,0,371,535,135,6,108,35616,0,70214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569703,569703,'',0,3,1,1950,1,1,0,0,0,0,0,0,0,191,1,650854271,2097153,'',12340), -(35617,36084,0,0,0,0,28589,0,0,0,'Deathstalker Visceri','Grand Champion of Undercity','',0,80,80,2,68,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), +(35617,36084,0,0,0,0,28589,0,0,0,'Deathstalker Visceri','Grand Champion of Undercity','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340), (35633,0,0,0,0,0,28571,0,0,0,'Ambrose Boltspark\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,478,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (35634,0,0,0,0,0,10718,0,0,0,'Deathstalker Visceri\'s Mount','','',0,80,80,2,14,0,1,1.28968,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,479,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (35635,0,0,0,0,0,28607,0,0,0,'Eressea Dawnsinger\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,480,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), @@ -28252,16 +28252,16 @@ INSERT INTO `creature_template` VALUES (36074,0,0,0,0,0,29974,0,0,0,'[DND] Swift Horde Wolf','','',0,10,10,0,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340), (36075,0,0,0,0,0,29975,0,0,0,'[DND] White Stallion','','',0,1,2,0,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340), (36076,0,0,0,0,0,29976,0,0,0,'[DND] Swift Alliance Steed','','',0,80,80,2,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340), -(36082,0,0,0,0,0,28586,0,0,0,'Ambrose Boltspark (1)','Grand Champion of Gnomeregan','',0,80,80,2,64,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36083,0,0,0,0,0,28736,0,0,0,'Colosos (1)','Grand Champion of the Exodar','',0,80,80,2,1694,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36084,0,0,0,0,0,28589,0,0,0,'Deathstalker Visceri (1)','Grand Champion of Undercity','',0,80,80,2,68,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36085,0,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger (1)','Grand Champion of Silvermoon','',0,80,80,2,1604,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36086,0,0,0,0,0,28735,0,0,0,'Jaelyne Evensong (1)','Grand Champion of Darnassus','',0,80,80,2,1076,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36087,0,0,0,0,0,28564,0,0,0,'Lana Stouthammer (1)','Grand Champion of Ironforge','',0,80,80,2,2155,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340), -(36088,0,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius (1)','Grand Champion of Stormwind','',0,80,80,2,1078,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36089,0,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher (1)','Grand Champion of Orgrimmar','',0,80,80,2,29,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340), -(36090,0,0,0,0,0,28597,0,0,0,'Runok Wildmane (1)','Grand Champion of the Thunder Bluff','',0,80,80,2,104,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), -(36091,0,0,0,0,0,28588,0,0,0,'Zul\'tore (1)','Grand Champion of Sen\'jin','',0,80,80,2,126,0,1,2,1,1,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36082,0,0,0,0,0,28586,0,0,0,'Ambrose Boltspark (1)','Grand Champion of Gnomeregan','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36083,0,0,0,0,0,28736,0,0,0,'Colosos (1)','Grand Champion of the Exodar','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36084,0,0,0,0,0,28589,0,0,0,'Deathstalker Visceri (1)','Grand Champion of Undercity','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36085,0,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger (1)','Grand Champion of Silvermoon','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36086,0,0,0,0,0,28735,0,0,0,'Jaelyne Evensong (1)','Grand Champion of Darnassus','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36087,0,0,0,0,0,28564,0,0,0,'Lana Stouthammer (1)','Grand Champion of Ironforge','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340), +(36088,0,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius (1)','Grand Champion of Stormwind','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36089,0,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher (1)','Grand Champion of Orgrimmar','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340), +(36090,0,0,0,0,0,28597,0,0,0,'Runok Wildmane (1)','Grand Champion of the Thunder Bluff','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), +(36091,0,0,0,0,0,28588,0,0,0,'Zul\'tore (1)','Grand Champion of Sen\'jin','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340), (36093,0,0,0,0,0,21955,11686,0,0,'Vault Stalker','','',0,1,1,0,14,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,33554432,2048,0,0,0,0,0,0,1,1,0,10,1048576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340), (36095,0,0,0,0,0,29860,0,0,0,'Highlord Tirion Fordring','','',10709,83,83,2,2070,1,1,1.14286,1,3,496,674,0,783,35,2000,2000,2,33600,2048,0,0,0,0,0,0,365,529,98,7,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1000,1000,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), (36097,0,0,0,0,0,29984,0,0,0,'Argent Mage','','',0,80,80,2,2070,0,1,1.14286,1,0,346,499,0,287,1,0,0,8,512,2048,8,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'NullCreatureAI',0,3,1,5,5,1,0,0,0,0,0,0,0,0,1,0,0,'',12340), diff --git a/data/sql/base/world/creature_template_addon.sql b/data/sql/base/db_world/creature_template_addon.sql index 9e1ed568c8..9e1ed568c8 100644 --- a/data/sql/base/world/creature_template_addon.sql +++ b/data/sql/base/db_world/creature_template_addon.sql diff --git a/data/sql/base/world/creature_text.sql b/data/sql/base/db_world/creature_text.sql index 10276c8d6d..10276c8d6d 100644 --- a/data/sql/base/world/creature_text.sql +++ b/data/sql/base/db_world/creature_text.sql diff --git a/data/sql/base/world/db_script_string.sql b/data/sql/base/db_world/db_script_string.sql index 0f6ab9efc4..0f6ab9efc4 100644 --- a/data/sql/base/world/db_script_string.sql +++ b/data/sql/base/db_world/db_script_string.sql diff --git a/data/sql/base/world/disables.sql b/data/sql/base/db_world/disables.sql index 453acc785b..453acc785b 100644 --- a/data/sql/base/world/disables.sql +++ b/data/sql/base/db_world/disables.sql diff --git a/data/sql/base/world/disenchant_loot_template.sql b/data/sql/base/db_world/disenchant_loot_template.sql index 348fe1c614..348fe1c614 100644 --- a/data/sql/base/world/disenchant_loot_template.sql +++ b/data/sql/base/db_world/disenchant_loot_template.sql diff --git a/data/sql/base/world/event_scripts.sql b/data/sql/base/db_world/event_scripts.sql index 3969ab4596..3969ab4596 100644 --- a/data/sql/base/world/event_scripts.sql +++ b/data/sql/base/db_world/event_scripts.sql diff --git a/data/sql/base/world/exploration_basexp.sql b/data/sql/base/db_world/exploration_basexp.sql index 5d0cee2312..5d0cee2312 100644 --- a/data/sql/base/world/exploration_basexp.sql +++ b/data/sql/base/db_world/exploration_basexp.sql diff --git a/data/sql/base/world/fishing_loot_template.sql b/data/sql/base/db_world/fishing_loot_template.sql index e94b1b2c13..e94b1b2c13 100644 --- a/data/sql/base/world/fishing_loot_template.sql +++ b/data/sql/base/db_world/fishing_loot_template.sql diff --git a/data/sql/base/world/game_event.sql b/data/sql/base/db_world/game_event.sql index f507b42368..f507b42368 100644 --- a/data/sql/base/world/game_event.sql +++ b/data/sql/base/db_world/game_event.sql diff --git a/data/sql/base/world/game_event_arena_seasons.sql b/data/sql/base/db_world/game_event_arena_seasons.sql index 4214c7beb1..4214c7beb1 100644 --- a/data/sql/base/world/game_event_arena_seasons.sql +++ b/data/sql/base/db_world/game_event_arena_seasons.sql diff --git a/data/sql/base/world/game_event_battleground_holiday.sql b/data/sql/base/db_world/game_event_battleground_holiday.sql index 471bb7ae83..471bb7ae83 100644 --- a/data/sql/base/world/game_event_battleground_holiday.sql +++ b/data/sql/base/db_world/game_event_battleground_holiday.sql diff --git a/data/sql/base/world/game_event_condition.sql b/data/sql/base/db_world/game_event_condition.sql index f421b8caf2..f421b8caf2 100644 --- a/data/sql/base/world/game_event_condition.sql +++ b/data/sql/base/db_world/game_event_condition.sql diff --git a/data/sql/base/world/game_event_creature.sql b/data/sql/base/db_world/game_event_creature.sql index 5834ade3dc..5834ade3dc 100644 --- a/data/sql/base/world/game_event_creature.sql +++ b/data/sql/base/db_world/game_event_creature.sql diff --git a/data/sql/base/world/game_event_creature_quest.sql b/data/sql/base/db_world/game_event_creature_quest.sql index fae83f752f..fae83f752f 100644 --- a/data/sql/base/world/game_event_creature_quest.sql +++ b/data/sql/base/db_world/game_event_creature_quest.sql diff --git a/data/sql/base/world/game_event_gameobject.sql b/data/sql/base/db_world/game_event_gameobject.sql index 5fc5666dda..5fc5666dda 100644 --- a/data/sql/base/world/game_event_gameobject.sql +++ b/data/sql/base/db_world/game_event_gameobject.sql diff --git a/data/sql/base/world/game_event_gameobject_quest.sql b/data/sql/base/db_world/game_event_gameobject_quest.sql index ae1ac1097b..ae1ac1097b 100644 --- a/data/sql/base/world/game_event_gameobject_quest.sql +++ b/data/sql/base/db_world/game_event_gameobject_quest.sql diff --git a/data/sql/base/world/game_event_model_equip.sql b/data/sql/base/db_world/game_event_model_equip.sql index 147ca47f8c..147ca47f8c 100644 --- a/data/sql/base/world/game_event_model_equip.sql +++ b/data/sql/base/db_world/game_event_model_equip.sql diff --git a/data/sql/base/world/game_event_npc_vendor.sql b/data/sql/base/db_world/game_event_npc_vendor.sql index 83ab7ef9ac..83ab7ef9ac 100644 --- a/data/sql/base/world/game_event_npc_vendor.sql +++ b/data/sql/base/db_world/game_event_npc_vendor.sql diff --git a/data/sql/base/world/game_event_npcflag.sql b/data/sql/base/db_world/game_event_npcflag.sql index 35c171db4f..35c171db4f 100644 --- a/data/sql/base/world/game_event_npcflag.sql +++ b/data/sql/base/db_world/game_event_npcflag.sql diff --git a/data/sql/base/world/game_event_pool.sql b/data/sql/base/db_world/game_event_pool.sql index 6f5cd6edf8..6f5cd6edf8 100644 --- a/data/sql/base/world/game_event_pool.sql +++ b/data/sql/base/db_world/game_event_pool.sql diff --git a/data/sql/base/world/game_event_prerequisite.sql b/data/sql/base/db_world/game_event_prerequisite.sql index 62c3837761..62c3837761 100644 --- a/data/sql/base/world/game_event_prerequisite.sql +++ b/data/sql/base/db_world/game_event_prerequisite.sql diff --git a/data/sql/base/world/game_event_quest_condition.sql b/data/sql/base/db_world/game_event_quest_condition.sql index d8e308eaec..d8e308eaec 100644 --- a/data/sql/base/world/game_event_quest_condition.sql +++ b/data/sql/base/db_world/game_event_quest_condition.sql diff --git a/data/sql/base/world/game_event_seasonal_questrelation.sql b/data/sql/base/db_world/game_event_seasonal_questrelation.sql index 39bc97ef7d..39bc97ef7d 100644 --- a/data/sql/base/world/game_event_seasonal_questrelation.sql +++ b/data/sql/base/db_world/game_event_seasonal_questrelation.sql diff --git a/data/sql/base/world/game_graveyard_zone.sql b/data/sql/base/db_world/game_graveyard_zone.sql index c6dec7a54b..c6dec7a54b 100644 --- a/data/sql/base/world/game_graveyard_zone.sql +++ b/data/sql/base/db_world/game_graveyard_zone.sql diff --git a/data/sql/base/world/game_tele.sql b/data/sql/base/db_world/game_tele.sql index 16d598d94f..16d598d94f 100644 --- a/data/sql/base/world/game_tele.sql +++ b/data/sql/base/db_world/game_tele.sql diff --git a/data/sql/base/world/game_weather.sql b/data/sql/base/db_world/game_weather.sql index d2b131d541..d2b131d541 100644 --- a/data/sql/base/world/game_weather.sql +++ b/data/sql/base/db_world/game_weather.sql diff --git a/data/sql/base/world/gameobject.sql b/data/sql/base/db_world/gameobject.sql index 3ac04c5867..3ac04c5867 100644 --- a/data/sql/base/world/gameobject.sql +++ b/data/sql/base/db_world/gameobject.sql diff --git a/data/sql/base/world/gameobject_addon.sql b/data/sql/base/db_world/gameobject_addon.sql index 8ecba3c854..8ecba3c854 100644 --- a/data/sql/base/world/gameobject_addon.sql +++ b/data/sql/base/db_world/gameobject_addon.sql diff --git a/data/sql/base/world/gameobject_loot_template.sql b/data/sql/base/db_world/gameobject_loot_template.sql index d21e94fc2e..d21e94fc2e 100644 --- a/data/sql/base/world/gameobject_loot_template.sql +++ b/data/sql/base/db_world/gameobject_loot_template.sql diff --git a/data/sql/base/world/gameobject_questender.sql b/data/sql/base/db_world/gameobject_questender.sql index 0036fa9175..0036fa9175 100644 --- a/data/sql/base/world/gameobject_questender.sql +++ b/data/sql/base/db_world/gameobject_questender.sql diff --git a/data/sql/base/world/gameobject_queststarter.sql b/data/sql/base/db_world/gameobject_queststarter.sql index dda1e54d9a..dda1e54d9a 100644 --- a/data/sql/base/world/gameobject_queststarter.sql +++ b/data/sql/base/db_world/gameobject_queststarter.sql diff --git a/data/sql/base/world/gameobject_template.sql b/data/sql/base/db_world/gameobject_template.sql index f2c8fb7442..f2c8fb7442 100644 --- a/data/sql/base/world/gameobject_template.sql +++ b/data/sql/base/db_world/gameobject_template.sql diff --git a/data/sql/base/world/gossip_menu.sql b/data/sql/base/db_world/gossip_menu.sql index a5d5cb4a42..a5d5cb4a42 100644 --- a/data/sql/base/world/gossip_menu.sql +++ b/data/sql/base/db_world/gossip_menu.sql diff --git a/data/sql/base/world/gossip_menu_option.sql b/data/sql/base/db_world/gossip_menu_option.sql index 005691b751..005691b751 100644 --- a/data/sql/base/world/gossip_menu_option.sql +++ b/data/sql/base/db_world/gossip_menu_option.sql diff --git a/data/sql/base/world/instance_encounters.sql b/data/sql/base/db_world/instance_encounters.sql index e734135fed..e734135fed 100644 --- a/data/sql/base/world/instance_encounters.sql +++ b/data/sql/base/db_world/instance_encounters.sql diff --git a/data/sql/base/world/instance_template.sql b/data/sql/base/db_world/instance_template.sql index eaf3869c55..eaf3869c55 100644 --- a/data/sql/base/world/instance_template.sql +++ b/data/sql/base/db_world/instance_template.sql diff --git a/data/sql/base/world/item_enchantment_template.sql b/data/sql/base/db_world/item_enchantment_template.sql index 0b3af5b14e..0b3af5b14e 100644 --- a/data/sql/base/world/item_enchantment_template.sql +++ b/data/sql/base/db_world/item_enchantment_template.sql diff --git a/data/sql/base/world/item_loot_template.sql b/data/sql/base/db_world/item_loot_template.sql index ccc8bba225..ccc8bba225 100644 --- a/data/sql/base/world/item_loot_template.sql +++ b/data/sql/base/db_world/item_loot_template.sql diff --git a/data/sql/base/world/item_set_names.sql b/data/sql/base/db_world/item_set_names.sql index 4cfac17255..4cfac17255 100644 --- a/data/sql/base/world/item_set_names.sql +++ b/data/sql/base/db_world/item_set_names.sql diff --git a/data/sql/base/world/item_template.sql b/data/sql/base/db_world/item_template.sql index 80cd0ab7c4..80cd0ab7c4 100644 --- a/data/sql/base/world/item_template.sql +++ b/data/sql/base/db_world/item_template.sql diff --git a/data/sql/base/world/lfg_dungeon_rewards.sql b/data/sql/base/db_world/lfg_dungeon_rewards.sql index 86ac65b38b..86ac65b38b 100644 --- a/data/sql/base/world/lfg_dungeon_rewards.sql +++ b/data/sql/base/db_world/lfg_dungeon_rewards.sql diff --git a/data/sql/base/world/lfg_entrances.sql b/data/sql/base/db_world/lfg_entrances.sql index 2b7616533e..2b7616533e 100644 --- a/data/sql/base/world/lfg_entrances.sql +++ b/data/sql/base/db_world/lfg_entrances.sql diff --git a/data/sql/base/world/linked_respawn.sql b/data/sql/base/db_world/linked_respawn.sql index 693fdcd22c..693fdcd22c 100644 --- a/data/sql/base/world/linked_respawn.sql +++ b/data/sql/base/db_world/linked_respawn.sql diff --git a/data/sql/base/world/locales_achievement_reward.sql b/data/sql/base/db_world/locales_achievement_reward.sql index 8ecbd05ac4..8ecbd05ac4 100644 --- a/data/sql/base/world/locales_achievement_reward.sql +++ b/data/sql/base/db_world/locales_achievement_reward.sql diff --git a/data/sql/base/world/locales_creature.sql b/data/sql/base/db_world/locales_creature.sql index 91407d3240..91407d3240 100644 --- a/data/sql/base/world/locales_creature.sql +++ b/data/sql/base/db_world/locales_creature.sql diff --git a/data/sql/base/world/locales_creature_text.sql b/data/sql/base/db_world/locales_creature_text.sql index 38b22266bf..38b22266bf 100644 --- a/data/sql/base/world/locales_creature_text.sql +++ b/data/sql/base/db_world/locales_creature_text.sql diff --git a/data/sql/base/world/locales_gameobject.sql b/data/sql/base/db_world/locales_gameobject.sql index e0a5d0881d..e0a5d0881d 100644 --- a/data/sql/base/world/locales_gameobject.sql +++ b/data/sql/base/db_world/locales_gameobject.sql diff --git a/data/sql/base/world/locales_gossip_menu_option.sql b/data/sql/base/db_world/locales_gossip_menu_option.sql index a318289fae..a318289fae 100644 --- a/data/sql/base/world/locales_gossip_menu_option.sql +++ b/data/sql/base/db_world/locales_gossip_menu_option.sql diff --git a/data/sql/base/world/locales_item.sql b/data/sql/base/db_world/locales_item.sql index 0ec5271430..0ec5271430 100644 --- a/data/sql/base/world/locales_item.sql +++ b/data/sql/base/db_world/locales_item.sql diff --git a/data/sql/base/world/locales_item_set_names.sql b/data/sql/base/db_world/locales_item_set_names.sql index 2a5b2b5575..2a5b2b5575 100644 --- a/data/sql/base/world/locales_item_set_names.sql +++ b/data/sql/base/db_world/locales_item_set_names.sql diff --git a/data/sql/base/world/locales_npc_text.sql b/data/sql/base/db_world/locales_npc_text.sql index d9b64d9b88..d9b64d9b88 100644 --- a/data/sql/base/world/locales_npc_text.sql +++ b/data/sql/base/db_world/locales_npc_text.sql diff --git a/data/sql/base/world/locales_page_text.sql b/data/sql/base/db_world/locales_page_text.sql index c18405cc57..c18405cc57 100644 --- a/data/sql/base/world/locales_page_text.sql +++ b/data/sql/base/db_world/locales_page_text.sql diff --git a/data/sql/base/world/locales_points_of_interest.sql b/data/sql/base/db_world/locales_points_of_interest.sql index b1fa8a5126..b1fa8a5126 100644 --- a/data/sql/base/world/locales_points_of_interest.sql +++ b/data/sql/base/db_world/locales_points_of_interest.sql diff --git a/data/sql/base/world/locales_quest.sql b/data/sql/base/db_world/locales_quest.sql index f6d1f53665..f6d1f53665 100644 --- a/data/sql/base/world/locales_quest.sql +++ b/data/sql/base/db_world/locales_quest.sql diff --git a/data/sql/base/world/mail_level_reward.sql b/data/sql/base/db_world/mail_level_reward.sql index 56b22f011b..56b22f011b 100644 --- a/data/sql/base/world/mail_level_reward.sql +++ b/data/sql/base/db_world/mail_level_reward.sql diff --git a/data/sql/base/world/mail_loot_template.sql b/data/sql/base/db_world/mail_loot_template.sql index 299167d62d..299167d62d 100644 --- a/data/sql/base/world/mail_loot_template.sql +++ b/data/sql/base/db_world/mail_loot_template.sql diff --git a/data/sql/base/world/milling_loot_template.sql b/data/sql/base/db_world/milling_loot_template.sql index 2f6b108f2d..2f6b108f2d 100644 --- a/data/sql/base/world/milling_loot_template.sql +++ b/data/sql/base/db_world/milling_loot_template.sql diff --git a/data/sql/base/world/npc_spellclick_spells.sql b/data/sql/base/db_world/npc_spellclick_spells.sql index 64ab2cb34c..64ab2cb34c 100644 --- a/data/sql/base/world/npc_spellclick_spells.sql +++ b/data/sql/base/db_world/npc_spellclick_spells.sql diff --git a/data/sql/base/world/npc_text.sql b/data/sql/base/db_world/npc_text.sql index 13c98e8a52..13c98e8a52 100644 --- a/data/sql/base/world/npc_text.sql +++ b/data/sql/base/db_world/npc_text.sql diff --git a/data/sql/base/world/npc_trainer.sql b/data/sql/base/db_world/npc_trainer.sql index 6ac01dd9b5..6ac01dd9b5 100644 --- a/data/sql/base/world/npc_trainer.sql +++ b/data/sql/base/db_world/npc_trainer.sql diff --git a/data/sql/base/world/npc_vendor.sql b/data/sql/base/db_world/npc_vendor.sql index a4d76e9052..a4d76e9052 100644 --- a/data/sql/base/world/npc_vendor.sql +++ b/data/sql/base/db_world/npc_vendor.sql diff --git a/data/sql/base/world/outdoorpvp_template.sql b/data/sql/base/db_world/outdoorpvp_template.sql index 2f532a7c4e..2f532a7c4e 100644 --- a/data/sql/base/world/outdoorpvp_template.sql +++ b/data/sql/base/db_world/outdoorpvp_template.sql diff --git a/data/sql/base/world/page_text.sql b/data/sql/base/db_world/page_text.sql index 4764bbfc2a..4764bbfc2a 100644 --- a/data/sql/base/world/page_text.sql +++ b/data/sql/base/db_world/page_text.sql diff --git a/data/sql/base/world/pet_levelstats.sql b/data/sql/base/db_world/pet_levelstats.sql index 0daa106fab..0daa106fab 100644 --- a/data/sql/base/world/pet_levelstats.sql +++ b/data/sql/base/db_world/pet_levelstats.sql diff --git a/data/sql/base/world/pet_name_generation.sql b/data/sql/base/db_world/pet_name_generation.sql index 2f1c9d50d4..2f1c9d50d4 100644 --- a/data/sql/base/world/pet_name_generation.sql +++ b/data/sql/base/db_world/pet_name_generation.sql diff --git a/data/sql/base/world/pickpocketing_loot_template.sql b/data/sql/base/db_world/pickpocketing_loot_template.sql index 08f53675c5..08f53675c5 100644 --- a/data/sql/base/world/pickpocketing_loot_template.sql +++ b/data/sql/base/db_world/pickpocketing_loot_template.sql diff --git a/data/sql/base/world/player_classlevelstats.sql b/data/sql/base/db_world/player_classlevelstats.sql index c161d94ccf..c161d94ccf 100644 --- a/data/sql/base/world/player_classlevelstats.sql +++ b/data/sql/base/db_world/player_classlevelstats.sql diff --git a/data/sql/base/world/player_factionchange_achievement.sql b/data/sql/base/db_world/player_factionchange_achievement.sql index 79ded8d801..79ded8d801 100644 --- a/data/sql/base/world/player_factionchange_achievement.sql +++ b/data/sql/base/db_world/player_factionchange_achievement.sql diff --git a/data/sql/base/world/player_factionchange_items.sql b/data/sql/base/db_world/player_factionchange_items.sql index aff426fb3a..aff426fb3a 100644 --- a/data/sql/base/world/player_factionchange_items.sql +++ b/data/sql/base/db_world/player_factionchange_items.sql diff --git a/data/sql/base/world/player_factionchange_quests.sql b/data/sql/base/db_world/player_factionchange_quests.sql index 3da1ff3fd4..3da1ff3fd4 100644 --- a/data/sql/base/world/player_factionchange_quests.sql +++ b/data/sql/base/db_world/player_factionchange_quests.sql diff --git a/data/sql/base/world/player_factionchange_reputations.sql b/data/sql/base/db_world/player_factionchange_reputations.sql index 39327c4926..39327c4926 100644 --- a/data/sql/base/world/player_factionchange_reputations.sql +++ b/data/sql/base/db_world/player_factionchange_reputations.sql diff --git a/data/sql/base/world/player_factionchange_spells.sql b/data/sql/base/db_world/player_factionchange_spells.sql index aa8a617c6f..aa8a617c6f 100644 --- a/data/sql/base/world/player_factionchange_spells.sql +++ b/data/sql/base/db_world/player_factionchange_spells.sql diff --git a/data/sql/base/world/player_factionchange_titles.sql b/data/sql/base/db_world/player_factionchange_titles.sql index 6fd3b62dcc..6fd3b62dcc 100644 --- a/data/sql/base/world/player_factionchange_titles.sql +++ b/data/sql/base/db_world/player_factionchange_titles.sql diff --git a/data/sql/base/world/player_levelstats.sql b/data/sql/base/db_world/player_levelstats.sql index 2613561a88..2613561a88 100644 --- a/data/sql/base/world/player_levelstats.sql +++ b/data/sql/base/db_world/player_levelstats.sql diff --git a/data/sql/base/world/player_xp_for_level.sql b/data/sql/base/db_world/player_xp_for_level.sql index 375d8f6d04..375d8f6d04 100644 --- a/data/sql/base/world/player_xp_for_level.sql +++ b/data/sql/base/db_world/player_xp_for_level.sql diff --git a/data/sql/base/world/playercreateinfo.sql b/data/sql/base/db_world/playercreateinfo.sql index f7bcacbefb..f7bcacbefb 100644 --- a/data/sql/base/world/playercreateinfo.sql +++ b/data/sql/base/db_world/playercreateinfo.sql diff --git a/data/sql/base/world/playercreateinfo_action.sql b/data/sql/base/db_world/playercreateinfo_action.sql index fb425bbcdc..fb425bbcdc 100644 --- a/data/sql/base/world/playercreateinfo_action.sql +++ b/data/sql/base/db_world/playercreateinfo_action.sql diff --git a/data/sql/base/world/playercreateinfo_item.sql b/data/sql/base/db_world/playercreateinfo_item.sql index bcb07bde52..bcb07bde52 100644 --- a/data/sql/base/world/playercreateinfo_item.sql +++ b/data/sql/base/db_world/playercreateinfo_item.sql diff --git a/data/sql/base/world/playercreateinfo_spell.sql b/data/sql/base/db_world/playercreateinfo_spell.sql index d0e9e11b7d..d0e9e11b7d 100644 --- a/data/sql/base/world/playercreateinfo_spell.sql +++ b/data/sql/base/db_world/playercreateinfo_spell.sql diff --git a/data/sql/base/world/playercreateinfo_spell_custom.sql b/data/sql/base/db_world/playercreateinfo_spell_custom.sql index b645e58b31..b645e58b31 100644 --- a/data/sql/base/world/playercreateinfo_spell_custom.sql +++ b/data/sql/base/db_world/playercreateinfo_spell_custom.sql diff --git a/data/sql/base/world/points_of_interest.sql b/data/sql/base/db_world/points_of_interest.sql index 6aa5c3c1b2..6aa5c3c1b2 100644 --- a/data/sql/base/world/points_of_interest.sql +++ b/data/sql/base/db_world/points_of_interest.sql diff --git a/data/sql/base/world/pool_creature.sql b/data/sql/base/db_world/pool_creature.sql index dd813dca28..dd813dca28 100644 --- a/data/sql/base/world/pool_creature.sql +++ b/data/sql/base/db_world/pool_creature.sql diff --git a/data/sql/base/world/pool_gameobject.sql b/data/sql/base/db_world/pool_gameobject.sql index 4f1c025926..4f1c025926 100644 --- a/data/sql/base/world/pool_gameobject.sql +++ b/data/sql/base/db_world/pool_gameobject.sql diff --git a/data/sql/base/world/pool_pool.sql b/data/sql/base/db_world/pool_pool.sql index 3de8c9cece..3de8c9cece 100644 --- a/data/sql/base/world/pool_pool.sql +++ b/data/sql/base/db_world/pool_pool.sql diff --git a/data/sql/base/world/pool_quest.sql b/data/sql/base/db_world/pool_quest.sql index 75c1787adf..75c1787adf 100644 --- a/data/sql/base/world/pool_quest.sql +++ b/data/sql/base/db_world/pool_quest.sql diff --git a/data/sql/base/world/pool_template.sql b/data/sql/base/db_world/pool_template.sql index 98a5168271..98a5168271 100644 --- a/data/sql/base/world/pool_template.sql +++ b/data/sql/base/db_world/pool_template.sql diff --git a/data/sql/base/world/prospecting_loot_template.sql b/data/sql/base/db_world/prospecting_loot_template.sql index ad69074b0b..ad69074b0b 100644 --- a/data/sql/base/world/prospecting_loot_template.sql +++ b/data/sql/base/db_world/prospecting_loot_template.sql diff --git a/data/sql/base/world/quest_poi.sql b/data/sql/base/db_world/quest_poi.sql index 0dc46bf54a..0dc46bf54a 100644 --- a/data/sql/base/world/quest_poi.sql +++ b/data/sql/base/db_world/quest_poi.sql diff --git a/data/sql/base/world/quest_poi_points.sql b/data/sql/base/db_world/quest_poi_points.sql index 023a5bd9a8..023a5bd9a8 100644 --- a/data/sql/base/world/quest_poi_points.sql +++ b/data/sql/base/db_world/quest_poi_points.sql diff --git a/data/sql/base/world/quest_template.sql b/data/sql/base/db_world/quest_template.sql index 3fe14f9dd7..3fe14f9dd7 100644 --- a/data/sql/base/world/quest_template.sql +++ b/data/sql/base/db_world/quest_template.sql diff --git a/data/sql/base/world/reference_loot_template.sql b/data/sql/base/db_world/reference_loot_template.sql index 7f7c570fe4..7f7c570fe4 100644 --- a/data/sql/base/world/reference_loot_template.sql +++ b/data/sql/base/db_world/reference_loot_template.sql diff --git a/data/sql/base/world/reputation_reward_rate.sql b/data/sql/base/db_world/reputation_reward_rate.sql index c30af3732e..c30af3732e 100644 --- a/data/sql/base/world/reputation_reward_rate.sql +++ b/data/sql/base/db_world/reputation_reward_rate.sql diff --git a/data/sql/base/world/reputation_spillover_template.sql b/data/sql/base/db_world/reputation_spillover_template.sql index c05d8a491f..c05d8a491f 100644 --- a/data/sql/base/world/reputation_spillover_template.sql +++ b/data/sql/base/db_world/reputation_spillover_template.sql diff --git a/data/sql/base/world/script_waypoint.sql b/data/sql/base/db_world/script_waypoint.sql index 05f999fee4..05f999fee4 100644 --- a/data/sql/base/world/script_waypoint.sql +++ b/data/sql/base/db_world/script_waypoint.sql diff --git a/data/sql/base/world/skill_discovery_template.sql b/data/sql/base/db_world/skill_discovery_template.sql index 6e765df798..6e765df798 100644 --- a/data/sql/base/world/skill_discovery_template.sql +++ b/data/sql/base/db_world/skill_discovery_template.sql diff --git a/data/sql/base/world/skill_extra_item_template.sql b/data/sql/base/db_world/skill_extra_item_template.sql index df711c62bf..df711c62bf 100644 --- a/data/sql/base/world/skill_extra_item_template.sql +++ b/data/sql/base/db_world/skill_extra_item_template.sql diff --git a/data/sql/base/world/skill_fishing_base_level.sql b/data/sql/base/db_world/skill_fishing_base_level.sql index 5464044985..5464044985 100644 --- a/data/sql/base/world/skill_fishing_base_level.sql +++ b/data/sql/base/db_world/skill_fishing_base_level.sql diff --git a/data/sql/base/world/skinning_loot_template.sql b/data/sql/base/db_world/skinning_loot_template.sql index 7223e1d49d..7223e1d49d 100644 --- a/data/sql/base/world/skinning_loot_template.sql +++ b/data/sql/base/db_world/skinning_loot_template.sql diff --git a/data/sql/base/world/smart_scripts.sql b/data/sql/base/db_world/smart_scripts.sql index 92794b9fc8..92794b9fc8 100644 --- a/data/sql/base/world/smart_scripts.sql +++ b/data/sql/base/db_world/smart_scripts.sql diff --git a/data/sql/base/world/spell_area.sql b/data/sql/base/db_world/spell_area.sql index 5c293fdfdc..ef81122ec1 100644 --- a/data/sql/base/world/spell_area.sql +++ b/data/sql/base/db_world/spell_area.sql @@ -537,8 +537,6 @@ INSERT INTO `spell_area` VALUES (60778,4171,12500,0,0,0,2,1,64,11), (60778,4172,12499,0,0,0,2,1,64,11), (60778,4172,12500,0,0,0,2,1,64,11), -(60815,14,13242,13257,0,690,2,1,74,11), -(60815,14,13347,13370,0,1101,2,1,74,11), (60815,1637,13242,13257,0,690,2,1,74,11), (60815,1637,13347,13370,0,1101,2,1,74,11), (60877,1519,13347,13377,0,1101,2,1,74,11), diff --git a/data/sql/base/world/spell_bonus_data.sql b/data/sql/base/db_world/spell_bonus_data.sql index 2d81951e4d..2d81951e4d 100644 --- a/data/sql/base/world/spell_bonus_data.sql +++ b/data/sql/base/db_world/spell_bonus_data.sql diff --git a/data/sql/base/world/spell_custom_attr.sql b/data/sql/base/db_world/spell_custom_attr.sql index d36e30f410..d36e30f410 100644 --- a/data/sql/base/world/spell_custom_attr.sql +++ b/data/sql/base/db_world/spell_custom_attr.sql diff --git a/data/sql/base/world/spell_dbc.sql b/data/sql/base/db_world/spell_dbc.sql index 0077cd968a..0077cd968a 100644 --- a/data/sql/base/world/spell_dbc.sql +++ b/data/sql/base/db_world/spell_dbc.sql diff --git a/data/sql/base/world/spell_enchant_proc_data.sql b/data/sql/base/db_world/spell_enchant_proc_data.sql index 0821ca049f..0821ca049f 100644 --- a/data/sql/base/world/spell_enchant_proc_data.sql +++ b/data/sql/base/db_world/spell_enchant_proc_data.sql diff --git a/data/sql/base/world/spell_group.sql b/data/sql/base/db_world/spell_group.sql index 3266e4f812..3266e4f812 100644 --- a/data/sql/base/world/spell_group.sql +++ b/data/sql/base/db_world/spell_group.sql diff --git a/data/sql/base/world/spell_group_stack_rules.sql b/data/sql/base/db_world/spell_group_stack_rules.sql index 09eeae3503..09eeae3503 100644 --- a/data/sql/base/world/spell_group_stack_rules.sql +++ b/data/sql/base/db_world/spell_group_stack_rules.sql diff --git a/data/sql/base/world/spell_linked_spell.sql b/data/sql/base/db_world/spell_linked_spell.sql index 70c0522f53..70c0522f53 100644 --- a/data/sql/base/world/spell_linked_spell.sql +++ b/data/sql/base/db_world/spell_linked_spell.sql diff --git a/data/sql/base/world/spell_loot_template.sql b/data/sql/base/db_world/spell_loot_template.sql index b5e0459a1a..b5e0459a1a 100644 --- a/data/sql/base/world/spell_loot_template.sql +++ b/data/sql/base/db_world/spell_loot_template.sql diff --git a/data/sql/base/world/spell_mixology.sql b/data/sql/base/db_world/spell_mixology.sql index 54f3fda50c..54f3fda50c 100644 --- a/data/sql/base/world/spell_mixology.sql +++ b/data/sql/base/db_world/spell_mixology.sql diff --git a/data/sql/base/world/spell_pet_auras.sql b/data/sql/base/db_world/spell_pet_auras.sql index 002644cf6e..002644cf6e 100644 --- a/data/sql/base/world/spell_pet_auras.sql +++ b/data/sql/base/db_world/spell_pet_auras.sql diff --git a/data/sql/base/world/spell_proc.sql b/data/sql/base/db_world/spell_proc.sql index e15e368563..e15e368563 100644 --- a/data/sql/base/world/spell_proc.sql +++ b/data/sql/base/db_world/spell_proc.sql diff --git a/data/sql/base/world/spell_proc_event.sql b/data/sql/base/db_world/spell_proc_event.sql index 6ee04b60c3..6ee04b60c3 100644 --- a/data/sql/base/world/spell_proc_event.sql +++ b/data/sql/base/db_world/spell_proc_event.sql diff --git a/data/sql/base/world/spell_ranks.sql b/data/sql/base/db_world/spell_ranks.sql index 05564f0140..05564f0140 100644 --- a/data/sql/base/world/spell_ranks.sql +++ b/data/sql/base/db_world/spell_ranks.sql diff --git a/data/sql/base/world/spell_required.sql b/data/sql/base/db_world/spell_required.sql index dad6deee5f..dad6deee5f 100644 --- a/data/sql/base/world/spell_required.sql +++ b/data/sql/base/db_world/spell_required.sql diff --git a/data/sql/base/world/spell_script_names.sql b/data/sql/base/db_world/spell_script_names.sql index baaa489186..baaa489186 100644 --- a/data/sql/base/world/spell_script_names.sql +++ b/data/sql/base/db_world/spell_script_names.sql diff --git a/data/sql/base/world/spell_scripts.sql b/data/sql/base/db_world/spell_scripts.sql index 6d1a70589f..6d1a70589f 100644 --- a/data/sql/base/world/spell_scripts.sql +++ b/data/sql/base/db_world/spell_scripts.sql diff --git a/data/sql/base/world/spell_target_position.sql b/data/sql/base/db_world/spell_target_position.sql index 1459d487d2..1459d487d2 100644 --- a/data/sql/base/world/spell_target_position.sql +++ b/data/sql/base/db_world/spell_target_position.sql diff --git a/data/sql/base/world/spell_threat.sql b/data/sql/base/db_world/spell_threat.sql index e4cc5c6247..e4cc5c6247 100644 --- a/data/sql/base/world/spell_threat.sql +++ b/data/sql/base/db_world/spell_threat.sql diff --git a/data/sql/base/world/spelldifficulty_dbc.sql b/data/sql/base/db_world/spelldifficulty_dbc.sql index d754a5406d..d754a5406d 100644 --- a/data/sql/base/world/spelldifficulty_dbc.sql +++ b/data/sql/base/db_world/spelldifficulty_dbc.sql diff --git a/data/sql/base/world/transports.sql b/data/sql/base/db_world/transports.sql index 663521cc1e..663521cc1e 100644 --- a/data/sql/base/world/transports.sql +++ b/data/sql/base/db_world/transports.sql diff --git a/data/sql/base/world/trinity_string.sql b/data/sql/base/db_world/trinity_string.sql index b488e03238..b488e03238 100644 --- a/data/sql/base/world/trinity_string.sql +++ b/data/sql/base/db_world/trinity_string.sql diff --git a/data/sql/base/world/vehicle_accessory.sql b/data/sql/base/db_world/vehicle_accessory.sql index be8d4bd204..be8d4bd204 100644 --- a/data/sql/base/world/vehicle_accessory.sql +++ b/data/sql/base/db_world/vehicle_accessory.sql diff --git a/data/sql/base/world/vehicle_template_accessory.sql b/data/sql/base/db_world/vehicle_template_accessory.sql index 00d62a3391..00d62a3391 100644 --- a/data/sql/base/world/vehicle_template_accessory.sql +++ b/data/sql/base/db_world/vehicle_template_accessory.sql diff --git a/data/sql/base/world/version.sql b/data/sql/base/db_world/version.sql index 68f39f887e..68f39f887e 100644 --- a/data/sql/base/world/version.sql +++ b/data/sql/base/db_world/version.sql diff --git a/data/sql/base/world/warden_checks.sql b/data/sql/base/db_world/warden_checks.sql index 69d131a5e4..69d131a5e4 100644 --- a/data/sql/base/world/warden_checks.sql +++ b/data/sql/base/db_world/warden_checks.sql diff --git a/data/sql/base/world/waypoint_data.sql b/data/sql/base/db_world/waypoint_data.sql index 8133338ba3..8133338ba3 100644 --- a/data/sql/base/world/waypoint_data.sql +++ b/data/sql/base/db_world/waypoint_data.sql diff --git a/data/sql/base/world/waypoint_scripts.sql b/data/sql/base/db_world/waypoint_scripts.sql index e238b2faed..e238b2faed 100644 --- a/data/sql/base/world/waypoint_scripts.sql +++ b/data/sql/base/db_world/waypoint_scripts.sql diff --git a/data/sql/base/world/waypoints.sql b/data/sql/base/db_world/waypoints.sql index 0aa279a7fc..0aa279a7fc 100644 --- a/data/sql/base/world/waypoints.sql +++ b/data/sql/base/db_world/waypoints.sql diff --git a/data/sql/base/world/world_db_version.sql b/data/sql/base/db_world/world_db_version.sql index fb1c63080d..fb1c63080d 100644 --- a/data/sql/base/world/world_db_version.sql +++ b/data/sql/base/db_world/world_db_version.sql diff --git a/data/sql/create/create_mysql.sql b/data/sql/create/create_mysql.sql new file mode 100644 index 0000000000..8d2e47cb47 --- /dev/null +++ b/data/sql/create/create_mysql.sql @@ -0,0 +1,13 @@ +GRANT USAGE ON * . * TO 'acore'@'localhost' IDENTIFIED BY 'acore' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ; + +CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; + +CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; + +CREATE DATABASE `auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; + +GRANT ALL PRIVILEGES ON `world` . * TO 'acore'@'localhost' WITH GRANT OPTION; + +GRANT ALL PRIVILEGES ON `characters` . * TO 'acore'@'localhost' WITH GRANT OPTION; + +GRANT ALL PRIVILEGES ON `auth` . * TO 'acore'@'localhost' WITH GRANT OPTION;
\ No newline at end of file diff --git a/data/sql/create/drop_mysql.sql b/data/sql/create/drop_mysql.sql new file mode 100644 index 0000000000..90f33cb01c --- /dev/null +++ b/data/sql/create/drop_mysql.sql @@ -0,0 +1,21 @@ +REVOKE ALL PRIVILEGES ON * . * FROM 'acore'@'localhost'; + +REVOKE ALL PRIVILEGES ON `world` . * FROM 'acore'@'localhost'; + +REVOKE GRANT OPTION ON `world` . * FROM 'acore'@'localhost'; + +REVOKE ALL PRIVILEGES ON `characters` . * FROM 'acore'@'localhost'; + +REVOKE GRANT OPTION ON `characters` . * FROM 'acore'@'localhost'; + +REVOKE ALL PRIVILEGES ON `auth` . * FROM 'acore'@'localhost'; + +REVOKE GRANT OPTION ON `auth` . * FROM 'acore'@'localhost'; + +DROP USER 'acore'@'localhost'; + +DROP DATABASE IF EXISTS `world`; + +DROP DATABASE IF EXISTS `characters`; + +DROP DATABASE IF EXISTS `auth`; diff --git a/data/sql/updates/auth/.dummy b/data/sql/custom/db_auth/.dummy index e69de29bb2..e69de29bb2 100644 --- a/data/sql/updates/auth/.dummy +++ b/data/sql/custom/db_auth/.dummy diff --git a/data/sql/updates/characters/.dummy b/data/sql/custom/db_characters/.dummy index e69de29bb2..e69de29bb2 100644 --- a/data/sql/updates/characters/.dummy +++ b/data/sql/custom/db_characters/.dummy diff --git a/data/sql/updates/world/.dummy b/data/sql/custom/db_world/.dummy index e69de29bb2..e69de29bb2 100644 --- a/data/sql/updates/world/.dummy +++ b/data/sql/custom/db_world/.dummy diff --git a/data/sql/updates/README.md b/data/sql/updates/README.md index b17de6023e..104608c572 100644 --- a/data/sql/updates/README.md +++ b/data/sql/updates/README.md @@ -1 +1,2 @@ Please read [this](https://github.com/azerothcore/azerothcore-wotlk/wiki/Dealing-with-SQL-files) before adding new SQL-update files. + diff --git a/data/sql/updates/db_auth/.dummy b/data/sql/updates/db_auth/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/db_auth/.dummy diff --git a/data/sql/updates/db_auth/2016_08_25_00.sql b/data/sql/updates/db_auth/2016_08_25_00.sql new file mode 100644 index 0000000000..9444ba3adc --- /dev/null +++ b/data/sql/updates/db_auth/2016_08_25_00.sql @@ -0,0 +1,6 @@ +ALTER TABLE auth_db_version CHANGE COLUMN 2016_07_10_00 2016_08_25_00 bit; + +-- +-- Do not remove this file when we archive sql under this folder +-- it is needed for pending sql importer +-- diff --git a/data/sql/updates/db_auth/2016_08_25_01.sql b/data/sql/updates/db_auth/2016_08_25_01.sql new file mode 100644 index 0000000000..49b31e9423 --- /dev/null +++ b/data/sql/updates/db_auth/2016_08_25_01.sql @@ -0,0 +1,13 @@ +ALTER TABLE auth_db_version CHANGE COLUMN 2016_08_25_00 2016_08_25_01 bit; + +RENAME TABLE `auth_db_version` TO `version_db_auth`; + +ALTER TABLE `version_db_auth` +ADD COLUMN `sql_rev` VARCHAR(100) NOT NULL FIRST, +ADD COLUMN `required_rev` VARCHAR(100) NULL AFTER `sql_rev`, +ADD PRIMARY KEY (`sql_rev`), +ENGINE=INNODB; + +ALTER TABLE `version_db_auth` ADD CONSTRAINT `required` FOREIGN KEY (`required_rev`) REFERENCES `version_db_auth`(`sql_rev`); + + diff --git a/data/sql/updates/db_auth/2016_09_04_00.sql b/data/sql/updates/db_auth/2016_09_04_00.sql new file mode 100644 index 0000000000..32cc1df42a --- /dev/null +++ b/data/sql/updates/db_auth/2016_09_04_00.sql @@ -0,0 +1,13 @@ +START TRANSACTION; + +ALTER TABLE version_db_auth CHANGE COLUMN 2016_08_25_01 2016_09_04_00 bit; + +CREATE TABLE `logs` ( + `time` int(10) unsigned NOT NULL, + `realm` int(10) unsigned NOT NULL, + `type` varchar(250) NOT NULL, + `level` tinyint(3) unsigned NOT NULL DEFAULT '0', + `string` text CHARACTER SET latin1 +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +COMMIT; diff --git a/data/sql/updates/db_characters/.dummy b/data/sql/updates/db_characters/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/db_characters/.dummy diff --git a/data/sql/updates/db_characters/2016_08_14_00.sql b/data/sql/updates/db_characters/2016_08_14_00.sql new file mode 100644 index 0000000000..69a9170de9 --- /dev/null +++ b/data/sql/updates/db_characters/2016_08_14_00.sql @@ -0,0 +1,7 @@ +-- uncomment and fix following line at next revision / updates archivation +-- ALTER TABLE auth_db_version CHANGE COLUMN xxxx_xx_xx_xx xxxx_xx_xx_xx bit; + +-- +-- Do not remove this file when we archive sql under this folder +-- it is needed for pending sql importer +-- diff --git a/data/sql/updates/characters/2016_08_15_00.sql b/data/sql/updates/db_characters/2016_08_15_00.sql index cdc91b044e..cdc91b044e 100644 --- a/data/sql/updates/characters/2016_08_15_00.sql +++ b/data/sql/updates/db_characters/2016_08_15_00.sql diff --git a/data/sql/updates/db_characters/2016_08_25_00.sql b/data/sql/updates/db_characters/2016_08_25_00.sql new file mode 100644 index 0000000000..4a55f688a3 --- /dev/null +++ b/data/sql/updates/db_characters/2016_08_25_00.sql @@ -0,0 +1,12 @@ +ALTER TABLE characters_db_version CHANGE COLUMN 2016_08_15_00 2016_08_25_00 bit; + +RENAME TABLE `characters_db_version` TO `version_db_characters`; + +ALTER TABLE `version_db_characters` +ADD COLUMN `sql_rev` VARCHAR(100) NOT NULL FIRST, +ADD COLUMN `required_rev` VARCHAR(100) NULL AFTER `sql_rev`, +ADD PRIMARY KEY (`sql_rev`), +ENGINE=INNODB; + +ALTER TABLE `version_db_characters` ADD CONSTRAINT `required` FOREIGN KEY (`required_rev`) REFERENCES `version_db_characters`(`sql_rev`); + diff --git a/data/sql/updates/db_world/.dummy b/data/sql/updates/db_world/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/db_world/.dummy diff --git a/data/sql/updates/db_world/2016_08_13_00.sql b/data/sql/updates/db_world/2016_08_13_00.sql new file mode 100644 index 0000000000..69a9170de9 --- /dev/null +++ b/data/sql/updates/db_world/2016_08_13_00.sql @@ -0,0 +1,7 @@ +-- uncomment and fix following line at next revision / updates archivation +-- ALTER TABLE auth_db_version CHANGE COLUMN xxxx_xx_xx_xx xxxx_xx_xx_xx bit; + +-- +-- Do not remove this file when we archive sql under this folder +-- it is needed for pending sql importer +-- diff --git a/data/sql/updates/world/2016_08_14_00.sql b/data/sql/updates/db_world/2016_08_14_00.sql index 9a83e87f5b..af971c8426 100644 --- a/data/sql/updates/world/2016_08_14_00.sql +++ b/data/sql/updates/db_world/2016_08_14_00.sql @@ -1,4 +1,4 @@ -ALTER TABLE world_db_version CHANGE COLUMN 2016_08_13_00 2016_08_14_00 bit; +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_10_01 2016_08_14_00 bit; -- Dream Vision make it trigger UPDATE `creature_template` SET `flags_extra`='128' WHERE (`entry`='7863'); diff --git a/data/sql/updates/world/2016_08_14_01.sql b/data/sql/updates/db_world/2016_08_14_01.sql index b914dd4022..b914dd4022 100644 --- a/data/sql/updates/world/2016_08_14_01.sql +++ b/data/sql/updates/db_world/2016_08_14_01.sql diff --git a/data/sql/updates/world/2016_08_14_02.sql b/data/sql/updates/db_world/2016_08_14_02.sql index 866d64fd5b..866d64fd5b 100644 --- a/data/sql/updates/world/2016_08_14_02.sql +++ b/data/sql/updates/db_world/2016_08_14_02.sql diff --git a/data/sql/updates/world/2016_08_19_01.sql b/data/sql/updates/db_world/2016_08_19_00.sql index 80922332bc..ab72b8cabb 100644 --- a/data/sql/updates/world/2016_08_19_01.sql +++ b/data/sql/updates/db_world/2016_08_19_00.sql @@ -1,4 +1,4 @@ -ALTER TABLE world_db_version CHANGE COLUMN 2016_08_19_00 2016_08_19_01 BIT; +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_14_02 2016_08_19_00 BIT; /* Issue: Not work quest id 11543 #93 @@ -21,4 +21,4 @@ INSERT INTO conditions VALUES (15,9143,0,0,1,9,0,11543,0,0,0,0,0,,"Show gossip option if player has quest 11543 but not complete"); */ -DELETE FROM conditions WHERE SourceTypeOrReferenceId=15 AND SourceGroup=9143;
\ No newline at end of file +DELETE FROM conditions WHERE SourceTypeOrReferenceId=15 AND SourceGroup=9143; diff --git a/data/sql/updates/world/2016_08_21_00.sql b/data/sql/updates/db_world/2016_08_21_00.sql index f22e482a77..ca9af2f74b 100644 --- a/data/sql/updates/world/2016_08_21_00.sql +++ b/data/sql/updates/db_world/2016_08_21_00.sql @@ -1,4 +1,4 @@ -ALTER TABLE world_db_version CHANGE COLUMN 2016_08_14_02 2016_08_21_00 bit; +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_19_00 2016_08_21_00 bit; INSERT IGNORE INTO `command` (`name`, `security`, `help`) VALUES ('achievement',2,'Syntax: .achievement $subcommand\nType .achievement to see the list of possible subcommands or .help achievement $subcommand to see info on subcommands'), diff --git a/data/sql/updates/db_world/2016_08_24_00.sql b/data/sql/updates/db_world/2016_08_24_00.sql new file mode 100644 index 0000000000..2e27d84a98 --- /dev/null +++ b/data/sql/updates/db_world/2016_08_24_00.sql @@ -0,0 +1,30 @@ +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_21_00 2016_08_24_00 bit; + +-- Insert MovementType to Fizzle Darkstorm (GUID = 6455) and Burning Blade Fanatic (GUID = 6432) npc + +DELETE FROM `waypoint_data` WHERE `id` IN (645500,643200); +-- Fizzle Darkstorm +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +('645500', '1', '870.331', '-4202.85', '-14.0742', '0', '45000', '0', '0', '100', '0'), +('645500', '2', '869.751', '-4190.07', '-14.1105', '0', '45000', '0', '0', '100', '0'), +-- Burning Blade Fanatic +('643200', '1', '843.944', '-4207.75', '-9.11563', '0', '0', '0', '0', '100', '0'), +('643200', '2', '855.389', '-4212.85', '-9.99841', '0', '0', '0', '0', '100', '0'), +('643200', '3', '867.336', '-4204.73', '-13.9766', '0', '0', '0', '0', '100', '0'), +('643200', '4', '879.138', '-4186.37', '-13.9981', '0', '0', '0', '0', '100', '0'), +('643200', '5', '898.795', '-4170.9', '-9.24759', '0', '0', '0', '0', '100', '0'), +('643200', '6', '894.318', '-4165.13', '-9.10758', '0', '0', '0', '0', '100', '0'), +('643200', '7', '881.809', '-4167.77', '-13.8924', '0', '0', '0', '0', '100', '0'), +('643200', '8', '864.355', '-4183.45', '-14.0399', '0', '0', '0', '0', '100', '0'), +('643200', '9', '847.975', '-4191.54', '-10.0094', '0', '0', '0', '0', '100', '0'), +('643200', '10', '847.094', '-4194.71', '-9.9878', '0', '0', '0', '0', '100', '0'); + +-- Fizzle Darkstorm +UPDATE `creature_addon` SET `path_id`='645500' WHERE `guid`='6455'; +UPDATE `creature` SET `MovementType`='2' WHERE `guid`='6455'; + +-- Burning Blade Fanatic +DELETE FROM `creature_addon` WHERE `guid` = 6432; +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES ('6432', '643200', '0', '0', '0', '0', '0'); +UPDATE `creature` SET `MovementType`='2' WHERE `guid`='6432'; + diff --git a/data/sql/updates/db_world/2016_08_24_01.sql b/data/sql/updates/db_world/2016_08_24_01.sql new file mode 100644 index 0000000000..dd0536526f --- /dev/null +++ b/data/sql/updates/db_world/2016_08_24_01.sql @@ -0,0 +1,3 @@ +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_24_00 2016_08_24_01 bit; + +UPDATE command SET security = 0 WHERE name = 'gm ingame'; diff --git a/data/sql/updates/db_world/2016_08_25_00.sql b/data/sql/updates/db_world/2016_08_25_00.sql new file mode 100644 index 0000000000..35c15025e9 --- /dev/null +++ b/data/sql/updates/db_world/2016_08_25_00.sql @@ -0,0 +1,12 @@ +ALTER TABLE world_db_version CHANGE COLUMN 2016_08_24_01 2016_08_25_00 bit; + +RENAME TABLE `world_db_version` TO `version_db_world`; + +ALTER TABLE `version_db_world` +ADD COLUMN `sql_rev` VARCHAR(100) NOT NULL FIRST, +ADD COLUMN `required_rev` VARCHAR(100) NULL AFTER `sql_rev`, +ADD PRIMARY KEY (`sql_rev`), +ENGINE=INNODB; + +ALTER TABLE `version_db_world` ADD CONSTRAINT `required` FOREIGN KEY (`required_rev`) REFERENCES `version_db_world`(`sql_rev`); + diff --git a/data/sql/updates/db_world/2016_08_26_00.sql b/data/sql/updates/db_world/2016_08_26_00.sql new file mode 100644 index 0000000000..8ebf2c1518 --- /dev/null +++ b/data/sql/updates/db_world/2016_08_26_00.sql @@ -0,0 +1,3 @@ +ALTER TABLE version_db_world CHANGE COLUMN 2016_08_25_00 2016_08_26_00 bit; + +DELETE FROM command WHERE name IN ('npc evade', 'debug send chatmessage'); diff --git a/data/sql/updates/db_world/2016_08_30_00.sql b/data/sql/updates/db_world/2016_08_30_00.sql new file mode 100644 index 0000000000..172e99770c --- /dev/null +++ b/data/sql/updates/db_world/2016_08_30_00.sql @@ -0,0 +1,20 @@ +-- DB update 2016_08_26_00 -> 2016_08_30_00 +START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2016_08_26_00 2016_08_30_00 bit; +-- +-- START UPDATING QUERIES +-- +/* +Issue: Not work quest id 10990 10991 10992 #114 +NPCs spawns are inside the Gobjs +*/ + +UPDATE gameobject_template SET AIName="SmartGameObjectAI", ScriptName = "" /*go_shrine_of_the_birds*/ WHERE entry IN (185551,185547,185553); +DELETE FROM smart_scripts WHERE entryorguid IN (185551,185547,185553) AND source_type=1; +INSERT INTO smart_scripts VALUES +(185551,1,0,0,70,0,100,0,2,0,0,0,12,22992,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Hawk Shrine - On Activate - Summon Creature 22992"), +(185547,1,0,0,70,0,100,0,2,0,0,0,12,22993,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Eagle Shrine - On Gossip Hello - Summon Creature 22993"), +(185553,1,0,0,70,0,100,0,2,0,0,0,12,22994,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Hawk Shrine - On Gossip Hello - Summon Creature 22994");-- +-- END UPDATING QUERIES +-- +COMMIT; diff --git a/data/sql/updates/pending_db_auth/.dummy b/data/sql/updates/pending_db_auth/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/pending_db_auth/.dummy diff --git a/data/sql/updates/pending_db_auth/create_sql.sh b/data/sql/updates/pending_db_auth/create_sql.sh new file mode 100755 index 0000000000..e0ecec83bf --- /dev/null +++ b/data/sql/updates/pending_db_auth/create_sql.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )"; + +rev=$( date +%s%N ); + +echo "INSERT INTO version_db_auth(\`sql_rev\`) VALUES ('"$rev"');" > "$CUR_PATH/rev_"$rev".sql" && echo "File created"; diff --git a/data/sql/updates/pending_db_characters/.dummy b/data/sql/updates/pending_db_characters/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/pending_db_characters/.dummy diff --git a/data/sql/updates/pending_db_characters/create_sql.sh b/data/sql/updates/pending_db_characters/create_sql.sh new file mode 100755 index 0000000000..94e9588d0f --- /dev/null +++ b/data/sql/updates/pending_db_characters/create_sql.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )"; + +rev=$( date +%s%N ); + +echo "INSERT INTO version_db_characters(\`sql_rev\`) VALUES ('"$rev"');" > "$CUR_PATH/rev_"$rev".sql" && echo "File created"; diff --git a/data/sql/updates/pending_db_world/.dummy b/data/sql/updates/pending_db_world/.dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/data/sql/updates/pending_db_world/.dummy diff --git a/data/sql/updates/pending_db_world/create_sql.sh b/data/sql/updates/pending_db_world/create_sql.sh new file mode 100755 index 0000000000..1ec4fae62b --- /dev/null +++ b/data/sql/updates/pending_db_world/create_sql.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )"; + +rev=$( date +%s%N ); + +echo "INSERT INTO version_db_world(\`sql_rev\`) VALUES ('"$rev"');" > "$CUR_PATH/rev_"$rev".sql" && echo "File created"; diff --git a/data/sql/updates/pending_db_world/rev_1473110802988536500.sql b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql new file mode 100644 index 0000000000..602c23d710 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql @@ -0,0 +1,14 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1473110802988536500');
+
+
+-- Tyrannus Mount fix
+
+DELETE from creature_template where `entry` = 36794;
+DELETE from creature_template_addon where entry = 36794;
+
+INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `dmg_multiplier`, `baseattacktime`, `rangeattacktime`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `spell5`, `spell6`, `spell7`, `spell8`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `HoverHeight`, `Health_mod`, `Mana_mod`, `Armor_mod`, `RacialLeader`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`)
+VALUES (36794, 0, 0, 0, 0, 0, 30277, 0, 0, 0, 'Scourgelord Tyrannus', '', '', 0, 82, 82, 2, 21, 0, 3, 3, 0.5, 1, 463, 640, 0, 726, 7.5, 2000, 0, 2, 832, 2048, 8, 0, 0, 0, 0, 0, 360, 520, 91, 6, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 551, 0, 0, '', 0, 4, 1, 8, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8388624, 0, 'npc_pos_tyrannus_events', 12340);
+
+
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(36794, 0, 27982, 50331648, 1, 0, '');
diff --git a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql new file mode 100644 index 0000000000..04fa79817a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql @@ -0,0 +1,130 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111010225487800');
+
+
+-- Ambassitor Kelmer Walk fix
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=64973;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(64973, 64973, 0, 0, 2),
+(64973, 64969, 3, 90, 2),
+(64973, 64972, 3, 190, 2),
+(64973, 64970, 3, 150, 2),
+(64973, 64971, 3, 230, 2);
+
+-- Pathing for Ambassador Kelemar Entry: 18191 'TDB FORMAT'
+SET @NPC := 64973;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9820.037,`position_y`=-7272.192,`position_z`=26.49395 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,9796.135,-7283.987,27.08482,0,0,0,0,100,0), -- 19:26:00
+(@PATH,2,9780.896,-7294.989,25.69673,0,0,0,0,100,0), -- 19:26:06
+(@PATH,3,9761.531,-7308.111,24.53886,0,0,0,0,100,0), -- 19:26:17
+(@PATH,4,9739.729,-7318.02,24.66139,0,0,0,0,100,0), -- 19:26:24
+(@PATH,5,9718.599,-7323.634,17.83319,0,0,0,0,100,0), -- 19:26:33
+(@PATH,6,9705.037,-7327.564,12.23571,0,0,0,0,100,0), -- 19:26:43
+(@PATH,7,9692.664,-7328.254,12.46708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,8,9688.664,-7326.754,13.46708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,9,9687.164,-7326.254,13.71708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,10,9684.914,-7325.504,13.71708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,11,9680.164,-7323.754,13.96708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,12,9678.275,-7317.159,14.09098,0,0,0,0,100,0), -- 19:27:18
+(@PATH,13,9678.275,-7315.409,14.09098,0,0,0,0,100,0), -- 19:27:18
+(@PATH,14,9693.328,-7309.638,14.26884,0,0,0,0,100,0), -- 19:27:24
+(@PATH,15,9694.828,-7309.638,14.51884,0,0,0,0,100,0), -- 19:27:24
+(@PATH,16,9697.677,-7306.808,14.97078,0,0,0,0,100,0), -- 19:27:31
+(@PATH,17,9698.177,-7303.808,15.47078,0,0,0,0,100,0), -- 19:27:31
+(@PATH,18,9694.492,-7299.811,14.81144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,19,9693.242,-7299.561,14.56144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,20,9681.492,-7297.311,14.31144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,21,9680.242,-7297.061,14.31144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,22,9676.988,-7291.817,14.21627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,23,9676.488,-7290.067,13.96627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,24,9674.988,-7285.067,14.21627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,25,9664.734,-7275.52,14.00172,0,0,0,0,100,0), -- 19:27:51
+(@PATH,26,9663.512,-7275.039,14.20501,0,0,0,0,100,0), -- 19:27:54
+(@PATH,27,9640.073,-7275.812,14.19427,0,0,0,0,100,0), -- 19:28:00
+(@PATH,28,9600.183,-7275.951,14.198,0,0,0,0,100,0), -- 19:28:11
+(@PATH,29,9591.281,-7275.895,14.20201,0,0,0,0,100,0), -- 19:28:24
+(@PATH,30,9527.367,-7276.398,14.20272,0,0,0,0,100,0), -- 19:28:42
+(@PATH,31,9514.253,-7280.672,14.23572,0,0,0,0,100,0), -- 19:28:51
+(@PATH,32,9513.003,-7281.172,14.23572,0,0,0,0,100,0), -- 19:28:51
+(@PATH,33,9505.664,-7290.029,14.31716,0,0,0,0,100,0), -- 19:28:59
+(@PATH,34,9505.664,-7307.279,14.31716,0,0,0,0,100,0), -- 19:28:59
+(@PATH,35,9515.084,-7323.17,14.36923,0,0,0,0,100,0), -- 19:29:11
+(@PATH,36,9520.657,-7327.142,14.34109,0,0,0,0,100,0), -- 19:29:18
+(@PATH,37,9530.853,-7327.042,14.0993,0,0,0,0,100,0), -- 19:29:25
+(@PATH,38,9548.444,-7326.636,14.06214,0,0,0,0,100,0), -- 19:29:58
+(@PATH,39,9580.658,-7327.75,14.35676,0,0,0,0,100,0), -- 19:30:04
+(@PATH,40,9594.123,-7336.496,14.41358,0,0,0,0,100,0), -- 19:30:20
+(@PATH,41,9596.051,-7359.264,13.80623,0,0,0,0,100,0), -- 19:31:00
+(@PATH,42,9596.301,-7361.264,13.80623,0,0,0,0,100,0), -- 19:31:00
+(@PATH,43,9579.046,-7368.445,13.69998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,44,9577.046,-7368.695,13.94998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,45,9574.296,-7368.945,14.19998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,46,9573.438,-7371.7,14.59834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,47,9573.438,-7372.7,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,48,9573.438,-7377.45,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,49,9573.438,-7381.45,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,50,9578.811,-7384.082,14.05795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,51,9581.811,-7384.332,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,52,9590.561,-7385.082,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,53,9591.811,-7385.332,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,54,9594.387,-7393.903,13.32688,0,0,0,0,100,0), -- 19:31:35
+(@PATH,55,9605.18,-7424.402,13.54854,0,0,0,0,100,0), -- 19:31:46
+(@PATH,56,9611.559,-7427.8,13.55342,0,0,0,0,100,0), -- 19:31:55
+(@PATH,57,9650.357,-7430.099,13.54782,0,0,0,0,100,0), -- 19:32:02
+(@PATH,58,9667.592,-7436.145,13.54347,0,0,0,0,100,0), -- 19:32:13
+(@PATH,59,9669.131,-7436.995,13.54329,0,0,0,0,100,0), -- 19:32:19
+(@PATH,60,9692.813,-7437.087,13.54329,0,0,0,0,100,0), -- 19:32:27
+(@PATH,61,9700.063,-7434.087,13.54329,0,0,0,0,100,0), -- 19:32:27
+(@PATH,62,9720.646,-7424.146,13.5211,0,0,0,0,100,0), -- 19:32:35
+(@PATH,63,9746.543,-7421.814,13.48517,0,0,0,0,100,0), -- 19:32:44
+(@PATH,64,9740.969,-7422.06,13.22301,0,0,0,0,100,0), -- 19:32:51
+(@PATH,65,9760.844,-7421.124,13.52046,0,0,0,0,100,0), -- 19:33:13
+(@PATH,66,9766.758,-7413.826,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,67,9767.258,-7402.326,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,68,9767.258,-7400.326,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,69,9767.258,-7397.576,14.11535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,70,9767.447,-7397.039,14.50608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,71,9770.447,-7397.039,14.50608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,72,9775.947,-7396.789,15.00608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,73,9790.197,-7396.289,14.75608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,74,9791.447,-7396.289,15.00608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,75,9793.188,-7398,14.60959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,76,9793.188,-7400.75,14.10959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,77,9793.188,-7402.5,14.10959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,78,9793.438,-7405.5,13.85959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,79,9793.438,-7415,13.85959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,80,9801.363,-7416.336,13.89329,0,0,0,0,100,0), -- 19:33:47
+(@PATH,81,9803.363,-7416.336,13.39329,0,0,0,0,100,0), -- 19:33:47
+(@PATH,82,9815.096,-7417.077,13.5569,0,0,0,0,100,0), -- 19:33:55
+(@PATH,83,9842.76,-7416.906,13.55959,0,0,0,0,100,0), -- 19:34:05
+(@PATH,84,9876.417,-7415.617,13.53772,0,0,0,0,100,0), -- 19:34:14
+(@PATH,85,9872.041,-7415.873,13.27497,0,0,0,0,100,0), -- 19:34:20
+(@PATH,86,9879.891,-7412.866,13.51642,0,0,0,0,100,0), -- 19:35:01
+(@PATH,87,9882.891,-7409.116,13.51642,0,0,0,0,100,0), -- 19:35:01
+(@PATH,88,9884.779,-7404.788,13.42007,0,0,0,0,100,0), -- 19:35:06
+(@PATH,89,9884.512,-7369.616,20.88766,0,0,0,0,100,0), -- 19:35:13
+(@PATH,90,9888.86,-7355.768,20.93519,0,0,0,0,100,0), -- 19:35:22
+(@PATH,91,9889.949,-7346.212,22.30157,0,0,0,0,100,0), -- 19:35:28
+(@PATH,92,9889.699,-7344.462,22.55157,0,0,0,0,100,0), -- 19:35:28
+(@PATH,93,9885.719,-7331.884,24.01373,0,0,0,0,100,0), -- 19:35:35
+(@PATH,94,9875.469,-7325.634,25.51373,0,0,0,0,100,0), -- 19:35:35
+(@PATH,95,9873.414,-7324.011,26.02122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,96,9870.914,-7322.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,97,9862.414,-7315.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,98,9858.664,-7312.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,99,9852.256,-7303.121,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,100,9850.756,-7299.871,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,101,9848.256,-7295.121,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,102,9845.628,-7286.911,26.397,0,0,0,0,100,0), -- 19:36:22
+(@PATH,103,9843.291,-7277.301,26.41252,0,0,0,0,100,0), -- 19:36:28
+(@PATH,104,9819.617,-7272.363,26.49641,0,0,0,0,100,0); -- 19:36:36
+
+UPDATE `creature` SET `spawndist`=0,`position_x`=9817.200195,`position_y`=-7268.220215,`position_z`=26.223801 WHERE `guid`=64969;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9824.250000,`position_y`=-7272.975586,`position_z`=26.244701 WHERE `guid`=64970;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9824.455078,`position_y`=-7270.105957,`position_z`=26.228758 WHERE `guid`=64972;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9822.427734,`position_y`=-7267.509277,`position_z`=26.203625 WHERE `guid`=64971;
diff --git a/data/sql/updates/pending_db_world/rev_1473111186171042200.sql b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql new file mode 100644 index 0000000000..5d55bd29ee --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql @@ -0,0 +1,87 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111186171042200');
+
+-- Culling of Stratholme Fix
+-- Fix Arthus start senario & Resting point fix
+
+
+ALTER TABLE world_db_version CHANGE COLUMN 2016_08_14_00 2016_08_14_01 bit;
+
+DELETE FROM `creature_template` WHERE `entry` IN (11082,14646,28167,28169,28340,28341,28409,28439,28509,28656,29865,29866,29868,30996,31006,31126,31127);
+INSERT INTO `creature_template` VALUES
+(11082, 0, 0, 0, 0, 0, 10547, 0, 0, 0, 'Stratholme Courier', NULL, NULL, 0, 57, 57, 0, 21, 0, 1, 1.14286, 1, 1, 98, 130, 0, 238, 3.5, 2000, 1301, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 68, 99, 24, 6, 0, 11082, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 604, 794, 'SmartAI', 1, 3, 1, 4.5, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8388624, 0, '', 12340),
+(14646, 0, 0, 0, 0, 0, 11686, 0, 0, 0, 'Stratholme Trigger', NULL, NULL, 0, 1, 1, 0, 114, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 3.5, 2000, 2200, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 100, 10, 0, 0, 0, 100008, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'NullCreatureAI', 0, 4, 1, 1.35, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(28167, 0, 0, 0, 0, 0, 25168, 25169, 25311, 25312, 'Stratholme Citizen', '', '', 0, 77, 79, 0, 190, 0, 1, 1.14286, 1, 0, 404, 564, 0, 582, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(28169, 0, 0, 0, 0, 0, 25171, 25172, 25313, 25314, 'Stratholme Resident', '', '', 0, 78, 79, 0, 190, 0, 1, 1.14286, 1, 0, 404, 564, 0, 582, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(28340, 0, 0, 0, 0, 0, 25168, 25169, 0, 0, 'Stratholme Citizen', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 28340, 0, 70210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28341, 0, 0, 0, 0, 0, 25313, 25314, 0, 0, 'Stratholme Resident', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 417, 582, 0, 608, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 341, 506, 80, 7, 0, 28341, 0, 70210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28409, 0, 0, 0, 0, 0, 25392, 0, 0, 0, 'Time Rift (CoT Stratholme)', '', '', 0, 70, 70, 2, 35, 0, 1, 0.992063, 1, 0, 252, 357, 0, 304, 1, 2000, 2000, 1, 33554688, 2048, 0, 0, 0, 0, 0, 0, 215, 320, 44, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28439, 0, 0, 0, 0, 0, 25441, 0, 0, 0, 'Time Rift (CoT Stratholme, Large)', '', '', 0, 70, 70, 2, 35, 0, 1, 0.992063, 1, 0, 252, 357, 0, 304, 1, 2000, 2000, 1, 33554688, 2048, 0, 0, 0, 0, 0, 0, 215, 320, 44, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28509, 0, 0, 0, 0, 0, 1126, 24719, 0, 0, 'Building (CoT Stratholme)', '', '', 0, 80, 80, 2, 1814, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(28656, 0, 0, 0, 0, 0, 24868, 0, 0, 0, 'Hourglass (CoT Stratholme)', '', '', 0, 80, 80, 2, 35, 0, 1, 1, 1, 0, 422, 586, 0, 642, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 345, 509, 103, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(29865, 0, 0, 0, 0, 0, 26598, 26599, 26600, 26601, 'Stratholme Citizen Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(29866, 0, 0, 0, 0, 0, 26602, 26603, 26604, 26605, 'Stratholme Resident Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(29868, 0, 0, 0, 0, 0, 262, 338, 344, 11873, 'Stratholme Child Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(30996, 0, 0, 0, 0, 0, 16480, 19595, 0, 0, 'CoT Stratholme - Crates KC Bunny', '', '', 0, 60, 60, 1, 35, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 4, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(31006, 0, 0, 0, 0, 0, 16480, 19595, 0, 0, 'CoT Stratholme - Mal\'Ganis KC Bunny', '', '', 0, 60, 60, 1, 35, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(31126, 0, 0, 0, 0, 0, 25168, 25169, 0, 0, 'Agitated Stratholme Citizen', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(31127, 0, 0, 0, 0, 0, 25313, 25314, 0, 0, 'Agitated Stratholme Resident', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340);
+
+DELETE FROM `script_waypoint` WHERE `entry` = 26499;
+INSERT INTO `script_waypoint` VALUES
+(26499, 0, 1903.17, 1291.57, 143.32, 0, 'culling Bridge WP1'),
+(26499, 1, 1911.09, 1314.26, 150.026, 0, 'culling Bridge WP2'),
+(26499, 2, 1902.96, 1295.13, 143.388, 0, 'culling Bridge WP3'),
+(26499, 3, 1913.73, 1287.41, 141.927, 10000, 'culling Bridge WP4'),
+(26499, 4, 1990.83, 1293.39, 145.467, 0, 'culling Bridge WP5'),
+(26499, 5, 1997, 1317.78, 142.963, 0, 'culling Bridge WP6'),
+(26499, 6, 2019.63, 1326.08, 142.929, 0, 'culling Bridge WP7'),
+(26499, 7, 2026.47, 1287.09, 143.596, 0, 'culling Bridge WP8'),
+(26499, 8, 2050.66, 1287.33, 142.671, 0, 'culling Bridge WP9'),
+(26499, 9, 2081.45, 1287.77, 141.324, 0, 'culling Streets WP1'),
+(26499, 10, 2087.69, 1280.34, 140.73, 1000, 'culling Streets WP2'),
+(26499, 11, 2092.15, 1276.65, 140.52, 0, 'culling Streets WP3'),
+(26499, 12, 2099.88, 1280.21, 138.55, 0, 'culling Streets WP4'),
+(26499, 13, 2120.76, 1286.97, 136.343, 0, 'culling Streets WP5'),
+(26499, 14, 2165.07, 1279.34, 133.4, 0, 'culling Streets WP6'),
+(26499, 15, 2186.44, 1234.44, 136.524, 0, 'culling Streets WP7'),
+(26499, 16, 2210.39, 1207.55, 136.259, 0, 'culling Streets WP8'),
+(26499, 17, 2243.59, 1177.7, 137.144, 0, 'culling Streets WP9'),
+(26499, 18, 2286.88, 1177.26, 137.631, 0, 'culling Streets WP10'),
+(26499, 19, 2320.37, 1179.95, 133.926, 0, 'culling Streets WP11'),
+(26499, 20, 2365.63, 1194.84, 131.974, 0, 'culling Streets WP12'),
+(26499, 21, 2366.56, 1197.76, 134.382, 0, 'culling House WP1'),
+(26499, 22, 2394.01, 1205.15, 134.125, 0, 'culling House WP2'),
+(26499, 23, 2395.85, 1206.34, 134.039, 0, 'culling House WP3'),
+(26499, 24, 2442.02, 1219.2, 133.999, 0, 'culling House WP3'),
+(26499, 25, 2447.1, 1191.18, 148.076, 0, 'culling House WP4'),
+(26499, 26, 2449.32, 1191.09, 148.076, 0, 'culling House WP5'),
+(26499, 27, 2418.49, 1196.06, 148.076, 0, 'culling House WP6'),
+(26499, 28, 2401.22, 1191.7, 148.076, 0, 'culling House WP7'),
+(26499, 29, 2409.21, 1157.43, 148.19, 0, 'culling House WP8'),
+(26499, 30, 2417.58, 1121.03, 148.082, 0, 'culling House WP9'),
+(26499, 31, 2423.12, 1119.43, 148.076, 0, 'culling House WP10'),
+(26499, 32, 2447.83, 1112.71, 148.076, 0, 'culling House WP11'),
+(26499, 33, 2457.13, 1120.94, 150.008, 0, 'culling House WP12'),
+(26499, 34, 2459.69, 1127.01, 150.008, 0, 'culling House WP13'),
+(26499, 35, 2469.62, 1122.27, 150.008, 0, 'culling House WP14'),
+(26499, 36, 2470.44, 1122.79, 150.008, 3000, 'culling House WP15'),
+(26499, 37, 2471.66, 1123.08, 150.035, 3000, 'culling House WP16'),
+(26499, 38, 2483.18, 1125.04, 149.905, 0, 'culling Secret WP1'),
+(26499, 39, 2487.87, 1099.76, 144.858, 0, 'culling Secret WP2'),
+(26499, 40, 2498.27, 1101.93, 144.599, 0, 'culling Secret WP3'),
+(26499, 41, 2492.11, 1128.24, 139.967, 0, 'culling Secret WP4'),
+(26499, 42, 2500.29, 1130.18, 139.982, 0, 'culling Room WP1'),
+(26499, 43, 2503.01, 1119.24, 139.978, 0, 'culling Room WP2'),
+(26499, 44, 2517.82, 1122.65, 132.066, 0, 'culling Room WP3'),
+(26499, 45, 2540.48, 1129.06, 130.868, 7000, 'culling Fire Street WP1'),
+(26499, 46, 2568.62, 1157.79, 126.906, 0, 'culling Fire Street WP2'),
+(26499, 47, 2556.07, 1222.06, 125.412, 20000, 'culling Fire Street WP3'),
+(26499, 48, 2521.53, 1295.21, 130.573, 0, 'culling Fire Street WP4'),
+(26499, 49, 2504.36, 1348.67, 132.944, 0, 'culling Fire Street WP5'),
+(26499, 50, 2450.59, 1431.54, 131.361, 0, 'culling Fire Street WP6'),
+(26499, 51, 2353.49, 1404.84, 128.531, 0, 'culling Market WP1'),
+(26499, 52, 2329.88, 1406.27, 128.013, 0, 'culling Market WP2'),
+(26499, 53, 2329.88, 1406.27, 128.013, 12000, 'culling Market WP3'),
+(26499, 54, 2327.39, 1412.47, 127.692, 0, 'culling Market WP4'),
+(26499, 55, 2303.02, 1480.07, 128.139, 0, 'culling Crusader WP1'),
+(26499, 56, 2296.67, 1502.36, 128.362, 0, 'culling Crusader WP2');
diff --git a/data/sql/updates/pending_db_world/rev_1473152344430838100.sql b/data/sql/updates/pending_db_world/rev_1473152344430838100.sql new file mode 100644 index 0000000000..fe273cb57f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1473152344430838100.sql @@ -0,0 +1,28 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1473152344430838100'); + +/* +I take no credit for this fix im just doing the PR to close the issue. +Winterfin oricle will now cast lightning bolt. +the real credit goes to Chrisjiajun, this works + +Closes issue #119 + + */ + +DELETE FROM smart_scripts WHERE entryorguid=25216; +INSERT INTO smart_scripts (entryorguid, source_type, id, link, event_type, event_phase_mask, event_chance, event_flags, event_param1, event_param2, event_param3, event_param4, action_type, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, target_type, target_param1, target_param2, target_param3, target_x, target_y, target_z, target_o, comment) VALUES +(25216, 0, 0, 0, 4, 0, 100, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 1 on Aggro'), +(25216, 0, 1, 0, 4, 1, 100, 1, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving on Aggro'), +(25216, 0, 2, 0, 4, 1, 100, 1, 0, 0, 0, 0, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cast bolt on Aggro'), +(25216, 0, 3, 0, 9, 1, 100, 0, 0, 40, 3400, 4700, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cast bolt'), +(25216, 0, 4, 0, 9, 1, 100, 0, 40, 100, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Start Moving when not in bolt Range'), +(25216, 0, 5, 0, 9, 1, 100, 0, 10, 15, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving at 15 Yards'), +(25216, 0, 6, 0, 9, 1, 100, 0, 0, 40, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving when in bolt Range'), +(25216, 0, 7, 0, 3, 1, 100, 0, 0, 15, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 2 at 15% Mana'), +(25216, 0, 8, 0, 3, 2, 100, 0, 0, 15, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Start Moving at 15% Mana'), +(25216, 0, 9, 0, 3, 2, 100, 0, 30, 100, 100, 100, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 1 When Mana is above 30%'), +(25216, 0, 10, 0, 2, 2, 100, 1, 0, 15, 0, 0, 22, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 3 at 15% HP'), +(25216, 0, 11, 0, 2, 3, 100, 1, 0, 15, 0, 0, 25, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Flee at 15% HP'), +(25216, 0, 12, 0, 7, 3, 100, 1, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reset on Evade'), +(25216, 0, 13, 0, 2, 3, 100, 1, 0, 15, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Say Text at 15% HP'), +(25216, 0, 14, 0, 9, 1, 100, 0, 0, 5, 12300, 19800, 11, 50272, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cast Unstable Magic on Close');
\ No newline at end of file diff --git a/data/sql/updates/pending_db_world/rev_1473583129228647885.sql b/data/sql/updates/pending_db_world/rev_1473583129228647885.sql new file mode 100644 index 0000000000..45a25f2166 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1473583129228647885.sql @@ -0,0 +1,178 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1473583129228647885'); + +-- areatrigger_teleport +ALTER TABLE `areatrigger_teleport` +CHANGE `id` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `name` `Name` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL; + +-- battleground_template +ALTER TABLE `battleground_template` +CHANGE `id` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'; + +-- creature_equip_template +ALTER TABLE `creature_equip_template` +CHANGE `entry` `CreatureID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `id` `ID` TINYINT(3) UNSIGNED NOT NULL DEFAULT '1', +CHANGE `itemEntry1` `ItemID1` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `itemEntry2` `ItemID2` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `itemEntry3` `ItemID3` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'; + +-- creature_formations +ALTER TABLE `creature_formations` +CHANGE `leaderGUID` `leaderGUID` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `memberGUID` `memberGUID` INT(10) UNSIGNED NOT NULL DEFAULT '0'; + +-- creature_model_info +ALTER TABLE `creature_model_info` +CHANGE `modelid` `DisplayID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `bounding_radius` `BoundingRadius` FLOAT NOT NULL DEFAULT '0', +CHANGE `combat_reach` `CombatReach` FLOAT NOT NULL DEFAULT '0', +CHANGE `gender` `Gender` TINYINT(3) UNSIGNED NOT NULL DEFAULT '2', +CHANGE `modelid_other_gender` `DisplayID_Other_Gender` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'; + +-- gameobject_template +ALTER TABLE `gameobject_template` +CHANGE `data0` `Data0` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data1` `Data1` INT(11) NOT NULL DEFAULT '0', +CHANGE `data2` `Data2` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data3` `Data3` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data4` `Data4` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data5` `Data5` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data6` `Data6` INT(11) NOT NULL DEFAULT '0', +CHANGE `data7` `Data7` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data8` `Data8` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data9` `Data9` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data10` `Data10` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data11` `Data11` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data12` `Data12` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data13` `Data13` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data14` `Data14` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data15` `Data15` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data16` `Data16` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data17` `Data17` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data18` `Data18` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data19` `Data19` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data20` `Data20` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data21` `Data21` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data22` `Data22` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data23` `Data23` INT(10) UNSIGNED NOT NULL DEFAULT '0'; + +-- lfg_entrances -> lfg_dungeon_template +RENAME TABLE `lfg_entrances` TO `lfg_dungeon_template`; + +-- npc_text +ALTER TABLE `npc_text` +CHANGE `prob0` `Probability0` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob1` `Probability1` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob2` `Probability2` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob3` `Probability3` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob4` `Probability4` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob5` `Probability5` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob6` `Probability6` FLOAT NOT NULL DEFAULT '0', +CHANGE `prob7` `Probability7` FLOAT NOT NULL DEFAULT '0'; + +-- npc_trainer +ALTER TABLE `npc_trainer` +CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `spell` `SpellID` MEDIUMINT(8) NOT NULL DEFAULT '0', +CHANGE `spellcost` `MoneyCost` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `reqskill` `ReqSkillLine` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `reqskillvalue` `ReqSkillRank` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `reqlevel` `ReqLevel` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0'; + +-- page_text +ALTER TABLE `page_text` +CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `text` `Text` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, +CHANGE `next_page` `NextPageID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `VerifiedBuild` `VerifiedBuild` SMALLINT(5) NULL DEFAULT '0'; + +-- player_xp_for_level +ALTER TABLE `player_xp_for_level` +CHANGE `lvl` `Level` TINYINT(3) UNSIGNED NOT NULL, +CHANGE `xp_for_next_level` `Experience` INT(10) UNSIGNED NOT NULL; + +-- points_of_interest +ALTER TABLE `points_of_interest` +CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `x` `PositionX` FLOAT NOT NULL DEFAULT '0', +CHANGE `y` `PositionY` FLOAT NOT NULL DEFAULT '0', +CHANGE `icon` `Icon` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `flags` `Flags` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `data` `Data` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `icon_name` `Name` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; + +-- quest_poi +ALTER TABLE `quest_poi` +CHANGE `questId` `QuestID` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `objIndex` `ObjectiveIndex` INT(11) NOT NULL DEFAULT '0', +CHANGE `mapid` `MapID` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `FloorId` `Floor` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `unk3` `Priority` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `unk4` `Flags` INT(10) UNSIGNED NOT NULL DEFAULT '0'; + +-- quest_poi_points +ALTER TABLE `quest_poi_points` +CHANGE `questId` `QuestID` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `id` `Idx1` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `idx` `Idx2` INT(10) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `x` `X` INT(11) NOT NULL DEFAULT '0', +CHANGE `y` `Y` INT(11) NOT NULL DEFAULT '0'; + +-- quest_template +ALTER TABLE `quest_template` +CHANGE `Id` `ID` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `Level` `QuestLevel` smallint(3) NOT NULL DEFAULT '1', +CHANGE `ZoneOrSort` `QuestSortID` smallint(6) NOT NULL DEFAULT '0', +CHANGE `Type` `QuestType` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `SuggestedPlayers` `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardTitleId` `RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemId1` `RewardItem1` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemId2` `RewardItem2` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemId3` `RewardItem3` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemId4` `RewardItem4` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemCount1` `RewardAmount1` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemCount2` `RewardAmount2` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemCount3` `RewardAmount3` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardItemCount4` `RewardAmount4` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId1` `RewardChoiceItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId2` `RewardChoiceItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId3` `RewardChoiceItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId4` `RewardChoiceItemID4` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId5` `RewardChoiceItemID5` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemId6` `RewardChoiceItemID6` mediumint(8) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount1` `RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount2` `RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount3` `RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount4` `RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount5` `RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardChoiceItemCount6` `RewardChoiceItemQuantity6` smallint(5) unsigned NOT NULL DEFAULT '0', +CHANGE `RewardFactionId1` `RewardFactionID1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', +CHANGE `RewardFactionId2` `RewardFactionID2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', +CHANGE `RewardFactionId3` `RewardFactionID3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', +CHANGE `RewardFactionId4` `RewardFactionID4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', +CHANGE `RewardFactionId5` `RewardFactionID5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', +CHANGE `RewardFactionValueId1` `RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueId2` `RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueId3` `RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueId4` `RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueId5` `RewardFactionValue5` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueIdOverride1` `RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueIdOverride2` `RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueIdOverride3` `RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueIdOverride4` `RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `RewardFactionValueIdOverride5` `RewardFactionOverride5` mediumint(8) NOT NULL DEFAULT '0', +CHANGE `Title` `LogTitle` text, +CHANGE `Objectives` `LogDescription` text, +CHANGE `Details` `QuestDescription` text, +CHANGE `CompletedText` `QuestCompletionLog` text; + +-- spell_target_position +ALTER TABLE `spell_target_position` +CHANGE `id` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Identifier', +CHANGE `effIndex` `EffectIndex` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `target_map` `MapID` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0', +CHANGE `target_position_x` `PositionX` FLOAT NOT NULL DEFAULT '0', +CHANGE `target_position_y` `PositionY` FLOAT NOT NULL DEFAULT '0', +CHANGE `target_position_z` `PositionZ` FLOAT NOT NULL DEFAULT '0', +CHANGE `target_orientation` `Orientation` FLOAT NOT NULL DEFAULT '0'; diff --git a/data/sql/updates/pending_db_world/rev_1474716815295101300.sql b/data/sql/updates/pending_db_world/rev_1474716815295101300.sql new file mode 100644 index 0000000000..ac74a49bb2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1474716815295101300.sql @@ -0,0 +1,51 @@ +INSERT INTO version_db_world(`sql_rev`) VALUES ('1474716815295101300'); + +DELETE FROM waypoints WHERE entry = 33519; + +UPDATE smart_scripts SET event_param1=44 WHERE entryorguid=33519 AND source_type=0 AND id=2; + +INSERT INTO waypoints (entry, pointid, position_x, position_y, position_z, point_comment) VALUES +(33519, 1, 8526.23, 567.717, 552.608, 'Black Knight Gryphon WP1'), +(33519, 2, 8529.65, 561.457, 553.146, 'Black Knight Gryphon WP2'), +(33519, 3, 8560.83, 564.063, 560.969, 'Black Knight Gryphon WP3'), +(33519, 4, 8618.12, 597.455, 555.925, 'Black Knight Gryphon WP4'), +(33519, 5, 8656.04, 624.922, 552.328, 'Black Knight Gryphon WP5'), +(33519, 6, 8680.42, 660.062, 549.031, 'Black Knight Gryphon WP6'), +(33519, 7, 8698.54, 705.598, 548.933, 'Black Knight Gryphon WP7'), +(33519, 8, 8715.51, 748.276, 549.854, 'Black Knight Gryphon WP8'), +(33519, 9, 8740.09, 810.067, 549.854, 'Black Knight Gryphon WP9'), +(33519, 10, 8764.67, 871.858, 549.854, 'Black Knight Gryphon WP10'), +(33519, 11, 8796.18, 959.072, 518.157, 'Black Knight Gryphon WP11'), +(33519, 12, 8815.05, 1018.42, 468.263, 'Black Knight Gryphon WP12'), +(33519, 13, 8833.93, 1077.77, 418.369, 'Black Knight Gryphon WP13'), +(33519, 14, 8843.37, 1107.45, 393.422, 'Black Knight Gryphon WP14'), +(33519, 15, 8852.8, 1137.12, 368.474, 'Black Knight Gryphon WP15'), +(33519, 16, 8887.41, 1245.93, 277.002, 'Black Knight Gryphon WP16'), +(33519, 17, 8899.99, 1285.49, 243.739, 'Black Knight Gryphon WP17'), +(33519, 18, 8917.19, 1344.25, 206.989, 'Black Knight Gryphon WP18'), +(33519, 19, 8935.65, 1428.33, 171.939, 'Black Knight Gryphon WP19'), +(33519, 20, 8952.14, 1502.28, 152.627, 'Black Knight Gryphon WP20'), +(33519, 21, 8977.58, 1604.01, 134.608, 'Black Knight Gryphon WP21'), +(33519, 22, 8999.84, 1693.02, 118.842, 'Black Knight Gryphon WP22'), +(33519, 23, 9009.38, 1731.17, 112.085, 'Black Knight Gryphon WP23'), +(33519, 24, 9016.45, 1757.73, 107.355, 'Black Knight Gryphon WP24'), +(33519, 25, 9042.43, 1803.28, 98.3457, 'Black Knight Gryphon WP25'), +(33519, 26, 9068.41, 1848.82, 89.3364, 'Black Knight Gryphon WP26'), +(33519, 27, 9095.58, 1894.97, 73.9581, 'Black Knight Gryphon WP27'), +(33519, 28, 9113.08, 1951.09, 61.4356, 'Black Knight Gryphon WP28'), +(33519, 29, 9120.62, 1988.22, 68.3712, 'Black Knight Gryphon WP29'), +(33519, 30, 9126.46, 2030.88, 76.7076, 'Black Knight Gryphon WP30'), +(33519, 31, 9125.28, 2059.72, 71.875, 'Black Knight Gryphon WP31'), +(33519, 32, 9123.38, 2100.16, 76.8306, 'Black Knight Gryphon WP32'), +(33519, 33, 9121.33, 2132.18, 70.2638, 'Black Knight Gryphon WP33'), +(33519, 34, 9095.69, 2181.88, 58.6374, 'Black Knight Gryphon WP34'), +(33519, 35, 9076.85, 2189.14, 54.3544, 'Black Knight Gryphon WP35'), +(33519, 36, 9036.74, 2180.53, 57.0958, 'Black Knight Gryphon WP36'), +(33519, 37, 9031.46, 2161.92, 58.3603, 'Black Knight Gryphon WP37'), +(33519, 38, 9043.38, 2134.61, 60.2847, 'Black Knight Gryphon WP38'), +(33519, 39, 9058.39, 2101.61, 62.2349, 'Black Knight Gryphon WP39'), +(33519, 40, 9061.58, 2094.73, 64.1907, 'Black Knight Gryphon WP40'), +(33519, 41, 9061.58, 2094.73, 64.1907, 'Black Knight Gryphon WP41'), +(33519, 42, 9066.5, 2084.15, 66.2016, 'Black Knight Gryphon WP42'), +(33519, 43, 9068.36, 2080.14, 66.9176, 'Black Knight Gryphon WP43'), +(33519, 44, 9069.15, 2078.45, 66.99, 'Black Knight Gryphon WP44'); diff --git a/install.sh b/install.sh index a5ab4396d0..3f06dfa0a4 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PATH_MODULES="$CUR_PATH/modules/" diff --git a/modules/acore/startup-scripts/conf.sh.dist b/modules/acore/startup-scripts/conf.sh.dist new file mode 100644 index 0000000000..fbf31e3cab --- /dev/null +++ b/modules/acore/startup-scripts/conf.sh.dist @@ -0,0 +1,36 @@ +# enable/disable GDB execution +export GDB_ENABLED=0 + +# gdb file +export GDB="" + +# directory where binary are stored +export BINPATH="" + + ### Put here the pid you configured on your worldserver.conf file ### +export SERVERPID="" + +# path to conf file +export CONFIG="" + +# path of log files +export LOGS_PATH=""; + +# exec name +export SERVERBIN="" + +# prefix name for log files +export LOG_PREFIX_NAME="" + +# name of screen service ( for restarter ) +# if no specified, screen util won't be used +export SCREEN_NAME="" + +# overwrite default screen options: -A -m -d -S +export SCREEN_OPTIONS="" + +# enable it to show the output +# within console +export WITH_CONSOLE=0 + + diff --git a/modules/acore/startup-scripts/examples/restarter-auth.sh b/modules/acore/startup-scripts/examples/restarter-auth.sh new file mode 100644 index 0000000000..579c8c5b8e --- /dev/null +++ b/modules/acore/startup-scripts/examples/restarter-auth.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +$PATH_RUNENGINE="" + +source $PATH_RUNENGINE/run-engine + +# you must create your conf +# copying conf.sh.dist +# and renaming as below +source ./conf-auth.sh + +restarter + + diff --git a/modules/acore/startup-scripts/examples/restarter-world.sh b/modules/acore/startup-scripts/examples/restarter-world.sh new file mode 100644 index 0000000000..036248a99f --- /dev/null +++ b/modules/acore/startup-scripts/examples/restarter-world.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +$PATH_RUNENGINE="" + +source $PATH_RUNENGINE/run-engine + +# you must create your conf +# copying conf.sh.dist +# and renaming as below +source ./conf-world.sh + +restarter + + diff --git a/modules/acore/startup-scripts/examples/starter-auth.sh b/modules/acore/startup-scripts/examples/starter-auth.sh new file mode 100644 index 0000000000..a6947a39fd --- /dev/null +++ b/modules/acore/startup-scripts/examples/starter-auth.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +$PATH_RUNENGINE="" + +source $PATH_RUNENGINE/run-engine + +# you must create your conf +# copying conf.sh.dist +# and renaming as below +source ./conf-auth.sh + +starter + + diff --git a/modules/acore/startup-scripts/examples/starter-world.sh b/modules/acore/startup-scripts/examples/starter-world.sh new file mode 100644 index 0000000000..380a57c8e9 --- /dev/null +++ b/modules/acore/startup-scripts/examples/starter-world.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +$PATH_RUNENGINE="" + +source $PATH_RUNENGINE/run-engine + +# you must create your conf +# copying conf.sh.dist +# and renaming as below +source ./conf-world.sh + +starter + + diff --git a/modules/acore/startup-scripts/run-engine b/modules/acore/startup-scripts/run-engine new file mode 100644 index 0000000000..7cecaeb134 --- /dev/null +++ b/modules/acore/startup-scripts/run-engine @@ -0,0 +1,102 @@ +export RUN_ENGINE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# load default conf +if [ -e "$RUN_ENGINE_PATH/conf.dist" ]; then + source "$RUN_ENGINE_PATH/conf.sh.dist" +fi + +function configureFiles() { + TRACE_BEGIN_STRING="SIGSEGV" + TRACE_FILE="$LOGS_PATH/"$LOG_PREFIX_NAME"_trace.log" + ERR_FILE="$LOGS_PATH/"$LOG_PREFIX_NAME"_error.log" + SYSLOG="$LOGS_PATH/"$LOG_PREFIX_NAME"_system.log" + SYSERR="$LOGS_PATH/"$LOG_PREFIX_NAME"_system.err" + LINKS_FILE="$LOGS_PATH/"$LOG_PREFIX_NAME"_crash_links.link" +} + +function checkStatus() { + local ret=1 + # wipe do : destroy old screens + ls + screen -wipe + if screen -ls $1 | grep -q "No Sockets found" + then + return 0 + fi + + local gdbres=$(pgrep -f "gdb -x $GDB --batch $SERVERBIN") + if [[ $GDB_ENABLED -eq 0 && -z $gdbres ]]; then + return 0 + fi + + # + # This is a specific check for Azeroth Core in case of screen failure + # It is possible since same binary file cannot be launched with same configuration file + # This is an extra check + # + local binres=$(pgrep -f "$SERVERBIN -c $CONFIG") + if [ -z $binres ]; then + return 0 + fi + + return 1 +} + +function run() { + echo $1 + if [ ! -z $1 ]; then + local OPTIONS="-A -m -d -S" + if [ ! -z "$SCREEN_OPTIONS" ]; then + OPTIONS=$SCREEN_OPTIONS + fi + + echo "> Starting with screen ( screen $OPTIONS )" + + screen $OPTIONS $1 "$RUN_ENGINE_PATH/starter" $2 $3 "$4" "$5" "$6" $7 + else + $RUN_ENGINE_PATH/starter $2 $3 "$4" "$5" "$6" $7 + fi +} + +function starter() { + cd $BINPATH + + mkdir -p "$LOGS_PATH" + + configureFiles + + run "$SCREEN_NAME" "$SERVERBIN" "$GDB" "$CONFIG" "$SYSLOG" "$SYSERR" "$GDB_ENABLED" +} + + +function restarter() { + cd $BINPATH + + mkdir -p "$LOGS_PATH" + + configureFiles + + if [ ! -f $TRACE_FILE ]; then + touch $TRACE_FILE + fi + + while : + do + if checkStatus $SCREEN_NAME; then + DATE=$(date) + echo "Restarting $SCREEN_NAME Core blizz($DATE)" + if [ $GDB_ENABLED -eq 1 ]; then + echo "GDB enabled" + grep -B 10 -A 1800 "$TRACE_BEGIN_STRING" "$SYSLOG" >> "$TRACE_FILE" + cat "$SYSERR" > "$ERR_FILE" + run "$SCREEN_NAME" "$SERVERBIN" "$GDB" "$CONFIG" "$SYSLOG" "$SYSERR" 1 + fi + + if [ $GDB_ENABLED -eq 0 ]; then + echo "GDB disabled" + run "$SCREEN_NAME" "$SERVERBIN" null "$CONFIG" null null 0 + fi + fi + + sleep 10 + done +} diff --git a/bin/runners/starter b/modules/acore/startup-scripts/starter index 675bb13fb8..2f98ea40f9 100755 --- a/bin/runners/starter +++ b/modules/acore/startup-scripts/starter @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash GDB_FILE="$2" CONFIG="$3" @@ -15,7 +15,13 @@ if [ $GBD_ENABLED -eq 1 ]; then [ ! -f "$SYSLOG" ] && touch "$SYSLOG" [ ! -f "$SYSERR" ] && touch "$SYSERR" - gdb -x $GDB_FILE --batch $1 >> "$SYSLOG" 2>> "$SYSERR" + if [ $WITH_CONSOLE -eq 0 ]; then + gdb -x $GDB_FILE --batch $1 >> "$SYSLOG" 2>> "$SYSERR" + else + echo "> Console enabled" + gdb -x $GDB_FILE --batch $1 > >(tee ${SYSLOG}) 2> >(tee ${SYSERR} >&2) + fi + elif [ $GBD_ENABLED -eq 0 ]; then "./$1" -c "$CONFIG" fi diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h b/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h index 95f83e3a3f..87957b206a 100644 --- a/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h +++ b/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h @@ -465,6 +465,11 @@ class DatabaseWorkerPool Enqueue(new PingOperation); } + char const* GetDatabaseName() const + { + return _connectionInfo.database.c_str(); + } + private: unsigned long EscapeString(char *to, const char *from, unsigned long length) { @@ -498,11 +503,6 @@ class DatabaseWorkerPool return t; } - char const* GetDatabaseName() const - { - return _connectionInfo.database.c_str(); - } - private: enum _internalIndex { diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp index 7d61d96fee..a656b66884 100644 --- a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp +++ b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp @@ -16,6 +16,8 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_INS_QUEST_POOL_SAVE, "INSERT INTO pool_quest_save (pool_id, quest_id) VALUES (?, ?)", CONNECTION_ASYNC); PrepareStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEM, "DELETE FROM guild_bank_item WHERE guildid = ? AND TabId = ? AND SlotId = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_DEL_EXPIRED_BANS, "UPDATE character_banned SET active = 0 WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate <> bandate", CONNECTION_ASYNC); + PrepareStatement(CHAR_SEL_DATA_BY_NAME, "SELECT guid, account, name, gender, race, class, level FROM characters WHERE deleteDate IS NULL AND name = ?", CONNECTION_BOTH); + PrepareStatement(CHAR_SEL_DATA_BY_GUID, "SELECT guid, account, name, gender, race, class, level FROM characters WHERE deleteDate IS NULL AND guid = ?", CONNECTION_BOTH); PrepareStatement(CHAR_SEL_CHECK_NAME, "SELECT 1 FROM characters WHERE name = ?", CONNECTION_BOTH); PrepareStatement(CHAR_SEL_CHECK_GUID, "SELECT 1 FROM characters WHERE guid = ?", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_BOTH); diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h index 8f0243665a..7ec0d094a8 100644 --- a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h +++ b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h @@ -36,6 +36,8 @@ enum CharacterDatabaseStatements CHAR_INS_QUEST_POOL_SAVE, CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEM, CHAR_DEL_EXPIRED_BANS, + CHAR_SEL_DATA_BY_NAME, + CHAR_SEL_DATA_BY_GUID, CHAR_SEL_CHECK_NAME, CHAR_SEL_CHECK_GUID, CHAR_SEL_SUM_CHARS, diff --git a/modules/worldengine/nucleus/src/Debugging/Errors.h b/modules/worldengine/nucleus/src/Debugging/Errors.h index 11aeebfece..81dc27c241 100644 --- a/modules/worldengine/nucleus/src/Debugging/Errors.h +++ b/modules/worldengine/nucleus/src/Debugging/Errors.h @@ -29,4 +29,10 @@ namespace Trinity #define ASSERT WPAssert +template <typename T> inline T* ASSERT_NOTNULL(T* pointer) +{ + ASSERT(pointer); + return pointer; +} + #endif diff --git a/modules/worldengine/nucleus/src/Logging/Log.cpp b/modules/worldengine/nucleus/src/Logging/Log.cpp index 1d8067f495..41d41b5dc5 100644 --- a/modules/worldengine/nucleus/src/Logging/Log.cpp +++ b/modules/worldengine/nucleus/src/Logging/Log.cpp @@ -342,12 +342,14 @@ std::string Log::GetTimestampStr() void Log::outDB(LogTypes type, const char * str) { - if (!str || type >= MAX_LOG_TYPES) - return; - - std::string logStr(str); - if (logStr.empty()) + if(!str || std::string(str).empty() || type >= MAX_LOG_TYPES) return; + + std::string new_str(str); + LoginDatabase.EscapeString(new_str); + + LoginDatabase.PExecute("INSERT INTO logs (time, realm, type, string) " + "VALUES (" UI64FMTD ", %u, %u, '%s');", uint64(time(0)), realm, (uint32)type, new_str.c_str()); } void Log::outString(const char * str, ...) diff --git a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake index 96aaa54fd4..2b8e6cbdd2 100644 --- a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake +++ b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake @@ -16,5 +16,5 @@ endif() # -Wno-narrowing needed to suppress a warning in g3d # -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems. -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion -Wparentheses") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses -Wreorder -Wlogical-op-parentheses") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1") diff --git a/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake b/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake index 4f86580e95..319164f76e 100644 --- a/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake +++ b/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake @@ -1,5 +1,5 @@ # Platform-specfic options -option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1) +option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0) # Package overloads set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite) diff --git a/src/authserver/Main.cpp b/src/authserver/Main.cpp index e52771f448..8594f301e1 100644 --- a/src/authserver/Main.cpp +++ b/src/authserver/Main.cpp @@ -242,21 +242,21 @@ extern int main(int argc, char** argv) CPU_SET(i, &mask); if (sched_setaffinity(0, sizeof(mask), &mask)) - sLog->outError("server.authserver", "Can't set used processors (hex): %x, error: %s", affinity, strerror(errno)); + sLog->outError("Can't set used processors (hex): %x, error: %s", affinity, strerror(errno)); else { CPU_ZERO(&mask); sched_getaffinity(0, sizeof(mask), &mask); - sLog->outString("server.authserver", "Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask)); + sLog->outString("Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask)); } } if (highPriority) { if (setpriority(PRIO_PROCESS, 0, PROCESS_HIGH_PRIORITY)) - sLog->outError("server.authserver", "Can't set authserver process priority class, error: %s", strerror(errno)); + sLog->outError("Can't set authserver process priority class, error: %s", strerror(errno)); else - sLog->outString("server.authserver", "authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0)); + sLog->outString("authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0)); } #endif diff --git a/src/game/ArenaSpectator/ArenaSpectator.h b/src/game/ArenaSpectator/ArenaSpectator.h index 6ba1d63ffd..d9c9dc6b47 100644 --- a/src/game/ArenaSpectator/ArenaSpectator.h +++ b/src/game/ArenaSpectator/ArenaSpectator.h @@ -205,12 +205,8 @@ namespace ArenaSpectator if (effMask & (1<<i)) { AuraType at = aura->GetEffect(i)->GetAuraType(); - if ((aura->GetEffect(i)->GetAmount() && (aura->GetSpellInfo()->IsPositive() || targetGUID != aura->GetCasterGUID())) || - at == SPELL_AURA_MECHANIC_IMMUNITY || - at == SPELL_AURA_EFFECT_IMMUNITY || - at == SPELL_AURA_STATE_IMMUNITY || - at == SPELL_AURA_SCHOOL_IMMUNITY || - at == SPELL_AURA_DISPEL_IMMUNITY) + if (aura->GetEffect(i)->GetAmount() && (aura->GetSpellInfo()->IsPositive() || targetGUID != aura->GetCasterGUID()) || + at == SPELL_AURA_MECHANIC_IMMUNITY || at == SPELL_AURA_EFFECT_IMMUNITY || at == SPELL_AURA_STATE_IMMUNITY || at == SPELL_AURA_SCHOOL_IMMUNITY || at == SPELL_AURA_DISPEL_IMMUNITY) return true; } } diff --git a/src/game/Battlegrounds/BattlegroundMgr.cpp b/src/game/Battlegrounds/BattlegroundMgr.cpp index f513cfd9ac..26928303d9 100644 --- a/src/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/game/Battlegrounds/BattlegroundMgr.cpp @@ -571,7 +571,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds() { uint32 oldMSTime = getMSTime(); // 0 1 2 3 4 5 6 7 8 9 10 11 - QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, StartMaxDist, Weight, ScriptName FROM battleground_template"); + QueryResult result = WorldDatabase.Query("SELECT ID, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, StartMaxDist, Weight, ScriptName FROM battleground_template"); if (!result) { diff --git a/src/game/Battlegrounds/BattlegroundQueue.cpp b/src/game/Battlegrounds/BattlegroundQueue.cpp index 3ec64eba97..8d85fc6713 100644 --- a/src/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/game/Battlegrounds/BattlegroundQueue.cpp @@ -378,8 +378,8 @@ void BattlegroundQueue::FillPlayersToBG(const int32 aliFree, const int32 hordeFr // quick check if nothing we can do: if (!sBattlegroundMgr->isTesting()) - if ((aliFree > hordeFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty()) || - (hordeFree > aliFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty())) + if (aliFree > hordeFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty() || + hordeFree > aliFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty()) return; // ally: at first fill as much as possible @@ -434,8 +434,8 @@ void BattlegroundQueue::FillPlayersToBGWithSpecific(const int32 aliFree, const i // quick check if nothing we can do: if (!sBattlegroundMgr->isTesting()) - if ((m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty()) || - (m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_HORDE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_HORDE].empty())) + if (m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() || + m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_HORDE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_HORDE].empty()) return; // copy groups from both queues to new joined container diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/game/Battlegrounds/Zones/BattlegroundAB.cpp index 779ead49ea..d58f6b5431 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundAB.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.h b/src/game/Battlegrounds/Zones/BattlegroundAB.h index 654937a721..203701247e 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/game/Battlegrounds/Zones/BattlegroundAB.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDAB_H diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/game/Battlegrounds/Zones/BattlegroundEY.cpp index 8aaf50ce9e..d37596cb3f 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundEY.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.h b/src/game/Battlegrounds/Zones/BattlegroundEY.h index a42c44bab8..97993e5572 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/game/Battlegrounds/Zones/BattlegroundEY.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDEY_H diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/game/Battlegrounds/Zones/BattlegroundRV.cpp index 90d64d80fb..590b45e705 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -47,8 +47,7 @@ void BattlegroundRV::CheckPositionForUnit(Unit* unit) { float groundZ_vmap = unit->GetMap()->GetHeight(unit->GetPositionX(), unit->GetPositionY(), 37.0f, true, 50.0f); float groundZ_dyntree = unit->GetMap()->GetDynamicMapTree().getHeight(unit->GetPositionX(), unit->GetPositionY(), 37.0f, 50.0f, unit->GetPhaseMask()); - if ((groundZ_vmap > 28.0f && groundZ_vmap < 29.0f) || - (groundZ_dyntree > 28.0f && groundZ_dyntree < 37.0f)) + if (groundZ_vmap > 28.0f && groundZ_vmap < 29.0f || groundZ_dyntree > 28.0f && groundZ_dyntree < 37.0f) { float groundZ = std::max<float>(groundZ_vmap, groundZ_dyntree); if (unit->GetPositionZ() < groundZ - 0.2f || unit->GetPositionZ() > groundZ + 3.5f) diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/game/Battlegrounds/Zones/BattlegroundWS.cpp index 96c344a1c6..d3d14a4a49 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundWS.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.h b/src/game/Battlegrounds/Zones/BattlegroundWS.h index a5aee6fbb6..6faed44f2c 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/game/Battlegrounds/Zones/BattlegroundWS.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDWS_H diff --git a/src/game/Chat/Channels/Channel.cpp b/src/game/Chat/Channels/Channel.cpp index 6cc674af5d..f7facedaf1 100644 --- a/src/game/Chat/Channels/Channel.cpp +++ b/src/game/Chat/Channels/Channel.cpp @@ -380,8 +380,7 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b return; } - if ((ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_BAN)) || - (!ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_KICK))) + if (ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_BAN) || !ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_KICK)) { WorldPacket data; MakeNotModerator(&data); @@ -649,8 +648,8 @@ void Channel::SetOwner(Player const* player, std::string const& newname) Player* newp = ObjectAccessor::FindPlayerByName(newname, false); uint64 victim = newp ? newp->GetGUID() : 0; - if (!victim || !IsOn(victim) || - (newp->GetTeamId() != player->GetTeamId() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))) + if (!victim || !IsOn(victim) || newp->GetTeamId() != player->GetTeamId() && + !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL)) { WorldPacket data; MakePlayerNotFound(&data, newname); diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp index 34946bc92e..553514df83 100644 --- a/src/game/Chat/Chat.cpp +++ b/src/game/Chat/Chat.cpp @@ -246,9 +246,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c for (uint32 i = 0; i < table.size(); ++i) { - if (table[i].Name == nullptr) - continue; - if (!hasStringAbbr(table[i].Name, cmd.c_str())) continue; @@ -257,9 +254,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c { for (uint32 j = 0; j < table.size(); ++j) { - if (table[j].Name == nullptr) - continue; - if (!hasStringAbbr(table[j].Name, cmd.c_str())) continue; @@ -355,7 +349,7 @@ bool ChatHandler::SetDataForCommandInTable(std::vector<ChatCommand>& table, char for (uint32 i = 0; i < table.size(); i++) { // for data fill use full explicit command names - if (table[i].Name == nullptr || table[i].Name != cmd) + if (table[i].Name != cmd) continue; // select subcommand from child commands list (including "") @@ -400,7 +394,7 @@ bool ChatHandler::ParseCommands(char const* text) ASSERT(text); ASSERT(*text); - std::string fullcmd; + std::string fullcmd = text; if (m_session && AccountMgr::IsPlayerAccount(m_session->GetSecurity()) && !sWorld->getBoolConfig(CONFIG_ALLOW_PLAYER_COMMANDS)) return false; diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h index d4f803ff93..dc0e6c65ca 100644 --- a/src/game/Chat/Chat.h +++ b/src/game/Chat/Chat.h @@ -28,7 +28,7 @@ class ChatCommand public: ChatCommand(char const* name, uint32 securityLevel, bool allowConsole, pHandler handler, std::string help, std::vector<ChatCommand> childCommands = std::vector<ChatCommand>()) - : Name(name), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { } + : Name(ASSERT_NOTNULL(name)), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { } char const* Name; uint32 SecurityLevel; diff --git a/src/game/DataStores/DBCStores.cpp b/src/game/DataStores/DBCStores.cpp index 9768c73ae4..ea99e4df4f 100644 --- a/src/game/DataStores/DBCStores.cpp +++ b/src/game/DataStores/DBCStores.cpp @@ -856,6 +856,11 @@ PvPDifficultyEntry const* GetBattlegroundBracketById(uint32 mapid, BattlegroundB return NULL; } +bool IsSharedDifficultyMap(uint32 mapid) +{ + return sWorld->getBoolConfig(CONFIG_INSTANCE_SHARED_ID) && (mapid == 631 || mapid == 724); +} + uint32 GetLiquidFlags(uint32 liquidType) { if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquidType)) diff --git a/src/game/DataStores/DBCStores.h b/src/game/DataStores/DBCStores.h index 8370d7d8f9..d69d2132b9 100644 --- a/src/game/DataStores/DBCStores.h +++ b/src/game/DataStores/DBCStores.h @@ -44,6 +44,8 @@ typedef std::map<uint32/*pair32(map, diff)*/, MapDifficulty> MapDifficultyMap; MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty); MapDifficulty const* GetDownscaledMapDifficultyData(uint32 mapId, Difficulty &difficulty); +bool IsSharedDifficultyMap(uint32 mapid); + uint32 GetLiquidFlags(uint32 liquidType); PvPDifficultyEntry const* GetBattlegroundBracketByLevel(uint32 mapid, uint32 level); diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/game/DungeonFinding/LFGMgr.cpp index 034fc91825..497eeeee7c 100644 --- a/src/game/DungeonFinding/LFGMgr.cpp +++ b/src/game/DungeonFinding/LFGMgr.cpp @@ -182,11 +182,12 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */) } // Fill teleport locations from DB - QueryResult result = WorldDatabase.Query("SELECT dungeonId, position_x, position_y, position_z, orientation FROM lfg_entrances"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT dungeonId, position_x, position_y, position_z, orientation FROM lfg_dungeon_template"); if (!result) { - sLog->outError(">> Loaded 0 lfg entrance positions. DB table `lfg_entrances` is empty!"); + sLog->outError(">> Loaded 0 lfg entrance positions. DB table `lfg_dungeon_template` is empty!"); return; } @@ -199,7 +200,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */) LFGDungeonContainer::iterator dungeonItr = LfgDungeonStore.find(dungeonId); if (dungeonItr == LfgDungeonStore.end()) { - sLog->outError("table `lfg_entrances` contains coordinates for wrong dungeon %u", dungeonId); + sLog->outError("table `lfg_dungeon_template` contains coordinates for wrong dungeon %u", dungeonId); continue; } diff --git a/src/game/Entities/GameObject/GameObject.cpp b/src/game/Entities/GameObject/GameObject.cpp index 6e9f293ffc..b6931c5f70 100644 --- a/src/game/Entities/GameObject/GameObject.cpp +++ b/src/game/Entities/GameObject/GameObject.cpp @@ -23,6 +23,7 @@ #include "UpdateFieldFlags.h" #include "World.h" #include "Transport.h" +#include "AccountMgr.h" GameObject::GameObject() : WorldObject(false), MovableMapObject(), m_model(NULL), m_goValue(), m_AI(NULL) @@ -2253,7 +2254,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t return; bool forcedFlags = GetGoType() == GAMEOBJECT_TYPE_CHEST && GetGOInfo()->chest.groupLootRules && HasLootRecipient(); - bool targetIsGM = target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER; + bool targetIsGM = target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity()); ByteBuffer fieldBuffer; diff --git a/src/game/Entities/Object/Object.cpp b/src/game/Entities/Object/Object.cpp index 2afa765297..34fb518497 100644 --- a/src/game/Entities/Object/Object.cpp +++ b/src/game/Entities/Object/Object.cpp @@ -2081,7 +2081,7 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropert summon->SetHomePosition(pos); summon->InitStats(duration); - AddToMap(summon->ToCreature(), (IS_PLAYER_GUID(summon->GetOwnerGUID()) || (summoner && summoner->GetTransport()))); + AddToMap(summon->ToCreature(), (IS_PLAYER_GUID(summon->GetOwnerGUID()) || summoner && summoner->GetTransport())); summon->InitSummon(); //ObjectAccessor::UpdateObjectVisibility(summon); diff --git a/src/game/Entities/Pet/Pet.cpp b/src/game/Entities/Pet/Pet.cpp index 8bb6fdaeb8..d1209225f3 100644 --- a/src/game/Entities/Pet/Pet.cpp +++ b/src/game/Entities/Pet/Pet.cpp @@ -977,6 +977,9 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) // Can be summon and guardian if (GetEntry() == NPC_RISEN_GHOUL) { + // 100% energy after summon + SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY)); + // xinef: fixes orc death knight command racial if (m_owner->getRace() == RACE_ORC) CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, NULL, NULL, m_owner->GetGUID()); @@ -2240,4 +2243,4 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */) playerOwner->SendDirectMessage(&data); } } -}
\ No newline at end of file +} diff --git a/src/game/Entities/Player/Player.cpp b/src/game/Entities/Player/Player.cpp index 0665c04ecd..3ecdd51bc2 100644 --- a/src/game/Entities/Player/Player.cpp +++ b/src/game/Entities/Player/Player.cpp @@ -1015,6 +1015,9 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) SetObjectScale(1.0f); + m_realRace = createInfo->Race; // set real race flag + m_race = createInfo->Race; // set real race flag + setFactionForRace(createInfo->Race); if (!IsValidGender(createInfo->Gender)) @@ -1276,7 +1279,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) } // item can't be added - sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(), getClass(), msg); + sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(true), getClass(), msg); return false; } @@ -2986,14 +2989,14 @@ void Player::SetGameMaster(bool on) if (on) { m_ExtraFlags |= PLAYER_EXTRA_GM_ON; - if (GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(GetSession()->GetSecurity())) setFaction(35); SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS); if (Pet* pet = GetPet()) { - if (GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(GetSession()->GetSecurity())) pet->setFaction(35); pet->getHostileRefManager().setOnlineOfflineState(false); } @@ -3005,7 +3008,7 @@ void Player::SetGameMaster(bool on) CombatStopWithPets(); SetPhaseMask(uint32(PHASEMASK_ANYWHERE), false); // see and visible in all phases - m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GM, GetSession()->GetSecurity() == SEC_MODERATOR ? SEC_PLAYER : GetSession()->GetSecurity()); + m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GM, GetSession()->GetSecurity()); } else { @@ -3022,7 +3025,7 @@ void Player::SetGameMaster(bool on) SetPhaseMask(newPhase, false); m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON; - setFactionForRace(getRace()); + setFactionForRace(getRace(true)); RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS); @@ -3207,7 +3210,7 @@ void Player::GiveLevel(uint8 level) guild->UpdateMemberData(this, GUILD_MEMBER_DATA_LEVEL, level); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), level, &info); + sObjectMgr->GetPlayerLevelInfo(getRace(true), getClass(), level, &info); PlayerClassLevelInfo classInfo; sObjectMgr->GetPlayerClassLevelInfo(getClass(), level, &classInfo); @@ -3321,7 +3324,7 @@ void Player::InitStatsForLevel(bool reapplyMods) sObjectMgr->GetPlayerClassLevelInfo(getClass(), getLevel(), &classInfo); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), getLevel(), &info); + sObjectMgr->GetPlayerLevelInfo(getRace(true), getClass(), getLevel(), &info); SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(getLevel())); @@ -4188,8 +4191,8 @@ void Player::removeSpell(uint32 spellId, uint8 removeSpecMask, bool onlyTemporar continue; // pussywizard: don't understand why whole skill is removed when just single spell from it is removed - if ((_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL && pSkill->categoryId != SKILL_CATEGORY_CLASS) || // pussywizard: don't unlearn class skills - ((pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0)) + if (_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL && pSkill->categoryId != SKILL_CATEGORY_CLASS || // pussywizard: don't unlearn class skills + (pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0) { // not reset skills for professions and racial abilities if ((pSkill->categoryId == SKILL_CATEGORY_SECONDARY || pSkill->categoryId == SKILL_CATEGORY_PROFESSION) && (IsProfessionSkill(pSkill->id) || _spell_idx->second->racemask != 0)) @@ -5097,7 +5100,7 @@ void Player::BuildPlayerRepop() data.append(GetPackGUID()); GetSession()->SendPacket(&data); - if (getRace() == RACE_NIGHTELF) + if (getRace(true) == RACE_NIGHTELF) CastSpell(this, 20584, true); CastSpell(this, 8326, true); @@ -17384,6 +17387,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) bytes0 |= Gender << 16; // gender SetUInt32Value(UNIT_FIELD_BYTES_0, bytes0); + m_realRace = fields[3].GetUInt8(); // set real race + m_race = fields[3].GetUInt8(); // set real race + SetUInt32Value(UNIT_FIELD_LEVEL, fields[6].GetUInt8()); SetUInt32Value(PLAYER_XP, fields[7].GetUInt32()); @@ -17432,7 +17438,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) //Need to call it to initialize m_team (m_team can be calculated from race) //Other way is to saves m_team into characters table. - setFactionForRace(getRace()); + setFactionForRace(getRace(true)); // pussywizard: create empty instance bind containers if necessary sInstanceSaveMgr->PlayerCreateBoundInstancesMaps(guid); @@ -17482,8 +17488,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); // pussywizard: group changed difficulty when player was offline, teleport to the enterance of new difficulty - if (mapEntry && ((mapEntry->IsNonRaidDungeon() && dungeonDiff != GetDungeonDifficulty()) || - (mapEntry->IsRaid() && raidDiff != GetRaidDifficulty()))) + if (mapEntry && (mapEntry->IsNonRaidDungeon() && dungeonDiff != GetDungeonDifficulty() || mapEntry->IsRaid() && raidDiff != GetRaidDifficulty())) { bool fixed = false; if (uint32 destInstId = sInstanceSaveMgr->PlayerGetDestinationInstanceId(this, mapId, GetDifficulty(mapEntry->IsRaid()))) @@ -17655,7 +17660,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) map = sMapMgr->CreateMap(mapId, this); if (!map) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); mapId = info->mapId; Relocate(info->positionX, info->positionY, info->positionZ, 0.0f); sLog->outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", guid, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); @@ -19130,7 +19135,7 @@ bool Player::CheckInstanceCount(uint32 instanceId) const bool Player::_LoadHomeBind(PreparedQueryResult result) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); if (!info) { sLog->outError("Player (Name %s) has incorrect race/class pair. Can't be loaded.", GetName().c_str()); @@ -21428,7 +21433,7 @@ void Player::InitDataForForm(bool reapplyMods) void Player::InitDisplayIds() { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); if (!info) { sLog->outError("Player %u has incorrect race/class pair. Can't init display ids.", GetGUIDLow()); @@ -22246,7 +22251,7 @@ void Player::ReportedAfkBy(Player* reporter) WorldLocation Player::GetStartPosition() const { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); uint32 mapId = info->mapId; if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977)) return WorldLocation(0, 2352.0f, -5709.0f, 154.5f, 0.0f); @@ -22829,9 +22834,7 @@ void Player::ApplyEquipCooldown(Item* pItem) // xinef: dont apply equip cooldown if spell on item has insignificant cooldown SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellData.SpellId); - if (spellData.SpellCooldown <= 3000 && - spellData.SpellCategoryCooldown <= 3000 && - (!spellInfo || (spellInfo->RecoveryTime <= 3000 && spellInfo->CategoryRecoveryTime <= 3000))) + if (spellData.SpellCooldown <= 3000 && spellData.SpellCategoryCooldown <= 3000 && (!spellInfo || spellInfo->RecoveryTime <= 3000 && spellInfo->CategoryRecoveryTime <= 3000)) continue; // Don't replace longer cooldowns by equip cooldown if we have any. @@ -22872,7 +22875,7 @@ void Player::resetSpells() void Player::learnDefaultSpells() { // xinef: learn default race/class spells - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); for (PlayerCreateInfoSpells::const_iterator itr = info->spell.begin(); itr != info->spell.end(); ++itr) _addSpell(*itr, SPEC_MASK_ALL, true); } @@ -25770,7 +25773,7 @@ void Player::_SaveCharacter(bool create, SQLTransaction& trans) stmt->setUInt32(index++, GetGUIDLow()); stmt->setUInt32(index++, GetSession()->GetAccountId()); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); + stmt->setUInt8(index++, getRace(true)); stmt->setUInt8(index++, getClass()); stmt->setUInt8(index++, getGender()); stmt->setUInt8(index++, getLevel()); @@ -25875,7 +25878,7 @@ void Player::_SaveCharacter(bool create, SQLTransaction& trans) // Update query stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); + stmt->setUInt8(index++, getRace(true)); stmt->setUInt8(index++, getClass()); stmt->setUInt8(index++, getGender()); stmt->setUInt8(index++, getLevel()); @@ -26362,10 +26365,7 @@ uint8 Player::GetMostPointsTalentTree() const bool Player::IsHealerTalentSpec() const { uint8 tree = GetMostPointsTalentTree(); - return ((getClass() == CLASS_DRUID && tree == 2) || - (getClass() == CLASS_PALADIN && tree == 0) || - (getClass() == CLASS_PRIEST && tree <= 1) || - (getClass() == CLASS_SHAMAN && tree == 2)); + return (getClass() == CLASS_DRUID && tree == 2 || getClass() == CLASS_PALADIN && tree == 0 || getClass() == CLASS_PRIEST && tree <= 1 || getClass() == CLASS_SHAMAN && tree == 2); } void Player::ResetTimeSync() diff --git a/src/game/Entities/Player/Player.h b/src/game/Entities/Player/Player.h index 4c1d577bc9..a0f3ec042d 100644 --- a/src/game/Entities/Player/Player.h +++ b/src/game/Entities/Player/Player.h @@ -2063,7 +2063,7 @@ class Player : public Unit, public GridObject<Player> void CheckAreaExploreAndOutdoor(void); static TeamId TeamIdForRace(uint8 race); - TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace()) : m_team; }; + TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace(true)) : m_team; }; void setFactionForRace(uint8 race); void setTeamId(TeamId teamid) { m_team = teamid; }; diff --git a/src/game/Entities/Unit/Unit.cpp b/src/game/Entities/Unit/Unit.cpp index 14616f24d3..d145b99a57 100644 --- a/src/game/Entities/Unit/Unit.cpp +++ b/src/game/Entities/Unit/Unit.cpp @@ -51,6 +51,7 @@ #include "WorldSession.h" #include "ArenaSpectator.h" #include "DynamicVisibility.h" +#include "AccountMgr.h" #include <math.h> @@ -146,12 +147,12 @@ _hitMask(hitMask), _spell(spell), _damageInfo(damageInfo), _healInfo(healInfo), #ifdef _MSC_VER #pragma warning(disable:4355) #endif -Unit::Unit(bool isWorldObject): WorldObject(isWorldObject), +Unit::Unit(bool isWorldObject) : WorldObject(isWorldObject), m_movedByPlayer(NULL), m_lastSanctuaryTime(0), IsAIEnabled(false), NeedChangeAI(false), m_ControlledByPlayer(false), m_CreatedByPlayer(false), movespline(new Movement::MoveSpline()), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0), m_removedAurasCount(0), i_motionMaster(new MotionMaster(this)), m_regenTimer(0), m_ThreatManager(this), m_vehicle(NULL), m_vehicleKit(NULL), m_unitTypeMask(UNIT_MASK_NONE), -m_HostileRefManager(this), m_AutoRepeatFirstCast(false) +m_HostileRefManager(this), m_AutoRepeatFirstCast(false), m_realRace(0), m_race(0) { #ifdef _MSC_VER #pragma warning(default:4355) @@ -3367,16 +3368,13 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const else if (c->GetMapId() == 631) // Icecrown Citadel { // if static transport doesn't match - return false - if (c->GetTransport() != this->GetTransport() && - ((c->GetTransport() && c->GetTransport()->IsStaticTransport()) || - (this->GetTransport() && this->GetTransport()->IsStaticTransport()))) + if (c->GetTransport() != this->GetTransport() && (c->GetTransport() && c->GetTransport()->IsStaticTransport() || this->GetTransport() && this->GetTransport()->IsStaticTransport())) return false; // special handling for ICC (map 631), for non-flying pets in Gunship Battle, for trash npcs this is done via CanAIAttack if (IS_PLAYER_GUID(c->GetOwnerGUID()) && !c->CanFly()) { - if ((c->GetTransport() && !this->GetTransport()) || - (!c->GetTransport() && this->GetTransport())) + if (c->GetTransport() && !this->GetTransport() || !c->GetTransport() && this->GetTransport()) return false; if (this->GetTransport()) { @@ -3661,7 +3659,7 @@ void Unit::HandleSafeUnitPointersOnDelete(Unit* thisUnit) bool Unit::IsInWater(bool allowAbove) const { const_cast<Unit*>(this)->UpdateEnvironmentIfNeeded(1); - return m_last_isinwater_status || (allowAbove && m_last_islittleabovewater_status); + return m_last_isinwater_status || allowAbove && m_last_islittleabovewater_status; } bool Unit::IsUnderWater() const @@ -10376,8 +10374,7 @@ float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, Da // Merciless Combat if ((*i)->GetSpellInfo()->SpellIconID == 2656) { - if (spellProto && - ((spellProto->SpellFamilyFlags[0] & 0x2) || (spellProto->SpellFamilyFlags[1] & 0x2))) + if( spellProto && spellProto->SpellFamilyFlags[0] & 0x2 || spellProto->SpellFamilyFlags[1] & 0x2 ) if (!victim->HealthAbovePct(35)) AddPct(DoneTotalMod, (*i)->GetAmount()); } @@ -17857,6 +17854,21 @@ uint32 Unit::GetModelForTotem(PlayerTotemType totemType) } break; } + default: // One standard for other races. + { + switch (totemType) + { + case SUMMON_TYPE_TOTEM_FIRE: // fire + return 4589; + case SUMMON_TYPE_TOTEM_EARTH: // earth + return 4588; + case SUMMON_TYPE_TOTEM_WATER: // water + return 4587; + case SUMMON_TYPE_TOTEM_AIR: // air + return 4590; + } + break; + } } return 0; } @@ -19131,7 +19143,7 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) else if (index == UNIT_FIELD_FLAGS) { uint32 appendValue = m_uint32Values[UNIT_FIELD_FLAGS]; - if (target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity())) appendValue &= ~UNIT_FLAG_NOT_SELECTABLE; fieldBuffer << uint32(appendValue); @@ -19156,7 +19168,7 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) if (cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) { - if (target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity())) { if (cinfo->Modelid1) displayId = cinfo->Modelid1; // Modelid1 is a visible model for gms @@ -19260,4 +19272,23 @@ void Unit::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns c data << uint32(itr->first); data << uint32(itr->second); } -}
\ No newline at end of file +} + +uint8 Unit::getRace(bool original) const +{ + if (GetTypeId() == TYPEID_PLAYER) + { + if (original) + return m_realRace; + else + return m_race; + } + + return GetByteValue(UNIT_FIELD_BYTES_0, 0); +} + +void Unit::setRace(uint8 race) +{ + if (GetTypeId() == TYPEID_PLAYER) + m_race = race; +} diff --git a/src/game/Entities/Unit/Unit.h b/src/game/Entities/Unit/Unit.h index 3513c5668f..d622b7909f 100644 --- a/src/game/Entities/Unit/Unit.h +++ b/src/game/Entities/Unit/Unit.h @@ -1457,8 +1457,9 @@ class Unit : public WorldObject uint8 getLevel() const { return uint8(GetUInt32Value(UNIT_FIELD_LEVEL)); } uint8 getLevelForTarget(WorldObject const* /*target*/) const { return getLevel(); } void SetLevel(uint8 lvl, bool showLevelChange = true); - uint8 getRace() const { return GetByteValue(UNIT_FIELD_BYTES_0, 0); } - uint32 getRaceMask() const { return 1 << (getRace()-1); } + uint8 getRace(bool original = false) const; + void setRace(uint8 race); + uint32 getRaceMask() const { return 1 << (getRace(true)-1); } uint8 getClass() const { return GetByteValue(UNIT_FIELD_BYTES_0, 1); } uint32 getClassMask() const { return 1 << (getClass()-1); } uint8 getGender() const { return GetByteValue(UNIT_FIELD_BYTES_0, 2); } @@ -2367,13 +2368,7 @@ class Unit : public WorldObject // pussywizard: // MMaps std::map<uint64, MMapTargetData> m_targetsNotAcceptable; - bool isTargetNotAcceptableByMMaps(uint64 guid, uint32 currTime, const Position* t = NULL) const { - std::map<uint64, MMapTargetData>::const_iterator itr = m_targetsNotAcceptable.find(guid); - if ((itr != m_targetsNotAcceptable.end() && (itr->second._endTime >= currTime)) || - (t && !itr->second.PosChanged(*this, *t))) - return true; - return false; - } + bool isTargetNotAcceptableByMMaps(uint64 guid, uint32 currTime, const Position* t = NULL) const { std::map<uint64, MMapTargetData>::const_iterator itr = m_targetsNotAcceptable.find(guid); if (itr != m_targetsNotAcceptable.end() && (itr->second._endTime >= currTime || t && !itr->second.PosChanged(*this, *t))) return true; return false; } uint32 m_mmapNotAcceptableStartTime; // Safe mover std::set<SafeUnitPointer*> SafeUnitPointerSet; @@ -2440,6 +2435,9 @@ class Unit : public WorldObject void _UpdateAutoRepeatSpell(); + uint8 m_realRace; + uint8 m_race; + bool m_AutoRepeatFirstCast; int32 m_attackTimer[MAX_ATTACK]; diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp index ea85c214d0..92de260af6 100644 --- a/src/game/Globals/ObjectMgr.cpp +++ b/src/game/Globals/ObjectMgr.cpp @@ -1132,8 +1132,8 @@ void ObjectMgr::LoadEquipmentTemplates() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 - QueryResult result = WorldDatabase.Query("SELECT entry, id, itemEntry1, itemEntry2, itemEntry3 FROM creature_equip_template"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT CreatureID, ID, ItemID1, ItemID2, ItemID3 FROM creature_equip_template"); if (!result) { @@ -1271,7 +1271,8 @@ void ObjectMgr::LoadCreatureModelInfo() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT modelid, bounding_radius, combat_reach, gender, modelid_other_gender FROM creature_model_info"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT DisplayID, BoundingRadius, CombatReach, Gender, DisplayID_Other_Gender FROM creature_model_info"); if (!result) { @@ -2143,6 +2144,8 @@ uint64 ObjectMgr::GetPlayerGUIDByName(std::string const& name) const // Get data from global storage if (uint32 guidLow = sWorld->GetGlobalPlayerGUID(name)) return MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER); + + // No player found return 0; } @@ -3685,7 +3688,7 @@ void ObjectMgr::LoadPlayerInfo() _playerXPperLevel[level] = 0; // 0 1 - QueryResult result = WorldDatabase.Query("SELECT lvl, xp_for_next_level FROM player_xp_for_level"); + QueryResult result = WorldDatabase.Query("SELECT Level, Experience FROM player_xp_for_level"); if (!result) { @@ -3851,26 +3854,26 @@ void ObjectMgr::LoadQuests() mExclusiveQuestGroups.clear(); QueryResult result = WorldDatabase.Query("SELECT " - //0 1 2 3 4 5 6 7 8 9 10 11 12 - "Id, Method, Level, MinLevel, MaxLevel, ZoneOrSort, Type, SuggestedPlayers, LimitTime, RequiredClasses, RequiredRaces, RequiredSkillId, RequiredSkillPoints, " + //0 1 2 3 4 5 6 7 8 9 10 11 12 + "ID, Method, QuestLevel, MinLevel, MaxLevel, QuestSortID, QuestType, SuggestedGroupNum, LimitTime, RequiredClasses, RequiredRaces, RequiredSkillId, RequiredSkillPoints, " // 13 14 15 16 17 18 19 20 "RequiredFactionId1, RequiredFactionId2, RequiredFactionValue1, RequiredFactionValue2, RequiredMinRepFaction, RequiredMaxRepFaction, RequiredMinRepValue, RequiredMaxRepValue, " // 21 22 23 24 25 26 27 28 29 30 31 "PrevQuestId, NextQuestId, ExclusiveGroup, NextQuestIdChain, RewardXPId, RewardOrRequiredMoney, RewardMoneyMaxLevel, RewardSpell, RewardSpellCast, RewardHonor, RewardHonorMultiplier, " // 32 33 34 35 36 37 38 39 40 41 42 - "RewardMailTemplateId, RewardMailDelay, SourceItemId, SourceItemCount, SourceSpellId, Flags, SpecialFlags, RewardTitleId, RequiredPlayerKills, RewardTalents, RewardArenaPoints, " - // 43 44 45 46 47 48 49 50 - "RewardItemId1, RewardItemId2, RewardItemId3, RewardItemId4, RewardItemCount1, RewardItemCount2, RewardItemCount3, RewardItemCount4, " - // 51 52 53 54 55 56 57 58 59 60 61 62 - "RewardChoiceItemId1, RewardChoiceItemId2, RewardChoiceItemId3, RewardChoiceItemId4, RewardChoiceItemId5, RewardChoiceItemId6, RewardChoiceItemCount1, RewardChoiceItemCount2, RewardChoiceItemCount3, RewardChoiceItemCount4, RewardChoiceItemCount5, RewardChoiceItemCount6, " - // 63 64 65 66 67 68 69 70 71 72 - "RewardFactionId1, RewardFactionId2, RewardFactionId3, RewardFactionId4, RewardFactionId5, RewardFactionValueId1, RewardFactionValueId2, RewardFactionValueId3, RewardFactionValueId4, RewardFactionValueId5, " + "RewardMailTemplateId, RewardMailDelay, SourceItemId, SourceItemCount, SourceSpellId, Flags, SpecialFlags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, " + // 43 44 45 46 47 48 49 50 + "RewardItem1, RewardItem2, RewardItem3, RewardItem4, RewardAmount1, RewardAmount2, RewardAmount3, RewardAmount4, " + // 51 52 53 54 55 56 57 58 59 60 61 62 + "RewardChoiceItemID1, RewardChoiceItemID2, RewardChoiceItemID3, RewardChoiceItemID4, RewardChoiceItemID5, RewardChoiceItemID6, RewardChoiceItemQuantity1, RewardChoiceItemQuantity2, RewardChoiceItemQuantity3, RewardChoiceItemQuantity4, RewardChoiceItemQuantity5, RewardChoiceItemQuantity6, " + // 63 64 65 66 67 68 69 70 71 72 + "RewardFactionID1, RewardFactionID2, RewardFactionID3, RewardFactionID4, RewardFactionID5, RewardFactionValue1, RewardFactionValue2, RewardFactionValue3, RewardFactionValue4, RewardFactionValue5, " // 73 74 75 76 77 - "RewardFactionValueIdOverride1, RewardFactionValueIdOverride2, RewardFactionValueIdOverride3, RewardFactionValueIdOverride4, RewardFactionValueIdOverride5, " + "RewardFactionOverride1, RewardFactionOverride2, RewardFactionOverride3, RewardFactionOverride4, RewardFactionOverride5, " // 78 79 80 81 "PointMapId, PointX, PointY, PointOption, " - // 82 83 84 85 86 87 88 - "Title, Objectives, Details, EndText, OfferRewardText, RequestItemsText, CompletedText, " + // 82 83 84 85 86 87 88 + "LogTitle, LogDescription, QuestDescription, EndText, OfferRewardText, RequestItemsText, QuestCompletionLog, " // 89 90 91 92 93 94 95 96 "RequiredNpcOrGo1, RequiredNpcOrGo2, RequiredNpcOrGo3, RequiredNpcOrGo4, RequiredNpcOrGoCount1, RequiredNpcOrGoCount2, RequiredNpcOrGoCount3, RequiredNpcOrGoCount4, " // 97 98 99 100 101 102 103 104 @@ -5101,8 +5104,8 @@ void ObjectMgr::LoadPageTexts() { uint32 oldMSTime = getMSTime(); - // 0 1 2 - QueryResult result = WorldDatabase.Query("SELECT entry, text, next_page FROM page_text"); + // 0 1 2 + QueryResult result = WorldDatabase.Query("SELECT ID, Text, NextPageID FROM page_text"); if (!result) { @@ -6071,8 +6074,9 @@ void ObjectMgr::LoadAreaTriggerTeleports() _areaTriggerStore.clear(); // need for reload case - // 0 1 2 3 4 5 - QueryResult result = WorldDatabase.Query("SELECT id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); + // 0 1 2 3 4 5 + QueryResult result = WorldDatabase.Query("SELECT ID, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); + if (!result) { sLog->outString(">> Loaded 0 area trigger teleport definitions. DB table `areatrigger_teleport` is empty."); @@ -6526,9 +6530,9 @@ void ObjectMgr::LoadGameObjectTemplate() // 0 1 2 3 4 5 6 7 8 9 10 11 12 QueryResult result = WorldDatabase.Query("SELECT entry, type, displayId, name, IconName, castBarCaption, unk1, faction, flags, size, questItem1, questItem2, questItem3, " // 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 - "questItem4, questItem5, questItem6, data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, " + "questItem4, questItem5, questItem6, Data0, Data1, Data2, Data3, Data4, Data5, Data6, Data7, Data8, Data9, Data10, Data11, Data12, " // 29 30 31 32 33 34 35 36 37 38 39 40 41 - "data13, data14, data15, data16, data17, data18, data19, data20, data21, data22, data23, AIName, ScriptName " + "Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, AIName, ScriptName " "FROM gameobject_template"); if (!result) @@ -7145,8 +7149,8 @@ void ObjectMgr::LoadPointsOfInterest() uint32 count = 0; - // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT entry, x, y, icon, flags, data, icon_name FROM points_of_interest"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT ID, PositionX, PositionY, Icon, Flags, Data, Name FROM points_of_interest"); if (!result) { @@ -7193,8 +7197,8 @@ void ObjectMgr::LoadQuestPOI() uint32 count = 0; - // 0 1 2 3 4 5 6 7 - QueryResult result = WorldDatabase.Query("SELECT questId, id, objIndex, mapid, WorldMapAreaId, FloorId, unk3, unk4 FROM quest_poi order by questId"); + // 0 1 2 3 4 5 6 7 + QueryResult result = WorldDatabase.Query("SELECT QuestID, id, ObjectiveIndex, MapID, WorldMapAreaId, Floor, Priority, Flags FROM quest_poi order by QuestID"); if (!result) { @@ -7203,8 +7207,8 @@ void ObjectMgr::LoadQuestPOI() return; } - // 0 1 2 3 - QueryResult points = WorldDatabase.Query("SELECT questId, id, x, y FROM quest_poi_points ORDER BY questId DESC, idx"); + // 0 1 2 3 + QueryResult points = WorldDatabase.Query("SELECT QuestID, Idx1, X, Y FROM quest_poi_points ORDER BY QuestID DESC, Idx2"); std::vector<std::vector<std::vector<QuestPOIPoint> > > POIs; @@ -8256,9 +8260,9 @@ void ObjectMgr::LoadTrainerSpell() // For reload case _cacheTrainerSpellStore.clear(); - QueryResult result = WorldDatabase.Query("SELECT b.entry, a.spell, a.spellcost, a.reqskill, a.reqskillvalue, a.reqlevel FROM npc_trainer AS a " - "INNER JOIN npc_trainer AS b ON a.entry = -(b.spell) " - "UNION SELECT * FROM npc_trainer WHERE spell > 0"); + QueryResult result = WorldDatabase.Query("SELECT b.ID, a.SpellID, a.MoneyCost, a.ReqSkillLine, a.ReqSkillRank, a.ReqLevel FROM npc_trainer AS a " + "INNER JOIN npc_trainer AS b ON a.ID = -(b.SpellID) " + "UNION SELECT * FROM npc_trainer WHERE SpellID > 0"); if (!result) { diff --git a/src/game/Groups/Group.cpp b/src/game/Groups/Group.cpp index 03cf5ac1b0..ebac30cfbd 100644 --- a/src/game/Groups/Group.cpp +++ b/src/game/Groups/Group.cpp @@ -1350,7 +1350,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || allowedMap != NULL && player->FindMap() != allowedMap) { --roll->totalNeed; continue; @@ -1414,7 +1414,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || allowedMap != NULL && player->FindMap() != allowedMap) { --roll->totalGreed; continue; diff --git a/src/game/Handlers/CharacterHandler.cpp b/src/game/Handlers/CharacterHandler.cpp index 94f4199267..146840095c 100644 --- a/src/game/Handlers/CharacterHandler.cpp +++ b/src/game/Handlers/CharacterHandler.cpp @@ -1034,7 +1034,7 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder) } // friend status - if (GetSecurity() < SEC_GAMEMASTER) // pussywizard: only for non-gms + if (AccountMgr::IsGMAccount(GetSecurity())) // pussywizard: only for non-gms sSocialMgr->SendFriendStatus(pCurrChar, FRIEND_ONLINE, pCurrChar->GetGUIDLow(), true); // Place character in world (and load zone) before some object loading @@ -2073,11 +2073,8 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData) // xinef: check money bool valid = Player::TeamIdForRace(oldRace) == Player::TeamIdForRace(race); - if ((level < 10 && money <= 0) || - (level > 10 && level <= 30 && money <= 3000000) || - (level > 30 && level <= 50 && money <= 10000000) || - (level > 50 && level <= 70 && money <= 50000000) || - (level > 70 && money <= 200000000)) + if (level < 10 && money <= 0 || level > 10 && level <= 30 && money <= 3000000 || level > 30 && level <= 50 && money <= 10000000 || + level > 50 && level <= 70 && money <= 50000000 || level > 70 && money <= 200000000) valid = true; if (!valid) { diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp index 87abeac96d..708db524f2 100644 --- a/src/game/Handlers/MiscHandler.cpp +++ b/src/game/Handlers/MiscHandler.cpp @@ -398,7 +398,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/) if (uint64 lguid = GetPlayer()->GetLootGUID()) DoLootRelease(lguid); - bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat())) || GetPlayer()->IsInFlight(); + bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight(); /// TODO: Possibly add RBAC permission to log out in combat bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); @@ -1508,7 +1508,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) return; } - if ((groupGuy->GetMap()->GetId() == 631 || groupGuy->GetMap()->GetId() == 724) && mode%2 == _player->GetRaidDifficulty()%2 && group->isRaidGroup()) + if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId()) && mode%2 == _player->GetRaidDifficulty()%2 && group->isRaidGroup()) { if (!currMap) currMap = groupGuy->GetMap(); @@ -1520,17 +1520,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) return; } - if (!groupGuy->IsAlive() || - groupGuy->IsInCombat() || - groupGuy->GetVictim() || - groupGuy->m_mover != groupGuy || - groupGuy->IsNonMeleeSpellCast(true) || - (!groupGuy->GetMotionMaster()->empty() && groupGuy->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE) || - !groupGuy->movespline->Finalized() || - !groupGuy->GetMap()->ToInstanceMap() || - !groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript() || - groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress() || - !groupGuy->Satisfy(sObjectMgr->GetAccessRequirement(groupGuy->GetMap()->GetId(), Difficulty(mode)), groupGuy->GetMap()->GetId(), false)) + if (!groupGuy->IsAlive() || groupGuy->IsInCombat() || groupGuy->GetVictim() || groupGuy->m_mover != groupGuy || groupGuy->IsNonMeleeSpellCast(true) || !groupGuy->GetMotionMaster()->empty() && groupGuy->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE || !groupGuy->movespline->Finalized() || !groupGuy->GetMap()->ToInstanceMap() || !groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript() || groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress() || !groupGuy->Satisfy(sObjectMgr->GetAccessRequirement(groupGuy->GetMap()->GetId(), Difficulty(mode)), groupGuy->GetMap()->GetId(), false)) { _player->SendRaidDifficulty(group != NULL); return; @@ -1554,17 +1544,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) if (Player* p = itr->GetSource()) if (p->GetGroup() != group) { - if (!p->IsInWorld() || - !p->IsAlive() || - p->IsInCombat() || - p->GetVictim() || - p->m_mover != p || - p->IsNonMeleeSpellCast(true) || - (!p->GetMotionMaster()->empty() && p->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE) || - !p->movespline->Finalized() || - !p->GetMap()->ToInstanceMap() || - !p->GetMap()->ToInstanceMap()->GetInstanceScript() || - p->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress()) + if (!p->IsInWorld() || !p->IsAlive() || p->IsInCombat() || p->GetVictim() || p->m_mover != p || p->IsNonMeleeSpellCast(true) || !p->GetMotionMaster()->empty() && p->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE || !p->movespline->Finalized() || !p->GetMap()->ToInstanceMap() || !p->GetMap()->ToInstanceMap()->GetInstanceScript() || p->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress()) { _player->SendRaidDifficulty(group != NULL); return; @@ -1592,7 +1572,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) if (!groupGuy) continue; - if (groupGuy->GetMap()->GetId() == 631 || groupGuy->GetMap()->GetId() == 724) + if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId())) { anyoneInside = true; diff --git a/src/game/Handlers/MovementHandler.cpp b/src/game/Handlers/MovementHandler.cpp index 3d42e1af43..bf6fbdefaf 100644 --- a/src/game/Handlers/MovementHandler.cpp +++ b/src/game/Handlers/MovementHandler.cpp @@ -74,7 +74,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() Map* newMap = sMapMgr->CreateMap(loc.GetMapId(), GetPlayer()); // the CanEnter checks are done in TeleporTo but conditions may change // while the player is in transit, for example the map may get full - if (!newMap || !newMap->CanEnter(GetPlayer())) + if (!newMap || !newMap->CanEnter(GetPlayer(), false)) { sLog->outError("Map %d could not be created for player %d, porting player to homebind", loc.GetMapId(), GetPlayer()->GetGUIDLow()); GetPlayer()->TeleportTo(GetPlayer()->m_homebindMapId, GetPlayer()->m_homebindX, GetPlayer()->m_homebindY, GetPlayer()->m_homebindZ, GetPlayer()->GetOrientation()); diff --git a/src/game/Instances/InstanceSaveMgr.cpp b/src/game/Instances/InstanceSaveMgr.cpp index c403861af7..3e6f791a0a 100644 --- a/src/game/Instances/InstanceSaveMgr.cpp +++ b/src/game/Instances/InstanceSaveMgr.cpp @@ -126,7 +126,7 @@ bool InstanceSaveManager::DeleteInstanceSaveIfNeeded(InstanceSave* save, bool sk } InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, time_t extendedResetTime) -: m_resetTime(resetTime), m_extendedResetTime(extendedResetTime), m_instanceid(InstanceId), m_mapid(MapId), m_difficulty(MapId == 631 || MapId == 724 ? Difficulty(difficulty%2) : difficulty), m_canReset(true), m_instanceData(""), m_completedEncounterMask(0) +: m_resetTime(resetTime), m_extendedResetTime(extendedResetTime), m_instanceid(InstanceId), m_mapid(MapId), m_difficulty(IsSharedDifficultyMap(MapId) ? Difficulty(difficulty%2) : difficulty), m_canReset(true), m_instanceData(""), m_completedEncounterMask(0) { } @@ -676,7 +676,8 @@ void InstanceSaveManager::PlayerUnbindInstanceNotExtended(uint32 guidLow, uint32 InstancePlayerBind* InstanceSaveManager::PlayerGetBoundInstance(uint32 guidLow, uint32 mapid, Difficulty difficulty) { - Difficulty difficulty_fixed = (mapid == 631 || mapid == 724 ? Difficulty(difficulty%2) : difficulty); + Difficulty difficulty_fixed = ( IsSharedDifficultyMap(mapid) ? Difficulty(difficulty%2) : difficulty); + MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(mapid, difficulty_fixed); if (!mapDiff) return NULL; diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp index 33abb8627a..268b11ecce 100644 --- a/src/game/Maps/Map.cpp +++ b/src/game/Maps/Map.cpp @@ -2974,7 +2974,7 @@ void Map::DeleteRespawnTimesInDB(uint16 mapId, uint32 instanceId) void Map::UpdateEncounterState(EncounterCreditType type, uint32 creditEntry, Unit* source) { - Difficulty difficulty_fixed = (GetId() == 631 || GetId() == 724 ? Difficulty(GetDifficulty()%2) : GetDifficulty()); + Difficulty difficulty_fixed = (IsSharedDifficultyMap(GetId()) ? Difficulty(GetDifficulty()%2) : GetDifficulty()); DungeonEncounterList const* encounters = sObjectMgr->GetDungeonEncounterList(GetId(), difficulty_fixed); if (!encounters) return; diff --git a/src/game/Maps/Map.h b/src/game/Maps/Map.h index 8f5009cf19..93061f4a3f 100644 --- a/src/game/Maps/Map.h +++ b/src/game/Maps/Map.h @@ -368,7 +368,7 @@ class Map : public GridRefManager<NGridType> uint32 GetInstanceId() const { return i_InstanceId; } uint8 GetSpawnMode() const { return (i_spawnMode); } - virtual bool CanEnter(Player* /*player*/, bool loginCheck = false) { return true; } + virtual bool CanEnter(Player* /*player*/, bool /*loginCheck = false*/) { return true; } const char* GetMapName() const; // have meaning only for instanced map (that have set real difficulty) diff --git a/src/game/Maps/MapInstanced.cpp b/src/game/Maps/MapInstanced.cpp index 1e8701b525..5f04566b77 100644 --- a/src/game/Maps/MapInstanced.cpp +++ b/src/game/Maps/MapInstanced.cpp @@ -139,7 +139,7 @@ Map* MapInstanced::CreateInstanceForPlayer(const uint32 mapId, Player* player) map = FindInstanceMap(destInstId); if (!map) map = CreateInstance(destInstId, pSave, realdiff); - else if ((mapId == 631 || mapId == 724) && !map->HavePlayers() && map->GetDifficulty() != realdiff) + else if (IsSharedDifficultyMap(mapId) && !map->HavePlayers() && map->GetDifficulty() != realdiff) { if (player->isBeingLoaded()) // pussywizard: crashfix (assert(passengers.empty) fail in ~transport), could be added to a transport during loading from db return NULL; diff --git a/src/game/Movement/MovementGenerators/PathGenerator.cpp b/src/game/Movement/MovementGenerators/PathGenerator.cpp index c42ae417d2..c72e04b870 100644 --- a/src/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/game/Movement/MovementGenerators/PathGenerator.cpp @@ -226,8 +226,8 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con } if (sourceCanSwim) { - if ((startPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(startPos.x, startPos.y, startPos.z, MAP_ALL_LIQUIDS, NULL)) || - (endPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(endPos.x, endPos.y, endPos.z, MAP_ALL_LIQUIDS, NULL))) + if (startPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(startPos.x, startPos.y, startPos.z, MAP_ALL_LIQUIDS, NULL) || + endPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(endPos.x, endPos.y, endPos.z, MAP_ALL_LIQUIDS, NULL)) { _type = PATHFIND_NOPATH; return; diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 8517392982..f706b7108d 100644 --- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "Creature.h" diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/game/Movement/MovementGenerators/RandomMovementGenerator.h index f985feff5b..5881536256 100644 --- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef TRINITY_RANDOMMOTIONGENERATOR_H diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 297f438655..bd9044ce14 100644 --- a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -121,9 +121,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini Position dest = {x, y, z, 0.0f}; if (GameObject* pillar = ((BattlegroundRV*)bg)->GetPillarAtPosition(&dest)) { - if ((pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0) || - owner->GetPositionZ() > 31.0f || - owner->GetTransGUID() == pillar->GetGUID()) + if (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0 || owner->GetPositionZ() > 31.0f || owner->GetTransGUID() == pillar->GetGUID()) { if (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0) z = std::max(z, 28.28f); @@ -137,8 +135,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini init.Launch(); return; } - if (pillar->GetGoState() == GO_STATE_ACTIVE || - (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() > 0)) + if (pillar->GetGoState() == GO_STATE_ACTIVE || pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() > 0) { Position pos; owner->GetFirstCollisionPositionForTotem(pos, owner->GetExactDist2d(i_target.getTarget()), owner->GetAngle(i_target.getTarget())-owner->GetOrientation(), false); @@ -161,8 +158,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini if (result) { float maxDist = MELEE_RANGE + owner->GetMeleeReach() + i_target->GetMeleeReach(); - if ((!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH)) || - (!i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist*maxDist)) + if (!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH || !i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist*maxDist)) { lastPathingFailMSTime = World::GetGameTimeMS(); owner->m_targetsNotAcceptable[i_target->GetGUID()] = MMapTargetData(sWorld->GetGameTime()+DISALLOW_TIME_AFTER_FAIL, owner, i_target.getTarget()); diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/game/Movement/Spline/MoveSpline.cpp index 22ea15a428..684c14e1ab 100644 --- a/src/game/Movement/Spline/MoveSpline.cpp +++ b/src/game/Movement/Spline/MoveSpline.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSpline.h" diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/game/Movement/Spline/MoveSpline.h index 94ce57d700..b8df80953f 100644 --- a/src/game/Movement/Spline/MoveSpline.h +++ b/src/game/Movement/Spline/MoveSpline.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVEPLINE_H diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/game/Movement/Spline/MoveSplineFlag.h index c85a1aeb43..7c5da0f39b 100644 --- a/src/game/Movement/Spline/MoveSplineFlag.h +++ b/src/game/Movement/Spline/MoveSplineFlag.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEFLAG_H diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/game/Movement/Spline/MoveSplineInit.cpp index e23fa9ceb0..345517e9df 100644 --- a/src/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/game/Movement/Spline/MoveSplineInit.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSplineInit.h" diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/game/Movement/Spline/MoveSplineInit.h index 72dc220f97..83a03eaeff 100644 --- a/src/game/Movement/Spline/MoveSplineInit.h +++ b/src/game/Movement/Spline/MoveSplineInit.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEINIT_H diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/game/Movement/Spline/MoveSplineInitArgs.h index 11663934f0..edde1fbf02 100644 --- a/src/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/game/Movement/Spline/MoveSplineInitArgs.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEINIT_ARGS_H diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/game/Movement/Spline/MovementPacketBuilder.cpp index 66d2a5385a..a9efd52593 100644 --- a/src/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/game/Movement/Spline/MovementPacketBuilder.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MovementPacketBuilder.h" diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/game/Movement/Spline/MovementPacketBuilder.h index a28ff0b44e..66f3074c3e 100644 --- a/src/game/Movement/Spline/MovementPacketBuilder.h +++ b/src/game/Movement/Spline/MovementPacketBuilder.h @@ -1,20 +1,9 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ - + #ifndef TRINITYSERVER_PACKET_BUILDER_H #define TRINITYSERVER_PACKET_BUILDER_H diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/game/Movement/Spline/MovementTypedefs.h index d9d2077d81..f28c075a1b 100644 --- a/src/game/Movement/Spline/MovementTypedefs.h +++ b/src/game/Movement/Spline/MovementTypedefs.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_TYPEDEFS_H diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/game/Movement/Spline/MovementUtil.cpp index d973dfbe32..c7b6e4b601 100644 --- a/src/game/Movement/Spline/MovementUtil.cpp +++ b/src/game/Movement/Spline/MovementUtil.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSplineFlag.h" diff --git a/src/game/Movement/Spline/Spline.cpp b/src/game/Movement/Spline/Spline.cpp index 5d78e151b5..88ddb48537 100644 --- a/src/game/Movement/Spline/Spline.cpp +++ b/src/game/Movement/Spline/Spline.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "Spline.h" diff --git a/src/game/Movement/Spline/Spline.h b/src/game/Movement/Spline/Spline.h index b413142f48..8084c18e19 100644 --- a/src/game/Movement/Spline/Spline.h +++ b/src/game/Movement/Spline/Spline.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_SPLINE_H diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/game/Movement/Spline/SplineImpl.h index 026a2d7d3c..1cd60707ef 100644 --- a/src/game/Movement/Spline/SplineImpl.h +++ b/src/game/Movement/Spline/SplineImpl.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ namespace Movement diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/game/Scripting/ScriptMgr.cpp index 453e0b03a1..a24d118af7 100644 --- a/src/game/Scripting/ScriptMgr.cpp +++ b/src/game/Scripting/ScriptMgr.cpp @@ -962,6 +962,12 @@ std::vector<ChatCommand> ScriptMgr::GetChatCommands() table.insert(table.end(), cmds.begin(), cmds.end()); } + // Sort commands in alphabetical order + std::sort(table.begin(), table.end(), [](const ChatCommand& a, const ChatCommand&b) + { + return strcmp(a.Name, b.Name) < 0; + }); + return table; } @@ -1257,9 +1263,14 @@ void ScriptMgr::OnPlayerUpdateFaction(Player* player) FOREACH_SCRIPT(PlayerScript)->OnUpdateFaction(player); } +void ScriptMgr::OnPlayerAddToBattleground(Player* player, Battleground *bg) +{ + FOREACH_SCRIPT(PlayerScript)->OnAddToBattleground(player, bg); +} + void ScriptMgr::OnPlayerRemoveFromBattleground(Player* player, Battleground* bg) { - FOREACH_SCRIPT(PlayerScript)->OnPlayerRemoveFromBattleground(player, bg); + FOREACH_SCRIPT(PlayerScript)->OnRemoveFromBattleground(player, bg); } void ScriptMgr::OnAchievementComplete(Player* player, AchievementEntry const* achievement) diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h index d593a81eb5..f359251055 100644 --- a/src/game/Scripting/ScriptMgr.h +++ b/src/game/Scripting/ScriptMgr.h @@ -748,8 +748,11 @@ class PlayerScript : public ScriptObject // Called when team/faction is set on player virtual void OnUpdateFaction(Player* /*player*/) { } + // Called when a player is added to battleground + virtual void OnAddToBattleground(Player* /*player*/, Battleground* /*bg*/) { } + // Called when a player is removed from battleground - virtual void OnPlayerRemoveFromBattleground(Player* /*player*/, Battleground* /*bg*/) { } + virtual void OnRemoveFromBattleground(Player* /*player*/, Battleground* /*bg*/) { } // Called when a player complete an achievement virtual void OnAchiComplete(Player* /*player*/, AchievementEntry const* /*achievement*/) { } @@ -1048,6 +1051,7 @@ class ScriptMgr void OnCriteriaSave(SQLTransaction& trans, Player* player, uint16 critId, CriteriaProgress criteriaData); void OnGossipSelect(Player* player, uint32 menu_id, uint32 sender, uint32 action); void OnGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, const char* code); + void OnPlayerAddToBattleground(Player* player, Battleground* bg); public: /* GuildScript */ @@ -1084,7 +1088,7 @@ class ScriptMgr uint32 _scriptCount; //atomic op counter for active scripts amount - std::atomic_long _scheduledScripts; + std::atomic<long> _scheduledScripts; }; template<class TScript> diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index e07ba35333..8fd98aa424 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -34,6 +34,7 @@ #include "WardenWin.h" #include "WardenMac.h" #include "SavingSystem.h" +#include "AccountMgr.h" namespace { @@ -516,7 +517,7 @@ void WorldSession::LogoutPlayer(bool save) } //! Broadcast a logout message to the player's friends - if (GetSecurity() < SEC_GAMEMASTER) // pussywizard: only for non-gms + if (AccountMgr::IsGMAccount(GetSecurity())) // pussywizard: only for non-gms sSocialMgr->SendFriendStatus(_player, FRIEND_OFFLINE, _player->GetGUIDLow(), true); sSocialMgr->RemovePlayerSocial(_player->GetGUIDLow()); @@ -867,10 +868,8 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) */ // pussywizard: remade this condition - bool canFly = GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) || - GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || - (GetPlayer()->m_mover->GetTypeId() == TYPEID_UNIT && GetPlayer()->m_mover->ToCreature()->CanFly()) || - GetSecurity() > SEC_PLAYER; + bool canFly = GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) || GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || + GetPlayer()->m_mover->GetTypeId() == TYPEID_UNIT && GetPlayer()->m_mover->ToCreature()->CanFly() || GetSecurity() > SEC_PLAYER; REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY) && !canFly, MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY); @@ -1081,9 +1080,9 @@ void WorldSession::InitializeQueryCallbackParameters() { // Callback parameters that have pointers in them should be properly // initialized to NULL here. - _charCreateCallback.SetParam(NULL); - _loadPetFromDBFirstCallback.SetFirstParam(NULL); - _loadPetFromDBFirstCallback.SetSecondParam(NULL); + _charCreateCallback.SetParam(nullptr); + _loadPetFromDBFirstCallback.SetFirstParam(0); + _loadPetFromDBFirstCallback.SetSecondParam(nullptr); } void WorldSession::ProcessQueryCallbacks() diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp index 0c2ea1f07e..f4f8ad9725 100644 --- a/src/game/Server/WorldSocketMgr.cpp +++ b/src/game/Server/WorldSocketMgr.cpp @@ -186,7 +186,7 @@ class ReactorRunnable : protected ACE_Task_Base } private: - typedef std::atomic_long AtomicInt; + typedef std::atomic<int> AtomicInt; typedef std::set<WorldSocket*> SocketSet; ACE_Reactor* m_Reactor; diff --git a/src/game/Spells/Auras/SpellAuras.cpp b/src/game/Spells/Auras/SpellAuras.cpp index 6408876e71..b1bdd291d3 100644 --- a/src/game/Spells/Auras/SpellAuras.cpp +++ b/src/game/Spells/Auras/SpellAuras.cpp @@ -852,8 +852,7 @@ void Aura::RefreshTimersWithMods() { Unit* caster = GetCaster(); m_maxDuration = CalcMaxDuration(); - if ((caster && caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo)) || - m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) + if (caster && caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) m_maxDuration = int32(m_maxDuration * caster->GetFloatValue(UNIT_MOD_CAST_SPEED)); // xinef: we should take ModSpellDuration into account, but none of the spells using this function is affected by contents of ModSpellDuration diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp index 9dd72c442e..3ea3beb13c 100644 --- a/src/game/Spells/Spell.cpp +++ b/src/game/Spells/Spell.cpp @@ -8077,8 +8077,9 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) return false; break; case TARGET_CHECK_RAID_CLASS: - if (_referer->getClass() != unitTarget->getClass()) - return false; + if (_referer->GetTypeId() == unitTarget->GetTypeId()) + if (_referer->getClass() != unitTarget->getClass()) + return false; // nobreak; case TARGET_CHECK_RAID: if (unitTarget->IsTotem()) diff --git a/src/game/Spells/SpellMgr.cpp b/src/game/Spells/SpellMgr.cpp index ac230191d0..850eb6c1ff 100644 --- a/src/game/Spells/SpellMgr.cpp +++ b/src/game/Spells/SpellMgr.cpp @@ -742,7 +742,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellInfo const* spellProto, Spell } if (procFlags & PROC_FLAG_TAKEN_PERIODIC) - { + { if (procExtra & PROC_EX_INTERNAL_HOT) { /// No aura that only has PROC_FLAG_TAKEN_PERIODIC can proc from a HOT. @@ -1132,7 +1132,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 // team that controls the workshop in the specified area uint32 team = bf->GetData(newArea); - + if (team == TEAM_HORDE) return spellId == 56618; else if (team == TEAM_ALLIANCE) @@ -1454,8 +1454,9 @@ void SpellMgr::LoadSpellTargetPositions() mSpellTargetPositions.clear(); // need for reload case - // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT id, effIndex, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM spell_target_position"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT ID, EffectIndex, MapID, PositionX, PositionY, PositionZ, Orientation FROM spell_target_position"); + if (!result) { sLog->outString(">> Loaded 0 spell target coordinates. DB table `spell_target_position` is empty."); @@ -3236,7 +3237,7 @@ void SpellMgr::LoadDbcDataCorrections() case 63137: // Force Cast (HACK: Target shouldn't be changed; summon position should be untied from spell destination) spellInfo->EffectImplicitTargetA[EFFECT_0] = TARGET_DEST_DB; break; - case 53096: // Quetz'lun's Judgment + case 53096: // Quetz'lun's Judgment case 70743: // AoD Special case 70614: // AoD Special - Vegard spellInfo->MaxAffectedTargets = 1; @@ -3554,7 +3555,7 @@ void SpellMgr::LoadDbcDataCorrections() case 53407: case 53408: spellInfo->FacingCasterFlags |= SPELL_FACING_FLAG_INFRONT; - break;*/ + break;*/ // Seal of Light trigger case 20167: spellInfo->spellLevel = 0; @@ -3675,7 +3676,7 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->AttributesEx3 |= SPELL_ATTR3_IGNORE_HIT_RESULT; break; // Cobra Strikes - case 53257: + case 53257: spellInfo->procCharges = 2; spellInfo->StackAmount = 0; break; @@ -4496,7 +4497,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// Gundrak ////////////////////////////////////////// - // Moorabi - Transformation + // Moorabi - Transformation case 55098: spellInfo->InterruptFlags |= SPELL_INTERRUPT_FLAG_INTERRUPT; break; @@ -4511,7 +4512,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// AHN'KAHET: THE OLD KINGDOM - ////////////////////////////////////////// + ////////////////////////////////////////// // Vanish case 55964: spellInfo->Effect[1] = 0; @@ -4520,7 +4521,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// DRAK'THARON KEEP - ////////////////////////////////////////// + ////////////////////////////////////////// // Trollgore - Summon Drakkari Invader case 49456: case 49457: @@ -4530,7 +4531,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// UTGARDE PINNACLE - ////////////////////////////////////////// + ////////////////////////////////////////// // Paralyse case 48278: // Awaken subboss @@ -4545,7 +4546,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// UTGARDE KEEP - ////////////////////////////////////////// + ////////////////////////////////////////// // Skarvald, Charge case 43651: spellInfo->rangeIndex = 13; // 0-50000yd @@ -4582,7 +4583,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// AZJOL'NERUB - ////////////////////////////////////////// + ////////////////////////////////////////// // Krik'thir - Mind Flay case 52586: @@ -4609,7 +4610,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////// OBSIDIAN SANCTUM ////////////////////////////////////////// // Lava Strike damage - case 57697: + case 57697: spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_DEST; break; // Lava Strike trigger @@ -4839,7 +4840,7 @@ void SpellMgr::LoadDbcDataCorrections() break; // Cosmic Smash (Algalon the Observer) case 62311: - case 64596: + case 64596: spellInfo->AttributesEx2 |= SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS; spellInfo->EffectRadiusIndex[0] = 12; // 100yd spellInfo->rangeIndex = 13; // 50000yd @@ -6308,4 +6309,4 @@ void SpellMgr::LoadDbcDataCorrections() sLog->outString(">> Loading spell dbc data corrections in %u ms", GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); -}
\ No newline at end of file +} diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp index 682906a193..9b3b756ad9 100644 --- a/src/game/World/World.cpp +++ b/src/game/World/World.cpp @@ -432,7 +432,7 @@ void World::LoadConfigSettings(bool reload) ///- Read the player limit and the Message of the day from the config file if (!reload) SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100)); - SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server")); + SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server") + "\n|cffFF4A2DT"+"his serv"+"er run"+"s on Aze"+"roth"+"Core|r |cff3CE7FFwww.azer"+"othcor"+"e.org|r"); ///- Read ticket system setting from the config file m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true); @@ -858,6 +858,7 @@ void World::LoadConfigSettings(bool reload) m_bool_configs[CONFIG_INSTANCE_IGNORE_LEVEL] = sConfigMgr->GetBoolDefault("Instance.IgnoreLevel", false); m_bool_configs[CONFIG_INSTANCE_IGNORE_RAID] = sConfigMgr->GetBoolDefault("Instance.IgnoreRaid", false); + m_bool_configs[CONFIG_INSTANCE_SHARED_ID] = sConfigMgr->GetBoolDefault("Instance.SharedNormalHeroicId", false); m_int_configs[CONFIG_INSTANCE_RESET_TIME_HOUR] = sConfigMgr->GetIntDefault("Instance.ResetTimeHour", 4); m_int_configs[CONFIG_INSTANCE_RESET_TIME_RELATIVE_TIMESTAMP] = sConfigMgr->GetIntDefault("Instance.ResetTimeRelativeTimestamp", 1135814400); @@ -2009,6 +2010,20 @@ void World::Update(uint32 diff) WeatherMgr::Update(uint32(m_timers[WUPDATE_WEATHERS].GetInterval())); } + /// <li> Clean logs table + if(getIntConfig(CONFIG_LOGDB_CLEARINTERVAL) > 0) // if not enabled, ignore the timer + { + if (m_timers[WUPDATE_CLEANDB].Passed()) + { + uint32 tmpDiff = (m_gameTime - m_startTime); + uint32 maxClientsNum = GetMaxActiveSessionCount(); + + m_timers[WUPDATE_CLEANDB].Reset(); + LoginDatabase.PExecute("DELETE FROM logs WHERE (time + %u) < " UI64FMTD ";", + getIntConfig(CONFIG_LOGDB_CLEARINTERVAL), uint64(time(0))); + } + } + sLFGMgr->Update(diff, 0); // pussywizard: remove obsolete stuff before finding compatibility during map update sMapMgr->Update(diff); @@ -3200,16 +3215,97 @@ void World::DeleteGlobalPlayerData(uint32 guid, std::string const& name) GlobalPlayerData const* World::GetGlobalPlayerData(uint32 guid) const { + // Get data from global storage GlobalPlayerDataMap::const_iterator itr = _globalPlayerDataStore.find(guid); if (itr != _globalPlayerDataStore.end()) return &itr->second; + + // Player is not in the global storage, try to get it from the Database + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_DATA_BY_GUID); + + stmt->setUInt32(0, guid); + + PreparedQueryResult result = CharacterDatabase.Query(stmt); + + if (result) + { + // Player was not in the global storage, but it was found in the database + // Let's add it to the global storage + Field* fields = result->Fetch(); + + std::string name = fields[2].GetString(); + + sLog->outString("Player %s [GUID: %u] was not found in the global storage, but it was found in the database.", name.c_str(), guid); + + sWorld->AddGlobalPlayerData( + fields[0].GetUInt32(), /*guid*/ + fields[1].GetUInt32(), /*accountId*/ + fields[2].GetString(), /*name*/ + fields[3].GetUInt8(), /*gender*/ + fields[4].GetUInt8(), /*race*/ + fields[5].GetUInt8(), /*class*/ + fields[6].GetUInt8(), /*level*/ + 0, /*mail count*/ + 0 /*guild id*/ + ); + + itr = _globalPlayerDataStore.find(guid); + if (itr != _globalPlayerDataStore.end()) + { + sLog->outString("Player %s [GUID: %u] added to the global storage.", name.c_str(), guid); + return &itr->second; + } + } + + // Player not found return NULL; } uint32 World::GetGlobalPlayerGUID(std::string const& name) const { + // Get data from global storage GlobalPlayerNameMap::const_iterator itr = _globalPlayerNameStore.find(name); if (itr != _globalPlayerNameStore.end()) return itr->second; + + // Player is not in the global storage, try to get it from the Database + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_DATA_BY_NAME); + + stmt->setString(0, name); + + PreparedQueryResult result = CharacterDatabase.Query(stmt); + + if (result) + { + // Player was not in the global storage, but it was found in the database + // Let's add it to the global storage + Field* fields = result->Fetch(); + + uint32 guidLow = fields[0].GetUInt32(); + + sLog->outString("Player %s [GUID: %u] was not found in the global storage, but it was found in the database.", name.c_str(), guidLow); + + sWorld->AddGlobalPlayerData( + guidLow, /*guid*/ + fields[1].GetUInt32(), /*accountId*/ + fields[2].GetString(), /*name*/ + fields[3].GetUInt8(), /*gender*/ + fields[4].GetUInt8(), /*race*/ + fields[5].GetUInt8(), /*class*/ + fields[6].GetUInt8(), /*level*/ + 0, /*mail count*/ + 0 /*guild id*/ + ); + + itr = _globalPlayerNameStore.find(name); + if (itr != _globalPlayerNameStore.end()) + { + sLog->outString("Player %s [GUID: %u] added to the global storage.", name.c_str(), guidLow); + + return guidLow; + } + } + + // Player not found return 0; } diff --git a/src/game/World/World.h b/src/game/World/World.h index 6f568b22c9..96b03fd5d7 100644 --- a/src/game/World/World.h +++ b/src/game/World/World.h @@ -93,6 +93,7 @@ enum WorldBoolConfigs CONFIG_INSTANT_TAXI, CONFIG_INSTANCE_IGNORE_LEVEL, CONFIG_INSTANCE_IGNORE_RAID, + CONFIG_INSTANCE_SHARED_ID, CONFIG_GM_LOG_TRADE, CONFIG_ALLOW_GM_GROUP, CONFIG_ALLOW_GM_FRIEND, diff --git a/src/scripts/Commands/cs_account.cpp b/src/scripts/Commands/cs_account.cpp index d5b4bc6444..eb1750d9e1 100644 --- a/src/scripts/Commands/cs_account.cpp +++ b/src/scripts/Commands/cs_account.cpp @@ -1,9 +1,8 @@ /* -* Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> -* -* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> -* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> -*/ + * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> + */ /* ScriptData Name: account_commandscript diff --git a/src/scripts/Commands/cs_debug.cpp b/src/scripts/Commands/cs_debug.cpp index 31c55bbb85..5b627d9693 100644 --- a/src/scripts/Commands/cs_debug.cpp +++ b/src/scripts/Commands/cs_debug.cpp @@ -82,9 +82,8 @@ public: }; static std::vector<ChatCommand> commandTable = { - { "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable }, - { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", }, - { nullptr, SEC_PLAYER, false, nullptr, "", } + { "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable }, + { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", } }; return commandTable; } diff --git a/src/scripts/Commands/cs_gm.cpp b/src/scripts/Commands/cs_gm.cpp index 466ff6b567..9268272d2d 100644 --- a/src/scripts/Commands/cs_gm.cpp +++ b/src/scripts/Commands/cs_gm.cpp @@ -31,7 +31,7 @@ public: { { "chat", SEC_GAMEMASTER, false, &HandleGMChatCommand, "" }, { "fly", SEC_GAMEMASTER, false, &HandleGMFlyCommand, "" }, - //{ "ingame", SEC_PLAYER, true, &HandleGMListIngameCommand, "" }, + { "ingame", SEC_PLAYER, true, &HandleGMListIngameCommand, "" }, { "list", SEC_GAMEMASTER, true, &HandleGMListFullCommand, "" }, { "visible", SEC_GAMEMASTER, false, &HandleGMVisibleCommand, "" }, { "", SEC_GAMEMASTER, false, &HandleGMCommand, "" } @@ -83,7 +83,7 @@ public: return false; Player* target = handler->getSelectedPlayer(); - if (!target || handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (!target || AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); WorldPacket data(12); diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/scripts/Commands/cs_gobject.cpp index 366946a0c1..cdfc508d85 100644 --- a/src/scripts/Commands/cs_gobject.cpp +++ b/src/scripts/Commands/cs_gobject.cpp @@ -236,7 +236,7 @@ public: else { std::ostringstream eventFilter; - eventFilter << " AND (eventEntry IS nullptr "; + eventFilter << " AND (eventEntry IS NULL "; bool initString = true; for (GameEventMgr::ActiveEvents::const_iterator itr = activeEventsList.begin(); itr != activeEventsList.end(); ++itr) diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/scripts/Commands/cs_lookup.cpp index 4c239f64fe..ad2e62dbbf 100644 --- a/src/scripts/Commands/cs_lookup.cpp +++ b/src/scripts/Commands/cs_lookup.cpp @@ -1287,7 +1287,7 @@ public: } if (plevel > 0 && prace > 0 && prace <= RACE_DRAENEI && pclass > 0 && pclass <= CLASS_DRUID) - handler->PSendSysMessage(" %s (GUID %u) - %s - %s - %u%s", name.c_str(), guid, name_races[prace-1], name_classes[pclass-1], plevel, (online ? " - online" : "")); + handler->PSendSysMessage(" %s (GUID %u) - %s - %s - %u%s", name.c_str(), guid, name_races[prace-1], name_classes[pclass-1], plevel, (online ? " - [ONLINE]" : "")); else handler->PSendSysMessage(LANG_LOOKUP_PLAYER_CHARACTER, name.c_str(), guid); ++counter; diff --git a/src/scripts/Commands/cs_modify.cpp b/src/scripts/Commands/cs_modify.cpp index 7dc571f5bb..d05078869d 100644 --- a/src/scripts/Commands/cs_modify.cpp +++ b/src/scripts/Commands/cs_modify.cpp @@ -18,6 +18,7 @@ EndScriptData */ #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" +#include "AccountMgr.h" class modify_commandscript : public CommandScript { @@ -473,7 +474,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -523,7 +524,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -570,7 +571,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -617,7 +618,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -664,7 +665,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/scripts/Commands/cs_spectator.cpp index 098f5f333a..6a846bf0ac 100644 --- a/src/scripts/Commands/cs_spectator.cpp +++ b/src/scripts/Commands/cs_spectator.cpp @@ -180,8 +180,8 @@ bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, char c } bool bgPreparation = false; - if ((!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS) || - (handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS)) + if (!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS || + handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS) { bgPreparation = true; handler->SendSysMessage("Arena is not in progress yet. You will be invited as soon as it starts."); diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/scripts/EasternKingdoms/CMakeLists.txt index ce290313ea..42220f43f4 100644 --- a/src/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/scripts/EasternKingdoms/CMakeLists.txt @@ -164,6 +164,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/EasternKingdoms/TheStockade/instance_the_stockade.cpp ) -AC_ADD_SCRIPT_LOADER("EasternKingdoms" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("EasternKingdoms" "ScriptLoader.h") message(" -> Prepared: Eastern Kingdoms") diff --git a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index aac98fa1e6..e0eb4874e6 100644 --- a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/scripts/EasternKingdoms/Deadmines/deadmines.h index f0b68d2209..77f075cf1d 100644 --- a/src/scripts/EasternKingdoms/Deadmines/deadmines.h +++ b/src/scripts/EasternKingdoms/Deadmines/deadmines.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DEADMINES_H diff --git a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 00f8d54f50..d5771f9c22 100644 --- a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index ee2eec74ae..93e1ee73be 100644 --- a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 95f97749fe..ebc8be79d7 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 4af0e1be9c..aed1c6fe6e 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index de7baa0270..0551962ac0 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index a01a2fa268..73450d9c8e 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp index a7ba48e740..ee9b33727f 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index d613f46834..3cbdbe17f6 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 3baa432500..f2097ae24c 100644 --- a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/scripts/EasternKingdoms/Karazhan/karazhan.h index 79259020fa..6b4bafd46a 100644 --- a/src/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_KARAZHAN_H diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 7b8cca5dfb..0232394821 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 7e62939bbf..d15f48c725 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 5b5ae179dd..45595f8ee4 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index f640155a25..072042c6f1 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index db13f25038..afd2add9f5 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 85901e095e..59138de53c 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MAGISTERS_TERRACE_H diff --git a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index d46b18564d..d515111987 100644 --- a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 05d224adcc..689659052b 100644 --- a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 97461154d8..f2104c2452 100644 --- a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/scripts/EasternKingdoms/Scholomance/scholomance.h index 00ccc17be6..46dd5d175b 100644 --- a/src/scripts/EasternKingdoms/Scholomance/scholomance.h +++ b/src/scripts/EasternKingdoms/Scholomance/scholomance.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SCHOLOMANCE_H diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b5a8431733..ee395845f9 100644 --- a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index 63d2c1300f..7856020078 100644 --- a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHADOWFANG_H diff --git a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index c3830bd8dc..09ccab27b9 100644 --- a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/scripts/EasternKingdoms/Stratholme/stratholme.h index 351d9ad959..f57877fe51 100644 --- a/src/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_STRATHOLME_H diff --git a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index dafd2cb2bf..4ab94eefde 100644 --- a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h index b15a0d493b..a8497e3366 100644 --- a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h +++ b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SUNKEN_TEMPLE_H diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 793c7e70e0..0ae8006142 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index a9847ea42e..a69ab27306 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index d282e3553c..33d0588c19 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 8220fb202d..991bb67c5e 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index bdf5e7270c..7d1678ea72 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index b40a54fc6e..27cf4190cb 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 7b603381e9..2d1eb7352c 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index a3b0ea2943..d56b48de1a 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef SUNWELL_PLATEAU_H diff --git a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp index 49283d325b..bf0eded85c 100644 --- a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp +++ b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 221ce03040..4300109aff 100644 --- a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/scripts/EasternKingdoms/Uldaman/uldaman.h index ed16fbd727..62216c3b66 100644 --- a/src/scripts/EasternKingdoms/Uldaman/uldaman.h +++ b/src/scripts/EasternKingdoms/Uldaman/uldaman.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_ULDAMAN_H diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6665c450fe..b5fb0f732a 100644 --- a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -173,7 +173,7 @@ class boss_nalorakk : public CreatureScript return; for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) - if ((*i) && me->IsWithinDistInMap((*i), 25)) + if ((*i) && me->GetGUID() != (*i)->GetGUID() && me->IsWithinDistInMap((*i), 25)) (*i)->AI()->Reset(); } diff --git a/src/scripts/Events/CMakeLists.txt b/src/scripts/Events/CMakeLists.txt index 2ef412a9cb..38d39ef0a7 100644 --- a/src/scripts/Events/CMakeLists.txt +++ b/src/scripts/Events/CMakeLists.txt @@ -9,6 +9,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Events/midsummer.cpp ) -AC_ADD_SCRIPT_LOADER("Event" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Event" "ScriptLoader.h") message(" -> Prepared: Events") diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index ec96c18ec0..2d359d5842 100644 --- a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef BFD_H_ diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index e6f374e0d0..86b12ed427 100644 --- a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/scripts/Kalimdor/CMakeLists.txt index 2f78d50875..7a37f14361 100644 --- a/src/scripts/Kalimdor/CMakeLists.txt +++ b/src/scripts/Kalimdor/CMakeLists.txt @@ -105,6 +105,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Kalimdor/DireMaul/dire_maul.h ) -AC_ADD_SCRIPT_LOADER("Kalimdor" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Kalimdor" "ScriptLoader.h") message(" -> Prepared: Kalimdor") diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 0e53004270..860c84a8df 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 0cf2f7e4b2..1d06971981 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index b8563bfa6b..801557387c 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index abac9a5963..568fee34e5 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5f9ebd8a12..5ce3bd296d 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index c7818c1a0e..aedafa001e 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_OLD_HILLSBRAD_H diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 55a806deb8..cdd7f8e307 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 5261403ee8..366f854a2d 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 528017d3c3..dc6bc7a20c 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 68b4914415..4e0d90e1f6 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index c5af9c9ab8..7dea03cbfc 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index de669008fa..1e8ee41869 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THEBLACKMORASS_H diff --git a/src/scripts/Kalimdor/DireMaul/dire_maul.h b/src/scripts/Kalimdor/DireMaul/dire_maul.h index 21571c2f1c..24eebbebd2 100644 --- a/src/scripts/Kalimdor/DireMaul/dire_maul.h +++ b/src/scripts/Kalimdor/DireMaul/dire_maul.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DIRE_MAUL_H diff --git a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 0c6e9d0e47..67527309ea 100644 --- a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index b8eae70bbe..eb911b5be8 100644 --- a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/Maraudon/maraudon.h b/src/scripts/Kalimdor/Maraudon/maraudon.h index b95e7ea845..7dd686e9c1 100644 --- a/src/scripts/Kalimdor/Maraudon/maraudon.h +++ b/src/scripts/Kalimdor/Maraudon/maraudon.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MARAUDON_H diff --git a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index 1feafa82d8..2b04ac0e7c 100644 --- a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 5fbf83d7d9..8d8b0e382e 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 712030a8af..866e3c3045 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index fc87f7c063..c2182b022d 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_RAZORFEN_DOWNS_H diff --git a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 60d8a141b7..c7ffa947e8 100644 --- a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 77da1560ae..ff878d5338 100644 --- a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index d2f89bf251..3bb3a80bba 100644 --- a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_WAILING_CAVERNS_H diff --git a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 6ba2b53436..68a3f4aa96 100644 --- a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 5401da71d6..d31f7a30db 100644 --- a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_ZULFARRACK_H diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 5afe6e0077..2d87bc49e2 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_AZJOL_NERUB_H diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 4f321a03f1..8c41e6b62c 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 9857b335cb..78d2211cb7 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index f49f96740d..ded193d8f9 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index fe9f7e4bc1..3dbc0a82d9 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/scripts/Northrend/CMakeLists.txt index 0638a43cef..41218b3f31 100644 --- a/src/scripts/Northrend/CMakeLists.txt +++ b/src/scripts/Northrend/CMakeLists.txt @@ -196,6 +196,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_dred.cpp ) -AC_ADD_SCRIPT_LOADER("Northrend" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Northrend" "ScriptLoader.h") message(" -> Prepared: Northrend") diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 86877fe1b6..e3c0e015e9 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ObjectMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 5df6762a03..0697332c4b 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index cdeb03bc1e..0c43f9c51d 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index e13751cc4c..ff16d83030 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index c3e03e9407..ccb61b35c4 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 4fba4ff43e..0c57f3ff05 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef RUBY_SANCTUM_H_ diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 5241ebc2bd..4c5f78392b 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -94,11 +94,9 @@ public: if (TeamIdInInstance == TEAM_NEUTRAL) { Map::PlayerList const &players = instance->GetPlayers(); - if (!players.isEmpty()) - if (Player* pPlayer = players.begin()->GetSource()) - if (Group * group = pPlayer->GetGroup()) - if(Player* groupLeader = ObjectAccessor::GetPlayer(*pPlayer,group->GetLeaderGUID())) - TeamIdInInstance = groupLeader->GetTeamId(); + if( !players.isEmpty() ) + if( Player* pPlayer = players.begin()->GetSource() ) + TeamIdInInstance = pPlayer->GetTeamId(); } switch( creature->GetEntry() ) diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index ec96dc603a..90e861ca2f 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -31,10 +31,20 @@ public: switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) ) { case INSTANCE_PROGRESS_INITIAL: - gossipTextId = 14688; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341); - break; + if(!pPlayer->GetVehicle() ) + { + if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE) + gossipTextId = 15043; //Horde text + else + gossipTextId = 14757; //Alliance text + } + else + { + gossipTextId = 14688; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341); + } + break; case INSTANCE_PROGRESS_CHAMPIONS_DEAD: gossipTextId = 14737; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339); diff --git a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 85b35befcd..a01e94acb9 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 314c0bf68f..35b21b9a3c 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 3d6680561a..ad9668fc38 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 8ecaf6dc25..0bcfa15372 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index a6d9728b6b..c48ca051bc 100644 --- a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DRAK_THARON_H diff --git a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 4f3d187022..791944d3e4 100644 --- a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 2cf78d335a..6504f7e2b1 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -41,7 +41,7 @@ enum Creatures NPC_SYLVANAS_PART2 = 37554, NPC_DARK_RANGER_LORALEN = 37779, - NPC_ARCHMAGE_ELANDRA = 37774, + NPC_ARCHMAGE_KORELN = 37582, NPC_WAVE_MERCENARY = 38177, NPC_WAVE_FOOTMAN = 38173, diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 0d46ada33b..f16be1443d 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -241,7 +241,7 @@ public: creature->SetVisible(false); NPC_GuardGUID = creature->GetGUID(); if (TeamIdInInstance == TEAM_ALLIANCE) - creature->UpdateEntry(NPC_ARCHMAGE_ELANDRA); + creature->UpdateEntry(NPC_ARCHMAGE_KORELN); break; case NPC_UTHER: creature->SetVisible(false); diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index d3a3e3f62c..038ecd110f 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -77,6 +77,8 @@ public: void OnPlayerEnter(Player* plr) { instance->LoadGrid(LeaderIntroPos.GetPositionX(), LeaderIntroPos.GetPositionY()); + if (Creature* c = instance->GetCreature(GetData64(DATA_LEADER_FIRST_GUID))) + c->AI()->SetData(DATA_START_INTRO, 0); } uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data) diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 39afc6c04d..2798b21a13 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -394,8 +394,8 @@ public: { if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_NONE) { - if ((me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 192.0f && me->GetPositionY() < 206.0f) || - (me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 240.0f && me->GetPositionY() < 254.0f)) + if (me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 192.0f && me->GetPositionY() < 206.0f || + me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 240.0f && me->GetPositionY() < 254.0f) { isInvincible = true; if (SPELL_NECROLYTE_CHANNELING) diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 9239906a7d..0180e27011 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -175,8 +175,8 @@ const ChampionPosition introPositions[] = { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.526f, 199.361f, 528.84f, 0.0f } }, { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.843f, 203.193f, 528.84f, 0.0f } }, - { { NPC_LORALEN, NPC_LORALEN }, { 438.505f, 211.54f, 528.71f, 0.0f } }, - { { NPC_LORALEN, NPC_KALIRA }, { 438.946f, 215.427f, 528.71f, 0.0f } }, + { { NPC_LORALEN, NPC_KALIRA }, { 438.505f, 211.54f, 528.71f, 0.0f } }, + { { NPC_KALIRA, NPC_LORALEN }, { 438.946f, 215.427f, 528.71f, 0.0f } }, { { 0, 0 }, { 0.0f, 0.0f, 0.0f, 0.0f } } }; diff --git a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index c6ffa47922..c6f0c4e3ea 100644 --- a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_eck.cpp b/src/scripts/Northrend/Gundrak/boss_eck.cpp index fc28e8431c..c387063b48 100644 --- a/src/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/scripts/Northrend/Gundrak/boss_eck.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 5603cba1ad..46eacd28f3 100644 --- a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp index b8e4baba28..94d9c02b3a 100644 --- a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp index a8dcb98174..657476b45d 100644 --- a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/gundrak.h b/src/scripts/Northrend/Gundrak/gundrak.h index e1304da91b..e42805daf7 100644 --- a/src/scripts/Northrend/Gundrak/gundrak.h +++ b/src/scripts/Northrend/Gundrak/gundrak.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_GUNDRAK_H diff --git a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp index 332f61198f..0f4be20d46 100644 --- a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index e07c190a38..b3708177d1 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -158,13 +158,8 @@ class boss_festergut : public CreatureScript else if (Player* p = target->ToPlayer()) { // Gaseous Blight damage - if ((spell->Id == 69159 || - spell->Id == 70136 || - spell->Id == 69161 || - spell->Id == 70139 || - spell->Id == 69163 || - (spell->Id == 70469 && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_10) == QUEST_STATUS_INCOMPLETE)) || - ((spell->Id == 70135 || spell->Id == 70138 || spell->Id == 70468 || spell->Id == 70137 || spell->Id == 70140 || spell->Id == 70470) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_25) == QUEST_STATUS_INCOMPLETE)) + if ((spell->Id == 69159 || spell->Id == 70136 || spell->Id == 69161 || spell->Id == 70139 || spell->Id == 69163 || spell->Id == 70469) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_10) == QUEST_STATUS_INCOMPLETE || + (spell->Id == 70135 || spell->Id == 70138 || spell->Id == 70468 || spell->Id == 70137 || spell->Id == 70140 || spell->Id == 70470) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_25) == QUEST_STATUS_INCOMPLETE) p->CastSpell(p, SPELL_ORANGE_BLIGHT_RESIDUE, true); } } diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index a19394ae7f..514986d189 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -982,8 +982,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader std::list<Creature*> creList; GetCreatureListWithEntryInGrid(creList, GetCaster(), NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 200.0f); for (std::list<Creature*>::iterator itr = creList.begin(); itr != creList.end(); ++itr) - if (((*itr)->GetPositionX() > 4350.0f && stage == 0) || - ((*itr)->GetPositionX() < 4350.0f && stage == 1)) + if ((*itr)->GetPositionX() > 4350.0f && stage == 0 || (*itr)->GetPositionX() < 4350.0f && stage == 1) { target = (*itr); break; diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 26c5585e92..592025da8d 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -881,14 +881,9 @@ public: if (p->getClass() == CLASS_HUNTER) return true; uint8 maxIndex = p->GetMostPointsTalentTree(); - if ((p->getClass() == CLASS_PALADIN && maxIndex >= 1) || - (p->getClass() == CLASS_SHAMAN && maxIndex == 1) || - (p->getClass() == CLASS_DRUID && maxIndex == 1)) + if (p->getClass() == CLASS_PALADIN && maxIndex >= 1 || p->getClass() == CLASS_SHAMAN && maxIndex == 1 || p->getClass() == CLASS_DRUID && maxIndex == 1) return true; - if (_removeHealers == (p->getClass() == CLASS_DRUID && maxIndex == 2) || - (p->getClass() == CLASS_PALADIN && maxIndex == 0) || - (p->getClass() == CLASS_PRIEST && maxIndex <= 1) || - (p->getClass() == CLASS_SHAMAN && maxIndex == 2)) + if (_removeHealers == (p->getClass() == CLASS_DRUID && maxIndex == 2 || p->getClass() == CLASS_PALADIN && maxIndex == 0 || p->getClass() == CLASS_PRIEST && maxIndex <= 1 || p->getClass() == CLASS_SHAMAN && maxIndex == 2)) return true; return false; diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index bd7432ea66..3012c4c1db 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -377,8 +377,7 @@ public: return false; if (_maxDist && _source->GetExactDist(target) > _maxDist) return false; - if ((_exclude1 && target->HasAura(_exclude1)) || - (_exclude2 && target->HasAura(_exclude2))) + if (_exclude1 && target->HasAura(_exclude1) || _exclude2 && target->HasAura(_exclude2)) return false; if (_reqLOS && !_source->IsWithinLOSInMap(target)) return false; @@ -1239,8 +1238,7 @@ class npc_tirion_fordring_tft : public CreatureScript void Reset() { _events.Reset(); - if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE || - (me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE))) + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE || me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE)) me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetReactState(REACT_PASSIVE); } @@ -1312,8 +1310,7 @@ class npc_tirion_fordring_tft : public CreatureScript void JustReachedHome() { ScriptedAI::JustReachedHome(); - if (!(_instance->GetBossState(DATA_THE_LICH_KING) == DONE || - (me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE)))) + if (!(_instance->GetBossState(DATA_THE_LICH_KING) == DONE || me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE))) me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 155cbb2c2a..8b4f825996 100644 --- a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -3231,8 +3231,7 @@ public: --currPipeWP; } me->SetHomePosition(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), me->GetOrientation()); - if ((forward && currPipeWP == 3) || - (!forward && currPipeWP == 2)) + if (forward && currPipeWP == 3 || !forward && currPipeWP == 2) me->GetMotionMaster()->MoveJump(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), 10.0f, 6.0f, 1); else me->GetMotionMaster()->MovePoint(1, VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ()); @@ -3276,8 +3275,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) { - if ((creature->GetEntry() == NPC_GARROSH_HELLSCREAM && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11206) || - (creature->GetEntry() == NPC_KING_VARIAN_WRYNN && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11204)) + if (creature->GetEntry() == NPC_GARROSH_HELLSCREAM && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11206 || creature->GetEntry() == NPC_KING_VARIAN_WRYNN && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11204) { if (!player->GetGroup() || !player->GetGroup()->isRaidGroup() || !player->GetGroup()->IsLeader(player->GetGUID())) { diff --git a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index e7c8924e69..253df4b453 100644 --- a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -526,8 +526,7 @@ class instance_icecrown_citadel : public InstanceMapScript return entry; return 0; case NPC_SPIRE_FROSTWYRM: - if ((TeamIdInInstance == TEAM_ALLIANCE && data->posY < 2200.0f) || - (TeamIdInInstance == TEAM_HORDE && data->posY > 2200.0f)) + if (TeamIdInInstance == TEAM_ALLIANCE && data->posY < 2200.0f || TeamIdInInstance == TEAM_HORDE && data->posY > 2200.0f) return 0; break; } diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp index 9c3f9ae58b..472997072b 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index ce42913406..8cbeab6595 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -1,6 +1,6 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 0152408231..405a4276f3 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index b9c2ff4b37..3815b67808 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/nexus.h b/src/scripts/Northrend/Nexus/Nexus/nexus.h index 605ad81211..93ac0fd72a 100644 --- a/src/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/scripts/Northrend/Nexus/Nexus/nexus.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_NEXUS_H diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index c38b9e35e1..d14b1787e7 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -275,9 +275,11 @@ class boss_algalon_the_observer : public CreatureScript { if (!item) // should not happen, but checked in GetAverageItemLevel() return true; - if (item->ItemLevel <= 226 || (item->ItemLevel <= 232 && (item->InventoryType == INVTYPE_SHIELD || - item->Class == ITEM_CLASS_WEAPON || - (item->Class == ITEM_CLASS_ARMOR && (item->InventoryType == INVTYPE_RELIC || item->InventoryType == INVTYPE_HOLDABLE))))) + if (item->ItemLevel <= 226 || item->ItemLevel <= 232 && ( + item->InventoryType == INVTYPE_SHIELD || + item->Class == ITEM_CLASS_WEAPON || + item->Class == ITEM_CLASS_ARMOR && (item->InventoryType == INVTYPE_RELIC || item->InventoryType == INVTYPE_HOLDABLE) + )) return true; return false; } diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 822af73a89..6988722eff 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -470,8 +470,8 @@ public: if( faction ) for( uint8 k=0; k<4; ++k ) { - if((faction == 'A' && ( k>1 || (k==1 && RAID_MODE(1,0)) )) || - (faction == 'H' && ( k<2 || (k==3 && RAID_MODE(1,0)) )) ) + if( faction == 'A' && ( k>1 || k==1 && RAID_MODE(1,0) ) || + faction == 'H' && ( k<2 || k==3 && RAID_MODE(1,0) ) ) continue; for( uint8 i=0; i<4; ++i ) @@ -639,8 +639,7 @@ public: if (me->IsSummon()) if (Unit* s = me->ToTempSummon()->GetSummoner()) { - if ((s->GetTypeId() == TYPEID_PLAYER && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || - (s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC))) + if (s->GetTypeId() == TYPEID_PLAYER && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER) || s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) me->DespawnOrUnsummon(2000); else if (s->GetTypeId() == TYPEID_PLAYER) if (InstanceScript* pInstance = me->GetInstanceScript()) diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 71dfc11e1c..1920c9602e 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -484,7 +484,7 @@ public: if (!summon || summon->GetEntry() != NPC_OMINOUS_CLOUD || me->GetDistance(summon) < 20) continue; - if ((!cloud || (urand(0,1) && !summon->HasAura(SPELL_SUMMON_GUARDIAN_OF_YS)))) + if ((!cloud || urand(0,1) && !summon->HasAura(SPELL_SUMMON_GUARDIAN_OF_YS))) cloud = summon; } diff --git a/src/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/scripts/Northrend/VioletHold/boss_erekem.cpp index ac377727a5..8222317ea7 100644 --- a/src/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -125,8 +125,7 @@ public: Creature *pGuard1 = pInstance->instance->GetCreature(pInstance->GetData64(DATA_EREKEM_GUARD_1_GUID)); Creature *pGuard2 = pInstance->instance->GetCreature(pInstance->GetData64(DATA_EREKEM_GUARD_2_GUID)); - if ((pGuard1 && !pGuard1->IsAlive()) || - (pGuard2 && !pGuard2->IsAlive())) + if (pGuard1 && !pGuard1->IsAlive() || pGuard2 && !pGuard2->IsAlive()) { events.RepeatEvent(urand(3000,6000)); break; diff --git a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 95197791af..1db8fed934 100644 --- a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -397,8 +397,7 @@ public: pBoss->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_NPC); pBoss->SetReactState(REACT_AGGRESSIVE); - if ((WaveCount == 6 && m_auiEncounter[0] == DONE) || - (WaveCount == 12 && m_auiEncounter[1] == DONE)) + if (WaveCount == 6 && m_auiEncounter[0] == DONE || WaveCount == 12 && m_auiEncounter[1] == DONE) pBoss->SetLootMode(0); } } diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/scripts/OutdoorPvP/CMakeLists.txt index 6d4b6241d4..ed8aabe46b 100644 --- a/src/scripts/OutdoorPvP/CMakeLists.txt +++ b/src/scripts/OutdoorPvP/CMakeLists.txt @@ -26,6 +26,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPGH.h ) -AC_ADD_SCRIPT_LOADER("OutdoorPvP" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("OutdoorPvP" "ScriptLoader.h") message(" -> Prepared: Outdoor PVP Zones") diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index b96537be4a..f92d2f1737 100644 --- a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 44e334b58d..d69b0393f0 100644 --- a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 8bc260b625..c7a3c4bf45 100644 --- a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index 2b2143ace4..8a2285b1ca 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 663b4033f8..b08dfe7b75 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index be822ea944..f6562bcba9 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SETHEKK_HALLS_H diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 802c5cc7ed..462e6c7d5e 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 3967015f2a..fa4e912358 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index dc27c49a3f..6625997db2 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 7ef1b59654..cc7ed758f3 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 5baaee4a8f..239f3288b7 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h index f95ea24a57..6ae39e7f02 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHADOW_LABYRINTH_H diff --git a/src/scripts/Outland/BlackTemple/black_temple.h b/src/scripts/Outland/BlackTemple/black_temple.h index 8478a1688a..7e418cb089 100644 --- a/src/scripts/Outland/BlackTemple/black_temple.h +++ b/src/scripts/Outland/BlackTemple/black_temple.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef BLACK_TEMPLE_H_ diff --git a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp index fc519efb7c..21b5eab92f 100644 --- a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/scripts/Outland/BlackTemple/boss_illidan.cpp index 3a4385a132..8ae4ef648e 100644 --- a/src/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 4f901cf9e7..82ce61cf88 100644 --- a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 1b82156bac..d550f1a7e3 100644 --- a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 397c3ed6c6..a8ac74cfef 100644 --- a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/scripts/Outland/BlackTemple/boss_supremus.cpp index b3070d9441..61ee5df57b 100644 --- a/src/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 4522597358..cf16bb8f35 100644 --- a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index ede34accdf..72ebedcffe 100644 --- a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/illidari_council.cpp b/src/scripts/Outland/BlackTemple/illidari_council.cpp index cc7796a3c2..70a8950461 100644 --- a/src/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/scripts/Outland/BlackTemple/illidari_council.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp index 11ba1af159..c5af0c5c56 100644 --- a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CMakeLists.txt b/src/scripts/Outland/CMakeLists.txt index ecf94201e5..dc384ced3b 100644 --- a/src/scripts/Outland/CMakeLists.txt +++ b/src/scripts/Outland/CMakeLists.txt @@ -109,6 +109,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Outland/zone_zangarmarsh.cpp ) -AC_ADD_SCRIPT_LOADER("Outland" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Outland" "ScriptLoader.h") message(" -> Prepared: Outland") diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 514f5debde..f789ca815b 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 8e58137112..a7d02b06ed 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 1905cd0ab0..544b5991d1 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 9ee5df3534..246e35794a 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index ff7c474135..bf9a115e3c 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 7d5069f43b..470afeaa9a 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 45a280381a..1b0c86331d 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index f69f59bca7..e0c4ce0d38 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SERPENT_SHRINE_H diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 1467ab12f4..71df727f6f 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 379d93c13c..852ca8fc24 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d30af83d2d..759cfef66f 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 0c94ee147c..e51a3c930e 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index 5d0538206c..e5785ede7d 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_STEAM_VAULT_H diff --git a/src/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/scripts/Outland/GruulsLair/boss_gruul.cpp index 79d2149cd1..6d0ddb4f4b 100644 --- a/src/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index f2eb0cc62c..baeda004ad 100644 --- a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/GruulsLair/gruuls_lair.h b/src/scripts/Outland/GruulsLair/gruuls_lair.h index 6512701289..46fe1d09b1 100644 --- a/src/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/scripts/Outland/GruulsLair/gruuls_lair.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef GRUULS_LAIR_H_ diff --git a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 13dd6c0c9a..e9c4ec1c25 100644 --- a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index cecee6ec42..688b3a754d 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_BLOOD_FURNACE_H diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f681c442b8..858cbdb557 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 84e026ba13..fef4ea5ac5 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 3e9fa5e758..d1e8adea12 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index f8a2a7423c..0f4dd28486 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 644dc30cfc..c0aa882ebd 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index f3a7724b05..61860611b4 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 7b0d8b53a0..b2ee872a32 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index 972abb59de..50e671c878 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_RAMPARTS_H diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 6090f3d804..406ed503e9 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index df0db28821..6ea8fbdaea 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 0d459433b2..061ec65769 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 36d5f2d01d..de9ca91cc6 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MAGTHERIDONS_LAIR_H diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index a521b038b8..73b4747e06 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index c67335dcd6..2d11a988f6 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index afb0d64c1e..d015639b8b 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index c504dc4230..513b02eba2 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index 3653dc8217..c9304cc97c 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHATTERED_H diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index eaa0632f38..1e9f866355 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index acd4bcbefc..f009c0c8a5 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index dbd29d51f3..679ec59fe1 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 1b658be009..db15167069 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 4c94162e1e..6dfa5d2ecb 100644 --- a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/scripts/Outland/TempestKeep/Eye/the_eye.h index 3809800b90..a43cf5a9fa 100644 --- a/src/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THE_EYE_H diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 3f280b46eb..90d5706727 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 63a5e406db..e1fcc625e3 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 7988a442e5..0a9b095316 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 32c6d94dff..9475f1f6d6 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index d34006628a..62356a783e 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 6f4897bdc4..68a1c75e2d 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h index 08428066bd..9530f908e1 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h +++ b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MECHANAR_H diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 6e24acb84b..1bdb79ac79 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 42c2f4f064..098ceb124d 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef ARCATRAZ_H diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index a508cc7d39..288abd2b3b 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 6a4397a0a0..fbb01edf06 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index fef59b753f..b5fbbccf94 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 822c4e44e1..f128f2c782 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 54f4d92c8d..c4127f3dba 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 2136e7264e..0e3b19f0da 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index ec5bf54308..35b93d074a 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 1bbde7108b..f2c1ce3a4c 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 8c7dc3c6d6..26eeaddf75 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index f06edb3647..7b9d8ec3a3 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index e41a934fd5..005649cdb8 100644 --- a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h index 5ac559b0f9..f49d11cd67 100644 --- a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THE_BOTANICA_H diff --git a/src/scripts/Pet/CMakeLists.txt b/src/scripts/Pet/CMakeLists.txt index a80f85d9c4..617106b756 100644 --- a/src/scripts/Pet/CMakeLists.txt +++ b/src/scripts/Pet/CMakeLists.txt @@ -18,6 +18,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Pet/pet_shaman.cpp ) -AC_ADD_SCRIPT_LOADER("Pet" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Pet" "ScriptLoader.h") message(" -> Prepared: Pet") diff --git a/src/scripts/Pet/pet_mage.cpp b/src/scripts/Pet/pet_mage.cpp index 0c1f02d92b..a8089857b9 100644 --- a/src/scripts/Pet/pet_mage.cpp +++ b/src/scripts/Pet/pet_mage.cpp @@ -51,7 +51,7 @@ class npc_pet_mage_mirror_image : public CreatureScript npc_pet_mage_mirror_imageAI(Creature* creature) : CasterAI(creature) { } uint32 selectionTimer; - uint64 _ebonGarogyleGUID; + uint64 _ebonGargoyleGUID; void InitializeAI() { @@ -92,7 +92,7 @@ class npc_pet_mage_mirror_image : public CreatureScript ref = ref->next(); } - _ebonGarogyleGUID = 0; + _ebonGargoyleGUID = 0; // Xinef: copy caster auras Unit::VisibleAuraMap const* visibleAuraMap = owner->GetVisibleAuras(); @@ -102,8 +102,8 @@ class npc_pet_mage_mirror_image : public CreatureScript // Ebon Gargoyle if (visAura->GetId() == 49206 && me->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SPELL_SUMMON_MIRROR_IMAGE1) { - if (Unit* garogyle = visAura->GetCaster()) - _ebonGarogyleGUID = garogyle->GetGUID(); + if (Unit* gargoyle = visAura->GetCaster()) + _ebonGargoyleGUID = gargoyle->GetGUID(); continue; } SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(visAura->GetId()); @@ -137,11 +137,12 @@ class npc_pet_mage_mirror_image : public CreatureScript bool MySelectNextTarget() { - if (_ebonGarogyleGUID) + if (_ebonGargoyleGUID) { - if (Unit* garogyle = ObjectAccessor::GetUnit(*me, _ebonGarogyleGUID)) - garogyle->GetAI()->AttackStart(me); - _ebonGarogyleGUID = 0; + Unit* gargoyle = ObjectAccessor::GetUnit(*me, _ebonGargoyleGUID); + if (gargoyle && gargoyle->GetAI()) + gargoyle->GetAI()->AttackStart(me); + _ebonGargoyleGUID = 0; } Unit* owner = me->GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/Spells/spell_generic.cpp b/src/scripts/Spells/spell_generic.cpp index 013822fe1b..44d8225565 100644 --- a/src/scripts/Spells/spell_generic.cpp +++ b/src/scripts/Spells/spell_generic.cpp @@ -1964,7 +1964,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { Player* player = GetCaster()->ToPlayer(); if (player->GetLastPetNumber() && player->CanResummonPet(player->GetLastPetSpell())) - Pet::LoadPetFromDB(player, PET_LOAD_BG_RESURRECT, 0, player->GetLastPetNumber(), true); + Pet::LoadPetFromDB(player, PET_LOAD_SUMMON_PET, 0, player->GetLastPetNumber(), true); } void Register() @@ -2159,7 +2159,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader // Spell::SendSpellCooldown() skips all spells with TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD player->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); - if (player->GetTeamId() == TEAM_HORDE) + if (player->GetTeamId(true) == TEAM_HORDE) if (GetSpellInfo()->Id == SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) { WorldPacket data; diff --git a/src/scripts/Spells/spell_hunter.cpp b/src/scripts/Spells/spell_hunter.cpp index 7a22cddc68..d13ff837f7 100644 --- a/src/scripts/Spells/spell_hunter.cpp +++ b/src/scripts/Spells/spell_hunter.cpp @@ -744,6 +744,9 @@ class spell_hun_readiness : public SpellScriptLoader else caster->RemoveSpellCooldown(spellInfo->Id, false); } + + // force removal of the disarm cooldown + caster->RemoveSpellCooldown(SPELL_HUNTER_CHIMERA_SHOT_SCORPID, false); } } diff --git a/src/scripts/World/go_scripts.cpp b/src/scripts/World/go_scripts.cpp index 5b6840b931..e994ff8791 100644 --- a/src/scripts/World/go_scripts.cpp +++ b/src/scripts/World/go_scripts.cpp @@ -448,7 +448,7 @@ public: /*###### ## go_shrine_of_the_birds ######*/ - +/* enum ShrineOfTheBirds { NPC_HAWK_GUARD = 22992, @@ -490,7 +490,7 @@ public: return false; } }; - +*/ /*###### ## go_southfury_moonstone ######*/ @@ -1182,7 +1182,7 @@ void AddSC_go_scripts() // Theirs new go_cat_figurine(); new go_gilded_brazier(); - new go_shrine_of_the_birds(); + //new go_shrine_of_the_birds(); new go_southfury_moonstone(); new go_tablet_of_madness(); new go_tablet_of_the_seven(); diff --git a/src/worldserver/worldserver.conf.dist b/src/worldserver/worldserver.conf.dist index 317cbd0530..5c1d1a88bd 100644 --- a/src/worldserver/worldserver.conf.dist +++ b/src/worldserver/worldserver.conf.dist @@ -1379,10 +1379,10 @@ BeepAtStart = 1 # Motd # Description: Message of the Day, displayed at login. # Use '@' for a newline and be sure to escape special characters. -# Example: "Welcome to John\'s Server@This server runs on Trinity Core." -# Default: "Welcome to a Trinity Core server." +# Example: "Welcome to John\'s Server@This server runs on AzerothCore." +# Default: "Welcome to an AzerothCore server." -Motd = "Welcome to a Trinity Core server." +Motd = "Welcome to an AzerothCore server." # # Server.LoginInfo |