Narcasung/Questie-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Remove route optimization from Questie-X (moved to Questie-RouteOptimizer plugin)

Browse Source
This commit is contained in:
Xurkon
2026-03-21 07:58:04 -05:00
parent 764ea7d2fc
commit 54aa7ea9bb
7 changed files with 4 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Options/IconsTab/QuestieOptionsIcons.lua
-2
View File
@@ -1137,7 +1137,6 @@ _GetIconTypes = function()
["loot_mono"] = "|T" .. Questie.icons["loot_mono"] .. ":0|t Loot mono",
["node_cut"] = "|T" .. Questie.icons["node_cut"] .. ":0|t pfQuest/Codex node cut center",
["object_mono"] = "|T" .. Questie.icons["object_mono"] .. ":0|t Object mono",
["route"] = "|T" .. Questie.icons["route"] .. ":0|t Route waypoint",
["slay_mono"] = "|T" .. Questie.icons["slay_mono"] .. ":0|t Slay mono",
["startend"] = "|T" .. Questie.icons["startend"] .. ":0|t Start and end",
["startendstart"] = "|T" .. Questie.icons["startendstart"] .. ":0|t Start and unfinished",
@@ -1175,7 +1174,6 @@ _GetIconTypesSort = function()
"startendstart",
"node",
"node_cut",
"route",
"player",
"fav",
"faction_alliance",
Modules/Options/QuestieOptionsDefaults.lua
-3
View File
@@ -158,9 +158,6 @@ function QuestieOptionsDefaults:Load()
objectiveProgressSoundChoiceName = "ObjectiveProgress",
iconTheme = "questie",
routeMode = 1,
routeDrawInterval = 5,
minimap = {
hide = false
},
Modules/Options/TrackerTab/QuestieOptionsTracker.lua
-28
View File
@@ -15,8 +15,6 @@ local TrackerLinePool = QuestieLoader:ImportModule("TrackerLinePool")
local TrackerQuestTimers = QuestieLoader:ImportModule("TrackerQuestTimers")
---@type QuestieArrow
local QuestieArrow = QuestieLoader:ImportModule("QuestieArrow")
---@type QuestieRouteOptimizer
local QuestieRouteOptimizer = QuestieLoader:ImportModule("QuestieRouteOptimizer")
---@type l10n
local l10n = QuestieLoader:ImportModule("l10n")
@@ -948,32 +946,6 @@ function QuestieOptions.tabs.tracker:Initialize()
},
}
},
route_header = {
type = "header",
order = 50,
name = function() return l10n('Quest Route Optimization') end,
},
routeMode = {
type = "select",
order = 51,
width = 2,
name = function() return l10n('Route Mode') end,
desc = function() return l10n('Choose how quest routes are calculated and displayed.') end,
disabled = function() return not Questie.db.profile.trackerEnabled end,
get = function() return Questie.db.profile.routeMode or 1 end,
set = function(_, value)
Questie.db.profile.routeMode = value
if QuestieRouteOptimizer and QuestieRouteOptimizer.Update then
QuestieRouteOptimizer:Update()
end
end,
values = {
[1] = l10n('Off'),
[2] = l10n('Single Quest'),
[3] = l10n('All Tracked Quests'),
[4] = l10n('TSP Approximation'),
},
},
}
}
Modules/QuestLinks/Hooks.lua
+1 -19
View File
@@ -43,24 +43,6 @@ function Hooks:HookQuestLogTitle()
-- but for chat links the original function usually just selects the quest anyway.
end
-- For shift-click tracking toggle, only handle if tracker is enabled
if Questie.db.profile.trackerEnabled and IsShiftKeyDown() then
local _, _, _, isHeader, _, _, _, questId = GetQuestLogTitle(questLogLineIndex)
if questId and questId > 0 and not isHeader then
-- Toggle tracking: if tracked, untrack; if untracked, track
local isTracked = Questie.db.char.TrackedQuests[questId] or (Questie.db.profile.autoTrackQuests and not Questie.db.char.AutoUntrackedQuests[questId])
if isTracked then
-- Quest is currently tracked — untrack it
pcall(QuestieTracker.UntrackQuestId, QuestieTracker, questId)
else
-- Quest is currently untracked — track it
Questie.db.char.TrackedQuests[questId] = true
Questie.db.char.AutoUntrackedQuests[questId] = nil
QuestieCombatQueue:Queue(function()
QuestieTracker:Update()
end)
end
end
end
end)
end
Modules/QuestieSlash.lua
-32
View File
@@ -64,7 +64,6 @@ function QuestieSlash.HandleCommands(input)
print(Questie:Colorize("/questie doable [questID] - " .. l10n("Prints whether you are eligibile to do a quest"), "yellow"));
print(Questie:Colorize("/questie version - " .. l10n("Prints Questie and client version info"), "yellow"));
print(Questie:Colorize("/questie learn [toggle/stats/clear/export] - " .. l10n("Self-learning database: toggle on/off, view stats, clear data, or export"), "yellow"));
print(Questie:Colorize("/questie route [off/single/all/tsp] - " .. l10n("Toggle quest route optimization. off=disable, single=single quest, all=all tracked, tsp=TSP approximation"), "yellow"));
return;
end
@@ -219,36 +218,5 @@ function QuestieSlash.HandleCommands(input)
return
end
-- /questie route [off/single/all/tsp]
if mainCommand == "route" then
local QuestieRouteOptimizer = QuestieLoader:ImportModule("QuestieRouteOptimizer")
if not QuestieRouteOptimizer or not QuestieRouteOptimizer.SetMode then
Questie:Print("QuestieRouteOptimizer module not loaded")
return
end
local ROUTE_MODE_OFF = 1
local ROUTE_MODE_SINGLE_QUEST = 2
local ROUTE_MODE_ALL_TRACKED = 3
local ROUTE_MODE_TSP_APPROXIMATION = 4
if subCommand == "off" or not subCommand then
QuestieRouteOptimizer:SetMode(ROUTE_MODE_OFF)
Questie:Print("Quest route " .. l10n("disabled"))
elseif subCommand == "single" then
QuestieRouteOptimizer:SetMode(ROUTE_MODE_SINGLE_QUEST)
Questie:Print("Quest route " .. l10n("set to single quest mode"))
elseif subCommand == "all" then
QuestieRouteOptimizer:SetMode(ROUTE_MODE_ALL_TRACKED)
Questie:Print("Quest route " .. l10n("set to all tracked quests mode"))
elseif subCommand == "tsp" then
QuestieRouteOptimizer:SetMode(ROUTE_MODE_TSP_APPROXIMATION)
Questie:Print("Quest route " .. l10n("set to TSP approximation mode"))
else
Questie:Print("Usage: /questie route [off/single/all/tsp]")
end
return
end
print(Questie:Colorize("[Questie] ", "yellow") .. l10n("Invalid command. For a list of options please type: ") .. Questie:Colorize("/questie help", "yellow"));
end
Modules/Tracker/QuestieRouteOptimizer.lua
+3 -324
View File
@@ -1,324 +1,3 @@
---@class QuestieRouteOptimizer
local QuestieRouteOptimizer = QuestieLoader:CreateModule("QuestieRouteOptimizer")
-------------------------
--Import modules.
-------------------------
---@type QuestieDB
local QuestieDB = QuestieLoader:ImportModule("QuestieDB")
---@type QuestieMap
local QuestieMap = QuestieLoader:ImportModule("QuestieMap")
---@type QuestieCompat
local QuestieCompat = QuestieLoader:ImportModule("QuestieCompat")
---@type QuestieFramePool
local QuestieFramePool = QuestieLoader:ImportModule("QuestieFramePool")
---@type l10n
local l10n = QuestieLoader:ImportModule("l10n")
-------------------------
--Compat
-------------------------
local pairs = pairs
local ipairs = ipairs
local tinsert = table.insert
local GetTime = GetTime
-------------------------
--Route optimization modes
-------------------------
local ROUTE_MODE_OFF = 1
local ROUTE_MODE_SINGLE_QUEST = 2
local ROUTE_MODE_ALL_TRACKED = 3
local ROUTE_MODE_TSP_APPROXIMATION = 4
-------------------------
--State
-------------------------
local routeIcons = {}
local routeLines = {}
-------------------------
--Constants
-------------------------
local ROUTE_COLOR = {0.2, 0.8, 1, 0.8}
local ROUTE_ICON_TYPE = "route"
--- Calculate distance between two points
---@param x1 number
---@param y1 number
---@param x2 number
---@param y2 number
---@return number distance
local function _GetDistance(x1, y1, x2, y2)
return math.sqrt((x2 - x1) ^ 2 + (y2 - y1) ^ 2)
end
--- Nearest neighbor TSP approximation
---@param coordinates table<number, {x: number, y: number, zone: number}>
---@return table<number, {x: number, y: number, zone: number}>
local function _NearestNeighborTSP(coordinates)
if #coordinates <= 1 then
return coordinates
end
local visited = {}
local route = {}
local current = 1
visited[current] = true
tinsert(route, coordinates[current])
for i = 2, #coordinates do
local nearestDist = math.huge
local nearestIdx = 0
for j = 1, #coordinates do
if not visited[j] then
local dist = _GetDistance(
coordinates[current].x, coordinates[current].y,
coordinates[j].x, coordinates[j].y
)
if dist < nearestDist then
nearestDist = dist
nearestIdx = j
end
end
end
if nearestIdx > 0 then
visited[nearestIdx] = true
tinsert(route, coordinates[nearestIdx])
current = nearestIdx
end
end
return route
end
--- Get spawn coordinates for objectives in a quest using the same structure as QuestieMap
---@param questId number
---@return table<number, {x: number, y: number, zone: number}>?
local function _GetQuestObjectiveCoords(questId)
local quest = QuestieDB.GetQuest(questId)
if not quest then
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Quest not found:", questId)
return nil
end
local coordinates = {}
---@param spawns table?
---@param zoneId number
local function AddCoordsFromSpawns(spawns, zoneId)
if not spawns then return end
for _, spawnList in pairs(spawns) do
if type(spawnList) == "table" then
for _, coord in pairs(spawnList) do
if type(coord) == "table" and coord[1] and coord[2] then
local x, y = coord[1], coord[2]
if x and y and x > 0 and x <= 100 and y > 0 and y <= 100 then
tinsert(coordinates, {
x = x,
y = y,
zone = zoneId
})
end
end
end
end
end
end
if quest.Objectives then
for _, objective in pairs(quest.Objectives) do
if objective.Spawns then
for zoneId, spawnData in pairs(objective.Spawns) do
AddCoordsFromSpawns(spawnData, zoneId)
end
end
if objective.Coordinates then
for _, coordData in pairs(objective.Coordinates) do
if type(coordData) == "table" then
for _, coord in pairs(coordData) do
if type(coord) == "table" and coord[1] and coord[2] then
local x, y = coord[1], coord[2]
if x and y and x > 0 and x <= 100 and y > 0 and y <= 100 then
tinsert(coordinates, {
x = x,
y = y,
zone = objective.Zone or 0
})
end
end
end
end
end
end
end
end
if quest.Finishers then
for _, finisher in pairs(quest.Finishers) do
if finisher.Spawns then
for zoneId, spawnData in pairs(finisher.Spawns) do
AddCoordsFromSpawns(spawnData, zoneId)
end
end
end
end
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Found", #coordinates, "coordinates for quest", questId)
return coordinates
end
--- Get spawn coordinates for all tracked quests
---@return table<number, {x: number, y: number, zone: number}>?
local function _GetAllTrackedQuestCoords()
local coordinates = {}
local trackedQuests = Questie.db.char.TrackedQuests
if not trackedQuests then
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] No tracked quests")
return nil
end
for questId in pairs(trackedQuests) do
local questCoords = _GetQuestObjectiveCoords(questId)
if questCoords then
for _, coord in pairs(questCoords) do
tinsert(coordinates, coord)
end
end
end
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Found", #coordinates, "total coordinates")
return coordinates
end
--- Clear all route visuals
function QuestieRouteOptimizer:ClearRoutes()
for _, icon in pairs(routeIcons) do
if icon and icon.Hide then
icon:Hide()
end
end
routeIcons = {}
for _, line in pairs(routeLines) do
if line and line.Hide then
line:Hide()
end
end
routeLines = {}
end
--- Draw route lines for a single zone
---@param waypoints table<number, {number, number}>
---@param zoneId number
local function _DrawZoneRoute(waypoints, zoneId)
if #waypoints < 2 then return end
local icon = CreateFrame("Button", "QuestieRouteIcon" .. #routeIcons, UIParent)
icon:SetWidth(1)
icon:SetHeight(1)
icon:SetPoint("CENTER", UIParent, "CENTER", 0, 0)
icon:SetFrameLevel(1)
icon:Show()
tinsert(routeIcons, icon)
local lineFrames = QuestieFramePool:CreateWaypoints(icon, waypoints, 2, ROUTE_COLOR, zoneId)
for _, lineFrame in ipairs(lineFrames) do
lineFrame:Show()
tinsert(routeLines, lineFrame)
end
end
--- Draw optimized route for given coordinates
---@param coordinates table<number, {x: number, y: number, zone: number}>
function QuestieRouteOptimizer:DrawRoute(coordinates)
self:ClearRoutes()
if not coordinates or #coordinates < 2 then
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Not enough coordinates to draw route")
return
end
local optimized = _NearestNeighborTSP(coordinates)
local currentZone = nil
local zoneWaypoints = {}
for _, coord in ipairs(optimized) do
if coord.zone == currentZone or not currentZone then
tinsert(zoneWaypoints, {coord.x, coord.y})
currentZone = coord.zone
else
if #zoneWaypoints >= 2 then
_DrawZoneRoute(zoneWaypoints, currentZone)
end
zoneWaypoints = {{coord.x, coord.y}}
currentZone = coord.zone
end
end
if #zoneWaypoints >= 2 then
_DrawZoneRoute(zoneWaypoints, currentZone)
end
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Drew", #routeLines, "route lines")
end
--- Update route based on current mode
function QuestieRouteOptimizer:Update()
local mode = Questie.db.profile.routeMode or ROUTE_MODE_OFF
Questie:Debug(Questie.DEBUG_DEVELOP, "[RouteOptimizer] Update called, mode:", mode)
if mode == ROUTE_MODE_OFF then
self:ClearRoutes()
elseif mode == ROUTE_MODE_SINGLE_QUEST then
local questId = QuestTrackerFrame and QuestTrackerFrame.selectedQuestID
if questId then
local coords = _GetQuestObjectiveCoords(questId)
if coords and #coords >= 2 then
self:DrawRoute(coords)
else
self:ClearRoutes()
end
else
self:ClearRoutes()
end
elseif mode == ROUTE_MODE_ALL_TRACKED or mode == ROUTE_MODE_TSP_APPROXIMATION then
local coords = _GetAllTrackedQuestCoords()
if coords and #coords >= 2 then
self:DrawRoute(coords)
else
self:ClearRoutes()
end
end
end
--- Toggle route visibility
function QuestieRouteOptimizer:Toggle()
if routeIcons and #routeIcons > 0 then
self:ClearRoutes()
Questie.db.profile.routeMode = ROUTE_MODE_OFF
else
self:Update()
end
end
--- Get current route mode
---@return number mode
function QuestieRouteOptimizer:GetMode()
return Questie.db.profile.routeMode or ROUTE_MODE_OFF
end
--- Set route mode
---@param mode number
function QuestieRouteOptimizer:SetMode(mode)
Questie.db.profile.routeMode = mode
self:Update()
end
return QuestieRouteOptimizer
-- QuestieRouteOptimizer has been moved to Questie-RouteOptimizer plugin
-- This file is kept for compatibility and will be removed in a future version
return nil
Questie.lua
-1
View File
@@ -193,7 +193,6 @@ Questie.icons = {
["loot_mono"] = QuestieLib.AddonPath .. "Icons\\loot_mono.tga",
["node_cut"] = QuestieLib.AddonPath .. "Icons\\node_cut.tga",
["object_mono"] = QuestieLib.AddonPath .. "Icons\\object_mono.tga",
["route"] = QuestieLib.AddonPath .. "Icons\\route.tga",
["slay_mono"] = QuestieLib.AddonPath .. "Icons\\slay_mono.tga",
["sod_rune"] = QuestieLib.AddonPath .. "Icons\\sod_rune.tga",
["startend"] = QuestieLib.AddonPath .. "Icons\\startend.tga",