Skip to content

Commit 52e9174

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-vas-autobalance
2 parents d2596c5 + 87cb789 commit 52e9174

File tree

12 files changed

+1719
-1387
lines changed

12 files changed

+1719
-1387
lines changed
Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
-- Snowpacked Icicle Target
2+
UPDATE `creature_template` SET `ScriptName` = 'npc_snowpacked_icicle_target' WHERE `entry` = 33174;
3+
4+
-- Messed up friends
5+
UPDATE `creature_template` SET `ScriptName` = 'npc_hodir_druid' WHERE `entry` = 32901;
6+
UPDATE `creature_template` SET `ScriptName` = 'npc_hodir_shaman' WHERE `entry` = 32900;
7+
8+
-- Priest
9+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 62809;
10+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
11+
(13,1,62809,0,0,31,0,3,32893,0,0,0,0,"","Group 0: Spell 'Great Heal' (Effect 0) targets creature 'Missy Flamecuffs'"),
12+
(13,1,62809,0,1,31,0,3,32897,0,0,0,0,"","Group 1: Spell 'Great Heal' (Effect 0) targets creature 'Field Medic Penny'"),
13+
(13,1,62809,0,2,31,0,3,32900,0,0,0,0,"","Group 2: Spell 'Great Heal' (Effect 0) targets creature 'Elementalist Avuun'"),
14+
(13,1,62809,0,3,31,0,3,32901,0,0,0,0,"","Group 3: Spell 'Great Heal' (Effect 0) targets creature 'Ellie Nightfeather'"),
15+
(13,1,62809,0,4,31,0,3,32941,0,0,0,0,"","Group 4: Spell 'Great Heal' (Effect 0) targets creature 'Tor Greycloud'"),
16+
(13,1,62809,0,5,31,0,3,32946,0,0,0,0,"","Group 5: Spell 'Great Heal' (Effect 0) targets creature 'Veesha Blazeweaver'"),
17+
(13,1,62809,0,6,31,0,3,32948,0,0,0,0,"","Group 6: Spell 'Great Heal' (Effect 0) targets creature 'Battle-Priest Eliza'"),
18+
(13,1,62809,0,7,31,0,3,32950,0,0,0,0,"","Group 7: Spell 'Great Heal' (Effect 0) targets creature 'Spiritwalker Yona'"),
19+
(13,1,62809,0,8,31,0,3,33325,0,0,0,0,"","Group 8: Spell 'Great Heal' (Effect 0) targets creature 'Eivi Nightfeather'"),
20+
(13,1,62809,0,9,31,0,3,33326,0,0,0,0,"","Group 10: Spell 'Great Heal' (Effect 0) targets creature 'Field Medic Jessi'"),
21+
(13,1,62809,0,10,31,0,3,33327,0,0,0,0,"","Group 11: Spell 'Great Heal' (Effect 0) targets creature 'Sissy Flamecuffs'"),
22+
(13,1,62809,0,11,31,0,3,33328,0,0,0,0,"","Group 12: Spell 'Great Heal' (Effect 0) targets creature 'Elementalist Mahfuun'"),
23+
(13,1,62809,0,12,31,0,3,33330,0,0,0,0,"","Group 13: Spell 'Great Heal' (Effect 0) targets creature 'Battle-Priest Gina'"),
24+
(13,1,62809,0,13,31,0,3,33331,0,0,0,0,"","Group 14: Spell 'Great Heal' (Effect 0) targets creature 'Amira Blazeweaver'"),
25+
(13,1,62809,0,14,31,0,3,33332,0,0,0,0,"","Group 15: Spell 'Great Heal' (Effect 0) targets creature 'Spiritwalker Tara'"),
26+
(13,1,62809,0,15,31,0,3,33333,0,0,0,0,"","Group 16: Spell 'Great Heal' (Effect 0) targets creature 'Kar Greycloud'");
27+
28+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_hodir_dispel_magic';
29+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
30+
(63499, 'spell_hodir_dispel_magic');
31+
32+
-- Shaman
33+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_hodir_storm_cloud_primer';
34+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
35+
(62797, 'spell_hodir_storm_cloud_primer');
36+
37+
-- Mage
38+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 64543;
39+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
40+
(13,1,64543,0,0,31,0,3,32926,0,0,0,0,"","Group 0: Spell 'Melt Ice' (Effect 0) targets creature 'Flash Freeze'"),
41+
(13,1,64543,0,1,31,0,3,32938,0,0,0,0,"","Group 1: Spell 'Melt Ice' (Effect 0) targets creature 'Flash Freeze'");
42+
43+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_hodir_melt_ice';
44+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
45+
(64543, 'spell_hodir_melt_ice');
46+
47+
-- Toasty Fire
48+
UPDATE `creature_template` SET `unit_flags` = 33554432, `flags_extra` = `flags_extra` &~ 2 WHERE `entry` = 33342;
49+
50+
-- Flash Freeze (Init)
51+
UPDATE `creature_template` SET `ScriptName` = 'npc_flash_freeze_init' WHERE `entry` = 32938;
52+
53+
-- Flash Freeze (Combat)
54+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` &~ (128|8192) WHERE `entry` IN (32926,33352);
55+
UPDATE `creature_template` SET `ScriptName` = 'npc_flash_freeze_combat' WHERE `entry` = 32926;
56+
57+
-- Coolest Friends
58+
UPDATE `creature_template` SET `unit_flags` = `unit_flags` |32768|512, `StringId` = 'HodirCoolestFriend' WHERE `entry` IN (32893,32897,32900,32901,32941,32946,32948,32950,33325,33326,33327,33328,33330,33331,33332,33333);
59+
60+
-- Hodir
61+
DELETE FROM `creature_text` WHERE `CreatureID` = 32845 AND `GroupID` = 3;
62+
UPDATE `creature_text` SET `Sound` = 15556 WHERE `CreatureID` = 32845 AND `GroupID` = 8;
63+
64+
UPDATE `spell_script_names` SET `ScriptName` = 'spell_hodir_biting_cold_area_aura' WHERE `ScriptName` = 'spell_biting_cold';
65+
UPDATE `spell_script_names` SET `ScriptName` = 'spell_hodir_biting_cold_periodic' WHERE `ScriptName` = 'spell_biting_cold_dot';
66+
67+
DELETE FROM `spell_target_position` WHERE `ID` = 62501;
68+
INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
69+
(62501,0,603,2036.17,-201.843,432.687,3.14159,0);
70+
71+
UPDATE `gameobject_template_addon` SET `flags` = 16 WHERE `entry` IN (194201,194307,194308);
72+
UPDATE `gameobject` SET `spawntimesecs` = 604800 WHERE `id` IN (194307,194308);
73+
74+
DELETE FROM `gameobject` WHERE `guid` IN (9908,9911) AND `id` IN (194200,194201);
75+
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `StringId`, `VerifiedBuild`) VALUES
76+
(9908,194200,603,0,0,1,1,2036.169921875,-201.842605590820312,432.686798095703125,3.141592741012573242,0,0,-1,0,604800,255,1,'',NULL,0),
77+
(9911,194201,603,0,0,2,1,2036.169921875,-201.842605590820312,432.686798095703125,3.141592741012573242,0,0,-1,0,604800,255,1,'',NULL,0);
78+
79+
DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
80+
'spell_hodir_shatter_chest',
81+
'spell_hodir_icicle',
82+
'spell_hodir_icicle_force_cast',
83+
'spell_hodir_flash_freeze',
84+
'spell_hodir_freeze');
85+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
86+
(65272, 'spell_hodir_shatter_chest'),
87+
(63545, 'spell_hodir_icicle'),
88+
(62476, 'spell_hodir_icicle_force_cast'),
89+
(62477, 'spell_hodir_icicle_force_cast'),
90+
(61968, 'spell_hodir_flash_freeze'),
91+
(62469, 'spell_hodir_freeze');
92+
93+
-- Achievements
94+
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10259,10261,10247,10248,10452,10458,10258,10260,10223,10240,10241,10229,10238,10239) AND `type` IN (11,18);
95+
INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
96+
(10259,11,0,0,'achievement_cheese_the_freeze'),
97+
(10261,11,0,0,'achievement_cheese_the_freeze'),
98+
(10247,11,0,0,'achievement_getting_cold_in_here'),
99+
(10248,11,0,0,'achievement_getting_cold_in_here'),
100+
(10452,11,0,0,'achievement_this_cache_was_rare'),
101+
(10458,11,0,0,'achievement_this_cache_was_rare'),
102+
(10258,11,0,0,'achievement_i_have_the_coolest_friends'),
103+
(10260,11,0,0,'achievement_i_have_the_coolest_friends'),
104+
(10223,11,0,0,'achievement_staying_buffed_all_winter'),
105+
(10240,11,0,0,'achievement_staying_buffed_all_winter'),
106+
(10241,11,0,0,'achievement_staying_buffed_all_winter'),
107+
(10229,11,0,0,'achievement_staying_buffed_all_winter_25'),
108+
(10238,11,0,0,'achievement_staying_buffed_all_winter_25'),
109+
(10239,11,0,0,'achievement_staying_buffed_all_winter_25');
110+
111+
-- First is replaced by spell scripts, last 2 are simply removed since are based on nothing \ or simply wrong
112+
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (62821,61969,61990);
113+
114+
--
115+
UPDATE `spell_dbc` SET `DurationIndex` = 327, `Effect2` = 6, `EffectImplicitTargetA1` = 22 /*18*/, `EffectImplicitTargetA2` = 22, `EffectImplicitTargetB1` = 15, /*16*/ `EffectImplicitTargetB2` = 15, `EffectApplyAuraName2` = 4, `EffectRadiusIndex2` = 28 WHERE `Id` = 64899;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- Saragosa
2+
DELETE FROM `creature_template_movement` WHERE `CreatureId` IN (26231);
3+
INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`) VALUES
4+
(26231, 1, 1, 1, 0);
5+
6+
-- Saragosa smart ai
7+
SET @ENTRY := 26231;
8+
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
9+
DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
10+
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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
11+
(@ENTRY, 0, 0, 0, 1, 1, 100, 1, 6000, 6000, 0, 0, 28, 46789, 0, 0, 0, 0, 0, 19, 26265, 40, 0, 0, 0, 0, 0, 'Time = 6 seconds (OOC) - Closest alive creature Saragosa\'s End Invisman (26265) in 40 yards: Remove aura due to spell Blue Power Focus (46789)'),
12+
(@ENTRY, 0, 1, 2, 1, 1, 100, 1, 12000, 12000, 0, 0, 12, 26232, 1, 120000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Time = 12 seconds (OOC) - Self: Summon creature Saragosa (26232) at Self\'s position, moved by offset (0, 0, 0, 0) as summon type timed or dead despawn with duration 120 seconds'),
13+
(@ENTRY, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Time = 12 seconds (OOC) - Self: Despawn instantly'),
14+
(@ENTRY, 0, 3, 0, 54, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'On just summoned - Set event phase to phase 1');
15+
16+
17+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 26231 AND `SourceId` = 0;
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
-- Re-order texts
2+
DELETE FROM `creature_text` WHERE `CreatureID` = 17968;
3+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
4+
(17968,0,0,"All of your efforts have been in vain, for the draining of the World Tree has already begun! Soon the heart of your world will beat no more!",14,0,100,0,0,10986,20432,3,"Archimonde - SAY_INTRO"),
5+
(17968,1,0,"Your resistance is insignificant.",14,0,100,0,0,10987,18257,0,"Archimonde - SAY_AGGRO"),
6+
(17968,2,0,"You are mine now.",14,0,100,0,0,10988,18258,0,"Archimonde - SAY_CHARM_1"),
7+
(17968,2,1,"Bow to my will.",14,0,100,0,0,11042,18259,0,"Archimonde - SAY_CHARM_2"),
8+
(17968,3,0,"A-kreesh!",14,0,100,0,0,10989,18260,0,"Archimonde - SAY_AIR_BURST_1"),
9+
(17968,3,1,"Away, vermin!",14,0,100,0,0,11043,18261,0,"Archimonde - SAY_AIR_BURST_2"),
10+
(17968,4,0,"This world will burn!",14,0,100,0,0,10990,18262,0,"Archimonde - SAY_DOOMFIRE_1"),
11+
(17968,4,1,"Manach sheek-thrish!",14,0,100,0,0,11041,18263,0,"Archimonde - SAY_DOOMFIRE_2"),
12+
(17968,5,0,"Your soul will languish for eternity.",14,0,100,0,0,10991,18264,0,"Archimonde - SAY_SLAY_1"),
13+
(17968,5,1,"All creation will be devoured.",14,0,100,0,0,11044,18265,0,"Archimonde - SAY_SLAY_2"),
14+
(17968,5,2,"I am the coming of the end!",14,0,100,0,0,11045,18266,0,"Archimonde - SAY_SLAY_3"),
15+
(17968,6,0,"No, it cannot be! Nooo!",14,0,100,0,0,10992,14991,0,"Archimonde - SAY_DEATH"),
16+
(17968,7,0,"At last it is here! Mourn and lament the passing of all you have ever known, and all that would have been! Hach min corai!",14,0,100,0,0,10993,14990,0,"Archimonde - SAY_ENRAGE");
17+
18+
-- Spell scripts
19+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_protection_of_elune';
20+
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_archimonde_eternal_silence';
21+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
22+
(42201, 'spell_archimonde_eternal_silence');
23+
24+
-- Conditions
25+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` IN (32111,32124);
26+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
27+
(13,1,32111,0,0,31,0,3,17946,0,0,0,0,"","Group 0: Spell 'Finger of Death' (Effect 0) targets creature 'Ancient Wisp'"),
28+
(13,1,32124,0,0,31,0,3,17946,0,0,0,0,"","Group 0: Spell 'Denouement Wisp' targets creature 'Ancient Wisp'"),
29+
(13,1,32124,0,1,31,0,3,18502,0,0,0,0,"","Group 1: Spell 'Denouement Wisp' targets creature 'Night Elf Wisp'");
30+
31+
-- Disable proc of Soul Charge spells, doesn't look like they proc on retail
32+
DELETE FROM `spell_proc` WHERE `SpellId` IN (32045,32051,32052);
33+
INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
34+
(32045,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0),
35+
(32051,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0),
36+
(32052,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0);
37+
38+
-- Creatures involved in encounter
39+
UPDATE `creature_template` SET `speed_walk` = 3.2, `speed_run` = 2.28571, `BaseAttackTime` = 1500 WHERE `entry` = 17968;
40+
UPDATE `creature_template` SET `speed_walk` = 1.6, `flags_extra` = `flags_extra` &~ 2 WHERE `entry` = 17946;
41+
UPDATE `creature_template` SET `speed_walk` = 2.8, `speed_run` = 1 WHERE `entry` = 18095;
42+
UPDATE `creature_template` SET `speed_walk` = 1, `ScriptName` = 'npc_doomfire_spirit' WHERE `entry` = 18104;
43+
UPDATE `creature_model_info` SET `BoundingRadius` = 4.2, `CombatReach` = 12 WHERE `DisplayID` = 20939;

src/server/game/AI/SmartScripts/SmartScript.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,6 +1542,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
15421542
if (!ne.minMaxRepeat.repeatMin && !ne.minMaxRepeat.repeatMax)
15431543
ne.event_flags |= SMART_EVENT_FLAG_NOT_REPEATABLE;
15441544

1545+
if (e.event.event_flags != 0 && (e.event.event_flags & SMART_EVENT_FLAG_WHILE_CHARMED) != 0)
1546+
ne.event_flags |= SMART_EVENT_FLAG_WHILE_CHARMED;
1547+
15451548
SmartAction ac = SmartAction();
15461549
ac.type = (SMART_ACTION)SMART_ACTION_TRIGGER_TIMED_EVENT;
15471550
ac.timeEvent.id = e.action.timeEvent.id;

0 commit comments

Comments
 (0)