Merge 3.3.5 to npcbots_3.3.5

cmake/macros/CheckPlatform.cmake

@@ -9,7 +9,7 @@ endif()
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
   set(TRINITY_SYSTEM_PROCESSOR "amd64")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)64$")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM|aarch)64$")
   set(TRINITY_SYSTEM_PROCESSOR "arm64")
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)$")
   set(TRINITY_SYSTEM_PROCESSOR "arm")

dep/argon2/CMakeLists.txt

@@ -12,10 +12,10 @@ file(GLOB_RECURSE sources *.c)
 
 if(TRINITY_SYSTEM_PROCESSOR MATCHES "x86|amd64")
   list(REMOVE_ITEM sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c)
 else()
   list(REMOVE_ITEM sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c)
 endif()
 
 add_library(argon2 STATIC

sql/updates/world/3.3.5/2024_03_29_00_world.sql

@@ -0,0 +1,7 @@
+-- "Artifacts of the Blacksilt" shouldn't have a prevquest requirement
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=9549;
+
+-- Breadcrumb quest Fix
+DELETE FROM `quest_template_addon` WHERE `ID`=10063;
+INSERT INTO `quest_template_addon` (`ID`, `BreadcrumbForQuestId`) VALUES
+(10063,9549);

sql/updates/world/3.3.5/2024_03_29_01_world.sql

@@ -0,0 +1,2 @@
+-- Defender Adrielle Gossip Menu Text
+UPDATE `creature_template` SET `gossip_menu_id`=7539 WHERE `entry`=18020;

sql/updates/world/3.3.5/2024_03_29_02_world.sql

@@ -0,0 +1,6 @@
+-- Missing Gossip Otions for "Galaen's Journal"
+DELETE FROM `gossip_menu_option` WHERE `MenuID`IN (7493,7492,7491);
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(7493,0,0,"<Turn to the next page.>",14429,1,1,7492,0,0,0,"",0,0),
+(7492,0,0,"<Turn to the next page.>",14429,1,1,7491,0,0,0,"",0,0),
+(7491,0,0,"<Turn to the next page.>",14429,1,1,7490,0,0,0,"",0,0);

sql/updates/world/3.3.5/2024_03_29_03_world.sql

@@ -0,0 +1,2 @@
+-- Remove creature Galaen (he is spawned by script)
+DELETE FROM `creature` WHERE `guid`=86514;

sql/updates/world/3.3.5/2024_03_29_04_world.sql

@@ -0,0 +1,4 @@
+-- Quest "What Argus Means to Me" should not be availably when you have quest "Report to Exarch Admetius" in your log (Not Breadcrumb)
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 19 AND `SourceEntry`=9693;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(19,0,9693,0,0,28,0,9668,0,0,1,0,0,'',"Don't show quest 'What Argus Means to Me' if quest 'Report To Exarch Admetius' is taken");

sql/updates/world/3.3.5/2024_03_29_05_world.sql

@@ -0,0 +1,10 @@
+-- Vindicator Aesom gossip menu text changes after turning in quest "The Sun Gate"
+-- Gossip menu
+DELETE FROM `gossip_menu` WHERE `MenuID`=7517 AND `TextID`=9130;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7517,9130,0);
+
+-- Condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7517;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7517,9130,0,0,8,0,9740,0,0,0,0,0,"","Gossip text 9130 requires quest The Sun Gate (9740) rewarded");

sql/updates/world/3.3.5/2024_03_29_06_world.sql

@@ -0,0 +1,12 @@
+-- High Chief Stillpine is missing gossip menu text
+DELETE FROM `gossip_menu` WHERE `MenuID`=7434 AND `TextID`=9173;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7434,9173,0);
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7434 AND `SourceEntry` IN (9173,9039);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7434,9173,0,0,8,0,9544,0,0,1,0,0,"","Gossip text 9173 requires quest 'The Prophecy of Akida (9544)' not rewarded and"),
+(14,7434,9173,0,0,47,0,9663,10,0,0,0,0,"","Gossip text 9173 requires players to have quest 'The Kessel Run' (9663) taken (active)"),
+(14,7434,9039,0,1,8,0,9544,0,0,0,0,0,"","Gossip text 9039 requires quest 'The Prophecy of Akida (9544)' rewarded and"),
+(14,7434,9039,0,1,47,0,9663,10,0,0,0,0,"","Gossip text 9039 requires players to have quest 'The Kessel Run' (9663) taken (active)");

