Merge branch '3.3.5' into npcbots_3.3.5

# Conflicts:
#	src/server/game/Entities/Creature/CreatureData.h
#	src/server/game/Entities/Unit/StatSystem.cpp

.github/SECURITY.md

@@ -54,8 +54,8 @@ Versions of macOS:
 
 | macOS Version | Supported          |
 | ------------- | ------------------ |
-| 12            | :white_check_mark: |
-| 11 and lower  | :red_circle:       |
+| 14            | :white_check_mark: |
+| 12 and lower  | :red_circle:       |
 
 **Note**: We do NOT support any repacks that may or may not have been made based on AzerothCore. This is because they are usually based on older versions and there is no way to know what is in the precompiled binaries. Instead, you should compile your binaries from the AzerothCore source. To get started, read the [Installation Guide](https://www.azerothcore.org/wiki/installation).
 

.github/workflows/macos_build.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
+          - macos-14
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }}
     if: |

apps/ci/mac/ci-compile.sh

@@ -28,8 +28,8 @@ time cmake ../../../ \
 -DCMAKE_BUILD_TYPE=Release \
 -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 \
+-DREADLINE_INCLUDE_DIR=$(brew --prefix readline)/include \
+-DREADLINE_LIBRARY=$(brew --prefix readline)/lib/libreadline.dylib \
 -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \
 -DOPENSSL_SSL_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libssl.dylib" \
 -DOPENSSL_CRYPTO_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libcrypto.dylib" \

data/sql/updates/db_characters/2024_09_22_00.sql

@@ -0,0 +1,4 @@
+-- DB update 2024_09_03_00 -> 2024_09_22_00
+--
+ALTER TABLE `recovery_item`
+    ADD COLUMN `DeleteDate` INT UNSIGNED NULL DEFAULT NULL AFTER `Count`;

data/sql/updates/db_world/2024_09_21_00.sql

@@ -0,0 +1,5 @@
+-- DB update 2024_09_20_00 -> 2024_09_21_00
+--
+DELETE FROM `conditions` WHERE `SourceTypeorReferenceiD` = 18 and `SourceGroup` = 34125 AND `ConditionValue1` = 62853;
+DELETE FROM `spell_script_names` WHERE `spell_id`=63215 AND `ScriptName`='spell_gen_summon_tournament_mount';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (63215, 'spell_gen_summon_tournament_mount');

data/sql/updates/db_world/2024_09_21_01.sql

@@ -0,0 +1,3 @@
+-- DB update 2024_09_21_00 -> 2024_09_21_01
+DELETE FROM `command` WHERE `name` = 'debug cooldown';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES ('debug cooldown', 3, 'Syntax: .debug cooldown #spellID #cooldownTime #itemID\nApply a cooldown of the given duration (in milliseconds) for the given spell and item ID.');

data/sql/updates/db_world/2024_09_21_02.sql

@@ -0,0 +1,2 @@
+-- DB update 2024_09_21_01 -> 2024_09_21_02
+UPDATE `creature` SET `equipment_id` = 1 WHERE `id1` = 37967;

data/sql/updates/db_world/2024_09_22_00.sql

@@ -0,0 +1,4 @@
+-- DB update 2024_09_21_02 -> 2024_09_22_00
+--
+UPDATE `quest_offer_reward` SET `RewardText`='We will leave this place on our own, $G Lord:Lady; $N - once we are certain that the evil within has been wholly destroyed. Your journey of legend is almost at an end.', `VerifiedBuild`=0 WHERE `ID`=8801;
+UPDATE `quest_request_items` SET `CompletionText`='$G Lord:Lady; $N, you have freed us of its grasp.', `VerifiedBuild`=0 WHERE `ID`=8801;

data/sql/updates/db_world/2024_09_22_01.sql

