Skip to content

Commit

Permalink
Update Vanilla and VC factionIDs to use constants for those missing, …
Browse files Browse the repository at this point in the history 
…catch more missed conversions
  • Loading branch information
@Eremeir
Eremeir committed Sep 10, 2024
1 parent c6739ca commit 47c89e1
Show file tree
Hide file tree
Showing 77 changed files with 1,131 additions and 1,075 deletions.
54 changes: 27 additions & 27 deletions .contrib/Parser/DATAS/00 - Item DB/Grand Commendations.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,34 @@ i(49702, FACTION_THE_SONS_OF_HODIR); -- Sons of Hodir Commendation Badge
i(44710, FACTION_THE_WYRMREST_ACCORD); -- Wyrmrest Commendation Badge

-- Argent Tournament
a(i(45714, 69)); -- Darnassus Commendation Badge
a(i(45715, 930)); -- Exodar Commendation Badge
a(i(45716, 54)); -- Gnomeregan Commendation Badge
a(i(45717, 47)); -- Ironforge Commendation Badge
h(i(45719, 76)); -- Orgrimmar Commendation Badge
h(i(45720, 530)); -- Sen'jin Commendation Badge
h(i(45721, 911)); -- Silvermoon Commendation Badge
a(i(45718, 72)); -- Stormwind Commendation Badge
h(i(45722, 81)); -- Thunder Bluff Commendation Badge
h(i(45723, 68)); -- Undercity Commendation Badge
a(i(45714, FACTION_DARNASSUS)); -- Darnassus Commendation Badge
a(i(45715, FACTION_EXODAR)); -- Exodar Commendation Badge
a(i(45716, FACTION_GNOMEREGAN)); -- Gnomeregan Commendation Badge
a(i(45717, FACTION_IRONFORGE)); -- Ironforge Commendation Badge
h(i(45719, FACTION_ORGRIMMAR)); -- Orgrimmar Commendation Badge
h(i(45720, FACTION_DARKSPEAR_TROLLS)); -- Sen'jin Commendation Badge
h(i(45721, FACTION_SILVERMOON_CITY)); -- Silvermoon Commendation Badge
a(i(45718, FACTION_STORMWIND)); -- Stormwind Commendation Badge
h(i(45722, FACTION_THUNDER_BLUFF)); -- Thunder Bluff Commendation Badge
h(i(45723, FACTION_UNDERCITY)); -- Undercity Commendation Badge

-- Cataclysm
-- Uldum
i(64492, FACTION_RAMKAHEN); -- Ramkahen Badge of Valor

-- Molten Front (Did not automatically apply race requirements... sigh)
h(i(71088, FACTION_BILGEWATER_CARTEL)); -- Bilgewater Writ of Commendation
a(i(70145, 69)); -- Darnassus Writ of Commendation
a(i(70146, 930)); -- Exodar Writ of Commendation
a(i(70145, FACTION_DARNASSUS)); -- Darnassus Writ of Commendation
a(i(70146, FACTION_EXODAR)); -- Exodar Writ of Commendation
a(i(71087, FACTION_GILNEAS)); -- Gilneas Writ of Commendation
a(i(70147, 54)); -- Gnomeregan Writ of Commendation
a(i(70148, 47)); -- Ironforge Writ of Commendation
h(i(70149, 76)); -- Orgrimmar Writ of Commendation
h(i(70150, 530)); -- Sen'jin Writ of Commendation
h(i(70151, 911)); -- Silvermoon Writ of Commendation
a(i(70152, 72)); -- Stormwind Writ of Commendation
h(i(70153, 81)); -- Thunder Bluff Writ of Commendation
h(i(70154, 68)); -- Undercity Writ of Commendation
a(i(70147, FACTION_GNOMEREGAN)); -- Gnomeregan Writ of Commendation
a(i(70148, FACTION_IRONFORGE)); -- Ironforge Writ of Commendation
h(i(70149, FACTION_ORGRIMMAR)); -- Orgrimmar Writ of Commendation
h(i(70150, FACTION_DARKSPEAR_TROLLS)); -- Sen'jin Writ of Commendation
h(i(70151, FACTION_SILVERMOON_CITY)); -- Silvermoon Writ of Commendation
a(i(70152, FACTION_STORMWIND)); -- Stormwind Writ of Commendation
h(i(70153, FACTION_THUNDER_BLUFF)); -- Thunder Bluff Writ of Commendation
h(i(70154, FACTION_UNDERCITY)); -- Undercity Writ of Commendation

