Changeset 14 for trunk

Timestamp:

11/19/08 13:23:07 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added fleeing and call assistance in script until we move all AI functions to core

Original author: Neo2003
Date: 2008-10-05 12:10:02-05:00

Location:

trunk/src

Files:

• bindings/scripts/include/sc_creature.h (modified) (1 diff)
• bindings/scripts/scripts/creature/mob_event_ai.cpp (modified) (7 diffs)
• game/Creature.cpp (modified) (1 diff)
• game/Creature.h (modified) (1 diff)

trunk/src/bindings/scripts/include/sc_creature.h

@@ -72 +72 @@
     //Bool for if we are in combat or not
     bool InCombat;
+
+    //For fleeing
+    bool IsFleeing;
 
     //*************

trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp

@@ -80 +80 @@
     uint32 AttackDistance;                                  //Distance to attack from
     float AttackAngle;                                      //Angle of attack
+    uint32 TimetoFleeLeft;                                  //For fleeing
 
     void AttackTarget(Unit* pTarget, bool Follow)
@@ -775 +776 @@
         case ACTION_T_FLEE:
             {
-                //TODO: Replace with Flee movement generator
-                m_creature->CastSpell(m_creature, SPELL_RUN_AWAY, true);
+                TimetoFleeLeft = 8000;
+                m_creature->DoFleeToGetAssistance();
+                IsFleeing = true;
             }
             break;
@@ -955 +957 @@
     {
         InCombat = false;
+        IsFleeing = false;
         Reset();
 
@@ -1015 +1018 @@
 
         InCombat = false;
+        IsFleeing = false;
         Reset();
 
@@ -1035 +1039 @@
     {
         InCombat = false;
+        IsFleeing = false;
         Reset();
 
@@ -1132 +1137 @@
             return;
 
-        if (who->isTargetableForAttack())
+        if (who->isTargetableForAttack() && !IsFleeing)
         {
             //Begin melee attack if we are within range
@@ -1224 +1229 @@
         //Must return if creature isn't alive. Normally select hostil target and get victim prevent this
         if (!m_creature->isAlive())
+            return;
+
+        if ((TimetoFleeLeft < diff || (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)) && IsFleeing)
+        {
+            m_creature->GetMotionMaster()->Clear(false);
+            m_creature->SetNoCallAssistence(false);
+            m_creature->CallAssistence();
+            m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+            IsFleeing = false;
+        } 
+        else
+            TimetoFleeLeft -= diff;
+
+        if(IsFleeing)
             return;
 

trunk/src/game/Creature.cpp

@@ -1645 +1645 @@
 }
 
+void Creature::DoFleeToGetAssistance(float radius) // Optional parameter
+{
+    if (!getVictim())
+        return;
+
+    Creature* pCreature = NULL;
+
+    CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY()));
+    Cell cell(p);
+    cell.data.Part.reserved = ALL_DISTRICT;
+    cell.SetNoCreate();
+
+    MaNGOS::NearestAssistCreatureInCreatureRangeCheck u_check(this,getVictim(),radius);
+    MaNGOS::CreatureLastSearcher<MaNGOS::NearestAssistCreatureInCreatureRangeCheck> searcher(pCreature, u_check);
+
+    TypeContainerVisitor<MaNGOS::CreatureLastSearcher<MaNGOS::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer >  grid_creature_searcher(searcher);
+
+    CellLock<GridReadGuard> cell_lock(cell, p);
+    cell_lock->Visit(cell_lock, grid_creature_searcher, *(GetMap()));
+
+    if(!GetMotionMaster()->empty() && (GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE))
+        GetMotionMaster()->Clear(false);
+    if(pCreature == NULL)
+    {
+        GetMotionMaster()->MoveIdle();
+        GetMotionMaster()->MoveFleeing(getVictim());
+    }
+    else
+    {
+        GetMotionMaster()->MoveIdle();
+        GetMotionMaster()->MovePoint(0,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ());
+    }
+}
+
 void Creature::CallAssistence()
 {

trunk/src/game/Creature.h

@@ -511 +511 @@
         void CallAssistence();
         void SetNoCallAssistence(bool val) { m_AlreadyCallAssistence = val; }
+        void DoFleeToGetAssistance(float radius = 50);
 
         MovementGeneratorType GetDefaultMovementType() const { return m_defaultMovementType; }