@@ -0,0 +1,41 @@
+-- DB update 2024_09_22_00 -> 2024_09_22_01
+-- Unyielding Footman
+
+-- Runecloth chance 50 (chance was 20)
+UPDATE `creature_loot_template`
+SET `Chance` = 50, `GroupId` = 1
+WHERE `Entry` = 16904 AND `Item` = 14047;
+
+-- Netherweave Cloth chance 25 (chance was 60)
+UPDATE `creature_loot_template`
+SET `Chance` = 25, `GroupId` = 1
+WHERE `Entry` = 16904 AND `Item` = 21877;
+
+
+
+-- Unyielding Sorcerer
+
+-- Runecloth chance 50 (chance was 20)
+UPDATE `creature_loot_template`
+SET `Chance` = 50, `GroupId` = 1
+WHERE `Entry` = 16905 AND `Item` = 14047;
+
+-- Netherweave Cloth chance 25 (chance was 60)
+UPDATE `creature_loot_template`
+SET `Chance` = 25, `GroupId` = 1
+WHERE `Entry` = 16905 AND `Item` = 21877;
+
+
+
+-- Unyielding Knight
+
+-- Runecloth chance 50 (chance was 20)
+UPDATE `creature_loot_template`
+SET `Chance` = 50, `GroupId` = 1
+WHERE `Entry` = 16906 AND `Item` = 14047;
+
+-- Netherweave Cloth chance 25 (chance was 60)
+UPDATE `creature_loot_template`
+SET `Chance` = 25, `GroupId` = 1
+WHERE `Entry` = 16906 AND `Item` = 21877;
+

data/sql/updates/db_world/2024_09_22_02.sql

