Skip to content

Commit 5eb6871

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-paymaster
2 parents 3c33e30 + 35c045f commit 5eb6871

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2918
-1676
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ clone_depth: 1
44
init:
55
- ps: ''
66
environment:
7-
BOOST_ROOT: C:\Libraries\boost_1_83_0
7+
BOOST_ROOT: C:\Libraries\boost_1_85_0
88
MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0
99
OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64
1010
build_script:

‎sql/base/characters_database.sql‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,14 +2508,15 @@ DROP TABLE IF EXISTS `quest_tracker`;
25082508
/*!40101 SET @saved_cs_client = @@character_set_client */;
25092509
/*!50503 SET character_set_client = utf8mb4 */;
25102510
CREATE TABLE `quest_tracker` (
2511-
`id` mediumint unsigned NOT NULL DEFAULT '0',
2511+
`id` int unsigned NOT NULL DEFAULT '0',
25122512
`character_guid` int unsigned NOT NULL DEFAULT '0',
25132513
`quest_accept_time` datetime NOT NULL,
25142514
`quest_complete_time` datetime DEFAULT NULL,
25152515
`quest_abandon_time` datetime DEFAULT NULL,
25162516
`completed_by_gm` tinyint(1) NOT NULL DEFAULT '0',
25172517
`core_hash` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
2518-
`core_revision` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0'
2518+
`core_revision` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
2519+
UNIQUE KEY `idx_latest_quest_for_character` (`id`,`character_guid`,`quest_accept_time` DESC)
25192520
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
25202521
/*!40101 SET character_set_client = @saved_cs_client */;
25212522

@@ -2690,7 +2691,8 @@ INSERT INTO `updates` VALUES
26902691
('2024_08_17_00_characters.sql','08705FBCB8504E8B1009FDAF955F56D734FAD782','ARCHIVED','2024-08-17 22:26:12',0),
26912692
('2024_10_03_00_characters.sql','408249A6992999A36EB94089D184972E8E0767A3','ARCHIVED','2024-10-03 11:10:18',0),
26922693
('2024_11_22_00_characters.sql','9EA2A4F88036D1D5F47EE8A6B634D52D0014986E','ARCHIVED','2024-11-22 23:18:14',0),
2693-
('2025_07_20_00_characters_2022_07_03_00_characters.sql','D3F04078C0846BCF7C8330AC20C39B8C3AEE7002','RELEASED','2022-07-03 23:37:24',0);
2694+
('2025_07_20_00_characters_2022_07_03_00_characters.sql','D3F04078C0846BCF7C8330AC20C39B8C3AEE7002','RELEASED','2022-07-03 23:37:24',0),
2695+
('2025_09_09_00_characters.sql','A1A793D656117C31DAA92653DF0BE4AE6354358A','RELEASED','2025-09-09 14:03:38',0);
26942696
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
26952697
UNLOCK TABLES;
26962698

‎sql/updates/characters/3.3.5/2025_09_09_00_characters.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE `quest_tracker`
2+
MODIFY COLUMN `id` int UNSIGNED NOT NULL DEFAULT 0 FIRST,
3+
ADD UNIQUE INDEX `idx_latest_quest_for_character`(`id`, `character_guid`, `quest_accept_time` DESC);

‎sql/updates/world/3.3.5/2025_09_09_00_world.sql‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
--
2+
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 3439;
3+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 3439 AND `source_type` = 0;
4+
DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 343900 AND 343903 AND `source_type` = 9;
5+
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
6+
(3439,0,0,0,19,0,100,0,863,0,0,0,0,80,343900,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Quest 'The Escape' Taken - Run Script"),
7+
8+
(343900,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Store Targetlist"),
9+
(343900,9,1,0,0,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Set Faction 113"),
10+
(343900,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Remove NPC Flag Questgiver"),
11+
(343900,9,3,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 0"),
12+
(343900,9,4,0,0,0,100,0,6000,6000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 1"),
13+
(343900,9,5,0,0,0,100,0,0,0,0,0,0,53,1,343900,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Start Waypoint"),
14+
15+
(3439,0,1,0,58,0,100,0,0,343900,0,0,0,80,343901,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Waypoint Finished - Run Script"),
16+
17+
(343901,9,0,0,0,0,100,0,3000,3000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 2"),
18+
(343901,9,1,0,0,0,100,0,0,0,0,0,0,53,0,343901,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Start Waypoint"),
19+
20+
(3439,0,2,0,58,0,100,0,0,343901,0,0,0,80,343902,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Waypoint Finished - Run Script"),
21+
22+
(343902,9,0,0,0,0,100,0,5000,5000,0,0,0,107,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Summon Group 0"),
23+
-- Our ugly hack
24+
(343902,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,19,3282,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 0 (Venture Co. Mercenary)"),
25+
-- Not entirely correct, more like when both summons are killed
26+
(343902,9,2,0,0,0,100,0,8000,8000,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 3"),
27+
(343902,9,3,0,0,0,100,0,3000,3000,0,0,0,53,1,343902,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Start Waypoint"),
28+
29+
(3439,0,3,0,58,0,100,0,0,343902,0,0,0,80,343903,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Waypoint Finished - Run Script"),
30+
31+
(343903,9,0,0,0,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 4"),
32+
(343903,9,1,0,0,0,100,0,4000,4000,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 5"),
33+
(343903,9,2,0,0,0,100,0,2000,2000,0,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Say Line 6"),
34+
(343903,9,4,0,0,0,100,0,6000,6000,0,0,0,15,863,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Quest Credit 'The Escape'"),
35+
(343903,9,5,0,0,0,100,0,0,0,0,0,0,11,5162,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Cast 'Self Explosion'"),
36+
-- Summon should be handled by GameEvent from the spell above but it doesn't work
37+
(343903,9,6,0,0,0,100,0,0,0,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Summon Group 1"),
38+
(343903,9,7,0,0,0,100,0,0,0,0,0,0,41,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Script - Despawn"),
39+
40+
(3439,0,4,0,6,0,100,0,0,0,0,0,0,6,863,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Wizzlecrank's Shredder - On Death - Fail Quest 'The Escape'");
41+
42+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 3451 AND `source_type` = 0;
43+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 345100 AND `source_type` = 9;
44+
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
45+
(3451,0,0,0,11,0,100,0,0,0,0,0,0,80,345100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pilot Wizzlecrank - On Spawn - Run Script"),
46+
47+
(345100,9,0,0,0,0,100,0,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,0,1011.5695,-2948.5574,94.42255,0,"Pilot Wizzlecrank - On Script - Move To Position"),
48+
(345100,9,1,0,0,0,100,0,1500,1500,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pilot Wizzlecrank - On Script - Say Line 0"),
49+
(345100,9,2,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pilot Wizzlecrank - On Script - Say Line 1"),
50+
-- Guessed
51+
(345100,9,3,0,0,0,100,0,20000,20000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pilot Wizzlecrank - On Script - Despawn");
52+
53+
DELETE FROM `creature_summon_groups` WHERE `summonerId` = 3439 AND `summonerType` = 0;
54+
INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
55+
(3439,0,0,3282,1075.1216,-2983.9827,92.90724,5.811946392059326171,4,60000,"Wizzlecrank's Shredder - Group 0 - Venture Co. Mercenary"),
56+
(3439,0,0,3282,1119.6910,-2970.8733,97.15814,4.014257431030273437,4,60000,"Wizzlecrank's Shredder - Group 0 - Venture Co. Mercenary"),
57+
58+
(3439,0,1,3451,1014.9248,-2945.6086,94.50288,2.114160060882568359,8,0,"Wizzlecrank's Shredder - Group 1 - Pilot Wizzlecrank");
59+
60+
DELETE FROM `script_waypoint` WHERE `entry` = 3439;
61+
DELETE FROM `waypoints` WHERE `entry` BETWEEN 343900 AND 343902;
62+
INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
63+
-- There only 4 waypoints at start but without adding all points we get too short path
64+
(343900,1,1107.5569,-3102.9243,82.8109,"Wizzlecrank's Shredder"),
65+
(343900,2,1106.3069,-3105.4243,83.0609,"Wizzlecrank's Shredder"),
66+
(343900,3,1109.0569,-3106.9243,82.8109,"Wizzlecrank's Shredder"),
67+
(343900,4,1110.8069,-3104.6743,82.5609,"Wizzlecrank's Shredder"),
68+
(343900,5,1108.4622,-3101.7402,82.21095,"Wizzlecrank's Shredder"), --
69+
(343900,6,1111.0613,-3104.9868,82.52319,"Wizzlecrank's Shredder"),
70+
(343900,7,1108.8113,-3101.7368,82.52319,"Wizzlecrank's Shredder"),
71+
(343900,8,1105.0613,-3102.9868,83.02319,"Wizzlecrank's Shredder"),
72+
(343900,9,1104.5613,-3103.2368,83.02319,"Wizzlecrank's Shredder"),
73+
(343900,10,1109.3113,-3103.7368,82.52319,"Wizzlecrank's Shredder"),
74+
(343900,11,1113.4314,-3104.049,82.46095,"Wizzlecrank's Shredder"), --
75+
(343900,12,1104.9719,-3103.0159,83.22392,"Wizzlecrank's Shredder"),
76+
(343900,13,1104.4719,-3103.2659,83.22392,"Wizzlecrank's Shredder"),
77+
(343900,14,1109.2219,-3103.7659,82.72392,"Wizzlecrank's Shredder"),
78+
(343900,15,1113.4719,-3104.0159,82.97392,"Wizzlecrank's Shredder"),
79+
(343900,16,1113.4719,-3107.0159,82.97392,"Wizzlecrank's Shredder"),
80+
(343900,17,1106.7219,-3108.2659,83.22392,"Wizzlecrank's Shredder"),
81+
(343900,18,1106.2535,-3108.632,83.08595,"Wizzlecrank's Shredder"), --
82+
(343900,19,1113.3845,-3104.1714,82.82361,"Wizzlecrank's Shredder"),
83+
(343900,20,1113.3845,-3106.9214,82.82361,"Wizzlecrank's Shredder"),
84+
(343900,21,1106.8845,-3108.4214,83.32361,"Wizzlecrank's Shredder"),
85+
(343900,22,1106.3845,-3108.4214,83.32361,"Wizzlecrank's Shredder"),
86+
(343900,23,1101.6771,-3104.3665,83.21095,"Wizzlecrank's Shredder"), --
87+
88+
(343901,1,1101.3541,-3096.9792,83.0092,"Wizzlecrank's Shredder"),
89+
(343901,2,1098.4445,-3060.212,82.08001,"Wizzlecrank's Shredder"),
90+
(343901,3,1090.5764,-3034.908,82.70501,"Wizzlecrank's Shredder"),
91+
(343901,4,1103.0762,-3013.2773,85.65292,"Wizzlecrank's Shredder"),
92+
(343901,5,1100.8525,-3002.5137,89.65292,"Wizzlecrank's Shredder"),
93+
(343901,6,1093.6041,-2977.8281,92.21579,"Wizzlecrank's Shredder"),
94+
95+
(343902,1,1068.5104,-2980.486,93.59079,"Wizzlecrank's Shredder"),
96+
(343902,2,1070.0381,-2957.5312,93.54168,"Wizzlecrank's Shredder"),
97+
(343902,3,1042.0365,-2964.448,93.29168,"Wizzlecrank's Shredder"),
98+
(343902,4,1037.1163,-2938.5747,91.91668,"Wizzlecrank's Shredder"),
99+
(343902,5,1014.908,-2943.962,94.54755,"Wizzlecrank's Shredder");
100+
101+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 3282 AND `source_type` = 0 AND `id` = 2;
102+
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
103+
(3282,0,2,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Venture Co. Mercenary - On Just Summoned - Start Attack");

‎sql/updates/world/3.3.5/2025_09_09_01_world.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--
2+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_moroes_garrote_remove';
3+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
4+
(37870, 'spell_moroes_garrote_remove');
5+
6+
DELETE FROM `creature_text` WHERE `CreatureID` = 15687 AND `GroupID` = 4;
7+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
8+
(15687,4,0,"%s goes into a frenzy!",16,0,100,0,0,0,1191,0,"moroes EMOTE_FRENZY");

0 commit comments

Comments
 (0)