Changeset 18 for trunk/src/game/SpellEffects.cpp

Timestamp:

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

Author:

yumileroy

Message:

[svn] * Little fix in RandomMovementGenerator?
* Updated to 6731 and 680

Original author: Neo2003
Date: 2008-10-06 04:48:59-05:00

Files:

• trunk/src/game/SpellEffects.cpp (modified) (5 diffs)

trunk/src/game/SpellEffects.cpp

@@ -53 +53 @@
 #include "SocialMgr.h"
 #include "Util.h"
+#include "TemporarySummon.h"
+
 
 pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
@@ -1007 +1009 @@
                     return;
                 }
+                case 37573:                                 //Temporal Phase Modulator
+                {
+                    if(!unitTarget)
+                        return;
+
+                    TemporarySummon* tempSummon = dynamic_cast<TemporarySummon*>(unitTarget);
+                    if(!tempSummon)
+                        return;
+
+                    uint32 health = tempSummon->GetHealth();
+                    const uint32 entry_list[6] = {21821, 21820, 21817};
+
+                    float x = tempSummon->GetPositionX();
+                    float y = tempSummon->GetPositionY();
+                    float z = tempSummon->GetPositionZ();
+                    float o = tempSummon->GetOrientation();
+
+                    tempSummon->UnSummon();
+
+                    Creature* pCreature = m_caster->SummonCreature(entry_list[urand(0, 2)], x, y, z, o,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,180000);
+                    if (!pCreature)
+                        return;
+
+                    pCreature->SetHealth(health);
+
+                    if(pCreature->AI())
+                        pCreature->AI()->AttackStart(m_caster);
+
+                    return;
+                }
+                case 34665:                                 //Administer Antidote
+                {
+                    if(!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER )
+                        return;
+
+                    if(!unitTarget)
+                        return;
+
+                    TemporarySummon* tempSummon = dynamic_cast<TemporarySummon*>(unitTarget);
+                    if(!tempSummon)
+                        return;
+
+                    uint32 health = tempSummon->GetHealth();
+
+                    float x = tempSummon->GetPositionX();
+                    float y = tempSummon->GetPositionY();
+                    float z = tempSummon->GetPositionZ();
+                    float o = tempSummon->GetOrientation();
+                    tempSummon->UnSummon();
+
+                    Creature* pCreature = m_caster->SummonCreature(16992, x, y, z, o,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,180000);
+                    if (!pCreature)
+                        return;
+
+                    pCreature->SetHealth(health);
+                    ((Player*)m_caster)->KilledMonster(16992,pCreature->GetGUID());
+
+                    if (pCreature->AI())
+                        pCreature->AI()->AttackStart(m_caster);
+
+                    return;
+                }
+                case 44997:                                 // Converting Sentry
+                {
+                    //Converted Sentry Credit
+                    m_caster->CastSpell(m_caster, 45009, true);
+                    return;
+                }                
                 case 45030:                                 // Impale Emissary
                 {
                     // Emissary of Hate Credit
-                    m_caster->CastSpell(m_caster,45088,true);
+                    m_caster->CastSpell(m_caster, 45088, true);
                     return;
                 }
@@ -1100 +1170 @@
                             ((Player*)m_caster)->GetSession()->SendPacket(&data);
                         }
+                    }
+                    return;
+                }
+                case 32826:
+                {
+                    if ( unitTarget && unitTarget->GetTypeId() == TYPEID_UNIT )
+                    {
+                        //Polymorph Cast Visual Rank 1
+                        const uint32 spell_list[6] = {32813, 32816, 32817, 32818, 32819, 32820};
+                        unitTarget->CastSpell( unitTarget, spell_list[urand(0, 5)], true); 
                     }
                     return;
@@ -2761 +2841 @@
             goInfo->type == GAMEOBJECT_TYPE_GOOBER && goInfo->goober.losOK )
         {
-            if(BattleGround *bg = player->GetBattleGround())// in battleground
-            {
-                if( !player->IsMounted() &&                 // not mounted
-                    !player->HasStealthAura() &&            // not stealthed
-                    !player->HasInvisibilityAura() &&       // not invisible
-                    player->isAlive() )                     // live player
-                {
-                    // check if it's correct bg
-                    if(bg && bg->GetTypeID() == BATTLEGROUND_AB)
-                        bg->EventPlayerClickedOnFlag(player, gameObjTarget);
-
-                    return;
-                }
+            //isAllowUseBattleGroundObject() already called in CanCast()
+            // in battleground check
+            if(BattleGround *bg = player->GetBattleGround())
+            {
+                // check if it's correct bg
+                if(bg && bg->GetTypeID() == BATTLEGROUND_AB)
+                    bg->EventPlayerClickedOnFlag(player, gameObjTarget);
+                return;
             }
         }
         else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
         {
+            //isAllowUseBattleGroundObject() already called in CanCast()
+            // in battleground check
             if(BattleGround *bg = player->GetBattleGround())
+            {
                 if(bg->GetTypeID() == BATTLEGROUND_EY)
                     bg->EventPlayerClickedOnFlag(player, gameObjTarget);
-            return;
+                return;
+            }
         }
         lockId = gameObjTarget->GetLockId();
@@ -4752 +4831 @@
             break;
         }
+        //5,000 Gold
+        case 46642:
+        {
+            if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                return;
+
+            ((Player*)unitTarget)->ModifyMoney(50000000);
+
+            break;
+        }
     }