Classic: Fixed Ruby Sanctum and Elemental Invasion phase identifiers.

.contrib/Parser/DATAS/01 - Dungeons Raids/03 - Wrath of the Lich King/9 The Ruby Sanctum.lua

@@ -1,7 +1,7 @@
 -----------------------------------------------------
 -- D U N G E O N S & R A I D S M O D U L E --
 -----------------------------------------------------
-root(ROOTS.Instances, tier(WOTLK_TIER, applyclassicphase(WRATH_PHASE_FIVE, {
+root(ROOTS.Instances, tier(WOTLK_TIER, applyclassicphase(WRATH_PHASE_FOUR_RUBYSANCTUM, {
  inst(761, { -- The Ruby Sanctum
  ["mapID"] = THE_RUBY_SANCTUM,
  ["coord"] = { 61.2, 52.7, DRAGONBLIGHT },

.contrib/Parser/DATAS/07 - Events/Elemental Unrest/Elemental Unrest.lua

@@ -13,7 +13,7 @@ ELEMENTAL_UNREST = createHeader({
  en = "The Elemental Unrest was a world event that heralded the Cataclysm. The event culminated in elementals attacking Stormwind, Orgrimmar, Ironforge, and Thunder Bluff. Players defeating these elementals and freeing trapped citizens within their entire city were granted access to two special boss encounters.",
  },
 });
-root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(ELEMENTAL_UNREST,
+root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_FOUR_ELEMENTAL_INVASION, n(ELEMENTAL_UNREST,
  bubbleDown({
  ["timeline"] = { "added 3.3.0", "removed 4.0.3" },
  -- #if ANYCLASSIC
@@ -22,7 +22,7 @@ root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(ELEMENTAL_UNREST,
  t.u = ]] .. REMOVED_FROM_GAME .. [[;
  t.rwp = nil;
  else
- t.u = ]] .. WRATH_PHASE_SIX .. [[;
+ t.u = ]] .. WRATH_PHASE_FOUR_ELEMENTAL_INVASION .. [[;
  t.rwp = 40003;
  end
  end]],

.contrib/Parser/DATAS/07 - Events/Operation Gnomeregan/Operation Gnomeregan.lua

@@ -11,7 +11,7 @@ OPERATION_GNOMEREGAN = createHeader({
  en = "Operation: Gnomeregan was the name of Gelbin Mekkatorque's plan for the retaking of the surface of Gnomeregan. Only Alliance players between level 75 and 80 were able to serve during the operation, but lower level players helped by motivating other gnomes or by turning in items.",
  },
 });
-root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(OPERATION_GNOMEREGAN,
+root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_FOUR_ELEMENTAL_INVASION, n(OPERATION_GNOMEREGAN,
  bubbleDown({
  ["timeline"] = { "added 3.3.0", "removed 4.0.3" },
  ["races"] = ALLIANCE_ONLY,
@@ -21,7 +21,7 @@ root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(OPERATION_GNOMEREGA
  t.u = ]] .. REMOVED_FROM_GAME .. [[;
  t.rwp = nil;
  else
- t.u = ]] .. WRATH_PHASE_SIX .. [[;
+ t.u = ]] .. WRATH_PHASE_FOUR_ELEMENTAL_INVASION .. [[;
  t.rwp = 40003;
  end
  end]],

.contrib/Parser/DATAS/07 - Events/Zalazane's Fall/Zalazane's Fall.lua

@@ -11,7 +11,7 @@ ZALAZANES_FALL = createHeader({
  en = "Zalazane's Fall (also referred to as the Battle to reclaim the Echo Isles) was the final push by Vol'jin and the Darkspear tribe to retake the Echo Isles from the clutches of the evil Zalazane. It was a culminating event for the Horde to occur before the release of the next expansion, Cataclysm. Furthermore, all troll characters created after the liberation of the Echo Isles now have their new starting point there.",
  },
 });
-root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(ZALAZANES_FALL,
+root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_FOUR_ELEMENTAL_INVASION, n(ZALAZANES_FALL,
  bubbleDown({
  ["timeline"] = { "added 3.3.0", "removed 4.0.3" },
  ["races"] = HORDE_ONLY,
@@ -21,7 +21,7 @@ root(ROOTS.WorldEvents, applyclassicphase(WRATH_PHASE_SIX, n(ZALAZANES_FALL,
  t.u = ]] .. REMOVED_FROM_GAME .. [[;
  t.rwp = nil;
  else
- t.u = ]] .. WRATH_PHASE_SIX .. [[;
+ t.u = ]] .. WRATH_PHASE_FOUR_ELEMENTAL_INVASION .. [[;
  t.rwp = 40003;
  end
  end]],

.contrib/Parser/lib/Constants/Phases.lua

@@ -51,8 +51,8 @@ WRATH_PHASE_TWO_HAMMERPRIO = 3101;
 WRATH_PHASE_THREE = 32;
 WRATH_PHASE_FOUR = 33;
 WRATH_PHASE_FOUR_SHADOWMOURNE = 3301;
-WRATH_PHASE_FIVE = 34;
-WRATH_PHASE_SIX = 35;
+WRATH_PHASE_FOUR_RUBYSANCTUM = 3302;
+WRATH_PHASE_FOUR_ELEMENTAL_INVASION = 3303;
 
 -- NOTE: Reason for this is to show when stuff is going away eventually.
 -- Cataclysm Classic Phases

classic/Settings.lua

@@ -2198,7 +2198,7 @@ WrathPhasesLabel:SetText("|CFFAAFFAAWrath Phases|r");
 WrathPhasesLabel:Show();
 
 last, xoffset, yoffset = WrathPhasesLabel, 0, -4;
-for i,o in ipairs({ { 30, 0, 0 }, {3001, spacing, -vspacing }, { 31, 0, -vspacing }, {3101, spacing, -vspacing }, { 32, 0, -vspacing }, { 33, 0 }, {3301, spacing, -vspacing }, { 34, 0, -vspacing }, { 35, 0, -vspacing }, }) do
+for i,o in ipairs({ { 30, 0, 0 }, {3001, spacing, -vspacing }, { 31, 0, -vspacing }, {3101, spacing, -vspacing }, { 32, 0, -vspacing }, { 33, 0 }, {3301, spacing, -vspacing }, {3302, spacing }, {3303, spacing }, }) do
  local u = o[1];
  yoffset = o[3] or 6;
  local reason = reasons[u];

classic/locales.lua

@@ -660,8 +660,8 @@ local L = {
  [32] = {2, "|CFFAAFFAAThis was not available until Phase 3 of Wrath Classic.|r", "Phase 3", 30400, 30402, "\n \n|CFFFFAAAAIncluded Trial of the Crusader.|r" },
  [33] = {2, "|CFFAAFFAAThis was not available until Phase 4 of Wrath Classic.|r", "Phase 4", 30400, 30403, "\n \n|CFFFFAAAAIncluded Icecrown Citadel.|r" },
  [3301] = {2, "|CFFAAFFAAThe wielder of Shadowmournes for all the people that don't have it.|r", "Shadowmourne Prio", 30400, 40001, "\n \n|CFFFFAAAADue to the exclusivity of Shadowmourne and how prio isn't always given to collectors over sweaties, Crieve decided it was appropriate for now to provide a filter to reduce guild drama.\n\nThis filter will be defaulted on after cata prepatch.\n\nIf you do actually have Shadowmourne prio, simply turn this on.|r" },
- [34] = {2, "|CFFAAFFAAThis was not available until Phase 5 of Wrath Classic.|r", "Phase 5", 30400, 30404, "\n \n|CFFFFAAAAIncluded The Ruby Sanctum...?|r" },
- [35] = {2, "|CFFAAFFAAThis was not available until Phase 6 of Wrath Classic.|r", "Phase 6", 30400, 30404, "\n \n|CFFFFAAAAThe Elemental Unrest Pre-Expansion Event?|r" },
+ [3302] = {2, "|CFFAAFFAAThis became available with the release of Ruby Sanctum during Wrath Classic.|r", "Ruby Sanctum", 30400, 30403, "\n \n|CFFFFAAAAIncluded The Ruby Sanctum.|r" },
+ [3303] = {2, "|CFFAAFFAAThis became available with the release of the Elemental Unrest Cataclysm Prepatch Event during Wrath Classic.|r", "Elemental Unrest", 30400, 30404, "\n \n|CFFFFAAAAThe Elemental Unrest Pre-Expansion Event?|r" },
  };
 };
 app.L = L;