yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128 from Grimfeather/quest---Into-the-Breach

Browse Source 
Quest/Event - Into the Breach
This commit is contained in:
Grimfeather
2025-06-02 01:08:18 +02:00
committed by GitHub
parent 8769f030a9 b2219c0e24
commit 1d9702f7d8
6 changed files with 409 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/world/base/adjustment_auras.sql
View File

@@ -1,5 +1,5 @@
SET @IPPPHASE := 65536;
SET @IPPPHASE_AQ := 131072;
SET @IPPPHASE_II := 131072;
DELETE FROM `spell_dbc` WHERE `ID` IN (89501, 89505, 89507, 89509, 89511);
@@ -14,4 +14,4 @@ INSERT INTO spell_dbc (`ID`,`Category`,`DispelType`,`Mechanic`,`Attributes`,`Att
INSERT INTO spell_dbc (`ID`,`Category`,`DispelType`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`ShapeshiftMask`,`unk_320_2`,`ShapeshiftExclude`,`unk_320_3`,`Targets`,`TargetCreatureType`,`RequiresSpellFocus`,`FacingCasterFlags`,`CasterAuraState`,`TargetAuraState`,`ExcludeCasterAuraState`,`ExcludeTargetAuraState`,`CasterAuraSpell`,`TargetAuraSpell`,`ExcludeCasterAuraSpell`,`ExcludeTargetAuraSpell`,`CastingTimeIndex`,`RecoveryTime`,`CategoryRecoveryTime`,`InterruptFlags`,`AuraInterruptFlags`,`ChannelInterruptFlags`,`ProcTypeMask`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`PowerType`,`ManaCost`,`ManaCostPerLevel`,`ManaPerSecond`,`ManaPerSecondPerLevel`,`RangeIndex`,`Speed`,`ModalNextSpell`,`CumulativeAura`,`Totem_1`,`Totem_2`,`Reagent_1`,`Reagent_2`,`Reagent_3`,`Reagent_4`,`Reagent_5`,`Reagent_6`,`Reagent_7`,`Reagent_8`,`ReagentCount_1`,`ReagentCount_2`,`ReagentCount_3`,`ReagentCount_4`,`ReagentCount_5`,`ReagentCount_6`,`ReagentCount_7`,`ReagentCount_8`,`EquippedItemClass`,`EquippedItemSubclass`,`EquippedItemInvTypes`,`Effect_1`,`Effect_2`,`Effect_3`,`EffectDieSides_1`,`EffectDieSides_2`,`EffectDieSides_3`,`EffectRealPointsPerLevel_1`,`EffectRealPointsPerLevel_2`,`EffectRealPointsPerLevel_3`,`EffectBasePoints_1`,`EffectBasePoints_2`,`EffectBasePoints_3`,`EffectMechanic_1`,`EffectMechanic_2`,`EffectMechanic_3`,`ImplicitTargetA_1`,`ImplicitTargetA_2`,`ImplicitTargetA_3`,`ImplicitTargetB_1`,`ImplicitTargetB_2`,`ImplicitTargetB_3`,`EffectRadiusIndex_1`,`EffectRadiusIndex_2`,`EffectRadiusIndex_3`,`EffectAura_1`,`EffectAura_2`,`EffectAura_3`,`EffectAuraPeriod_1`,`EffectAuraPeriod_2`,`EffectAuraPeriod_3`,`EffectMultipleValue_1`,`EffectMultipleValue_2`,`EffectMultipleValue_3`,`EffectChainTargets_1`,`EffectChainTargets_2`,`EffectChainTargets_3`,`EffectItemType_1`,`EffectItemType_2`,`EffectItemType_3`,`EffectMiscValue_1`,`EffectMiscValue_2`,`EffectMiscValue_3`,`EffectMiscValueB_1`,`EffectMiscValueB_2`,`EffectMiscValueB_3`,`EffectTriggerSpell_1`,`EffectTriggerSpell_2`,`EffectTriggerSpell_3`,`EffectPointsPerCombo_1`,`EffectPointsPerCombo_2`,`EffectPointsPerCombo_3`,`EffectSpellClassMaskA_1`,`EffectSpellClassMaskA_2`,`EffectSpellClassMaskA_3`,`EffectSpellClassMaskB_1`,`EffectSpellClassMaskB_2`,`EffectSpellClassMaskB_3`,`EffectSpellClassMaskC_1`,`EffectSpellClassMaskC_2`,`EffectSpellClassMaskC_3`,`SpellVisualID_1`,`SpellVisualID_2`,`SpellIconID`,`ActiveIconID`,`SpellPriority`,`Name_Lang_enUS`,`Name_Lang_enGB`,`Name_Lang_koKR`,`Name_Lang_frFR`,`Name_Lang_deDE`,`Name_Lang_enCN`,`Name_Lang_zhCN`,`Name_Lang_enTW`,`Name_Lang_zhTW`,`Name_Lang_esES`,`Name_Lang_esMX`,`Name_Lang_ruRU`,`Name_Lang_ptPT`,`Name_Lang_ptBR`,`Name_Lang_itIT`,`Name_Lang_Unk`,`Name_Lang_Mask`,`NameSubtext_Lang_enUS`,`NameSubtext_Lang_enGB`,`NameSubtext_Lang_koKR`,`NameSubtext_Lang_frFR`,`NameSubtext_Lang_deDE`,`NameSubtext_Lang_enCN`,`NameSubtext_Lang_zhCN`,`NameSubtext_Lang_enTW`,`NameSubtext_Lang_zhTW`,`NameSubtext_Lang_esES`,`NameSubtext_Lang_esMX`,`NameSubtext_Lang_ruRU`,`NameSubtext_Lang_ptPT`,`NameSubtext_Lang_ptBR`,`NameSubtext_Lang_itIT`,`NameSubtext_Lang_Unk`,`NameSubtext_Lang_Mask`,`Description_Lang_enUS`,`Description_Lang_enGB`,`Description_Lang_koKR`,`Description_Lang_frFR`,`Description_Lang_deDE`,`Description_Lang_enCN`,`Description_Lang_zhCN`,`Description_Lang_enTW`,`Description_Lang_zhTW`,`Description_Lang_esES`,`Description_Lang_esMX`,`Description_Lang_ruRU`,`Description_Lang_ptPT`,`Description_Lang_ptBR`,`Description_Lang_itIT`,`Description_Lang_Unk`,`Description_Lang_Mask`,`AuraDescription_Lang_enUS`,`AuraDescription_Lang_enGB`,`AuraDescription_Lang_koKR`,`AuraDescription_Lang_frFR`,`AuraDescription_Lang_deDE`,`AuraDescription_Lang_enCN`,`AuraDescription_Lang_zhCN`,`AuraDescription_Lang_enTW`,`AuraDescription_Lang_zhTW`,`AuraDescription_Lang_esES`,`AuraDescription_Lang_esMX`,`AuraDescription_Lang_ruRU`,`AuraDescription_Lang_ptPT`,`AuraDescription_Lang_ptBR`,`AuraDescription_Lang_itIT`,`AuraDescription_Lang_Unk`,`AuraDescription_Lang_Mask`,`ManaCostPct`,`StartRecoveryCategory`,`StartRecoveryTime`,`MaxTargetLevel`,`SpellClassSet`,`SpellClassMask_1`,`SpellClassMask_2`,`SpellClassMask_3`,`MaxTargets`,`DefenseType`,`PreventionType`,`StanceBarOrder`,`EffectChainAmplitude_1`,`EffectChainAmplitude_2`,`EffectChainAmplitude_3`,`MinFactionID`,`MinReputation`,`RequiredAuraVision`,`RequiredTotemCategoryID_1`,`RequiredTotemCategoryID_2`,`RequiredAreasID`,`SchoolMask`,`RuneCostID`,`SpellMissileID`,`PowerDisplayID`,`EffectBonusMultiplier_1`,`EffectBonusMultiplier_2`,`EffectBonusMultiplier_3`,`SpellDescriptionVariableID`,`SpellDifficultyID`) VALUES
(89509,0,0,0,2843738496,3072,16385,1048576,128,393224,4096,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,21,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,0,1,0,0,0,0,0,-1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,@IPPPHASE + 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,0,0,'Phase Shift: IPP','','','','','','','','','','','','','','','',16712190,'','','','','','','','','','','','','','','','',16712172,'','','','','','','','','','','','','','','','',16712188,'','','','','','','','','','','','','','','','',16712188,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
(89511,0,0,0,2843738496,3072,16385,1048576,128,393224,4096,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,21,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,0,1,0,0,0,0,0,-1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,@IPPPHASE_AQ + 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,0,0,'Phase Shift: IPP','','','','','','','','','','','','','','','',16712190,'','','','','','','','','','','','','','','','',16712172,'','','','','','','','','','','','','','','','',16712188,'','','','','','','','','','','','','','','','',16712188,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0);
(89511,0,0,0,2843738496,3072,16385,1048576,128,393224,4096,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,21,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,0,1,0,0,0,0,0,-1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,@IPPPHASE_II + 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,0,0,'Phase Shift: IPP','','','','','','','','','','','','','','','',16712190,'','','','','','','','','','','','','','','','',16712172,'','','','','','','','','','','','','','','','',16712188,'','','','','','','','','','','','','','','','',16712188,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0);

4
sql/world/base/ipp_aware_npcs.sql
View File

@@ -1,5 +1,5 @@
SET @IPPPHASE := 65536; -- this method of phasing is useful for aggressive creatures
SET @IPPPHASE_AQ := 131072;
SET @IPPPHASE_II := 131072;
UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (16841, 19254, 16840,
20026, 20027, 20053, 20054, 20069, 18542, 20080, 20081, 20082, 21643, 20130,
@@ -16,7 +16,7 @@ UPDATE `creature` SET `ScriptName` = 'npc_ipp_preaq' WHERE `id1` = 15184 AND `gu
-- Phasing NPCs until after the outdoors AQ war has been completed
UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_aq' WHERE `entry` IN (15498, 15499, 15500, 15540, 16091); -- Cenarion Hold
UPDATE `creature` SET `phaseMask` = @IPPPHASE_AQ WHERE `id1` IN (15612, 15613, 15615, 15616, 15617, 17070, 17079, 17766, -- Orgrimmar Legion Post
UPDATE `creature` SET `phaseMask` = @IPPPHASE_II WHERE `id1` IN (15612, 15613, 15615, 15616, 15617, 17070, 17079, 17766, -- Orgrimmar Legion Post
15440, 15441, 15442, 15443, 15444, 15903, 17068, 17080, 17765); -- Ironforge Brigade post
-- Phasing Wanted Poster Deathclasp
UPDATE `gameobject_template` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `entry` IN (180448);

298
sql/world/base/zone_blasted_lands.sql
View File

@@ -3,8 +3,9 @@ UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 5981;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 5981;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(5981, 0, 0, 0, 9, 0, 100, 0, 1000, 3200, 2800, 5200, 0, 10, 11, 15453, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Portal Seeker - In combat - Cast Arcane Explosion'),
(5981, 0, 1, 0, 0, 0, 100, 0, 0, 1000, 3000, 4000, 0, 0, 11, 16799, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Portal Seeker - In Combat - Cast Frostbolt');
(5981, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6059810, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Portal Seeker - On Respawn - Waypoint Start'),
(5981, 0, 1, 0, 9, 0, 100, 0, 1000, 3200, 2800, 5200, 0, 10, 11, 15453, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Portal Seeker - In combat - Cast Arcane Explosion'),
(5981, 0, 2, 0, 0, 0, 100, 0, 0, 1000, 3000, 4000, 0, 0, 11, 16799, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Portal Seeker - In Combat - Cast Frostbolt');
DELETE FROM `creature` WHERE `guid` = 605981;
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`,
@@ -31,3 +32,296 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
(6059810, 12, -11396.9, -2926.05, 3.04129, NULL, 0, 0, 0, 100, 0),
(6059810, 13, -11370.7, -2855.8, 4.71995, NULL, 0, 0, 0, 100, 0),
(6059810, 14, -11358.6, -2796.98, 5.47431, NULL, 0, 0, 0, 100, 0);
-- Quest: Into the Breach
SET @CGUID := 640000;
SET @IPPPHASE_II := 131072;
REPLACE INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`,
`spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES
(@CGUID, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11871, -3218.74, -14.8771, 0.159796, 120, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL), -- Invading Voidwalker
(@CGUID+1, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11874.4, -3190.96, -14.9067, 6.21522, 120, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+2, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11863.4, -3193.57, -23.0898, 0.113359, 120, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+3, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11861.4, -3213.53, -22.4019, 0.108753, 120, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+4, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11903.3, -3210.05, -14.8145, 0.126833, 30, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+5, 19287, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11903.8, -3206.12, -14.8229, 0.134687, 30, 0, 0, 3297, 2434, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+6, 19288, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11891.6, -3206.74, -14.7911, 0.133866, 1800, 0, 0, 88440, 13100, 0, 0, 0, 0, '', NULL, 0, NULL), -- Dreadknight, Melgromm
(@CGUID+7, 19288, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11897.1, -3211.45, -14.6568, 0.0835547, 1200, 0, 0, 88440, 13100, 0, 0, 0, 0, '', NULL, 0, NULL), -- Dreadknight, Raynor
(@CGUID+8, 19288, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11897.6, -3202.01, -14.651, 0.0796277, 900, 0, 0, 88440, 13100, 0, 0, 0, 0, '', NULL, 0, NULL), -- Dreadknight, Justinius
--
(@CGUID+9, 19391, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11902.3, -3207.61, -14.7973, 0.122027, 180, 0, 0, 15260, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Felguard Lieutenant
--
(@CGUID+10, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11904.2, -3206.61, -14.8357, 0.157618, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Invading Felguard
(@CGUID+11, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11903.9, -3209.76, -14.8296, 0.14191, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+12, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11902.3, -3212.55, -14.7525, 0.137533, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+13, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11903.4, -3202.8, -14.3541, 0.184657, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+14, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11902.3, -3207.49, -14.7963, 0.121825, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+15, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11887.9, -3210.06, -15.0765, 0.137536, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+16, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11888.8, -3202.12, -14.901, 0.0833477, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+17, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11888, -3205.81, -15.2381, 0.0990557, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+18, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11904.6, -3203.73, -14.8507, 0.126202, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+19, 19284, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11903.5, -3212.87, -14.748, 0.149764, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
--
(@CGUID+20, 19286, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11902.9, -3211.64, -14.7827, 0.134731, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Invading Fel Stalker
(@CGUID+21, 19286, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11902.9, -3208.03, -14.8118, 0.103315, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+22, 19286, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11903.5, -3204.3, -14.819, 0.115096, 30, 0, 0, 4121, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+23, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11895.1, -3203.58, -14.592, 0.0885828, 1800, 0, 0, 4594, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Portal Hound
(@CGUID+24, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11894.5, -3209.87, -14.6023, 0.119999, 1800, 0, 0, 4594, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+25, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11900.6, -3208.54, -14.7589, 0.116072, 1200, 0, 0, 4455, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+26, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11900.4, -3213.68, -14.2425, 0.139634, 1200, 0, 0, 4455, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+27, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11901.7, -3199.99, -14.2882, 0.0964368, 900, 0, 0, 4594, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+28, 19311, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11901.2, -3205.42, -14.7608, 0.152985, 900, 0, 0, 4594, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+29, 19285, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11888.2, -3215.89, -14.2359, 0.17849, 300, 0, 0, 3237, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Invading Infernal
(@CGUID+30, 19285, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11891.2, -3196.54, -14.2259, 0.0363392, 300, 0, 0, 3237, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+31, 19290, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11869, -3225.79, -14.9308, 0.144756, 120, 0, 0, 2515, 2486, 0, 0, 0, 0, '', NULL, 0, NULL), -- Invading Anguisher
(@CGUID+32, 19290, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11875, -3180.81, -14.9425, 0.168318, 120, 0, 0, 2515, 2486, 0, 0, 0, 0, '', NULL, 0, NULL),
--
(@CGUID+100, 19006, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 0, -11793.4, -3185.31, -28.8352, 2.69812, 300, 0, 0, 55890, 31550, 0, 0, 0, 0, '', NULL, 0, NULL), -- Silvermoon Magister
(@CGUID+101, 19007, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11799.3, -3228.41, -27.2092, 2.12007, 300, 0, 0, 55890, 31550, 0, 0, 0, 0, '', NULL, 0, NULL), -- Gnomeregan Conjuror
--
(@CGUID+102, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11818.3, -3228.96, -30.4358, 1.59057, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Argent Protector
(@CGUID+103, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11796.4, -3195.61, -28.1723, 3.86363, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+104, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11842.8, -3176.78, -28.9028, 4.34478, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+105, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11840.7, -3217.56, -29.6506, 2.10609, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+106, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11848.4, -3222.04, -28.4381, 2.09824, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+107, 19320, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11835.8, -3190.32, -29.9569, 3.80256, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+108, 19322, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11794.1, -3190.4, -28.794, 2.05722, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Argent Guardian
(@CGUID+109, 19322, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11838.3, -3174.86, -29.5202, 4.26624, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+110, 19322, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11837.2, -3208.95, -30.2396, 2.54984, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+111, 19322, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11839.5, -3187.33, -29.4911, 4.12849, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+112, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11818.6, -3168.31, -28.35, 3.66258, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Argent Bowman
(@CGUID+113, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11829.5, -3219.82, -30.5772, 2.47023, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+114, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11830.4, -3216.54, -30.7041, 2.43705, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+115, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11835.1, -3182.6, -29.9996, 4.00275, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+116, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11825.3, -3208.96, -29.6347, 3.2149, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+117, 19365, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11822.7, -3182.43, -29.0161, 3.74751, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+118, 19366, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11831.3, -3160.67, -30.0144, 4.12282, 60, 0, 0, 4979, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Argent Hunter
(@CGUID+119, 19366, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11846, -3171.25, -28.5187, 4.27488, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+120, 19366, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11844.1, -3234, -25.5526, 1.70452, 60, 3, 0, 4979, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
--
(@CGUID+200, 19385, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11804.1, -3221.13, -30.622, 2.75383, 1200, 0, 0, 69860, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Lord Marshal Raynor
(@CGUID+201, 19386, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11802.5, -3223.36, -30.4378, 2.63601, 1200, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Stormwind Marshal
(@CGUID+202, 19386, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11801.4, -3219.95, -30.5844, 2.78131, 1200, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Stormwind Marshal
--
(@CGUID+203, 18966, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11800, -3179.14, -30.4951, 3.5574, 900, 0, 0, 111780, 47325, 0, 0, 0, 0, '', NULL, 0, NULL), -- Justinius the Harbinger
(@CGUID+204, 19407, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11797.3, -3180.99, -30.3303, 3.42781, 900, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Azuremyst Vindicator
(@CGUID+205, 19407, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11800, -3175.74, -30.4326, 3.73019, 900, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Azuremyst Vindicator
--
(@CGUID+206, 18969, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11792.7, -3175.95, -30.0411, 3.55114, 1800, 0, 0, 111780, 47325, 0, 0, 0, 0, '', NULL, 0, NULL), -- Melgromm Highmountain
(@CGUID+207, 19406, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11790.8, -3178.18, -29.9874, 3.55507, 1800, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Thunder Bluff Huntsman
(@CGUID+208, 19406, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11793.4, -3172.56, -29.8954, 3.65324, 1800, 0, 0, 5914, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Thunder Bluff Huntsman
--
(@CGUID+209, 19566, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11797.3, -3207.71, -30.2781, 1.91272, 300, 0, 0, 5385, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Nethergarde Advisor
(@CGUID+210, 19566, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11800, -3208.97, -30.3819, 2.36362, 300, 0, 0, 5186, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
(@CGUID+211, 19567, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11798.8, -3208.15, -30.3542, 2.06588, 300, 0, 0, 5975, 0, 0, 0, 0, 0, '', NULL, 0, NULL), -- Watcher Theronus
(@CGUID+212, 19942, 0, 0, 0, 0, 0, 1, @IPPPHASE_II, 1, -11796, -3192.45, -28.6508, 3.2903, 300, 0, 0, 5228, 0, 0, 0, 0, 0, '', NULL, 0, NULL); -- Agent Proudwell
DELETE FROM `creature_formations` WHERE `leaderGUID` IN (@CGUID+6, @CGUID+7, @CGUID+8, @CGUID+200, @CGUID+203, @CGUID+206);
INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
(@CGUID+6, @CGUID+6, 0, 0, 2, 0, 0),
(@CGUID+6, @CGUID+23, 4, 110, 516, 0, 0),
(@CGUID+6, @CGUID+24, 4, 250, 516, 0, 0),
(@CGUID+7, @CGUID+7, 0, 0, 2, 0, 0),
(@CGUID+7, @CGUID+25, 4, 110, 516, 0, 0),
(@CGUID+7, @CGUID+26, 4, 250, 516, 0, 0),
(@CGUID+8, @CGUID+8, 0, 0, 2, 0, 0),
(@CGUID+8, @CGUID+27, 4, 110, 516, 0, 0),
(@CGUID+8, @CGUID+28, 4, 250, 516, 0, 0),
--
(@CGUID+200, @CGUID+200, 0, 0, 2, 0, 0),
(@CGUID+200, @CGUID+201, 3, 90, 516, 0, 0),
(@CGUID+200, @CGUID+202, 3, 270, 516, 0, 0),
(@CGUID+203, @CGUID+203, 0, 0, 2, 0, 0),
(@CGUID+203, @CGUID+204, 3, 90, 516, 0, 0),
(@CGUID+203, @CGUID+205, 3, 270, 516, 0, 0),
(@CGUID+206, @CGUID+206, 0, 0, 2, 0, 0),
(@CGUID+206, @CGUID+207, 3, 90, 516, 0, 0),
(@CGUID+206, @CGUID+208, 3, 270, 516, 0, 0);
UPDATE `creature_template` SET `faction` = 1767 WHERE `entry` = 19567;
UPDATE `creature_template` SET `DamageModifier` = 2.6, `unit_flags` = 33040 WHERE `entry` = 19385;
UPDATE `creature_template` SET `unit_class` = 8 WHERE `entry` IN (19566, 19567);
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (19385, 19566, 19567);
UPDATE `creature_template` SET `flags_extra` = 2 WHERE `entry` = 19006;
UPDATE `creature_template` SET `flags_extra` = 134217728 WHERE `entry` IN (18966, 18969, 19284, 19286, 19287, 19288, 19320); -- DONT_OVERRIDE_SAI_ENTRY (134217728)
UPDATE `creature_template` SET `detection_range` = 40 WHERE `entry` IN (19287, 19566, 19567);
UPDATE `creature_template` SET `detection_range` = 30 WHERE `entry` IN (19285, 19290, 19365, 19366);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-640004, -640005, -640006, -640007, -640008, -640010, -640011, -640012, -640013, -640014, -640015, -640016, -640017, -640018, -640019,
-640020, -640021, -640022, -640102, -640203, -640206, 18966, 18969, 19287, 19365, 19385, 19391, 19566, 19567);
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`,
`event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`,
`action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`,
`target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(-640004, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400040, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Voidwalker - On Respawn - Waypoint Start'),
(-640005, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400050, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Voidwalker - On Respawn - Waypoint Start'),
--
(-640006, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400060, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Respawn - Waypoint Start'),
(-640006, 0, 1, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+206, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Melgromm Highmountain'),
(-640006, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+207, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Thunder Bluff Huntsman'),
(-640006, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+208, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Thunder Bluff Huntsman'),
(-640006, 0, 4, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Self'),
(-640006, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+23, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
(-640006, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+24, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
--
(-640007, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400070, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Respawn - Waypoint Start'),
(-640007, 0, 1, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+200, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Marshal Raynor'),
(-640007, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+201, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Stormwind Marshal'),
(-640007, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+202, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Stormwind Marshal'),
(-640007, 0, 4, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Self'),
(-640007, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+25, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
(-640007, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+26, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
--
(-640008, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400080, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Respawn - Waypoint Start'),
(-640008, 0, 1, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+203, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Justinius the Harbinger'),
(-640008, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+204, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Azuremyst Vindicator'),
(-640008, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+205, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Azuremyst Vindicator'),
(-640008, 0, 4, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Self'),
(-640008, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+27, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
(-640008, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 10, @CGUID+28, 0, 0, 0, 0, 0, 0, 0, 'Dreadknight - On Death - Despawn Portal Hound'),
--
(-640010, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640011, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400110, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640012, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400120, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640013, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400130, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640014, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400140, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640015, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400150, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640016, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400160, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640017, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400170, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640018, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400180, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
(-640019, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400190, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Felguard - On Respawn - Waypoint Start'),
--
(-640020, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400200, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Fel Stalker - On Respawn - Waypoint Start'),
(-640021, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400210, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Fel Stalker - On Respawn - Waypoint Start'),
(-640022, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400220, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Fel Stalker - On Respawn - Waypoint Start'),
--
(-640102, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6401020, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Argent Protector - On Respawn - Waypoint Start'),
(-640203, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6402030, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Justinius the Harbinger - On Respawn - Waypoint Start'),
(-640206, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6402060, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Melgromm Highmountain - On Respawn - Waypoint Start'),
--
(19365, 0, 0, 0, 9, 0, 100, 0, 0, 0, 2300, 3900, 5, 30, 11, 6660, 64, 0, 0, 0, 0, 25, 30, 0, 0, 0, 0, 0, 0, 0, 'Argent Bowman - On Victim In Range - Cast Shoot'),
--
(18966, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Justinius the Harbinger - On Aggro - Say Line 0'),
(18966, 0, 1, 0, 0, 0, 100, 0, 5000, 10000, 10000, 20000, 0, 0, 11, 33554, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Justinius the Harbinger - In Combat - Cast Judgement of Command'),
(18966, 0, 2, 0, 14, 0, 100, 0, 2500, 40, 18000, 21000, 0, 0, 11, 33641, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Justinius the Harbinger - Friendly At 2500 Health - Cast Flash of Light'),
--
(18969, 0, 0, 0, 0, 0, 100, 0, 5000, 10000, 10000, 20000, 0, 0, 11, 33643, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Melgromm Highmountain - In Combat - Cast Chain Lightning'),
(18969, 0, 1, 0, 0, 0, 100, 0, 5000, 10000, 10000, 20000, 0, 0, 11, 22885, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Melgromm Highmountain - In Combat - Cast Earth Shock'),
--
(19385, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6402000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Marshal Raynor - On Respawn - Waypoint Start'),
(19385, 0, 1, 0, 0, 0, 100, 0, 4850, 18250, 4850, 18250, 0, 0, 11, 40504, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Lord Marshal Raynor - In Combat - Cast Cleave'),
--
(19287, 0, 0, 0, 0, 0, 100, 0, 3000, 6000, 12000, 24000, 0, 0, 11, 11829, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Invading Voidwalker - In Combat - Cast Flamestrike'),
(19287, 0, 1, 0, 0, 0, 100, 0, 0, 0, 5000, 10000, 0, 0, 11, 20825, 0, 0, 0, 0, 0, 25, 40, 0, 0, 0, 0, 0, 0, 0, 'Invading Voidwalker - In Combat - Cast Shadow Bolt'),
--
(19391, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 6400090, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Felguard Lieutenant - On Respawn - Waypoint Start'),
(19391, 0, 1, 0, 0, 0, 100, 0, 3000, 6000, 10000, 15000, 0, 0, 11, 3551, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Felguard Lieutenant - In Combat - Cast Skull Crack'),
--
(19566, 0, 0, 0, 9, 0, 100, 0, 1000, 3200, 2800, 5200, 0, 10, 11, 15453, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Nethergarde Advisor - On Victim In Range - Cast Arcane Explosion'),
(19566, 0, 1, 0, 0, 0, 100, 0, 0, 0, 3600, 5900, 0, 0, 11, 20823, 64, 0, 0, 0, 0, 25, 40, 0, 0, 0, 0, 0, 0, 0, 'Nethergarde Advisor - In Combat - Cast Fireball'),
(19567, 0, 0, 0, 9, 0, 100, 0, 1000, 3200, 2800, 5200, 0, 10, 11, 15453, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Watcher Theronus - On Victim In Range - Cast Arcane Explosion'),
(19567, 0, 1, 0, 0, 0, 100, 0, 0, 1000, 3000, 4000, 0, 0, 11, 16799, 64, 0, 0, 0, 0, 25, 40, 0, 0, 0, 0, 0, 0, 0, 'Watcher Theronus - In Combat - Cast Frostbolt');
DELETE FROM `creature_addon` WHERE `guid` IN (640004, 640005, 640006, 640007, 640008, 640009,
640010, 640011, 640012, 640013, 640014, 640015, 640016, 640017, 640018, 640019,
640020, 640021, 640022, 640102, 640200, 640203, 640206);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(640004, 6400040, 0, 0, 0, 0, 0, NULL),
(640005, 6400050, 0, 0, 0, 0, 0, NULL),
(640006, 6400060, 0, 0, 0, 0, 0, NULL),
(640007, 6400070, 0, 0, 0, 0, 0, NULL),
(640008, 6400080, 0, 0, 0, 0, 0, NULL),
(640009, 6400090, 0, 0, 0, 0, 0, NULL),
(640010, 6400100, 0, 0, 0, 0, 0, NULL),
(640011, 6400110, 0, 0, 0, 0, 0, NULL),
(640012, 6400120, 0, 0, 0, 0, 0, NULL),
(640013, 6400130, 0, 0, 0, 0, 0, NULL),
(640014, 6400140, 0, 0, 0, 0, 0, NULL),
(640015, 6400150, 0, 0, 0, 0, 0, NULL),
(640016, 6400160, 0, 0, 0, 0, 0, NULL),
(640017, 6400170, 0, 0, 0, 0, 0, NULL),
(640018, 6400180, 0, 0, 0, 0, 0, NULL),
(640019, 6400190, 0, 0, 0, 0, 0, NULL),
(640020, 6400200, 0, 0, 0, 0, 0, NULL),
(640021, 6400210, 0, 0, 0, 0, 0, NULL),
(640022, 6400220, 0, 0, 0, 0, 0, NULL),
(640102, 6401020, 0, 0, 0, 0, 0, NULL),
(640200, 6402000, 0, 0, 0, 0, 0, NULL),
(640203, 6402030, 0, 0, 0, 0, 0, NULL),
(640206, 6402060, 0, 0, 0, 0, 0, NULL);
DELETE FROM `waypoint_data` WHERE `id` IN (6400040, 6400050, 6400060, 6400070, 6400080, 6400090,
6400100, 6400110, 6400120, 6400130, 6400140, 6400150, 6400160, 6400170, 6400180, 6400190,
6400200, 6400210, 6400220, 6401020, 6402000, 6402030, 6402060);
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(6402000, 1, -11824.2, -3225.97, -30.3699, NULL, 0, 0, 0, 100, 0), -- Lord Marshal Raynor
(6402000, 2, -11839, -3211.73, -30.043, NULL, 0, 0, 0, 100, 0),
(6402030, 1, -11823.1, -3192.1, -30.7322, NULL, 0, 0, 0, 100, 0), -- Justinius the Harbinger
(6402030, 2, -11837.2, -3195.41, -29.8546, NULL, 0, 0, 0, 100, 0),
(6402060, 1, -11812.5, -3186.91, -30.6074, NULL, 0, 0, 0, 100, 0), -- Melgromm Highmountain
(6402060, 2, -11821.2, -3208.73, -29.7076, NULL, 0, 0, 0, 100, 0),
(6402060, 3, -11836, -3204.49, -30.2795, NULL, 0, 0, 0, 100, 0),
--
(6400040, 1, -11889.6, -3208.69, -14.963, NULL, 0, 0, 0, 100, 0), -- Invading Voidwalker
(6400040, 2, -11855.6, -3204.76, -26.665, NULL, 30000, 0, 0, 100, 0),
(6400050, 1, -11890.4, -3204.01, -14.7968, NULL, 0, 0, 0, 100, 0),
(6400050, 2, -11855.8, -3199.2, -26.909, NULL, 30000, 0, 0, 100, 0),
--
(6400060, 1, -11845.1, -3200.56, -29.3595, NULL, 0, 0, 0, 100, 0), -- Dreadknight, Melgromm
(6400070, 1, -11891.3, -3206.46, -14.8065, NULL, 0, 0, 0, 100, 0), -- Dreadknight, Raynor
(6400070, 2, -11850.2, -3201.36, -28.6679, NULL, 0, 0, 0, 100, 0),
(6400070, 3, -11843.8, -3206.54, -29.5158, NULL, 0, 0, 0, 100, 0),
(6400080, 1, -11889.9, -3206.58, -14.9646, NULL, 0, 0, 0, 100, 0), -- Dreadknight, Justinius
(6400080, 2, -11851.1, -3201.08, -28.5624, NULL, 0, 0, 0, 100, 0),
(6400080, 3, -11843.6, -3196.09, -29.3421, NULL, 0, 0, 0, 100, 0),
(6400090, 1, -11837.4, -3199.97, -29.9665, NULL, 30000, 0, 0, 100, 0), -- Felguard Lieutenant
--
(6400200, 1, -11889.4, -3210.32, -14.9459, NULL, 0, 0, 0, 100, 0), -- Invading Fel Stalker
(6400200, 2, -11845.4, -3204.67, -29.4112, NULL, 0, 1, 0, 100, 0),
(6400200, 3, -11832.9, -3215.73, -30.5512, NULL, 30000, 1, 0, 100, 0),
(6400210, 1, -11889, -3206.14, -15.0842, NULL, 0, 0, 0, 100, 0),
(6400210, 2, -11843.2, -3200.21, -29.5037, NULL, 0, 1, 0, 100, 0),
(6400210, 3, -11826.9, -3207.13, -30.0613, NULL, 30000, 1, 0, 100, 0),
(6400220, 1, -11890.1, -3202.46, -14.781, NULL, 0, 0, 0, 100, 0),
(6400220, 2, -11841.1, -3195.8, -29.4767, NULL, 0, 1, 0, 100, 0),
(6400220, 3, -11833.8, -3179.55, -30.1652, NULL, 30000, 1, 0, 100, 0),
--
(6401020, 1, -11818.4, -3210.99, -30.1687, NULL, 0, 1, 0, 100, 0), -- Argent Protector
(6401020, 2, -11846.5, -3200.56, -29.201, NULL, 30000, 1, 0, 100, 0),
--
(6400100, 1, -11893.4, -3204.94, -14.6618, NULL, 0, 0, 0, 100, 0), -- Invading Felguard
(6400100, 2, -11850, -3200.02, -28.7504, NULL, 0, 1, 0, 100, 0),
(6400100, 3, -11837.2, -3192.87, -29.8202, NULL, 30000, 1, 0, 100, 0),
(6400110, 1, -11892.3, -3208.3, -14.7235, NULL, 0, 0, 0, 100, 0),
(6400110, 2, -11847.9, -3202.94, -29.0108, NULL, 0, 1, 0, 100, 0),
(6400110, 3, -11834.2, -3205.21, -30.4318, NULL, 30000, 1, 0, 100, 0),
(6400120, 1, -11888.2, -3210.41, -15.0273, NULL, 0, 1, 0, 100, 0),
(6400120, 2, -11846.8, -3206.71, -29.0062, NULL, 30000, 1, 0, 100, 0),
(6400130, 1, -11889.1, -3202.02, -14.8334, NULL, 0, 1, 0, 100, 0),
(6400130, 2, -11847.9, -3196.42, -28.9539, NULL, 30000, 1, 0, 100, 0),
(6400140, 1, -11889.6, -3206.22, -14.994, NULL, 0, 1, 0, 100, 0),
(6400140, 2, -11842.7, -3200.9, -29.5849, NULL, 30000, 1, 0, 100, 0),
(6400150, 1, -11848, -3206.28, -28.8014, NULL, 0, 1, 0, 100, 0),
(6400150, 2, -11837.3, -3213.55, -30.1827, NULL, 30000, 1, 0, 100, 0),
(6400160, 1, -11849.9, -3196.86, -28.6516, NULL, 0, 1, 0, 100, 0),
(6400160, 2, -11837.5, -3191.1, -29.7639, NULL, 30000, 1, 0, 100, 0),
(6400170, 1, -11850.5, -3201.05, -28.6364, NULL, 0, 1, 0, 100, 0),
(6400170, 2, -11834.5, -3199.66, -30.1119, NULL, 30000, 1, 0, 100, 0),
(6400180, 1, -11893, -3202.07, -14.6551, NULL, 0, 0, 0, 100, 0),
(6400180, 2, -11849.6, -3196.98, -28.7049, NULL, 0, 1, 0, 100, 0),
(6400180, 3, -11852.3, -3184.09, -28.1065, NULL, 30000, 1, 0, 100, 0),
(6400190, 1, -11891.9, -3211.69, -14.6478, NULL, 0, 0, 0, 100, 0),
(6400190, 2, -11847.1, -3205.97, -28.9958, NULL, 0, 1, 0, 100, 0),
(6400190, 3, -11842.5, -3223.27, -28.9624, NULL, 30000, 1, 0, 100, 0);

35
src/IndividualProgression.h
View File

@@ -48,18 +48,20 @@ enum BuffSpells
SPELL_RUNE_TAP = 48982,
SPELL_LIFE_STEAL = 20004,
IPP_PHASE = 89509,
IPP_PHASE_AQ = 89511
IPP_PHASE_II = 89511
};
enum ProgressionQuestIDs
{
MIGHT_OF_KALIMDOR = 8742,
BANG_A_GONG = 108743,
CHAOS_AND_DESTRUCTION = 108744,
QUEST_MORROWGRAIN = 3803,
QUEST_TROLL_NECKLACE = 2881,
QUEST_MORROWGRAIN = 3803,
QUEST_DEADWOOD = 6221,
QUEST_WINTERFALL = 6241
QUEST_WINTERFALL = 6241,
MIGHT_OF_KALIMDOR = 8742,
INTO_THE_BREACH = 10259,
BANG_A_GONG = 108743,
CHAOS_AND_DESTRUCTION = 108744
};
enum ProgressionZones
@@ -131,16 +133,17 @@ enum ProgressionState : uint8
PROGRESSION_AQ_WAR = 5, // AQ gates open, raid available
PROGRESSION_AQ = 6,
PROGRESSION_NAXX40 = 7,
PROGRESSION_TBC_TIER_1 = 8, // Karazhan, Gruul's Lair, Magtheridon's Lair
PROGRESSION_TBC_TIER_2 = 9, // Serpentshrine Cavern, Tempest Keep
PROGRESSION_TBC_TIER_3 = 10, // Hyjal Summit and Black Temple
PROGRESSION_TBC_TIER_4 = 11, // Zul'Aman
PROGRESSION_TBC_TIER_5 = 12, // Sunwell Plateau
PROGRESSION_WOTLK_TIER_1 = 13, // WotLK Naxx, EoE, OS
PROGRESSION_WOTLK_TIER_2 = 14, // Ulduar
PROGRESSION_WOTLK_TIER_3 = 15, // TotC
PROGRESSION_WOTLK_TIER_4 = 16, // ICC
PROGRESSION_WOTLK_TIER_5 = 17 // Ruby Sanctum
PROGRESSION_PRE_TBC = 8, // Into the Breach
PROGRESSION_TBC_TIER_1 = 9, // Karazhan, Gruul's Lair, Magtheridon's Lair
PROGRESSION_TBC_TIER_2 = 10, // Serpentshrine Cavern, Tempest Keep
PROGRESSION_TBC_TIER_3 = 11, // Hyjal Summit and Black Temple
PROGRESSION_TBC_TIER_4 = 12, // Zul'Aman
PROGRESSION_TBC_TIER_5 = 13, // Sunwell Plateau
PROGRESSION_WOTLK_TIER_1 = 14, // WotLK Naxx, EoE, OS
PROGRESSION_WOTLK_TIER_2 = 15, // Ulduar
PROGRESSION_WOTLK_TIER_3 = 16, // TotC
PROGRESSION_WOTLK_TIER_4 = 17, // ICC
PROGRESSION_WOTLK_TIER_5 = 18 // Ruby Sanctum
};
enum RandomDungeonIds : uint16

4
src/IndividualProgressionAwarenessScripts.cpp
View File

@@ -174,7 +174,7 @@ public:
return true;
}
Player* target = ObjectAccessor::FindConnectedPlayer(player->GetGUID());
return sIndividualProgression->hasPassedProgression(target, PROGRESSION_NAXX40);
return sIndividualProgression->hasPassedProgression(target, PROGRESSION_PRE_TBC);
}
};
@@ -400,7 +400,7 @@ public:
return true;
}
Player* target = ObjectAccessor::FindConnectedPlayer(player->GetGUID());
return sIndividualProgression->hasPassedProgression(target, PROGRESSION_NAXX40);
return sIndividualProgression->hasPassedProgression(target, PROGRESSION_PRE_TBC);
}
};

164
src/IndividualProgressionPlayer.cpp
View File

@@ -36,7 +36,7 @@ public:
return;
}
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC))
{
if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 60)
{
@@ -79,7 +79,7 @@ public:
return false;
}
// Player is still in Vanilla content - give money at 60 level cap
return ((!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && player->GetLevel() == 60) ||
return ((!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() == 60) ||
// Player is in TBC content - give money at 70 level cap
(!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && player->GetLevel() == 70));
}
@@ -98,7 +98,7 @@ public:
sIndividualProgression->ComputeGearTuning(player, gearAdjustment, item->GetTemplate());
}
// Player is still in Vanilla content - give Vanilla health adjustment
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
float adjustmentAmount = 1.0f - sIndividualProgression->vanillaHealthAdjustment;
float applyPercent = ((player->GetLevel() - 10.0f) / 50.0f);
@@ -141,7 +141,7 @@ public:
return;
}
// Player is still in Vanilla content - do not give XP past level 60
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && player->GetLevel() >= 60)
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() >= 60)
{
// Still award XP to pets - they won't be able to pass the player's level
Pet* pet = player->GetPet();
@@ -195,7 +195,7 @@ public:
}
if (mapid == MAP_OUTLAND)
{
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC))
{
// The player may be in the Azuremyst area which is on the outlands map - check the area ID
return IsTBCRaceStartingZone(mapid, x, y, z);
@@ -235,7 +235,7 @@ public:
InstanceTemplate const* instanceTemplate = sObjectMgr->GetInstanceTemplate(mapid);
if (instanceTemplate)
{
if (instanceTemplate->Parent == MAP_OUTLAND && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
if (instanceTemplate->Parent == MAP_OUTLAND && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC))
{
return false;
}
@@ -273,6 +273,12 @@ public:
sIndividualProgression->UpdateProgressionState(player, PROGRESSION_AQ_WAR);
}
break;
case INTO_THE_BREACH:
if (!sIndividualProgression->disableDefaultProgression)
{
sIndividualProgression->UpdateProgressionState(player, PROGRESSION_PRE_TBC);
}
break;
case QUEST_MORROWGRAIN:
case QUEST_TROLL_NECKLACE:
case QUEST_DEADWOOD:
@@ -347,7 +353,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -355,7 +361,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -363,7 +369,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -371,7 +377,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -379,63 +385,63 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_ASHI:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_ZORA:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_REGAL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_BOUGH_SHADOW:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -443,7 +449,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -451,7 +457,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -459,7 +465,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -467,7 +473,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -475,7 +481,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -483,7 +489,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -491,7 +497,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -499,7 +505,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -507,7 +513,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -515,7 +521,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -523,7 +529,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -531,7 +537,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -539,7 +545,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -547,7 +553,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -555,7 +561,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -563,7 +569,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -571,7 +577,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -579,7 +585,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -587,7 +593,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -595,7 +601,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -603,15 +609,21 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_PRE_TBC)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_SERPENTS_COIL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -619,7 +631,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -627,7 +639,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -635,7 +647,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -643,7 +655,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -651,7 +663,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -659,7 +671,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -667,7 +679,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -675,7 +687,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -683,7 +695,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -691,7 +703,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -699,7 +711,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -707,7 +719,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -715,7 +727,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -723,7 +735,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -731,7 +743,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -739,7 +751,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -747,7 +759,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -755,7 +767,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -772,7 +784,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_2))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
@@ -783,41 +795,41 @@ public:
if (mapid == MAP_SHADOWFANG_KEEP && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
break;
}
if (mapid == MAP_RAZORFEN_DOWNS && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
break;
}
if (mapid == MAP_SCARLET_MONASTERY && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
break;
}
if (mapid == MAP_STRATHOLME && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
break;
}
if (mapid == MAP_DIRE_MAUL && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
break;
}
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->RemoveAura(IPP_PHASE_II);
}
}
@@ -838,7 +850,7 @@ public:
return;
}
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
rDungeonId = RDF_CLASSIC;
}
@@ -1064,7 +1076,7 @@ private:
return;
}
if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_NAXX40) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_NAXX40)) && (pet->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC)) && (pet->GetLevel() < 61)))
{
AdjustVanillaStats(pet);
}
@@ -1164,7 +1176,7 @@ public:
}
Player* player = isPet ? healer->GetOwner()->ToPlayer() : healer->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
heal *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaHealingAdjustment) - gearAdjustment);
}
@@ -1189,7 +1201,7 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}
@@ -1215,7 +1227,7 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}
@@ -1250,7 +1262,7 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}