Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripting: Some cleanup

Browse Source
This commit is contained in:
Malcrom
2013-01-07 22:48:40 -03:30
parent 2a9fc5198b
commit 43d73bebd0
8 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
View File

@@ -25,7 +25,7 @@ enum Spells
SPELL_BLASTWAVE = 11130,
SPELL_SHOUT = 23511,
SPELL_CLEAVE = 20691,
SPELL_KNOCKAWAY = 20686,
SPELL_KNOCKAWAY = 20686
};
enum Events
@@ -33,14 +33,13 @@ enum Events
EVENT_BLAST_WAVE = 1,
EVENT_SHOUT = 2,
EVENT_CLEAVE = 3,
EVENT_KNOCK_AWAY = 4,
EVENT_KNOCK_AWAY = 4
};
enum Adds
{
NPC_SPIRESTONE_WARLORD = 9216,
NPC_SMOLDERTHORN_BERSERKER = 9268,
NPC_SMOLDERTHORN_BERSERKER = 9268
};
const Position SummonLocation1 = { -39.355f, -513.456f, 88.472f, 4.679f };

11
src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
View File

@@ -27,10 +27,13 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "stratholme.h"
#define SPELL_ENCASINGWEBS 4962
#define SPELL_PIERCEARMOR 6016
#define SPELL_CRYPT_SCARABS 31602
#define SPELL_RAISEUNDEADSCARAB 17235
enum Spells
{
SPELL_ENCASINGWEBS = 4962,
SPELL_PIERCEARMOR = 6016,
SPELL_CRYPT_SCARABS = 31602,
SPELL_RAISEUNDEADSCARAB = 17235
};
class boss_nerubenkan : public CreatureScript
{

23
src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
View File

@@ -35,15 +35,22 @@ EndScriptData */
# Once Aurius is defeated, he should be the one summoning the ghosts.
#####*/
#define SH_GREGOR 17910
#define SH_CATHELA 17911
#define SH_NEMAS 17912
#define SH_AELMAR 17913
#define SH_VICAR 17914
#define SH_QUEST_CREDIT 17915
enum CreatureIds
{
SH_GREGOR = 17910,
SH_CATHELA = 17911,
SH_NEMAS = 17912,
SH_AELMAR = 17913,
SH_VICAR = 17914,
SH_QUEST_CREDIT = 17915
};
enum Spells
{
SPELL_HOLY_LIGHT = 25263,
SPELL_DIVINE_SHIELD = 13874
};
#define SPELL_HOLY_LIGHT 25263
#define SPELL_DIVINE_SHIELD 13874
class boss_silver_hand_bosses : public CreatureScript
{
public:

4
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
View File

@@ -42,7 +42,7 @@ enum Yells
SAY_PHASE_3_TRANS = 3,
// Emote
EMOTE_BREATH = 4,
EMOTE_BREATH = 4
};
enum Spells
@@ -72,7 +72,7 @@ enum Spells
//SPELL_BREATH = 21131, // 8x in "array", different initial cast than the other arrays
// Phase 3 spells
SPELL_BELLOWING_ROAR = 18431,
SPELL_BELLOWING_ROAR = 18431
};
struct OnyxMove

6
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
View File

@@ -29,7 +29,7 @@ enum Texts
SAY_INTRO = 1,
SAY_AGGRO = 2,
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_DEATH = 4
};
enum Spells
@@ -40,12 +40,12 @@ enum Spells
SPELL_SUPREME = 25176,
SPELL_SUMMON = 20477,
SPELL_SAND_STORM = 25160,
SPELL_SUMMON_CRYSTAL = 25192,
SPELL_SUMMON_CRYSTAL = 25192
};
enum Actions
{
ACTION_TRIGGER_WEAKNESS = 1,
ACTION_TRIGGER_WEAKNESS = 1
};
enum Events

14
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
View File

@@ -27,12 +27,14 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "temple_of_ahnqiraj.h"
#define SPELL_SWEEP 26103
#define SPELL_SANDBLAST 26102
#define SPELL_GROUND_RUPTURE 26100
#define SPELL_BIRTH 26262 //The Birth Animation
#define SPELL_DIRTMOUND_PASSIVE 26092
enum Spells
{
SPELL_SWEEP = 26103,
SPELL_SANDBLAST = 26102,
SPELL_GROUND_RUPTURE = 26100,
SPELL_BIRTH = 26262, // The Birth Animation
SPELL_DIRTMOUND_PASSIVE = 26092
};
class boss_ouro : public CreatureScript
{

4
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
View File

@@ -42,7 +42,7 @@ EndScriptData */
enum Say
{
EMOTE_FOCUSE = 0
EMOTE_FOCUSED = 0
};
class boss_shirrak_the_dead_watcher : public CreatureScript
@@ -146,7 +146,7 @@ public:
{
FocusedTargetGUID = target->GetGUID();
me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500);
Talk(EMOTE_FOCUSE, FocusedTargetGUID);
Talk(EMOTE_FOCUSED, FocusedTargetGUID);
}
FocusFire_Timer = 15000+(rand()%5000);
} else FocusFire_Timer -= diff;

28
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
View File

@@ -29,24 +29,24 @@ EndScriptData */
enum eSays
{
SAY_AGGRO = 0,
SAY_SUMMON = 1,
SAY_CURSE = 2,
SAY_KILL_1 = 3,
SAY_DIE = 4,
SAY_WIPE = 5,
SAY_AGGRO = 0,
SAY_SUMMON = 1,
SAY_CURSE = 2,
SAY_KILL_1 = 3,
SAY_DIE = 4,
SAY_WIPE = 5
};
enum eSpells
{
SPELL_ORBITAL_STRIKE = 30637,
SPELL_SHADOW_WHIP = 30638,
SPELL_TREACHEROUS_AURA = 30695,
H_SPELL_BANE_OF_TREACHERY = 37566,
SPELL_DEMONIC_SHIELD = 31901,
SPELL_SHADOW_BOLT = 30686,
H_SPELL_SHADOW_BOLT = 39297,
SPELL_SUMMON_FIENDISH_HOUND= 30707,
SPELL_ORBITAL_STRIKE = 30637,
SPELL_SHADOW_WHIP = 30638,
SPELL_TREACHEROUS_AURA = 30695,
H_SPELL_BANE_OF_TREACHERY = 37566,
SPELL_DEMONIC_SHIELD = 31901,
SPELL_SHADOW_BOLT = 30686,
H_SPELL_SHADOW_BOLT = 39297,
SPELL_SUMMON_FIENDISH_HOUND = 30707
};
class boss_omor_the_unscarred : public CreatureScript