Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

This commit is contained in:
Vincent_Michael committed 2013-01-08 16:28:37 +01:00
commit d36d2eac76
72 files changed
+1887 -1391

No files matched your search

@@ -57,7 +57,7 @@ enum Yells
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_FEED = 5,
SAY_VANISH = 6,
SAY_VANISH = 6
};
enum CombatPhase
{
@@ -21,10 +21,10 @@
enum Texts
{
SAY_AGGRO = 0, // You will sssuffer for this intrusion! (17528)
SAY_CONFLAGRATION = 1, // Burn in the master's flame! (17532)
EMOTE_ENRAGED = 2, // %s becomes enraged!
SAY_KILL = 3, // Halion will be pleased. (17530) - As it should be.... (17529)
SAY_AGGRO = 0, // You will sssuffer for this intrusion! (17528)
SAY_CONFLAGRATION = 1, // Burn in the master's flame! (17532)
EMOTE_ENRAGED = 2, // %s becomes enraged!
SAY_KILL = 3, // Halion will be pleased. (17530) - As it should be.... (17529)
};
enum Spells
@@ -38,28 +38,28 @@ enum Spells
enum Events
{
EVENT_ENRAGE = 1,
EVENT_FLIGHT = 2,
EVENT_FLAME_BREATH = 3,
EVENT_CONFLAGRATION = 4,
EVENT_LAND_GROUND = 5,
EVENT_AIR_MOVEMENT = 6,
EVENT_ENRAGE = 1,
EVENT_FLIGHT = 2,
EVENT_FLAME_BREATH = 3,
EVENT_CONFLAGRATION = 4,
EVENT_LAND_GROUND = 5,
EVENT_AIR_MOVEMENT = 6,
// Event group
EVENT_GROUP_LAND_PHASE = 1,
EVENT_GROUP_LAND_PHASE = 1,
};
enum MovementPoints
{
POINT_FLIGHT = 1,
POINT_LAND = 2,
POINT_TAKEOFF = 3,
POINT_LAND_GROUND = 4
POINT_FLIGHT = 1,
POINT_LAND = 2,
POINT_TAKEOFF = 3,
POINT_LAND_GROUND = 4
};
enum Misc
{
SOUND_ID_DEATH = 17531,
SOUND_ID_DEATH = 17531,
};
Position const SavianaRagefireFlyOutPos = {3155.51f, 683.844f, 95.0f, 4.69f};
@@ -25,7 +25,7 @@
#include "Vehicle.h"
#include "GridNotifiers.h"
enum ScriptTexts
enum Say
{
// Festergut
SAY_FESTERGUT_GASEOUS_BLIGHT = 0,
@@ -45,7 +45,7 @@ enum ScriptTexts
EMOTE_CHOKING_GAS_BOMB = 10,
SAY_KILL = 11,
SAY_BERSERK = 12,
SAY_DEATH = 13,
SAY_DEATH = 13
};
enum Spells
@@ -135,7 +135,7 @@ enum Events
EVENT_CHOKING_GAS_BOMB = 12,
EVENT_UNBOUND_PLAGUE = 13,
EVENT_MUTATED_PLAGUE = 14,
EVENT_PHASE_TRANSITION = 15,
EVENT_PHASE_TRANSITION = 15
};
enum Phases
@@ -148,14 +148,14 @@ enum Phases
PHASE_COMBAT_3 = 6,
PHASE_MASK_COMBAT = (1 << PHASE_COMBAT_1) | (1 << PHASE_COMBAT_2) | (1 << PHASE_COMBAT_3),
PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE),
PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE)
};
enum Points
{
POINT_FESTERGUT = 366260,
POINT_ROTFACE = 366270,
POINT_TABLE = 366780,
POINT_TABLE = 366780
};
Position const festergutWatchPos = {4324.820f, 3166.03f, 389.3831f, 3.316126f}; //emote 432 (release gas)
@@ -169,7 +169,7 @@ enum PutricideData
{
DATA_EXPERIMENT_STAGE = 1,
DATA_PHASE = 2,
DATA_ABOMINATION = 3,
DATA_ABOMINATION = 3
};
#define EXPERIMENT_STATE_OOZE false
@@ -21,7 +21,8 @@
enum
{
EMOTE_BERSERK = 0
EMOTE_BERSERK = 0,
EMOTE_LEAP = 1 // Not in use
};
//Spells Archavon
@@ -38,9 +39,6 @@ enum
//4 Warders spawned
#define ARCHAVON_WARDER 32353 //npc 32353
//Yell
#define SAY_LEAP "Archavon the Stone Watcher lunges for $N!" //$N should be the target
enum Events
{
// Archavon