Skip to content

Commit 7cbb24f

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-skip-dk
2 parents 49d3238 + e3576bc commit 7cbb24f

File tree

7 files changed

+53
-48
lines changed

7 files changed

+53
-48
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--
2+
DELETE FROM `graveyard_zone` WHERE `ID`=469 AND `GhostZone` IN (141,1657);
3+
UPDATE `graveyard_zone` SET `Faction`=0 WHERE `ID`=91 AND `GhostZone`=141;
4+
5+
DELETE FROM `graveyard_zone` WHERE `ID`=91 AND `GhostZone`=1657;
6+
INSERT INTO `graveyard_zone` (`ID`, `GhostZone`, `Faction`, `Comment`) VALUES
7+
(91, 1657, 67, 'Teldrassil, Dolanaar GY - Teldrassil');

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "SpellHistory.h"
2929
#include "SpellMgr.h"
3030

31-
enum Spells
31+
enum GeneralBjarngrimSpells
3232
{
3333
// General Bjarngrim
3434
SPELL_CHARGE_UP = 52098,
@@ -57,7 +57,7 @@ enum Spells
5757
SPELL_CHARGE_UP_DUMMY = 56458
5858
};
5959

60-
enum Events
60+
enum GeneralBjarngrimEvents
6161
{
6262
// General Bjarngrim
6363
EVENT_CHARGE_UP = 1,
@@ -75,24 +75,24 @@ enum Events
7575
EVENT_CHECK_BJARNGRIMS_HEALTH
7676
};
7777

78-
enum EventGroups
78+
enum GeneralBjarngrimEventGroups
7979
{
8080
EVENT_GROUP_DEFENSIVE_STANCE = 1,
8181
EVENT_GROUP_BERSERKER_STANCE,
8282
EVENT_GROUP_BATTLE_STANCE
8383
};
8484

85-
enum Actions
85+
enum GeneralBjarngrimActions
8686
{
8787
ACTION_SWITCH_STANCE = 0
8888
};
8989

90-
enum Phases
90+
enum GeneralBjarngrimPhases
9191
{
9292
PHASE_OUT_OF_COMBAT = 1
9393
};
9494

95-
enum Texts
95+
enum GeneralBjarngrimTexts
9696
{
9797
// General Bjarngrim
9898
SAY_AGGRO = 0,
@@ -106,14 +106,14 @@ enum Texts
106106
SAY_DEATH = 8
107107
};
108108

109-
enum VirtualItemIds
109+
enum GeneralBjarngrimVirtualItemIds
110110
{
111111
ITEM_ID_AXE = 43625,
112112
ITEM_ID_SHIELD = 39384,
113113
ITEM_ID_GREATAXE = 43623
114114
};
115115

