diff options
Diffstat (limited to 'src')
18 files changed, 400 insertions, 501 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index b3aa1bfd17d..ea3a4f79a68 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -414,10 +414,10 @@ SET(trinityscript_LIB_SRCS scripts/zone/Azjol-Nerub/Azjol-Nerub/boss_anub_arak.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_taldaram.cpp - scripts/zone/Azjol-Nerub/ahnkahet/boss_nadox.cpp - scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga.cpp - scripts/zone/Azjol-Nerub/ahnkahet/boss_volazj.cpp + scripts/zone/Azjol-Nerub/ahnkahet/boss_prince_taldaram.cpp + scripts/zone/Azjol-Nerub/ahnkahet/boss_elder_nadox.cpp + scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga_shadowseeker.cpp + scripts/zone/Azjol-Nerub/ahnkahet/boss_herald_volazj.cpp scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj index 1fb17a8de40..a193b68cf35 100644 --- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj +++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj @@ -632,31 +632,31 @@ Name="Ahn'kahet" > <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_amanitar.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_amanitar.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_elder_nadox.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_elder_nadox.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_herald_volazj.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_herald_volazj.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_jedoga_shadowseeker.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_jedoga_shadowseeker.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_prince_taldaram.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_prince_taldaram.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\def_ahnkahet.h" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\def_ahnkahet.h" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\instance_ahnkahet.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\instance_ahnkahet.cpp" > </File> </Filter> diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj index 24a3338d80d..2e4102b5c04 100644 --- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj +++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj @@ -809,31 +809,31 @@ Name="Ahn'kahet" > <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_amanitar.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_amanitar.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_elder_nadox.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_elder_nadox.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_herald_volazj.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_herald_volazj.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_jedoga_shadowseeker.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_jedoga_shadowseeker.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_prince_taldaram.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_prince_taldaram.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\def_ahnkahet.h" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\def_ahnkahet.h" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\instance_ahnkahet.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\instance_ahnkahet.cpp" > </File> </Filter> diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index d7795cb0e66..d7a414ce78f 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -816,51 +816,31 @@ Name="Ahn'kahet" > <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_amanitar.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_amanitar.cpp" > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\ahnkahet\boss_aminitar.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_elder_nadox.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_elder_nadox.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_herald_volazj.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_herald_volazj.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_jedoga_shadowseeker.cpp" > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\ahnkahet\boss_jedoga.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\boss_prince_taldaram.cpp" > </File> <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_jedoga_shadowseeker.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\def_ahnkahet.h" > </File> <File - RelativePath="..\scripts\zone\azjol-nerub\ahnkahet\boss_nadox.cpp" - > - </File> - <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\boss_prince_taldaram.cpp" - > - </File> - <File - RelativePath="..\scripts\zone\azjol-nerub\ahnkahet\boss_taldaram.cpp" - > - </File> - <File - RelativePath="..\scripts\zone\azjol-nerub\ahnkahet\boss_volazj.cpp" - > - </File> - <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\def_ahnkahet.h" - > - </File> - <File - RelativePath="..\scripts\zone\Azjol-Nerub\Ahn'kahet\instance_ahnkahet.cpp" + RelativePath="..\scripts\zone\Azjol-Nerub\ahnkahet\instance_ahnkahet.cpp" > </File> </Filter> diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_amanitar.cpp deleted file mode 100644 index 14480a8b725..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_amanitar.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_amanitar -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Ahn'kahet -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp deleted file mode 100644 index 6ae0e551b6f..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_elder_nadox -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Ahn'kahet -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" - -#define SPELL_BROOD_PLAGUE 56130 -#define H_SPELL_BROOD_PLAGUE 59467 -#define SPELL_BROOD_RAGE 59465 - -#define MOB_AHNKAHAR_SWARMER 30178 -#define SPELL_SUMMON_SWARMERS 56119//2x 30178 - -#define MOB_AHNKAHAR_SWARMER 30178 -#define SPELL_SUMMON_SWARM_GUARD 56120//1x 30176 -#define SPELL_DEADLY_POISON 56145// Proc trigger -#define H_SPELL_DEADLY_POISON 59479// Proc trigger -#define SPELL_GUARDIAN_AURA 56151 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_herald_volazj.cpp deleted file mode 100644 index 389e828c881..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_herald_volazj.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_herald_volazj -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Ahn'kahet -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_jedoga_shadowseeker.cpp deleted file mode 100644 index efcd811641f..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_jedoga_shadowseeker.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_jedoga_shadowseeker -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Ahn'kahet -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" - -#define SPELL_CYCLONE_STRIKE 56855 -#define H_SPELL_CYCLONE_STRIKE 60030//kein unterschied zu 56855 außer das 60030 1,5sec cast ist -#define SPELL_LIGHTNING_BOLT 56891 -#define H_SPELL_LIGHTNING_BOLT 60032 -#define SPELL_THUNDERSHOCK 56926//AOE works -#define H_SPELL_THUNDERSHOCK 60029//AOE works - -#define SPELL_GIFT_OF_THE_HERALD 56219//triggert if sucessfull sacreficed diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_prince_taldaram.cpp deleted file mode 100644 index c03fe85a7f1..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_prince_taldaram.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_prince_taldaram -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Ahn'kahet -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" - -#define SPELL_BLOODTHIRST 55968 //Trigger Spell + add aura -#define SPELL_CONJURE_FLAME_SPHERE 55931 - -#define SPELL_FLAME_SPHERE_SUMMON_1 55895// 1x 30106 -#define H_SPELL_FLAME_SPHERE_SUMMON_1 59511// 1x 31686 -#define H_SPELL_FLAME_SPHERE_SUMMON_2 59512// 1x 31687 -#define SPELL_FLAME_SPHERE_SPAWN_EFFEKT 55891 -#define SPELL_FLAME_SPHERE_VISUAL 55928 -#define SPELL_FLAME_SPHERE_PERIODIC 55926 -#define H_SPELL_FLAME_SPHERE_PERIODIC 59508 -#define SPELL_FLAME_SPHERE_DEATH_EFFEKT 55947 - -#define SPELL_EMBRACE_OF_THE_VAMPYR 55959 -#define H_SPELL_EMBRACE_OF_THE_VAMPYR 59513 - -#define SPELL_VANISH 55964 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/def_ahnkahet.h b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/def_ahnkahet.h deleted file mode 100644 index 97c0db55d72..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/def_ahnkahet.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_AHNKAHET_H -#define DEF_AHNKAHET_H - -#define DATA_ELDER_NADOX 1 -#define DATA_PRINCE_TALDARAM 2 -#define DATA_JEDOGA_SHADOWSEEKER 3 -#define DATA_HERALD_VOLAZJ 4 -#define DATA_AMANITAR 5 - -#define DATA_ELDER_NADOX_EVENT 6 -#define DATA_PRINCE_TALDARAM_EVENT 7 -#define DATA_JEDOGA_SHADOWSEEKER_EVENT 8 -#define DATA_HERALD_VOLAZJ_EVENT 9 -#define DATA_AMANITAR_EVENT 10 -#endif diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp deleted file mode 100644 index 544d504c5ae..00000000000 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Azjol_Nerub -SD%Complete: 0 -SDComment: Placeholder -SDCategory: Azjol Nerub -EndScriptData */ - -#include "precompiled.h" -#include "def_ahnkahet.h" - -#define ENCOUNTERS 5 - -/* Ahn'kahet encounters: -0 - Elder Nadox -1 - Prince Taldaram -2 - Jedoga Shadowseeker -3 - Herald Volazj -4 - Amanitar (Heroic only) -*/ - -struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance -{ - instance_ahnkahet(Map *Map) : ScriptedInstance(Map) {Initialize();}; - - uint64 Elder_Nadox; - uint64 Prince_Taldaram; - uint64 Jedoga_Shadowseeker; - uint64 Herald_Volazj; - uint64 Amanitar; - - uint32 Encounters[ENCOUNTERS]; - - void Initialize() - { - Elder_Nadox =0; - Prince_Taldaram =0; - Jedoga_Shadowseeker =0; - Herald_Volazj =0; - Amanitar =0; - - for(uint8 i = 0; i < ENCOUNTERS; ++i) - Encounters[i] = NOT_STARTED; - } - - bool IsEncounterInProgress() const - { - for(uint8 i = 0; i < ENCOUNTERS; ++i) - if(Encounters[i] == IN_PROGRESS) return true; - - return false; - } - - - void OnCreatureCreate(Creature *creature, uint32 creature_entry) - { - switch(creature_entry) - { - case 29309: Elder_Nadox = creature->GetGUID(); break; - case 29308: Prince_Taldaram = creature->GetGUID(); break; - case 29310: Jedoga_Shadowseeker = creature->GetGUID(); break; - case 29311: Herald_Volazj = creature->GetGUID(); break; - case 30258: Amanitar = creature->GetGUID(); break; - } - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_ELDER_NADOX: return Elder_Nadox; - case DATA_PRINCE_TALDARAM: return Prince_Taldaram; - case DATA_JEDOGA_SHADOWSEEKER: return Jedoga_Shadowseeker; - case DATA_HERALD_VOLAZJ: return Herald_Volazj; - case DATA_AMANITAR: return Amanitar; - } - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_ELDER_NADOX_EVENT: - Encounters[0] = data;break; - case DATA_PRINCE_TALDARAM_EVENT: - Encounters[1] = data; break; - case DATA_JEDOGA_SHADOWSEEKER_EVENT: - Encounters[2] = data; break; - case DATA_HERALD_VOLAZJ: - Encounters[3] = data; break; - case DATA_AMANITAR: - Encounters[4] = data; break; - } - - if (data == DONE) - { - SaveToDB(); - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_ELDER_NADOX_EVENT: return Encounters[0]; - case DATA_PRINCE_TALDARAM_EVENT: return Encounters[1]; - case DATA_JEDOGA_SHADOWSEEKER_EVENT: return Encounters[2]; - case DATA_HERALD_VOLAZJ: return Encounters[3]; - case DATA_AMANITAR: return Encounters[4]; - } - return 0; - } - - const char* Save() - { - OUT_SAVE_INST_DATA; - - std::string str_data; - - std::ostringstream saveStream; - saveStream << "A K " << Encounters[0] << " " << Encounters[1] << " " - << Encounters[2] << Encounters[3] << Encounters[4]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data.c_str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0,data1,data2,data3,data4; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4; - - if( dataHead1 == 'A' && dataHead2 == 'K') - { - Encounters[0] = data0; - Encounters[1] = data1; - Encounters[2] = data2; - Encounters[3] = data3; - Encounters[4] = data4; - - for(uint8 i = 0; i < ENCOUNTERS; ++i) - if (Encounters[i] == IN_PROGRESS) - Encounters[i] = NOT_STARTED; - - }else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_ahnkahet(Map* map) -{ - return new instance_ahnkahet(map); -} - -void AddSC_instance_ahnkahet() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_ahnkahet"; - newscript->GetInstanceData = &GetInstanceData_instance_ahnkahet; - newscript->RegisterSelf(); -} diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp index 28d8bba173a..11332d0a383 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_aminitar.cpp @@ -1,15 +1,35 @@ +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + /* Script Data Start -SDName: Boss Amanitar +SDName: boss_aminitar SDAuthor: LordVanMartin -SD%Complete: +SD%Complete: 0 SDComment: Only appears in heroic mode -SDCategory: +SDCategory: Ahn'kahet Script Data End */ /*** SQL START *** update creature_template set scriptname = 'boss_amanitar' where entry = ''; *** SQL END ***/ + #include "precompiled.h" +#include "def_ahnkahet.h" #define SPELL_BASH 57094 #define SPELL_ENTANGLING_ROOTS 57095 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_nadox.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_elder_nadox.cpp index 6e667a5254f..468aa8e10a7 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_nadox.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_elder_nadox.cpp @@ -1,20 +1,48 @@ -/* Script Data Start -SDName: Boss nadox +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_elder_nadox SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ +SD%Complete: 0 +SDComment: +SDCategory: Ahn'kahet +EndScriptData */ /*** SQL START *** update creature_template set scriptname = 'boss_nadox' where entry = ''; *** SQL END ***/ + #include "precompiled.h" +#include "def_ahnkahet.h" + +#define SPELL_BROOD_PLAGUE 56130 +#define H_SPELL_BROOD_PLAGUE 59467 +#define SPELL_BROOD_RAGE 59465 //--> Heroic -- Enrages a Swarmer, increasing size and damage done. + +#define MOB_AHNKAHAR_SWARMER 30178 +#define SPELL_SUMMON_SWARMERS 56119//2x 30178 -//Spells -#define SPELL_BROOD_PLAGUE_N 56130 //Diseases the enemy, causing 12750 Nature damage over 30 sec. -#define SPELL_BROOD_PLAGUE_H 59467 //Diseases the enemy, causing 25500 Nature damage over 30 sec. -#define BUFF_BROOD_RAGE_H 59465 //--> Heroic -- Enrages a Swarmer, increasing size and damage done. +#define MOB_AHNKAHAR_SWARMER 30178 +#define SPELL_SUMMON_SWARM_GUARD 56120//1x 30176 +#define SPELL_DEADLY_POISON 56145// Proc trigger +#define H_SPELL_DEADLY_POISON 59479// Proc trigger +#define SPELL_GUARDIAN_AURA 56151 //randomly summons NPC 30178 and 30176 they can cast Sprint (56354) diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_volazj.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_herald_volazj.cpp index 38dbe61f8ec..8e0b1a4744d 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_volazj.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_herald_volazj.cpp @@ -1,15 +1,35 @@ -/* Script Data Start -SDName: Boss volazj +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_herald_volazj SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ +SD%Complete: 0 +SDComment: +SDCategory: Ahn'kahet +EndScriptData */ /*** SQL START *** update creature_template set scriptname = 'boss_volazj' where entry = ''; *** SQL END ***/ + #include "precompiled.h" +#include "def_ahnkahet.h" //Spells #define SPELL_INSANITY 57496 //Dummy diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index f088badd149..145c017679e 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -1,19 +1,43 @@ -/* Script Data Start -SDName: Boss jedoga +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_jedoga_shadowseeker SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ +SD%Complete: 0 +SDComment: +SDCategory: Ahn'kahet +EndScriptData */ /*** SQL START *** update creature_template set scriptname = 'boss_jedoga' where entry = ''; *** SQL END ***/ + #include "precompiled.h" +#include "def_ahnkahet.h" -#define SPELL_CYCLONE_STRIKE 56855 -#define SPELL_LIGHTNING_BOLT 56891 -#define SPELL_THUNDERSHOCK 56926 +#define SPELL_CYCLONE_STRIKE 56855 +#define H_SPELL_CYCLONE_STRIKE 60030//kein unterschied zu 56855 außer das 60030 1,5sec cast ist +#define SPELL_LIGHTNING_BOLT 56891 +#define H_SPELL_LIGHTNING_BOLT 60032 +#define SPELL_THUNDERSHOCK 56926//AOE works +#define H_SPELL_THUNDERSHOCK 60029//AOE works +#define SPELL_GIFT_OF_THE_HERALD 56219//triggert if sucessfull sacreficed #define SAY_AGGRO -1619000 #define SAY_C_SACRIFICE_1 -1619001 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_taldaram.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_prince_taldaram.cpp index b9d0b0ede97..36e68862f0c 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_taldaram.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/boss_prince_taldaram.cpp @@ -1,22 +1,48 @@ -/* Script Data Start -SDName: Boss taldaram +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_prince_taldaram SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ +SD%Complete: 0 +SDComment: +SDCategory: Ahn'kahet +EndScriptData */ -/*** SQL START *** -update creature_template set scriptname = 'boss_taldaram' where entry = ''; -*** SQL END ***/ #include "precompiled.h" +#include "def_ahnkahet.h" + +#define SPELL_BLOODTHIRST 55968 //Trigger Spell + add aura +#define SPELL_CONJURE_FLAME_SPHERE 55931 + +#define SPELL_FLAME_SPHERE_SUMMON_1 55895// 1x 30106 +#define H_SPELL_FLAME_SPHERE_SUMMON_1 59511// 1x 31686 +#define H_SPELL_FLAME_SPHERE_SUMMON_2 59512// 1x 31687 +#define SPELL_FLAME_SPHERE_SPAWN_EFFEKT 55891 +#define SPELL_FLAME_SPHERE_VISUAL 55928 +#define SPELL_FLAME_SPHERE_PERIODIC 55926 +#define H_SPELL_FLAME_SPHERE_PERIODIC 59508 +#define SPELL_FLAME_SPHERE_DEATH_EFFEKT 55947 + +#define SPELL_EMBRACE_OF_THE_VAMPYR 55959 +#define H_SPELL_EMBRACE_OF_THE_VAMPYR 59513 -//Spells -#define SPELL_BLOODTHIRST 55968 -#define SPELL_CONJURE_FLAME_SPHERE 55931 -#define SPELL_EMBRACE_OF_THE_VAMPYR_N 55959 -#define SPELL_EMBRACE_OF_THE_VAMPYR_H 59513 -#define SPELL_VANISH 55964 +#define SPELL_VANISH 55964 //Yell #define SAY_AGGRO -1619021 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h index 2ccf0a45ba2..97c0db55d72 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/def_ahnkahet.h @@ -1,4 +1,33 @@ -#ifndef DEF_AHN_KAHET_H -#define DEF_AHN_KAHET_H +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef DEF_AHNKAHET_H +#define DEF_AHNKAHET_H + +#define DATA_ELDER_NADOX 1 +#define DATA_PRINCE_TALDARAM 2 +#define DATA_JEDOGA_SHADOWSEEKER 3 +#define DATA_HERALD_VOLAZJ 4 +#define DATA_AMANITAR 5 + +#define DATA_ELDER_NADOX_EVENT 6 +#define DATA_PRINCE_TALDARAM_EVENT 7 +#define DATA_JEDOGA_SHADOWSEEKER_EVENT 8 +#define DATA_HERALD_VOLAZJ_EVENT 9 +#define DATA_AMANITAR_EVENT 10 #endif diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp index f6164dbc7dd..41cb91f86b7 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/ahnkahet/instance_ahnkahet.cpp @@ -1,21 +1,194 @@ +/* + * Copyright (C) 2009 Trinity <http://www.trinitycore.org/> + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Azjol_Nerub +SD%Complete: 0 +SDComment: +SDCategory: Azjol Nerub +EndScriptData */ + #include "precompiled.h" #include "def_ahnkahet.h" -struct TRINITY_DLL_DECL instance_ahn_kahet : public ScriptedInstance +#define ENCOUNTERS 5 + +/* Ahn'kahet encounters: +0 - Elder Nadox +1 - Prince Taldaram +2 - Jedoga Shadowseeker +3 - Herald Volazj +4 - Amanitar (Heroic only) +*/ + +struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance { - instance_ahn_kahet(Map *Map) : ScriptedInstance(Map) {Initialize();}; + instance_ahnkahet(Map *Map) : ScriptedInstance(Map) {Initialize();}; + + uint64 Elder_Nadox; + uint64 Prince_Taldaram; + uint64 Jedoga_Shadowseeker; + uint64 Herald_Volazj; + uint64 Amanitar; + + uint32 Encounters[ENCOUNTERS]; + + void Initialize() + { + Elder_Nadox =0; + Prince_Taldaram =0; + Jedoga_Shadowseeker =0; + Herald_Volazj =0; + Amanitar =0; + + for(uint8 i = 0; i < ENCOUNTERS; ++i) + Encounters[i] = NOT_STARTED; + } + + bool IsEncounterInProgress() const + { + for(uint8 i = 0; i < ENCOUNTERS; ++i) + if(Encounters[i] == IN_PROGRESS) return true; + + return false; + } + + + void OnCreatureCreate(Creature *creature, uint32 creature_entry) + { + switch(creature_entry) + { + case 29309: Elder_Nadox = creature->GetGUID(); break; + case 29308: Prince_Taldaram = creature->GetGUID(); break; + case 29310: Jedoga_Shadowseeker = creature->GetGUID(); break; + case 29311: Herald_Volazj = creature->GetGUID(); break; + case 30258: Amanitar = creature->GetGUID(); break; + } + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_ELDER_NADOX: return Elder_Nadox; + case DATA_PRINCE_TALDARAM: return Prince_Taldaram; + case DATA_JEDOGA_SHADOWSEEKER: return Jedoga_Shadowseeker; + case DATA_HERALD_VOLAZJ: return Herald_Volazj; + case DATA_AMANITAR: return Amanitar; + } + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_ELDER_NADOX_EVENT: + Encounters[0] = data;break; + case DATA_PRINCE_TALDARAM_EVENT: + Encounters[1] = data; break; + case DATA_JEDOGA_SHADOWSEEKER_EVENT: + Encounters[2] = data; break; + case DATA_HERALD_VOLAZJ: + Encounters[3] = data; break; + case DATA_AMANITAR: + Encounters[4] = data; break; + } + + if (data == DONE) + { + SaveToDB(); + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_ELDER_NADOX_EVENT: return Encounters[0]; + case DATA_PRINCE_TALDARAM_EVENT: return Encounters[1]; + case DATA_JEDOGA_SHADOWSEEKER_EVENT: return Encounters[2]; + case DATA_HERALD_VOLAZJ: return Encounters[3]; + case DATA_AMANITAR: return Encounters[4]; + } + return 0; + } + + const char* Save() + { + OUT_SAVE_INST_DATA; + + std::string str_data; + + std::ostringstream saveStream; + saveStream << "A K " << Encounters[0] << " " << Encounters[1] << " " + << Encounters[2] << Encounters[3] << Encounters[4]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data.c_str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0,data1,data2,data3,data4; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4; + + if( dataHead1 == 'A' && dataHead2 == 'K') + { + Encounters[0] = data0; + Encounters[1] = data1; + Encounters[2] = data2; + Encounters[3] = data3; + Encounters[4] = data4; + + for(uint8 i = 0; i < ENCOUNTERS; ++i) + if (Encounters[i] == IN_PROGRESS) + Encounters[i] = NOT_STARTED; + + }else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } }; -InstanceData* GetInstanceData_instance_ahn_kahet(Map* map) +InstanceData* GetInstanceData_instance_ahnkahet(Map* map) { - return new instance_ahn_kahet(map); + return new instance_ahnkahet(map); } -void AddSC_instance_ahn_kahet() +void AddSC_instance_ahnkahet() { - Script *newscript; - newscript = new Script; - newscript->Name = "instance_ahn_kahet"; - newscript->GetInstanceData = GetInstanceData_instance_ahn_kahet; - newscript->RegisterSelf(); + Script *newscript; + newscript = new Script; + newscript->Name = "instance_ahnkahet"; + newscript->GetInstanceData = &GetInstanceData_instance_ahnkahet; + newscript->RegisterSelf(); } |