Release Candidate 1

Tercioo · Aug 22, 2024 · a607b37 · a607b37
1 parent fd1b81c
commit a607b37
Show file tree

Hide file tree

Showing 9 changed files with 511 additions and 44 deletions.
diff --git a/WorldQuestTracker.lua b/WorldQuestTracker.lua
@@ -1267,6 +1267,11 @@ function SlashCmdList.WQTRACKER (msg, editbox)
 	else
 		WorldQuestTracker:Msg("version:", WQT_VERSION)
 
+		if (not WorldQuestTracker.SetupStatusbarButton) then
+			WorldQuestTracker:Msg(L["S_SLASH_OPENMAP_FIRST"])
+			return
+		end
+		WorldQuestTracker.OpenOptionsPanel()
 	end
 end
 

diff --git a/WorldQuestTracker_Core.lua b/WorldQuestTracker_Core.lua
@@ -12,6 +12,7 @@ if (not WorldQuestTracker) then
 end
 
 --framework
+---@type detailsframework
 local DF = _G ["DetailsFramework"]
 if (not DF) then
 	print("|cFFFFAA00World Quest Tracker: framework not found, if you just installed or updated the addon, please restart your client.|r")
@@ -221,6 +222,7 @@ WorldQuestTracker.OnMapHasChanged = function(self)
 		end
 	end)
 
+	DF.Schedules.RunNextTick(WorldQuestTracker.UpdateQuestIdentification)
 end
 
 hooksecurefunc(WorldMapFrame, "OnMapChanged", WorldQuestTracker.OnMapHasChanged)

