diff --git a/DailyAutoShare/DASMenu.lua b/DailyAutoShare/DASMenu.lua index c4f7fbb..11f5e72 100644 --- a/DailyAutoShare/DASMenu.lua +++ b/DailyAutoShare/DASMenu.lua @@ -61,17 +61,6 @@ function DAS.CreateMenu(savedVars, defaults) name = "Activate auto quest stuff in...", controls = { - { -- checkbox: Clockwork City? - type = "checkbox", - tooltip = "Clockwork City?", - name = "Activate in Clockwork City?", - getFunc = function() return DAS.GetActiveIn(980) end, - setFunc = function(value) - DAS.SetActiveIn(980, value) - DAS.SetActiveIn(981, value) - DAS.SetActiveIn(983, value) - end - }, { type = "submenu", name = "Clockwork City", @@ -102,7 +91,7 @@ function DAS.CreateMenu(savedVars, defaults) type = "checkbox", name = "Hide", tooltip = "Don't show world boss dailies on UI list \nKeeps sharing on group invite", - getFunc = function() return DAS.GetQuestListItem(980, "boss", "invisible")end, + getFunc = function() return DAS.GetQuestListItem(980, "boss", "invisible") end, setFunc = function(value) DAS.SetQuestListItem(980, "boss", "invisible", value) end }, { -- header: CC Slagtown gathering dailies diff --git a/DailyAutoShare/DASUserSettingsAdapter.lua b/DailyAutoShare/DASUserSettingsAdapter.lua index 1c64c4a..bf5c4d6 100644 --- a/DailyAutoShare/DASUserSettingsAdapter.lua +++ b/DailyAutoShare/DASUserSettingsAdapter.lua @@ -395,8 +395,8 @@ function DAS.GetQuestStatus(questName, questList, zoneId) end function DAS.GetQuestListItem(zoneId, listName, listKey) - if nil == zoneId or nil == listName or nil == listKey then return end - if nil == DAS.settings[zoneId] or nil == DAS.settings[zoneId][listName] then return end + if nil == zoneId or nil == listName or nil == listKey then return false end + if nil == DAS.settings[zoneId] or nil == DAS.settings[zoneId][listName] then return false end return DAS.settings[zoneId][listName][listKey] end diff --git a/DailyAutoShare/DasGui.lua b/DailyAutoShare/DasGui.lua index 7df01c5..d753a97 100644 --- a/DailyAutoShare/DasGui.lua +++ b/DailyAutoShare/DasGui.lua @@ -141,7 +141,10 @@ local function shouldHideLabel(questName, questList, zoneId) zoneId = zoneId or DAS.GetZoneId() for questListName, questListData in pairs(questList) do - if questListData[questName] then + if questListData[questName] then + -- d(questName) + -- d("active: " .. tostring(DAS.GetQuestListItem(zoneId, questListName, "active"))) + -- d("hidden: " .. tostring(DAS.GetQuestListItem(zoneId, questListName, "invisible"))) return ( (not DAS.GetQuestListItem(zoneId, questListName, "active")) or DAS.GetQuestListItem(zoneId, questListName, "invisible")) diff --git a/DailyAutoShare/locale/en.lua b/DailyAutoShare/locale/en.lua index 59891d7..4299af6 100644 --- a/DailyAutoShare/locale/en.lua +++ b/DailyAutoShare/locale/en.lua @@ -76,7 +76,7 @@ local strings = { DAS_CLOCK_CROW_GLIT_TURNIN = "IMPLEMENT_ME", DAS_CLOCK_CROW_TRIB_TURNIN = "IMPLEMENT_ME", - DAS_CLOCK_CROW_NIBB_TURNIN = "IMPLEMENT_ME", + DAS_CLOCK_CROW_NIBB_TURNIN = "Here are the items you requested.", DAS_CLOCK_CROW_MORS_TURNIN = "IMPLEMENT_ME", DAS_CLOCK_CROW_RESP_TURNIN = "IMPLEMENT_ME", DAS_CLOCK_CROW_LEIS_TURNIN = "IMPLEMENT_ME", diff --git a/DailyAutoShare/questData/ClockworkCity.lua b/DailyAutoShare/questData/ClockworkCity.lua index 5acea29..66c3ada 100644 --- a/DailyAutoShare/questData/ClockworkCity.lua +++ b/DailyAutoShare/questData/ClockworkCity.lua @@ -142,10 +142,14 @@ DAS.shareables[zoneId3] = DAS.shareables[zoneId] DAS.bingo[zoneId2] = DAS.bingo[zoneId] DAS.bingo[zoneId3] = DAS.bingo[zoneId] +DAS.QuestLists[zoneId2] = DAS.QuestLists[zoneId] +DAS.QuestLists[zoneId3] = DAS.QuestLists[zoneId] DAS.questStartStrings[zoneId] = { [GetString(DAS_CLOCK_BOSS_START)] = true, [GetString(DAS_CLOCK_CAVE_START)] = true, + [GetString(DAS_CLOCK_CROW_START)] = true, + [GetString(DAS_CLOCK_CRAFT_START)] = true, } DAS.questStartStrings[zoneId2] = DAS.questStartStrings[zoneId] DAS.questStartStrings[zoneId3] = DAS.questStartStrings[zoneId] diff --git a/DailyAutoShare/startup.lua b/DailyAutoShare/startup.lua index 890c92f..c5126b0 100644 --- a/DailyAutoShare/startup.lua +++ b/DailyAutoShare/startup.lua @@ -79,6 +79,24 @@ local defaults = { ["active"] = true, }, }, + [980] = { + ["crow"] = { + ["invisible"] = false, + ["active"] = true, + }, + ["craft"] = { + ["invisible"] = false, + ["active"] = true, + }, + ["delve"] = { + ["invisible"] = false, + ["active"] = true, + }, + ["boss"] = { + ["invisible"] = false, + ["active"] = true, + }, + }, debugOutput = false, currentlyWithQuest = false,