Changeset 202 for trunk

Timestamp:

11/19/08 13:45:54 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix a bug that event_ai mobs do not attack or cast.

Original author: megamage
Date: 2008-11-09 10:00:15-06:00

Location:

trunk/src/bindings/scripts

Files:

• include/sc_creature.h (modified) (1 diff)
• scripts/creature/mob_event_ai.cpp (modified) (5 diffs)
• scripts/zone/zulaman/boss_hexlord.cpp (modified) (16 diffs)

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

@@ -26 +26 @@
 struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 {
-    ScriptedAI(Creature* creature) : m_creature(creature), InCombat(false) {}
+    ScriptedAI(Creature* creature) : m_creature(creature), InCombat(false), IsFleeing(false) {}
     ~ScriptedAI() {}
 

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

@@ -1241 +1241 @@
             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)
+        if (IsFleeing)
+        {
+            if(TimetoFleeLeft < diff 
+                || m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE 
+                && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
+            {
+                m_creature->GetMotionMaster()->Clear(false);
+                m_creature->SetNoCallAssistence(false);
+                m_creature->CallAssistence();
+                if(m_creature->getVictim())
+                    m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
+                IsFleeing = false;
+            }
+            else
+                TimetoFleeLeft -= diff;
+
             return;
+        }
 
         //Events are only updated once every EVENT_UPDATE_TIME ms to prevent lag with large amount of events
@@ -1275 +1280 @@
                     }
                 }
-                }
+            }
 
             //Check for time based events
@@ -1282 +1287 @@
                 //Decrement Timers
                 if ((*i).Time)
-
                 {
                     if ((*i).Time > EventDiff)
                     {
-                         //Do not decrement timers if event cannot trigger in this phase
+                        //Do not decrement timers if event cannot trigger in this phase
                         if (!((*i).Event.event_inverse_phase_mask & (1 << Phase)))
                             (*i).Time -= EventDiff;
@@ -1308 +1312 @@
                     case EVENT_T_FRIENDLY_HP:
                         if( Combat )
-                                ProcessEvent(*i);
+                            ProcessEvent(*i);
                         break;
-                    }
+                }
             }
 
             EventDiff = 0;
             EventUpdateTime = EVENT_UPDATE_TIME;
-        }else
+        }
+        else
         {
             EventDiff += diff;
@@ -1324 +1329 @@
         if (Combat && MeleeEnabled)
             DoMeleeAttackIfReady();
-
     }
 };

trunk/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp

@@ -482 +482 @@
             return;
 
-        boss_hexlord_addAI::UpdateAI(diff);
-
         if(bloodlust_timer < diff)
         {
@@ -500 +498 @@
             cleave_timer = 12000; //3 sec cast
         }else cleave_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -549 +549 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
-
 
         if(flashheal_timer < diff)
@@ -593 +590 @@
         dispelmagic_timer = 12000;
         }else dispelmagic_timer -= diff;*/
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -635 +634 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if(firebolt_timer < diff)
@@ -643 +640 @@
             firebolt_timer = 700;
         }else firebolt_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -668 +667 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if (thunderclap_timer < diff)
@@ -682 +679 @@
             flamebreath_timer = 12000;
         }else flamebreath_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -704 +703 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if (psychicwail_timer < diff)
@@ -712 +709 @@
             psychicwail_timer = 12000;
         }else psychicwail_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -755 +754 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if (venomspit_timer < diff)
@@ -763 +761 @@
             venomspit_timer = 2500;
         }else venomspit_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -786 +786 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if (volatileinf_timer < diff)
@@ -795 +793 @@
             volatileinf_timer = 12000;
         }else volatileinf_timer -= diff;
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };
@@ -822 +822 @@
         if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
             return;
-
-        boss_hexlord_addAI::UpdateAI(diff);
 
         if (mightyblow_timer < diff)
@@ -836 +834 @@
             coldstare_timer = 12000;
         }
+
+        boss_hexlord_addAI::UpdateAI(diff);
     }
 };