Changeset 109 for trunk/src/bindings/scripts/include/sc_creature.cpp

Timestamp:

11/19/08 13:36:49 (17 years ago)

Author:

yumileroy

Message:

[svn] Update trinityscript to SD2 rev 700. Source: scriptdev2. Patch provided by SLG.

Original author: megamage
Date: 2008-10-25 11:40:10-05:00

Files:

• trunk/src/bindings/scripts/include/sc_creature.cpp (modified) (17 diffs)

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

@@ -12 +12 @@
 // Spell summary for ScriptedAI::SelectSpell
 struct TSpellSummary {
-    uint8 Targets;    // set of enum SelectTarget
-    uint8 Effects;    // set of enum SelectEffect
+    uint8 Targets;                                          // set of enum SelectTarget
+    uint8 Effects;                                          // set of enum SelectEffect
 } *SpellSummary;
 
@@ -26 +26 @@
 void ScriptedAI::MoveInLineOfSight(Unit *who)
 {
-    if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
+    if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature))
     {
         if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
@@ -32 +32 @@
 
         float attackRadius = m_creature->GetAttackDistance(who);
-        if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
-        {
-            DoStartAttackAndMovement(who);
+        if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
+        {
             who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
-            if (!InCombat)
-            {
-                InCombat = true;
-                Aggro(who);
-            }
-        }
-    }
-}
-
-void ScriptedAI::AttackStart(Unit* who)
+            AttackStart(who);
+        }
+    }
+}
+
+void ScriptedAI::AttackStart(Unit* who, bool melee)
 {
     if (!who)
         return;
 
-    if (who->isTargetableForAttack())
-    {
-        //Begin attack
-        DoStartAttackAndMovement(who);
+    if (m_creature->Attack(who, melee))
+    {
+        m_creature->AddThreat(who, 0.0f);
+        m_creature->SetInCombatWith(who);
+        who->SetInCombatWith(m_creature);
 
         if (!InCombat)
@@ -61 +56 @@
             Aggro(who);
         }
+
+        if(melee)
+            DoStartMovement(who);
+        else
+            DoStartNoMovement(who);
+    }
+}
+
+void ScriptedAI::AttackStart(Unit* who)
+{
+    if (!who)
+        return;
+
+    if (m_creature->Attack(who, true))
+    {
+        m_creature->AddThreat(who, 0.0f);
+        m_creature->SetInCombatWith(who);
+        who->SetInCombatWith(m_creature);
+
+        if (!InCombat)
+        {
+            InCombat = true;
+            Aggro(who);
+        }
+
+        DoStartMovement(who);
     }
 }
@@ -67 +88 @@
 {
     //Check if we have a current target
-    if( m_creature->isAlive() && m_creature->SelectHostilTarget() && m_creature->getVictim())
-    {
-        if( m_creature->isAttackReady() )
+    if (m_creature->isAlive() && m_creature->SelectHostilTarget() && m_creature->getVictim())
+    {
+        if (m_creature->isAttackReady() )
         {
             //If we are within range melee the target
-            if( m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
+            if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
@@ -89 +110 @@
     m_creature->LoadCreaturesAddon();
 
-    if( m_creature->isAlive() )
+    if (m_creature->isAlive())
         m_creature->GetMotionMaster()->MoveTargetedHome();
 
@@ -104 +125 @@
 }
 
-void ScriptedAI::DoStartAttackAndMovement(Unit* victim, float distance, float angle)
+void ScriptedAI::DoStartMovement(Unit* victim, float distance, float angle)
 {
     if (!victim)
         return;
 
-    if ( m_creature->Attack(victim, true) )
-    {
-        m_creature->GetMotionMaster()->MoveChase(victim, distance, angle);
-        m_creature->AddThreat(victim, 0.0f);
-    }
-}
-
-void ScriptedAI::DoStartAttackNoMovement(Unit* victim)
+    m_creature->GetMotionMaster()->MoveChase(victim, distance, angle);
+}
+
+void ScriptedAI::DoStartNoMovement(Unit* victim)
 {
     if (!victim)
         return;
 
-    if ( m_creature->Attack(victim, true) )
-    {
-        m_creature->AddThreat(victim, 0.0f);
-    }
+    m_creature->GetMotionMaster()->MoveIdle();
+    m_creature->StopMoving();
 }
 
@@ -131 +146 @@
 {
     //Make sure our attack is ready and we aren't currently casting before checking distance
-    if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+    if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
     {
         //If we are within range melee the target
-        if( m_creature->IsWithinCombatDist(m_creature->getVictim(), ATTACK_DISTANCE))
+        if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE))
         {
             m_creature->AttackerStateUpdate(m_creature->getVictim());
@@ -144 +159 @@
 void ScriptedAI::DoStopAttack()
 {
-    if( m_creature->getVictim() != NULL )
+    if (m_creature->getVictim() != NULL)
     {
         m_creature->AttackStop();
@@ -170 +185 @@
 void ScriptedAI::DoSay(const char* text, uint32 language, Unit* target)
 {
-    if (target)m_creature->Say(text, language, target->GetGUID());
+    if (target) m_creature->Say(text, language, target->GetGUID());
     else m_creature->Say(text, language, 0);
 }
@@ -176 +191 @@
 void ScriptedAI::DoYell(const char* text, uint32 language, Unit* target)
 {
-    if (target)m_creature->Yell(text, language, target->GetGUID());
+    if (target) m_creature->Yell(text, language, target->GetGUID());
     else m_creature->Yell(text, language, 0);
 }
@@ -182 +197 @@
 void ScriptedAI::DoTextEmote(const char* text, Unit* target, bool IsBossEmote)
 {
-    if (target)m_creature->TextEmote(text, target->GetGUID(), IsBossEmote);
+    if (target) m_creature->TextEmote(text, target->GetGUID(), IsBossEmote);
     else m_creature->TextEmote(text, 0, IsBossEmote);
 }
@@ -205 +220 @@
     }
 
-    unit->SendPlaySound(sound, false);
+    WorldPacket data(4);
+    data.SetOpcode(SMSG_PLAY_SOUND);
+    data << uint32(sound);
+    unit->SendMessageToSet(&data,false);
 }
 
@@ -462 +480 @@
     {
         error_log("SD2: DoZoneInCombat called for creature that either cannot have threat list or has empty threat list (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0);
+
         return;
     }*/
@@ -580 +599 @@
         if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
         {
-            DoStartAttackNoMovement(who);
             who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
-
-            if (!InCombat)
-            {
-                InCombat = true;
-                Aggro(who);
-            }
+            AttackStart(who);
         }
     }
@@ -597 +610 @@
         return;
 
-    if (who->isTargetableForAttack())
-    {
-        //Begin attack
-        DoStartAttackNoMovement(who);
+    if (m_creature->Attack(who, true))
+    {
+        m_creature->AddThreat(who, 0.0f);
+        m_creature->SetInCombatWith(who);
+        who->SetInCombatWith(m_creature);
 
         if (!InCombat)
@@ -607 +621 @@
             Aggro(who);
         }
-    }
-}
+
+        DoStartNoMovement(who);
+    }
+}