Merge 3.3.5 to 3.3.5-solocraft

Author: Github Actions

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: trinitycore/circle-ci:3.3.5-base-22.04
+      - image: trinitycore/circle-ci:debian-12-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -38,7 +38,7 @@ jobs:
             cat sql/updates/world/3.3.5/*.sql | mysql -h 127.0.0.1 -uroot world
   pch:
     docker:
-      - image: trinitycore/circle-ci:3.3.5-base-22.04
+      - image: trinitycore/circle-ci:debian-12-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -97,7 +97,7 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: trinitycore/circle-ci:3.3.5-base-22.04
+      - image: trinitycore/circle-ci:debian-12-builder
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

contrib/Docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM trinitycore/circle-ci:3.3.5-base-22.04
+FROM trinitycore/circle-ci:debian-12-runner
 
 #Setup
 WORKDIR /home/circleci

sql/updates/world/3.3.5/2025_05_27_00_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 27483;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(27483,0,0,'%s raises his talons menacingly!',41,0,100,0,0,0,26745,0,'King Dred EMOTE_SLASH');

sql/updates/world/3.3.5/2025_05_27_01_world.sql

@@ -0,0 +1,19 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17826 AND `source_type` = 0;
+UPDATE `creature_template` SET `AIName` = '', `ScriptName` = 'boss_swamplord_muselek' WHERE `entry` = 17826;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17827 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1782700 AND `source_type` = 9;
+UPDATE `creature_template` SET `AIName` = '', `ScriptName` = 'npc_claw' WHERE `entry` = 17827;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_swamplord_muselek_move_away_primer';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(31564, 'spell_swamplord_muselek_move_away_primer');
+
+DELETE FROM `creature_formations` WHERE `leaderGUID` = 103246;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(103246,103246,0,0,3,0,0),
+(103246,103431,0,0,3,0,0);
+
+UPDATE `creature_template` SET `gossip_menu_id` = 0, `npcflag` = 0 WHERE `entry` IN (17827,20165);
+UPDATE `creature_template` SET `gossip_menu_id` = 7525 WHERE `entry` = 17894;

sql/updates/world/3.3.5/2025_05_28_00_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_target_position` WHERE `ID` = 58681;
+INSERT INTO `spell_target_position` (`ID`,`EffectIndex`,`MapID`,`PositionX`,`PositionY`,`PositionZ`,`Orientation`,`VerifiedBuild`) VALUES
+(58681,0,571,5386.05,2840.97,418.675,3.14159,0);

sql/updates/world/3.3.5/2025_05_28_01_world.sql

@@ -0,0 +1,2 @@
+-- Update "Return to Thrallmar" Quest requirements
+UPDATE `quest_template_addon` SET `PrevQuestID`=10129 WHERE `ID`=10388;

sql/updates/world/3.3.5/2025_05_28_02_world.sql

@@ -0,0 +1,5 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 17798 AND `GroupID` = 3 AND `ID` = 1;
+DELETE FROM `creature_text` WHERE `CreatureID` = 17798 AND `GroupID` = 5;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(17798,5,0,"%s begins to channel from the nearby distiller...",16,0,100,0,0,0,19166,0,"kalithresh EMOTE_CHANNEL");