Skip to content

Commit 7b43027

Browse files
snowflame0snowflame0
committed
Integrate most difficulty names into IngameLocales.lua and remove unused locale strings
1 parent ce9d345 commit 7b43027

File tree

28 files changed

+144
-134
lines changed

28 files changed

+144
-134
lines changed

‎AtlasLootClassic/AtlasLoot.lua‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ local UnitPosition = UnitPosition
1717
-- ----------------------------------------------------------------------------
1818
local AtlasLoot = _G.AtlasLoot
1919
local AL = AtlasLoot.Locales
20+
local ALIL = AtlasLoot.IngameLocales
2021

2122
local LibStub = _G.LibStub
2223

@@ -218,20 +219,23 @@ end
218219
-- Difficultys
219220
-- ##############################
220221
AtlasLoot.DIFFICULTY = {
221-
[175] = { id = 175, short = "rf", loc = AL["Raid Finder"], sourceLoc = AL["RF"], key = "RAIDFINDER" },
222-
[1] = { id = 1, short = "n", loc = AL["Normal"], sourceLoc = AL["N"], key = "NORMAL" },
223-
[2] = { id = 2, short = "h", loc = AL["Heroic"], sourceLoc = AL["H"], key = "HEROIC" },
224-
[3] = { id = 3, short = "r10", loc = AL["10 Raid"], sourceLoc = "10", key = "10RAID" },
225-
[4] = { id = 4, short = "r25", loc = AL["25 Raid"], sourceLoc = "25", key = "25RAID" },
226-
[5] = { id = 5, short = "r10h", loc = AL["10 Raid Heroic"], sourceLoc = AL["10H"], key = "10RAIDH" },
227-
[6] = { id = 6, short = "r25h", loc = AL["25 Raid Heroic"], sourceLoc = AL["25H"], key = "25RAIDH" },
228-
[9] = { id = 7, short = "r40", loc = AL["40 Raid"], sourceLoc = nil, key = "40RAID" },
229-
[148] = { id = 148, short = "r20", loc = AL["20 Raid"], sourceLoc = nil, key = "20RAID" },
230-
[173] = { id = 173, short = "n", loc = AL["Normal"], sourceLoc = AL["N"], key = "NORMAL2" },
231-
[174] = { id = 174, short = "h", loc = AL["Heroic"], sourceLoc = AL["H"], key = "HEROIC2" },
232-
[176] = { id = 176, short = "r25", loc = AL["25 Raid"], sourceLoc = "25", key = "25RAID2" },
233-
[193] = { id = 193, short = "r10h", loc = AL["10 Raid Heroic"], sourceLoc = AL["10H"], key = "10RAIDH2" },
234-
[194] = { id = 194, short = "r25h", loc = AL["25 Raid Heroic"], sourceLoc = AL["25H"], key = "25RAIDH2" },
222+
[1] = { id = 1, short = "n", loc = ALIL["Normal"], sourceLoc = AL["N"], key = "NORMAL" },
223+
[2] = { id = 2, short = "h", loc = ALIL["Heroic"], sourceLoc = AL["H"], key = "HEROIC" },
224+
[3] = { id = 3, short = "r10", loc = ALIL["10 Raid"], sourceLoc = "10", key = "10RAID" },
225+
[4] = { id = 4, short = "r25", loc = ALIL["25 Raid"], sourceLoc = "25", key = "25RAID" },
226+
[5] = { id = 5, short = "r10h", loc = ALIL["10 Raid Heroic"], sourceLoc = AL["10H"], key = "10RAIDH" },
227+
[6] = { id = 6, short = "r25h", loc = ALIL["25 Raid Heroic"], sourceLoc = AL["25H"], key = "25RAIDH" },
228+
[8] = { id = 8, short = "ch", loc = ALIL["Challenge Mode"], sourceLoc = AL["CM"], key = "CHALLENGE" },
229+
[9] = { id = 9, short = "r40", loc = ALIL["40 Raid"], sourceLoc = nil, key = "40RAID" },
230+
[11] = { id = 12, short = "scn", loc = ALIL["Normal Scenario"], sourceLoc = AL["SC"], key = "SCENARIO" },
231+
[14] = { id = 14, short = "flex", loc = ALIL["Flexible"], sourceLoc = AL["F"], key = "FLEXIBLE" },
232+
[148] = { id = 148, short = "r20", loc = ALIL["20 Raid"], sourceLoc = nil, key = "20RAID" },
233+
[173] = { id = 173, short = "n", loc = ALIL["Normal"], sourceLoc = AL["N"], key = "NORMAL2" },
234+
[174] = { id = 174, short = "h", loc = ALIL["Heroic"], sourceLoc = AL["H"], key = "HEROIC2" },
235+
[176] = { id = 176, short = "r25", loc = ALIL["25 Raid"], sourceLoc = "25", key = "25RAID2" },
236+
[193] = { id = 193, short = "r10h", loc = ALIL["10 Raid Heroic"], sourceLoc = AL["10H"], key = "10RAIDH2" },
237+
[194] = { id = 194, short = "r25h", loc = ALIL["25 Raid Heroic"], sourceLoc = AL["25H"], key = "25RAIDH2" },
238+
[237] = { id = 237, short = "c", loc = ALIL["Celestial"], sourceLoc = AL["C"], key = "CELESTIAL" },
235239
}
236240

