Skip to content

Commit 618db3f

Browse files
PkllonGPkllonG
authored
Merge branch 'master' into Fix-the-crash-2
2 parents 3806c1e + 5bef92d commit 618db3f

File tree

14 files changed

+712
-285
lines changed

14 files changed

+712
-285
lines changed

‎data/sql/updates/db_world/2025_11_08_01.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- DB update 2025_11_08_00 -> 2025_11_08_01
2+
--
3+
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 17) AND (`SourceGroup` = 0) AND (`SourceEntry` = 40969) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 31) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 3) AND (`ConditionValue2` = 23689) AND (`ConditionValue3` = 0);
4+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
5+
(17, 0, 40969, 0, 0, 31, 1, 3, 23689, 0, 0, 0, 0, '', 'Malister Frost Wand require Proto-Drake');

‎data/sql/updates/db_world/2025_11_08_02.sql‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
-- DB update 2025_11_08_01 -> 2025_11_08_02
2+
SET @BossXPMod = 7.5,
3+
@FinalBossXPMod = 10;
4+
5+
UPDATE `creature_template` SET `ExperienceModifier` = @BossXPMod WHERE `entry` IN (
6+
-- Utgarde Keep
7+
23953, -- Prince Keleseth
8+
30748,
9+
24200, -- Skarvald the Constructor
10+
31679,
11+
24201, -- Dalronn the Controller
12+
31656,
13+
-- Azjol-Nerub
14+
28684, -- Krik'thir the Gatewatcher
15+
31612,
16+
28921, -- Hadronox
17+
31611,
18+
-- Ahn'kahet: The Old Kingdom
19+
29309, -- Elder Nadox
20+
31456,
21+
29308, -- Prince Taldaram
22+
31469,
23+
29310, -- Jedoga Shadowseeker
24+
31465,
25+
30258, -- Amanitar
26+
31463,
27+
-- The Nexus
28+
26731, -- Grand Magus Telestra
29+
30510,
30+
26763, -- Anomalus
31+
30529,
32+
26794, -- Ormorok the Tree-Shaper
33+
30532,
34+
26796, -- Commander Stoutbeard
35+
30398,
36+
26798, -- Commander Kolurg
37+
30397,
38+
-- Drak'Tharon Keep
39+
26630, -- Trollgore
40+
31362,
41+
26631, -- Novos the Summoner
42+
31350,
43+
-- 27483, -- King Dred, observed to not give as much experience as this
44+
-- 31349,
45+
-- The Violet Hold
46+
29315, -- Erekem
47+
31507,
48+
29316, -- Moragg
49+
31510,
50+
29313, -- Ichoron
51+
31508,
52+
29266, -- Xevozz
53+
31511,
54+
29312, -- Lavanthor
55+
31509,
56+
29314, -- Zuramat the Obliterator
57+
31512,
58+
-- Gundrak
59+
29304, -- Slad'ran
60+
31370,
61+
-- 29573, -- Drakkari Elemental, observed to not give as much experience as this
62+
-- 31367,
63+
29305, -- Moorabi
64+
30530,
65+
29932, -- Eck the Ferocious
66+
-- Halls of Stone
67+
27975, -- Maiden of Grief
68+
31384,
69+
27977, -- Krystallus
70+
31381,
71+
-- Halls of Lightning
72+
28586, -- General Bjarngrim
73+
31533,
74+
28587, -- Volkhan
75+
31536,
76+
28546, -- Ionar
77+
31537,
78+
-- The Oculus
79+
27654, -- Drakos the Interrogator
80+
31558,
81+
27447, -- Varos Cloudstrider
82+
31559,
83+
27655, -- Mage-Lord Urom
84+
31560,
85+
-- Utgarde Pinnacle
86+
26668, -- Svala Sorrowgrave
87+
30810,
88+
26687, -- Gortok Palehoof
89+
30774,
90+
26693, -- Skadi the Ruthless
91+
30807,
92+
-- The Culling of Stratholme
93+
26529, -- Meathook
94+
31211,
95+
26530, -- Salramm the Fleshcrafter
96+
31212,
97+
26532, -- Chrono-Lord Epoch
98+
31215,
99+
32273, -- Infinite Corruptor
100+
32313,
101+
-- Trial of the Champion
102+
34705, -- Marshal Jacob Alerius
103+
36088,
104+
34702, -- Ambrose Boltspark
105+
36082,
106+
34701, -- Colosos
107+
36083,
108+
34657, -- Jaelyne Evensong
109+
36086,
110+
34703, -- Lana Stouthammer
111+
36087,
112+
35572, -- Mokra the Skullcrusher
113+
36089,
114+
35569, -- Eressea Dawnsinger
115+
36085,
116+
35571, -- Runok Wildmane
117+
36090,
118+
35570, -- Zul'tore
119+
36091,
120+
35617, -- Deathstalker Visceri
121+
36084,
122+
35119, -- Eadric the Pure
123+
35518,
124+
34928, -- Argent Confessor Paletress
125+
35517,
126+
-- The Forge of Souls
127+
36497, -- Bronjahm
128+
36498,
129+
-- Pit of Saron
130+
36494, -- Forgemaster Garfrost
131+
37613,
132+
36476, -- Ick
133+
37627,
134+
-- Halls of Reflection
135+
38112, -- Falric
136+
38599,
137+
38113, -- Marwyn
138+
38603
139+
);
140+
141+
UPDATE `creature_template` SET `ExperienceModifier` = @FinalBossXPMod WHERE `entry` IN (
142+
23954, -- Ingvar the Plunderer, Utgarde Keep
143+
31673,
144+
29120, -- Anub'arak, Azjol-Nerub
145+
31610,
146+
29311, -- Herald Volazj,
147+
31464,
148+
26723, -- Keristrasza
149+
30540,
150+
26632, -- The Prophet Tharon'ja
151+
31360,
152+
31134, -- Cyanigosa
153+
31506,
154+
29306, -- Gal'darah
155+
31368,
156+
27978, -- Sjonnir The Ironshaper
157+
31386,
158+
28923, -- Loken
159+
31538,
160+
27656, -- Ley-Guardian Eregos
161+
31561,
162+
26861, -- King Ymiron
163+
30788,
164+
26533, -- Mal'Ganis
165+
31217,
166+
35451, -- The Black Knight, Trial of the Champion
167+
35490,
168+
36502, -- Devourer of Souls, Forge of Souls
169+
37677,
170+
36658, -- Scourgelord Tyrannus, Pit of Saron
171+
36938
172+
);

