From 609232dfbeb7940163bc00c4b6fa53d07afa47a8 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 Jan 2013 16:12:49 -0330 Subject: Core/Scripting: Move Text for Archavon the Stone Watcher to creature text --- src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index dc9665ae27b..33e0619c7e5 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -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 -- cgit v1.2.3 From 70977f30977316f14500561796b0276f40fcb1b6 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 Jan 2013 20:18:47 -0330 Subject: Core/Scripting: Misc fixes --- .../EasternKingdoms/ZulGurub/boss_renataki.cpp | 12 +++-- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 55 ++++++++++++---------- .../RubySanctum/boss_saviana_ragefire.cpp | 32 ++++++------- .../boss_shirrak_the_dead_watcher.cpp | 4 +- .../underbog/boss_the_black_stalker.cpp | 24 ++++++---- 5 files changed, 72 insertions(+), 55 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 87081b07e9d..d562b7cdf9b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -27,10 +27,16 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SPELL_AMBUSH 24337 -#define SPELL_THOUSANDBLADES 24649 +enum Spells +{ + SPELL_AMBUSH = 34794, + SPELL_THOUSANDBLADES = 34799 +}; -#define EQUIP_ID_MAIN_HAND 0 //was item display id 31818, but this id does not exist +enum Misc +{ + EQUIP_ID_MAIN_HAND = 0 //was item display id 31818, but this id does not exist +}; class boss_renataki : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 66160c03d9b..d623963e929 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -27,38 +27,43 @@ EndScriptData */ #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" #include "WorldPacket.h" - #include "Item.h" #include "Spell.h" -#define SPELL_HEAL_BROTHER 7393 -#define SPELL_TWIN_TELEPORT 800 // CTRA watches for this spell to start its teleport timer -#define SPELL_TWIN_TELEPORT_VISUAL 26638 // visual - -#define SPELL_EXPLODEBUG 804 -#define SPELL_MUTATE_BUG 802 - -#define SOUND_VN_DEATH 8660 //8660 - Death - Feel -#define SOUND_VN_AGGRO 8661 //8661 - Aggro - Let none -#define SOUND_VN_KILL 8662 //8661 - Kill - your fate - -#define SOUND_VL_AGGRO 8657 //8657 - Aggro - To Late -#define SOUND_VL_KILL 8658 //8658 - Kill - You will not -#define SOUND_VL_DEATH 8659 //8659 - Death +enum Spells +{ + SPELL_HEAL_BROTHER = 7393, + SPELL_TWIN_TELEPORT = 800, // CTRA watches for this spell to start its teleport timer + SPELL_TWIN_TELEPORT_VISUAL = 26638, // visual + SPELL_EXPLODEBUG = 804, + SPELL_MUTATE_BUG = 802, + SPELL_BERSERK = 26662, + SPELL_UPPERCUT = 26007, + SPELL_UNBALANCING_STRIKE = 26613, + SPELL_SHADOWBOLT = 26006, + SPELL_BLIZZARD = 26607, + SPELL_ARCANEBURST = 568, +}; -#define PULL_RANGE 50 -#define ABUSE_BUG_RANGE 20 -#define SPELL_BERSERK 26662 -#define TELEPORTTIME 30000 +enum Sound +{ + SOUND_VL_AGGRO = 8657, //8657 - Aggro - To Late + SOUND_VL_KILL = 8658, //8658 - Kill - You will not + SOUND_VL_DEATH = 8659, //8659 - Death + SOUND_VN_DEATH = 8660, //8660 - Death - Feel + SOUND_VN_AGGRO = 8661, //8661 - Aggro - Let none + SOUND_VN_KILL = 8662, //8661 - Kill - your fate +}; -#define SPELL_UPPERCUT 26007 -#define SPELL_UNBALANCING_STRIKE 26613 +enum Misc +{ + PULL_RANGE = 50, + ABUSE_BUG_RANGE = 20, + VEKLOR_DIST = 20, // VL will not come to melee when attacking + TELEPORTTIME = 30000 +}; -#define VEKLOR_DIST 20 // VL will not come to melee when attacking -#define SPELL_SHADOWBOLT 26006 -#define SPELL_BLIZZARD 26607 -#define SPELL_ARCANEBURST 568 struct boss_twinemperorsAI : public ScriptedAI { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 463a1a6c2e3..06743858ec0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -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}; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 8bb97fbe387..edaff280937 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) #define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual -enum Emote +enum Say { EMOTE_FOCUSE = 0 }; @@ -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); + Talk(EMOTE_FOCUSE, FocusedTargetGUID); } FocusFire_Timer = 15000+(rand()%5000); } else FocusFire_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index c7f378ce2fe..1e8fd8b2676 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -26,15 +26,21 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_LEVITATE 31704 -#define SPELL_SUSPENSION 31719 -#define SPELL_LEVITATION_PULSE 31701 -#define SPELL_MAGNETIC_PULL 31705 -#define SPELL_CHAIN_LIGHTNING 31717 -#define SPELL_STATIC_CHARGE 31715 -#define SPELL_SUMMON_SPORE_STRIDER 38755 - -#define ENTRY_SPORE_STRIDER 22299 +enum Spells +{ + SPELL_LEVITATE = 31704, + SPELL_SUSPENSION = 31719, + SPELL_LEVITATION_PULSE = 31701, + SPELL_MAGNETIC_PULL = 31705, + SPELL_CHAIN_LIGHTNING = 31717, + SPELL_STATIC_CHARGE = 31715, + SPELL_SUMMON_SPORE_STRIDER = 38755 +}; + +enum CreatureIdS +{ + ENTRY_SPORE_STRIDER = 22299 +}; class boss_the_black_stalker : public CreatureScript { -- cgit v1.2.3 From 0105bc849fd062d2a8a8110e6c3cfefb70da0e16 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Mon, 7 Jan 2013 21:47:38 -0330 Subject: Core/Scripting: Misc clean up and a warning fix --- .../BlackrockSpire/boss_pyroguard_emberseer.cpp | 6 +-- .../BlackrockSpire/boss_quartermaster_zigris.cpp | 4 +- .../Karazhan/boss_prince_malchezaar.cpp | 6 +-- .../EasternKingdoms/MoltenCore/boss_ragnaros.cpp | 50 +++++++++++----------- .../Scholomance/boss_ras_frostwhisper.cpp | 15 ++++--- .../Stratholme/boss_ramstein_the_gorger.cpp | 14 ++++-- .../BattleForMountHyjal/boss_rage_winterchill.cpp | 12 +++--- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 20 ++++----- .../AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 2 +- .../IcecrownCitadel/boss_professor_putricide.cpp | 12 +++--- 10 files changed, 75 insertions(+), 66 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp index be20e3d7dac..047ad3f7096 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -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 }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp index 94764c94dcf..2f86c009d56 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -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 diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 8fb86183428..3a026d23faa 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -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 diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index a8d54f5f186..eecd9ae65f4 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -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_INTRO_1 = 8, - EVENT_INTRO_2 = 9, - EVENT_INTRO_3 = 10, - EVENT_INTRO_4 = 11, - EVENT_INTRO_5 = 12, + 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 }; class boss_ragnaros : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 40e0d3630d3..99f01ee96c3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -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 { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 2af6a4d0f93..6d83093d13c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -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)); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 2dfa62f36a1..84ef05779ee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -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 diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index d5d36722618..1186459218c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -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; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 0208edebef5..8f77cc7ec6f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -57,7 +57,7 @@ enum Yells SAY_SLAY = 3, SAY_DEATH = 4, SAY_FEED = 5, - SAY_VANISH = 6, + SAY_VANISH = 6 }; enum CombatPhase { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 95830916abd..05bf7b9794a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -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 -- cgit v1.2.3