Skip to content

Commit f3a8f57

Browse files
offloffl
authored
Scripts/Ruby Sanctum: Modernize scripts (TrinityCore#31052)
1 parent 49e02d7 commit f3a8f57

File tree

4 files changed

+58
-51
lines changed

4 files changed

+58
-51
lines changed

‎src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp

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

25-
enum Texts
25+
enum BaltharusTexts
2626
{
2727
SAY_BALTHARUS_INTRO = 0, // Your power wanes, ancient one.... Soon you will join your friends.
2828
SAY_AGGRO = 1, // Ah, the entertainment has arrived.
@@ -31,7 +31,7 @@ enum Texts
3131
SAY_DEATH = 4 // I... didn't see that coming....
3232
};
3333

34-
enum Spells
34+
enum BaltharusSpells
3535
{
3636
SPELL_BARRIER_CHANNEL = 76221,
3737
SPELL_ENERVATING_BRAND = 74502,
@@ -44,28 +44,29 @@ enum Spells
4444
SPELL_SPAWN_EFFECT = 64195
4545
};
4646

47-
enum Events
47+
enum BaltharusEvents
4848
{
49-
EVENT_BLADE_TEMPEST = 1,
49+
EVENT_BLADE_TEMPEST = 1,
5050
EVENT_CLEAVE,
5151
EVENT_ENERVATING_BRAND,
5252
EVENT_INTRO_TALK,
5353
EVENT_SUMMONS_ATTACK,
5454
EVENT_CLONE
5555
};
5656

57-
enum Actions
57+
enum BaltharusActions
5858
{
59-
ACTION_CLONE = 1
59+
ACTION_CLONE = 1
6060
};
6161

62-
enum Phases
62+
enum BaltharusPhases
6363
{
64-
PHASE_ALL = 0,
64+
PHASE_ALL = 0,
6565
PHASE_INTRO,
6666
PHASE_COMBAT
6767
};
6868

69+
// 39751 - Baltharus the Warborn
6970
struct boss_baltharus_the_warborn : public BossAI
7071
{
7172
boss_baltharus_the_warborn(Creature* creature) : BossAI(creature, DATA_BALTHARUS_THE_WARBORN), _cloneCount(0) { }
@@ -87,7 +88,7 @@ struct boss_baltharus_the_warborn : public BossAI
8788
case ACTION_INTRO_BALTHARUS:
8889
me->setActive(true);
8990
me->SetFarVisible(true);
90-
events.ScheduleEvent(EVENT_INTRO_TALK, Seconds(7), 0, PHASE_INTRO);
91+
events.ScheduleEvent(EVENT_INTRO_TALK, 7s, 0, PHASE_INTRO);
9192
break;
9293
case ACTION_CLONE:
9394
{
@@ -108,9 +109,9 @@ struct boss_baltharus_the_warborn : public BossAI
108109
BossAI::JustEngagedWith(who);
109110
events.Reset();
110111
events.SetPhase(PHASE_COMBAT);
111-
events.ScheduleEvent(EVENT_CLEAVE, Seconds(13), 0, PHASE_COMBAT);
112-
events.ScheduleEvent(EVENT_ENERVATING_BRAND, Seconds(13), 0, PHASE_COMBAT);
113-
events.ScheduleEvent(EVENT_BLADE_TEMPEST, Seconds(18), 0, PHASE_COMBAT);
112+
events.ScheduleEvent(EVENT_CLEAVE, 13s, 0, PHASE_COMBAT);
113+
events.ScheduleEvent(EVENT_ENERVATING_BRAND, 13s, 0, PHASE_COMBAT);
114+
events.ScheduleEvent(EVENT_BLADE_TEMPEST, 18s, 0, PHASE_COMBAT);
114115
Talk(SAY_AGGRO);
115116
}
116117

@@ -142,20 +143,20 @@ struct boss_baltharus_the_warborn : public BossAI
142143
if (me->HealthBelowPctDamaged(50, damage) && _cloneCount == 0)
143144
{
144145
++_cloneCount;
145-
events.ScheduleEvent(EVENT_CLONE, Milliseconds(1));
146+
events.ScheduleEvent(EVENT_CLONE, 1ms);
146147
}
147148
}
148149
else
149150
{
150151
if (me->HealthBelowPctDamaged(66, damage) && _cloneCount == 0)
151152
{
152153
++_cloneCount;
153-
events.ScheduleEvent(EVENT_CLONE, Milliseconds(1));
154+
events.ScheduleEvent(EVENT_CLONE, 1ms);
154155
}
155156
else if (me->HealthBelowPctDamaged(33, damage) && _cloneCount == 1)
156157
{
157158
++_cloneCount;
158-
events.ScheduleEvent(EVENT_CLONE, Milliseconds(1));
159+
events.ScheduleEvent(EVENT_CLONE, 1ms);
159160
}
160161
}
161162

@@ -193,17 +194,17 @@ struct boss_baltharus_the_warborn : public BossAI
193194
break;
194195
case EVENT_CLEAVE:
195196
DoCastVictim(SPELL_CLEAVE);
196-
events.Repeat(Seconds(20), Seconds(24));
197+
events.Repeat(20s, 24s);
197198
break;
198199
case EVENT_BLADE_TEMPEST:
199200
DoCastSelf(SPELL_BLADE_TEMPEST);
200-
events.Repeat(Seconds(24));
201+
events.Repeat(24s);
201202
break;
202203
case EVENT_ENERVATING_BRAND:
203204
for (uint8 i = 0; i < RAID_MODE<uint8>(2, 4, 2, 4); i++)
204205
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND))
205206
DoCast(target, SPELL_ENERVATING_BRAND);
206-
events.Repeat(Seconds(26));
207+
events.Repeat(26s);
207208
break;
208209
case EVENT_SUMMONS_ATTACK:
209210
summons.DoZoneInCombat(NPC_BALTHARUS_THE_WARBORN_CLONE);
@@ -226,6 +227,7 @@ struct boss_baltharus_the_warborn : public BossAI
226227
uint8 _cloneCount;
227228
};
228229

