yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #527 from Grimfeather/Loatheb-fixes

Browse Source 
Loatheb fixes
This commit is contained in:
Grimfeather
2025-07-05 17:30:48 +02:00
committed by GitHub
parent 555f83c3ec 698cfa5f2c
commit 9b0d44ed01
1 changed files with 106 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/naxx40Scripts/boss_loatheb_40.cpp
View File

@@ -22,19 +22,22 @@
enum Spells enum Spells
{ {
SPELL_NECROTIC_AURA = 55593, SPELL_NECROTIC_AURA = 55593,
SPELL_DEATHBLOOM = 29865, // SPELL_CORRUPTED_MIND = 29201, // this triggers the following spells on targets (based on class): 29185, 29194, 29196, 29198
// SPELL_POISON_AURA = 29865, // does 200 dmg every second for 6 seconds with 1200 extra damage at the end. should do 196 dmg every 6 seconds. no extra damage at the end.
SPELL_POISON_SHOCK = 22595, // does 180-220 aoe poison damage. if we let loatheb recast this every 6 seconds it's a possible fix for poison aura.
SPELL_INEVITABLE_DOOM = 29204, SPELL_INEVITABLE_DOOM = 29204,
SPELL_BERSERK = 26662 SPELL_REMOVE_CURSE = 30281 // He periodically removes all curses on himself
}; };
enum Events enum Events
{ {
EVENT_NECROTIC_AURA = 1, // EVENT_CORRUPTED_MIND = 1,
EVENT_DEATHBLOOM = 2, EVENT_NECROTIC_AURA = 1,
EVENT_POISON_SHOCK = 2,
EVENT_INEVITABLE_DOOM = 3, EVENT_INEVITABLE_DOOM = 3,
EVENT_BERSERK = 4, EVENT_SUMMON_SPORE = 4,
EVENT_SUMMON_SPORE = 5, EVENT_REMOVE_CURSE = 5,
EVENT_NECROTIC_AURA_FADING = 6, EVENT_NECROTIC_AURA_FADING = 6,
EVENT_NECROTIC_AURA_REMOVED = 7 EVENT_NECROTIC_AURA_REMOVED = 7
}; };
@@ -110,11 +113,12 @@ public:
{ {
BossAI::JustEngagedWith(who); BossAI::JustEngagedWith(who);
me->SetInCombatWithZone(); me->SetInCombatWithZone();
events.ScheduleEvent(EVENT_NECROTIC_AURA, 10000); // events.ScheduleEvent(EVENT_CORRUPTED_MIND, 5000);
events.ScheduleEvent(EVENT_DEATHBLOOM, 5000); events.ScheduleEvent(EVENT_NECROTIC_AURA, 10000);
events.ScheduleEvent(EVENT_POISON_SHOCK, 6000);
events.ScheduleEvent(EVENT_INEVITABLE_DOOM, 120000); events.ScheduleEvent(EVENT_INEVITABLE_DOOM, 120000);
events.ScheduleEvent(EVENT_SUMMON_SPORE, 15000); events.ScheduleEvent(EVENT_SUMMON_SPORE, 13000);
events.ScheduleEvent(EVENT_BERSERK, 720000); events.ScheduleEvent(EVENT_REMOVE_CURSE, 5000);
if (pInstance) if (pInstance)
{ {
pInstance->SetData(BOSS_LOATHEB, IN_PROGRESS); pInstance->SetData(BOSS_LOATHEB, IN_PROGRESS);
@@ -147,41 +151,77 @@ public:
switch (events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_SUMMON_SPORE: case EVENT_SUMMON_SPORE:
{
me->CastSpell(me, SPELL_SUMMON_SPORE, true); me->CastSpell(me, SPELL_SUMMON_SPORE, true);
events.RepeatEvent(35000); events.RepeatEvent(13000);
break; break;
}
case EVENT_NECROTIC_AURA: case EVENT_NECROTIC_AURA:
{
me->CastSpell(me, SPELL_NECROTIC_AURA, true); me->CastSpell(me, SPELL_NECROTIC_AURA, true);
Talk(SAY_NECROTIC_AURA_APPLIED); Talk(SAY_NECROTIC_AURA_APPLIED);
events.ScheduleEvent(EVENT_NECROTIC_AURA_FADING, 14000); events.ScheduleEvent(EVENT_NECROTIC_AURA_FADING, 14000);
events.ScheduleEvent(EVENT_NECROTIC_AURA_REMOVED, 17000); events.ScheduleEvent(EVENT_NECROTIC_AURA_REMOVED, 17000);
events.RepeatEvent(20000); events.RepeatEvent(20000);
break; break;
case EVENT_DEATHBLOOM: }
/*
case EVENT_CORRUPTED_MIND:
{ {
//me->CastSpell(me, SPELL_DEATHBLOOM, false); if (me->CastSpell(me, SPELL_CORRUPTED_MIND, true) == SPELL_CAST_OK)
int32 bp0 = 33; // TODO: Amplitude should be 6k, but is 1k. 200 dmg after 6 seconds {
me->CastCustomSpell(me, SPELL_DEATHBLOOM, &bp0, 0, 0, false); events.RepeatEvent(10000);
events.RepeatEvent(30000); }
else
{
events.RepeatEvent(100);
}
break; break;
} }
*/
case EVENT_POISON_SHOCK:
{
if (me->CastSpell(me, SPELL_POISON_SHOCK, true) == SPELL_CAST_OK)
{
events.RepeatEvent(6000);
}
else
{
events.RepeatEvent(100);
}
break;
}
case EVENT_INEVITABLE_DOOM: case EVENT_INEVITABLE_DOOM:
{ {
int32 bp0 = 2549; int32 bp0 = 2549;
me->CastCustomSpell(me, SPELL_INEVITABLE_DOOM, &bp0, 0, 0, false);
doomCounter++; if (me->CastCustomSpell(me, SPELL_INEVITABLE_DOOM, &bp0, 0, 0, false) == SPELL_CAST_OK)
events.RepeatEvent(doomCounter < 6 ? 30000 : 15000); {
doomCounter++;
events.RepeatEvent(doomCounter < 6 ? 30000 : 15000);
}
else
{
events.RepeatEvent(100);
}
break; break;
} }
case EVENT_BERSERK: case EVENT_REMOVE_CURSE:
me->CastSpell(me, SPELL_BERSERK, true); {
me->CastSpell(me, SPELL_REMOVE_CURSE, true);
events.RepeatEvent(30000);
break; break;
}
case EVENT_NECROTIC_AURA_FADING: case EVENT_NECROTIC_AURA_FADING:
{
Talk(SAY_NECROTIC_AURA_FADING); Talk(SAY_NECROTIC_AURA_FADING);
break; break;
}
case EVENT_NECROTIC_AURA_REMOVED: case EVENT_NECROTIC_AURA_REMOVED:
{
Talk(SAY_NECROTIC_AURA_REMOVED); Talk(SAY_NECROTIC_AURA_REMOVED);
break; break;
}
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -197,11 +237,54 @@ public:
return false; return false;
} }
return true; return true;
} }
}; };
}; };
/*
// 29201 - Corrupted Mind (Loatheb)
class spell_loatheb_corrupted_mind_aoe_40 : public SpellScript
{
PrepareSpellScript(spell_loatheb_corrupted_mind_aoe_40);
void HandleEffect(Spell* spell, SpellEffIndex effIndex)
{
// Loatheb Corrupted Mind triggered sub spells
uint32 spellid;
switch (spell->GetTarget()->GetClass())
{
// priests should be getting 29185, but it triggers on dmg effects as well, don't know why.
case CLASS_PRIEST: spellid = 29194; break;//29185; break;
case CLASS_DRUID: spellid = 29194; break;
case CLASS_PALADIN: spellid = 29196; break;
case CLASS_SHAMAN: spellid = 29198; break;
default: return false;
}
spell->me->CastSpell(spell->GetTarget(), spellid, true);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_loatheb_corrupted_mind_aoe_40::HandleEffect, SPELL_CORRUPTED_MIND, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_loatheb_corrupted_mind_loader : public SpellScriptLoader
{
public:
spell_loatheb_corrupted_mind_loader() : SpellScriptLoader("spell_loatheb_corrupted_mind_aoe_40") { }
SpellScript* GetSpellScript() const override
{
return new spell_loatheb_corrupted_mind_aoe_40();
}
};
*/
void AddSC_boss_loatheb_40() void AddSC_boss_loatheb_40()
{ {
new boss_loatheb_40(); new boss_loatheb_40();
// new spell_loatheb_corrupted_mind_loader();
} }