@@ -0,0 +1,40 @@
+-- DB update 2024_09_22_01 -> 2024_09_22_02
+-- AzjolNerub
+-- Anubarak 29120 txt line ruRU loc (BroadcastTextId unknown)
+DELETE FROM `creature_text_locale` WHERE `CreatureID`=29120 AND `GroupID`=5 AND `ID`=0 AND `locale`='ruRU' ;
+INSERT INTO `creature_text_locale` (`CreatureID`, `GroupID`, `ID`, `Locale`, `Text`) VALUES 
+(29120, 5, 0, 'ruRU', 'Я был королем этой империи, когдато. При жизни я был героем смерти, я вернулся завоевателем. Теперь я снова оберегаю это королевство. Забавно, неправда ли?');
+
+-- Pit of Saron
+-- Lady Sylvanas Windrunner 36990 use localized lines
+UPDATE `creature_text` SET `BroadcastTextId` = 37393 WHERE `CreatureID` = 36990 AND `GroupID`=7 AND `ID`=0;
+
+-- Gorkun Ironskull 37320 use localized lines 
+UPDATE `creature_text` SET `BroadcastTextId` = 37320 WHERE `CreatureID` = 37581 AND `GroupID`=61 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId` = 37321 WHERE `CreatureID` = 37581 AND `GroupID`=62 AND `ID`=0;
+
+-- Rescued Horde Slave 36889 use localized lines
+UPDATE `creature_text` SET `BroadcastTextId` = 36718 WHERE `CreatureID` = 36889 AND `GroupID`=0 AND `ID`=0;
+-- connect heroic version template
+UPDATE `creature_template` SET `difficulty_entry_1` = 37654 WHERE `entry` = 36889;
+
+-- Rescued Alliance Slave connect heroic version template
+UPDATE `creature_template` SET `difficulty_entry_1` = 37653 WHERE `entry` = 36888;
+
+-- remove duplicated line (already exist in GroupID=0
+DELETE FROM `creature_text` WHERE `CreatureID`=36993 AND `GroupID`=36 AND `ID`=0;
+DELETE FROM `creature_text` WHERE `CreatureID`=36990 AND `GroupID`=37 AND `ID`=0;
+
+-- remove duplicated line (already exist in GroupID=1
+DELETE FROM `creature_text` WHERE `CreatureID`=36990 AND `GroupID`=40 AND `ID`=0;
+DELETE FROM `creature_text` WHERE `CreatureID`=36993 AND `GroupID`=39 AND `ID`=0;
+
+-- remove duplicated line (already exist in GroupID=2
+DELETE FROM `creature_text` WHERE `CreatureID`=36990 AND `GroupID`=46 AND `ID`=0;
+
+-- update comment according to core cript
+UPDATE `creature_text` SET `comment` = 'Sylvanas SAY_SYLVANAS_KRICK_1' WHERE `CreatureID` = 36990 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `comment` = 'Sylvanas SAY_SYLVANAS_KRICK_2' WHERE `CreatureID` = 36990 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `comment` = 'Sylvanas SAY_SYLVANAS_KRICK_3' WHERE `CreatureID` = 36990 AND `GroupID`=2 AND `ID`=0;
+UPDATE `creature_text` SET `comment` = 'Jaina SAY_JAINA_KRICK_2' WHERE `CreatureID` = 36993 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `comment` = 'Jaina SAY_JAINA_KRICK_1' WHERE `CreatureID` = 36993 AND `GroupID`=0 AND `ID`=0;

data/sql/updates/db_world/2024_09_22_03.sql

@@ -0,0 +1,4 @@
+-- DB update 2024_09_22_02 -> 2024_09_22_03
+
+UPDATE `item_template` SET `BuyCount` = 20 WHERE (`entry` = 32453);
+UPDATE `item_template` SET `BuyCount` = 5 WHERE (`entry` = 32455);

data/sql/updates/db_world/2024_09_23_00.sql

@@ -0,0 +1,27 @@
+-- DB update 2024_09_22_03 -> 2024_09_23_00
+-- Bug Report #19575
+
+-- Unlink from engineering quest chain:
+-- 3638 (Goblin Engineering - Pledge of Secrecy)
+-- 3640 (gnome engineering - pledge of secrecy, alliance)
+-- 3642 (gnome engineering - pledge of secrecy, horde)
+UPDATE `quest_template` SET `RewardNextQuest`=0 WHERE `ID`=3638 OR `ID`=3640 OR `ID`=3642;
+UPDATE `quest_template` SET `RewardNextQuest`=3639 WHERE `ID`=3526 OR `ID`=3629 OR `ID`=3633 OR `ID`=4181;
+UPDATE `quest_template` SET `RewardNextQuest`=3641 WHERE `ID`=3630 OR `ID`=3632 OR `ID`=3634;
+UPDATE `quest_template` SET `RewardNextQuest`=3643 WHERE `ID`=3635 OR `ID`=3637;
+
+-- Remove Pledge of Secrecy from creature_queststarter
+DELETE FROM `creature_queststarter` WHERE `quest`=3638 OR `quest`=3640 OR `quest`=3642;
+-- Remove Pledge of Secrecy from creature_questender
+DELETE FROM `creature_questender` WHERE `quest`=3638 OR `quest`=3640 OR `quest`=3642;
+
+-- Link quests together:
+-- 3526, 3629, 3633, 4181 (Goblin Engineering) -> 3639 (Goblin Engineering - Show Your Work)
+UPDATE `quest_template_addon` SET `PrevQuestID`=3633 WHERE `ID`=3639;
+UPDATE `quest_template_addon` SET `NextQuestID`=3639 WHERE `ID`=3526 OR `ID`=3629 OR `ID`=3633 OR `ID`=4181;
+-- 3630, 3632, 3634 (Gnome Engineering - Alliance) -> 3641 (Gnome Engineering - Show Your Work - Alliance)
+UPDATE `quest_template_addon` SET `PrevQuestID`=3634 WHERE `ID`=3641;
+UPDATE `quest_template_addon` SET `NextQuestID`=3641 WHERE `ID`=3630 OR `ID`=3632 OR `ID`=3634;
+-- 3635, 3637 (Gnome Engineering - Horde) -> 3643 (Gnome Engineering - Show Your Work - Horde)
+UPDATE `quest_template_addon` SET `PrevQuestID`=3635 WHERE `ID`=3643;
+UPDATE `quest_template_addon` SET `NextQuestID`=3643 WHERE `ID`=3635 OR `ID`=3637;

data/sql/updates/db_world/2024_09_23_01.sql

@@ -0,0 +1,9 @@
+-- DB update 2024_09_23_00 -> 2024_09_23_01
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_skyguard_blasting_charges';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(39844, 'spell_item_skyguard_blasting_charges');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 17) AND (`SourceGroup` = 0) AND (`SourceEntry` = 39844) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 30) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 185549) AND (`ConditionValue2` = 30) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 39844, 0, 0, 30, 0, 185549, 30, 0, 0, 0, 0, '', ' Launch a blasting charge from your flying mount at monstrous kaliri eggs.');

data/sql/updates/db_world/2024_09_23_02.sql

@@ -0,0 +1,12 @@
+-- DB update 2024_09_23_01 -> 2024_09_23_02
+-- Updating loot for Hound of Culuthas (Entry: 20141)
+DELETE FROM `creature_loot_template` WHERE `Entry` = 20141 AND `Item` IN (25418, 25421);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(20141, 25418, 0, 80, 0, 1, 2, 1, 1, 'Hound of Culuthas - Razor Sharp Fang'),
+(20141, 25421, 0, 0, 0, 1, 2, 1, 1, 'Hound of Culuthas - Gnarled Claw');
+
+-- Updating loot for Eye of Culuthas (Entry: 20394)
+DELETE FROM `creature_loot_template` WHERE `Entry` = 20394 AND `Item` IN (29799, 29800);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(20394, 29799, 0, 80, 0, 1, 2, 1, 1, 'Eye of Culuthas - Lifeless Tendril'),
+(20394, 29800, 0, 0, 0, 1, 2, 1, 1, 'Eye of Culuthas - Evil Eye');