Skip to content

Commit

Permalink
Fix Cipher of Damnation script attack initiation
Browse files Browse the repository at this point in the history
-- Enraged totems
UPDATE creature_template SET NpcFlags=2, UnitFlags=768, FactionAlliance=35, FactionHorde=35 WHERE entry in(21073,21097,21109,21116); -- fix attackability
DELETE FROM spell_script_target WHERE entry IN(36035); -- target only enraged spirits
INSERT INTO spell_script_target VALUES
(36035,1,21050,0),
(36035,1,21061,0),
(36035,1,21059,0),
(36035,1,21060,0);

-- The Cipher of Damnation 10588
UPDATE creature_template SET MinLevel=70,MaxLevel=70 WHERE entry IN(21685,21687,21686);
UPDATE creature_template SET MinLevelHealth=20250,MaxLevelHealth=20250 WHERE entry=21685;
UPDATE creature_template SET MinLevelHealth=16200,MaxLevelHealth=16200 WHERE entry=21686;
UPDATE creature_template SET MinLevelHealth=55888,MaxLevelHealth=55888 WHERE entry=21687;

Poke DB devs for TBC and WOTLK when this is merged

(based on cmangos/mangos-wotlk@7ce7110d1)

Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
  • Loading branch information
killerwife authored and xfurry committed Jan 4, 2018
1 parent c4b3993 commit 68cd74e
Showing 1 changed file with 8 additions and 18 deletions.
26 changes: 8 additions & 18 deletions src/game/AI/ScriptDevAI/scripts/outland/shadowmoon_valley.cpp
Expand Up @@ -1575,21 +1575,6 @@ struct npc_spawned_oronok_tornheartAI : public ScriptedAI, private DialogueHelpe
}
}

void Aggro(Unit* pWho) override
{
if (!m_bHasAttackStart && pWho->GetEntry() == NPC_EARTH_SPIRIT)
{
// Cyrukh starts to attack
if (Creature* pCyrukh = m_creature->GetMap()->GetCreature(m_cyrukhGuid))
{
pCyrukh->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
pCyrukh->AI()->AttackStart(m_creature);
AttackStart(pCyrukh);
m_bHasAttackStart = true;
}
}
}

void JustSummoned(Creature* pSummoned) override
{
switch (pSummoned->GetEntry())
Expand Down Expand Up @@ -1645,9 +1630,14 @@ struct npc_spawned_oronok_tornheartAI : public ScriptedAI, private DialogueHelpe
DoScriptText(SAY_ORONOK_READY, m_creature);
break;
case POINT_ID_ELEMENTS:
// Attack the closest earth element
if (Creature* pElement = GetClosestCreatureWithEntry(m_creature, NPC_EARTH_SPIRIT, 50.0f))
AttackStart(pElement);
// Cyrukh starts to attack
if (Creature* pCyrukh = m_creature->GetMap()->GetCreature(m_cyrukhGuid))
{
pCyrukh->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE);
pCyrukh->AI()->AttackStart(m_creature);
AttackStart(pCyrukh);
m_bHasAttackStart = true;
}
break;
case POINT_ID_EPILOGUE:
StartNextDialogueText(NPC_EARTHMENDER_TORLOK);
Expand Down

0 comments on commit 68cd74e

Please sign in to comment.