Merge branch 'master' into Playerbot

apps/codestyle/codestyle.py

@@ -31,7 +31,8 @@ def parsing_file(directory: str) -> None:
                         multiple_blank_lines_check(file, file_path)
                         trailing_whitespace_check(file, file_path)
                         get_counter_check(file, file_path)
-                        misc_codestyle_check(file, file_path)
+                        if not file_name.endswith('.cmake') and file_name != 'CMakeLists.txt':
+                            misc_codestyle_check(file, file_path)
                         if file_name != 'Object.h':
                             get_typeid_check(file, file_path)
                         if file_name != 'Unit.h':
@@ -223,6 +224,10 @@ def misc_codestyle_check(file: io, file_path: str) -> None:
             print(
                 f"Please use the syntax 'Class/ObjectType const*' instead of 'const Class/ObjectType*': {file_path} at line {line_number}")
             check_failed = True
+        if [match for match in [' if(', ' if ( '] if match in line]:
+            print(
+                f"AC have as standard: if (XXXX). Please check spaces in your condition': {file_path} at line {line_number}")
+            check_failed = True
     # Handle the script error and update the result output
     if check_failed:
         error_handler = True

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');