Changeset 3190

Timestamp:

03/02/2010 09:24:12 AM (6 months ago)

Author:

Dfighter

Message:

APPLIED: Ezri's Demonic Circle patch. http://arcemu.org/forums/index.php?showtopic=21031
Thanks for contributing.

Location:

trunk/src/arcemu-world

Files:

• SpellAuras.cpp (modified) (3 diffs)
• SpellAuras.h (modified) (1 diff)
• SpellFixes.cpp (modified) (1 diff)

trunk/src/arcemu-world/SpellAuras.cpp

@@ -3804 +3804 @@
 }
 
+void Aura::EventPeriodicTriggerDummy(){
+        
+        switch( GetSpellProto()->Id ){
+        case 48018:{
+                GameObject * circle = m_target->GetMapMgr()->GetGameObject( m_target->m_ObjectSlots[ 0 ] );
+                SpellEntry* sp = dbcSpell.LookupEntryForced( 48020 );
+                
+                if( circle != NULL && sp != NULL && m_target->CalcDistance( circle ) <= GetMaxRange( dbcSpellRange.LookupEntry( sp->rangeIndex ) )){
+                        if( !m_target->HasAura( 62388 ) )
+                                m_target->CastSpell( m_target, 62388, true );
+                }else
+                        m_target->RemoveAura( 62388 );
+
+                           break; }
+        }
+}
+
 void Aura::SpellAuraModResistance(bool apply)
 {
@@ -6109 +6126 @@
                 else
                         SetNegative();
+
+                // Demonic Circle hack
+                if ( m_spellProto->Id == 48020 && m_target->IsPlayer() && m_target->HasAura( 62388 ) ){
+                        GameObject* obj = m_target->GetMapMgr()->GetGameObject( m_target->m_ObjectSlots[ 0 ] );
+
+                        if( obj != NULL ){
+                                Player *ptarget = static_cast< Player* >( m_target );
+
+                                ptarget->SafeTeleport( obj->GetMapId(), obj->GetInstanceID(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), m_target->GetOrientation() );
+                        }
+                }
         }
         else
@@ -6347 +6375 @@
         switch( m_spellProto->NameHash )
         {
+                // Demonic Circle
+                case SPELL_HASH_DEMONIC_CIRCLE__SUMMON:{
+                        if (apply)
+                                sEventMgr.AddEvent( this, &Aura::EventPeriodicTriggerDummy, EVENT_AURA_PERIODIC_TRIGGERSPELL, GetSpellProto()->EffectAmplitude[mod->i],360,EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT );
+                        else{
+                                sEventMgr.RemoveEvents( this );
+                                m_target->RemoveAllAuraById(62388);
+                                }
+
+                                break;}
+
                 case SPELL_HASH_ASPECT_OF_THE_VIPER:
                         if( p_target )

trunk/src/arcemu-world/SpellAuras.h

@@ -748 +748 @@
         void EventPeriodicManaPct(float);
         void EventPeriodicRegenManaStatPct(uint32 perc,uint32 stat);
+        void EventPeriodicTriggerDummy();
+
+
         void RelocateEvents();
         int32 event_GetInstanceID();

trunk/src/arcemu-world/SpellFixes.cpp

@@ -5614 +5614 @@
         // Insert warlock spell fixes here
                 
+                //Dummy for Demonic Circle
+                sp = dbcSpell.LookupEntryForced( 48018 );
+                if (sp != NULL){
+                        
+                        sp->EffectImplicitTargetA[1] = 1;
+                        CreateDummySpell( 62388 );
+                        sp = dbcSpell.LookupEntryForced( 62388 );
+                        if ( sp != NULL ){
+                                sp->Effect[0] = 6;
+                                sp->EffectApplyAuraName[0] = SPELL_AURA_DUMMY;
+                        }
+                }
+                
                 //megai2: Immolation Aura
                 sp = dbcSpell.LookupEntryForced( 50589 );