116-
enum Stances
116+
enum GeneralBjarngrimStances
117117
{
118118
STANCE_DEFENSIVE = 0,
119119
STANCE_BERSERKER = 1,
@@ -158,7 +158,7 @@ static std::array<StanceInfo, MAX_STANCE> const StanceData =
158158

159159
struct boss_general_bjarngrim : public BossAI
160160
{
161-
boss_general_bjarngrim(Creature* creature) : BossAI(creature, DATA_GENERAL_BJARNGRIM), _currentStanceId(STANCE_BATTLE) { }
161+
boss_general_bjarngrim(Creature* creature) : BossAI(creature, BOSS_GENERAL_BJARNGRIM), _currentStanceId(STANCE_BATTLE) { }
162162

163163
void JustAppeared() override
164164
{
@@ -357,7 +357,7 @@ struct npc_bjarngrim_stormforged_lieutenant : public ScriptedAI
357357
_events.Repeat(22s);
358358
break;
359359
case EVENT_CHECK_BJARNGRIMS_HEALTH:
360-
if (Creature* bjarngrim = _instance->GetCreature(DATA_GENERAL_BJARNGRIM))
360+
if (Creature* bjarngrim = _instance->GetCreature(BOSS_GENERAL_BJARNGRIM))
361361
if (bjarngrim->GetHealthPct() <= 75.f) // @todo: validate
362362
DoCast(bjarngrim, SPELL_RENEW_STEEL);
363363

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "ScriptedCreature.h"
2828
#include "SpellInfo.h"
2929

30-
enum Spells
30+
enum IonarSpells
3131
{
3232
SPELL_BALL_LIGHTNING = 52780,
3333
SPELL_STATIC_OVERLOAD = 52658,
@@ -41,20 +41,20 @@ enum Spells
4141
SPELL_RANDOM_LIGHTNING_VISUAL = 52663
4242
};
4343

44-
enum Yells
44+
enum IonarTexts
4545
{
4646
SAY_AGGRO = 0,
4747
SAY_SPLIT = 1,
4848
SAY_SLAY = 2,
4949
SAY_DEATH = 3
5050
};
5151

52-
enum Creatures
52+
enum IonarCreatures
5353
{
5454
NPC_SPARK_OF_IONAR = 28926
5555
};
5656

57-
enum Misc
57+
enum IonarMisc
5858
{
5959
DATA_MAX_SPARKS = 5,
6060
DATA_POINT_CALLBACK = 0
@@ -68,7 +68,7 @@ static constexpr float DATA_MAX_SPARK_DISTANCE = 90; // Distance to boss - preve
6868

6969
struct boss_ionar : public BossAI
7070
{
71-
boss_ionar(Creature* creature) : BossAI(creature, DATA_IONAR)
71+
boss_ionar(Creature* creature) : BossAI(creature, BOSS_IONAR)
7272
{
7373
Initialize();
7474
}
@@ -97,8 +97,6 @@ struct boss_ionar : public BossAI
9797

9898
if (!me->IsVisible())
9999
me->SetVisible(true);
100-
101-
instance->SetBossState(DATA_IONAR, NOT_STARTED);
102100
}
103101

104102
void JustEngagedWith(Unit* who) override
@@ -315,7 +313,7 @@ struct npc_spark_of_ionar : public ScriptedAI
315313
void UpdateAI(uint32 uiDiff) override
316314
{
317315
// Despawn if the encounter is not running
318-
if (_instance->GetBossState(DATA_IONAR) != IN_PROGRESS)
316+
if (_instance->GetBossState(BOSS_IONAR) != IN_PROGRESS)
319317
{
320318
me->DespawnOrUnsummon();
321319
return;
@@ -324,7 +322,7 @@ struct npc_spark_of_ionar : public ScriptedAI
324322
// Prevent them to follow players through the whole instance
325323
if (uiCheckTimer <= uiDiff)
326324
{
327-
Creature* ionar = _instance->GetCreature(DATA_IONAR);
325+
Creature* ionar = _instance->GetCreature(BOSS_IONAR);
328326
if (ionar && ionar->IsAlive())
329327
{
330328
if (me->GetDistance(ionar) > DATA_MAX_SPARK_DISTANCE)

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ EndScriptData */
2929
#include "SpellMgr.h"
3030
#include "SpellScript.h"
3131

32-
enum Texts
32+
enum LokenTexts
3333
{
3434
SAY_INTRO_1 = 0,
3535
SAY_INTRO_2 = 1,
@@ -43,7 +43,7 @@ enum Texts
4343
EMOTE_NOVA = 9
4444
};
4545

46-
enum Spells
46+
enum LokenSpells
4747
{
4848
SPELL_ARC_LIGHTNING = 52921,
4949
SPELL_LIGHTNING_NOVA = 52960,
@@ -52,22 +52,22 @@ enum Spells
5252
SPELL_PULSING_SHOCKWAVE_AURA = 59414
5353
};
5454

55-
enum Events
55+
enum LokenEvents
5656
{
5757
EVENT_ARC_LIGHTNING = 1,
5858
EVENT_LIGHTNING_NOVA,
5959
EVENT_RESUME_PULSING_SHOCKWAVE,
6060
EVENT_INTRO_DIALOGUE
6161
};
6262

63-
enum Phases
63+
enum LokenPhases
6464
{
6565
// Phases are used to allow executing the intro event while UpdateVictim() returns false and convenience.
6666
PHASE_INTRO = 1,
6767
PHASE_NORMAL
6868
};
6969

70-
enum Misc
70+
enum LokenMisc
7171
{
7272
ACHIEV_TIMELY_DEATH_START_EVENT = 20384
7373
};
@@ -78,7 +78,7 @@ enum Misc
7878

7979
struct boss_loken : public BossAI
8080
{
81-
boss_loken(Creature* creature) : BossAI(creature, DATA_LOKEN)
81+
boss_loken(Creature* creature) : BossAI(creature, BOSS_LOKEN)
8282
{
8383
Initialize();
8484
_isIntroDone = false;

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "SpellInfo.h"
2828
#include "SpellScript.h"
2929

30-
enum Texts
30+
enum VolkhanTexts
3131
{
3232
// Volkhan
3333
SAY_AGGRO = 0,
@@ -39,7 +39,7 @@ enum Texts
3939
SAY_SLAY = 6
4040
};
4141

42-
enum Spells
42+
enum VolkhanSpells
4343
{
4444
// Volkhan
4545
SPELL_TEMPER_SUMMON_OBJECT = 52661,
@@ -62,7 +62,7 @@ enum Spells
6262
SPELL_IMMOLATION_STRIKE = 52433
6363
};
6464

65-
enum Events
65+
enum VolkhanEvents
6666
{
6767
// Volkhan
6868
EVENT_TEMPER_INTRO = 1,
@@ -75,7 +75,7 @@ enum Events
7575
EVENT_IMMOLATION_STRIKE
7676
};
7777

78-
enum Actions
78+
enum VolkhanActions
7979
{
8080
// Volkhan
8181
ACTION_SHATTER_GOLEMS = 0,
@@ -85,25 +85,25 @@ enum Actions
8585
ACTION_SHATTER = 0
8686
};
8787

88-
enum Phases
88+
enum VolkhanPhases
8989
{
9090
// Volkhan
9191
PHASE_INTRO = 1,
9292
PHASE_COMBAT
9393
};
9494

95-
enum MovePoints
95+
enum VolkhanMovePoints
9696
{
9797
// Volkhan
9898
POINT_ID_ANVIL = 0
9999
};
100100

101-
enum Misc
101+
enum VolkhanMisc
102102
{
103103
ENTRY_BRITTLE_GOLEM = 28681
104104
};
105105

106-
enum Data
106+
enum VolkhanData
107107
{
108108
DATA_SHATTER_RESISTANT = 0
109109
};
@@ -112,7 +112,7 @@ static Position const AnvilPosition = { 1333.5901f, -103.67797f, 56.7177f };
112112

113113
struct boss_volkhan : public BossAI
114114
{
115-
boss_volkhan(Creature* creature) : BossAI(creature, DATA_VOLKHAN),
115+
boss_volkhan(Creature* creature) : BossAI(creature, BOSS_VOLKHAN),
116116
_shatteredGolems(false), _temperingGolems(false), _temperCycles(0), _shatteredGolemsCount(0) { }
117117

118118
void JustAppeared() override

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ uint32 const EncounterCount = 4;
2828
enum HOLDataTypes
2929
{
3030
// Bosses
31-
DATA_GENERAL_BJARNGRIM = 0,
32-
DATA_VOLKHAN = 1,
33-
DATA_IONAR = 2,
34-
DATA_LOKEN = 3,
31+
BOSS_GENERAL_BJARNGRIM = 0,
32+
BOSS_VOLKHAN = 1,
33+
BOSS_IONAR = 2,
34+
BOSS_LOKEN = 3,
3535

3636
// Additional Data
3737
/*General Bjarngrim*/

‎src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525

2626
DoorData const doorData[] =
2727
{
28-
{ GO_VOLKHAN_DOOR, DATA_VOLKHAN, DOOR_TYPE_PASSAGE },
29-
{ GO_IONAR_DOOR, DATA_IONAR, DOOR_TYPE_PASSAGE },
30-
{ GO_LOKEN_DOOR, DATA_LOKEN, DOOR_TYPE_PASSAGE },
28+
{ GO_VOLKHAN_DOOR, BOSS_VOLKHAN, DOOR_TYPE_PASSAGE },
29+
{ GO_IONAR_DOOR, BOSS_IONAR, DOOR_TYPE_PASSAGE },
30+
{ GO_LOKEN_DOOR, BOSS_LOKEN, DOOR_TYPE_PASSAGE },
3131
{ 0, 0, DOOR_TYPE_ROOM } // END
3232
};
3333

3434
ObjectData const creatureData[] =
3535
{
36-
{ NPC_GENERAL_BJARNGRIM, DATA_GENERAL_BJARNGRIM },
37-
{ NPC_VOLKHAN, DATA_VOLKHAN },
38-
{ NPC_IONAR, DATA_IONAR },
39-
{ NPC_LOKEN, DATA_LOKEN },
36+
{ NPC_GENERAL_BJARNGRIM, BOSS_GENERAL_BJARNGRIM },
37+
{ NPC_VOLKHAN, BOSS_VOLKHAN },
38+
{ NPC_IONAR, BOSS_IONAR },
39+
{ NPC_LOKEN, BOSS_LOKEN },
4040
{ NPC_INVISIBLE_STALKER, DATA_INVISIBLE_STALKER },
4141
{ NPC_VOLKHANS_ANVIL, DATA_VOLKHANS_ANVIL },
4242
{ 0, 0 } // END
@@ -71,9 +71,9 @@ class instance_halls_of_lightning : public InstanceMapScript
7171
switch (creature->GetEntry())
7272
{
7373
case NPC_MOLTEN_GOLEM:
74-
if (GetBossState(DATA_VOLKHAN) == IN_PROGRESS)
74+
if (GetBossState(BOSS_VOLKHAN) == IN_PROGRESS)
7575
{
76-
if (Creature* volkhan = GetCreature(DATA_VOLKHAN))
76+
if (Creature* volkhan = GetCreature(BOSS_VOLKHAN))
7777
if (CreatureAI* ai = volkhan->AI())
7878
ai->JustSummoned(creature);
7979
}
@@ -92,7 +92,7 @@ class instance_halls_of_lightning : public InstanceMapScript
9292

9393
switch (type)
9494
{
95-
case DATA_LOKEN:
95+
case BOSS_LOKEN:
9696
if (state == DONE)
9797
if (GameObject* globe = GetGameObject(DATA_LOKEN_GLOBE))
9898
globe->SendCustomAnim(0);

0 commit comments

Comments
 (0)