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

Timestamp:

11/22/08 00:36:22 (17 years ago)

Author:

yumileroy

Message:

Merged commit 269 (5f0e38da128a).

Original author: gvcoman
Date: 2008-11-21 14:34:05-05:00

Files:

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

trunk/src/game/SpellEffects.cpp

@@ -334 +334 @@
                         break;
                     }
-                    // must only affect demons
+                    // must only affect demons (also undead?)
                     case 45072:
                     {
-                        if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON)
+                        if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON
+                            || unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
                             return;
                         break;
                     }
+                    // gruul's shatter
+                    case 33671:
+                    {
+                        // don't damage self and only players
+                        if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                            return;
+
+                        float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[0]));
+                        if(!radius) return;
+                        float distance = m_caster->GetDistance2d(unitTarget);
+                        damage = (distance > radius ) ? 0 : (int32)(m_spellInfo->EffectBasePoints[0]*((radius - distance)/radius));
+                    }break;
                 }
                 break;
@@ -1159 +1172 @@
                     m_caster->CastSpell(m_caster, 45009, true);
                     return;
-                }                
+                }
                 case 45030:                                 // Impale Emissary
                 {
@@ -1262 +1275 @@
                         //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); 
+                        unitTarget->CastSpell( unitTarget, spell_list[urand(0, 5)], true);
                     }
                     return;
@@ -2238 +2251 @@
         m_caster->ModifyPower(POWER_MANA,gain);
         //send log
-        m_caster->SendEnergizeSpellLog(m_caster, m_spellInfo->Id,gain,POWER_MANA,false);
+        m_caster->SendEnergizeSpellLog(m_caster, m_spellInfo->Id,gain,POWER_MANA);
     }
 }
@@ -2254 +2267 @@
                     /*do not uncomment .
                     if(bg->GetTypeID()==BATTLEGROUND_WS)
-                        bg->EventPlayerClickedOnFlag((Player*)m_caster, this->gameObjTarget);
+                        bg->EventPlayerClickedOnFlag((Player*)m_caster, gameObjTarget);
                     sLog.outDebug("Send Event Horde Flag Picked Up");
                     break;
@@ -2267 +2280 @@
                     /*do not uncomment ... (it will cause crash, because of null targetobject!) anyway this is a bad way to call that event, because it would cause recursion
                     if(bg->GetTypeID()==BATTLEGROUND_WS)
-                        bg->EventPlayerClickedOnFlag((Player*)m_caster, this->gameObjTarget);
+                        bg->EventPlayerClickedOnFlag((Player*)m_caster, gameObjTarget);
                     sLog.outDebug("Send Event Alliance Flag Picked Up");
                     break;
@@ -2278 +2291 @@
                     case 23385:                                 // Alliance Flag Returns
                         if(bg->GetTypeID()==BATTLEGROUND_WS)
-                            bg->EventPlayerClickedOnFlag((Player*)m_caster, this->gameObjTarget);
+                            bg->EventPlayerClickedOnFlag((Player*)m_caster, gameObjTarget);
                         sLog.outDebug("Alliance Flag Returned");
                         break;
                     case 23386:                                   // Horde Flag Returns
                         if(bg->GetTypeID()==BATTLEGROUND_WS)
-                            bg->EventPlayerClickedOnFlag((Player*)m_caster, this->gameObjTarget);
+                            bg->EventPlayerClickedOnFlag((Player*)m_caster, gameObjTarget);
                         sLog.outDebug("Horde Flag Returned");
                         break;*/
@@ -2289 +2302 @@
                     /*
                     if(bg->GetTypeID()==BATTLEGROUND_EY)
-                        bg->EventPlayerClickedOnFlag((Player*)m_caster, this->gameObjTarget);
+                        bg->EventPlayerClickedOnFlag((Player*)m_caster, gameObjTarget);
                     */
                     break;
@@ -2638 +2651 @@
     float radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
     Unit *caster = m_originalCasterGUID ? m_originalCaster : m_caster;
+    if(!caster) return;
 
     if(Player* modOwner = caster->GetSpellModOwner())
@@ -2667 +2681 @@
 
     // Some level depends spells
-    int multiplier  = 0;
+    int multiplier = 0;
     int level_diff = 0;
     switch (m_spellInfo->Id)
@@ -2674 +2688 @@
         case 9512:
             level_diff = m_caster->getLevel() - 40;
-            multiplier  = 2;
+            multiplier = 2;
             break;
         // Blood Fury
         case 24571:
             level_diff = m_caster->getLevel() - 60;
