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:
megamage
2009-01-29 19:35:49 -06:00
parent 25ab1fa4ad adee7cab17
commit b0bf621a13
30 changed files with 158 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+3 -5
View File
@@ -1225,7 +1225,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
void UpdateAI(const uint32 diff)
{
//Check if we are in combat (also updates calls threat update code)
bool Combat = InCombat ? (m_creature->SelectHostilTarget() && m_creature->getVictim()) : false;
bool Combat = InCombat ? m_creature->SelectHostilTarget() : false;
//Must return if creature isn't alive. Normally select hostil target and get victim prevent this
if (!m_creature->isAlive())
@@ -1233,11 +1233,9 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
if (IsFleeing)
{
if(TimetoFleeLeft < diff
|| m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE
&& m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
if(TimetoFleeLeft < diff)
{
m_creature->GetMotionMaster()->Clear(false);
m_creature->SetControlled(false, UNIT_STAT_FLEEING);
m_creature->SetNoCallAssistance(false);
m_creature->CallAssistance();
if(m_creature->getVictim())
src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
-1
View File
@@ -149,7 +149,6 @@ struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI
//m_creature->CombatStop();
EnterEvadeMode();
}
AttackedBy(done_by);
}
void Aggro(Unit *who) {}
src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp
+6
View File
@@ -144,6 +144,12 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI
{
}
void JustSummoned(Creature *summon)
{
if(summon && m_creature->getVictim())
summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
}
void UpdateAI(const uint32 diff)
{
if( !m_creature->SelectHostilTarget() || !m_creature->getVictim() )