Changeset 200 for trunk

Timestamp:

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

Author:

yumileroy

Message:

[svn] * Disabled the move and stay commands while pet is possessed
* Make pet come back to its owner after possession ends if it's not currently in combat
* Allow the possessed unit to properly change attack targets
* Also remove charm effects from charmed target on owner aura cancel

Original author: gvcoman
Date: 2008-11-08 23:32:15-06:00

Location:

trunk/src/game

Files:

• PetHandler.cpp (modified) (1 diff)
• Player.cpp (modified) (1 diff)
• PossessedAI.cpp (modified) (1 diff)
• SpellHandler.cpp (modified) (1 diff)

trunk/src/game/PetHandler.cpp

@@ -79 +79 @@
     {
         case ACT_COMMAND:                                   //0x0700
+            // Possessed pets are only able to attack
+            if (pet->isPossessed() && spellid != COMMAND_ATTACK)
+                return;
+
             switch(spellid)
             {

trunk/src/game/Player.cpp

@@ -18765 +18765 @@
     {
         target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+        // Reinitialize the pet bar and make the pet come back to the owner
         if(((Creature*)target)->isPet())
+        {
             PetSpellInitialize();
+            if (!target->getVictim())
+            {
+                target->GetMotionMaster()->MoveFollow(this, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+                target->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
+            }
+        }
         else if (target->isAlive())
         {

trunk/src/game/PossessedAI.cpp

@@ -25 +25 @@
 void PossessedAI::AttackStart(Unit *u)
 {
-    if( i_pet.getVictim() || !u )
+    if( !u )
         return;
+
+    if (i_pet.getVictim() && u != i_pet.getVictim())
+        i_pet.AttackStop();
 
     if(i_pet.Attack(u, true))

trunk/src/game/SpellHandler.cpp

@@ -353 +353 @@
         return;
 
-    // Remove possess aura from the possessed as well
-    if(_player->isPossessing())
+    // Remove possess/charm aura from the possessed/charmed as well
+    // TODO: Remove this once the ability to cancel aura sets at once is implemented
+    if(_player->GetCharm())
     {
         for (int i = 0; i < 3; ++i)
         {
             if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS ||
-                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET)
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET ||
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_CHARM)
             {
                 _player->RemoveAurasDueToSpellByCancel(spellId);