public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/MC): Golemagg (#9233)

Browse Source
This commit is contained in:
Nefertumm
2021-11-22 18:44:08 -03:00
committed by GitHub
parent 9e2b855636
commit 2eb422885e
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
View File

@@ -31,8 +31,10 @@ enum Spells
// Golemagg // Golemagg
SPELL_PYROBLAST = 20228, SPELL_PYROBLAST = 20228,
SPELL_EARTHQUAKE = 19798, SPELL_EARTHQUAKE = 19798,
SPELL_ENRAGE = 19953,
SPELL_ATTRACK_RAGER = 20544, SPELL_ATTRACK_RAGER = 20544,
SPELL_MAGMASPLASH = 13879,
SPELL_GOLEMAGG_TRUST_AURA = 20556,
SPELL_DOUBLE_ATTACK = 18943,
// Core Rager // Core Rager
SPELL_MANGLE = 19820, SPELL_MANGLE = 19820,
@@ -58,13 +60,15 @@ public:
earthquakeTimer = 0; earthquakeTimer = 0;
pyroblastTimer = urand(3000, 7000); pyroblastTimer = urand(3000, 7000);
enraged = false; enraged = false;
DoCastSelf(SPELL_MAGMASPLASH);
DoCastSelf(SPELL_GOLEMAGG_TRUST_AURA);
DoCastSelf(SPELL_DOUBLE_ATTACK);
} }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if (!enraged && me->HealthBelowPctDamaged(10, damage)) if (!enraged && me->HealthBelowPctDamaged(10, damage))
{ {
DoCastSelf(SPELL_ENRAGE, true);
DoCastSelf(SPELL_ATTRACK_RAGER, true); DoCastSelf(SPELL_ATTRACK_RAGER, true);
DoCastAOE(SPELL_EARTHQUAKE, true); DoCastAOE(SPELL_EARTHQUAKE, true);
earthquakeTimer = 5000; earthquakeTimer = 5000;
@@ -84,7 +88,7 @@ public:
{ {
if (earthquakeTimer <= diff) if (earthquakeTimer <= diff)
{ {
DoCastAOE(SPELL_EARTHQUAKE, true); DoCastSelf(SPELL_EARTHQUAKE, true);
earthquakeTimer = 5000; earthquakeTimer = 5000;
} }
else else
@@ -100,10 +104,7 @@ public:
if (pyroblastTimer <= diff) if (pyroblastTimer <= diff)
{ {
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) DoCastRandomTarget(SPELL_PYROBLAST);
{
DoCast(target, SPELL_PYROBLAST);
}
pyroblastTimer = 7000; pyroblastTimer = 7000;
} }

15
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
View File

@@ -263,20 +263,6 @@ public:
} }
break; break;
} }
case IN_PROGRESS:
{
if (!_golemaggMinionsGUIDS.empty())
{
for (ObjectGuid const& minionGuid : _golemaggMinionsGUIDS)
{
if (Creature* minion = instance->GetCreature(minionGuid))
{
minion->AI()->DoZoneInCombat(nullptr, 150.0f);
}
}
}
break;
}
case DONE: case DONE:
{ {
if (!_golemaggMinionsGUIDS.empty()) if (!_golemaggMinionsGUIDS.empty())
@@ -292,6 +278,7 @@ public:
} }
break; break;
} }
case IN_PROGRESS:
default: default:
break; break;
} }