From 43e933ada292b9afc0d69184ac74f7705bb5ec16 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Thu, 22 Oct 2009 12:10:38 +0200 Subject: Remove def_ from headers filename. Part 1 --HG-- branch : trunk --- src/bindings/scripts/CMakeLists.txt | 32 +++++------ .../northrend/azjol_nerub/ahnkahet/ahnkahet.h | 48 ++++++++++++++++ .../azjol_nerub/ahnkahet/boss_amanitar.cpp | 2 +- .../azjol_nerub/ahnkahet/boss_elder_nadox.cpp | 2 +- .../azjol_nerub/ahnkahet/boss_herald_volazj.cpp | 2 +- .../ahnkahet/boss_jedoga_shadowseeker.cpp | 2 +- .../azjol_nerub/ahnkahet/boss_prince_taldaram.cpp | 2 +- .../northrend/azjol_nerub/ahnkahet/def_ahnkahet.h | 48 ---------------- .../azjol_nerub/ahnkahet/instance_ahnkahet.cpp | 2 +- .../azjol_nerub/azjol_nerub/azjol_nerub.h | 38 +++++++++++++ .../azjol_nerub/azjol_nerub/boss_anubarak.cpp | 2 +- .../azjol_nerub/azjol_nerub/boss_hadronox.cpp | 2 +- .../azjol_nerub/boss_krikthir_the_gatewatcher.cpp | 2 +- .../azjol_nerub/azjol_nerub/def_azjol_nerub.h | 38 ------------- .../azjol_nerub/instance_azjol_nerub.cpp | 2 +- .../northrend/draktharon_keep/boss_dred.cpp | 2 +- .../northrend/draktharon_keep/boss_novos.cpp | 2 +- .../northrend/draktharon_keep/boss_tharon_ja.cpp | 2 +- .../northrend/draktharon_keep/boss_trollgore.cpp | 2 +- .../draktharon_keep/def_drak_tharon_keep.h | 21 ------- .../northrend/draktharon_keep/drak_tharon_keep.h | 21 +++++++ .../draktharon_keep/instance_drak_tharon_keep.cpp | 2 +- .../northrend/gundrak/boss_drakkari_colossus.cpp | 2 +- .../scripts/scripts/northrend/gundrak/boss_eck.cpp | 2 +- .../scripts/northrend/gundrak/boss_gal_darah.cpp | 2 +- .../scripts/northrend/gundrak/boss_moorabi.cpp | 2 +- .../scripts/northrend/gundrak/boss_slad_ran.cpp | 2 +- .../scripts/northrend/gundrak/def_gundrak.h | 23 -------- .../scripts/scripts/northrend/gundrak/gundrak.h | 23 ++++++++ .../scripts/northrend/gundrak/instance_gundrak.cpp | 2 +- .../northrend/naxxramas/boss_anubrekhan.cpp | 2 +- .../scripts/northrend/naxxramas/boss_faerlina.cpp | 2 +- .../northrend/naxxramas/boss_four_horsemen.cpp | 2 +- .../scripts/northrend/naxxramas/boss_gluth.cpp | 2 +- .../scripts/northrend/naxxramas/boss_gothik.cpp | 2 +- .../scripts/northrend/naxxramas/boss_grobbulus.cpp | 2 +- .../scripts/northrend/naxxramas/boss_heigan.cpp | 2 +- .../scripts/northrend/naxxramas/boss_kelthuzad.cpp | 2 +- .../scripts/northrend/naxxramas/boss_loatheb.cpp | 2 +- .../scripts/northrend/naxxramas/boss_maexxna.cpp | 2 +- .../scripts/northrend/naxxramas/boss_noth.cpp | 2 +- .../scripts/northrend/naxxramas/boss_patchwerk.cpp | 2 +- .../scripts/northrend/naxxramas/boss_razuvious.cpp | 2 +- .../scripts/northrend/naxxramas/boss_sapphiron.cpp | 2 +- .../scripts/northrend/naxxramas/boss_thaddius.cpp | 2 +- .../scripts/northrend/naxxramas/def_naxxramas.h | 52 ----------------- .../northrend/naxxramas/instance_naxxramas.cpp | 2 +- .../scripts/northrend/naxxramas/naxxramas.h | 52 +++++++++++++++++ .../nexus/eye_of_eternity/def_eye_of_eternity.h | 4 -- .../nexus/eye_of_eternity/eye_of_eternity.h | 4 ++ .../eye_of_eternity/instance_eye_of_eternity.cpp | 2 +- .../northrend/nexus/nexus/boss_anomalus.cpp | 2 +- .../northrend/nexus/nexus/boss_keristrasza.cpp | 2 +- .../northrend/nexus/nexus/boss_magus_telestra.cpp | 2 +- .../scripts/northrend/nexus/nexus/boss_ormorok.cpp | 2 +- .../scripts/northrend/nexus/nexus/def_nexus.h | 19 ------- .../northrend/nexus/nexus/instance_nexus.cpp | 2 +- .../scripts/scripts/northrend/nexus/nexus/nexus.h | 19 +++++++ .../scripts/northrend/nexus/oculus/boss_drakos.cpp | 2 +- .../scripts/northrend/nexus/oculus/boss_eregos.cpp | 2 +- .../scripts/northrend/nexus/oculus/boss_urom.cpp | 2 +- .../scripts/northrend/nexus/oculus/boss_varos.cpp | 2 +- .../scripts/northrend/nexus/oculus/def_oculus.h | 28 ---------- .../northrend/nexus/oculus/instance_oculus.cpp | 3 +- .../scripts/northrend/nexus/oculus/oculus.h | 28 ++++++++++ .../northrend/obsidian_sanctum/boss_sartharion.cpp | 2 +- .../obsidian_sanctum/def_obsidian_sanctum.h | 20 ------- .../obsidian_sanctum/instance_obsidian_sanctum.cpp | 2 +- .../northrend/obsidian_sanctum/obsidian_sanctum.h | 20 +++++++ .../ulduar/halls_of_lightning/boss_bjarngrim.cpp | 2 +- .../ulduar/halls_of_lightning/boss_ionar.cpp | 2 +- .../ulduar/halls_of_lightning/boss_loken.cpp | 2 +- .../ulduar/halls_of_lightning/boss_volkhan.cpp | 2 +- .../halls_of_lightning/def_halls_of_lightning.h | 34 ----------- .../ulduar/halls_of_lightning/halls_of_lightning.h | 34 +++++++++++ .../instance_halls_of_lightning.cpp | 2 +- .../ulduar/halls_of_stone/boss_krystallus.cpp | 2 +- .../ulduar/halls_of_stone/boss_maiden_of_grief.cpp | 2 +- .../ulduar/halls_of_stone/boss_sjonnir.cpp | 2 +- .../ulduar/halls_of_stone/def_halls_of_stone.h | 24 -------- .../ulduar/halls_of_stone/halls_of_stone.cpp | 2 +- .../ulduar/halls_of_stone/halls_of_stone.h | 24 ++++++++ .../halls_of_stone/instance_halls_of_stone.cpp | 2 +- .../northrend/ulduar/ulduar/boss_algalon.cpp | 2 +- .../ulduar/ulduar/boss_assembly_of_iron.cpp | 2 +- .../northrend/ulduar/ulduar/boss_auriaya.cpp | 2 +- .../ulduar/ulduar/boss_flame_leviathan.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/boss_freya.cpp | 2 +- .../northrend/ulduar/ulduar/boss_general_vezax.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/boss_hodir.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/boss_ignis.cpp | 2 +- .../northrend/ulduar/ulduar/boss_kologarn.cpp | 2 +- .../northrend/ulduar/ulduar/boss_mimiron.cpp | 2 +- .../northrend/ulduar/ulduar/boss_razorscale.cpp | 2 +- .../northrend/ulduar/ulduar/boss_thorim.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/boss_xt002.cpp | 2 +- .../northrend/ulduar/ulduar/boss_yoggsaron.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/def_ulduar.h | 65 ---------------------- .../northrend/ulduar/ulduar/instance_ulduar.cpp | 2 +- .../scripts/northrend/ulduar/ulduar/ulduar.h | 65 ++++++++++++++++++++++ .../northrend/ulduar/ulduar/ulduar_teleporter.cpp | 2 +- .../utgarde_keep/boss_ingvar_the_plunderer.cpp | 2 +- .../utgarde_keep/utgarde_keep/boss_keleseth.cpp | 2 +- .../utgarde_keep/boss_skarvald_dalronn.cpp | 2 +- .../utgarde_keep/utgarde_keep/def_utgarde_keep.h | 35 ------------ .../utgarde_keep/instance_utgarde_keep.cpp | 2 +- .../utgarde_keep/utgarde_keep/utgarde_keep.cpp | 2 +- .../utgarde_keep/utgarde_keep/utgarde_keep.h | 35 ++++++++++++ .../utgarde_pinnacle/boss_palehoof.cpp | 2 +- .../utgarde_keep/utgarde_pinnacle/boss_skadi.cpp | 2 +- .../utgarde_keep/utgarde_pinnacle/boss_svala.cpp | 2 +- .../utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp | 2 +- .../utgarde_keep/utgarde_pinnacle/def_pinnacle.h | 26 --------- .../utgarde_pinnacle/instance_pinnacle.cpp | 2 +- .../utgarde_pinnacle/utgarde_pinnacle.h | 26 +++++++++ .../northrend/vault_of_archavon/boss_archavon.cpp | 2 +- .../northrend/vault_of_archavon/boss_emalon.cpp | 2 +- .../vault_of_archavon/def_vault_of_archavon.h | 8 --- .../instance_vault_of_archavon.cpp | 2 +- .../vault_of_archavon/vault_of_archavon.h | 8 +++ .../northrend/violet_hold/boss_cyanigosa.cpp | 2 +- .../scripts/northrend/violet_hold/boss_erekem.cpp | 2 +- .../scripts/northrend/violet_hold/boss_ichoron.cpp | 2 +- .../northrend/violet_hold/boss_lavanthor.cpp | 2 +- .../scripts/northrend/violet_hold/boss_moragg.cpp | 2 +- .../scripts/northrend/violet_hold/boss_xevozz.cpp | 2 +- .../scripts/northrend/violet_hold/boss_zuramat.cpp | 2 +- .../northrend/violet_hold/def_violet_hold.h | 35 ------------ .../northrend/violet_hold/instance_violet_hold.cpp | 2 +- .../scripts/northrend/violet_hold/violet_hold.cpp | 2 +- .../scripts/northrend/violet_hold/violet_hold.h | 35 ++++++++++++ 131 files changed, 595 insertions(+), 594 deletions(-) create mode 100644 src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h delete mode 100644 src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h create mode 100644 src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h delete mode 100644 src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h delete mode 100644 src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h create mode 100644 src/bindings/scripts/scripts/northrend/draktharon_keep/drak_tharon_keep.h delete mode 100644 src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h create mode 100644 src/bindings/scripts/scripts/northrend/gundrak/gundrak.h delete mode 100644 src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h create mode 100644 src/bindings/scripts/scripts/northrend/naxxramas/naxxramas.h delete mode 100644 src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h create mode 100644 src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h delete mode 100644 src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h create mode 100644 src/bindings/scripts/scripts/northrend/nexus/nexus/nexus.h delete mode 100644 src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h create mode 100644 src/bindings/scripts/scripts/northrend/nexus/oculus/oculus.h delete mode 100644 src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h create mode 100644 src/bindings/scripts/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h delete mode 100644 src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h create mode 100644 src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h delete mode 100644 src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h create mode 100644 src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h delete mode 100644 src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h create mode 100644 src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar.h delete mode 100644 src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h create mode 100644 src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h delete mode 100644 src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h create mode 100644 src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h delete mode 100644 src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h create mode 100644 src/bindings/scripts/scripts/northrend/vault_of_archavon/vault_of_archavon.h delete mode 100644 src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h create mode 100644 src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.h (limited to 'src') diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 7d0481fda23..e51c59402fb 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -298,27 +298,27 @@ SET(trinityscript_LIB_SRCS scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp - scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h + scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp - scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h + scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp scripts/northrend/draktharon_keep/boss_trollgore.cpp scripts/northrend/draktharon_keep/boss_novos.cpp scripts/northrend/draktharon_keep/boss_dred.cpp scripts/northrend/draktharon_keep/boss_tharon_ja.cpp - scripts/northrend/draktharon_keep/def_drak_tharon_keep.h + scripts/northrend/draktharon_keep/drak_tharon_keep.h scripts/northrend/gundrak/instance_gundrak.cpp scripts/northrend/gundrak/boss_slad_ran.cpp scripts/northrend/gundrak/boss_moorabi.cpp scripts/northrend/gundrak/boss_drakkari_colossus.cpp scripts/northrend/gundrak/boss_gal_darah.cpp scripts/northrend/gundrak/boss_eck.cpp - scripts/northrend/gundrak/def_gundrak.h + scripts/northrend/gundrak/gundrak.h scripts/northrend/naxxramas/boss_anubrekhan.cpp scripts/northrend/naxxramas/boss_faerlina.cpp scripts/northrend/naxxramas/boss_gluth.cpp @@ -334,11 +334,11 @@ SET(trinityscript_LIB_SRCS scripts/northrend/naxxramas/boss_razuvious.cpp scripts/northrend/naxxramas/boss_sapphiron.cpp scripts/northrend/naxxramas/boss_thaddius.cpp - scripts/northrend/naxxramas/def_naxxramas.h + scripts/northrend/naxxramas/naxxramas.h scripts/northrend/naxxramas/instance_naxxramas.cpp scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp - scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h + scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h scripts/northrend/nexus/nexus/instance_nexus.cpp scripts/northrend/nexus/nexus/boss_magus_telestra.cpp scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -346,28 +346,28 @@ SET(trinityscript_LIB_SRCS scripts/northrend/nexus/nexus/boss_keristrasza.cpp scripts/northrend/nexus/nexus/commander_stoutbeard.cpp scripts/northrend/nexus/nexus/commander_kolurg.cpp - scripts/northrend/nexus/nexus/def_nexus.h + scripts/northrend/nexus/nexus/nexus.h scripts/northrend/nexus/oculus/instance_oculus.cpp scripts/northrend/nexus/oculus/boss_drakos.cpp scripts/northrend/nexus/oculus/boss_urom.cpp scripts/northrend/nexus/oculus/boss_varos.cpp scripts/northrend/nexus/oculus/boss_eregos.cpp - scripts/northrend/nexus/oculus/def_oculus.h + scripts/northrend/nexus/oculus/oculus.h scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp scripts/northrend/obsidian_sanctum/boss_sartharion.cpp - scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h + scripts/northrend/obsidian_sanctum/obsidian_sanctum.h scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp - scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h + scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp - scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h + scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h scripts/northrend/ulduar/ulduar/boss_algalon.cpp scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp scripts/northrend/ulduar/ulduar/boss_auriaya.cpp @@ -383,24 +383,24 @@ SET(trinityscript_LIB_SRCS scripts/northrend/ulduar/ulduar/boss_xt002.cpp scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp - scripts/northrend/ulduar/ulduar/def_ulduar.h + scripts/northrend/ulduar/ulduar/ulduar.h scripts/northrend/ulduar/ulduar/instance_ulduar.cpp scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp - scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h + scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp - scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h + scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp scripts/northrend/vault_of_archavon/boss_archavon.cpp scripts/northrend/vault_of_archavon/boss_emalon.cpp - scripts/northrend/vault_of_archavon/def_vault_of_archavon.h + scripts/northrend/vault_of_archavon/vault_of_archavon.h scripts/northrend/violet_hold/instance_violet_hold.cpp scripts/northrend/violet_hold/boss_cyanigosa.cpp scripts/northrend/violet_hold/boss_erekem.cpp @@ -409,7 +409,7 @@ SET(trinityscript_LIB_SRCS scripts/northrend/violet_hold/boss_moragg.cpp scripts/northrend/violet_hold/boss_xevozz.cpp scripts/northrend/violet_hold/boss_zuramat.cpp - scripts/northrend/violet_hold/def_violet_hold.h + scripts/northrend/violet_hold/violet_hold.h scripts/northrend/violet_hold/violet_hold.cpp scripts/northrend/borean_tundra.cpp scripts/northrend/dragonblight.cpp diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h new file mode 100644 index 00000000000..e6d3bd387ae --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2009 Trinity + * + * 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 + +#define DATA_SPHERE1 11 +#define DATA_SPHERE2 12 +#define DATA_SPHERE1_EVENT 13 +#define DATA_SPHERE2_EVENT 14 +#define DATA_PRINCE_TALDARAM_PLATFORM 15 + +#define DATA_PL_JEDOGA_TARGET 16 +#define DATA_ADD_JEDOGA_OPFER 17 +#define DATA_JEDOGA_RESET_INITIANDS 18 +#define DATA_JEDOGA_TRIGGER_SWITCH 19 +#define DATA_ADD_JEDOGA_INITIAND 20 +#define DATA_ALL_INITIAND_DEAD 21 +#define DATA_INITIAND_KILLED 22 + +#endif diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp index 24434bec9a8..50316858ca5 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -25,7 +25,7 @@ SDCategory: Ahn'kahet Script Data End */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" #define SPELL_BASH 57094 // Victim #define SPELL_ENTANGLING_ROOTS 57095 // Random Victim 100Y 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 67402872784..def99430913 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 @@ -24,7 +24,7 @@ SDCategory: Ahn'kahet EndScriptData */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" bool DeadAhnkaharGuardian; // needed for achievement: Respect Your Elders(2038) diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index 72023225dbe..ff4d557f731 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -25,7 +25,7 @@ SDCategory: Ahn'kahet EndScriptData */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 6abf61d67bc..e38136e5bc1 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -25,7 +25,7 @@ SDCategory: Ahn'kahet EndScriptData */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" #define TEXT_AGGRO -1619000 #define TEXT_SACRIFICE_1_1 -1619001 diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 7f124077f86..eca9fbb0e67 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -25,7 +25,7 @@ SDCategory: Ahn'kahet EndScriptData */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h deleted file mode 100644 index e6d3bd387ae..00000000000 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * 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 - -#define DATA_SPHERE1 11 -#define DATA_SPHERE2 12 -#define DATA_SPHERE1_EVENT 13 -#define DATA_SPHERE2_EVENT 14 -#define DATA_PRINCE_TALDARAM_PLATFORM 15 - -#define DATA_PL_JEDOGA_TARGET 16 -#define DATA_ADD_JEDOGA_OPFER 17 -#define DATA_JEDOGA_RESET_INITIANDS 18 -#define DATA_JEDOGA_TRIGGER_SWITCH 19 -#define DATA_ADD_JEDOGA_INITIAND 20 -#define DATA_ALL_INITIAND_DEAD 21 -#define DATA_INITIAND_KILLED 22 - -#endif diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp index 23e1829a53e..b3b0e203fdf 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp @@ -24,7 +24,7 @@ SDCategory: Azjol Nerub EndScriptData */ #include "precompiled.h" -#include "def_ahnkahet.h" +#include "ahnkahet.h" #define MAX_ENCOUNTER 5 #define MAX_JEDOGA_INITIANDS 15 diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h new file mode 100644 index 00000000000..df02f9e13d3 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2009 Trinity + * + * 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_AZJOL_NERUB_H +#define DEF_AZJOL_NERUB_H + +enum Data64 +{ + DATA_KRIKTHIR_THE_GATEWATCHER, + DATA_HADRONOX, + DATA_ANUBARAK, + DATA_WATCHER_GASHRA, + DATA_WATCHER_SILTHIK, + DATA_WATCHER_NARJIL +}; +enum Data +{ + DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, + DATA_HADRONOX_EVENT, + DATA_ANUBARAK_EVENT +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index cab79fc3bea..3e1997320e7 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -25,7 +25,7 @@ EndScriptData */ #include "precompiled.h" -#include "def_azjol_nerub.h" +#include "azjol_nerub.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp index b8b52d00465..b8757536172 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -37,7 +37,7 @@ This is the timed gauntlet - waves of non-elite spiders Hadronox to make his way to you. When Hadronox enters the main room, she will web the doors, and no more non-elites will spawn.*/ #include "precompiled.h" -#include "def_azjol_nerub.h" +#include "azjol_nerub.h" #define SPELL_ACID_CLOUD 53400 // Victim #define SPELL_LEECH_POISON 53030 // Victim diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index abb4fc6c7cb..b22535a03cf 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -28,7 +28,7 @@ update creature_template set scriptname = 'boss_krik_thir' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_azjol_nerub.h" +#include "azjol_nerub.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h deleted file mode 100644 index df02f9e13d3..00000000000 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * 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_AZJOL_NERUB_H -#define DEF_AZJOL_NERUB_H - -enum Data64 -{ - DATA_KRIKTHIR_THE_GATEWATCHER, - DATA_HADRONOX, - DATA_ANUBARAK, - DATA_WATCHER_GASHRA, - DATA_WATCHER_SILTHIK, - DATA_WATCHER_NARJIL -}; -enum Data -{ - DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, - DATA_HADRONOX_EVENT, - DATA_ANUBARAK_EVENT -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp index 87d0b854821..c03f78bc382 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp @@ -24,7 +24,7 @@ SDCategory: Azjol Nerub EndScriptData */ #include "precompiled.h" -#include "def_azjol_nerub.h" +#include "azjol_nerub.h" #define MAX_ENCOUNTER 3 diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp index eedc97e3e36..deec202f043 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_drak_tharon_keep.h" +#include "drak_tharon_keep.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp index 963e42f82aa..609564747a7 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_novos' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_drak_tharon_keep.h" +#include "drak_tharon_keep.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index 185d062b11a..6bdc05542fa 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_tharon_ja' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_drak_tharon_keep.h" +#include "drak_tharon_keep.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp index 64c476296cc..e737af60b51 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_trollgore' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_drak_tharon_keep.h" +#include "drak_tharon_keep.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h b/src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h deleted file mode 100644 index 89f350c1a47..00000000000 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef DEF_DRAK_THARON_H -#define DEF_DRAK_THARON_H -enum Data -{ - DATA_TROLLGORE_EVENT, - DATA_NOVOS_EVENT, - DATA_DRED_EVENT, - DATA_THARON_JA_EVENT -}; -enum Data64 -{ - DATA_TROLLGORE, - DATA_NOVOS, - DATA_DRED, - DATA_THARON_JA, - DATA_NOVOS_CRYSTAL_1, - DATA_NOVOS_CRYSTAL_2, - DATA_NOVOS_CRYSTAL_3, - DATA_NOVOS_CRYSTAL_4 -}; -#endif diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/drak_tharon_keep.h b/src/bindings/scripts/scripts/northrend/draktharon_keep/drak_tharon_keep.h new file mode 100644 index 00000000000..89f350c1a47 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/drak_tharon_keep.h @@ -0,0 +1,21 @@ +#ifndef DEF_DRAK_THARON_H +#define DEF_DRAK_THARON_H +enum Data +{ + DATA_TROLLGORE_EVENT, + DATA_NOVOS_EVENT, + DATA_DRED_EVENT, + DATA_THARON_JA_EVENT +}; +enum Data64 +{ + DATA_TROLLGORE, + DATA_NOVOS, + DATA_DRED, + DATA_THARON_JA, + DATA_NOVOS_CRYSTAL_1, + DATA_NOVOS_CRYSTAL_2, + DATA_NOVOS_CRYSTAL_3, + DATA_NOVOS_CRYSTAL_4 +}; +#endif diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp index 75eee1caba2..6c24d1ab55e 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_drak_tharon_keep.h" +#include "drak_tharon_keep.h" #define MAX_ENCOUNTER 4 /* Drak'Tharon Keep encounters: diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index 3ca1abdd8f1..3b06768be56 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -25,7 +25,7 @@ SDCategory: Script Data End */ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp index af0ebba511b..4334c51d25d 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp index b82f937c157..1dc6f8606a4 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" //Spells enum Spells diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp index d16d86ab4b9..59039c8733f 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp @@ -7,7 +7,7 @@ SDCategory: Gundrak Script Data End */ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" //Spells diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp index 7a2da670478..c35bee39b44 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_slad_ran' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" //Spells enum Spells diff --git a/src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h b/src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h deleted file mode 100644 index 957bb9d2367..00000000000 --- a/src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef DEF_GUNDRAK_H -#define DEF_GUNDRAK_H - -enum Data -{ - DATA_SLAD_RAN_EVENT, - DATA_MOORABI_EVENT, - DATA_DRAKKARI_COLOSSUS_EVENT, - DATA_GAL_DARAH_EVENT, - DATA_ECK_THE_FEROCIOUS_EVENT -}; - -enum Data64 -{ - DATA_SLAD_RAN_ALTAR, - DATA_MOORABI_ALTAR, - DATA_DRAKKARI_COLOSSUS_ALTAR, - DATA_SLAD_RAN_STATUE, - DATA_MOORABI_STATUE, - DATA_DRAKKARI_COLOSSUS_STATUE -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/gundrak/gundrak.h b/src/bindings/scripts/scripts/northrend/gundrak/gundrak.h new file mode 100644 index 00000000000..957bb9d2367 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/gundrak/gundrak.h @@ -0,0 +1,23 @@ +#ifndef DEF_GUNDRAK_H +#define DEF_GUNDRAK_H + +enum Data +{ + DATA_SLAD_RAN_EVENT, + DATA_MOORABI_EVENT, + DATA_DRAKKARI_COLOSSUS_EVENT, + DATA_GAL_DARAH_EVENT, + DATA_ECK_THE_FEROCIOUS_EVENT +}; + +enum Data64 +{ + DATA_SLAD_RAN_ALTAR, + DATA_MOORABI_ALTAR, + DATA_DRAKKARI_COLOSSUS_ALTAR, + DATA_SLAD_RAN_STATUE, + DATA_MOORABI_STATUE, + DATA_DRAKKARI_COLOSSUS_STATUE +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp index 9a7a6b7a97d..bc463215021 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_gundrak.h" +#include "gundrak.h" #define MAX_ENCOUNTER 5 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp index 2de7abcf392..c3f5d7d957f 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SAY_GREET RAND(-1533000,-1533004,-1533005,-1533006,-1533007) #define SAY_AGGRO RAND(-1533001,-1533002,-1533003) diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp index e7cd19d3b26..bfe774e2ce7 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SAY_GREET -1533009 #define SAY_AGGRO RAND(-1533010,-1533011,-1533012,-1533013) diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp index b051b956e66..0ed6b953866 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" enum Horsemen { diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp index 2e121e54b1a..058261f9589 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SPELL_MORTAL_WOUND 25646 #define SPELL_ENRAGE HEROIC(28371,54427) diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp index 9a4e33ddfbd..a712659b1a0 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" enum Yells { diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp index 38edde2c327..8d82d4d024e 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SPELL_BOMBARD_SLIME 28280 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp index 4cf9eb0ffcb..53cb9895b2f 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SAY_AGGRO RAND(-1533109,-1533110,-1533111) #define SAY_SLAY -1533112 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp index e5b86e59193..b81b08ceda5 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -22,7 +22,7 @@ SDCategory: Naxxramas EndScriptData */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" //when shappiron dies. dialog between kel and lich king (in this order) #define SAY_SAPP_DIALOG1 -1533084 //not used diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp index c87caf2beae..29d4f8d15f0 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SPELL_NECROTIC_AURA 55593 #define SPELL_SUMMON_SPORE 29234 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp index f1209f3f948..5ac34737b7a 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SPELL_WEB_WRAP 28622 #define SPELL_WEB_SPRAY HEROIC(29484,54125) diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp index 911ca8a39f7..70dd411fba1 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SAY_AGGRO RAND(-1533075,-1533076,-1533077) #define SAY_SUMMON -1533078 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp index 3686d859bc8..2b0a8af6680 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define SAY_AGGRO RAND(-1533017,-1533018) #define SAY_SLAY -1533019 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp index 7f92978e8b1..a6eae2e892d 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" //Razuvious - NO TEXT sound only //8852 aggro01 - Hah hah, I'm just getting warmed up! diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp index e460627d648..c6f1c479b8f 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" #define EMOTE_BREATH -1533082 #define EMOTE_ENRAGE -1533083 diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp index dc1123d5a2e..0b7edf09db6 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" //Stalagg #define SAY_STAL_AGGRO -1533023 //not used diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h b/src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h deleted file mode 100644 index 383200d4600..00000000000 --- a/src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2008 - 2009 Trinity - * - * 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_NAXXRAMAS_H -#define DEF_NAXXRAMAS_H - -enum Encounter -{ - BOSS_ANUBREKHAN, - BOSS_FAERLINA, - BOSS_MAEXXNA, - BOSS_NOTH, - BOSS_HEIGAN, - BOSS_LOATHEB, - BOSS_PATCHWERK, - BOSS_GROBBULUS, - BOSS_GLUTH, - BOSS_THADDIUS, - BOSS_RAZUVIOUS, - BOSS_GOTHIK, - BOSS_HORSEMEN, - BOSS_SAPPHIRON, - BOSS_KELTHUZAD, - MAX_BOSS_NUMBER -}; - -enum Data -{ - DATA_HEIGAN_ERUPT, - DATA_GOTHIK_GATE, - DATA_SAPPHIRON_BIRTH, -}; - -#define GO_BIRTH 181356 - -#endif - diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp index eff98fe289f..35bac524060 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp @@ -15,7 +15,7 @@ */ #include "precompiled.h" -#include "def_naxxramas.h" +#include "naxxramas.h" const DoorData doorData[] = { diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/naxxramas.h b/src/bindings/scripts/scripts/northrend/naxxramas/naxxramas.h new file mode 100644 index 00000000000..383200d4600 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/naxxramas/naxxramas.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008 - 2009 Trinity + * + * 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_NAXXRAMAS_H +#define DEF_NAXXRAMAS_H + +enum Encounter +{ + BOSS_ANUBREKHAN, + BOSS_FAERLINA, + BOSS_MAEXXNA, + BOSS_NOTH, + BOSS_HEIGAN, + BOSS_LOATHEB, + BOSS_PATCHWERK, + BOSS_GROBBULUS, + BOSS_GLUTH, + BOSS_THADDIUS, + BOSS_RAZUVIOUS, + BOSS_GOTHIK, + BOSS_HORSEMEN, + BOSS_SAPPHIRON, + BOSS_KELTHUZAD, + MAX_BOSS_NUMBER +}; + +enum Data +{ + DATA_HEIGAN_ERUPT, + DATA_GOTHIK_GATE, + DATA_SAPPHIRON_BIRTH, +}; + +#define GO_BIRTH 181356 + +#endif + diff --git a/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h deleted file mode 100644 index caa82a92e95..00000000000 --- a/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef DEF_EYE_OF_ETERNITY_H -#define DEF_EYE_OF_ETERNITY_H - -#endif diff --git a/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h new file mode 100644 index 00000000000..caa82a92e95 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h @@ -0,0 +1,4 @@ +#ifndef DEF_EYE_OF_ETERNITY_H +#define DEF_EYE_OF_ETERNITY_H + +#endif diff --git a/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp index 7c89a117d92..c940409cd27 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_eye_of_eternity.h" +#include "eye_of_eternity.h" struct TRINITY_DLL_DECL instance_eye_of_eternity : public ScriptedInstance { diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp index 3f37cca3893..a89461f6026 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -22,7 +22,7 @@ SDCategory: The Nexus, The Nexus EndScriptData */ #include "precompiled.h" -#include "def_nexus.h" +#include "nexus.h" bool DeadChaoticRift; // needed for achievement: Chaos Theory(2037) diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index 38bd1a7822b..312a97a8d42 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -22,7 +22,7 @@ SDCategory: The Nexus, The Nexus EndScriptData */ #include "precompiled.h" -#include "def_nexus.h" +#include "nexus.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index 7b8fe60bacf..caa9cdfd19c 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -22,7 +22,7 @@ SDCategory: The Nexus, The Nexus EndScriptData */ #include "precompiled.h" -#include "def_nexus.h" +#include "nexus.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 44c4a16401d..215bcc8fdbc 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -22,7 +22,7 @@ SDCategory: The Nexus, The Nexus EndScriptData */ #include "precompiled.h" -#include "def_nexus.h" +#include "nexus.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h b/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h deleted file mode 100644 index de36fea4b93..00000000000 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef DEF_NEXUS_H -#define DEF_NEXUS_H - -enum eTypes -{ - DATA_MAGUS_TELESTRA_EVENT, - DATA_ANOMALUS_EVENT, - DATA_ORMOROK_EVENT, - DATA_KERISTRASZA_EVENT, - - DATA_ANOMALUS, - DATA_KERISTRASZA, - - ANOMALUS_CONTAINMET_SPHERE, - ORMOROKS_CONTAINMET_SPHERE, - TELESTRAS_CONTAINMET_SPHERE -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp index b696012b776..24b8646cb0e 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp @@ -22,7 +22,7 @@ SDCategory: The Nexus, The Nexus EndScriptData */ #include "precompiled.h" -#include "def_nexus.h" +#include "nexus.h" #define NUMBER_OF_ENCOUNTERS 4 diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/nexus.h b/src/bindings/scripts/scripts/northrend/nexus/nexus/nexus.h new file mode 100644 index 00000000000..de36fea4b93 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/nexus.h @@ -0,0 +1,19 @@ +#ifndef DEF_NEXUS_H +#define DEF_NEXUS_H + +enum eTypes +{ + DATA_MAGUS_TELESTRA_EVENT, + DATA_ANOMALUS_EVENT, + DATA_ORMOROK_EVENT, + DATA_KERISTRASZA_EVENT, + + DATA_ANOMALUS, + DATA_KERISTRASZA, + + ANOMALUS_CONTAINMET_SPHERE, + ORMOROKS_CONTAINMET_SPHERE, + TELESTRAS_CONTAINMET_SPHERE +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp index 587c39c57f1..cad2ffb52de 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_oculus.h" +#include "oculus.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp index 8fcc8d84d34..f2dbe406331 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_oculus.h" +#include "oculus.h" //Types of drake mounts: Ruby(Tank), Amber(DPS), Emerald(Healer) //Two Repeating phases diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp index ab96dffc324..ba382c4a6e1 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_oculus.h" +#include "oculus.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp index 4a1975e6c4b..cef27563f73 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_oculus.h" +#include "oculus.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h b/src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h deleted file mode 100644 index 6680e7cf0ba..00000000000 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef DEF_OCULUS_H -#define DEF_OCULUS_H - -enum Data -{ - DATA_DRAKOS_EVENT, - DATA_VAROS_EVENT, - DATA_UROM_EVENT, - DATA_EREGOS_EVENT -}; - -enum Data64 -{ - DATA_DRAKOS, - DATA_VAROS, - DATA_UROM, - DATA_EREGOS -}; - -enum Bosses -{ - CREATURE_DRAKOS = 27654, - CREATURE_VAROS = 27447, - CREATURE_UROM = 27655, - CREATURE_EREGOS = 27656 -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp index 324a643c74c..f6d808e01d5 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp @@ -1,5 +1,6 @@ #include "precompiled.h" -#include "def_oculus.h" +#include "oculus.h" + #define MAX_ENCOUNTER 4 /* The Occulus encounters: diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/oculus.h b/src/bindings/scripts/scripts/northrend/nexus/oculus/oculus.h new file mode 100644 index 00000000000..6680e7cf0ba --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/oculus.h @@ -0,0 +1,28 @@ +#ifndef DEF_OCULUS_H +#define DEF_OCULUS_H + +enum Data +{ + DATA_DRAKOS_EVENT, + DATA_VAROS_EVENT, + DATA_UROM_EVENT, + DATA_EREGOS_EVENT +}; + +enum Data64 +{ + DATA_DRAKOS, + DATA_VAROS, + DATA_UROM, + DATA_EREGOS +}; + +enum Bosses +{ + CREATURE_DRAKOS = 27654, + CREATURE_VAROS = 27447, + CREATURE_UROM = 27655, + CREATURE_EREGOS = 27656 +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index b791b05ddbc..1ec27f1cbd7 100644 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -22,7 +22,7 @@ SDCategory: Obsidian Sanctum EndScriptData */ #include "precompiled.h" -#include "def_obsidian_sanctum.h" +#include "obsidian_sanctum.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h deleted file mode 100644 index 59013174795..00000000000 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef DEF_OBSIDIAN_SANCTUM_H -#define DEF_OBSIDIAN_SANCTUM_H - -enum eTypes -{ - TYPE_SARTHARION_EVENT = 1, - - DATA_SARTHARION = 10, - DATA_TENEBRON = 11, - DATA_SHADRON = 12, - DATA_VESPERON = 13, - - NPC_SARTHARION = 28860, - NPC_TENEBRON = 30452, - NPC_SHADRON = 30451, - NPC_VESPERON = 30449, - GO_TWILIGHT_PORTAL = 193988 -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp index 5dd3e06e585..0badc63a40e 100644 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_obsidian_sanctum.h" +#include "obsidian_sanctum.h" #define MAX_ENCOUNTER 1 diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h new file mode 100644 index 00000000000..59013174795 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h @@ -0,0 +1,20 @@ +#ifndef DEF_OBSIDIAN_SANCTUM_H +#define DEF_OBSIDIAN_SANCTUM_H + +enum eTypes +{ + TYPE_SARTHARION_EVENT = 1, + + DATA_SARTHARION = 10, + DATA_TENEBRON = 11, + DATA_SHADRON = 12, + DATA_VESPERON = 13, + + NPC_SARTHARION = 28860, + NPC_TENEBRON = 30452, + NPC_SHADRON = 30451, + NPC_VESPERON = 30449, + GO_TWILIGHT_PORTAL = 193988 +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp index aabb23349ff..b35a5eeafe5 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -22,7 +22,7 @@ SDCategory: Halls of Lightning EndScriptData */ #include "precompiled.h" -#include "def_halls_of_lightning.h" +#include "halls_of_lightning.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 74df79e6211..7895bcdb116 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -22,7 +22,7 @@ SDCategory: Halls of Lightning EndScriptData */ #include "precompiled.h" -#include "def_halls_of_lightning.h" +#include "halls_of_lightning.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index 64cdc6a6017..0520b56f670 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -22,7 +22,7 @@ SDCategory: Halls of Lightning EndScriptData */ #include "precompiled.h" -#include "def_halls_of_lightning.h" +#include "halls_of_lightning.h" #define MAX_ENCOUNTER_TIME 2 * 60 * 1000 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index a2aa5f293fc..8c506ef7dac 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -22,7 +22,7 @@ SDCategory: Halls of Lightning EndScriptData */ #include "precompiled.h" -#include "def_halls_of_lightning.h" +#include "halls_of_lightning.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h deleted file mode 100644 index d9739fdf888..00000000000 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_HALLS_OF_LIGHTNING_H -#define DEF_HALLS_OF_LIGHTNING_H - -enum eTypes -{ - MAX_ENCOUNTER = 4, - - DATA_BJARNGRIM = 1, - DATA_IONAR = 2, - DATA_LOKEN = 3, - DATA_VOLKHAN = 4, - - TYPE_BJARNGRIM = 10, - TYPE_IONAR = 11, - TYPE_LOKEN = 12, - TYPE_VOLKHAN = 13, - - NPC_BJARNGRIM = 28586, - NPC_VOLKHAN = 28587, - NPC_IONAR = 28546, - NPC_LOKEN = 28923, - - GO_BJARNGRIM_DOOR = 191416, //_doors10 - GO_VOLKHAN_DOOR = 191325, //_doors07 - GO_IONAR_DOOR = 191326, //_doors05 - GO_LOKEN_DOOR = 191324, //_doors02 - GO_LOKEN_THRONE = 192654 -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h new file mode 100644 index 00000000000..d9739fdf888 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h @@ -0,0 +1,34 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_HALLS_OF_LIGHTNING_H +#define DEF_HALLS_OF_LIGHTNING_H + +enum eTypes +{ + MAX_ENCOUNTER = 4, + + DATA_BJARNGRIM = 1, + DATA_IONAR = 2, + DATA_LOKEN = 3, + DATA_VOLKHAN = 4, + + TYPE_BJARNGRIM = 10, + TYPE_IONAR = 11, + TYPE_LOKEN = 12, + TYPE_VOLKHAN = 13, + + NPC_BJARNGRIM = 28586, + NPC_VOLKHAN = 28587, + NPC_IONAR = 28546, + NPC_LOKEN = 28923, + + GO_BJARNGRIM_DOOR = 191416, //_doors10 + GO_VOLKHAN_DOOR = 191325, //_doors07 + GO_IONAR_DOOR = 191326, //_doors05 + GO_LOKEN_DOOR = 191324, //_doors02 + GO_LOKEN_THRONE = 192654 +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp index e9d75fb8b6f..5ff993a08fd 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp @@ -22,7 +22,7 @@ SDCategory: Halls of Lightning EndScriptData */ #include "precompiled.h" -#include "def_halls_of_lightning.h" +#include "halls_of_lightning.h" /* Halls of Lightning encounters: 0 - General Bjarngrim diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp index ed5291a6887..dd80a95e979 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_krystallus' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_halls_of_stone.h" +#include "halls_of_stone.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index d74a4a228eb..9315d56dffa 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_maiden_of_grief' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_halls_of_stone.h" +#include "halls_of_stone.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp index 4f0aceaa866..b9f646cbce3 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_sjonnir' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_halls_of_stone.h" +#include "halls_of_stone.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h deleted file mode 100644 index 0e5d59ae6d5..00000000000 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef DEF_HALLS_OF_STONE_H -#define DEF_HALLS_OF_STONE_H -enum Data -{ - DATA_KRYSTALLUS_EVENT, - DATA_MAIDEN_OF_GRIEF_EVENT, - DATA_SJONNIR_EVENT, - DATA_BRANN_EVENT -}; -enum Data64 -{ - DATA_KRYSTALLUS, - DATA_MAIDEN_OF_GRIEF, - DATA_SJONNIR, - DATA_KADDRAK, - DATA_MARNAK, - DATA_ABEDNEUM, - DATA_GO_TRIBUNAL_CONSOLE, - DATA_GO_KADDRAK, - DATA_GO_MARNAK, - DATA_GO_ABEDNEUM, - DATA_GO_SKY_FLOOR -}; -#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index 6e6b0aef0c6..ded58f8d5c0 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" #include "escort_ai.h" -#include "def_halls_of_stone.h" +#include "halls_of_stone.h" enum Texts { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h new file mode 100644 index 00000000000..0e5d59ae6d5 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h @@ -0,0 +1,24 @@ +#ifndef DEF_HALLS_OF_STONE_H +#define DEF_HALLS_OF_STONE_H +enum Data +{ + DATA_KRYSTALLUS_EVENT, + DATA_MAIDEN_OF_GRIEF_EVENT, + DATA_SJONNIR_EVENT, + DATA_BRANN_EVENT +}; +enum Data64 +{ + DATA_KRYSTALLUS, + DATA_MAIDEN_OF_GRIEF, + DATA_SJONNIR, + DATA_KADDRAK, + DATA_MARNAK, + DATA_ABEDNEUM, + DATA_GO_TRIBUNAL_CONSOLE, + DATA_GO_KADDRAK, + DATA_GO_MARNAK, + DATA_GO_ABEDNEUM, + DATA_GO_SKY_FLOOR +}; +#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp index 5960614eeff..1d0af37a36d 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_halls_of_stone.h" +#include "halls_of_stone.h" #define MAX_ENCOUNTER 4 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp index a736b2db12a..a9305c36011 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp @@ -17,4 +17,4 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 0b8d1e87b5c..9a11315726b 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -24,7 +24,7 @@ SDCategory: Ulduar - Ulduar EndScriptData */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" // Any boss #define SPELL_SUPERCHARGE 61920 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp index e4dedac54ac..558d6fbbd31 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" //boss_auriaya #define SPELL_TERRIFYING_SCREECH 64386 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp index 6179b19f0e2..d19d917011c 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" #include "Vehicle.h" #define SPELL_PURSUED 62374 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp index ac0b23c1b7a..8ac121d8e14 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" /* #define SAY_AGGRO -1 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp index a736b2db12a..a9305c36011 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp @@ -17,4 +17,4 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp index c05d30d83ba..9129c3d0523 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" /* #define SAY_AGGRO -1 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp index 38c662f5fe9..4dc5f255dca 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" #define SPELL_FLAME_JETS 62680 #define SPELL_SCORCH 62546 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp index b2dfbc08263..80faac62951 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" #include "Vehicle.h" #define SPELL_ARM_DEAD_DAMAGE HEROIC(63629,63979) diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp index a736b2db12a..a9305c36011 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp @@ -17,4 +17,4 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index ca766468cfc..a89c1db76c4 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -24,7 +24,7 @@ Category: EndScriptData */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" //wrong text ids. correct are between -1000000 AND -1999999 //between -2000000 and -2999999 are custom texts so wtf? diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp index d0bd4c87c04..6abdbb6e950 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" /* #define SAY_AGGRO -1 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index e5889969716..09bceb1b320 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" #define SPELL_SEARING_LIGHT 63018 #define SPELL_SONIC_BOOM 38897 diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp index a736b2db12a..a9305c36011 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp @@ -17,4 +17,4 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h deleted file mode 100644 index ed7686343fb..00000000000 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2008 - 2009 Trinity - * - * 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_ULDUAR_H -#define DEF_ULDUAR_H - -enum eTypes -{ - MAX_ENCOUNTER = 14, - - TYPE_LEVIATHAN = 0, - TYPE_IGNIS = 1, - TYPE_RAZORSCALE = 2, - TYPE_XT002 = 3, - TYPE_ASSEMBLY = 4, - TYPE_KOLOGARN = 5, - TYPE_AURIAYA = 6, - TYPE_MIMIRON = 7, - TYPE_HODIR = 8, - TYPE_THORIM = 9, - TYPE_FREYA = 10, - TYPE_VEZAX = 11, - TYPE_YOGGSARON = 12, - TYPE_ALGALON = 13, - - DATA_STEELBREAKER = 20, - DATA_MOLGEIM = 21, - DATA_BRUNDIR = 22, - DATA_RUNEMASTER_MOLGEIM = 23, - DATA_STORMCALLER_BRUNDIR = 24, - - NPC_LEVIATHAN = 33113, - NPC_IGNIS = 33118, - NPC_RAZORSCALE = 33186, - NPC_XT002 = 33293, - NPC_STEELBREAKER = 32867, - NPC_MOLGEIM = 32927, - NPC_BRUNDIR = 32857, - NPC_KOLOGARN = 32930, - NPC_AURIAYA = 33515, - NPC_MIMIRON = 33350, - NPC_HODIR = 32845, - NPC_THORIM = 32865, - NPC_FREYA = 32906, - NPC_VEZAX = 33271, - NPC_YOGGSARON = 33288, - NPC_ALGALON = 32871 -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp index ef51c26e0d7..475fadb8b63 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" enum eGameObjects { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar.h b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar.h new file mode 100644 index 00000000000..ed7686343fb --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2008 - 2009 Trinity + * + * 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_ULDUAR_H +#define DEF_ULDUAR_H + +enum eTypes +{ + MAX_ENCOUNTER = 14, + + TYPE_LEVIATHAN = 0, + TYPE_IGNIS = 1, + TYPE_RAZORSCALE = 2, + TYPE_XT002 = 3, + TYPE_ASSEMBLY = 4, + TYPE_KOLOGARN = 5, + TYPE_AURIAYA = 6, + TYPE_MIMIRON = 7, + TYPE_HODIR = 8, + TYPE_THORIM = 9, + TYPE_FREYA = 10, + TYPE_VEZAX = 11, + TYPE_YOGGSARON = 12, + TYPE_ALGALON = 13, + + DATA_STEELBREAKER = 20, + DATA_MOLGEIM = 21, + DATA_BRUNDIR = 22, + DATA_RUNEMASTER_MOLGEIM = 23, + DATA_STORMCALLER_BRUNDIR = 24, + + NPC_LEVIATHAN = 33113, + NPC_IGNIS = 33118, + NPC_RAZORSCALE = 33186, + NPC_XT002 = 33293, + NPC_STEELBREAKER = 32867, + NPC_MOLGEIM = 32927, + NPC_BRUNDIR = 32857, + NPC_KOLOGARN = 32930, + NPC_AURIAYA = 33515, + NPC_MIMIRON = 33350, + NPC_HODIR = 32845, + NPC_THORIM = 32865, + NPC_FREYA = 32906, + NPC_VEZAX = 33271, + NPC_YOGGSARON = 33288, + NPC_ALGALON = 32871 +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp index 3ea183059da..91c506e45ad 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_ulduar.h" +#include "ulduar.h" /* The teleporter appears to be active and stable. diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 87f5eeec1d9..36c041f0116 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -24,7 +24,7 @@ SDCategory: Udgarde Keep EndScriptData */ #include "precompiled.h" -#include "def_utgarde_keep.h" +#include "utgarde_keep.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index d5a5b3dcabd..f5c4b268766 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -24,7 +24,7 @@ SDCategory: Utgarde Keep EndScriptData */ #include "precompiled.h" -#include "def_utgarde_keep.h" +#include "utgarde_keep.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index dcb222e163c..bb27b5a71f0 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -24,7 +24,7 @@ SDCategory: Utgarde Keep EndScriptData */ #include "precompiled.h" -#include "def_utgarde_keep.h" +#include "utgarde_keep.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h deleted file mode 100644 index b630e156564..00000000000 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * 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_UTGARDE_KEEP_H -#define DEF_UTGARDE_KEEP_H - -#define DATA_PRINCEKELESETH 1 -#define DATA_SKARVALD 3 -#define DATA_DALRONN 4 -#define DATA_INGVAR 6 - -#define DATA_PRINCEKELESETH_EVENT 2 -#define DATA_SKARVALD_DALRONN_EVENT 5 -#define DATA_INGVAR_EVENT 7 - -#define EVENT_FORGE_1 8 -#define EVENT_FORGE_2 9 -#define EVENT_FORGE_3 10 - -#endif diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index be4446dd6d4..9441f1f4bf0 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -24,7 +24,7 @@ SDCategory: Utgarde Keep EndScriptData */ #include "precompiled.h" -#include "def_utgarde_keep.h" +#include "utgarde_keep.h" #define MAX_ENCOUNTER 3 diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp index 2a0fb5642bb..f7f506e3575 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp @@ -17,7 +17,7 @@ */ #include "precompiled.h" -#include "def_utgarde_keep.h" +#include "utgarde_keep.h" uint32 entry_search[3] = { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h new file mode 100644 index 00000000000..b630e156564 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2009 Trinity + * + * 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_UTGARDE_KEEP_H +#define DEF_UTGARDE_KEEP_H + +#define DATA_PRINCEKELESETH 1 +#define DATA_SKARVALD 3 +#define DATA_DALRONN 4 +#define DATA_INGVAR 6 + +#define DATA_PRINCEKELESETH_EVENT 2 +#define DATA_SKARVALD_DALRONN_EVENT 5 +#define DATA_INGVAR_EVENT 7 + +#define EVENT_FORGE_1 8 +#define EVENT_FORGE_2 9 +#define EVENT_FORGE_3 10 + +#endif diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index e16c0b940ad..3bcaebb9658 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_palehoof' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_pinnacle.h" +#include "utgarde_pinnacle.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index f389b2e99ab..13500dc9e11 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_skadi' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_pinnacle.h" +#include "utgarde_pinnacle.h" //Phase 0 "gauntlet even" Skadi on a flying mount, waves of adds charging to the group periodicaly carrying harpoons //Phase 1 Kill the Skadi drake mount with harppons launcher diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 37a871bfde5..077fb311a71 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_svala' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_pinnacle.h" +#include "utgarde_pinnacle.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index fce4ad3f5e7..33632a93648 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = 'boss_ymiron' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_pinnacle.h" +#include "utgarde_pinnacle.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h deleted file mode 100644 index 550e9c28694..00000000000 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef DEF_PINNACLE_H -#define DEF_PINNACLE_H - -enum Data -{ - DATA_SVALA_SORROWGRAVE_EVENT, - DATA_GORTOK_PALEHOOF_EVENT, - DATA_SKADI_THE_RUTHLESS_EVENT, - DATA_KING_YMIRON_EVENT -}; -enum Data64 -{ - DATA_SVALA, - DATA_SVALA_SORROWGRAVE, - DATA_GORTOK_PALEHOOF, - DATA_SKADI_THE_RUTHLESS, - DATA_KING_YMIRON, - DATA_MOB_FRENZIED_WORGEN, - DATA_MOB_RAVENOUS_FURBOLG, - DATA_MOB_MASSIVE_JORMUNGAR, - DATA_MOB_FEROCIOUS_RHINO, - DATA_MOB_ORB, - DATA_GORTOK_PALEHOOF_SPHERE -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp index b06fa524b65..e9ad8fe0a35 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_pinnacle.h" +#include "utgarde_pinnacle.h" #define MAX_ENCOUNTER 4 diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h new file mode 100644 index 00000000000..550e9c28694 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h @@ -0,0 +1,26 @@ +#ifndef DEF_PINNACLE_H +#define DEF_PINNACLE_H + +enum Data +{ + DATA_SVALA_SORROWGRAVE_EVENT, + DATA_GORTOK_PALEHOOF_EVENT, + DATA_SKADI_THE_RUTHLESS_EVENT, + DATA_KING_YMIRON_EVENT +}; +enum Data64 +{ + DATA_SVALA, + DATA_SVALA_SORROWGRAVE, + DATA_GORTOK_PALEHOOF, + DATA_SKADI_THE_RUTHLESS, + DATA_KING_YMIRON, + DATA_MOB_FRENZIED_WORGEN, + DATA_MOB_RAVENOUS_FURBOLG, + DATA_MOB_MASSIVE_JORMUNGAR, + DATA_MOB_FEROCIOUS_RHINO, + DATA_MOB_ORB, + DATA_GORTOK_PALEHOOF_SPHERE +}; + +#endif diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp index 34e0cdc61b2..aa6ad3d6c8f 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp @@ -3,7 +3,7 @@ UPDATE `creature_template` SET `ScriptName`='boss_archavon' WHERE `entry`='31125 UPDATE `creature_template` SET `ScriptName`='mob_archavon_warder' WHERE `entry`='32353'; *** SQL END ***/ #include "precompiled.h" -#include "def_vault_of_archavon.h" +#include "vault_of_archavon.h" #define EMOTE_BERSERK -1590002 diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp index 6b9586560a0..f38ccefb370 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_vault_of_archavon.h" +#include "vault_of_archavon.h" //Emalon spells #define SPELL_CHAIN_LIGHTNING HEROIC(64213, 64215) diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h b/src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h deleted file mode 100644 index 95c44035184..00000000000 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef DEF_ARCHAVON_H -#define DEF_ARCHAVON_H - -#define DATA_ARCHAVON_EVENT 1 -#define DATA_EMALON_EVENT 2 -#define DATA_EMALON 3 -#define DATA_ARCHAVON 4 -#endif diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp index dc9b78e825f..252531dee68 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_vault_of_archavon.h" +#include "vault_of_archavon.h" #define ENCOUNTERS 2 diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/vault_of_archavon.h b/src/bindings/scripts/scripts/northrend/vault_of_archavon/vault_of_archavon.h new file mode 100644 index 00000000000..95c44035184 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/vault_of_archavon.h @@ -0,0 +1,8 @@ +#ifndef DEF_ARCHAVON_H +#define DEF_ARCHAVON_H + +#define DATA_ARCHAVON_EVENT 1 +#define DATA_EMALON_EVENT 2 +#define DATA_EMALON 3 +#define DATA_ARCHAVON 4 +#endif diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp index a4b5a69e4f0..970d3e9cd5c 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp index 0ce745c37ee..728a9fd8276 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp index 848b43facb8..6ea9cbfe530 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp index fc493735a72..df0bddb6965 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp index fa700d6253a..84d214abcbb 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" //Spells enum Spells diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp index 3f607bcd3f3..0b19ee205bd 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp index d573060f50e..446a74fad8e 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -10,7 +10,7 @@ Script Data End */ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" enum Spells { diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h b/src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h deleted file mode 100644 index 8737bab2b60..00000000000 --- a/src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef DEF_VIOLET_HOLD_H -#define DEF_VIOLET_HOLD_H - -enum Data -{ - DATA_1ST_BOSS_EVENT, - DATA_2ND_BOSS_EVENT, - DATA_CYANIGOSA_EVENT, - DATA_WAVE_COUNT -}; - -enum Data64 -{ - DATA_MORAGG, - DATA_EREKEM, - DATA_EREKEM_GUARD_1, - DATA_EREKEM_GUARD_2, - DATA_ICHORON, - DATA_LAVANTHOR, - DATA_XEVOZZ, - DATA_ZURAMAT, - DATA_CYANIGOSA, - DATA_MORAGG_CELL, - DATA_EREKEM_CELL, - DATA_EREKEM_LEFT_GUARD_CELL, - DATA_EREKEM_RIGHT_GUARD_CELL, - DATA_ICHORON_CELL, - DATA_LAVANTHOR_CELL, - DATA_XEVOZZ_CELL, - DATA_ZURAMAT_CELL, - DATA_MAIN_DOOR, - DATA_SINCLARI -}; - -#endif diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp index fe341667f78..c160e68611d 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" #define MAX_ENCOUNTER 3 diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp index 4f467a28be2..7888d995ceb 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp @@ -1,5 +1,5 @@ #include "precompiled.h" -#include "def_violet_hold.h" +#include "violet_hold.h" #define GOSSIP_START_EVENT "[PH]: Start Event" #define NEXT_WAVE_TIME 90000 diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.h b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.h new file mode 100644 index 00000000000..8737bab2b60 --- /dev/null +++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.h @@ -0,0 +1,35 @@ +#ifndef DEF_VIOLET_HOLD_H +#define DEF_VIOLET_HOLD_H + +enum Data +{ + DATA_1ST_BOSS_EVENT, + DATA_2ND_BOSS_EVENT, + DATA_CYANIGOSA_EVENT, + DATA_WAVE_COUNT +}; + +enum Data64 +{ + DATA_MORAGG, + DATA_EREKEM, + DATA_EREKEM_GUARD_1, + DATA_EREKEM_GUARD_2, + DATA_ICHORON, + DATA_LAVANTHOR, + DATA_XEVOZZ, + DATA_ZURAMAT, + DATA_CYANIGOSA, + DATA_MORAGG_CELL, + DATA_EREKEM_CELL, + DATA_EREKEM_LEFT_GUARD_CELL, + DATA_EREKEM_RIGHT_GUARD_CELL, + DATA_ICHORON_CELL, + DATA_LAVANTHOR_CELL, + DATA_XEVOZZ_CELL, + DATA_ZURAMAT_CELL, + DATA_MAIN_DOOR, + DATA_SINCLARI +}; + +#endif -- cgit v1.2.3