Changeset 63

Timestamp:

11/19/08 13:30:46 (17 years ago)

Author:

yumileroy

Message:

[svn] Recalculate attack time in Unit::ApplyAttackTimePercentMod? function.
Add Felmyst script.
Add Eredar twins script. Script provided by BroodWyrm?.
Update Brutallus script. Patch provided by riddick. (Burn temporarily disabled)
Update void reaver script. Patch provided by Bagsac.
Fix a bug that Najentus causes server crash.

Original author: megamage
Date: 2008-10-19 12:01:49-05:00

Location:

trunk/src

Files:

• bindings/scripts/Makefile.am (modified) (1 diff)
• bindings/scripts/VC71/71ScriptDev2.vcproj (modified) (1 diff)
• bindings/scripts/VC80/80ScriptDev2.vcproj (modified) (1 diff)
• bindings/scripts/VC90/90ScriptDev2.vcproj (modified) (1 diff)
• bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp (modified) (3 diffs)
• bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp (modified) (9 diffs)
• bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (added)
• bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp (added)
• bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp (modified) (1 diff)
• bindings/scripts/sql/Updates/r66_trinity.sql (added)
• game/Unit.cpp (modified) (2 diffs)

trunk/src/bindings/scripts/Makefile.am

@@ -324 +324 @@
 scripts/zone/stratholme/instance_stratholme.cpp \
 scripts/zone/stratholme/stratholme.cpp \
+scripts/zone/sunwell_plateau/boss_eredar_twins.cpp \
+scripts/zone/sunwell_plateau/boss_felmyst.cpp \
 scripts/zone/sunwell_plateau/boss_brutallus.cpp \
 scripts/zone/sunwell_plateau/boss_kalecgos.cpp \

trunk/src/bindings/scripts/VC71/71ScriptDev2.vcproj

@@ -1924 +1924 @@
                                         <File
                                                 RelativePath="..\scripts\zone\sunwell_plateau\boss_brutallus.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_eredar_twins.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_felmyst.cpp"
                                                 >
                                         </File>

trunk/src/bindings/scripts/VC80/80ScriptDev2.vcproj

@@ -2157 +2157 @@
                                         <File
                                                 RelativePath="..\scripts\zone\sunwell_plateau\boss_brutallus.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_eredar_twins.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_felmyst.cpp"
                                                 >
                                         </File>

trunk/src/bindings/scripts/VC90/90ScriptDev2.vcproj

@@ -2155 +2155 @@
                                         <File
                                                 RelativePath="..\scripts\zone\sunwell_plateau\boss_brutallus.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_eredar_twins.cpp"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\scripts\zone\sunwell_plateau\boss_felmyst.cpp"
                                                 >
                                         </File>

trunk/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp

@@ -169 +169 @@
         if(TidalShieldTimer < diff)
         {
-            m_creature->InterruptNonMeleeSpells(false);
-            DoCast(m_creature, SPELL_TIDAL_SHIELD, true);
+            m_creature->CastSpell(m_creature, SPELL_TIDAL_SHIELD, true);
             ResetTimer(45000);
         }else TidalShieldTimer -= diff;
@@ -187 +186 @@
             for(uint8 i = 0; i < 3; ++i)
             {
-                Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                if(!target) target = m_creature->getVictim();
-                m_creature->CastSpell(target, SPELL_NEEDLE_SPINE, true);
-            }
-            m_creature->SetInFront(m_creature->getVictim());
+                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) 
+                    m_creature->CastSpell(target, SPELL_NEEDLE_SPINE, true);
+            }
             NeedleSpineTimer = 30000;
         }else NeedleSpineTimer -= diff;
@@ -214 +211 @@
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
             if(!target) target = m_creature->getVictim();
