Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripting: Misc clean up and a warning fix

Browse Source
This commit is contained in:
Malcrom
2013-01-07 21:47:38 -03:30
parent 6ba128b2b2
commit 0105bc849f
10 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
View File

@@ -25,7 +25,7 @@ enum Text
EMOTE_ONE_STACK = 0,
EMOTE_TEN_STACK = 1,
EMOTE_FREE_OF_BONDS = 2,
YELL_FREE_OF_BONDS = 3,
YELL_FREE_OF_BONDS = 3
};
enum Spells
@@ -37,14 +37,14 @@ enum Spells
SPELL_EMBERSEER_FULL_STRENGTH = 16047, // Emberseer Full Strength
SPELL_FIRENOVA = 23462, // Combat
SPELL_FLAMEBUFFET = 23341, // Combat
SPELL_PYROBLAST = 17274, // Combat
SPELL_PYROBLAST = 17274 // Combat
};
enum Events
{
EVENT_FIRENOVA = 1,
EVENT_FLAMEBUFFET = 2,
EVENT_PYROBLAST = 3,
EVENT_PYROBLAST = 3
};

4
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
View File

@@ -25,13 +25,13 @@ enum Spells
SPELL_SHOOT = 16496,
SPELL_STUNBOMB = 16497,
SPELL_HEALING_POTION = 15504,
SPELL_HOOKEDNET = 15609,
SPELL_HOOKEDNET = 15609
};
enum Events
{
EVENT_SHOOT = 1,
EVENT_STUN_BOMB = 2,
EVENT_STUN_BOMB = 2
};
class quartermaster_zigris : public CreatureScript

6
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
View File

@@ -88,12 +88,12 @@ enum PrinceMalchezaar
SPELL_CLEAVE = 30131, //Same as Nightbane.
SPELL_HELLFIRE = 30859, //Infenals' hellfire aura
NETHERSPITE_INFERNAL = 17646, //The netherspite infernal creature
MALCHEZARS_AXE = 17650, //Malchezar's axes (creatures), summoned during phase 3
MALCHEZARS_AXE = 17650, //Malchezar's axes (creatures), summoned during phase 3
INFERNAL_MODEL_INVISIBLE = 11686, //Infernal Effects
INFERNAL_MODEL_INVISIBLE = 11686, //Infernal Effects
SPELL_INFERNAL_RELAY = 30834,
EQUIP_ID_AXE = 33542, //Axes info
EQUIP_ID_AXE = 33542 //Axes info
};
//---------Infernal code first

48
src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
View File

@@ -29,17 +29,17 @@ EndScriptData */
enum Texts
{
SAY_SUMMON_MAJ = 0,
SAY_ARRIVAL1_RAG = 1,
SAY_ARRIVAL2_MAJ = 2,
SAY_ARRIVAL3_RAG = 3,
SAY_ARRIVAL5_RAG = 4,
SAY_REINFORCEMENTS1 = 5,
SAY_REINFORCEMENTS2 = 6,
SAY_HAND = 7,
SAY_WRATH = 8,
SAY_KILL = 9,
SAY_MAGMABURST = 10
SAY_SUMMON_MAJ = 0,
SAY_ARRIVAL1_RAG = 1,
SAY_ARRIVAL2_MAJ = 2,
SAY_ARRIVAL3_RAG = 3,
SAY_ARRIVAL5_RAG = 4,
SAY_REINFORCEMENTS1 = 5,
SAY_REINFORCEMENTS2 = 6,
SAY_HAND = 7,
SAY_WRATH = 8,
SAY_KILL = 9,
SAY_MAGMABURST = 10
};
enum Spells
@@ -53,24 +53,24 @@ enum Spells
SPELL_RAGEMERGE = 20568,
SPELL_MELT_WEAPON = 21388,
SPELL_ELEMENTAL_FIRE = 20564,
SPELL_ERRUPTION = 17731,
SPELL_ERRUPTION = 17731
};
enum Events
{
EVENT_ERUPTION = 1,
EVENT_WRATH_OF_RAGNAROS = 2,
EVENT_HAND_OF_RAGNAROS = 3,
EVENT_LAVA_BURST = 4,
EVENT_ELEMENTAL_FIRE = 5,
EVENT_MAGMA_BLAST = 6,
EVENT_SUBMERGE = 7,
EVENT_ERUPTION = 1,
EVENT_WRATH_OF_RAGNAROS = 2,
EVENT_HAND_OF_RAGNAROS = 3,
EVENT_LAVA_BURST = 4,
EVENT_ELEMENTAL_FIRE = 5,
EVENT_MAGMA_BLAST = 6,
EVENT_SUBMERGE = 7,
EVENT_INTRO_1 = 8,
EVENT_INTRO_2 = 9,
EVENT_INTRO_3 = 10,
EVENT_INTRO_4 = 11,
EVENT_INTRO_5 = 12,
EVENT_INTRO_1 = 8,
EVENT_INTRO_2 = 9,
EVENT_INTRO_3 = 10,
EVENT_INTRO_4 = 11,
EVENT_INTRO_5 = 12
};
class boss_ragnaros : public CreatureScript

