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

*Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Blaymoira
2009-01-22 19:25:41 +01:00
parent c36c7111c5 b065d4ac49
commit 8c545eac4b
7 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/CMakeLists.txt
+2
View File
@@ -379,6 +379,8 @@ SET(trinityscript_LIB_SRCS
add_library(trinityscript SHARED ${trinityscript_LIB_SRCS})
add_definitions(-D_TRINITY_SCRIPT_CONFIG='"${CONF_DIR}/trinitycore.conf"')
target_link_libraries(trinityscript)
set_target_properties(trinityscript PROPERTIES VERSION 4.2.0 SOVERSION 4)
src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
+3 -3
View File
@@ -276,13 +276,13 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
{
for (uint8 i = 0; i < 4; ++i)
{
Unit* Temp = NULL;
Creature* Temp = NULL;
if (AddGUID[i])
{
Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
Temp = (Creature*)Unit::GetUnit((*m_creature),AddGUID[i]);
if (Temp && Temp->isAlive())
if (!Temp->SelectHostilTarget() || !Temp->getVictim() )
((Creature*)Temp)->AI()->AttackStart(m_creature->getVictim());
Temp->AI()->AttackStart(m_creature->getVictim());
}
}
CheckAdds_Timer = 5000;
src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp
+4 -3
View File
@@ -131,7 +131,8 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
Unit *victim = m_creature->SelectHostilTarget();
if(!victim)
return;
if( m_creature->getVictim() && m_creature->isAlive())
@@ -234,11 +235,11 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
}else Fear_Timer -=diff;
//Mortal Strike if target below 50% hp
if (m_creature->getVictim()->GetHealth() < m_creature->getVictim()->GetMaxHealth()*0.5)
if (victim && victim->GetHealth() < victim->GetMaxHealth()*0.5)
{
if (MortalStrike_Timer < diff)
{
DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE);
DoCast(victim,SPELL_MORTAL_STRIKE);
MortalStrike_Timer = 15000;
}else MortalStrike_Timer -= diff;
}