Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/HoL: apply some missing scripting standards to all files

Browse Source
This commit is contained in:
Ovahlord
2025-05-29 15:49:38 +02:00
parent 640ee45199
commit adff72b485
6 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp
View File

@@ -28,7 +28,7 @@
#include "SpellHistory.h"
#include "SpellMgr.h"
enum Spells
enum GeneralBjarngrimSpells
{
// General Bjarngrim
SPELL_CHARGE_UP = 52098,
@@ -57,7 +57,7 @@ enum Spells
SPELL_CHARGE_UP_DUMMY = 56458
};
enum Events
enum GeneralBjarngrimEvents
{
// General Bjarngrim
EVENT_CHARGE_UP = 1,
@@ -75,24 +75,24 @@ enum Events
EVENT_CHECK_BJARNGRIMS_HEALTH
};
enum EventGroups
enum GeneralBjarngrimEventGroups
{
EVENT_GROUP_DEFENSIVE_STANCE = 1,
EVENT_GROUP_BERSERKER_STANCE,
EVENT_GROUP_BATTLE_STANCE
};
enum Actions
enum GeneralBjarngrimActions
{
ACTION_SWITCH_STANCE = 0
};
enum Phases
enum GeneralBjarngrimPhases
{
PHASE_OUT_OF_COMBAT = 1
};
enum Texts
enum GeneralBjarngrimTexts
{
// General Bjarngrim
SAY_AGGRO = 0,
@@ -106,14 +106,14 @@ enum Texts
SAY_DEATH = 8
};
enum VirtualItemIds
enum GeneralBjarngrimVirtualItemIds
{
ITEM_ID_AXE = 43625,
ITEM_ID_SHIELD = 39384,
ITEM_ID_GREATAXE = 43623
};
enum Stances
enum GeneralBjarngrimStances
{
STANCE_DEFENSIVE = 0,
STANCE_BERSERKER = 1,
@@ -158,7 +158,7 @@ static std::array<StanceInfo, MAX_STANCE> const StanceData =
struct boss_general_bjarngrim : public BossAI
{
boss_general_bjarngrim(Creature* creature) : BossAI(creature, DATA_GENERAL_BJARNGRIM), _currentStanceId(STANCE_BATTLE) { }
boss_general_bjarngrim(Creature* creature) : BossAI(creature, BOSS_GENERAL_BJARNGRIM), _currentStanceId(STANCE_BATTLE) { }
void JustAppeared() override
{
@@ -357,7 +357,7 @@ struct npc_bjarngrim_stormforged_lieutenant : public ScriptedAI
_events.Repeat(22s);
break;
case EVENT_CHECK_BJARNGRIMS_HEALTH:
if (Creature* bjarngrim = _instance->GetCreature(DATA_GENERAL_BJARNGRIM))
if (Creature* bjarngrim = _instance->GetCreature(BOSS_GENERAL_BJARNGRIM))
if (bjarngrim->GetHealthPct() <= 75.f) // @todo: validate
DoCast(bjarngrim, SPELL_RENEW_STEEL);

16
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
View File

@@ -27,7 +27,7 @@
#include "ScriptedCreature.h"
#include "SpellInfo.h"
enum Spells
enum IonarSpells
{
SPELL_BALL_LIGHTNING = 52780,
SPELL_STATIC_OVERLOAD = 52658,
@@ -41,7 +41,7 @@ enum Spells
SPELL_RANDOM_LIGHTNING_VISUAL = 52663
};
enum Yells
enum IonarTexts
{
SAY_AGGRO = 0,
SAY_SPLIT = 1,
@@ -49,12 +49,12 @@ enum Yells
SAY_DEATH = 3
};
enum Creatures
enum IonarCreatures
{
NPC_SPARK_OF_IONAR = 28926
};
enum Misc
enum IonarMisc
{
DATA_MAX_SPARKS = 5,
DATA_POINT_CALLBACK = 0
@@ -68,7 +68,7 @@ static constexpr float DATA_MAX_SPARK_DISTANCE = 90; // Distance to boss - preve
struct boss_ionar : public BossAI
{
boss_ionar(Creature* creature) : BossAI(creature, DATA_IONAR)
boss_ionar(Creature* creature) : BossAI(creature, BOSS_IONAR)
{
Initialize();
}
@@ -97,8 +97,6 @@ struct boss_ionar : public BossAI
if (!me->IsVisible())
me->SetVisible(true);
instance->SetBossState(DATA_IONAR, NOT_STARTED);
}
void JustEngagedWith(Unit* who) override
@@ -315,7 +313,7 @@ struct npc_spark_of_ionar : public ScriptedAI
void UpdateAI(uint32 uiDiff) override
{
// Despawn if the encounter is not running
if (_instance->GetBossState(DATA_IONAR) != IN_PROGRESS)
if (_instance->GetBossState(BOSS_IONAR) != IN_PROGRESS)
{
me->DespawnOrUnsummon();
return;
@@ -324,7 +322,7 @@ struct npc_spark_of_ionar : public ScriptedAI
// Prevent them to follow players through the whole instance
if (uiCheckTimer <= uiDiff)
{
Creature* ionar = _instance->GetCreature(DATA_IONAR);
Creature* ionar = _instance->GetCreature(BOSS_IONAR);
if (ionar && ionar->IsAlive())
{
if (me->GetDistance(ionar) > DATA_MAX_SPARK_DISTANCE)

12
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
View File

@@ -29,7 +29,7 @@ EndScriptData */
#include "SpellMgr.h"
#include "SpellScript.h"
enum Texts
enum LokenTexts
{
SAY_INTRO_1 = 0,
SAY_INTRO_2 = 1,
@@ -43,7 +43,7 @@ enum Texts
EMOTE_NOVA = 9
};
enum Spells
enum LokenSpells
{
SPELL_ARC_LIGHTNING = 52921,
SPELL_LIGHTNING_NOVA = 52960,
@@ -52,7 +52,7 @@ enum Spells
SPELL_PULSING_SHOCKWAVE_AURA = 59414
};
enum Events
enum LokenEvents
{
EVENT_ARC_LIGHTNING = 1,
EVENT_LIGHTNING_NOVA,
@@ -60,14 +60,14 @@ enum Events
EVENT_INTRO_DIALOGUE
};
enum Phases
enum LokenPhases
{
// Phases are used to allow executing the intro event while UpdateVictim() returns false and convenience.
PHASE_INTRO = 1,
PHASE_NORMAL
};
enum Misc
enum LokenMisc
{
ACHIEV_TIMELY_DEATH_START_EVENT = 20384
};
@@ -78,7 +78,7 @@ enum Misc
struct boss_loken : public BossAI
{
boss_loken(Creature* creature) : BossAI(creature, DATA_LOKEN)
boss_loken(Creature* creature) : BossAI(creature, BOSS_LOKEN)
{
Initialize();
_isIntroDone = false;

18
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
View File

@@ -27,7 +27,7 @@
#include "SpellInfo.h"
#include "SpellScript.h"
enum Texts
enum VolkhanTexts
{
// Volkhan
SAY_AGGRO = 0,
@@ -39,7 +39,7 @@ enum Texts
SAY_SLAY = 6
};
enum Spells
enum VolkhanSpells
{
// Volkhan
SPELL_TEMPER_SUMMON_OBJECT = 52661,
@@ -62,7 +62,7 @@ enum Spells
SPELL_IMMOLATION_STRIKE = 52433
};
enum Events
enum VolkhanEvents
{
// Volkhan
EVENT_TEMPER_INTRO = 1,
@@ -75,7 +75,7 @@ enum Events
EVENT_IMMOLATION_STRIKE
};
enum Actions
enum VolkhanActions
{
// Volkhan
ACTION_SHATTER_GOLEMS = 0,
@@ -85,25 +85,25 @@ enum Actions
ACTION_SHATTER = 0
};
enum Phases
enum VolkhanPhases
{
// Volkhan
PHASE_INTRO = 1,
PHASE_COMBAT
};
enum MovePoints
enum VolkhanMovePoints
{
// Volkhan
POINT_ID_ANVIL = 0
};
enum Misc
enum VolkhanMisc
{
ENTRY_BRITTLE_GOLEM = 28681
};
enum Data
enum VolkhanData
{
DATA_SHATTER_RESISTANT = 0
};
@@ -112,7 +112,7 @@ static Position const AnvilPosition = { 1333.5901f, -103.67797f, 56.7177f };
struct boss_volkhan : public BossAI
{
boss_volkhan(Creature* creature) : BossAI(creature, DATA_VOLKHAN),
boss_volkhan(Creature* creature) : BossAI(creature, BOSS_VOLKHAN),
_shatteredGolems(false), _temperingGolems(false), _temperCycles(0), _shatteredGolemsCount(0) { }
void JustAppeared() override

8
src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
View File

@@ -28,10 +28,10 @@ uint32 const EncounterCount = 4;
enum HOLDataTypes
{
// Bosses
DATA_GENERAL_BJARNGRIM = 0,
DATA_VOLKHAN = 1,
DATA_IONAR = 2,
DATA_LOKEN = 3,
BOSS_GENERAL_BJARNGRIM = 0,
BOSS_VOLKHAN = 1,
BOSS_IONAR = 2,
BOSS_LOKEN = 3,
// Additional Data
/*General Bjarngrim*/

20
src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
View File

@@ -25,18 +25,18 @@
DoorData const doorData[] =
{
{ GO_VOLKHAN_DOOR, DATA_VOLKHAN, DOOR_TYPE_PASSAGE },
{ GO_IONAR_DOOR, DATA_IONAR, DOOR_TYPE_PASSAGE },
{ GO_LOKEN_DOOR, DATA_LOKEN, DOOR_TYPE_PASSAGE },
{ GO_VOLKHAN_DOOR, BOSS_VOLKHAN, DOOR_TYPE_PASSAGE },
{ GO_IONAR_DOOR, BOSS_IONAR, DOOR_TYPE_PASSAGE },
{ GO_LOKEN_DOOR, BOSS_LOKEN, DOOR_TYPE_PASSAGE },
{ 0, 0, DOOR_TYPE_ROOM } // END
};
ObjectData const creatureData[] =
{
{ NPC_GENERAL_BJARNGRIM, DATA_GENERAL_BJARNGRIM },
{ NPC_VOLKHAN, DATA_VOLKHAN },
{ NPC_IONAR, DATA_IONAR },
{ NPC_LOKEN, DATA_LOKEN },
{ NPC_GENERAL_BJARNGRIM, BOSS_GENERAL_BJARNGRIM },
{ NPC_VOLKHAN, BOSS_VOLKHAN },
{ NPC_IONAR, BOSS_IONAR },
{ NPC_LOKEN, BOSS_LOKEN },
{ NPC_INVISIBLE_STALKER, DATA_INVISIBLE_STALKER },
{ NPC_VOLKHANS_ANVIL, DATA_VOLKHANS_ANVIL },
{ 0, 0 } // END
@@ -71,9 +71,9 @@ class instance_halls_of_lightning : public InstanceMapScript
switch (creature->GetEntry())
{
case NPC_MOLTEN_GOLEM:
if (GetBossState(DATA_VOLKHAN) == IN_PROGRESS)
if (GetBossState(BOSS_VOLKHAN) == IN_PROGRESS)
{
if (Creature* volkhan = GetCreature(DATA_VOLKHAN))
if (Creature* volkhan = GetCreature(BOSS_VOLKHAN))
if (CreatureAI* ai = volkhan->AI())
ai->JustSummoned(creature);
}
@@ -92,7 +92,7 @@ class instance_halls_of_lightning : public InstanceMapScript
switch (type)
{
case DATA_LOKEN:
case BOSS_LOKEN:
if (state == DONE)
if (GameObject* globe = GetGameObject(DATA_LOKEN_GLOBE))
globe->SendCustomAnim(0);