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

Drak'Tharon Keep: Fix Trollgore's achievement

Browse Source 
Fix possible crash in Tharon'Ja's script
		  Add player spells in Tharon'Ja's script

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-10-31 21:29:00 +01:00
parent 7f00bab916
commit d9e728eade
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
+23 -1
View File
@@ -168,8 +168,15 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid());
if (pTemp->GetTypeId() == TYPEID_PLAYER)
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);
}
}
uiPhaseTimer = 20000;
uiLightningBreathTimer = urand(3000,4000);
@@ -217,6 +224,21 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
uiCurseOfLifeTimer = 1000;
uiRainOfFireTimer = urand(14000,18000);
uiShadowVolleyTimer = urand(8000,10000);
std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList();
for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid());
if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER)
{
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);
}
}
} else uiPhaseTimer -= diff;
break;
}
src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI
uiInfectedWoundTimer = urand(6000,10000);
uiExplodeCorpseTimer = 3000;
bAchiev = true;
bAchiev = HeroicMode;
if (pInstance)
pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED);