josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drak'Tharon Keep, Trollgore: Remove stacked buff on Reset

Browse Source 
Drak'Tharon Keep, Tharon'Ja: Fix Gift of Tharon'Ja + add skeletal morphing

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-10-31 23:11:05 +01:00
parent d9e728eade
commit ab49001e0a
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
+6 -13
View File
@@ -19,7 +19,7 @@
/* Script Data Start
SDName: Boss Tharon'ja
SDAuthor: Tartalo
SD%Complete:
SD%Complete: 100
SDComment:
SDCategory:
Script Data End */
@@ -73,7 +73,8 @@ enum Yells
};
enum Models
{
MODEL_FLESH = 27696
MODEL_FLESH = 27696,
MODEL_SKELETON = 27511
};
enum CombatPhase
{
@@ -170,12 +171,8 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid());
if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER)
{
Player *pTarget = CAST_PLR(pTemp);
DoCast(pTemp, SPELL_GIFT_OF_THARON_JA);
pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_BONE_ARMOR);
pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_SLAYING_STRIKE);
pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_TAUNT);
pTarget->AddTemporarySpell(SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE);
m_creature->AddAura(SPELL_GIFT_OF_THARON_JA,pTemp);
pTemp->SetDisplayId(MODEL_SKELETON);
}
}
uiPhaseTimer = 20000;
@@ -232,11 +229,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
{
if (pTemp->HasAura(SPELL_GIFT_OF_THARON_JA))
pTemp->RemoveAura(SPELL_GIFT_OF_THARON_JA);
Player *pTarget = CAST_PLR(pTemp);
pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_BONE_ARMOR);
pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_SLAYING_STRIKE);
pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_TAUNT);
pTarget->RemoveTemporarySpell(SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE);
pTemp->DeMorph();
}
}
} else uiPhaseTimer -= diff;
src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+3
View File
@@ -84,6 +84,9 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI
uiExplodeCorpseTimer = 3000;
bAchiev = HeroicMode;
if (m_creature->HasAura(HEROIC(SPELL_CONSUME,H_SPELL_CONSUME)))
m_creature->RemoveAura(HEROIC(SPELL_CONSUME,H_SPELL_CONSUME));
if (pInstance)
pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED);