sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
bash
2025-09-30 15:27:48 +02:00
committed by GitHub
parent 59c1233d98 a56d1f65aa
commit 5fbcb45727
8 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+10 -3
View File
@@ -27,6 +27,7 @@ enum Spells
SPELL_MOJO_WAVE = 55626,
SPELL_FREEZE_ANIM = 52656,
SPELL_MIGHTY_BLOW = 54719,
SPELL_MORTAL_STRIKE = 54715,
SPELL_ELEMENTAL_SPAWN_EFFECT = 54888,
SPELL_EMERGE = 54850,
@@ -54,9 +55,10 @@ enum Misc
EMOTE_ALTAR = 1,
EVENT_COLOSSUS_MIGHTY_BLOW = 1,
EVENT_COLOSSUS_HEALTH_1 = 2,
EVENT_COLOSSUS_HEALTH_2 = 3,
EVENT_COLOSSUS_START_FIGHT = 4,
EVENT_COLOSSUS_MORTAL_STRIKE = 2,
EVENT_COLOSSUS_HEALTH_1 = 3,
EVENT_COLOSSUS_HEALTH_2 = 4,
EVENT_COLOSSUS_START_FIGHT = 5,
EVENT_ELEMENTAL_HEALTH = 10,
EVENT_ELEMENTAL_SURGE = 11,
@@ -146,6 +148,7 @@ public:
{
BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10s);
events.ScheduleEvent(EVENT_COLOSSUS_MORTAL_STRIKE, 7s);
events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_1, 1s);
events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_2, 1s);
}
@@ -212,6 +215,10 @@ public:
me->CastSpell(me->GetVictim(), SPELL_MIGHTY_BLOW, false);
events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10s);
break;
case EVENT_COLOSSUS_MORTAL_STRIKE:
DoCastVictim(SPELL_MORTAL_STRIKE);
events.ScheduleEvent(EVENT_COLOSSUS_MORTAL_STRIKE, 7s);
break;
case EVENT_COLOSSUS_HEALTH_1:
if (me->HealthBelowPct(51))
{
src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+4 -11
View File
@@ -51,14 +51,7 @@ enum Misc
MAX_CONSTRICTOR = 3,
MAX_SUMMONS = 5,
EVENT_POISON_NOVA = 1,
EVENT_POWERFULL_BITE = 2,
EVENT_VENOM_BOLT = 3,
EVENT_CHECK_HEALTH1 = 4,
EVENT_CHECK_HEALTH2 = 5,
EVENT_SUMMON1 = 6,
EVENT_SUMMON2 = 7,
EVENT_KILL_TALK = 8
EVENT_KILL_TALK = 1
};
const Position SpawnLoc[] =
@@ -121,17 +114,17 @@ public:
Talk(SAY_AGGRO);
BossAI::JustEngagedWith(who);
ScheduleTimedEvent(10s, [&]{
ScheduleTimedEvent(16s, 53s, [&]{
Talk(EMOTE_NOVA);
DoCastAOE(SPELL_POISON_NOVA);
}, 15s);
}, 16s, 53s);
ScheduleTimedEvent(3s, [&] {
DoCastVictim(SPELL_POWERFULL_BITE);
}, 10s);
ScheduleTimedEvent(15s, [&] {
DoCastVictim(SPELL_VENOM_BOLT);
DoCastRandomTarget(SPELL_VENOM_BOLT, 0, 45.0f, false);
}, 10s);
}