237241
for k,v in pairs(AtlasLoot.DIFFICULTY) do

‎AtlasLootClassic/Data/ItemSet.lua‎

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

‎AtlasLootClassic/Documentation/TODO.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@
66
- [ ] S14 gear
77
- [ ] S15 gear
88
- [ ] Collections module needs to be populated
9-
- [x] New tier sets
109
- [ ] Legendaries clean up, add gems and other stuff
11-
- [x] World Drops
1210
- [ ] JP and VP vendors
1311
- [ ] Celestial dungeon vendor
14-
- [ ] Cooking vendors?
1512
- [ ] Spirit of Harmony vendor
16-
- [ ] Proving grounds/brawler's rewards?
13+
- [ ] Glyphs
14+
- [ ] Brawler's Guild
15+
- [x] New tier sets
16+
- [x] World Drops
17+
- [ ] Cooking vendors?
18+
- [ ] World event changes
1719
- [x] New mounts
1820
- [x] New pets
1921
- [x] New heirlooms
2022
- [x] New tabards
21-
- [ ] World event changes
22-
- [ ] Glyphs
2323
- ???
2424
- [ ] Finish Crafting module
2525
- [ ] Leatherworking
2626
- [x] Blacksmithing
2727
- [ ] Inscription
28+
- [ ] Redo all old glyphs under wrath/cata
2829
- [ ] Sets
2930
- [ ] Finish Dungeons and Raids module
3031
- [ ] Add Celestial Dungeon stuff to Dungeons and Raids

