diff options
6 files changed, 154 insertions, 198 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 93b13037ff5..66155de24e2 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -409,9 +409,9 @@ SET(trinityscript_LIB_SRCS scripts/zone/nexus/oculus/boss_eregos.cpp scripts/zone/nexus/oculus/def_oculus.h scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp - scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krik_thir.cpp + scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krikthir_the_gatewatcher.cpp scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_hadronox.cpp - scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.cpp + scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anubarak.cpp scripts/zone/Azjol-Nerub/Azjol-Nerub/def_azjol_nerub.h scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp scripts/zone/Azjol-Nerub/ahnkahet/boss_prince_taldaram.cpp diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index d7a414ce78f..56438d536f4 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -848,10 +848,6 @@ Name="Azjol-Nerub" > <File - RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\boss_anub_arak.cpp" - > - </File> - <File RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_anubarak.cpp" > </File> @@ -860,10 +856,6 @@ > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\azjol-nerub\boss_krik_thir.cpp" - > - </File> - <File RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_krikthir_the_gatewatcher.cpp" > </File> diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.cpp deleted file mode 100644 index 83695bd86d7..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* Script Data Start -SDName: Boss anub_arak -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_anub_arak' where entry = ''; -*** SQL END ***/ -#include "precompiled.h" - -//Spells -#define SPELL_CARRION_BEETLES 53520 -#define SPELL_LOCUST_SWARM 53467 -#define SPELL_IMPALE 53454 -#define SPELL_POUND 53472 - -//Yell -#define SAY_INTRO -1601010 -#define SAY_AGGRO -1601000 -#define SAY_SLAY_1 -1601001 -#define SAY_SLAY_2 -1601002 -#define SAY_SLAY_3 -1601003 -#define SAY_LOCUST_1 -1601005 -#define SAY_LOCUST_2 -1601006 -#define SAY_LOCUST_3 -1601007 -#define SAY_SUBMERGE_1 -1601008 -#define SAY_SUBMERGE_2 -1601009 -#define SAY_DEATH -1601004 - -struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI -{ - boss_anub_arakAI(Creature *c) : ScriptedAI(c) {} - - uint32 phase; - - void Reset() {} - void Aggro(Unit* who) - { - DoScriptText(SAY_AGGRO, m_creature); - } - void AttackStart(Unit* who) {} - void MoveInLineOfSight(Unit* who) {} - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if(!UpdateVictim()) - return; - - phase =1; - - if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 33) - phase = 2; - if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) == 15) - phase = 3; - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* killer) - { - DoScriptText(SAY_DEATH, m_creature); - } - void KilledUnit(Unit *victim) - { - if (victim == m_creature) - return; - - switch(rand()%3) - { - case 0: DoScriptText(SAY_SLAY_1, m_creature);break; - case 1: DoScriptText(SAY_SLAY_2, m_creature);break; - case 2: DoScriptText(SAY_SLAY_3, m_creature);break; - } - } -}; - -CreatureAI* GetAI_boss_anub_arak(Creature *_Creature) -{ - return new boss_anub_arakAI (_Creature); -} - -void AddSC_boss_anub_arak() -{ - Script *newscript; - - newscript = new Script; - newscript->Name="boss_anub_arak"; - newscript->GetAI = GetAI_boss_anub_arak; - newscript->RegisterSelf(); -} diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anubarak.cpp index f9922581733..c479e17d162 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anubarak.cpp @@ -18,10 +18,95 @@ /* ScriptData SDName: boss_anubarak +SDAuthor: LordVanMartin SD%Complete: 0 -SDComment: Placeholder +SDComment: SDCategory: Azjol Nerub EndScriptData */ +/*** SQL START *** +update creature_template set scriptname = 'boss_anub_arak' where entry = ''; +*** SQL END ***/ + #include "precompiled.h" #include "def_azjol_nerub.h" + +//Spells +#define SPELL_CARRION_BEETLES 53520 +#define SPELL_LOCUST_SWARM 53467 +#define SPELL_IMPALE 53454 +#define SPELL_POUND 53472 + +//Yell +#define SAY_INTRO -1601010 +#define SAY_AGGRO -1601000 +#define SAY_SLAY_1 -1601001 +#define SAY_SLAY_2 -1601002 +#define SAY_SLAY_3 -1601003 +#define SAY_LOCUST_1 -1601005 +#define SAY_LOCUST_2 -1601006 +#define SAY_LOCUST_3 -1601007 +#define SAY_SUBMERGE_1 -1601008 +#define SAY_SUBMERGE_2 -1601009 +#define SAY_DEATH -1601004 + +struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI +{ + boss_anub_arakAI(Creature *c) : ScriptedAI(c) {} + + uint32 phase; + + void Reset() {} + void Aggro(Unit* who) + { + DoScriptText(SAY_AGGRO, m_creature); + } + void AttackStart(Unit* who) {} + void MoveInLineOfSight(Unit* who) {} + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if(!UpdateVictim()) + return; + + phase =1; + + if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 33) + phase = 2; + if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) == 15) + phase = 3; + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* killer) + { + DoScriptText(SAY_DEATH, m_creature); + } + void KilledUnit(Unit *victim) + { + if (victim == m_creature) + return; + + switch(rand()%3) + { + case 0: DoScriptText(SAY_SLAY_1, m_creature);break; + case 1: DoScriptText(SAY_SLAY_2, m_creature);break; + case 2: DoScriptText(SAY_SLAY_3, m_creature);break; + } + } +}; + +CreatureAI* GetAI_boss_anub_arak(Creature *_Creature) +{ + return new boss_anub_arakAI (_Creature); +} + +void AddSC_boss_anub_arak() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="boss_anub_arak"; + newscript->GetAI = GetAI_boss_anub_arak; + newscript->RegisterSelf(); +} diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krik_thir.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krik_thir.cpp deleted file mode 100644 index 91c185aaf40..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krik_thir.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* Script Data Start -SDName: Boss krik_thir -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_krik_thir' where entry = ''; -*** SQL END ***/ -#include "precompiled.h" - -//Spells -#define SPELL_SUMMON_SKITTERING_SWARMER 52438 //maybe 52439 //summons NPC 28735 -#define SPELL_MIND_FLAY 52586 -#define SPELL_FRENZY 53361 -#define SPELL_CURSE_OF_FATIGUE 52592 //Curses all enemies in a 5 radius around the target, dealing 2828 to 3172 Shadow damage, slowing movement speed by 30%, attack speed by 30%, and casting speed by 30%. Lasts 10 sec. - -#define SKITTERING_SWARMER 28735 - -//Yell -#define SAY_AGGRO -1601011 -#define SAY_SLAY_1 -1601012 -#define SAY_SLAY_2 -1601013 -#define SAY_SLAY_3 -1601014 -#define SAY_DEATH -1601015 -#define SAY_SEND_GROUP_1 -1601018 -#define SAY_SEND_GROUP_2 -1601019 -#define SAY_SEND_GROUP_3 -1601020 -#define SAY_SWARM_1 -1601016 -#define SAY_SWARM_2 -1601017 -#define SAY_PREFIGHT_1 -1601021 -#define SAY_PREFIGHT_2 -1601022 -#define SAY_PREFIGHT_3 -1601023 - -struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI -{ - boss_krik_thirAI(Creature *c) : ScriptedAI(c) {} - - void Reset() {} - - void Aggro(Unit* who) - { - DoScriptText(SAY_AGGRO, m_creature); - } - - void UpdateAI(const uint32 diff) - { - if(!UpdateVictim()) - return; - - if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) >= 10) - { - //Frenzy - } - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* killer) - { - DoScriptText(SAY_DEATH, m_creature); - } - void KilledUnit(Unit *victim) - { - if (victim == m_creature) - return; - - switch(rand()%3) - { - case 0: DoScriptText(SAY_SLAY_1, m_creature);break; - case 1: DoScriptText(SAY_SLAY_2, m_creature);break; - case 2: DoScriptText(SAY_SLAY_3, m_creature);break; - } - } -}; - -CreatureAI* GetAI_boss_krik_thir(Creature *_Creature) -{ - return new boss_krik_thirAI (_Creature); -} - -void AddSC_boss_krik_thir() -{ - Script *newscript; - - newscript = new Script; - newscript->Name="boss_krik_thir"; - newscript->GetAI = GetAI_boss_krik_thir; - newscript->RegisterSelf(); - -} diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krikthir_the_gatewatcher.cpp index 27f4d3070fc..73316668d89 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_krikthir_the_gatewatcher.cpp @@ -18,11 +18,16 @@ /* ScriptData SDName: boss_krikthir_the_gatewatcher +SDAuthor: LordVanMartin SD%Complete: 0 SDComment: Placeholder SDCategory: Azjol Nerub EndScriptData */ +/*** SQL START *** +update creature_template set scriptname = 'boss_krik_thir' where entry = ''; +*** SQL END ***/ + #include "precompiled.h" #include "def_azjol_nerub.h" @@ -30,9 +35,67 @@ EndScriptData */ #define H_SPELL_MIND_FLAY 59367 #define SPELL_CURSE_OF_FATIGUE 52592 #define H_SPELL_CURSE_OF_FATIGUE 59368 -#define SPELL_FRENZY 28747 +#define SPELL_FRENZY 28747 // maybe 53361 #define MOB_SKITTERING_SWARMER 28735 #define MOB_SKITTERING_SWARMER_CONTROLLER 32593 -#define SPELL_SUMMON_SKITTERING_SWARMER 52438//AOE Effekt 140 -#define SPELL_SUMMON_SKITTERING_SWARMER 52439//Summon 3x 28735
\ No newline at end of file + +#define SPELL_SUMMON_SKITTERING_SWARMER 52438//AOE Effekt 140, maybe 52439 +#define SPELL_SUMMON_SKITTERING_SWARMER 52439//Summon 3x 28735 + +struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI +{ + boss_krik_thirAI(Creature *c) : ScriptedAI(c) {} + + void Reset() {} + + void Aggro(Unit* who) + { + DoScriptText(SAY_AGGRO, m_creature); + } + + void UpdateAI(const uint32 diff) + { + if(!UpdateVictim()) + return; + + if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) >= 10) + { + //Frenzy + } + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* killer) + { + DoScriptText(SAY_DEATH, m_creature); + } + void KilledUnit(Unit *victim) + { + if (victim == m_creature) + return; + + switch(rand()%3) + { + case 0: DoScriptText(SAY_SLAY_1, m_creature);break; + case 1: DoScriptText(SAY_SLAY_2, m_creature);break; + case 2: DoScriptText(SAY_SLAY_3, m_creature);break; + } + } +}; + +CreatureAI* GetAI_boss_krik_thir(Creature *_Creature) +{ + return new boss_krik_thirAI (_Creature); +} + +void AddSC_boss_krik_thir() +{ + Script *newscript; + + newscript = new Script; + newscript->Name="boss_krik_thir"; + newscript->GetAI = GetAI_boss_krik_thir; + newscript->RegisterSelf(); + +} |