diff --git a/WorldQuestTracker_IDs.lua b/WorldQuestTracker_IDs.lua
@@ -47,6 +47,13 @@ WorldQuestTracker.MapData.ZoneIDs = {
 	--Main Hub
 		AZEROTH =		947,
 
+	--wow11
+		KHAZALGAR = 	2274,
+		RINGINGDEEPS =	2214,
+		DORN = 			2248,
+		AZJKAHET = 		2255,
+		HALLOWFALL = 	2215,
+
 	--Dragonflight
 		DRAGONISLES = 	1978,
 		AZURESSPAN = 	2024,
@@ -112,10 +119,21 @@ WorldQuestTracker.DotLineScale = {
 	[zoneIDs.DRAGONISLES] = 2,
 	[2112] = 2, --valdrakken
 	[zoneIDs.EMERALDDREAM] = 2,
+
+	[zoneIDs.RINGINGDEEPS] = 3,
+	[zoneIDs.DORN] = 3,
+	[zoneIDs.AZJKAHET] = 3,
+	[zoneIDs.HALLOWFALL] = 3,
 }
 
 --all zones with world quests
 WorldQuestTracker.MapData.WorldQuestZones = {
+	--wow 11
+		[zoneIDs.DORN] = true,
+		[zoneIDs.AZJKAHET] = true,
+		[zoneIDs.HALLOWFALL] = true,
+		[zoneIDs.AZJKAHET] = true,
+
 	--Dragonflight
 		[zoneIDs.AZURESSPAN] = 		true,
 		[zoneIDs.THALDRASZUS] = 	true,
@@ -186,6 +204,7 @@ WorldQuestTracker.MapData.DragonflightZones = {
 
 --quest hub by expansion
 WorldQuestTracker.MapData.ExpMaps = {
+	[zoneIDs.KHAZALGAR] = 11,
 	[zoneIDs.DRAGONISLES] = 10,
 	[zoneIDs.THESHADOWLANDS] = 9,
 	[zoneIDs.ZANDALAR] = 8,
@@ -201,10 +220,12 @@ WorldQuestTracker.MapData.HubMapIconsScale = {
 	[zoneIDs.KULTIRAS] = 1,
 	[zoneIDs.AZEROTH] = 1,
 	[zoneIDs.BROKENISLES] = 0.8,
+	[zoneIDs.KHAZALGAR] = 0.8,
 }
 
 --list of map ids for world quest hubs
 WorldQuestTracker.MapData.QuestHubs = {
+	[zoneIDs.KHAZALGAR] = true, --wow11 hub
 	[zoneIDs.DRAGONISLES] = true, --dragon isles hub
 	[zoneIDs.THESHADOWLANDS] = true, --shadowlands hub
 	[zoneIDs.BROKENISLES] = true, --dalaran (~rev)
@@ -216,6 +237,47 @@ WorldQuestTracker.MapData.QuestHubs = {
 
 --world map anchors
 WorldQuestTracker.mapTables = {
+	--dlc 10 (tww)
+	[zoneIDs.RINGINGDEEPS] = 		{
+		widgets = {},
+		Anchor_X = 0.995,
+		Anchor_Y = 0.65,
+		GrowRight = false,
+		show_on_map = {
+			[zoneIDs.KHAZALGAR] = true,
+		},
+	},
+
+	[zoneIDs.HALLOWFALL] = 		{
+		widgets = {},
+		Anchor_X = 0.002,
+		Anchor_Y = 0.28,
+		GrowRight = true,
+		show_on_map = {
+			[zoneIDs.KHAZALGAR] = true,
+		},
+	},
+
+	[zoneIDs.DORN] = 		{
+		widgets = {},
+		Anchor_X = 0.3,
+		Anchor_Y = 0.12,
+		GrowRight = true,
+		show_on_map = {
+			[zoneIDs.KHAZALGAR] = true,
+		},
+	},
+
+	[zoneIDs.AZJKAHET] = 		{
+		widgets = {},
+		Anchor_X = 0.002,
+		Anchor_Y = 0.78,
+		GrowRight = true,
+		show_on_map = {
+			[zoneIDs.KHAZALGAR] = true,
+		},
+	},
+
 	--Dragon Isles (Dragonflight)
 
 		[zoneIDs.AZURESSPAN] = 		{
@@ -644,28 +706,16 @@ WorldQuestTracker.MapData.ResourceIcons = {
 	[1397630] = true, --order resources LEGION
 }
 
---which faction set to be used by the map id
---this table isn't being in use at the moment
-WorldQuestTracker.MapData.FactionByMapID = { --not in use
-	[zoneIDs.ZANDALAR] = "BFA",
-	[zoneIDs.KULTIRAS] = "BFA",
-	[zoneIDs.AZEROTH] = "BFA",
-
-	[619] = "LEGION", --brosken isles map
-	[905] = "LEGION", --argus map
-
-	[zoneIDs.ZULDAZAAR] = 	"BFA",
-	[zoneIDs.NAZMIR] = 		"BFA",
-	[zoneIDs.VOLDUN] = 		"BFA",
-	[zoneIDs.TIRAGARDE] = 	"BFA",
-	[zoneIDs.STORMSONG] = 	"BFA",
-	[zoneIDs.DRUSTVAR] = 	"BFA",
-}
-
 --start of ~factions
 
 -- texture ID of the reward when the world quest reward is a faction rep token
 WorldQuestTracker.MapData.ReputationIcons = {
+	--DLC 10 (tww)
+	[5891369] = true, --Council of Dornogal
+	[5891367] = true, --The Assembly of the Deeps
+	[5891368] = true, --Hallowfall Arathi
+	[5891370] = true, --The Severed Threads
+
 	--Dragonflight
 	[4687627] = true, --Maruuk Centaur
 	[4687628] = true, --Dragonscale Expedition
@@ -704,6 +754,12 @@ WorldQuestTracker.MapData.ReputationIcons = {
 ---list of relevant factions
 ---@type table<factionid, boolean>
 WorldQuestTracker.MapData.AllFactionIds = {
+	--DLC 10 (tww)
+	[2590] = true, --Council of Dornogal
+	[2594] = true, --The Assembly of the Deeps
+	[2570] = true, --Hallowfall Arathi
+	[2600] = true, --The Severed Threads
+
 	--Dragonflight Factions
 	[2503] = true, --Maruuk Centaur
 	--[2506] = true, --Dragonflight
@@ -753,6 +809,12 @@ WorldQuestTracker.MapData.AllFactionIds = {
 
 ---@type table<factionid, mapid>
 WorldQuestTracker.MapData.FactionMapId = {
+	--DLC 10 (tww)
+	[2590] = zoneIDs.DORN, --Council of Dornogal
+	[2594] = zoneIDs.RINGINGDEEPS, --The Assembly of the Deeps
+	[2570] = zoneIDs.HALLOWFALL, --Hallowfall Arathi
+	[2600] = zoneIDs.AZJKAHET, --The Severed Threads
+
 	--Dragonflight
 	[2503] = zoneIDs.OHNAHRANPLAINS, --Maruuk Centaur
 	[2507] = zoneIDs.WAKINGSHORES, --Dragonscale Expedition
@@ -773,6 +835,12 @@ WorldQuestTracker.MapData.FactionMapId = {
 
 ---@type table<factionid, string|number>
 WorldQuestTracker.MapData.FactionIcons = {
+	--DLC 10 (tww)
+	[2590] = 5891369, --Council of Dornogal
+	[2594] = 5891367, --The Assembly of the Deeps
+	[2570] = 5891368, --Hallowfall Arathi
+	[2600] = 5891370, --The Severed Threads
+
 	--Dragonflight
 	[2503] = 4687627, --Maruuk Centaur
 	[2507] = 4687628, --Dragonscale Expedition
@@ -820,6 +888,13 @@ WorldQuestTracker.MapData.FactionIcons = {
 --	/run for i =1, 3000 do local N={WorldQuestTracker.GetFactionDataByID(i)}if(N[1])then print(N[1].." "..N[14])end end
 }
 
+local WOW11Factions = { --DLC10 (tww)
+	[2590] = true, --Council of Dornogal
+	[2594] = true, --The Assembly of the Deeps
+	[2570] = true, --Hallowfall Arathi
+	[2600] = true, --The Severed Threads
+}
+
 local DragonflightFactions = {
 	[2503] = true, --Maruuk Centaur
 	[2507] = true, --Dragonscale Expedition
@@ -885,7 +960,7 @@ local LegionFactions = {
 --what are the factionIds belong to the map
 WorldQuestTracker.MapData.ReputationByMap = {
 	--world maps
-		[zoneIDs.DRAGONISLES] = DragonflightFactions,
+		[zoneIDs.KHAZALGAR] = WOW11Factions,
 		[zoneIDs.THESHADOWLANDS] = ShadowlandsFactions,
 		[zoneIDs.KULTIRAS] = BFAFactions,
 		[zoneIDs.ZANDALAR] = BFAFactions,
@@ -894,6 +969,12 @@ WorldQuestTracker.MapData.ReputationByMap = {
 		[zoneIDs.ARGUS] = LegionFactions,
 
 	--zones
+		--wow11
+		[zoneIDs.DORN] = WOW11Factions,
+		[zoneIDs.RINGINGDEEPS] = WOW11Factions,
+		[zoneIDs.HALLOWFALL] = WOW11Factions,
+		[zoneIDs.AZJKAHET] = WOW11Factions,
+
 		--Dragonflight
 		[zoneIDs.OHNAHRANPLAINS] = DragonflightFactions,
 		[zoneIDs.WAKINGSHORES] = DragonflightFactions,

diff --git a/WorldQuestTracker_Initialize.lua b/WorldQuestTracker_Initialize.lua
@@ -105,7 +105,7 @@ do
 			},
 
 			close_blizz_popups = {
-				ABANDON_QUEST = false,
+				ABANDON_QUEST = true,
 			},
 
 			sort_order = {
@@ -184,10 +184,17 @@ do
 				summary_widgets_per_row = 8,
 			},
 
+			speed_run = {
+				auto_accept = false,
+				auto_complete = false,
+				cancel_cinematic = false,
+			},
+
 			disable_world_map_widgets = false, --a
 			show_filter_button = false, --a
 			show_sort_button = false, --a
 			show_timeleft_button = true, --a
+			numerate_quests = true,
 
 			show_emissary_info = true,
 
@@ -206,8 +213,8 @@ do
 
 			last_news_time = 0,
 
-			world_summary_alpha = 0.843, --parei fazendo a substituição dos valores hardcoded to these values, parei na criação da opção de mudar o alpha, parei procurando as funções que atualiza of frames com o novo alpha
-			worldmap_widget_alpha = 0.843,
+			world_summary_alpha = 0.934, --parei fazendo a substituição dos valores hardcoded to these values, parei na criação da opção de mudar o alpha, parei procurando as funções que atualiza of frames com o novo alpha
+			worldmap_widget_alpha = 0.933,
 
 			hoverover_animations = true, --hover and shown slider animations
 			anchor_options = {}, --store the anchor options of each anchor
@@ -266,7 +273,7 @@ do
 
 			zone_map_config = {
 				summary_show = true,
-				quest_summary_scale = 1,
+				quest_summary_scale = 1.2,
 				show_widgets = true,
 				scale = 1,
 			},

diff --git a/WorldQuestTracker_OptionsPanel.lua b/WorldQuestTracker_OptionsPanel.lua
@@ -600,6 +600,17 @@ function WorldQuestTrackerAddon.OpenOptionsPanel()
                 name = "S_OPTTIONS_AUTOACCEPT_ABANDONQUEST",
                 desc = "S_OPTTIONS_AUTOACCEPT_ABANDONQUEST_DESC",
             },
+            {
+                type = "toggle",
+                get = function()
+                    return DB.profile.numerate_quests
+                end,
+                set = function(self, fixedparam, value)
+                    DB.profile.numerate_quests = value
+                end,
+                name = "S_OPTTIONS_NUMERATE_QUEST",
+                desc = "S_OPTTIONS_NUMERATE_QUEST_DESC",
+            },
 
             {type = "blank"},
 
@@ -814,6 +825,51 @@ function WorldQuestTrackerAddon.OpenOptionsPanel()
                 desc = "S_OPTIONS_WORLDMAP_WIDGET_ALPHA",
             },
 
+            {type = "blank"},
+            {
+                type = "label",
+                get = function() return "S_SPEEDRUN" end,
+                text_template = DF:GetTemplate("font", "ORANGE_FONT_TEMPLATE")
+            },
+            {
+                type = "toggle",
+                get = function()
+                    return WorldQuestTracker.db.profile.speed_run.auto_accept
+                end,
+                set = function(self, fixedparam, value)
+                    WorldQuestTracker.db.profile.speed_run.auto_accept = not WorldQuestTracker.db.profile.speed_run.auto_accept
+                    WorldQuestTracker.RefreshStatusBarButtons()
+                end,
+                name = "S_SPEEDRUN_AUTO_ACCEPT",
+                desc = "S_SPEEDRUN_AUTO_ACCEPT",
+            },
+            {
+                type = "toggle",
+                get = function()
+                    return WorldQuestTracker.db.profile.speed_run.auto_complete
+                end,
+                set = function(self, fixedparam, value)
+                    WorldQuestTracker.db.profile.speed_run.auto_complete = not WorldQuestTracker.db.profile.speed_run.auto_complete
+                    WorldQuestTracker.RefreshStatusBarButtons()
+                end,
+                name = "S_SPEEDRUN_AUTO_COMPLETE",
+                desc = "S_SPEEDRUN_AUTO_COMPLETE",
+            },
+            {
+                type = "toggle",
+                get = function()
+                    return WorldQuestTracker.db.profile.speed_run.cancel_cinematic
+                end,
+                set = function(self, fixedparam, value)
+                    WorldQuestTracker.db.profile.speed_run.cancel_cinematic = not WorldQuestTracker.db.profile.speed_run.cancel_cinematic
+                    WorldQuestTracker.RefreshStatusBarButtons()
+                end,
+                name = "S_SPEEDRUN_CANCEL_CINEMATIC",
+                desc = "S_SPEEDRUN_CANCEL_CINEMATIC",
+            },
+
+
+
             --
 
 			--map_frame_scale_enabled = false,