-            multiplier  = 10;
+            multiplier = 10;
             break;
         // Burst of Energy
         case 24532:
             level_diff = m_caster->getLevel() - 60;
-            multiplier  = 4;
+            multiplier = 4;
             break;
         default:
@@ -3746 +3760 @@
         ((Player*)unitTarget)->TeleportTo(mapid, fx, fy, fz, -m_caster->GetOrientation(), TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0));
     else
-        MapManager::Instance().GetMap(mapid, m_caster)->CreatureRelocation((Creature*)m_caster, fx, fy, fz, -m_caster->GetOrientation());
+        m_caster->GetMap()->CreatureRelocation((Creature*)m_caster, fx, fy, fz, -m_caster->GetOrientation());
 }
 
@@ -3767 +3781 @@
         return;
 
-    sLog.outDebug("SpellEffect::AddHonor called for spell_id %u , that rewards %d honor points to player: %u", m_spellInfo->Id, this->damage, ((Player*)unitTarget)->GetGUIDLow());
+    sLog.outDebug("SpellEffect::AddHonor called for spell_id %u , that rewards %d honor points to player: %u", m_spellInfo->Id, damage, ((Player*)unitTarget)->GetGUIDLow());
 
     // TODO: find formula for honor reward based on player's level!
@@ -3773 +3787 @@
     // now fixed only for level 70 players:
     if (((Player*)unitTarget)->getLevel() == 70)
-        ((Player*)unitTarget)->RewardHonor(NULL, 1, this->damage);
+        ((Player*)unitTarget)->RewardHonor(NULL, 1, damage);
 }
 
@@ -3988 +4002 @@
 
     // add to world
-    MapManager::Instance().GetMap(pet->GetMapId(), pet)->Add((Creature*)pet);
+    pet->GetMap()->Add((Creature*)pet);
 
     // visual effect for levelup
@@ -4018 +4032 @@
                 return;
 
-            MapManager::Instance().GetMap(OldSummon->GetMapId(), OldSummon)->Remove((Creature*)OldSummon,false);
+            OldSummon->GetMap()->Remove((Creature*)OldSummon,false);
             OldSummon->SetMapId(m_caster->GetMapId());
 
@@ -4025 +4039 @@
 
             OldSummon->Relocate(px, py, pz, OldSummon->GetOrientation());
-            MapManager::Instance().GetMap(m_caster->GetMapId(), m_caster)->Add((Creature*)OldSummon);
+            m_caster->GetMap()->Add((Creature*)OldSummon);
 
             if(m_caster->GetTypeId() == TYPEID_PLAYER && OldSummon->isControlled() )
@@ -4108 +4122 @@
     if(m_caster->GetTypeId() == TYPEID_UNIT)
     {
-                if ( ((Creature*)m_caster)->isTotem() )
-                        NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
-                else
-                        NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
+        if ( ((Creature*)m_caster)->isTotem() )
+            NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
+        else
+            NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
     }
 
@@ -4433 +4447 @@
             ((Player*)m_caster)->AddComboPoints(unitTarget, 1);
     }
+
     // Mangle (Cat): CP
     if(m_spellInfo->SpellFamilyName==SPELLFAMILY_DRUID && (m_spellInfo->SpellFamilyFlags==0x0000040000000000LL))
@@ -4439 +4454 @@
             ((Player*)m_caster)->AddComboPoints(unitTarget,1);
     }
-
 
     // take ammo
@@ -5435 +5449 @@
 }
 
-void Spell::EffectResurrect(uint32 i)
+void Spell::EffectResurrect(uint32 /*effIndex*/)
 {
     if(!unitTarget)
@@ -5656 +5670 @@
     int32 targetLevel = creature->getLevel();
 
-    uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill(); 
+    uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
 
     ((Player*)m_caster)->SendLoot(creature->GetGUID(),LOOT_SKINNING);
@@ -5683 +5697 @@
 
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
-        MapManager::Instance().GetMap(m_caster->GetMapId(), m_caster)->CreatureRelocation((Creature*)m_caster,x,y,z,m_caster->GetOrientation());
+        m_caster->GetMap()->CreatureRelocation((Creature*)m_caster,x,y,z,m_caster->GetOrientation());
 
     // not all charge effects used in negative spells
@@ -6119 +6133 @@
             linkedGO->SetOwnerGUID(m_caster->GetGUID() );
 
-            MapManager::Instance().GetMap(linkedGO->GetMapId(), linkedGO)->Add(linkedGO);
+            linkedGO->GetMap()->Add(linkedGO);
         }
         else