230+
// 39899 - Baltharus the Warborn
229231
struct npc_baltharus_the_warborn_clone : public BossAI
230232
{
231233
npc_baltharus_the_warborn_clone(Creature* creature) : BossAI(creature, DATA_BALTHARUS_CLONE) { }
@@ -279,17 +281,17 @@ struct npc_baltharus_the_warborn_clone : public BossAI
279281
{
280282
case EVENT_CLEAVE:
281283
DoCastVictim(SPELL_CLEAVE);
282-
events.Repeat(Seconds(20), Seconds(24));
284+
events.Repeat(20s, 24s);
283285
break;
284286
case EVENT_BLADE_TEMPEST:
285287
DoCastVictim(SPELL_BLADE_TEMPEST);
286-
events.Repeat(Seconds(24));
288+
events.Repeat(24s);
287289
break;
288290
case EVENT_ENERVATING_BRAND:
289291
for (uint8 i = 0; i < RAID_MODE<uint8>(2, 4, 2, 4); i++)
290292
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND))
291293
DoCast(target, SPELL_ENERVATING_BRAND);
292-
events.Repeat(Seconds(26));
294+
events.Repeat(26s);
293295
break;
294296
default:
295297
break;

‎src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
#include "ruby_sanctum.h"
2323
#include "ScriptedCreature.h"
2424

25-
enum Texts
25+
enum ZarithrianTexts
2626
{
2727
SAY_AGGRO = 0, // Alexstrasza has chosen capable allies.... A pity that I must END YOU!
2828
SAY_KILL = 1, // You thought you stood a chance? - It's for the best.
2929
SAY_ADDS = 2, // Turn them to ash, minions!
3030
SAY_DEATH = 3, // HALION! I...
3131
};
3232

33-
enum Spells
33+
enum ZarithrianSpells
3434
{
3535
// General Zarithrian
3636
SPELL_INTIMIDATING_ROAR = 74384,
@@ -44,10 +44,10 @@ enum Spells
4444
SPELL_LAVA_GOUT = 74394
4545
};
4646

47-
enum Events
47+
enum ZarithrianEvents
4848
{
4949
// General Zarithrian
50-
EVENT_CLEAVE = 1,
50+
EVENT_CLEAVE = 1,
5151
EVENT_INTIDMDATING_ROAR,
5252
EVENT_SUMMON_ADDS,
5353
EVENT_SUMMON_ADDS2,
@@ -57,13 +57,14 @@ enum Events
5757
EVENT_LAVA_GOUT
5858
};
5959

60-
enum MinionsMovement
60+
enum ZarithrianMisc
6161
{
6262
SPLINE_GENERAL_EAST = 1,
6363
SPLINE_GENERAL_WEST = 2,
6464
POINT_GENERAL_ROOM = 3
6565
};
6666

67+
// 39746 - General Zarithrian
6768
struct boss_general_zarithrian : public BossAI
6869
{
6970
boss_general_zarithrian(Creature* creature) : BossAI(creature, DATA_GENERAL_ZARITHRIAN) { }
@@ -91,7 +92,7 @@ struct boss_general_zarithrian : public BossAI
9192
events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, 14s);
9293
events.ScheduleEvent(EVENT_SUMMON_ADDS, 15s);
9394
if (Is25ManRaid())
94-
events.ScheduleEvent(EVENT_SUMMON_ADDS2, Seconds(16));
95+
events.ScheduleEvent(EVENT_SUMMON_ADDS2, 16s);
9596
}
9697