-- Pandaria
-- The "Grand Commendation" items of Pandaria unlock bonus reputation rather than grant reputation.
Expand Down Expand Up @@ -82,13 +82,13 @@ i(94226, FACTION_THE_KLAXXI); -- Stolen Klaxxi Insignia
i(94223, FACTION_SHADO_PAN); -- Stolen Shado-Pan Insignia

-- Timewalking: Burning Crusade
i(129948, 946); -- Commendation of Honor Hold
i(129951, 1011); -- Commendation of Lower City
i(129949, 942); -- Commendation of the Cenarion Expedition
i(129945, 933); -- Commendation of The Consortium
i(129950, 989); -- Commendation of the Keepers of Time
i(129946, 935); -- Commendation of The Sha'tar
i(129947, 947); -- Commendation of Thrallmar
i(129948, FACTION_HONOR_HOLD); -- Commendation of Honor Hold
i(129951, FACTION_LOWER_CITY); -- Commendation of Lower City
i(129949, FACTION_CENARION_EXPEDITION); -- Commendation of the Cenarion Expedition
i(129945, FACTION_THE_CONSORTIUM); -- Commendation of The Consortium
i(129950, FACTION_KEEPERS_OF_TIME); -- Commendation of the Keepers of Time
i(129946, FACTION_THE_SHATAR); -- Commendation of The Sha'tar
i(129947, FACTION_THRALLMAR); -- Commendation of Thrallmar

