Skip to content

Commit c8efee7

Browse files
offloffl
authored
Scripts/BlackTemple: Modernize scripts (#30963)
1 parent 8c58635 commit c8efee7

11 files changed

+291
-241
lines changed

‎src/server/scripts/Outland/BlackTemple/black_temple.cpp‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "SpellAuraEffects.h"
2323
#include "SpellScript.h"
2424

25-
enum Spells
25+
enum BlackTempleSpells
2626
{
2727
// Wrathbone Flayer
2828
SPELL_CLEAVE = 15496,
@@ -37,13 +37,13 @@ enum Spells
3737
SPELL_SHADOW_INFERNO_DAMAGE = 39646
3838
};
3939

40-
enum Creatures
40+
enum BlackTempleCreatures
4141
{
4242
NPC_BLOOD_MAGE = 22945,
4343
NPC_DEATHSHAPER = 22882
4444
};
4545

46-
enum Events
46+
enum BlackTempleEvents
4747
{
4848
// Wrathbone Flayer
4949
EVENT_GET_CHANNELERS = 1,
@@ -52,11 +52,12 @@ enum Events
5252
EVENT_IGNORED
5353
};
5454

55-
enum Misc
55+
enum BlackTempleMisc
5656
{
5757
GROUP_OUT_OF_COMBAT = 1
5858
};
5959

60+
// 22953 - Wrathbone Flayer
6061
struct npc_wrathbone_flayer : public ScriptedAI
6162
{
6263
npc_wrathbone_flayer(Creature* creature) : ScriptedAI(creature)
@@ -135,7 +136,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
135136
if (Creature* deathshaper = ObjectAccessor::GetCreature(*me, guid))
136137
deathshaper->CastSpell(nullptr, SPELL_SUMMON_CHANNEL);
137138

138-
_events.ScheduleEvent(EVENT_SET_CHANNELERS, 12s);
139+
_events.Repeat(12s);
139140

140141
break;
141142
}
@@ -156,12 +157,12 @@ struct npc_wrathbone_flayer : public ScriptedAI
156157
{
157158
case EVENT_CLEAVE:
158159
DoCastVictim(SPELL_CLEAVE);
159-
_events.ScheduleEvent(EVENT_CLEAVE, 1s, 2s);
160+
_events.Repeat(1s, 2s);
160161
break;
161162
case EVENT_IGNORED:
162163
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
163164
DoCast(target, SPELL_IGNORED);
164-
_events.ScheduleEvent(EVENT_IGNORED, 10s);
165+
_events.Repeat(10s);
165166
break;
166167
default:
167168
break;
@@ -178,6 +179,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
178179
bool _enteredCombat;
179180
};
180181

182+
// 23398 - Angered Soul Fragment
181183
struct npc_angered_soul_fragment : public ScriptedAI
182184
{
183185
npc_angered_soul_fragment(Creature* creature) : ScriptedAI(creature) { }
@@ -186,18 +188,18 @@ struct npc_angered_soul_fragment : public ScriptedAI
186188
{
187189
_scheduler.CancelAll();
188190

189-
_scheduler.Schedule(Seconds(1), GROUP_OUT_OF_COMBAT, [this](TaskContext invi)
191+
_scheduler.Schedule(1s, GROUP_OUT_OF_COMBAT, [this](TaskContext invi)
190192
{
191193
DoCastSelf(SPELL_GREATER_INVISIBILITY);
192194

193195
/* Workaround - On Retail creature appear and "vanish" again periodically, but i cant find packets
194196
with UPDATE_AURA on sniffs about it */
195-
_scheduler.Schedule(Seconds(5), Seconds(10), GROUP_OUT_OF_COMBAT, [this](TaskContext /*context*/)
197+
_scheduler.Schedule(5s, 10s, GROUP_OUT_OF_COMBAT, [this](TaskContext /*context*/)
196198
{
197199
me->RemoveAurasDueToSpell(SPELL_GREATER_INVISIBILITY);
198200
});
199201

200-
invi.Repeat(Seconds(15), Seconds(25));
202+
invi.Repeat(15s, 25s);
201203
});
202204
}
203205

@@ -206,13 +208,13 @@ struct npc_angered_soul_fragment : public ScriptedAI
206208
me->RemoveAurasDueToSpell(SPELL_GREATER_INVISIBILITY);
207209

208210
_scheduler.CancelGroup(GROUP_OUT_OF_COMBAT);
209-
_scheduler.Schedule(Seconds(1), [this](TaskContext anger)
211+
_scheduler.Schedule(1s, [this](TaskContext anger)
210212
{
211213
Unit* target = me->GetVictim();
212214
if (target && me->IsWithinMeleeRange(target))
213215
DoCastSelf(SPELL_ANGER);
214216
else
215-
anger.Repeat(Seconds(1));
217+
anger.Repeat(1s);
216218
});
217219
}
218220

‎src/server/scripts/Outland/BlackTemple/black_temple.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ enum BTDataTypes
5858
DATA_RELIQUARY_COMBAT_TRIGGER = 25
5959
};
6060

61-
enum TriggerEmotes
61+
enum BTTexts
6262
{
6363
EMOTE_HIGH_WARLORD_NAJENTUS_DIED = 0,
6464
EMOTE_DEN_OF_MORTAL_DOOR_OPEN = 1
@@ -132,7 +132,7 @@ enum BTGameObjectIds
132132
GO_ILLIDAN_MUSIC_CONTROLLER = 185966
133133
};
134134

135-
enum BlackTempleMisc
135+
enum BTMisc
136136
{
137137
AKAMA_INTRO = 1,
138138
AKAMA_FIGHT = 2,

‎src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
#include "ScriptedCreature.h"
2424
#include "SpellScript.h"
2525

26-
enum Says
26+
enum GurtoggTexts
2727
{
28-
SAY_AGGRO = 0,
29-
SAY_SLAY = 1,
30-
SAY_SPECIAL = 2,
31-
SAY_ENRAGE = 3
28+
SAY_AGGRO = 0,
29+
SAY_SLAY = 1,
30+
SAY_SPECIAL = 2,
31+
SAY_ENRAGE = 3
3232
};
3333

34-
enum Spells
34+
enum GurtoggSpells
3535
{
3636
//Gurtogg
3737
SPELL_BLOODBOIL = 42005,
@@ -59,23 +59,23 @@ enum Spells
5959
SPELL_BIRTH = 40031
6060
};
6161

62-
enum Phases
62+
enum GurtoggPhases
6363
{
64-
PHASE_1 = 1,
65-
PHASE_2 = 2,
66-
GROUP_PHASE_1 = 1,
67-
GROUP_PHASE_2 = 2
64+
PHASE_1 = 1,
65+
PHASE_2 = 2,
66+
GROUP_PHASE_1 = 1,
67+
GROUP_PHASE_2 = 2
6868
};
6969

70-
enum Sounds
70+
enum GurtoggSounds
7171
{
72-
SOUND_ID_DEATH = 11439,
73-
SOUND_ID_ENRAGE = 11437
72+
SOUND_ID_DEATH = 11439,
73+
SOUND_ID_ENRAGE = 11437
7474
};
7575

76-
enum Events
76+
enum GurtoggEvents
7777
{
78-
EVENT_BERSERK = 1,
78+
EVENT_BERSERK = 1,
7979
EVENT_BLOODBOIL,
8080
EVENT_ARCING_SMASH,
8181
EVENT_FEL_ACID_BREATH,
@@ -89,6 +89,7 @@ enum Events
8989
EVENT_CHARGE_PLAYER
9090
};
9191

92+
// 22948 - Gurtogg Bloodboil
9293
struct boss_gurtogg_bloodboil : public BossAI
9394
{
9495
boss_gurtogg_bloodboil(Creature* creature) : BossAI(creature, DATA_GURTOGG_BLOODBOIL)
@@ -143,18 +144,18 @@ struct boss_gurtogg_bloodboil : public BossAI
143144
{
144145
if (events.IsInPhase(PHASE_1))
145146
{
146-
events.ScheduleEvent(EVENT_BLOODBOIL, Seconds(10), GROUP_PHASE_1, PHASE_1);
147-
events.ScheduleEvent(EVENT_ARCING_SMASH, Seconds(10), GROUP_PHASE_1, PHASE_1);
148-
events.ScheduleEvent(EVENT_FEL_ACID_BREATH, Seconds(25), GROUP_PHASE_1, PHASE_1);
149-
events.ScheduleEvent(EVENT_EJECT, Seconds(35), GROUP_PHASE_1, PHASE_1);
150-
events.ScheduleEvent(EVENT_BEWILDERING_STRIKE, Seconds(47), GROUP_PHASE_1, PHASE_1);
147+
events.ScheduleEvent(EVENT_BLOODBOIL, 10s, GROUP_PHASE_1, PHASE_1);
148+
events.ScheduleEvent(EVENT_ARCING_SMASH, 10s, GROUP_PHASE_1, PHASE_1);
149+
events.ScheduleEvent(EVENT_FEL_ACID_BREATH, 25s, GROUP_PHASE_1, PHASE_1);
150+
events.ScheduleEvent(EVENT_EJECT, 35s, GROUP_PHASE_1, PHASE_1);
151+
events.ScheduleEvent(EVENT_BEWILDERING_STRIKE, 47s, GROUP_PHASE_1, PHASE_1);
151152
}
152153
else if (events.IsInPhase(PHASE_2))
153154
{
154-
events.ScheduleEvent(EVENT_START_PHASE_2, Milliseconds(100), GROUP_PHASE_2, PHASE_2);
155-
events.ScheduleEvent(EVENT_EJECT_2, Seconds(14), GROUP_PHASE_2, PHASE_2);
156-
events.ScheduleEvent(EVENT_FEL_ACID_BREATH_2, Seconds(16), GROUP_PHASE_2, PHASE_2);
157-
events.ScheduleEvent(EVENT_ARCING_SMASH_2, Seconds(8), GROUP_PHASE_2, PHASE_2);
155+
events.ScheduleEvent(EVENT_START_PHASE_2, 100ms, GROUP_PHASE_2, PHASE_2);
156+
events.ScheduleEvent(EVENT_EJECT_2, 14s, GROUP_PHASE_2, PHASE_2);
157+
events.ScheduleEvent(EVENT_FEL_ACID_BREATH_2, 16s, GROUP_PHASE_2, PHASE_2);
158+
events.ScheduleEvent(EVENT_ARCING_SMASH_2, 8s, GROUP_PHASE_2, PHASE_2);
158159
}
159160
}
160161

@@ -186,16 +187,16 @@ struct boss_gurtogg_bloodboil : public BossAI
186187
{
187188
case EVENT_BLOODBOIL:
188189
DoCast(SPELL_BLOODBOIL);
189-
events.Repeat(Seconds(10));
190+
events.Repeat(10s);
190191
break;
191192
case EVENT_ARCING_SMASH:
192193
DoCastVictim(SPELL_ARCING_SMASH);
193-
events.Repeat(Seconds(10));
194+
events.Repeat(10s);
194195
break;
195196
case EVENT_FEL_ACID_BREATH:
196197
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, me->GetCombatReach()))
197198
DoCast(target, SPELL_FEL_ACID_BREATH);
198-
events.Repeat(Seconds(25), Seconds(30));
199+
events.Repeat(25s, 30s);
199200
break;
200201
case EVENT_EJECT:
201202
Talk(SAY_SPECIAL);
@@ -226,7 +227,7 @@ struct boss_gurtogg_bloodboil : public BossAI
226227
target->CastSpell(target, SPELL_TAUNT_GURTOGG, true);
227228
DoCastAOE(SPELL_INSIGNIFIGANCE, true);
228229

229-
events.ScheduleEvent(EVENT_CHARGE_PLAYER, Seconds(2), GROUP_PHASE_2, PHASE_2);
230+
events.ScheduleEvent(EVENT_CHARGE_PLAYER, 2s, GROUP_PHASE_2, PHASE_2);
230231

231232
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
232233
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
@@ -236,7 +237,7 @@ struct boss_gurtogg_bloodboil : public BossAI
236237
events.SetPhase(PHASE_1);
237238
events.CancelEventGroup(GROUP_PHASE_2);
238239
ScheduleEvents();
239-
events.RescheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
240+
events.RescheduleEvent(EVENT_CHANGE_PHASE, 60s);
240241
}
241242
break;
242243
case EVENT_CHARGE_PLAYER:
@@ -251,7 +252,7 @@ struct boss_gurtogg_bloodboil : public BossAI
251252
break;
252253
case EVENT_ARCING_SMASH_2:
253254
DoCastVictim(SPELL_ARCING_SMASH_2);
254-
events.Repeat(Seconds(13));
255+
events.Repeat(13s);
255256
break;
256257
case EVENT_BERSERK:
257258
DoCast(SPELL_BERSERK);
@@ -303,6 +304,7 @@ struct boss_gurtogg_bloodboil : public BossAI
303304
float _oldThreat;
304305
};
305306

307+
// 23254 - Fel Geyser
306308
struct npc_fel_geyser : public PassiveAI
307309
{
308310
npc_fel_geyser(Creature* creature) : PassiveAI(creature) { }

0 commit comments

Comments
 (0)