sql/updates/world/3.3.5/2024_03_29_07_world.sql

@@ -0,0 +1,17 @@
+-- Vindicator Boros gossip menu changes after turning in quest "I Shoot Magic Into the Darkness"
+-- Gossip menu
+DELETE FROM `gossip_menu` WHERE `MenuID`=7465 AND `TextID`=9076;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7465,9076,0);
+
+-- Missing Gossip Otions for Vindicator Boros during quest "I Shoot Magic Inte the Darkness"
+-- Gossip menu option text
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=7465;
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(7465,0,0,"Where should I begin my search for the portal?",14503,1,1,7501,0,0,0,"",0,0);
+
+-- Condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=7465;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7465,9076,0,0,8,0,9700,0,0,0,0,0,"","Gossip text 9076 requires quest 'I Shoot Magic Into the Darkness' rewarded"),
+(15,7465,0,0,0,47,0,9700,10,0,0,0,0,'','Show gossip menu options only if Quest 9700 is taken (active)');

sql/updates/world/3.3.5/2024_03_29_08_world.sql

@@ -0,0 +1,16 @@
+-- Missing Gossip Otions for Jessera of Mac'Aree during quest "Mac'Aree Mushroom Menagerie"
+-- Gossip option text
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=7452 AND `OptionID` IN (0,1,2,3);
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(7452,0,0,"Jessera, could you direct me towards the aquatic stinkhorn?",14284,1,1,7453,0,0,0,"",0,0),
+(7452,1,0,"Jessera, could you direct me towards the ruinous polyspore?",14287,1,1,7454,0,0,0,"",0,0),
+(7452,2,0,"Jessera, could you direct me towards the fel cone fungus?",14290,1,1,7456,0,0,0,"",0,0),
+(7452,3,0,"Jessera, could you direct me towards the blood mushrooms?",14292,1,1,7457,0,0,0,"",0,0);
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 15 AND `SourceGroup`=7452 AND `SourceEntry` IN (0,1,2,3);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7452,0,0,0,47,0,9648,10,0,0,0,0,'',"Show gossip menu options only if Quest 9648 is taken (active)"),
+(15,7452,1,0,0,47,0,9648,10,0,0,0,0,'',"Show gossip menu options only if Quest 9648 is taken (active)"),
+(15,7452,2,0,0,47,0,9648,10,0,0,0,0,'',"Show gossip menu options only if Quest 9648 is taken (active)"),
+(15,7452,3,0,0,47,0,9648,10,0,0,0,0,'',"Show gossip menu options only if Quest 9648 is taken (active)");

sql/updates/world/3.3.5/2024_03_29_09_world.sql

@@ -0,0 +1,13 @@
+-- Aqueous's gossip menu text changes after turning in quest "Call of Water" (9508)
+DELETE FROM `gossip_menu` WHERE `MenuID`=7417 AND `TextID` IN (8958,9014,9016);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7417,8958,0),
+(7417,9014,0),
+(7417,9016,0);
+
+-- Condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7417 AND `SourceEntry` IN (9014,9015,9016);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7417,9014,0,0,15,0,64,0,0,0,0,0,"","Gossip text 9014 requires players to be a Shaman"),
+(14,7417,9015,0,0,8,0,9501,0,0,0,0,0,"","Gossip text 9015 requires quest 'Call of Water' (9501) rewarded"),
+(14,7417,9016,0,0,8,0,9508,0,0,0,0,0,"","Gossip text 9016 requires quest 'Call of Water' (9508) rewarded");

sql/updates/world/3.3.5/2024_03_29_10_world.sql

@@ -0,0 +1,10 @@
+-- Vindicator Kuros gossip menu changes after turning in quest "The Cryo-Core"
+-- Gossip menu
+DELETE FROM `gossip_menu` WHERE `MenuID`=7489 AND `TextID`=9107;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7489,9107,0);
+
+-- Condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7489;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7489,9107,0,0,8,0,9703,0,0,0,0,0,"","Gossip text 9107 requires quest 'The Cryo-Core' rewarded");

