Skip to content

Commit

Permalink
8.3.04.8
Browse files Browse the repository at this point in the history
Fix for TomTom integration
  • Loading branch information
LanceDH committed Aug 12, 2020
1 parent bae125e commit e812f82
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
8 changes: 7 additions & 1 deletion Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,13 @@ end

-- This is just easier to maintain than changing the entire string every time
_V["PATCH_NOTES"] = {
{["version"] = "8.3.04"
{{["version"] = "8.3.04"
,["minor"] = "2"
,["fixes"] = {
"Fixed some issues with TomTom integration."
}
}
,["version"] = "8.3.04"
,["new"] = {
"Added support for setting profiles, allowing different for different characters."
,"New Quest List setting: Number of Rewards (default 1). Choose how many rewards you want displayed per quest (between 0 and 3)."
Expand Down
12 changes: 6 additions & 6 deletions External/TomTom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ local _V = addon.variables;
local WQT_Utils = addon.WQT_Utils;

local _settings = {
{["type"] = _V["SETTING_TYPES"].checkBox, ["categoryID"] = "TOMTOM", ["label"] = _L["USE_TOMTOM"], ["tooltip"] = _L["USE_TOMTOM_TT"]
, ["func"] = function(value)
{["template"] = "WQT_SettingCheckboxTemplate", ["categoryID"] = "TOMTOM", ["label"] = _L["USE_TOMTOM"], ["tooltip"] = _L["USE_TOMTOM_TT"]
, ["valueChangedFunc"] = function(value)
WQT.settings.general.useTomTom = value;
end
,["getValueFunc"] = function() return WQT.settings.general.useTomTom; end
}
,{["type"] = _V["SETTING_TYPES"].checkBox, ["categoryID"] = "TOMTOM", ["label"] = _L["TOMTOM_AUTO_ARROW"], ["tooltip"] = _L["TOMTOM_AUTO_ARROW_TT"]
, ["func"] = function(value)
,{["template"] = "WQT_SettingCheckboxTemplate", ["categoryID"] = "TOMTOM", ["label"] = _L["TOMTOM_AUTO_ARROW"], ["tooltip"] = _L["TOMTOM_AUTO_ARROW_TT"]
, ["valueChangedFunc"] = function(value)
WQT.settings.general.TomTomAutoArrow = value;
end
,["getValueFunc"] = function() return WQT.settings.general.TomTomAutoArrow; end
,["isDisabled"] = function() return not WQT.settings.general.useTomTom; end
}
,{["type"] = _V["SETTING_TYPES"].checkBox, ["categoryID"] = "TOMTOM", ["label"] = _L["TOMTOM_CLICK_ARROW"], ["tooltip"] = _L["TOMTOM_CLICK_ARROW_TT"]
, ["func"] = function(value)
,{["template"] = "WQT_SettingCheckboxTemplate", ["categoryID"] = "TOMTOM", ["label"] = _L["TOMTOM_CLICK_ARROW"], ["tooltip"] = _L["TOMTOM_CLICK_ARROW_TT"]
, ["valueChangedFunc"] = function(value)
WQT.settings.general.TomTomArrowOnClick = value;

if (not value and WQT_WorldQuestFrame.softTomTomArrow and not IsWorldQuestHardWatched(WQT_WorldQuestFrame.softTomTomArrow)) then
Expand Down
12 changes: 12 additions & 0 deletions Locals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ L["MAP_FILTER_DISABLED_INFO"] = "停用過濾或許會隱藏某些任務。您
L["MAP_FILTER_DISABLED_TITLE"] = "某些世界地圖過濾已停用"
L["MAP_PINS"] = "地圖任務點"
L["MINI_ICONS"] = "小圖示"
L["NEW_PROFILE"] = "新設定檔"
L["NEW_PROFILE_TT"] = "基於現有設置建立一個新設定檔。"
L["NO_FACTION"] = "無陣營"
L["NUMBERS_FIRST"] = "%g萬"
L["NUMBERS_SECOND"] = "%g億"
Expand Down Expand Up @@ -426,11 +428,20 @@ L["PIN_TYPE"] = "任務類型圖示"
L["PIN_TYPE_TT"] = "在地圖圖示下顯示特殊任務類型圖示"
L["PRECISE_FILTER"] = "精確過濾"
L["PRECISE_FILTER_TT"] = "過濾器只顯示與所有類別匹配的任務,而不僅僅是任何類別。"
L["PROFILES"] = "設定檔"
L["QUEST_COUNTER"] = "任務日誌計數"
L["QUEST_COUNTER_INFO"] = "以下的|cFFFFd100%d|r隱藏任務計入您的任務上限而且無法忽略。這最終是暴雪的問題。"
L["QUEST_COUNTER_TITLE"] = "隱藏任務"
L["QUEST_COUNTER_TT"] = "顯示您預設任務日誌中的任務數。"
L["QUEST_LIST"] = "任務列表"
L["REMOVE_PROFILE"] = "移除設定檔"
L["REMOVE_PROFILE_TT"] = "移除當前啟用的設定檔。"
L["RESET_PROFILE"] = "重置設定檔"
L["RESET_PROFILE_TT"] = "重置當前啟用設定檔恢復為預設設定。"
L["REWARD_NUM_DISPLAY"] = "獎勵數量"
L["REWARD_NUM_DISPLAY_PIN"] = "獎勵圖示"
L["REWARD_NUM_DISPLAY_PIN_TT"] = "根據任務的獎勵添加類型圖示,最多不超過所選數量。"
L["REWARD_NUM_DISPLAY_TT"] = "應該顯示多少個任務獎勵。"
L["SAVE_SETTINGS"] = "儲存過濾/排序"
L["SAVE_SETTINGS_TT"] = "在每次登入與重載間儲存過濾與排序設置。"
L["SHOW_FACTION"] = "顯示陣營"
Expand All @@ -455,6 +466,7 @@ L["WHATS_NEW"] = "最新消息"
L["WHATS_NEW_TT"] = "查看World Quest Tab更新說明。"
L["WQT_FULLSCREEN_BUTTON_TT"] = "左鍵點擊以切換世界任務列表。右鍵點擊並拖動以變更位置。"


L["IS_AZIAN_CLIENT"] = true
end

Expand Down
2 changes: 1 addition & 1 deletion WorldQuestTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,7 @@ function WQT_CoreMixin:QUEST_WATCH_LIST_CHANGED(...)
-- Update TomTom arrows when quests change. Might be new that needs tracking or completed that needs removing
local autoArrow = WQT.settings.general.TomTomAutoArrow;
local clickArrow = WQT.settings.general.TomTomArrowOnClick;
if (questId and added and TomTom and WQT.settings.general.useTomTom and (clickArrow or autoArrow) and QuestUtils_IsQuestWorldQuest(questId)) then
if (questId and TomTom and WQT.settings.general.useTomTom and (clickArrow or autoArrow) and QuestUtils_IsQuestWorldQuest(questId)) then

if (added) then
if (clickArrow or IsWorldQuestHardWatched(questId)) then
Expand Down

0 comments on commit e812f82

Please sign in to comment.