‎AtlasLootClassic/Locales/IngameLocales.lua‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,23 @@ local IngameLocales = {
300300
["Artifact"] = GLOBAL["ITEM_QUALITY6_DESC"],
301301
["Heirloom"] = GLOBAL["ITEM_QUALITY7_DESC"],
302302

303+
-- ######################################################################
304+
-- Difficulties
305+
-- ######################################################################
306+
["Normal"] = GetDifficultyInfo(1),
307+
["Heroic"] = GetDifficultyInfo(2),
308+
["10 Raid"] = GetDifficultyInfo(3),
309+
["25 Raid"] = GetDifficultyInfo(4),
310+
["10 Raid Heroic"] = GetDifficultyInfo(5),
311+
["25 Raid Heroic"] = GetDifficultyInfo(6),
312+
["Challenge Mode"] = GetDifficultyInfo(8),
313+
["40 Raid"] = GetDifficultyInfo(7),
314+
["Normal Scenario"] = GetDifficultyInfo(12),
315+
["Flexible"] = GetDifficultyInfo(14),
316+
["20 Raid"] = GetDifficultyInfo(148),
317+
["Celestial"] = GetDifficultyInfo(237),
318+
319+
303320
-- ######################################################################
304321
-- Misc
305322
-- ######################################################################

‎AtlasLootClassic_Collections/data-cata.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ local data = AtlasLoot.ItemDB:Add(addonname, 1, AtlasLoot.CATA_VERSION_NUM)
2525
local AL = AtlasLoot.Locales
2626
local ALIL = AtlasLoot.IngameLocales
2727

28-
-- local RAIDFINDER_DIFF = data:AddDifficulty("Raid Finder", nil, nil, nil, true)
28+
-- local RAIDFINDER_DIFF = data:AddDifficulty(AL["Raid Finder"], nil, nil, nil, true)
2929
local NORMAL_DIFF = data:AddDifficulty("NORMAL", nil, nil, nil, true)
3030
-- local HEROIC_DIFF = data:AddDifficulty("HEROIC", nil, nil, nil, true)
3131

‎AtlasLootClassic_Collections/data-mop.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ local data = AtlasLoot.ItemDB:Add(addonname, 1, AtlasLoot.MOP_VERSION_NUM)
2525
local AL = AtlasLoot.Locales
2626
local ALIL = AtlasLoot.IngameLocales
2727

28-
-- local RAIDFINDER_DIFF = data:AddDifficulty("Raid Finder", nil, nil, nil, true)
28+
local CELESTIAL_DIFF = data:AddDifficulty("CELESTIAL", nil, nil, nil, true)
2929
local NORMAL_DIFF = data:AddDifficulty("NORMAL", nil, nil, nil, true)
30-
-- local HEROIC_DIFF = data:AddDifficulty("HEROIC", nil, nil, nil, true)
30+
local HEROIC_DIFF = data:AddDifficulty("HEROIC", nil, nil, nil, true)
3131

3232
local VENDOR_DIFF = data:AddDifficulty(AL["Vendor"], "vendor", 0)
3333
local VENDOR_DIFF_P1 = data:AddDifficulty(AL["Vendor"] .. " - " .. AL["P1"], "vendor", 0)

‎AtlasLootClassic_Collections/data-tbc.lua‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ local GetForVersion = AtlasLoot.ReturnForGameVersion
2929

3030
local NORMAL_DIFF = data:AddDifficulty("NORMAL", nil, nil, nil, true)
3131
local HEROIC_DIFF = data:AddDifficulty("HEROIC", nil, nil, nil, true)
32-
local RAID10_DIFF = data:AddDifficulty("10RAID")
33-
local RAID10H_DIFF = data:AddDifficulty("10RAIDH")
34-
local RAID25_DIFF = data:AddDifficulty("25RAID")
35-
local RAID25H_DIFF = data:AddDifficulty("25RAIDH")
36-
37-
local VENDOR_DIFF = data:AddDifficulty(AL["Vendor"], "vendor", 0)
38-
local T10_1_DIFF = data:AddDifficulty(AL["10H / 25 / 25H"], "T10_1", 0)
39-
local T10_2_DIFF = data:AddDifficulty(AL["25 Raid Heroic"], "T10_2", 0)
4032

4133
local ALLIANCE_DIFF, HORDE_DIFF, LOAD_DIFF
4234
if UnitFactionGroup("player") == "Horde" then

‎AtlasLootClassic_Collections/data-wrath.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ local RAID25H_DIFF = data:AddDifficulty("25RAIDH")
3636

3737
local VENDOR_DIFF = data:AddDifficulty(AL["Vendor"], "vendor", 0)
3838
local T10_1_DIFF = data:AddDifficulty(AL["10H / 25 / 25H"], "T10_1", 0)
39-
local T10_2_DIFF = data:AddDifficulty(AL["25 Raid Heroic"], "T10_2", 0)
39+
local T10_2_DIFF = data:AddDifficulty(ALIL["25 Raid Heroic"], "T10_2", 0)
4040

4141
local ALLIANCE_DIFF, HORDE_DIFF, LOAD_DIFF
4242
if UnitFactionGroup("player") == "Horde" then

‎AtlasLootClassic_Collections/data.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ local ALIL = AtlasLoot.IngameLocales
2525
local GetForVersion = AtlasLoot.ReturnForGameVersion
2626

2727
local TWILIGHT_DIFF = data:AddDifficulty(AL["Elemental Rune Twilight"], nil, nil, nil, true)
28-
local CELESTIAL_DIFF = data:AddDifficulty(AL["Celestial"], nil, nil, nil, true)
29-
local FLEXIBLE_DIFF = data:AddDifficulty(AL["Flexible"], nil, nil, nil, true)
28+
local CELESTIAL_DIFF = data:AddDifficulty("CELESTIAL", nil, nil, nil, true)
29+
local FLEXIBLE_DIFF = data:AddDifficulty("FLEXIBLE", nil, nil, nil, true)
3030

3131
local NORMAL_DIFF = data:AddDifficulty("NORMAL", nil, nil, nil, true)
3232
local HEROIC_DIFF = data:AddDifficulty("HEROIC", nil, nil, nil, true)
@@ -37,7 +37,7 @@ local RAID25H_DIFF = data:AddDifficulty("25RAIDH")
3737

3838
local VENDOR_DIFF = data:AddDifficulty(AL["Vendor"], "vendor", 0)
3939
local T10_1_DIFF = data:AddDifficulty(AL["10H / 25 / 25H"], "T10_1", 0)
40-
local T10_2_DIFF = data:AddDifficulty(AL["25 Raid Heroic"], "T10_2", 0)
40+
local T10_2_DIFF = data:AddDifficulty("25RAIDH", "T10_2", 0)
4141

4242
local ALLIANCE_DIFF, HORDE_DIFF, LOAD_DIFF
4343
if UnitFactionGroup("player") == "Horde" then

‎AtlasLootClassic_Crafting/data-cata.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ local GetColorSkill = AtlasLoot.Data.Profession.GetColorSkillRankNoSpell
2222
local AL = AtlasLoot.Locales
2323
local ALIL = AtlasLoot.IngameLocales
2424

25-
local NORMAL_DIFF = data:AddDifficulty(AL["Normal"], "n", 1, nil, true)
25+
local NORMAL_DIFF = data:AddDifficulty("NORMAL", "n", 1, nil, true)
2626
local LEATHER_DIFF = data:AddDifficulty(ALIL["Leather"], "leather", 0)
2727
local MAIL_DIFF = data:AddDifficulty(ALIL["Mail"], "mail", 0)
2828
local PLATE_DIFF = data:AddDifficulty(ALIL["Plate"], "plate", 0)

0 commit comments

Comments
 (0)