-            m_creature->CastSpell(target, SPELL_IMPALING_SPINE, true);
-            m_creature->SetInFront(m_creature->getVictim());
-            SpineTargetGUID = target->GetGUID();
-            //must let target summon, otherwise you cannot click the spine
-            target->SummonGameObject(GOBJECT_SPINE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), m_creature->GetOrientation(), 0, 0, 0, 0, 30);
-
-            switch(rand()%2)
-            {
-            case 0:
-                DoYell(SAY_NEEDLE1, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_NEEDLE1);
-                break;
-            case 1:
-                DoYell(SAY_NEEDLE2, LANG_UNIVERSAL, NULL);
-                DoPlaySoundToSet(m_creature, SOUND_NEEDLE2);
-                break;
-            }
-            ImpalingSpineTimer = 21000;
+            if(target)
+            {
+                m_creature->CastSpell(target, SPELL_IMPALING_SPINE, true);
+                SpineTargetGUID = target->GetGUID();
+                //must let target summon, otherwise you cannot click the spine
+                target->SummonGameObject(GOBJECT_SPINE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), m_creature->GetOrientation(), 0, 0, 0, 0, 30);
+
+                switch(rand()%2)
+                {
+                case 0:
+                    DoYell(SAY_NEEDLE1, LANG_UNIVERSAL, NULL);
+                    DoPlaySoundToSet(m_creature, SOUND_NEEDLE1);
+                    break;
+                case 1:
+                    DoYell(SAY_NEEDLE2, LANG_UNIVERSAL, NULL);
+                    DoPlaySoundToSet(m_creature, SOUND_NEEDLE2);
+                    break;
+                }
+                ImpalingSpineTimer = 21000;
+            }
         }else ImpalingSpineTimer -= diff;
 

trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp

@@ -1 @@
-/* Copyright © 2006,2007 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+/* Copyright ?2006,2007 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17 +17 @@
 /* ScriptData
 SDName: Boss_Brutallus
-SD%Complete: 80
-SDComment: Needs intro. Talk to the dragon.
+SD%Complete: 90
+SDComment: Burn gets casted on himself and intro is missing.
 EndScriptData */
 
@@ -25 +25 @@
 
 // Yells and Sounds used by boss.
-#define YELL_AGGRO "Ahh! More lambs to the slaughter!"
-#define SOUND_AGGRO 12463
+#define YELL_AGGRO                      "Ahh! More lambs to the slaughter!"
+#define SOUND_AGGRO             12463
 
-#define YELL_BERSERK "So much for a real challenge... Die!"
-#define SOUND_BERSERK 12470
+#define YELL_BERSERK            "So much for a real challenge... Die!"
+#define SOUND_BERSERK           12470
 
-#define YELL_KILL1 "Perish, insect!"
-#define SOUND_KILL1 12464
+#define YELL_KILL1                      "Perish, insect!"
+#define SOUND_KILL1             12464
 
-#define YELL_KILL2 "You are meat!"
-#define SOUND_KILL2 12465
+#define YELL_KILL2                      "You are meat!"
+#define SOUND_KILL2             12465
+        
+#define YELL_KILL3                      "Too easy!"
+#define SOUND_KILL3             12466
 
-#define YELL_KILL3 "Too easy!"
-#define SOUND_KILL3 12466
+#define YELL_CHARGE             "I will crush you!"
+#define SOUND_CHARGE            12460
 
-#define YELL_CHARGE "I will crush you!"                     //I think it use this for stomp. No?
-#define SOUND_CHARGE 12460
+#define YELL_DEATH                      "Gah! Well done... Now... this gets... interesting..."
+#define SOUND_DEATH             12471
 
-#define YELL_DEATH "Gah! Well done... Now... this gets... interesting..."
-#define SOUND_DEATH 12471
+#define YELL_LOVE1                      "Bring the fight to me!"
+#define SOUND_LOVE1             12467
 
-#define YELL_LOVE1 "Bring the fight to me!"
-#define SOUND_LOVE1 12467
+#define YELL_LOVE2                      "Another day, another glorious battle!"
+#define SOUND_LOVE2             12468
 
-#define YELL_LOVE2 "Another day, another glorious battle!"
-#define SOUND_LOVE2 12468
-
-#define YELL_LOVE3 "I live for this!"
-#define SOUND_LOVE3 12469
+#define YELL_LOVE3                      "I live for this!"
+#define SOUND_LOVE3             12469
 
 // Boss spells.
-#define METEOR_SLASH 45150
-#define BURN 46394
-#define STOMP 45185
-#define BERSERK 26662
+#define SPELL_METEOR_SLASH              45150
+#define SPELL_BURN                              46394
+#define SPELL_STOMP                     45185
+#define SPELL_BERSERK                   26662
 
 struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
