Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retail: Fix shaman class hall's version of Firelands showing Things from Mount Hyjal. #1890

Merged
merged 7 commits into from
Jan 22, 2025
Merged

Retail: Fix shaman class hall's version of Firelands showing Things from Mount Hyjal. #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3450aeb
Retail: Add Shaman class hall's Firelands as separate zone and remove…
donkers-mike Jan 21, 2025
088e2df
Retail: Assign shaman class hall quests that take place in the Firela…
donkers-mike Jan 21, 2025
aa80239
Merge pull request #1 from donkers-mike/retail/fix-legion-firelands-h…
donkers-mike Jan 21, 2025
a03cd95
Merge branch 'ATTWoWAddon:master' into master
donkers-mike Jan 22, 2025
4e5448c
Retail: Move shaman class hall's Firelands to under EF>Class Hall>Shaman
donkers-mike Jan 22, 2025
b813c18
Merge pull request #2 from donkers-mike/retail/fix-legion-firelands-h…
donkers-mike Jan 22, 2025
0675f39
Merge branch 'ATTWoWAddon:master' into master
donkers-mike Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ root(ROOTS.Zones, m(KALIMDOR, {
["icon"] = 409547,
["timeline"] = { ADDED_4_0_3 },
["maps"] = {
738, -- Firelands
760, -- Malorne's Nightmare
},
["groups"] = {
Expand Down
16 changes: 16 additions & 0 deletions ...ib/Parser/DATAS/06 - Expansion Features/06 Legion/Legion Class Halls/Shaman/Firelands.lua
View file
Open in desktop
DFortun81 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-------------------------------------------------------------------
-- E X P A N S I O N F E A T U R E S M O D U L E --
-------------------------------------------------------------------

root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timeline"] = { ADDED_7_0_3 } },{
n(CLASS_HALL, {
cl(SHAMAN, bubbleDown({ ["classes"] = { SHAMAN } }, {
m(THE_HEART_OF_AZEROTH_FIRELANDS, {
["lore"] = "The death of Ragnaros has left the Firelands in utter chaos. The elementals residing there became engaged in an epic battle for supremacy. Eventually Smolderon and Pyroth, the son of Lord Rhyolith, would emerge as the top contenders for the position of Firelord.",
["coord"] = { 31.0, 61.0, THE_HEART_Of_AZEROTH },
["timeline"] = { ADDED_7_0_3 },
["icon"] = 529270,
})
}))
})
})));
7 changes: 4 additions & 3 deletions ...s Halls/The Heart Of Azeroth (Shaman).lua → .../Shaman/The Heart Of Azeroth (Shaman).lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,23 +519,24 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
42208, -- Return to the Firelands
42990, -- Neltharion's Lair: The Earthen Amulet
},
["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS },
["provider"] = { "n", 96746 }, -- Advisor Sevel
["coord"] = { 33.0, 60.0, THE_HEART_Of_AZEROTH },
}),
q(41773, { -- The Firelord's Command
["sourceQuests"] = { 41772 }, -- Ascendant of Flames
["provider"] = { "n", 105055 }, -- Baron Scaldius
["maps"] = { 738 }, -- Firelands (Scenario Map)
["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS }, -- Firelands (Scenario Map)
}),
q(41934, { -- The Brand of Damnation
["sourceQuests"] = { 41773 }, -- The Firelord's Command
["provider"] = { "n", 105120 }, -- Lord Smolderon
["maps"] = { 738 }, -- Firelands (Scenario Map)
["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS }, -- Firelands (Scenario Map)
}),
q(41888, { -- Allegiance of Flame
["sourceQuests"] = { 41934 }, -- The Brand of Damnation
["provider"] = { "n", 105594 }, -- Lord Smolderon
["maps"] = { 738 }, -- Firelands (Scenario Map)
["maps"] = { THE_HEART_OF_AZEROTH_FIRELANDS }, -- Firelands (Scenario Map)
["g"] = {
i(139698), -- Farseer's Harness
title(336), -- Farseer <Name>
Expand Down
2 changes: 2 additions & 0 deletions .contrib/Parser/lib/Constants/Maps.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ SHADOWMOON_VALLEY = 104;
-- #endif

-- Cataclysm
FIRELANDS = 367
MOUNT_HYJAL = 198;
DARKMOON_ISLAND = 407;
DEEPHOLM = 207;
Expand Down Expand Up @@ -423,6 +424,7 @@ SKYHOLD = 695;
THE_DREAMGROVE = 747;
THE_HALL_OF_SHADOWS = 626;
THE_HEART_Of_AZEROTH = 726;
THE_HEART_OF_AZEROTH_FIRELANDS = 738;
THE_WANDERING_ISLE = 709;
TRUESHOT_LODGE = 739;
CLASS_HALL_MAPS = {
Expand Down