diff options
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 1 | ||||
| -rw-r--r-- | sql/updates/5966_world_scripts.sql | 3 | ||||
| -rw-r--r-- | sql/updates/5971_world_scripts.sql (renamed from sql/uwom/6144_world_scripts.sql) | 3 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp | 40 |
4 files changed, 23 insertions, 24 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 7288a2583a8..b895e0031c2 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -195,6 +195,7 @@ UPDATE `gameobject_template` SET `ScriptName`='prince_taldaram_sphere' WHERE `en UPDATE `creature_template` SET `ScriptName`='boss_volazj' WHERE `entry`=29311; UPDATE `creature_template` SET `ScriptName`='boss_amanitar' WHERE `entry`=30258; UPDATE `creature_template` SET `ScriptName`='mob_amanitar_mushrooms' WHERE `entry` IN (30435,30391); +UPDATE `creature_template` SET `ScriptName`='mob_nadox_eggs' WHERE `entry` IN (30172,30173); /* AZSHARA */ UPDATE `creature_template` SET `ScriptName`='mobs_spitelashes' WHERE `entry` IN (6190,6193,6194,6195,6196,7885,7886,12204,12205); diff --git a/sql/updates/5966_world_scripts.sql b/sql/updates/5966_world_scripts.sql index d7f710d9964..fa7a9f2d79f 100644 --- a/sql/updates/5966_world_scripts.sql +++ b/sql/updates/5966_world_scripts.sql @@ -1,3 +1,4 @@ + UPDATE `creature_template` SET `ScriptName`='mob_massive_jormungar' WHERE `entry`=26685; UPDATE `creature_template` SET `ScriptName`='mob_ferocious_rhino' WHERE `entry`=26686; -UPDATE `creature_template` SET `ScriptName`='mob_palehoof_orb' WHERE `entry`=26688;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='mob_palehoof_orb' WHERE `entry`=26688; diff --git a/sql/uwom/6144_world_scripts.sql b/sql/updates/5971_world_scripts.sql index 72535721bf6..0a69409ae0c 100644 --- a/sql/uwom/6144_world_scripts.sql +++ b/sql/updates/5971_world_scripts.sql @@ -1 +1,2 @@ -UPDATE `creature_template` SET `ScriptName`='mob_nadox_eggs' WHERE `entry` IN ('30172','30173'); + +UPDATE `creature_template` SET `ScriptName`='mob_nadox_eggs' WHERE `entry` IN (30172,30173); diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index 65bab5333b5..67402872784 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI void JustDied(Unit* killer) { - DoScriptText(SAY_SLAY_3,m_creature); + DoScriptText(SAY_SLAY_3,m_creature); //SAY_SLAY_3 on death? if (HeroicMode && !DeadAhnkaharGuardian) { @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI { DoCast(m_creature->getVictim(),HEROIC(SPELL_BROOD_PLAGUE, H_SPELL_BROOD_PLAGUE)); plague_Timer = 15000; - }else plague_Timer -= diff; + } else plague_Timer -= diff; if (HeroicMode) if (rage_Timer < diff) @@ -146,25 +146,24 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI DoCast(Swarmer,H_SPELL_BROOD_RAGE,true); rage_Timer = 15000; } - }else rage_Timer -= diff; + } else rage_Timer -= diff; if (swarmer_spawn_Timer < diff) { DoCast(m_creature,SPELL_SUMMON_SWARMERS,true); DoCast(m_creature,SPELL_SUMMON_SWARMERS); - if (rand()%3 == 0) - { + if (urand(1,3) == 3) // 33% chance of dialog DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), m_creature); - } + swarmer_spawn_Timer = 10000; - }else swarmer_spawn_Timer -= diff; + } else swarmer_spawn_Timer -= diff; if (guard_spawn_Timer < diff) { m_creature->MonsterTextEmote(EMOTE_HATCHES,m_creature->GetGUID(),true); DoCast(m_creature,SPELL_SUMMON_SWARM_GUARD); guard_spawn_Timer = 25000; - }else guard_spawn_Timer -= diff; + } else guard_spawn_Timer -= diff; if (enrage_Timer < diff) { @@ -174,14 +173,11 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI float x, y, z, o; m_creature->GetHomePosition(x, y, z, o); if (z < 24) - { if (!m_creature->IsNonMeleeSpellCasted(false)) - { DoCast(m_creature,SPELL_ENRAGE,true); - } - } + enrage_Timer = 5000; - }else enrage_Timer -= diff; + } else enrage_Timer -= diff; DoMeleeAttackIfReady(); } @@ -206,7 +202,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI void Reset() { - if (m_creature->GetEntry() == 30176) + if (m_creature->GetEntry() == 30176) //magic numbers are bad! DoCast(m_creature,SPELL_GUARDIAN_AURA,true); sprint_Timer = 10000; } @@ -221,7 +217,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (m_creature->GetEntry() == 30176) + if (m_creature->GetEntry() == 30176) //magic numbers are bad! m_creature->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA); if (pInstance) @@ -240,7 +236,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI { DoCast(m_creature,SPELL_SPRINT); sprint_Timer = 25000; - }else sprint_Timer -= diff; + } else sprint_Timer -= diff; DoMeleeAttackIfReady(); } @@ -253,11 +249,11 @@ struct MANGOS_DLL_DECL mob_nadox_eggsAI : public Scripted_NoMovementAI c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); c->UpdateAllStats(); } - void Reset() { } - void EnterCombat(Unit* who) { } - void AttackStart(Unit* victim) { } - void MoveInLineOfSight(Unit* who) { } - void UpdateAI(const uint32 diff) { } + void Reset() {} + void EnterCombat(Unit* who) {} + void AttackStart(Unit* victim) {} + void MoveInLineOfSight(Unit* who) {} + void UpdateAI(const uint32 diff) {} }; CreatureAI* GetAI_mob_ahnkahar_nerubian(Creature* pCreature) @@ -285,7 +281,7 @@ void AddSC_boss_elder_nadox() newscript->RegisterSelf(); newscript = new Script; - newscript->Name="mob_nadox_eggs"; + newscript->Name = "mob_nadox_eggs"; newscript->GetAI = &GetAI_mob_nadox_eggs; newscript->RegisterSelf(); } |