‎data/sql/updates/db_world/2025_11_09_00.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2025_11_08_02 -> 2025_11_09_00
2+
--
3+
UPDATE `creature_addon` SET `visibilityDistanceType` = 3 WHERE `guid` = 103278;

‎data/sql/updates/db_world/2025_11_09_01.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2025_11_09_00 -> 2025_11_09_01
2+
--
3+
UPDATE `creature_template` SET `flags_extra` = `flags_extra`|64 WHERE `entry` IN (28220, 28218, 28242, 28103, 28212, 28207, 28170);

‎data/sql/updates/db_world/2025_11_09_02.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2025_11_09_01 -> 2025_11_09_02
2+
--
3+
DELETE FROM `creature` WHERE `id1` = 10218;

‎data/sql/updates/db_world/2025_11_09_03.sql‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
-- DB update 2025_11_09_02 -> 2025_11_09_03
2+
--
3+
-- Fixes "Bluff", Set `allowOverride` of action list
4+
UPDATE `smart_scripts` SET `action_param3` = 1 WHERE (`entryorguid` IN (23672, 23673, 23675, 24271)) AND (`source_type` = 0) AND (`event_type` = 8) AND (`event_param1` = 44609);
5+
6+
-- Removes double spawns
7+
DELETE FROM `gameobject` WHERE `id` = 186959 AND `guid` IN (264459, 264460, 264461, 264462, 264463, 264464, 264465);
8+
9+
-- Add missing aura. Usage is unknown
10+
DELETE FROM `creature_template_addon` WHERE (`entry` = 24825);
11+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
12+
(24825, 0, 0, 0, 0, 0, 0, '44652');
13+
14+
-- Disable flying vehicle, but causes camera stuttering on rocket jump
15+
UPDATE `creature_template_movement` SET `Flight` = 0 WHERE (`CreatureId` = 24825);
16+
17+
DELETE FROM `creature_text` WHERE (`CreatureID` = 24825) AND (`GroupID` = 1);
18+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
19+
(24825, 1, 0, 'Launching.', 12, 0, 100, 0, 0, 0, 23860, 0, 'Iron Rune Construct');
20+
21+
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 24825) AND (`source_type` = 0) AND (`id` IN (15, 16));
22+
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`, `event_param6`, `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
23+
(24825, 0, 15, 0, 31, 0, 100, 512, 44609, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Spellhit \'Bluff\' - Say Line 0'),
24+
(24825, 0, 16, 0, 8, 0, 100, 512, 44626, 0, 5000, 5000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Spellhit \'Rocket Jump\' - Say Line 1');
25+
-- Remove unused 'Say Line 0' in actionscripts
26+
DELETE FROM `smart_scripts` WHERE (`entryorguid` IN (2367201, 2367301, 2367501, 2427101)) AND `source_type` = 9 AND `id` = 1 AND `target_type` = 19 AND `target_param1` = 24825 AND `action_type` = 1 AND `target_param2` = 20;
27+
28+
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` IN (2, 4)) AND (`SourceEntry` = 44608) AND (`SourceId` = 0) AND (`ConditionTypeOrReference` = 31);
29+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
30+
(13, 4, 44608, 0, 0, 31, 0, 3, 24826, 0, 0, 0, 0, '', 'Rocket Jump'),
31+
(13, 4, 44608, 0, 1, 31, 0, 3, 24827, 0, 0, 0, 0, '', 'Rocket Jump'),
32+
(13, 4, 44608, 0, 2, 31, 0, 3, 24828, 0, 0, 0, 0, '', 'Rocket Jump'),
33+
(13, 4, 44608, 0, 3, 31, 0, 3, 24829, 0, 0, 0, 0, '', 'Rocket Jump'),
34+
(13, 4, 44608, 0, 4, 31, 0, 3, 24831, 0, 0, 0, 0, '', 'Rocket Jump'),
35+
(13, 4, 44608, 0, 5, 31, 0, 3, 24832, 0, 0, 0, 0, '', 'Rocket Jump'),
36+
(13, 2, 44608, 0, 0, 31, 0, 5, 186953, 0, 0, 0, 0, '', 'Rocket Jump'),
37+
(13, 2, 44608, 0, 1, 31, 0, 5, 186960, 0, 0, 0, 0, '', 'Rocket Jump'),
38+
(13, 2, 44608, 0, 2, 31, 0, 5, 186961, 0, 0, 0, 0, '', 'Rocket Jump'),
39+
(13, 2, 44608, 0, 3, 31, 0, 5, 186963, 0, 0, 0, 0, '', 'Rocket Jump'),
40+
(13, 2, 44608, 0, 4, 31, 0, 5, 186962, 0, 0, 0, 0, '', 'Rocket Jump'),
41+
(13, 2, 44608, 0, 5, 31, 0, 5, 186964, 0, 0, 0, 0, '', 'Rocket Jump');
42+
43+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 24825);
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`, `event_param6`, `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+
(24825, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 0, 0, 75, 44643, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Just Summoned - Add Aura \'Reputation and Language\''),
46+
(24825, 0, 1, 0, 28, 0, 100, 512, 0, 0, 0, 0, 0, 0, 28, 44643, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Passenger Removed - Remove Aura \'Reputation and Language\''),
47+
(24825, 0, 2, 0, 38, 0, 100, 512, 0, 1, 0, 0, 0, 0, 53, 2, 24826, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 1 - Start Waypoint Path 24826'),
48+
(24825, 0, 3, 0, 38, 0, 100, 512, 0, 2, 0, 0, 0, 0, 53, 2, 24827, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 2 - Start Waypoint Path 24827'),
49+
(24825, 0, 4, 0, 38, 0, 100, 512, 0, 3, 0, 0, 0, 0, 53, 2, 24828, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 3 - Start Waypoint Path 24828'),
50+
(24825, 0, 5, 0, 38, 0, 100, 512, 0, 4, 0, 0, 0, 0, 53, 2, 24831, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 4 - Start Waypoint Path 24831'),
51+
(24825, 0, 6, 0, 38, 0, 100, 512, 0, 5, 0, 0, 0, 0, 53, 2, 24829, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 5 - Start Waypoint Path 24829'),
52+
(24825, 0, 7, 0, 38, 0, 100, 512, 0, 6, 0, 0, 0, 0, 53, 2, 24832, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Data Set 0 6 - Start Waypoint Path 24832'),
53+
(24825, 0, 8, 0, 58, 0, 100, 512, 0, 0, 0, 0, 0, 0, 28, 44626, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Path 0 Finished - Remove Aura \'Rocket Jump\''),
54+
(24825, 0, 9, 0, 31, 0, 100, 512, 44609, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Target Spellhit \'Bluff\' - Say Line 0'),
55+
(24825, 0, 10, 0, 8, 0, 100, 512, 44626, 0, 5000, 5000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Iron Rune Construct - On Spellhit \'Rocket Jump\' - Say Line 1');
56+
--
57+
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` IN (24826, 24827, 24828, 24829, 24831, 24832));
58+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (24826, 24827, 24828, 24829, 24831, 24832));
59+
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`, `event_param6`, `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
60+
(24826, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 1'),
61+
(24827, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 2'),
62+
(24828, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 3, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 3'),
63+
(24831, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 4, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 4'),
64+
(24829, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 5, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 5'),
65+
(24832, 0, 0, 0, 8, 0, 100, 0, 44608, 0, 0, 0, 0, 0, 45, 0, 6, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'On Spellhit \'Rocket Jump\' - Set Data 0 6');
66+
67+
DELETE FROM `smart_scripts` WHERE `source_type` = 9 AND `entryorguid` IN (2482600, 2482700, 2482800, 2482900, 2483100, 2483200);

‎data/sql/updates/db_world/2025_11_09_04.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- DB update 2025_11_09_03 -> 2025_11_09_04
2+
--
3+
DELETE FROM `spell_custom_attr` WHERE `spell_id` IN (52671, 59834);
4+
INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES
5+
(52671, 0x00400000),
6+
(59834, 0x00400000);

0 commit comments

Comments
 (0)