*Fix some merged SD2 scripts.
--HG-- branch : trunk
This commit is contained in:
@@ -405,11 +405,11 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
|
|||||||
damage /= 4;
|
damage /= 4;
|
||||||
for(uint8 i = 0; i < 4; ++i)
|
for(uint8 i = 0; i < 4; ++i)
|
||||||
{
|
{
|
||||||
if(Unit* pUnit = Unit::GetUnit(*m_creature, Council[i]))
|
if(Creature* pUnit = Unit::GetCreature(*m_creature, Council[i]))
|
||||||
if(pUnit != m_creature && damage < pUnit->GetHealth())
|
if(pUnit != m_creature && damage < pUnit->GetHealth())
|
||||||
{
|
{
|
||||||
pUnit->SetHealth(pUnit->GetHealth() - damage);
|
pUnit->SetHealth(pUnit->GetHealth() - damage);
|
||||||
((Creature*)pUnit)->LowerPlayerDamageReq(damage);
|
pUnit->LowerPlayerDamageReq(damage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
boss_morogrim_tidewalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
|
boss_morogrim_tidewalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||||
{
|
{
|
||||||
m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData());
|
m_pInstance = pCreature->GetInstanceData();
|
||||||
}
|
}
|
||||||
|
|
||||||
ScriptedInstance* m_pInstance; // the instance
|
ScriptedInstance* m_pInstance; // the instance
|
||||||
|
|||||||
+8
-2
@@ -82,8 +82,11 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void OnCreatureCreate(Creature *creature, uint32 creature_entry)
|
void OnCreatureCreate(Creature *creature, bool add)
|
||||||
{
|
{
|
||||||
|
if(!add)
|
||||||
|
return;
|
||||||
|
|
||||||
switch(creature->GetEntry())
|
switch(creature->GetEntry())
|
||||||
{
|
{
|
||||||
case 17381: The_MakerGUID = creature->GetGUID(); break;
|
case 17381: The_MakerGUID = creature->GetGUID(); break;
|
||||||
@@ -92,8 +95,11 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnObjectCreate(GameObject *go)
|
void OnGameObjectCreate(GameObject *go, bool add)
|
||||||
{
|
{
|
||||||
|
if(!add)
|
||||||
|
return;
|
||||||
|
|
||||||
if (go->GetEntry() == 181766) //Final exit door
|
if (go->GetEntry() == 181766) //Final exit door
|
||||||
Door1GUID = go->GetGUID();
|
Door1GUID = go->GetGUID();
|
||||||
if (go->GetEntry() == 181811) //The Maker Front door
|
if (go->GetEntry() == 181811) //The Maker Front door
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ bool QuestAccept_npc_bartleby(Player* pPlayer, Creature* pCreature, Quest const*
|
|||||||
if (pQuest->GetQuestId() == QUEST_BEAT)
|
if (pQuest->GetQuestId() == QUEST_BEAT)
|
||||||
{
|
{
|
||||||
pCreature->setFaction(FACTION_ENEMY);
|
pCreature->setFaction(FACTION_ENEMY);
|
||||||
((npc_bartlebyAI*)pCreature->AI())->AttackStart(pPlayer);
|
pCreature->AI()->AttackStart(pPlayer);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user