Skip to content

Commit 6ad0472

Browse files
evil-morfarevil-morfar
committed
Added trinkets and tokens
1 parent edd2b8b commit 6ad0472

File tree

4 files changed

+133
-12
lines changed

4 files changed

+133
-12
lines changed

‎Utils/EncounterJournalData.lua‎

Lines changed: 102 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function RCLootCouncil:ExportEJData(nextTier, nextIsRaid, nextIndex, nextDiffID,
5050
nextIndex = nextIndex or 1
5151
nextDiffID = nextDiffID or 1
5252
if not nextTier then
53-
nextTier = 11 -- TWW
53+
nextTier = 12 -- TWW
5454
self:Print("Exporting the loot specs of all trinkets in the dungeon journal\n"
5555
.. "This command is intended to be run by the developer.\n"
5656
.. "After exporting is done and copy and paste the data into Utils/TrinketData.lua.\n"
@@ -255,14 +255,14 @@ end
255255
-- Trinket categories description according to specs that can loot the trinket.
256256
-- These categories should cover all trinkets in the Encounter Journal. Add more if any trinket is missing category.
257257
_G.RCTrinketCategories = {
258-
["73F7777777777"] = ALL_CLASSES, -- All Classes
258+
["77F7777777777"] = ALL_CLASSES, -- All Classes
259259
["0365002707767"] = ITEM_MOD_STRENGTH_SHORT .. "/" .. ITEM_MOD_AGILITY_SHORT, -- Strength/Agility
260260
["0000000700067"] = ITEM_MOD_STRENGTH_SHORT, -- Strength
261261
["0365002707467"] = MELEE, -- Melee
262262
["33F7777077710"] = ITEM_MOD_AGILITY_SHORT .. "/" .. ITEM_MOD_INTELLECT_SHORT, -- Agility/Intellect
263263
["1375773047700"] = DAMAGER .. ", " .. ITEM_MOD_AGILITY_SHORT .. "/" .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Agility/Intellect
264264
["0365002007700"] = ITEM_MOD_AGILITY_SHORT, -- Agility
265-
["7092775070010"] = ITEM_MOD_INTELLECT_SHORT, -- Intellect
265+
["7492775070010"] = ITEM_MOD_INTELLECT_SHORT, -- Intellect
266266
["0241000100024"] = TANK, -- Tank
267267
["0041000100024"] = TANK, -- Tanks except DEMONHUNTER (Too old) - FORMER: All Classes?
268268
["0000000000024"] = TANK .. ", " .. BLOCK, -- Tank, Block (Warrior, Paladin)
@@ -285,9 +285,10 @@ _G.RCTrinketCategories = {
285285
["1010771050000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect
286286
["3092776070010"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage + Healers, Intellect
287287
["1010671040000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (direct damage, no affliction warlock and shadow priest)
288-
["5010771040000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (no discipline)
288+
["5410771040000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (no discipline)
289289
["1134773647743"] = DAMAGER, -- Damage (Pre augmentation evoker)
290290
["5134773647743"] = DAMAGER, -- Damage
291+
["5534773047700"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT .. "/" .. ITEM_MOD_AGILITY_SHORT, -- Damage Agi/Int
291292
["0325002007700"] = ITEM_MOD_AGILITY_SHORT, -- Agility (DPS + vengance and brewmaster)??
292293
["73F7777077710"] = ITEM_MOD_AGILITY_SHORT .. "/" .. ITEM_MOD_INTELLECT_SHORT, -- Agility/Intellect
293294
["0000000700077"] = ITEM_MOD_STRENGTH_SHORT, -- Strength
@@ -306,7 +307,7 @@ _G.RCTrinketCategories = {
306307
["0124002607447"] = MELEE, -- All melee + protection warrior?
307308
["0092775070010"] = ITEM_MOD_INTELLECT_SHORT, -- Intellect (No evoker)
308309
["03F7777777777"] = ALL_CLASSES, -- All Classes except Evoker
309-
["0010771040000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (no discipline or evoker)
310+
["0410771040000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (no discipline or evoker)
310311
["0010771050000"] = DAMAGER .. ", " .. ITEM_MOD_INTELLECT_SHORT, -- Damage, Intellect (no Evoker)
311312
["7300070000077"] = "", -- Class specific (Evoker, Demonhunter, Mage, Paladin, Warrior)
312313
["0007707000700"] = "", -- Class specific (Monk, Warlock, Shaman, Hunter)
@@ -552,8 +553,8 @@ _G.RCTrinketSpecs = {
552553
[37657] = "0092775070010", -- Spark of Life, Intellect
553554
-- Halls of Stone Heroic (id: 277).
554555
-- Pit of Saron Normal (id: 278).
555-
[50235] = "0241000100024", -- Ick's Rotting Thumb, Tank
556-
[50259] = "3092775070010", -- Nevermelting Ice Crystal, Intellect
556+
-- [50235] = "0241000100024", -- Ick's Rotting Thumb, Tank
557+
-- [50259] = "3092775070010", -- Nevermelting Ice Crystal, Intellect
557558
-- Pit of Saron Heroic (id: 278).
558559
-- The Culling of Stratholme Normal (id: 279).
559560
[37111] = "0082004030010", -- Soul Preserver, Healer
@@ -1345,10 +1346,10 @@ _G.RCTrinketSpecs = {
13451346
[142164] = "0124002607443", -- Toe Knee's Promise, Damage, Melee
13461347
-- Return to Karazhan Mythic (id: 860).
13471348
-- Seat of the Triumvirate Heroic (id: 945).
1348-
[151312] = "0241000100024", -- Ampoule of Pure Void, Tank
1349-
[151340] = "0082004030010", -- Echo of L'ura, Healer
1350-
[151310] = "0010771050000", -- Reality Breacher,
1351-
[151307] = "0124002607743", -- Void Stalker's Contract, Damage, Strength/Agility
1349+
-- [151312] = "0241000100024", -- Ampoule of Pure Void, Tank
1350+
-- [151340] = "0082004030010", -- Echo of L'ura, Healer
1351+
-- [151310] = "0010771050000", -- Reality Breacher,
1352+
-- [151307] = "0124002607743", -- Void Stalker's Contract, Damage, Strength/Agility
13521353
-- Seat of the Triumvirate Mythic (id: 945).
13531354
-- The Arcway Heroic (id: 726).
13541355
[137419] = "33F7777777777", -- Chrono Shard, All Classes
@@ -2081,6 +2082,90 @@ _G.RCTrinketSpecs = {
20812082
-- Eco-Dome Al'dani Mythic (id: 1303).
20822083
-- Halls of Atonement Heroic (id: 1185).
20832084
[246344] = "0124002607443", -- Cursed Stone Idol, Damage, Melee
2085+
2086+
2087+
-- Midnight Normal (id: 1312).
2088+
[250462] = "77F7777777777", -- Forgotten Farstrider's Insignia, All
2089+
-- The Dreamrift Normal (id: 1314).
2090+
[249343] = "77F7777777777", -- Gaze of the Alnseer, All
2091+
[249805] = "0124002607743", -- Undreamt God's Oozing Vestige, Damage, Strength/Agility
2092+
-- The Dreamrift Heroic (id: 1314).
2093+
-- The Dreamrift Mythic (id: 1314).
2094+
-- The Dreamrift Looking For Raid (id: 1314).
2095+
-- The Voidspire Normal (id: 1307).
2096+
[249339] = "0241000100024", -- Gloom-Spattered Dreadscale, Tank
2097+
[249342] = "0000000700067", -- Heart of Ancient Hunger, Strength
2098+
[249344] = "0124002607743", -- Light Company Guidon, Damage, Strength/Agility
2099+
[249808] = "2082004030010", -- Litany of Lightblind Wrath, Healer
2100+
[249809] = "7492775070010", -- Locus-Walker's Ribbon, Intellect
2101+
[249345] = "0124002007700", -- Ranger-Captain's Iridescent Insignia, Damage, Agility
2102+
[249346] = "7492775070010", -- Vaelgor's Final Stare, Intellect
2103+
[249341] = "2082004030010", -- Volatile Void Suffuser, Healer
2104+
[249340] = "5410771040000", -- Wraps of Cosmic Madness, Damage, int
2105+
-- The Voidspire Heroic (id: 1307).
2106+
-- The Voidspire Mythic (id: 1307).
2107+
-- The Voidspire Looking For Raid (id: 1307).
2108+
-- March on Quel'Danas Normal (id: 1308).
2109+
[249811] = "2082004030010", -- Light of the Cosmic Crescendo, Healer
2110+
[249806] = "0365002707767", -- Radiant Plume, Strength/Agility
2111+
[249810] = "5410771040000", -- Shadow of the Empyrean Requiem, Damage, int
2112+
[249807] = "0241000100024", -- The Eternal Egg, Tank
2113+
[260235] = "0365002707767", -- Umbral Plume, Strength/Agility
2114+
-- March on Quel'Danas Heroic (id: 1308).
2115+
-- March on Quel'Danas Mythic (id: 1308).
2116+
-- March on Quel'Danas Looking For Raid (id: 1308).
2117+
-- Magisters' Terrace Normal (id: 1300).
2118+
[250257] = "5534773047700", -- Eye of the Drowning Void, DPS, Agility/Intellect
2119+
[250242] = "0241000100024", -- Jelly Replicator, Tank
2120+
[250246] = "2082004030010", -- Refueling Orb, Healer
2121+
-- Magisters' Terrace Heroic (id: 1300).
2122+
-- Magisters' Terrace Mythic (id: 1300).
2123+
-- Maisara Caverns Normal (id: 1315).
2124+
[250223] = "0410771040000", -- Soulcatcher's Charm, Damage, int
2125+
[250258] = "77F7777777777", -- Vessel of Tortured Souls, All
2126+
-- Maisara Caverns Heroic (id: 1315).
2127+
-- Maisara Caverns Mythic (id: 1315).
2128+
-- Nexus-Point Xenas Normal (id: 1316).
2129+
[250241] = "0000000700067", -- Mark of Light, Strength
2130+
[250253] = "2082004030010", -- Whisper of the Duskwraith, Healer
2131+
-- Nexus-Point Xenas Heroic (id: 1316).
2132+
-- Nexus-Point Xenas Mythic (id: 1316).
2133+
-- Windrunner Spire Normal (id: 1299).
2134+
[250144] = "77F7777077710", -- Emberwing Feather, All
2135+
[250256] = "77F7777777777", -- Heart of Wind, All
2136+
[250227] = "0124002607443", -- Kroluk's Warbanner, Damage, Melee
2137+
[250226] = "0124002607443", -- Latch's Crooked Hook, Damage, Melee
2138+
-- Windrunner Spire Heroic (id: 1299).
2139+
-- Windrunner Spire Mythic (id: 1299).
2140+
-- Algeth'ar Academy Normal (id: 1201).
2141+
[193701] = "0365002707767", -- Algeth'ar Puzzle Box, Strength/Agility
2142+
[193719] = "0000000700067", -- Dragon Games Equipment, Strength
2143+
[193718] = "6082004030010", -- Emerald Coach's Whistle, Healer
2144+
-- Algeth'ar Academy Heroic (id: 1201).
2145+
-- Algeth'ar Academy Mythic (id: 1201).
2146+
-- Pit of Saron Normal (id: 278).
2147+
[50235] = "0241000100024", -- Ick's Rotting Thumb, Tank
2148+
[50259] = "7492775070010", -- Nevermelting Ice Crystal, Intellect
2149+
-- Pit of Saron Heroic (id: 278).
2150+
[252421] = "0241000100024", -- Rotting Globule, Tank
2151+
-- Pit of Saron Mythic (id: 278).
2152+
-- Seat of the Triumvirate Heroic (id: 945).
2153+
[151312] = "0241000100024", -- Ampoule of Pure Void, Tank
2154+
[151340] = "2082004030010", -- Echo of L'ura, Healer
2155+
[151310] = "5410771050000", -- Reality Breacher,
2156+
[151307] = "0124002607743", -- Void Stalker's Contract, Damage, Strength/Agility
2157+
-- Seat of the Triumvirate Mythic (id: 945).
2158+
-- Skyreach Normal (id: 476).
2159+
[110011] = "0000000600043", -- Fires of the Sun, Damage, Strength
2160+
[110006] = "2082004030010", -- Rukhran's Quill, Healer
2161+
[110016] = "0241000100024", -- Solar Containment Unit, Tank
2162+
-- Skyreach Heroic (id: 476).
2163+
[252411] = "2082004030010", -- Radiant Sunstone, Healer
2164+
[252418] = "0241000100024", -- Solar Core Igniter, Tank
2165+
[252420] = "0365002707767", -- Solarflare Prism, Strength/Agility
2166+
-- Skyreach Mythic (id: 476).
2167+
-- Skyreach Timewalking (id: 476).
2168+
-- Keystone Dungeons Mythic (id: 1319).
20842169
}
20852170

20862171
--- Items listed as rare or above in the encounter journal.
@@ -2108,4 +2193,10 @@ _G.RCRareItems = {
21082193
[243307] = true, -- Interloper's Plated Sabatons
21092194
[243306] = true, -- Interloper's Reinforced Sandals
21102195
[243305] = true, -- Interloper's Silken Striders
2196+
2197+
-- Midnight Normal (id: 1312).
2198+
-- The Voidspire Normal (id: 1307).
2199+
[249368] = true, -- Eternal Voidsong Chain
2200+
-- March on Quel'Danas Normal (id: 1308).
2201+
[249920] = true, -- Eye of Midnight
21112202
}

‎Utils/tokenData.lua‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,28 @@ _G.RCTokenTable = {
890890
[237598] = "ShoulderSlot", -- Mystic Yearning Cursemark,
891891
[237599] = "ShoulderSlot", -- Venerated Yearning Cursemark,
892892
[237600] = "ShoulderSlot", -- Zenith Yearning Cursemark,
893+
894+
-- Midnight
895+
[249347] = "ChestSlot", -- Alnwoven Riftbloom,
896+
[249348] = "ChestSlot", -- Alncured Riftbloom,
897+
[249349] = "ChestSlot", -- Alncast Riftbloom,
898+
[249350] = "ChestSlot", -- Alnforged Riftbloom,
899+
[249351] = "HandsSlot", -- Voidwoven Hungering Nullcore,
900+
[249352] = "HandsSlot", -- Voidcured Hungering Nullcore,
901+
[249353] = "HandsSlot", -- Voidcast Hungering Nullcore,
902+
[249354] = "HandsSlot", -- Voidforged Hungering Nullcore,
903+
[249355] = "HeadSlot", -- Voidwoven Fanatical Nullcore,
904+
[249356] = "HeadSlot", -- Voidcured Fanatical Nullcore,
905+
[249357] = "HeadSlot", -- Voidcast Fanatical Nullcore,
906+
[249358] = "HeadSlot", -- Voidforged Fanatical Nullcore,
907+
[249359] = "LegsSlot", -- Voidwoven Corrupted Nullcore,
908+
[249360] = "LegsSlot", -- Voidcured Corrupted Nullcore,
909+
[249361] = "LegsSlot", -- Voidcast Corrupted Nullcore,
910+
[249362] = "LegsSlot", -- Voidforged Corrupted Nullcore,
911+
[249363] = "ShoulderSlot", -- Voidwoven Unraveled Nullcore,
912+
[249364] = "ShoulderSlot", -- Voidcured Unraveled Nullcore,
913+
[249365] = "ShoulderSlot", -- Voidcast Unraveled Nullcore,
914+
[249366] = "ShoulderSlot", -- Voidforged Unraveled Nullcore,
893915
}
894916

895917
-- The base item level for the token on normal difficulty

‎__tests/wow_api/wow_api.lua‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,13 @@ local CLASS_INFO = {
10481048
iconID = 1247265,
10491049
role = "TANK",
10501050
},
1051-
},
1051+
[3] = {
1052+
spedID = 1480,
1053+
name = "Devourer",
1054+
iconID = 7455385,
1055+
role = "DAMAGER",
1056+
}
1057+
}
10521058
},
10531059
[13] = {
10541060
className = "Evoker",

‎changelog.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Changes
22

3+
Added Midnight trinkets and tokens data.
4+
35
### Auto pass
46

57
Clarified Auto Pass options and descriptions.

0 commit comments

Comments
 (0)