-- Timewalking: Wrath of the Lich King
i(129955, FACTION_ALLIANCE_VANGUARD); -- Commendation of the Alliance Vanguard
Expand Down
48 changes: 24 additions & 24 deletions .contrib/Parser/DATAS/01 - Dungeons Raids/01 - Classic/1.0 Molten Core.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
["lvl"] = lvlsquish(50, 50, 25),
["groups"] = {
n(ACHIEVEMENTS, {
achWithRep(955, 749, { -- Hydraxian Waterlords
achWithRep(955, FACTION_HYDRAXIAN_WATERLORDS, { -- Hydraxian Waterlords
-- #if BEFORE WRATH
["description"] = "Raise your reputation with the Hydraxian Waterlords to Exalted.",
-- #endif
Expand All @@ -65,7 +65,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
ach(11741, {["timeline"] = {ADDED_7_2_0}}), -- So Hot Right Now (Molten Core)
}),
n(FACTIONS, {
faction(749, { -- Hydraxian Waterlords
faction(FACTION_HYDRAXIAN_WATERLORDS, { -- Hydraxian Waterlords
["icon"] = "Interface\\Icons\\Spell_frost_summonwaterelemental",
["qg"] = 13278, -- Duke Hydraxis
["coord"] = { 79.2, 73.6, AZSHARA },
Expand Down Expand Up @@ -115,7 +115,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
["qg"] = 13278, -- Duke Hydraxis
["sourceQuest"] = 6822, -- The Molten Core
["coord"] = { 79.2, 73.6, AZSHARA },
["minReputation"] = { 749, HONORED }, -- Hydraxian Waterlords, Honored.
["minReputation"] = { FACTION_HYDRAXIAN_WATERLORDS, HONORED }, -- Hydraxian Waterlords, Honored.
["lvl"] = 55,
})),
q(7633, bubbleDown({ ["timeline"] = { ADDED_1_0_1, REMOVED_4_0_3 } }, { -- An Introduction
Expand Down Expand Up @@ -365,13 +365,13 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
n(REWARDS, {
i(17333, { -- Aqual Quintessence
["description"] = "Return to the Duke at Honored reputation after completing the Hands of the Enemy quest to receive this item from a dialog option.",
["minReputation"] = { 749, HONORED }, -- Hydraxian Waterlords, Honored.
["minReputation"] = { FACTION_HYDRAXIAN_WATERLORDS, HONORED }, -- Hydraxian Waterlords, Honored.
["sourceQuest"] = 6824, -- Hands of the Enemy
["timeline"] = { ADDED_1_0_1, REMOVED_3_0_8 },
}),
applyclassicphase(PHASE_THREE, i(22754, { -- Eternal Quintessence
["description"] = "Return to the Duke at Revered reputation to be given a version of your Quintessence that can be used more than once.",
["minReputation"] = { 749, REVERED }, -- Hydraxian Waterlords, Revered.
["minReputation"] = { FACTION_HYDRAXIAN_WATERLORDS, REVERED }, -- Hydraxian Waterlords, Revered.
["sourceQuest"] = 6824, -- Hands of the Enemy
["timeline"] = { ADDED_1_0_1, REMOVED_3_0_8 },
})),
Expand Down Expand Up @@ -616,7 +616,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
-- #if after 4.4.0
["description"] = "For Blizzard to consider the Tier 1 Priest set as collected in the Transmog Preview, you need to loot these exact pants.",
-- #endif
}),
}),
i(18824), -- Magma Tempered Boots
i(19144), -- Sabatons of the Flamewalker
i(18821), -- Quick Strike Ring
Expand Down Expand Up @@ -922,7 +922,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.SCORCHED_CORE.BELT, i(226660)), -- Cenarion Girdle
tokencost(TOKENS.SCORCHED_CORE.LEGS, i(226666)), -- Cenarion Trousers
tokencost(TOKENS.SCORCHED_CORE.BOOTS, i(226663)), -- Cenarion Treads

-- DPS (Intellect)
tokencost(TOKENS.SCORCHED_CORE.HELM, i(226658)), -- Cenarion Antlers
tokencost(TOKENS.SCORCHED_CORE.SHOULDERS, i(226653)), -- Cenarion Mantle
Expand All @@ -932,7 +932,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.SCORCHED_CORE.BELT, i(226657)), -- Cenarion Cord
tokencost(TOKENS.SCORCHED_CORE.LEGS, i(226651)), -- Cenarion Pants
tokencost(TOKENS.SCORCHED_CORE.BOOTS, i(226652)), -- Cenarion Sandals

-- Healer
tokencost(TOKENS.SCORCHED_CORE.HELM, i(226647)), -- Cenarion Helm
tokencost(TOKENS.SCORCHED_CORE.SHOULDERS, i(226644)), -- Cenarion Spaulders
Expand All @@ -942,7 +942,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.SCORCHED_CORE.BELT, i(226650)), -- Cenarion Belt
tokencost(TOKENS.SCORCHED_CORE.LEGS, i(226646)), -- Cenarion Leggings
tokencost(TOKENS.SCORCHED_CORE.BOOTS, i(226645)), -- Cenarion Boots

-- Tank
tokencost(TOKENS.SCORCHED_CORE.HELM, i(226670)), -- Cenarion Crown
tokencost(TOKENS.SCORCHED_CORE.SHOULDERS, i(226674)), -- Cenarion Pauldrons
Expand All @@ -963,7 +963,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226542)), -- Giantstalker's Girdle
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226537)), -- Giantstalker's Chain Leggings
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226538)), -- Giantstalker's Sabatons

-- Ranged
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226533)), -- Giantstalker's Helmet
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226527)), -- Giantstalker's Epaulets
Expand All @@ -984,7 +984,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.INCANDESCENT.BELT, i(226555)), -- Arcanist Belt
tokencost(TOKENS.INCANDESCENT.LEGS, i(226561)), -- Arcanist Leggings
tokencost(TOKENS.INCANDESCENT.BOOTS, i(226557)), -- Arcanist Boots

-- Healer
tokencost(TOKENS.INCANDESCENT.HELM, i(226564)), -- Arcanist Headdress
tokencost(TOKENS.INCANDESCENT.SHOULDERS, i(226566)), -- Arcanist Shoulders
Expand All @@ -1005,7 +1005,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226597)), -- Lawbringer Girdle
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226598)), -- Lawbringer Leggings
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226601)), -- Lawbringer Battleboots

-- Healer
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226590)), -- Lawbringer Helm
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226588)), -- Lawbringer Spaulders
Expand All @@ -1015,7 +1015,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226592)), -- Lawbringer Belt
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226594)), -- Lawbringer Legplates
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226593)), -- Lawbringer Boots

