Skip to content

Commit

Permalink
Update for 10.0.7. Minor fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tga123 authored Mar 22, 2023
1 parent ff59950 commit 79496d1
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 9 deletions.
27 changes: 20 additions & 7 deletions Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ local function _DeepWipeTable(t)
end
-- /dump WorldMapFrame:GetMapID()
local WQT_DRAGONFLIGHT = {
[2026] = {["x"] = 0.66, ["y"] = 0.09}, -- Forbidden Reach
[2026] = {["x"] = 0.66, ["y"] = 0.09}, -- Forbidden Reach (dracthyr start)
[2151] = {["x"] = 0.66, ["y"] = 0.09}, -- Forbidden Reach
[2112] = {["x"] = 0.55, ["y"] = 0.48}, -- Valdrakken
[2022] = {["x"] = 0.49, ["y"] = 0.35}, -- Waking Shores
[2023] = {["x"] = 0.42, ["y"] = 0.56}, -- Ohn'ahran Plains
Expand Down Expand Up @@ -298,7 +299,8 @@ local WQT_DRAENOR = {
local ZonesByExpansion = {
[LE_EXPANSION_DRAGONFLIGHT] = {
1978, -- Dragon Isles
2026, -- Forbidden Reach
2026, -- Forbidden Reach (dracthyr start)
2151, -- Forbidden Reach
2112, -- Valdrakken
2022, -- Waking Shores
2023, -- Ohn'ahran Plains
Expand Down Expand Up @@ -616,7 +618,7 @@ _V["SETTING_LIST"] = {
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_RING", ["label"] = RELICSLOT, ["defaultColor"] = _V["WQT_COLOR_RELIC"],
["valueChangedFunc"] = UpdateColorID, ["colorID"] = "rewardRelic", ["getValueFunc"] = GetColorByID
},
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_RING", ["label"] = ANIMA, ["defaultColor"] = _V["WQT_COLOR_ARTIFACT"],
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_RING", ["label"] = WORLD_QUEST_REWARD_FILTERS_ANIMA, ["defaultColor"] = _V["WQT_COLOR_ARTIFACT"],
["valueChangedFunc"] = UpdateColorID, ["colorID"] = "rewardAnima", ["getValueFunc"] = GetColorByID
},
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_RING", ["label"] = ITEM_QUALITY6_DESC, ["defaultColor"] = _V["WQT_COLOR_ARTIFACT"],
Expand Down Expand Up @@ -656,7 +658,7 @@ _V["SETTING_LIST"] = {
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_AMOUNT", ["label"] = RELICSLOT, ["defaultColor"] = WHITE_FONT_COLOR,
["valueChangedFunc"] = UpdateColorID, ["colorID"] = "rewardTextRelic", ["getValueFunc"] = GetColorByID
},
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_AMOUNT", ["label"] = ANIMA, ["defaultColor"] = GREEN_FONT_COLOR,
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_AMOUNT", ["label"] = WORLD_QUEST_REWARD_FILTERS_ANIMA, ["defaultColor"] = GREEN_FONT_COLOR,
["valueChangedFunc"] = UpdateColorID, ["colorID"] = "rewardTextAnima", ["getValueFunc"] = GetColorByID
},
{["template"] = "WQT_SettingColorTemplate", ["categoryID"] = "COLORS_REWARD_AMOUNT", ["label"] = ITEM_QUALITY6_DESC, ["defaultColor"] = GREEN_FONT_COLOR,
Expand Down Expand Up @@ -1067,7 +1069,7 @@ _V["WQT_CVAR_LIST"] = {
_V["WQT_TYPEFLAG_LABELS"] = {
[2] = {["Default"] = DEFAULT, ["Elite"] = ELITE, ["PvP"] = PVP, ["Petbattle"] = PET_BATTLE_PVP_QUEUE, ["Dungeon"] = TRACKER_HEADER_DUNGEON, ["Raid"] = RAID, ["Profession"] = BATTLE_PET_SOURCE_4, ["Invasion"] = _L["TYPE_INVASION"], ["Assault"] = SPLASH_BATTLEFORAZEROTH_8_1_FEATURE2_TITLE
, ["Daily"] = DAILY, ["Threat"] = REPORT_THREAT, ["Bonus"] = SCENARIO_BONUS_LABEL}
,[3] = {["Item"] = ITEMS, ["Armor"] = WORLD_QUEST_REWARD_FILTERS_EQUIPMENT, ["Gold"] = WORLD_QUEST_REWARD_FILTERS_GOLD, ["Currency"] = CURRENCY, ["Artifact"] = ITEM_QUALITY6_DESC, ["Anima"] = ANIMA, ["Conduits"] = _L["REWARD_CONDUITS"]
,[3] = {["Item"] = ITEMS, ["Armor"] = WORLD_QUEST_REWARD_FILTERS_EQUIPMENT, ["Gold"] = WORLD_QUEST_REWARD_FILTERS_GOLD, ["Currency"] = CURRENCY, ["Artifact"] = ITEM_QUALITY6_DESC, ["Anima"] = WORLD_QUEST_REWARD_FILTERS_ANIMA, ["Conduits"] = _L["REWARD_CONDUITS"]
, ["Relic"] = RELICSLOT, ["None"] = NONE, ["Experience"] = POWER_TYPE_EXPERIENCE, ["Honor"] = HONOR, ["Reputation"] = REPUTATION}
};

Expand Down Expand Up @@ -1354,7 +1356,7 @@ _V["WQT_FACTION_DATA"] = {
,[2400] = { ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = "Alliance" ,["texture"] = 2909043 } -- Waveblade Ankoan
,[2417] = { ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 3196264 } -- Uldum Accord
,[2415] = { ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 3196265 } -- Rajani
-- Shadowlands - Speculation at this point, I can't test
-- Shadowlands
,[2407] = { ["expansion"] = LE_EXPANSION_SHADOWLANDS,["playerFaction"] = nil ,["texture"] = 3257748 } -- The Ascended
,[2410] = { ["expansion"] = LE_EXPANSION_SHADOWLANDS,["playerFaction"] = nil ,["texture"] = 3641396 } -- The Undying Army
,[2413] = { ["expansion"] = LE_EXPANSION_SHADOWLANDS,["playerFaction"] = nil ,["texture"] = 3257751 } -- Court of Harvesters
Expand All @@ -1372,7 +1374,9 @@ _V["WQT_FACTION_DATA"] = {
,[2517] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4640487 } -- Wrathion
,[2518] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4640488 } -- Sabellian
,[2550] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 134565 } -- Cobalt Assembly

,[2523] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4528811 } -- Dark Talons
,[2524] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4528812 } -- Obsidian Warders
,[2526] = { ["expansion"] = LE_EXPANSION_DRAGONFLIGHT,["playerFaction"] = nil ,["texture"] = 4901295 } -- Winterpelt Furbolg
}
-- Add localized faction names
for k, v in pairs(_V["WQT_FACTION_DATA"]) do
Expand Down Expand Up @@ -1510,6 +1514,15 @@ end

-- This is just easier to maintain than changing the entire string every time
_V["PATCH_NOTES"] = {
{["version"] = "10.0.7.0",
["new"] ={
"Added new Dragonflight zones and factions.",
},
["fixes"] = {
'Fixed "Anima" translation.',
'Fixed "Shadowlands" submenu in filters dropdown.',
},
},
{["version"] = "10.0.2.2",
["fixes"] = {
'Fixed "Sparks of Life" bug.',
Expand Down
2 changes: 2 additions & 0 deletions Locals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ L["WHATS_NEW_TT"] = "查看 World Quest Tab 的更新日志。"
L["WQT_FULLSCREEN_BUTTON_TT"] = "左键点击来切换世界任务列表,右键按住拖拽来改变位置。"
L["PRECISE_FILTER"] = "精确过滤"
L["PRECISE_FILTER_TT"] = "过滤器只显示与所有过滤匹配的任务,\\n而不仅仅是单一过滤匹配的任务。"
L["IGNORES_FILTERS"] = "始终显示"

L["IS_AZIAN_CLIENT"] = true
end
Expand Down Expand Up @@ -688,6 +689,7 @@ L["USE_TOMTOM_TT"] = "在此插件添加TomTom功能。"
L["WHATS_NEW"] = "最新消息"
L["WHATS_NEW_TT"] = "查看World Quest Tab更新說明。"
L["WQT_FULLSCREEN_BUTTON_TT"] = "左鍵點擊以切換世界任務列表。右鍵點擊並拖動以變更位置。"
L["IGNORES_FILTERS"] = "始終顯示類型"

L["IS_AZIAN_CLIENT"] = true
end
Expand Down
26 changes: 26 additions & 0 deletions WorldQuestTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@ local function FilterDDFunc(ddFrame)

-- Other expansions
info = ddFrame:CreateButtonInfo("expand");

-- Shadowlands
info.text = EXPANSION_NAME8;
info.value = 303;
ddFrame:AddButton(info);

-- BFA
info.text = EXPANSION_NAME7;
info.value = 302;
Expand Down Expand Up @@ -393,6 +399,26 @@ local function FilterDDFunc(ddFrame)
for k, flagKey in pairs(order) do
local factionInfo = type(flagKey) == "number" and WQT_Utils:GetFactionDataInternal(flagKey) or nil;

if (factionInfo and factionInfo.expansion == currExp and (not factionInfo.playerFaction or factionInfo.playerFaction == _playerFaction)) then
info.text = type(flagKey) == "number" and factionInfo.name or flagKey;
info.func = function(_, _, _, value)
options[flagKey] = value;
if (value) then
WQT_WorldQuestFrame.pinDataProvider:RefreshAllData()
end
WQT_QuestScrollFrame:UpdateQuestList();
end
info.checked = function() return options[flagKey] end;
ddFrame:AddButton(info);
end
end
elseif value == 303 then -- Shadowlands
local options = WQT.settings.filters[1].flags;
local order = WQT.filterOrders[1]
local currExp = LE_EXPANSION_SHADOWLANDS;
for k, flagKey in pairs(order) do
local factionInfo = type(flagKey) == "number" and WQT_Utils:GetFactionDataInternal(flagKey) or nil;

if (factionInfo and factionInfo.expansion == currExp and (not factionInfo.playerFaction or factionInfo.playerFaction == _playerFaction)) then
info.text = type(flagKey) == "number" and factionInfo.name or flagKey;
info.func = function(_, _, _, value)
Expand Down
4 changes: 2 additions & 2 deletions WorldQuestTab.toc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Interface: 100002
## Interface: 100007
## Title: World Quest Tab
## Notes: Creates a new quest tab to keep track of world quests.
## Author: LanceDH
## Version: 10.0.2.2
## Version: 10.0.7.0
## SavedVariables: BWQDB
## X-Website: https://www.curseforge.com/wow/addons/worldquesttab
## X-Curse-Project-ID: 102243
Expand Down

0 comments on commit 79496d1

Please sign in to comment.