sql/updates/world/3.3.5/2024_03_29_11_world.sql

@@ -0,0 +1,31 @@
+-- Library Guardian (29724)
+DELETE FROM `creature` WHERE `id`=29724 AND `guid` IN (83139,83140,83141,83142,83143);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(83139, 29724, 571, 0, 0, 1, 1, 26475, 1, 8058.83, -854.984, 971.823, 0.628318011760711669, 300, 0, 0, 12175, 3893, 0, 0, 0, 0, '', 0),
+(83140, 29724, 571, 0, 0, 1, 1, 26475, 1, 8064.08, -831.682, 971.823, 5.427969932556152343, 300, 0, 0, 12175, 3893, 0, 0, 0, 0, '', 0),
+(83141, 29724, 571, 0, 0, 1, 1, 26475, 1, 8110.12, -871.216, 957.133, 6.126110076904296875, 300, 0, 0, 12175, 3893, 0, 0, 0, 0, '', 0),
+(83142, 29724, 571, 0, 0, 1, 1, 26475, 1, 8117.55, -838.988, 957.313, 6.230820178985595703, 300, 0, 0, 12175, 3893, 0, 0, 0, 0, '', 0),
+(83143, 29724, 571, 0, 0, 1, 1, 26475, 1, 8129.377, -859.2718, 955.6569, 6.045253276824951171, 300, 0, 0, 12175, 3893, 2, 0, 0, 0, '', 0);
+
+-- Waypoints
+SET @PATH=83143 * 10;
+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, 0, 8087.6626, -849.15497, 970.93066, NULL, 0, 0, 0, 100, 0),
+(@PATH, 1, 8088.6396, -849.36865, 970.93066, NULL, 0, 0, 0, 100, 0),
+(@PATH, 2, 8091.55, -850.0977, 968.5479, NULL, 0, 0, 0, 100, 0),
+(@PATH, 3, 8095.437, -851.04047, 966.1648, NULL, 0, 0, 0, 100, 0),
+(@PATH, 4, 8099.324, -851.9832, 963.7824, NULL, 0, 0, 0, 100, 0),
+(@PATH, 5, 8103.2114, -852.92596, 961.39984, NULL, 0, 0, 0, 100, 0),
+(@PATH, 6, 8107.0986, -853.8687, 959.09894, NULL, 0, 0, 0, 100, 0),
+(@PATH, 7, 8110.986, -854.81146, 956.6338, NULL, 0, 0, 0, 100, 0),
+(@PATH, 8, 8114.873, -855.7542, 956.57263, NULL, 0, 0, 0, 100, 0),
+(@PATH, 9, 8118.7603, -856.69696, 956.595, NULL, 0, 0, 0, 100, 0),
+(@PATH, 10, 8122.6475, -857.6397, 956.32056, NULL, 0, 0, 0, 100, 0),
+(@PATH, 11, 8126.5347, -858.58246, 955.9371, NULL, 0, 0, 0, 100, 0),
+(@PATH, 12, 8130.422, -859.5252, 955.5539, NULL, 0, 0, 0, 100, 0),
+(@PATH, 13, 8134.47, -860.507, 955.6393, NULL, 0, 0, 0, 100, 0);
+
+DELETE FROM `creature_addon` WHERE `guid`=83143;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(83143, @PATH, 9474, 0, 0, 0, 0, 0, 0, 0, 0, NULL);

sql/updates/world/3.3.5/2024_03_29_12_world.sql

@@ -0,0 +1,12 @@
+-- Captured Sunhawk Agent missing dialogue after interrogation
+-- Script
+UPDATE `smart_scripts` SET `link`=2 WHERE `entryorguid`=17824 AND `id`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17824 AND `id` IN (2,3);
+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`,`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
+(17824,0,2,3,61,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Captured Sunhawk Agent - On Link - Set Orientation Invoker"),
+(17824,0,3,0,61,0,100,0,9141,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,'Captured Sunhawk Agent - On Link - Say Text 0');
+
+-- Creature text
+DELETE FROM `creature_text` WHERE `CreatureID`=17824; 
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17824,0,0,"Treacherous whelp! Sironas will destroy you and your people!",12,7,100,5,0,0,14637,0,"Captured Sunhawk Agent");