@@ -69 +69 @@
     uint32 StompTimer;
     uint32 BerserkTimer;
-    uint32 LoveTimer;
 
     void Reset()
@@ -77 +76 @@
         BurnTimer = 60000;
         BerserkTimer = 360000;
-        LoveTimer = 10000 + rand()%7000;
     }
 
@@ -116 +114 @@
             return;
 
-        if(LoveTimer < diff)
-        {
-            switch(rand()%3)
-            {
-                case 0:
-                    DoYell(YELL_LOVE1,LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_LOVE1);
-                    break;
-                case 1:
-                    DoYell(YELL_LOVE2,LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_LOVE2);
-                    break;
-                case 2:
-                    DoYell(YELL_LOVE3,LANG_UNIVERSAL, NULL);
-                    DoPlaySoundToSet(m_creature, SOUND_LOVE3);
-                    break;
-            }
-            LoveTimer = 15000 + rand()%8000;
-        }else LoveTimer -= diff;
-
         if(SlashTimer < diff)
         {
-            DoCast(m_creature->getVictim(),METEOR_SLASH);
+            DoCast(m_creature->getVictim(),SPELL_METEOR_SLASH);
             SlashTimer = 11000;
         }else SlashTimer -= diff;
@@ -144 +122 @@
         if(StompTimer < diff)
         {
-            DoYell(YELL_CHARGE,LANG_UNIVERSAL, NULL);
-            DoPlaySoundToSet(m_creature, SOUND_CHARGE);
-            Unit *Target = m_creature->getVictim();
-            DoCast(Target,STOMP);
+                        switch(rand()%3)
+                        {
+                                case 0:
+                                        DoYell(YELL_LOVE1,LANG_UNIVERSAL, NULL);
+                                        DoPlaySoundToSet(m_creature, SOUND_LOVE1);
+                                        break;
+                                case 1:
+                                        DoYell(YELL_LOVE2,LANG_UNIVERSAL, NULL);
+                                        DoPlaySoundToSet(m_creature, SOUND_LOVE2);
+                                        break;
+                                case 2:
+                                        DoYell(YELL_LOVE3,LANG_UNIVERSAL, NULL);
+                                        DoPlaySoundToSet(m_creature, SOUND_LOVE3);
+                                        break;
+                        }
+            
+                        Unit *Target = m_creature->getVictim();
+            DoCast(Target,SPELL_STOMP);
             if(Target->HasAura(45151,0)) Target->RemoveAura(45151,0);
             StompTimer = 30000;
@@ -155 +147 @@
         {
             Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            DoCast(target,BURN);
-            BurnTimer = 60000;
+            //DoCast(target,SPELL_BURN);
+                        BurnTimer = 60000;
         }
         else BurnTimer -= diff;
@@ -166 +158 @@
             DoYell(YELL_BERSERK,LANG_UNIVERSAL, NULL);
             DoPlaySoundToSet(m_creature, SOUND_BERSERK);
-            DoCast(m_creature,BERSERK);
+            DoCast(m_creature,SPELL_BERSERK);
             BerserkTimer = 20000;
         }

trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp

@@ -27 +27 @@
 #define SPELL_POUNDING              34162
 #define SPELL_ARCANE_ORB            34172
-#define SPELL_KNOCK_AWAY            11130
+#define SPELL_KNOCK_AWAY            25778
 #define SPELL_BERSERK               27680
 

trunk/src/game/Unit.cpp

@@ -10648 +10648 @@
 void Unit::ApplyAttackTimePercentMod( WeaponAttackType att,float val, bool apply )
 {
+    float remainingTimePct = (float)m_attackTimer[att] / (GetAttackTime(att) * m_modAttackSpeedPct[att]);
     if(val > 0)
     {
@@ -10658 +10659 @@
         ApplyPercentModFloatValue(UNIT_FIELD_BASEATTACKTIME+att,-val,apply);
     }
+    m_attackTimer[att] = uint32(GetAttackTime(att) * m_modAttackSpeedPct[att] * remainingTimePct);
 }