Merge branch 'azerothcore:master' into Playerbot

This commit is contained in:
bash
2025-09-20 22:17:46 +02:00
committed by GitHub
30 changed files with 840 additions and 178 deletions
@@ -2033,12 +2033,8 @@ enum StrengthenAncientsMisc
{
SAY_WALKER_FRIENDLY = 0,
SAY_WALKER_ENEMY = 1,
SAY_LOTHALOR = 0,
SPELL_CREATE_ITEM_BARK = 47550,
SPELL_CONFUSED = 47044,
NPC_LOTHALOR = 26321
};
class spell_q12096_q12092_dummy : public SpellScript
@@ -2082,27 +2078,6 @@ class spell_q12096_q12092_dummy : public SpellScript
}
};
class spell_q12096_q12092_bark : public SpellScript
{
PrepareSpellScript(spell_q12096_q12092_bark);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Creature* lothalor = GetHitCreature();
if (!lothalor || lothalor->GetEntry() != NPC_LOTHALOR)
return;
lothalor->AI()->Talk(SAY_LOTHALOR);
lothalor->RemoveAura(SPELL_CONFUSED);
lothalor->DespawnOrUnsummon(4000);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
/*#####
# npc_torturer_lecraft
#####*/
@@ -2320,7 +2295,6 @@ void AddSC_dragonblight()
new npc_spiritual_insight();
new npc_commander_eligor_dawnbringer();
RegisterSpellScript(spell_q12096_q12092_dummy);
RegisterSpellScript(spell_q12096_q12092_bark);
new npc_torturer_lecraft();
RegisterSpellScript(spell_dragonblight_corrosive_spit);
RegisterSpellScript(spell_handover_reins);