Skip to content

Commit

Permalink
clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
cyriun committed Oct 19, 2023
1 parent b447349 commit 59b89b5
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 55 deletions.
7 changes: 3 additions & 4 deletions Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -674,12 +674,11 @@ function R:IsAttemptAllowed(item)
end

local _, _, _, _, _, _, _, _, _, LfgDungeonID = GetInstanceInfo()
print("Torghast Layer " .. LfgDungeonID)
if item.requiredDungeons[CONSTANTS.LFG_DUNGEON_IDS.TORGHAST_LAYER] then
if tContains(CONSTANTS.LFG_DUNGEON_IDS.TORGHAST_LAYER, LfgDungeonID) then
print("Toy drop tracking for Torghast Layer " .. LfgDungeonID)
if tContains(CONSTANTS.LFG_DUNGEON_IDS, LfgDungeonID) then
Rarity:Debug("Toy drop tracking for Torghast Layer " .. LfgDungeonID)
else
print("Not in Torghast Layer.")
Rarity:Debug("Not in Torghast Layer.")
return false
end
end
Expand Down
98 changes: 48 additions & 50 deletions DB/SharedConstants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -265,56 +265,54 @@ C.FACTION_IDS = {
}

C.LFG_DUNGEON_IDS = {
TORGHAST_LAYER = {
2197,
2198,
2199,
2200,
2295,
2296,
2297,
2298,
2201,
2202,
2203,
2204,
2299,
2300,
2301,
2302,
2205,
2206,
2207,
2208,
2303,
2304,
2305,
2306,
2209,
2210,
2211,
2212,
2307,
2308,
2309,
2310,
2213,
2214,
2215,
2216,
2311,
2312,
2313,
2314,
2217,
2218,
2219,
2220,
2315,
2316,
2317,
2318,
},
SKODUS_HALL_LAYER_9 = 2197,
SKODUS_HALL_LAYER_10 = 2198,
SKODUS_HALL_LAYER_11 = 2199,
SKODUS_HALL_LAYER_12 = 2200,
SKODUS_HALL_LAYER_13 = 2295,
SKODUS_HALL_LAYER_14 = 2296,
SKODUS_HALL_LAYER_15 = 2297,
SKODUS_HALL_LAYER_16 = 2298,
FRACTURE_CHAMBERS_LAYER_9 = 2201,
FRACTURE_CHAMBERS_LAYER_10 = 2202,
FRACTURE_CHAMBERS_LAYER_11 = 2203,
FRACTURE_CHAMBERS_LAYER_12 = 2204,
FRACTURE_CHAMBERS_LAYER_13 = 2299,
FRACTURE_CHAMBERS_LAYER_14 = 2300,
FRACTURE_CHAMBERS_LAYER_15 = 2301,
FRACTURE_CHAMBERS_LAYER_16 = 2302,
THE_SOULFORGES_LAYER_9 = 2205,
THE_SOULFORGES_LAYER_10 = 2206,
THE_SOULFORGES_LAYER_11 = 2207,
THE_SOULFORGES_LAYER_12 = 2208,
THE_SOULFORGES_LAYER_13 = 2303,
THE_SOULFORGES_LAYER_14 = 2304,
THE_SOULFORGES_LAYER_15 = 2305,
THE_SOULFORGES_LAYER_16 = 2306,
COLDHEART_INTERSTITA_LAYER_9 = 2209,
COLDHEART_INTERSTITA_LAYER_10 = 2210,
COLDHEART_INTERSTITA_LAYER_11 = 2211,
COLDHEART_INTERSTITA_LAYER_12 = 2212,
COLDHEART_INTERSTITA_LAYER_13 = 2307,
COLDHEART_INTERSTITA_LAYER_14 = 2308,
COLDHEART_INTERSTITA_LAYER_15 = 2309,
COLDHEART_INTERSTITA_LAYER_16 = 2310,
MORTREGAR_LAYER_9 = 2213,
MORTREGAR_LAYER_10 = 2214,
MORTREGAR_LAYER_11 = 2215,
MORTREGAR_LAYER_12 = 2216,
MORTREGAR_LAYER_13 = 2311,
MORTREGAR_LAYER_14 = 2312,
MORTREGAR_LAYER_15 = 2313,
MORTREGAR_LAYER_16 = 2314,
THE_UPPER_REACHES_LAYER_9 = 2217,
THE_UPPER_REACHES_LAYER_10 = 2218,
THE_UPPER_REACHES_LAYER_11 = 2219,
THE_UPPER_REACHES_LAYER_12 = 2220,
THE_UPPER_REACHES_LAYER_13 = 2315,
THE_UPPER_REACHES_LAYER_14 = 2316,
THE_UPPER_REACHES_LAYER_15 = 2317,
THE_UPPER_REACHES_LAYER_16 = 2318,
}

-- This doesn't really belong here and needs streamlining anyway, but for now this is the best place.
Expand Down
2 changes: 1 addition & 1 deletion DB/Toys/Shadowlands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ local shadowlandsToys = {
},
itemId = 187075,
chance = 50,
requiredDungeons = { [CONSTANTS.LFG_DUNGEON_IDS.TORGHAST_LAYER] = true },
requiredDungeons = { [CONSTANTS.LFG_DUNGEON_IDS] = true },
},
}

Expand Down

0 comments on commit 59b89b5

Please sign in to comment.