15
src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
View File

@@ -26,12 +26,15 @@ EndScriptData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#define SPELL_FROSTBOLT 21369
#define SPELL_ICEARMOR 18100 //This is actually a buff he gives himself
#define SPELL_FREEZE 18763
#define SPELL_FEAR 26070
#define SPELL_CHILLNOVA 18099
#define SPELL_FROSTVOLLEY 8398
enum Spells
{
SPELL_FROSTBOLT = 21369,
SPELL_ICEARMOR = 18100, // This is actually a buff he gives himself
SPELL_FREEZE = 18763,
SPELL_FEAR = 26070,
SPELL_CHILLNOVA = 18099,
SPELL_FROSTVOLLEY = 8398
};
class boss_boss_ras_frostwhisper : public CreatureScript
{

14
src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
View File

@@ -27,10 +27,16 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "stratholme.h"
#define SPELL_TRAMPLE 5568
#define SPELL_KNOCKOUT 17307
enum Spells
{
SPELL_TRAMPLE = 5568,
SPELL_KNOCKOUT = 17307
};
#define C_MINDLESS_UNDEAD 11030
enum CreatureId
{
NPC_MINDLESS_UNDEAD = 11030
};
class boss_ramstein_the_gorger : public CreatureScript
{
@@ -68,7 +74,7 @@ public:
{
for (uint8 i = 0; i < 30; ++i)
{
if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD, 3969.35f+irand(-10, 10), -3391.87f+irand(-10, 10), 119.11f, 5.91f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
if (Creature* mob = me->SummonCreature(NPC_MINDLESS_UNDEAD, 3969.35f+irand(-10, 10), -3391.87f+irand(-10, 10), 119.11f, 5.91f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000))
mob->AI()->AttackStart(me->SelectNearestTarget(100.0f));
}

12
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
View File

@@ -25,16 +25,16 @@ enum Spells
SPELL_FROST_ARMOR = 31256,
SPELL_DEATH_AND_DECAY = 31258,
SPELL_FROST_NOVA = 31250,
SPELL_ICEBOLT = 31249,
SPELL_ICEBOLT = 31249
};
enum Texts
{
SAY_ONDEATH = 0,
SAY_ONSLAY = 1,
SAY_DECAY = 2,
SAY_NOVA = 3,
SAY_ONAGGRO = 4,
SAY_ONDEATH = 0,
SAY_ONSLAY = 1,
SAY_DECAY = 2,
SAY_NOVA = 3,
SAY_ONAGGRO = 4
};
class boss_rage_winterchill : public CreatureScript

20
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
View File

@@ -26,7 +26,7 @@ enum Yells
SAY_AGGRO = 0,
SAY_SLAY = 1,
SAY_SPLIT = 2,
SAY_DEATH = 3,
SAY_DEATH = 3
};
enum Spells
@@ -79,20 +79,20 @@ class boss_skeram : public CreatureScript
void JustSummoned(Creature* creature)
{
// Shift the boss and images (Get it? *Shift*?)
uint8 Rand;
uint8 rand = 0;
if (_flag != 0)
{
while (_flag & (1 << Rand))
Rand = urand(0, 2);
DoCast(me, BlinkSpells[Rand]);
_flag |= (1 << Rand);
while (_flag & (1 << rand))
rand = urand(0, 2);
DoCast(me, BlinkSpells[rand]);
_flag |= (1 << rand);
_flag |= (1 << 7);
}
while (_flag & (1 << Rand))
Rand = urand(0, 2);
creature->CastSpell(creature, BlinkSpells[Rand]);
_flag |= (1 << Rand);
while (_flag & (1 << rand))
rand = urand(0, 2);
creature->CastSpell(creature, BlinkSpells[rand]);
_flag |= (1 << rand);
if (_flag & (1 << 7))
_flag = 0;

2
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
View File

@@ -57,7 +57,7 @@ enum Yells
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_FEED = 5,
SAY_VANISH = 6,
SAY_VANISH = 6
};
enum CombatPhase
{

12
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -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