From 03285af1643d5ac19b9de3ba905e7074126c6328 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Thu, 22 Oct 2009 12:51:05 +0200 Subject: Remove def_ from headers filename. Part 3 (last) --HG-- branch : trunk --- src/bindings/scripts/CMakeLists.txt | 26 +++++------ .../blackrock_depths/blackrock_depths.cpp | 2 +- .../blackrock_depths/blackrock_depths.h | 38 ++++++++++++++++ .../blackrock_depths/boss_tomb_of_seven.cpp | 2 +- .../blackrock_depths/def_blackrock_depths.h | 38 ---------------- .../blackrock_depths/instance_blackrock_depths.cpp | 2 +- .../eastern_kingdoms/deadmines/deadmines.cpp | 2 +- .../scripts/eastern_kingdoms/deadmines/deadmines.h | 14 ++++++ .../eastern_kingdoms/deadmines/def_deadmines.h | 14 ------ .../eastern_kingdoms/karazhan/boss_moroes.cpp | 2 +- .../eastern_kingdoms/karazhan/boss_netherspite.cpp | 2 +- .../eastern_kingdoms/karazhan/boss_nightbane.cpp | 2 +- .../karazhan/boss_prince_malchezaar.cpp | 2 +- .../karazhan/boss_shade_of_aran.cpp | 2 +- .../karazhan/boss_terestian_illhoof.cpp | 2 +- .../eastern_kingdoms/karazhan/bosses_opera.cpp | 2 +- .../eastern_kingdoms/karazhan/def_karazhan.h | 53 ---------------------- .../karazhan/instance_karazhan.cpp | 2 +- .../scripts/eastern_kingdoms/karazhan/karazhan.cpp | 2 +- .../scripts/eastern_kingdoms/karazhan/karazhan.h | 53 ++++++++++++++++++++++ .../magisters_terrace/boss_felblood_kaelthas.cpp | 2 +- .../magisters_terrace/boss_priestess_delrissa.cpp | 2 +- .../magisters_terrace/boss_selin_fireheart.cpp | 2 +- .../magisters_terrace/boss_vexallus.cpp | 2 +- .../magisters_terrace/def_magisters_terrace.h | 31 ------------- .../instance_magisters_terrace.cpp | 2 +- .../magisters_terrace/magisters_terrace.h | 31 +++++++++++++ .../eastern_kingdoms/molten_core/boss_golemagg.cpp | 2 +- .../molten_core/boss_sulfuron_harbinger.cpp | 2 +- .../eastern_kingdoms/molten_core/def_molten_core.h | 22 --------- .../molten_core/instance_molten_core.cpp | 2 +- .../eastern_kingdoms/molten_core/molten_core.h | 22 +++++++++ .../scarlet_monastery/boss_headless_horseman.cpp | 2 +- .../scarlet_monastery/boss_interrogator_vishas.cpp | 2 +- .../boss_mograine_and_whitemane.cpp | 2 +- .../scarlet_monastery/def_scarlet_monastery.h | 18 -------- .../instance_scarlet_monastery.cpp | 2 +- .../scarlet_monastery/scarlet_monastery.h | 18 ++++++++ .../scholomance/boss_darkmaster_gandling.cpp | 2 +- .../scholomance/boss_doctor_theolen_krastinov.cpp | 2 +- .../scholomance/boss_illucia_barov.cpp | 2 +- .../scholomance/boss_instructor_malicia.cpp | 2 +- .../scholomance/boss_lord_alexei_barov.cpp | 2 +- .../scholomance/boss_lorekeeper_polkelt.cpp | 2 +- .../scholomance/boss_the_ravenian.cpp | 2 +- .../eastern_kingdoms/scholomance/def_scholomance.h | 17 ------- .../scholomance/instance_scholomance.cpp | 2 +- .../eastern_kingdoms/scholomance/scholomance.h | 17 +++++++ .../shadowfang_keep/def_shadowfang_keep.h | 13 ------ .../shadowfang_keep/instance_shadowfang_keep.cpp | 2 +- .../shadowfang_keep/shadowfang_keep.cpp | 2 +- .../shadowfang_keep/shadowfang_keep.h | 13 ++++++ .../stratholme/boss_baron_rivendare.cpp | 2 +- .../stratholme/boss_baroness_anastari.cpp | 2 +- .../stratholme/boss_magistrate_barthilas.cpp | 2 +- .../stratholme/boss_maleki_the_pallid.cpp | 2 +- .../stratholme/boss_nerubenkan.cpp | 2 +- .../stratholme/boss_order_of_silver_hand.cpp | 2 +- .../stratholme/boss_ramstein_the_gorger.cpp | 2 +- .../eastern_kingdoms/stratholme/def_stratholme.h | 28 ------------ .../stratholme/instance_stratholme.cpp | 2 +- .../eastern_kingdoms/stratholme/stratholme.cpp | 2 +- .../eastern_kingdoms/stratholme/stratholme.h | 28 ++++++++++++ .../sunken_temple/def_sunken_temple.h | 22 --------- .../sunken_temple/instance_sunken_temple.cpp | 2 +- .../sunken_temple/sunken_temple.cpp | 2 +- .../eastern_kingdoms/sunken_temple/sunken_temple.h | 22 +++++++++ .../sunwell_plateau/boss_brutallus.cpp | 2 +- .../sunwell_plateau/boss_eredar_twins.cpp | 2 +- .../sunwell_plateau/boss_felmyst.cpp | 2 +- .../sunwell_plateau/boss_kalecgos.cpp | 2 +- .../sunwell_plateau/boss_kiljaeden.cpp | 2 +- .../eastern_kingdoms/sunwell_plateau/boss_muru.cpp | 2 +- .../sunwell_plateau/def_sunwell_plateau.h | 37 --------------- .../sunwell_plateau/instance_sunwell_plateau.cpp | 2 +- .../sunwell_plateau/sunwell_plateau.cpp | 2 +- .../sunwell_plateau/sunwell_plateau.h | 37 +++++++++++++++ .../eastern_kingdoms/zulaman/boss_akilzon.cpp | 2 +- .../eastern_kingdoms/zulaman/boss_halazzi.cpp | 2 +- .../eastern_kingdoms/zulaman/boss_hexlord.cpp | 2 +- .../eastern_kingdoms/zulaman/boss_janalai.cpp | 2 +- .../eastern_kingdoms/zulaman/boss_nalorakk.cpp | 2 +- .../eastern_kingdoms/zulaman/boss_zuljin.cpp | 2 +- .../scripts/eastern_kingdoms/zulaman/def_zulaman.h | 19 -------- .../eastern_kingdoms/zulaman/instance_zulaman.cpp | 2 +- .../scripts/eastern_kingdoms/zulaman/zulaman.cpp | 2 +- .../scripts/eastern_kingdoms/zulaman/zulaman.h | 19 ++++++++ .../eastern_kingdoms/zulgurub/boss_arlokk.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_grilek.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_hakkar.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_hazzarah.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_jeklik.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_jindo.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_mandokir.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_marli.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_renataki.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_thekal.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_venoxis.cpp | 2 +- .../eastern_kingdoms/zulgurub/boss_wushoolay.cpp | 2 +- .../eastern_kingdoms/zulgurub/def_zulgurub.h | 28 ------------ .../zulgurub/instance_zulgurub.cpp | 2 +- .../scripts/eastern_kingdoms/zulgurub/zulgurub.h | 28 ++++++++++++ 102 files changed, 428 insertions(+), 428 deletions(-) create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/deadmines/def_deadmines.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/def_magisters_terrace.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/molten_core/def_molten_core.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/molten_core/molten_core.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/def_scarlet_monastery.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/scholomance/def_scholomance.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/scholomance/scholomance.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/def_shadowfang_keep.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/stratholme/def_stratholme.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/def_sunwell_plateau.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/zulaman/def_zulaman.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.h delete mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h create mode 100644 src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/zulgurub.h (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 29a9ac6e94f..a8e758c14fa 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -30,7 +30,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp - scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h + scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp @@ -54,7 +54,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp - scripts/eastern_kingdoms/deadmines/def_deadmines.h + scripts/eastern_kingdoms/deadmines/deadmines.h scripts/eastern_kingdoms/deadmines/deadmines.cpp scripts/eastern_kingdoms/karazhan/boss_curator.cpp scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -66,14 +66,14 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp scripts/eastern_kingdoms/karazhan/bosses_opera.cpp - scripts/eastern_kingdoms/karazhan/def_karazhan.h + scripts/eastern_kingdoms/karazhan/karazhan.h scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp scripts/eastern_kingdoms/karazhan/karazhan.cpp scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp - scripts/eastern_kingdoms/magisters_terrace/def_magisters_terrace.h + scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp @@ -86,7 +86,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp - scripts/eastern_kingdoms/molten_core/def_molten_core.h + scripts/eastern_kingdoms/molten_core/molten_core.h scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp scripts/eastern_kingdoms/molten_core/molten_core.cpp scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp @@ -104,7 +104,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp - scripts/eastern_kingdoms/scarlet_monastery/def_scarlet_monastery.h + scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -117,9 +117,9 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp scripts/eastern_kingdoms/scholomance/boss_vectus.cpp - scripts/eastern_kingdoms/scholomance/def_scholomance.h + scripts/eastern_kingdoms/scholomance/scholomance.h scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp - scripts/eastern_kingdoms/shadowfang_keep/def_shadowfang_keep.h + scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -133,10 +133,10 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp - scripts/eastern_kingdoms/stratholme/def_stratholme.h + scripts/eastern_kingdoms/stratholme/stratholme.h scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp scripts/eastern_kingdoms/stratholme/stratholme.cpp - scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h + scripts/eastern_kingdoms/sunken_temple/sunken_temple.h scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -146,7 +146,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp - scripts/eastern_kingdoms/sunwell_plateau/def_sunwell_plateau.h + scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -158,7 +158,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/zulaman/boss_janalai.cpp scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp - scripts/eastern_kingdoms/zulaman/def_zulaman.h + scripts/eastern_kingdoms/zulaman/zulaman.h scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp scripts/eastern_kingdoms/zulaman/zulaman.cpp scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -174,7 +174,7 @@ SET(trinityscript_LIB_SRCS scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp - scripts/eastern_kingdoms/zulgurub/def_zulgurub.h + scripts/eastern_kingdoms/zulgurub/zulgurub.h scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp scripts/eastern_kingdoms/alterac_mountains.cpp scripts/eastern_kingdoms/arathi_highlands.cpp diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index faa05e147ed..b0cbbe28835 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -38,7 +38,7 @@ EndContentData */ #include "precompiled.h" #include "escort_ai.h" -#include "def_blackrock_depths.h" +#include "blackrock_depths.h" /*###### +## go_shadowforge_brazier diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h new file mode 100644 index 00000000000..6ced6bafe15 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h @@ -0,0 +1,38 @@ +/* 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_BRD_H +#define DEF_BRD_H + +#define FACTION_NEUTRAL 734 +#define FACTION_HOSTILE 754 +#define FACTION_FRIEND 35 + +enum eTypes +{ + TYPE_RING_OF_LAW = 1, + TYPE_VAULT = 2, + TYPE_BAR = 3, + TYPE_TOMB_OF_SEVEN = 4, + TYPE_LYCEUM = 5, + TYPE_IRON_HALL = 6, + + DATA_EMPEROR = 10, + DATA_PHALANX = 11, + + DATA_ARENA1 = 12, + DATA_ARENA2 = 13, + DATA_ARENA3 = 14, + DATA_ARENA4 = 15, + + DATA_GO_BAR_KEG = 16, + DATA_GO_BAR_KEG_TRAP = 17, + DATA_GO_BAR_DOOR = 18, + DATA_GO_CHALICE = 19, + + DATA_GHOSTKILL = 20, + DATA_EVENSTARTER = 21 +}; +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index 80b2ea8ac08..80e85220187 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -22,7 +22,7 @@ SDCategory: Blackrock Depths EndScriptData */ #include "precompiled.h" -#include "def_blackrock_depths.h" +#include "blackrock_depths.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h deleted file mode 100644 index 6ced6bafe15..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h +++ /dev/null @@ -1,38 +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_BRD_H -#define DEF_BRD_H - -#define FACTION_NEUTRAL 734 -#define FACTION_HOSTILE 754 -#define FACTION_FRIEND 35 - -enum eTypes -{ - TYPE_RING_OF_LAW = 1, - TYPE_VAULT = 2, - TYPE_BAR = 3, - TYPE_TOMB_OF_SEVEN = 4, - TYPE_LYCEUM = 5, - TYPE_IRON_HALL = 6, - - DATA_EMPEROR = 10, - DATA_PHALANX = 11, - - DATA_ARENA1 = 12, - DATA_ARENA2 = 13, - DATA_ARENA3 = 14, - DATA_ARENA4 = 15, - - DATA_GO_BAR_KEG = 16, - DATA_GO_BAR_KEG_TRAP = 17, - DATA_GO_BAR_DOOR = 18, - DATA_GO_CHALICE = 19, - - DATA_GHOSTKILL = 20, - DATA_EVENSTARTER = 21 -}; -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp index 79ef098260d..be0caf09919 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp @@ -30,7 +30,7 @@ update `instance_template` set `script`='instance_blackrock_depths' where `map`= */ #include "precompiled.h" -#include "def_blackrock_depths.h" +#include "blackrock_depths.h" #define TIMER_TOMBOFTHESEVEN 15000 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp index d2544cc881f..3a082588c09 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp @@ -22,7 +22,7 @@ SDCategory: Deadmines EndScriptData */ #include "precompiled.h" -#include "def_deadmines.h" +#include "deadmines.h" #include "Spell.h" #define SOUND_CANNONFIRE 1400 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.h b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.h new file mode 100644 index 00000000000..9b535a9fd80 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.h @@ -0,0 +1,14 @@ +#ifndef DEF_DEADMINES_H +#define DEF_DEADMINES_H + +#include "precompiled.h" + +#define CANNON_NOT_USED 1 +#define CANNON_GUNPOWDER_USED 2 +#define CANNON_BLAST_INITIATED 3 +#define PIRATES_ATTACK 4 +#define EVENT_DONE 5 + +#define EVENT_STATE 1 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/def_deadmines.h b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/def_deadmines.h deleted file mode 100644 index 9b535a9fd80..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/def_deadmines.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef DEF_DEADMINES_H -#define DEF_DEADMINES_H - -#include "precompiled.h" - -#define CANNON_NOT_USED 1 -#define CANNON_GUNPOWDER_USED 2 -#define CANNON_BLAST_INITIATED 3 -#define PIRATES_ATTACK 4 -#define EVENT_DONE 5 - -#define EVENT_STATE 1 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 838fc70f135..8464098fda7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #define SAY_AGGRO -1532011 #define SAY_SPECIAL_1 -1532012 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index 4776042cdb0..72e30bba96d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #define EMOTE_PHASE_PORTAL -1532089 #define EMOTE_PHASE_BANISH -1532090 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp index 0168ce10a35..50cf24c6883 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" //phase 1 #define SPELL_BELLOWING_ROAR 39427 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index c44cbcc7ced..f01de21b827 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #define SAY_AGGRO -1532091 #define SAY_AXE_TOSS1 -1532092 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index 66f50881aa9..0276cb8a405 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" #include "simple_ai.h" -#include "def_karazhan.h" +#include "karazhan.h" #include "GameObject.h" #define SAY_AGGRO1 -1532073 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp index c19c7f1b14c..c7d910cf5c9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #define SAY_SLAY1 -1532065 #define SAY_SLAY2 -1532066 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp index 51827bd3fb3..1dcafab1886 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" /***********************************/ /*** OPERA WIZARD OF OZ EVENT *****/ diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h deleted file mode 100644 index 56a6b106332..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h +++ /dev/null @@ -1,53 +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_KARAZHAN_H -#define DEF_KARAZHAN_H - -enum eEnums -{ - TYPE_ATTUMEN = 1, - TYPE_MOROES = 2, - TYPE_MAIDEN = 3, - TYPE_OPTIONAL_BOSS = 4, - TYPE_OPERA = 5, - TYPE_CURATOR = 6, - TYPE_ARAN = 7, - TYPE_TERESTIAN = 8, - TYPE_NETHERSPITE = 9, - TYPE_CHESS = 10, - TYPE_MALCHEZZAR = 11, - TYPE_NIGHTBANE = 12, - - DATA_OPERA_PERFORMANCE = 13, - DATA_OPERA_OZ_DEATHCOUNT = 14, - - DATA_KILREK = 15, - DATA_TERESTIAN = 16, - DATA_MOROES = 17, - DATA_GO_CURTAINS = 18, - DATA_GO_STAGEDOORLEFT = 19, - DATA_GO_STAGEDOORRIGHT = 20, - DATA_GO_LIBRARY_DOOR = 21, - DATA_GO_MASSIVE_DOOR = 22, - DATA_GO_NETHER_DOOR = 23, - DATA_GO_GAME_DOOR = 24, - DATA_GO_GAME_EXIT_DOOR = 25, - - DATA_IMAGE_OF_MEDIVH = 26, - DATA_MASTERS_TERRACE_DOOR_1 = 27, - DATA_MASTERS_TERRACE_DOOR_2 = 28, - DATA_GO_SIDE_ENTRANCE_DOOR = 29 -}; - -enum OperaEvents -{ - EVENT_OZ = 1, - EVENT_HOOD = 2, - EVENT_RAJ = 3 -}; - -#define ERROR_INST_DATA(a) error_log("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp index de82fb9c44b..066ecca5b23 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp @@ -22,7 +22,7 @@ SDCategory: Karazhan EndScriptData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #define MAX_ENCOUNTER 12 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp index b7bd436f2a8..8267048e13a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp @@ -28,7 +28,7 @@ npc_image_of_medivh EndContentData */ #include "precompiled.h" -#include "def_karazhan.h" +#include "karazhan.h" #include "escort_ai.h" /*###### diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.h b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.h new file mode 100644 index 00000000000..56a6b106332 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.h @@ -0,0 +1,53 @@ +/* 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_KARAZHAN_H +#define DEF_KARAZHAN_H + +enum eEnums +{ + TYPE_ATTUMEN = 1, + TYPE_MOROES = 2, + TYPE_MAIDEN = 3, + TYPE_OPTIONAL_BOSS = 4, + TYPE_OPERA = 5, + TYPE_CURATOR = 6, + TYPE_ARAN = 7, + TYPE_TERESTIAN = 8, + TYPE_NETHERSPITE = 9, + TYPE_CHESS = 10, + TYPE_MALCHEZZAR = 11, + TYPE_NIGHTBANE = 12, + + DATA_OPERA_PERFORMANCE = 13, + DATA_OPERA_OZ_DEATHCOUNT = 14, + + DATA_KILREK = 15, + DATA_TERESTIAN = 16, + DATA_MOROES = 17, + DATA_GO_CURTAINS = 18, + DATA_GO_STAGEDOORLEFT = 19, + DATA_GO_STAGEDOORRIGHT = 20, + DATA_GO_LIBRARY_DOOR = 21, + DATA_GO_MASSIVE_DOOR = 22, + DATA_GO_NETHER_DOOR = 23, + DATA_GO_GAME_DOOR = 24, + DATA_GO_GAME_EXIT_DOOR = 25, + + DATA_IMAGE_OF_MEDIVH = 26, + DATA_MASTERS_TERRACE_DOOR_1 = 27, + DATA_MASTERS_TERRACE_DOOR_2 = 28, + DATA_GO_SIDE_ENTRANCE_DOOR = 29 +}; + +enum OperaEvents +{ + EVENT_OZ = 1, + EVENT_HOOD = 2, + EVENT_RAJ = 3 +}; + +#define ERROR_INST_DATA(a) error_log("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index d1d85cf55ee..851f76e7e55 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -22,7 +22,7 @@ SDCategory: Magisters' Terrace EndScriptData */ #include "precompiled.h" -#include "def_magisters_terrace.h" +#include "magisters_terrace.h" #include "WorldPacket.h" #define SAY_AGGRO -1585023 //This yell should be done when the room is cleared. For now, set it as a movelineofsight yell. diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index 49af52a6c55..ad9b64b5765 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -22,7 +22,7 @@ SDCategory: Magister's Terrace EndScriptData */ #include "precompiled.h" -#include "def_magisters_terrace.h" +#include "magisters_terrace.h" struct Speech { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp index 9cb816fa920..80fc1fb48cd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp @@ -22,7 +22,7 @@ SDCategory: Magister's Terrace EndScriptData */ #include "precompiled.h" -#include "def_magisters_terrace.h" +#include "magisters_terrace.h" #define SAY_AGGRO -1585000 #define SAY_ENERGY -1585001 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index c4e7a33a77c..18cdea3680a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -22,7 +22,7 @@ SDCategory: Magister's Terrace EndScriptData */ #include "precompiled.h" -#include "def_magisters_terrace.h" +#include "magisters_terrace.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/def_magisters_terrace.h b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/def_magisters_terrace.h deleted file mode 100644 index d6419ea409c..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/def_magisters_terrace.h +++ /dev/null @@ -1,31 +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_MAGISTERS_TERRACE_H -#define DEF_MAGISTERS_TERRACE_H - -#define DATA_SELIN_EVENT 1 -#define DATA_VEXALLUS_EVENT 2 -#define DATA_DELRISSA_EVENT 3 -#define DATA_KAELTHAS_EVENT 4 - -#define DATA_SELIN 5 -#define DATA_FEL_CRYSTAL 6 -#define DATA_FEL_CRYSTAL_SIZE 7 - -#define DATA_VEXALLUS_DOOR 8 -#define DATA_SELIN_DOOR 9 -#define DATA_DELRISSA 10 -#define DATA_DELRISSA_DOOR 11 -#define DATA_SELIN_ENCOUNTER_DOOR 12 - -#define DATA_KAEL_DOOR 13 -#define DATA_KAEL_STATUE_LEFT 14 -#define DATA_KAEL_STATUE_RIGHT 15 - -#define DATA_DELRISSA_DEATH_COUNT 16 - -#define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Magister's Terrace instance (map 585). Encounters will be buggy." -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp index be71b7a01ad..704347208b0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp @@ -22,7 +22,7 @@ SDCategory: Magister's Terrace EndScriptData */ #include "precompiled.h" -#include "def_magisters_terrace.h" +#include "magisters_terrace.h" #define MAX_ENCOUNTER 4 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h new file mode 100644 index 00000000000..d6419ea409c --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h @@ -0,0 +1,31 @@ +/* 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_MAGISTERS_TERRACE_H +#define DEF_MAGISTERS_TERRACE_H + +#define DATA_SELIN_EVENT 1 +#define DATA_VEXALLUS_EVENT 2 +#define DATA_DELRISSA_EVENT 3 +#define DATA_KAELTHAS_EVENT 4 + +#define DATA_SELIN 5 +#define DATA_FEL_CRYSTAL 6 +#define DATA_FEL_CRYSTAL_SIZE 7 + +#define DATA_VEXALLUS_DOOR 8 +#define DATA_SELIN_DOOR 9 +#define DATA_DELRISSA 10 +#define DATA_DELRISSA_DOOR 11 +#define DATA_SELIN_ENCOUNTER_DOOR 12 + +#define DATA_KAEL_DOOR 13 +#define DATA_KAEL_STATUE_LEFT 14 +#define DATA_KAEL_STATUE_RIGHT 15 + +#define DATA_DELRISSA_DEATH_COUNT 16 + +#define ERROR_INST_DATA "TSCR Error: Instance Data not set properly for Magister's Terrace instance (map 585). Encounters will be buggy." +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp index 3fedad28827..797a1060ecf 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp @@ -22,7 +22,7 @@ SDCategory: Molten Core EndScriptData */ #include "precompiled.h" -#include "def_molten_core.h" +#include "molten_core.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index a01fb32c46c..67f7b117123 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -22,7 +22,7 @@ SDCategory: Molten Core EndScriptData */ #include "precompiled.h" -#include "def_molten_core.h" +#include "molten_core.h" #define SPELL_DARKSTRIKE 19777 #define SPELL_DEMORALIZINGSHOUT 19778 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/def_molten_core.h b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/def_molten_core.h deleted file mode 100644 index 5874d8b9408..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/def_molten_core.h +++ /dev/null @@ -1,22 +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_MOLTEN_CORE_H -#define DEF_MOLTEN_CORE_H - -#define DATA_FLAMEWAKERPRIEST 1 -#define DATA_GARRISDEAD 2 -#define DATA_GEDDONISDEAD 3 -#define DATA_GEHENNASISDEAD 4 -#define DATA_GOLEMAGGISDEAD 5 -#define DATA_GOLEMAGG_DEATH 6 -#define DATA_LUCIFRONISDEAD 7 -#define DATA_MAGMADARISDEAD 8 -#define DATA_MAJORDOMOISDEAD 9 -#define DATA_SHAZZRAHISDEAD 10 -#define DATA_SULFURON 11 -#define DATA_SULFURONISDEAD 12 -#define DATA_GOLEMAGG 13 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp index 5dea84aceb6..b46445b285b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp @@ -22,7 +22,7 @@ SDCategory: Molten Core EndScriptData */ #include "precompiled.h" -#include "def_molten_core.h" +#include "molten_core.h" #define MAX_ENCOUNTER 9 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/molten_core.h b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/molten_core.h new file mode 100644 index 00000000000..5874d8b9408 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/molten_core.h @@ -0,0 +1,22 @@ +/* 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_MOLTEN_CORE_H +#define DEF_MOLTEN_CORE_H + +#define DATA_FLAMEWAKERPRIEST 1 +#define DATA_GARRISDEAD 2 +#define DATA_GEDDONISDEAD 3 +#define DATA_GEHENNASISDEAD 4 +#define DATA_GOLEMAGGISDEAD 5 +#define DATA_GOLEMAGG_DEATH 6 +#define DATA_LUCIFRONISDEAD 7 +#define DATA_MAGMADARISDEAD 8 +#define DATA_MAJORDOMOISDEAD 9 +#define DATA_SHAZZRAHISDEAD 10 +#define DATA_SULFURON 11 +#define DATA_SULFURONISDEAD 12 +#define DATA_GOLEMAGG 13 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index cac306ec258..1ac67d1f8a3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" #include "SpellMgr.h" -#include "def_scarlet_monastery.h" +#include "scarlet_monastery.h" //this texts are already used by 3975 and 3976 #define SAY_ENTRANCE -1189001 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index c0b02a2c370..0101ddf26a1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -22,7 +22,7 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "precompiled.h" -#include "def_scarlet_monastery.h" +#include "scarlet_monastery.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index 0ed5de79fe1..e778221a697 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -22,7 +22,7 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "precompiled.h" -#include "def_scarlet_monastery.h" +#include "scarlet_monastery.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/def_scarlet_monastery.h b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/def_scarlet_monastery.h deleted file mode 100644 index 2b6399ae3e4..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/def_scarlet_monastery.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/> - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SCARLET_M -#define DEF_SCARLET_M - -#define TYPE_MOGRAINE_AND_WHITE_EVENT 1 -#define DATA_MOGRAINE 2 -#define DATA_WHITEMANE 3 -#define DATA_DOOR_WHITEMANE 4 - -#define DATA_HORSEMAN_EVENT 5 -#define GAMEOBJECT_PUMPKIN_SHRINE 6 - -#define DATA_VORREL 7 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp index 44b05733909..ac0795ce6ae 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp @@ -22,7 +22,7 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "precompiled.h" -#include "def_scarlet_monastery.h" +#include "scarlet_monastery.h" #include "sc_creature.h" #define ENTRY_PUMPKIN_SHRINE 186267 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h new file mode 100644 index 00000000000..2b6399ae3e4 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h @@ -0,0 +1,18 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/> + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SCARLET_M +#define DEF_SCARLET_M + +#define TYPE_MOGRAINE_AND_WHITE_EVENT 1 +#define DATA_MOGRAINE 2 +#define DATA_WHITEMANE 3 +#define DATA_DOOR_WHITEMANE 4 + +#define DATA_HORSEMAN_EVENT 5 +#define GAMEOBJECT_PUMPKIN_SHRINE 6 + +#define DATA_VORREL 7 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp index b064a1d9e10..e861a168c80 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_ARCANEMISSILES 22272 #define SPELL_SHADOWSHIELD 22417 //Not right ID. But 12040 is wrong either. diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp index 51ace6a6e21..e6950f2c086 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" enum eEnums { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp index c6bb471f6f0..533542d9383 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_CURSEOFAGONY 18671 #define SPELL_SHADOWSHOCK 20603 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp index 866a2f4dfbc..e5ea8666fdb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_CALLOFGRAVES 17831 #define SPELL_CORRUPTION 11672 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp index 41f771471db..e5f11ee9c32 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_IMMOLATE 20294 // Old ID was 15570 #define SPELL_VEILOFSHADOW 17820 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp index 695d907fca5..d924656c7ef 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_VOLATILEINFECTION 24928 #define SPELL_DARKPLAGUE 18270 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp index aae06c8d27a..abe852580a7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define SPELL_TRAMPLE 15550 #define SPELL_CLEAVE 20691 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/def_scholomance.h b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/def_scholomance.h deleted file mode 100644 index 83ce26c9687..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/def_scholomance.h +++ /dev/null @@ -1,17 +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_SCHOLOMANCE_H -#define DEF_SCHOLOMANCE_H - -#define TYPE_GANDLING 1 -#define DATA_DOCTORTHEOLENKRASTINOV_DEATH 2 -#define DATA_INSTRUCTORMALICIA_DEATH 3 -#define DATA_LADYILLUCIABAROV_DEATH 4 -#define DATA_LORDALEXEIBAROV_DEATH 5 -#define DATA_LOREKEEPERPOLKELT_DEATH 6 -#define DATA_THERAVENIAN_DEATH 7 -#define TYPE_KIRTONOS 8 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp index 8c124652a29..eaad33e554f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp @@ -22,7 +22,7 @@ SDCategory: Scholomance EndScriptData */ #include "precompiled.h" -#include "def_scholomance.h" +#include "scholomance.h" #define GO_GATE_KIRTONOS 175570 #define GO_GATE_GANDLING 177374 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/scholomance.h b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/scholomance.h new file mode 100644 index 00000000000..83ce26c9687 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/scholomance.h @@ -0,0 +1,17 @@ +/* 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_SCHOLOMANCE_H +#define DEF_SCHOLOMANCE_H + +#define TYPE_GANDLING 1 +#define DATA_DOCTORTHEOLENKRASTINOV_DEATH 2 +#define DATA_INSTRUCTORMALICIA_DEATH 3 +#define DATA_LADYILLUCIABAROV_DEATH 4 +#define DATA_LORDALEXEIBAROV_DEATH 5 +#define DATA_LOREKEEPERPOLKELT_DEATH 6 +#define DATA_THERAVENIAN_DEATH 7 +#define TYPE_KIRTONOS 8 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/def_shadowfang_keep.h b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/def_shadowfang_keep.h deleted file mode 100644 index 8383a5c3950..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/def_shadowfang_keep.h +++ /dev/null @@ -1,13 +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_SHADOWFANG_H -#define DEF_SHADOWFANG_H - -#define TYPE_FREE_NPC 1 -#define TYPE_RETHILGORE 2 -#define TYPE_FENRUS 3 -#define TYPE_NANDOS 4 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp index a4bc6c40f28..74da9dea4c4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp @@ -22,7 +22,7 @@ SDCategory: Shadowfang Keep EndScriptData */ #include "precompiled.h" -#include "def_shadowfang_keep.h" +#include "shadowfang_keep.h" #define MAX_ENCOUNTER 4 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp index dddf80ee4bb..d2fdeb89987 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp @@ -27,7 +27,7 @@ EndContentData */ #include "precompiled.h" #include "escort_ai.h" -#include "def_shadowfang_keep.h" +#include "shadowfang_keep.h" /*###### ## npc_shadowfang_prisoner diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h new file mode 100644 index 00000000000..8383a5c3950 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h @@ -0,0 +1,13 @@ +/* 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_SHADOWFANG_H +#define DEF_SHADOWFANG_H + +#define TYPE_FREE_NPC 1 +#define TYPE_RETHILGORE 2 +#define TYPE_FENRUS 3 +#define TYPE_NANDOS 4 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp index e5f33d7a086..bdb314bf8bc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define SAY_0 "Intruders! More pawns of the Argent Dawn, no doubt. I already count one of their number among my prisoners. Withdraw from my domain before she is executed!" #define SAY_1 "You're still here? Your foolishness is amusing! The Argent Dawn wench needn't suffer in vain. Leave at once and she shall be spared!" diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp index ba5c2ec0521..5498e33f652 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define SPELL_BANSHEEWAIL 16565 #define SPELL_BANSHEECURSE 16867 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp index c1fe3220b9e..ed695161455 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define SPELL_DRAININGBLOW 16793 #define SPELL_CROWDPUMMEL 10887 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp index e5e31e20704..1cc4b37a699 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define SPELL_FROSTBOLT 17503 #define SPELL_DRAINLIFE 20743 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp index f051208c287..a5ea4a65bb6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define SPELL_ENCASINGWEBS 4962 #define SPELL_PIERCEARMOR 6016 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp index 4cbbe273a65..94ed6b0a906 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" /*##### # Additional: diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp index 48c78e72953..c645e17d3f4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" - #include "def_stratholme.h" +#include "stratholme.h" #define SPELL_TRAMPLE 5568 #define SPELL_KNOCKOUT 17307 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/def_stratholme.h b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/def_stratholme.h deleted file mode 100644 index b9246091a7c..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/def_stratholme.h +++ /dev/null @@ -1,28 +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_STRATHOLME_H -#define DEF_STRATHOLME_H - -#define TYPE_BARON_RUN 1 -#define TYPE_BARONESS 2 -#define TYPE_NERUB 3 -#define TYPE_PALLID 4 -#define TYPE_RAMSTEIN 5 -#define TYPE_BARON 6 - -#define DATA_BARON 10 -#define DATA_YSIDA_TRIGGER 11 - -#define TYPE_SH_QUEST 20 -#define TYPE_SH_CATHELA 21 -#define TYPE_SH_GREGOR 22 -#define TYPE_SH_NEMAS 23 -#define TYPE_SH_VICAR 24 -#define TYPE_SH_AELMAR 25 - -#define QUEST_DEAD_MAN_PLEA 8945 -#define SPELL_BARON_ULTIMATUM 27861 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp index fe0845118ee..3b3d0c6a670 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp @@ -22,7 +22,7 @@ SDCategory: Stratholme EndScriptData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" #define GO_SERVICE_ENTRANCE 175368 #define GO_GAUNTLET_GATE1 175357 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp index 1d8db17d501..38129a208fd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -29,7 +29,7 @@ mobs_spectral_ghostly_citizen EndContentData */ #include "precompiled.h" -#include "def_stratholme.h" +#include "stratholme.h" /*###### ## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.h b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.h new file mode 100644 index 00000000000..b9246091a7c --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.h @@ -0,0 +1,28 @@ +/* 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_STRATHOLME_H +#define DEF_STRATHOLME_H + +#define TYPE_BARON_RUN 1 +#define TYPE_BARONESS 2 +#define TYPE_NERUB 3 +#define TYPE_PALLID 4 +#define TYPE_RAMSTEIN 5 +#define TYPE_BARON 6 + +#define DATA_BARON 10 +#define DATA_YSIDA_TRIGGER 11 + +#define TYPE_SH_QUEST 20 +#define TYPE_SH_CATHELA 21 +#define TYPE_SH_GREGOR 22 +#define TYPE_SH_NEMAS 23 +#define TYPE_SH_VICAR 24 +#define TYPE_SH_AELMAR 25 + +#define QUEST_DEAD_MAN_PLEA 8945 +#define SPELL_BARON_ULTIMATUM 27861 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h deleted file mode 100644 index 82245095c31..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (C) 2006 - 2009 kb_z - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SUNKEN_TEMPLE_H -#define DEF_SUNKEN_TEMPLE_H - -#define TROLLBOSS1_DEATH 1 -#define TROLLBOSS2_DEATH 2 -#define TROLLBOSS3_DEATH 3 -#define TROLLBOSS4_DEATH 4 -#define TROLLBOSS5_DEATH 5 -#define TROLLBOSS6_DEATH 6 -#define JAMMALAN_DEATH 7 -#define MORPHAZ_DEATH 8 -#define HAZZAS_DEATH 9 -#define ERANIKUS_DEATH 10 -#define ATALALARION_DEATH 11 //optional - -#define EVENT_STATE 1 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp index 502a1827728..262e50a318d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp @@ -22,7 +22,7 @@ SDCategory: Sunken Temple EndScriptData */ #include "precompiled.h" -#include "def_sunken_temple.h" +#include "sunken_temple.h" #define GO_ATALAI_STATUE1 148830 #define GO_ATALAI_STATUE2 148831 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp index d4da9a68e53..3e8ea7a95d9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp @@ -26,7 +26,7 @@ at_malfurion_Stormrage_trigger EndContentData */ #include "precompiled.h" -#include "def_sunken_temple.h" +#include "sunken_temple.h" /*##### # at_malfurion_Stormrage_trigger diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h new file mode 100644 index 00000000000..82245095c31 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h @@ -0,0 +1,22 @@ +/* Copyright (C) 2006 - 2009 kb_z + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SUNKEN_TEMPLE_H +#define DEF_SUNKEN_TEMPLE_H + +#define TROLLBOSS1_DEATH 1 +#define TROLLBOSS2_DEATH 2 +#define TROLLBOSS3_DEATH 3 +#define TROLLBOSS4_DEATH 4 +#define TROLLBOSS5_DEATH 5 +#define TROLLBOSS6_DEATH 6 +#define JAMMALAN_DEATH 7 +#define MORPHAZ_DEATH 8 +#define HAZZAS_DEATH 9 +#define ERANIKUS_DEATH 10 +#define ATALALARION_DEATH 11 //optional + +#define EVENT_STATE 1 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index 985a4d5af5b..2b8bf280ad5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -21,7 +21,7 @@ SDComment: Find a way to start the intro, best code for the intro EndScriptData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" enum Quotes { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp index 6c62c75e35d..8c4ae59cfda 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp @@ -21,7 +21,7 @@ SDComment: EndScriptData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" enum Quotes { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index 68cc122bfd1..57d9d19a591 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -21,7 +21,7 @@ SDComment: EndScriptData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" enum Quotes { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index 01b74fc6aa8..c6ee37ad33f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -22,7 +22,7 @@ SDCategory: Sunwell_Plateau EndScriptData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" enum Quotes { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index e9e18e4383c..b447d7fafef 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -25,7 +25,7 @@ EndScriptData */ //TODO Remove blue visual from Orbs on reset and if it is used #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" #include /*** Speech and sounds***/ diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp index ea679322225..346d9bbf3e1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp @@ -21,7 +21,7 @@ SDComment: all sounds, black hole effect triggers to often (46228) */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" // Muru & Entropius's spells enum Spells diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/def_sunwell_plateau.h b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/def_sunwell_plateau.h deleted file mode 100644 index f955e8c7e17..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/def_sunwell_plateau.h +++ /dev/null @@ -1,37 +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_SUNWELLPLATEAU_H -#define DEF_SUNWELLPLATEAU_H - -/*** Encounters ***/ -#define DATA_KALECGOS_EVENT 1 -#define DATA_BRUTALLUS_EVENT 2 -#define DATA_FELMYST_EVENT 3 -#define DATA_EREDAR_TWINS_EVENT 4 -#define DATA_MURU_EVENT 5 -#define DATA_KILJAEDEN_EVENT 6 - -/*** Creatures ***/ -#define DATA_KALECGOS_DRAGON 7 -#define DATA_KALECGOS_HUMAN 8 -#define DATA_SATHROVARR 9 -#define DATA_BRUTALLUS 10 -#define DATA_MADRIGOSA 11 -#define DATA_FELMYST 12 -#define DATA_ALYTHESS 13 -#define DATA_SACROLASH 14 -#define DATA_MURU 15 -#define DATA_KILJAEDEN 16 -#define DATA_KILJAEDEN_CONTROLLER 17 -#define DATA_ANVEENA 18 -#define DATA_KALECGOS_KJ 19 - -/*** GameObjects ***/ -#define DATA_GO_FORCEFIELD 20 - -/*** Misc ***/ -#define DATA_PLAYER_GUID 21 -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp index 9e1fc10d684..c852849fa39 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp @@ -10,7 +10,7 @@ SDCategory: Sunwell_Plateau EndScriptData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" #define MAX_ENCOUNTER 6 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp index 9eac24fa45e..e1b118e8b46 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp @@ -26,7 +26,7 @@ npc_captain_selana EndContentData */ #include "precompiled.h" -#include "def_sunwell_plateau.h" +#include "sunwell_plateau.h" /*###### ## npc_prophet_velen diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h new file mode 100644 index 00000000000..f955e8c7e17 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h @@ -0,0 +1,37 @@ +/* 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_SUNWELLPLATEAU_H +#define DEF_SUNWELLPLATEAU_H + +/*** Encounters ***/ +#define DATA_KALECGOS_EVENT 1 +#define DATA_BRUTALLUS_EVENT 2 +#define DATA_FELMYST_EVENT 3 +#define DATA_EREDAR_TWINS_EVENT 4 +#define DATA_MURU_EVENT 5 +#define DATA_KILJAEDEN_EVENT 6 + +/*** Creatures ***/ +#define DATA_KALECGOS_DRAGON 7 +#define DATA_KALECGOS_HUMAN 8 +#define DATA_SATHROVARR 9 +#define DATA_BRUTALLUS 10 +#define DATA_MADRIGOSA 11 +#define DATA_FELMYST 12 +#define DATA_ALYTHESS 13 +#define DATA_SACROLASH 14 +#define DATA_MURU 15 +#define DATA_KILJAEDEN 16 +#define DATA_KILJAEDEN_CONTROLLER 17 +#define DATA_ANVEENA 18 +#define DATA_KALECGOS_KJ 19 + +/*** GameObjects ***/ +#define DATA_GO_FORCEFIELD 20 + +/*** Misc ***/ +#define DATA_PLAYER_GUID 21 +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index f093de53185..dd57c5c990f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -24,7 +24,7 @@ SQLUpdate: EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" #include "Weather.h" #define SPELL_STATIC_DISRUPTION 43622 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp index 2cced564afb..8ef5743bc60 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Aman EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" //#include "spell.h" #define YELL_AGGRO "Get on your knees and bow to da fang and claw!" diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index ba3fbe750eb..16e64ed46fb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Aman EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" #define YELL_AGGRO "Da shadow gonna fall on you... " #define SOUND_YELL_AGGRO 12041 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index e8eaee46895..6bb3c807441 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Aman EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" #include "GridNotifiers.h" enum eEnums diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp index fb1a996ea24..07766004f09 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Aman EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" #include "GridNotifiers.h" //Trash Waves diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index 47b55f4c4bb..c8f85a81a71 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -21,7 +21,7 @@ SDComment: EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" //Speech #define YELL_TRANSFORM_TO_LYNX "Let me introduce to you my new bruddahs: fang and claw!" diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/def_zulaman.h b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/def_zulaman.h deleted file mode 100644 index 6fb0ef173bd..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/def_zulaman.h +++ /dev/null @@ -1,19 +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_ZULAMAN_H -#define DEF_ZULAMAN_H - -#define DATA_NALORAKKEVENT 1 -#define DATA_AKILZONEVENT 2 -#define DATA_JANALAIEVENT 3 -#define DATA_HALAZZIEVENT 4 -#define DATA_HEXLORDEVENT 5 -#define DATA_ZULJINEVENT 6 -#define DATA_CHESTLOOTED 7 -#define TYPE_RAND_VENDOR_1 8 -#define TYPE_RAND_VENDOR_2 9 - -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp index c12d3117949..0ab398e0ef4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Aman EndScriptData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" #define MAX_ENCOUNTER 6 #define RAND_VENDOR 2 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp index 83237e13d54..3f198d1ab59 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp @@ -26,7 +26,7 @@ npc_forest_frog EndContentData */ #include "precompiled.h" -#include "def_zulaman.h" +#include "zulaman.h" /*###### ## npc_forest_frog diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.h b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.h new file mode 100644 index 00000000000..6fb0ef173bd --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.h @@ -0,0 +1,19 @@ +/* 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_ZULAMAN_H +#define DEF_ZULAMAN_H + +#define DATA_NALORAKKEVENT 1 +#define DATA_AKILZONEVENT 2 +#define DATA_JANALAIEVENT 3 +#define DATA_HALAZZIEVENT 4 +#define DATA_HEXLORDEVENT 5 +#define DATA_ZULJINEVENT 6 +#define DATA_CHESTLOOTED 7 +#define TYPE_RAND_VENDOR_1 8 +#define TYPE_RAND_VENDOR_2 9 + +#endif + diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index 5244e5d3538..fa51899be22 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" bool GOHello_go_gong_of_bethekk(Player* pPlayer, GameObject* pGo) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp index 6475f7ab4e5..eb46bb9bcd1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SPELL_AVARTAR 24646 //The Enrage Spell #define SPELL_GROUNDTREMOR 6524 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp index be73374aafc..f3c13643036 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309020 #define SAY_FLEEING -1309021 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp index 9875dc642da..f6c3773e3cd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SPELL_MANABURN 26046 #define SPELL_SLEEP 24664 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp index 27d9fc56443..0ac6e2f54c1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309002 #define SAY_RAIN_FIRE -1309003 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp index 3fa3090abdb..b09d431f947 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309014 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index c6792f82451..42f0cca638e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309015 #define SAY_DING_KILL -1309016 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp index ef29657f559..7c9714ff461 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309005 #define SAY_TRANSFORM -1309006 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index bc6be61e253..862f6181b8c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SPELL_AMBUSH 24337 #define SPELL_THOUSANDBLADES 24649 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp index a0693a0cdc4..e182ee094d1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_AGGRO -1309009 #define SAY_DEATH -1309010 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp index 4eb7b649a88..53248c28357 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SAY_TRANSFORM -1309000 #define SAY_DEATH -1309001 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp index 4ba494a2b0a..8ef4a7a69ff 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" #define SPELL_LIGHTNINGCLOUD 25033 #define SPELL_LIGHTNINGWAVE 24819 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h deleted file mode 100644 index bf55a54c1d5..00000000000 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h +++ /dev/null @@ -1,28 +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_ZULGURUB_H -#define DEF_ZULGURUB_H - -enum eTypes -{ - MAX_ENCOUNTERS = 8, - - TYPE_ARLOKK = 1, - TYPE_JEKLIK = 2, - TYPE_VENOXIS = 3, - TYPE_MARLI = 4, - TYPE_OHGAN = 5, - TYPE_THEKAL = 6, - TYPE_ZATH = 7, - TYPE_LORKHAN = 8, - - DATA_JINDO = 10, - DATA_LORKHAN = 11, - DATA_THEKAL = 12, - DATA_ZATH = 13 -}; - -#endif - diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp index 03b3e64c5e6..377c06b808a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp @@ -22,7 +22,7 @@ SDCategory: Zul'Gurub EndScriptData */ #include "precompiled.h" -#include "def_zulgurub.h" +#include "zulgurub.h" struct TRINITY_DLL_DECL instance_zulgurub : public ScriptedInstance { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/zulgurub.h b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/zulgurub.h new file mode 100644 index 00000000000..bf55a54c1d5 --- /dev/null +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/zulgurub.h @@ -0,0 +1,28 @@ +/* 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_ZULGURUB_H +#define DEF_ZULGURUB_H + +enum eTypes +{ + MAX_ENCOUNTERS = 8, + + TYPE_ARLOKK = 1, + TYPE_JEKLIK = 2, + TYPE_VENOXIS = 3, + TYPE_MARLI = 4, + TYPE_OHGAN = 5, + TYPE_THEKAL = 6, + TYPE_ZATH = 7, + TYPE_LORKHAN = 8, + + DATA_JINDO = 10, + DATA_LORKHAN = 11, + DATA_THEKAL = 12, + DATA_ZATH = 13 +}; + +#endif + -- cgit v1.2.3