9798
// Override to not set adds in combat yet.
@@ -143,12 +144,12 @@ struct boss_general_zarithrian : public BossAI
143144
if (Creature* stalker2 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ZARITHRIAN_SPAWN_STALKER_2)))
144145
stalker2->CastSpell(stalker2, SPELL_SUMMON_FLAMECALLER, true);
145146

146-
events.Repeat(Seconds(45));
147+
events.Repeat(45s);
147148
break;
148149
}
149150
case EVENT_INTIDMDATING_ROAR:
150151
DoCastSelf(SPELL_INTIMIDATING_ROAR);
151-
events.Repeat(Seconds(35), Seconds(40));
152+
events.Repeat(35s, 40s);
152153
break;
153154
case EVENT_CLEAVE:
154155
DoCastVictim(SPELL_CLEAVE_ARMOR);
@@ -166,6 +167,7 @@ struct boss_general_zarithrian : public BossAI
166167
}
167168
};
168169

170+
// 39814 - Onyx Flamecaller
169171
struct npc_onyx_flamecaller : public ScriptedAI
170172
{
171173
npc_onyx_flamecaller(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _lavaGoutCount(0) { }
@@ -225,18 +227,18 @@ struct npc_onyx_flamecaller : public ScriptedAI
225227
{
226228
case EVENT_BLAST_NOVA:
227229
DoCastAOE(SPELL_BLAST_NOVA);
228-
_events.Repeat(Seconds(15), Seconds(20));
230+
_events.Repeat(15s, 20s);
229231
break;
230232
case EVENT_LAVA_GOUT:
231233
if (_lavaGoutCount >= 3)
232234
{
233235
_lavaGoutCount = 0;
234-
_events.Repeat(Seconds(8));
236+
_events.Repeat(8s);
235237
break;
236238
}
237239
DoCastVictim(SPELL_LAVA_GOUT);
238240
_lavaGoutCount++;
239-
_events.Repeat(Seconds(1));
241+
_events.Repeat(1s);
240242
break;
241243
default:
242244
break;
@@ -245,6 +247,7 @@ struct npc_onyx_flamecaller : public ScriptedAI
245247

246248
DoMeleeAttackIfReady();
247249
}
250+
248251
private:
249252
EventMap _events;
250253
InstanceScript* _instance;

‎src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp

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

26-
enum Texts
26+
enum SavianaTexts
2727
{
2828
SAY_AGGRO = 0, // You will sssuffer for this intrusion! (17528)
2929
SAY_CONFLAGRATION = 1, // Burn in the master's flame! (17532)
3030
EMOTE_ENRAGED = 2, // %s becomes enraged!
3131
SAY_KILL = 3, // Halion will be pleased. (17530) - As it should be.... (17529)
3232
};
3333

34-
enum Spells
34+
enum SavianaSpells
3535
{
3636
SPELL_CONFLAGRATION = 74452,
3737
SPELL_FLAME_BEACON = 74453,
@@ -40,7 +40,7 @@ enum Spells
4040
SPELL_FLAME_BREATH = 74403,
4141
};
4242

43-
enum Events
43+
enum SavianaEvents
4444
{
4545
EVENT_ENRAGE = 1,
4646
EVENT_FLIGHT = 2,
@@ -53,23 +53,24 @@ enum Events
5353
EVENT_GROUP_LAND_PHASE = 1,
5454
};
5555

56-
enum MovementPoints
56+
enum SavianaPoints
5757
{
5858
POINT_FLIGHT = 1,
5959
POINT_LAND = 2,
6060
POINT_TAKEOFF = 3,
6161
POINT_LAND_GROUND = 4
6262
};
6363

64-
enum Misc
64+
enum SavianaMisc
6565
{
66-
SOUND_ID_DEATH = 17531,
66+
SOUND_ID_DEATH = 17531
6767
};
6868

6969
Position const SavianaRagefireFlyOutPos = {3155.51f, 683.844f, 95.0f, 4.69f};
7070
Position const SavianaRagefireFlyInPos = {3151.07f, 636.443f, 79.540f, 4.69f};
7171
Position const SavianaRagefireLandPos = {3151.07f, 636.443f, 78.649f, 4.69f};
7272

73+
// 39747 - Saviana Ragefire
7374
struct boss_saviana_ragefire : public BossAI
7475
{
7576
boss_saviana_ragefire(Creature* creature) : BossAI(creature, DATA_SAVIANA_RAGEFIRE) { }
@@ -87,9 +88,9 @@ struct boss_saviana_ragefire : public BossAI
8788
BossAI::JustEngagedWith(who);
8889
Talk(SAY_AGGRO);
8990
events.Reset();
90-
events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE);
91-
events.ScheduleEvent(EVENT_FLAME_BREATH, Seconds(14), EVENT_GROUP_LAND_PHASE);
92-
events.ScheduleEvent(EVENT_FLIGHT, Seconds(60), EVENT_GROUP_LAND_PHASE);
91+
events.ScheduleEvent(EVENT_ENRAGE, 20s, EVENT_GROUP_LAND_PHASE);
92+
events.ScheduleEvent(EVENT_FLAME_BREATH, 14s, EVENT_GROUP_LAND_PHASE);
93+
events.ScheduleEvent(EVENT_FLIGHT, 60s, EVENT_GROUP_LAND_PHASE);
9394
}
9495

9596
void JustDied(Unit* /*killer*/) override
@@ -110,18 +111,18 @@ struct boss_saviana_ragefire : public BossAI
110111
Talk(SAY_CONFLAGRATION);
111112
break;
112113
case POINT_LAND:
113-
events.ScheduleEvent(EVENT_LAND_GROUND, Milliseconds(1));
114+
events.ScheduleEvent(EVENT_LAND_GROUND, 1ms);
114115
break;
115116
case POINT_LAND_GROUND:
116117
me->SetCanFly(false);
117118
me->SetDisableGravity(false);
118119
me->SetReactState(REACT_AGGRESSIVE);
119-
events.ScheduleEvent(EVENT_ENRAGE, Seconds(1), EVENT_GROUP_LAND_PHASE);
120-
events.ScheduleEvent(EVENT_FLAME_BREATH, Seconds(2), Seconds(4), EVENT_GROUP_LAND_PHASE);
121-
events.ScheduleEvent(EVENT_FLIGHT, Seconds(50), EVENT_GROUP_LAND_PHASE);
120+
events.ScheduleEvent(EVENT_ENRAGE, 1s, EVENT_GROUP_LAND_PHASE);
121+
events.ScheduleEvent(EVENT_FLAME_BREATH, 2s, 4s, EVENT_GROUP_LAND_PHASE);
122+
events.ScheduleEvent(EVENT_FLIGHT, 50s, EVENT_GROUP_LAND_PHASE);
122123
break;
123124
case POINT_TAKEOFF:
124-
events.ScheduleEvent(EVENT_AIR_MOVEMENT, Milliseconds(1));
125+
events.ScheduleEvent(EVENT_AIR_MOVEMENT, 1ms);
125126
break;
126127
default:
127128
break;
@@ -172,11 +173,11 @@ struct boss_saviana_ragefire : public BossAI
172173
case EVENT_ENRAGE:
173174
DoCastSelf(SPELL_ENRAGE);
174175
Talk(EMOTE_ENRAGED);
175-
events.Repeat(Seconds(24));
176+
events.Repeat(24s);
176177
break;
177178
case EVENT_FLAME_BREATH:
178179
DoCastVictim(SPELL_FLAME_BREATH);
179-
events.Repeat(Seconds(20), Seconds(30));
180+
events.Repeat(20s, 30s);
180181
break;
181182
case EVENT_AIR_MOVEMENT:
182183
me->GetMotionMaster()->MovePoint(POINT_FLIGHT, SavianaRagefireFlyOutPos);

‎src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "ScriptedGossip.h"
2525
#include "SpellScript.h"
2626

27-
enum Texts
27+
enum RubySanctumTexts
2828
{
2929
SAY_XERESTRASZA_EVENT = 0,
3030
SAY_XERESTRASZA_EVENT_1 = 1,
@@ -37,7 +37,7 @@ enum Texts
3737
SAY_XERESTRASZA_INTRO = 8,
3838
};
3939

40-
enum Events
40+
enum RubySanctumEvents
4141
{
4242
EVENT_XERESTRASZA_EVENT_1 = 1,
4343
EVENT_XERESTRASZA_EVENT_2 = 2,
@@ -48,13 +48,14 @@ enum Events
4848
EVENT_XERESTRASZA_EVENT_7 = 7,
4949
};
5050

51-
enum Spells
51+
enum RubySanctumSpells
5252
{
5353
SPELL_RALLY = 75416
5454
};
5555

5656
Position const xerestraszaMovePos = {3151.236f, 379.8733f, 86.31996f, 0.0f};
5757

58+
// 40429 - Sanctum Guardian Xerestrasza
5859
struct npc_xerestrasza : public ScriptedAI
5960
{
6061
npc_xerestrasza(Creature* creature) : ScriptedAI(creature)

0 commit comments

Comments
 (0)