Merge pull request #37 from liyunfan1223/Playerbot

pbot

AUTHORS

@@ -16,21 +16,21 @@ Development of this project dates back to 2004, and was developed under various
 * SD2 project, 2008-2009, located at http://www.scriptdev2.com/
 * TrinityCore, 2008-2012, located at https://www.trinitycore.org/
 * SunwellCore 2012-2016, privately developed, more info at https://www.azerothcore.org/pages/sunwell.pl/
-* AzerothCore, 2016-2023, located at https://www.azerothcore.org/
+* AzerothCore, 2016-CURRENT, located at https://www.azerothcore.org/
 
 ## Authorship of the code
 Authorship is assigned for each commit within the git history, which is stored in these git repositories:
 * github.com/cmangos/mangos-svn (History from MaNGOS project from 2005-2008, originally hosted at http://mangos.svn.sourceforge.net)
 * github.com/TrinityCore/TrinityCore
 * github.com/azerothcore/azerothcore-wotlk
 
-Unfortunately we have no detailed information of the history of the WoWD project;
+Unfortunately, we have no detailed information on the history of the WoWD project;
 if somebody can provide information, please contact us, so that we can make this history available
 
-SunwellCore developed privately and has no git history.
+SunwellCore was developed privately and has unfortunately no git history.
 
-## Exceptions with third party libraries
-The third party libraries have their own way of addressing authorship, and the authorship of commits importing/ updating
-a third party library reflects who did the importing instead of who wrote the code within the commit.
+## Exceptions with third-party libraries
+The third-party libraries have their own way of addressing authorship, and the authorship of commits importing/updating
+a third-party library reflects who did the importing instead of who wrote the code within the commit.
 
-The Authors of third party libraries are not explicitly mentioned, and usually are possible to obtain from the files belonging to the third party libraries.
+The Authors of third-party libraries are not explicitly mentioned, and usually is possible to obtain from the files belonging to the third-party libraries.

apps/ci/mac/ci-compile.sh

@@ -10,12 +10,23 @@ ccache -s
 
 cd var/build/obj
 
+mysql_include_path=$(brew --prefix mysql)/include/mysql
+mysql_lib_path=$(brew --prefix mysql)/lib/libmysqlclient.dylib
+
+if [ ! -d "$mysql_include_path" ]; then
+    echo "Original mysql include directory doesn't exist. Lets try to use the first available folder in mysql dir."
+    base_dir=$(brew --cellar mysql)/$(basename $(ls -d $(brew --cellar mysql)/*/ | head -n 1))
+    echo "Trying the next mysql base dir: $base_dir"
+    mysql_include_path=$base_dir/include/mysql
+    mysql_lib_path=$base_dir/lib/libmysqlclient.dylib
+fi
+
 time cmake ../../../ \
 -DTOOLS_BUILD=all \
 -DSCRIPTS=static \
 -DCMAKE_BUILD_TYPE=Release \
--DMYSQL_ADD_INCLUDE_PATH=/usr/local/include \
--DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib \
+-DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \
+-DMYSQL_LIBRARY=$mysql_lib_path \
 -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \
 -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \
 -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \

apps/docker/Dockerfile

@@ -8,7 +8,6 @@ FROM ubuntu:$UBUNTU_VERSION AS skeleton
 ARG DOCKER=1
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV TZ=$TZ
 ENV AC_FORCE_CREATE_DB=1
 
 RUN mkdir -pv \
@@ -29,11 +28,12 @@ RUN mkdir -pv \
         /azerothcore/build
 
 # Configure Timezone
-RUN apt-get update                                          \
-    && apt-get install -y tzdata ca-certificates            \
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime   \
-    && echo $TZ > /etc/timezone                         \
-    && dpkg-reconfigure --frontend noninteractive tzdata
+RUN apt-get update                                                       \
+    && apt-get install -y --no-install-recommends tzdata ca-certificates \
+    && ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime                  \
+    && echo "$TZ" > /etc/timezone                                          \
+    && dpkg-reconfigure --frontend noninteractive tzdata                 \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /azerothcore
 
@@ -145,7 +145,7 @@ ENTRYPOINT ["/usr/bin/env", "bash", "/azerothcore/entrypoint.sh"]
 ###############
 
 FROM runtime AS authserver
-LABEL description "AzerothCore Auth Server"
+LABEL description="AzerothCore Auth Server"
 
 ENV ACORE_COMPONENT=authserver
 # Don't run database migrations. We can leave that up to the db-import container
@@ -167,7 +167,7 @@ CMD ["authserver"]
 
 FROM runtime AS worldserver
 
-LABEL description "AzerothCore World Server"
+LABEL description="AzerothCore World Server"
 
 ENV ACORE_COMPONENT=worldserver
 # Don't run database migrations. We can leave that up to the db-import container
@@ -190,7 +190,7 @@ CMD ["worldserver"]
 
 FROM runtime AS db-import
 
-LABEL description "AzerothCore Database Import tool"
+LABEL description="AzerothCore Database Import tool"
 
 USER $DOCKER_USER
 
@@ -203,7 +203,7 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER\
      --from=build \
      /azerothcore/env/dist/bin/dbimport /azerothcore/env/dist/bin/dbimport
 
-CMD /azerothcore/env/dist/bin/dbimport
+CMD [ "/azerothcore/env/dist/bin/dbimport" ]
 
 ###############
 # Client Data #
@@ -225,15 +225,15 @@ VOLUME /azerothcore/env/dist/data
 
 USER $DOCKER_USER
 
-CMD bash -c "source /azerothcore/apps/installer/includes/functions.sh && inst_download_client_data"
+CMD ["bash",  "-c", "source /azerothcore/apps/installer/includes/functions.sh && inst_download_client_data" ]
 
 ##################
 # Map Extractors #
 ##################
 
 FROM runtime AS tools
 
-LABEL description "AzerothCore Tools"
+LABEL description="AzerothCore Tools"
 
 WORKDIR /azerothcore/env/dist/
 

apps/installer/includes/functions.sh

@@ -39,7 +39,7 @@ function inst_configureOS() {
             # TODO: implement different configurations by distro
             source "$AC_PATH_INSTALLER/includes/os_configs/$DISTRO.sh"
         ;;
-        bsd*)     echo "BSD is not supported yet" ;;
+        *bsd*)     echo "BSD is not supported yet" ;;
         msys*)    source "$AC_PATH_INSTALLER/includes/os_configs/windows.sh" ;;
         *)        echo "This platform is not supported" ;;
     esac

data/sql/updates/db_world/2024_08_01_00.sql

@@ -0,0 +1,2 @@
+-- DB update 2024_07_31_00 -> 2024_08_01_00
+DELETE FROM `spell_script_names` WHERE `spell_id` = 32014;

data/sql/updates/db_world/2024_08_02_00.sql

@@ -0,0 +1,8 @@
+-- DB update 2024_08_01_00 -> 2024_08_02_00
+-- Flame Wave.
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (18975,19740));
+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`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(18975, 0, 0, 0, 0, 0, 75, 0, 5000, 10000, 15000, 20000, 0, 0, 11, 33804, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathguard - In Combat - Cast \'Flame Wave\''),
+(19740, 0, 0, 0, 0, 0, 75, 0, 5000, 10000, 15000, 20000, 0, 0, 11, 33804, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathwalker - In Combat - Cast \'Flame Wave\'');
+
+UPDATE `creature_template` SET `faction` = 90 WHERE (`entry` = 19381);

data/sql/updates/db_world/2024_08_05_00.sql

@@ -0,0 +1,2 @@
+-- DB update 2024_08_02_00 -> 2024_08_05_00
+UPDATE `creature_template` SET `flags_extra` = `flags_extra`|256 WHERE `entry` = 17968;

data/sql/updates/db_world/2024_08_06_00.sql

@@ -0,0 +1,2 @@
+-- DB update 2024_08_05_00 -> 2024_08_06_00
+UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 7 WHERE `creature_id` IN (17977,21582);

data/sql/updates/db_world/2024_08_06_01.sql

@@ -0,0 +1,8 @@
+-- DB update 2024_08_06_00 -> 2024_08_06_01
+UPDATE `creature_loot_template` SET `Chance` = 50, `GroupId` = 2 WHERE `Entry` = 20783 AND `Reference` IN (14501, 24013);
+UPDATE `creature_loot_template` SET `Chance` = 50, `GroupId` = 1 WHERE `Entry` IN (20785, 20786, 20788, 20789, 20790) AND `Reference` IN (14501, 24013);
+UPDATE `creature_loot_template` SET `Chance` = 50, `GroupId` = 1 WHERE `Entry` = 20784 AND `Reference` = 14501;
+
+DELETE FROM `creature_loot_template` WHERE `Entry` = 20784 AND `Reference` = 24013;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(20784, 24013, 24013, 50, 0, 1, 1, 1, 1, 'Armbreaker Huffaz - (ReferenceTable)');

data/sql/updates/db_world/2024_08_06_02.sql

@@ -0,0 +1,5 @@
+-- DB update 2024_08_06_01 -> 2024_08_06_02
+--
+DELETE FROM `command` WHERE `name` = 'morph mount';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES
+('morph mount', 1, 'Syntax: .morph mount #displayid - Change the selected target\'s mount\'s model ID to #displayid.');