nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 09:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/MoltenCore): Fixed some Geddon encounter issues (#8941)

Browse Source
This commit is contained in:
Andrius Peleckas
2021-11-08 18:11:10 +02:00
committed by GitHub
parent 009a52d1f1
commit bbd547fc14
2 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/sql/updates/pending_db_world/rev_1635964941654899600.sql Normal file
View File

@@ -0,0 +1,4 @@
INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1635964941654899600');
DELETE FROM `spell_script_names` WHERE `spell_id`=20478 AND `ScriptName`='spell_geddon_armageddon';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(20478, 'spell_geddon_armageddon');

72
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
View File

@@ -73,13 +73,13 @@ public:
// If boss is below 2% hp - cast Armageddon
if (!armageddonCasted && damage < me->GetHealth() && me->HealthBelowPctDamaged(2, damage))
{
me->InterruptNonMeleeSpells(true);
if (me->CastSpell(me, SPELL_ARMAGEDDON) == SPELL_CAST_OK)
me->RemoveAurasDueToSpell(SPELL_INFERNO);
me->StopMoving();
if (me->CastSpell(me, SPELL_ARMAGEDDON, TRIGGERED_FULL_MASK) == SPELL_CAST_OK)
{
Talk(EMOTE_SERVICE);
armageddonCasted = true;
}
armageddonCasted = true;
}
}
@@ -89,7 +89,7 @@ public:
{
case EVENT_INFERNO:
{
DoCastSelf(SPELL_INFERNO);
DoCastAOE(SPELL_INFERNO);
events.RepeatEvent(urand(21000, 26000));
break;
}
@@ -141,6 +141,23 @@ public:
return ValidateSpellInfo({ SPELL_INFERNO_DUMMY_EFFECT });
}
void HandleAfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* pCreatureTarget = GetTarget()->ToCreature())
{
pCreatureTarget->SetReactState(REACT_PASSIVE);
pCreatureTarget->AttackStop();
}
}
void HandleAfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* pCreatureTarget = GetTarget()->ToCreature())
{
pCreatureTarget->SetReactState(REACT_AGGRESSIVE);
}
}
void PeriodicTick(AuraEffect const* aurEff)
{
PreventDefaultAction();
@@ -168,12 +185,14 @@ public:
break;
}
caster->CastCustomSpell(SPELL_INFERNO_DUMMY_EFFECT, SPELLVALUE_BASE_POINT0, 500 * multiplier, caster, TRIGGERED_NONE, nullptr, aurEff);
caster->CastCustomSpell(SPELL_INFERNO_DUMMY_EFFECT, SPELLVALUE_BASE_POINT0, 500 * multiplier, (Unit*)nullptr, TRIGGERED_NONE, nullptr, aurEff);
}
}
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_geddon_inferno_AuraScript::HandleAfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_geddon_inferno_AuraScript::HandleAfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_geddon_inferno_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -184,10 +203,51 @@ public:
}
};
// 20478 Armageddon
class spell_geddon_armageddon : public SpellScriptLoader
{
public:
spell_geddon_armageddon() : SpellScriptLoader("spell_geddon_armageddon") { }
class spell_geddon_armageddon_AuraScript : public AuraScript
{
PrepareAuraScript(spell_geddon_armageddon_AuraScript);
void HandleAfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* pCreatureTarget = GetTarget()->ToCreature())
{
pCreatureTarget->SetReactState(REACT_PASSIVE);
pCreatureTarget->AttackStop();
}
}
void HandleAfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Creature* pCreatureTarget = GetTarget()->ToCreature())
{
pCreatureTarget->SetReactState(REACT_AGGRESSIVE);
}
}
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_geddon_armageddon_AuraScript::HandleAfterApply, EFFECT_1, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_geddon_armageddon_AuraScript::HandleAfterRemove, EFFECT_1, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_geddon_armageddon_AuraScript();
}
};
void AddSC_boss_baron_geddon()
{
new boss_baron_geddon();
// Spells
new spell_geddon_inferno();
new spell_geddon_armageddon();
}