-- Tank
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226607)), -- Lawbringer Headguard
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226605)), -- Lawbringer Pauldrons
Expand All @@ -1036,7 +1036,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.INCANDESCENT.BELT, i(226580)), -- Belt of Prophecy
tokencost(TOKENS.INCANDESCENT.LEGS, i(226583)), -- Leggings of Prophecy
tokencost(TOKENS.INCANDESCENT.BOOTS, i(226586)), -- Sandals of Prophecy

-- Healer
tokencost(TOKENS.INCANDESCENT.HELM, i(226573)), -- Circlet of Prophecy
tokencost(TOKENS.INCANDESCENT.SHOULDERS, i(226576)), -- Mantle of Prophecy
Expand All @@ -1057,7 +1057,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.SCORCHED_CORE.BELT, i(226440)), -- Nightslayer Belt
tokencost(TOKENS.SCORCHED_CORE.LEGS, i(226445)), -- Nightslayer Pants
tokencost(TOKENS.SCORCHED_CORE.BOOTS, i(226443)), -- Nightslayer Boots

-- Tank
tokencost(TOKENS.SCORCHED_CORE.HELM, i(226480)), -- Nightslayer Hood
tokencost(TOKENS.SCORCHED_CORE.SHOULDERS, i(226478)), -- Nightslayer Pauldrons
Expand All @@ -1078,7 +1078,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226641)), -- Earthfury Girdle
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226639)), -- Earthfury Chain Leggings
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226636)), -- Earthfury Battleboots

-- DPS (Intellect)
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226622)), -- Earthfury Visor
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226624)), -- Earthfury Mantle
Expand All @@ -1088,7 +1088,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226625)), -- Earthfury Cord
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226623)), -- Earthfury Leggings
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226620)), -- Earthfury Walkers

-- Healer
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226612)), -- Earthfury Helmet
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226611)), -- Earthfury Epaulets
Expand All @@ -1098,7 +1098,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.MOLTEN_SCALED.BELT, i(226616)), -- Earthfury Belt
tokencost(TOKENS.MOLTEN_SCALED.LEGS, i(226614)), -- Earthfury Legguards
tokencost(TOKENS.MOLTEN_SCALED.BOOTS, i(226613)), -- Earthfury Boots

-- Tank
tokencost(TOKENS.MOLTEN_SCALED.HELM, i(226630)), -- Earthfury Greathelm
tokencost(TOKENS.MOLTEN_SCALED.SHOULDERS, i(226632)), -- Earthfury Pauldrons
Expand All @@ -1119,7 +1119,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.INCANDESCENT.BELT, i(226551)), -- Felheart Belt
tokencost(TOKENS.INCANDESCENT.LEGS, i(226547)), -- Felheart Pants
tokencost(TOKENS.INCANDESCENT.BOOTS, i(226554)), -- Felheart Slippers

-- Tank
tokencost(TOKENS.INCANDESCENT.HELM, i(216922)), -- Felheart Crown
tokencost(TOKENS.INCANDESCENT.SHOULDERS, i(216925)), -- Felheart Mantle
Expand All @@ -1140,7 +1140,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
tokencost(TOKENS.SCORCHED_CORE.BELT, i(226498)), -- Sash of Might
tokencost(TOKENS.SCORCHED_CORE.LEGS, i(226493)), -- Leggings of Might
tokencost(TOKENS.SCORCHED_CORE.BOOTS, i(226496)), -- Treads of Might

-- Tank
tokencost(TOKENS.SCORCHED_CORE.HELM, i(226488)), -- Helm of Might
tokencost(TOKENS.SCORCHED_CORE.SHOULDERS, i(226491)), -- Shoulderplates of Might
Expand Down Expand Up @@ -1490,7 +1490,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
i(228297), -- Shard of the Flame
}),
n(227939, { -- The Molten Core

}),
spell(458843, { -- Molten Heat [Heat Level 3]
["description"] = "You can opt into Heat Level 3 by speaking to Duke Hydraxis. Doing so will drop 'Molten' varients of the weapons that have a neat molten appearance despite providing no difference in quality. (Cosmetic only!)",
Expand Down Expand Up @@ -1561,17 +1561,17 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
--[[
i(, { -- [Molten]
["crs"] = {
, --
, --
},
}),
i(, { -- [Molten]
["crs"] = {
, --
, --
},
}),
i(, { -- [Molten]
["crs"] = {
, --
, --
},
}),
]]--
Expand Down
Loading

0 comments on commit 47c89e1

Please sign in to comment.