Fixes for Kel'Thuzad and Painsmith encounters
This commit is contained in:
+9
-7
@@ -6196,7 +6196,7 @@ function DF:PassLoadFilters (loadTable, encounterID)
|
||||
return
|
||||
end
|
||||
local hasEncounter
|
||||
for _, ID in ipairs (loadTable.encounter_ids) do
|
||||
for _, ID in pairs (loadTable.encounter_ids) do
|
||||
if (ID == encounterID) then
|
||||
hasEncounter = true
|
||||
break
|
||||
@@ -6213,7 +6213,7 @@ function DF:PassLoadFilters (loadTable, encounterID)
|
||||
local uiMapID = C_Map.GetBestMapForUnit ("player")
|
||||
|
||||
local hasMapID
|
||||
for _, ID in ipairs (loadTable.map_ids) do
|
||||
for _, ID in pairs (loadTable.map_ids) do
|
||||
if (ID == zoneMapID or ID == uiMapID) then
|
||||
hasMapID = true
|
||||
break
|
||||
@@ -6608,8 +6608,10 @@ function DF:OpenLoadConditionsPanel (optionsTable, callback, frameOptions)
|
||||
local textEntryRefresh = function (self)
|
||||
local idList = f.OptionsTable [self.DBKey]
|
||||
self:SetText ("")
|
||||
for i = 1, #idList do
|
||||
self:SetText (self:GetText() .. " " .. idList [i])
|
||||
for _, id in pairs(idList) do
|
||||
if tonumber(id) then
|
||||
self:SetText (self:GetText() .. " " .. id)
|
||||
end
|
||||
end
|
||||
self:SetText (self:GetText():gsub ("^ ", ""))
|
||||
end
|
||||
@@ -6618,7 +6620,7 @@ function DF:OpenLoadConditionsPanel (optionsTable, callback, frameOptions)
|
||||
wipe (f.OptionsTable [self.DBKey])
|
||||
local text = self:GetText()
|
||||
|
||||
for _, ID in ipairs ({strsplit ("", text)}) do
|
||||
for _, ID in ipairs ({strsplit (" ", text)}) do
|
||||
ID = DF:trim (ID)
|
||||
ID = tonumber (ID)
|
||||
if (ID) then
|
||||
@@ -6635,7 +6637,7 @@ function DF:OpenLoadConditionsPanel (optionsTable, callback, frameOptions)
|
||||
encounterIDEditbox:SetPoint ("topleft", encounterIDLabel, "bottomleft", 0, -2)
|
||||
encounterIDEditbox.DBKey = "encounter_ids"
|
||||
encounterIDEditbox.Refresh = textEntryRefresh
|
||||
encounterIDEditbox.tooltip = "Enter multiple IDs separating with a semicolon ()\nExample: 35 45 95\n\nUldir:\n"
|
||||
encounterIDEditbox.tooltip = "Enter multiple IDs separating with a whitespace.\nExample: 35 45 95\n\nSanctum of Domination:\n"
|
||||
for _, encounterTable in ipairs (DF:GetCLEncounterIDs()) do
|
||||
encounterIDEditbox.tooltip = encounterIDEditbox.tooltip .. encounterTable.ID .. " - " .. encounterTable.Name .. "\n"
|
||||
end
|
||||
@@ -6649,7 +6651,7 @@ function DF:OpenLoadConditionsPanel (optionsTable, callback, frameOptions)
|
||||
mapIDEditbox:SetPoint ("topleft", mapIDLabel, "bottomleft", 0, -2)
|
||||
mapIDEditbox.DBKey = "map_ids"
|
||||
mapIDEditbox.Refresh = textEntryRefresh
|
||||
mapIDEditbox.tooltip = "Enter multiple IDs separating with a semicolon ()\nExample: 35 45 95"
|
||||
mapIDEditbox.tooltip = "Enter multiple IDs separating with a whitespace\nExample: 35 45 95"
|
||||
mapIDEditbox:SetHook ("OnEnterPressed", textEntryOnEnterPressed)
|
||||
tinsert (f.AllTextEntries, mapIDEditbox)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user