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

fix: dedupe waypoint quest giver icons

Browse Source
This commit is contained in:
Xurkon
2026-06-13 10:45:32 -05:00
parent ff906c6f32
commit 51fe8bbf5a
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Quest/AvailableQuests.lua
+17 -5
View File
@@ -41,6 +41,14 @@ local dungeons = ZoneDB:GetDungeons()
local _CalculateAvailableQuests, _DrawChildQuests, _AddStarter, _DrawAvailableQuest, _GetQuestIcon, _GetIconScaleForAvailable, _HasProperDistanceToAlreadyAddedSpawns
local function _GetFirstWaypointCoord(waypoints)
if waypoints and waypoints[1] and waypoints[1][1] and waypoints[1][1][1] and waypoints[1][1][2] then
return waypoints[1][1]
end
return nil
end
---@param callback function | nil
function AvailableQuests.CalculateAndDrawAll(callback)
Questie:Debug(Questie.DEBUG_INFO, "[AvailableQuests.CalculateAndDrawAll]")
@@ -348,7 +356,8 @@ _AddStarter = function(starter, quest, tooltipKey)
local zoneId, spawns = next(starter.spawns or {})
while zoneId do
local alreadyAddedSpawns = {}
if spawns then
local waypointStart = starter.waypoints and _GetFirstWaypointCoord(starter.waypoints[zoneId])
if spawns and not waypointStart then
local spawnIndex = 1
while spawns[spawnIndex] do
local coords = spawns[spawnIndex]
@@ -396,7 +405,8 @@ _AddStarter = function(starter, quest, tooltipKey)
if starter.waypoints then
local zone, waypoints = next(starter.waypoints or {})
while zone do
if not dungeons[zone] and waypoints[1] and waypoints[1][1] and waypoints[1][1][1] then
local waypointStart = _GetFirstWaypointCoord(waypoints)
if not dungeons[zone] and waypointStart then
if not starterIcons[zone] then
local data = {
Id = quest.Id,
@@ -408,10 +418,12 @@ _AddStarter = function(starter, quest, tooltipKey)
Name = starter.name,
IsObjectiveNote = false,
}
starterIcons[zone] = QuestieMap:DrawWorldIcon(data, zone, waypoints[1][1][1], waypoints[1][1][2])
starterLocs[zone] = { waypoints[1][1][1], waypoints[1][1][2] }
starterIcons[zone] = QuestieMap:DrawWorldIcon(data, zone, waypointStart[1], waypointStart[2])
starterLocs[zone] = { waypointStart[1], waypointStart[2] }
end
if starterIcons[zone] then
QuestieMap:DrawWaypoints(starterIcons[zone], waypoints, zone)
end
QuestieMap:DrawWaypoints(starterIcons[zone], waypoints, zone)
end
zone, waypoints = next(starter.waypoints, zone)
end
Modules/Quest/QuestieQuest.lua
+18 -7
View File
@@ -1326,6 +1326,14 @@ local function _GetIconScaleForAvailable()
return Questie.db.profile.availableScale or 1.3
end
local function _GetFirstWaypointCoord(waypoints)
if waypoints and waypoints[1] and waypoints[1][1] and waypoints[1][1][1] and waypoints[1][1][2] then
return waypoints[1][1]
end
return nil
end
---@param quest Quest
function QuestieQuest:AddFinisher(quest)
--We should never ever add the quest if IsQuestFlaggedComplete true.
@@ -1413,7 +1421,8 @@ function QuestieQuest:AddFinisher(quest)
local finisherZone, spawns = next(finisher.spawns or {})
while finisherZone do
if (finisherZone ~= nil and spawns ~= nil) then
local waypointStart = finisher.waypoints and _GetFirstWaypointCoord(finisher.waypoints[finisherZone])
if (finisherZone ~= nil and spawns ~= nil and not waypointStart) then
local _, coords = next(spawns)
while _ do
local data = {
@@ -1469,8 +1478,9 @@ function QuestieQuest:AddFinisher(quest)
if finisher.waypoints then
local zone, waypoints = next(finisher.waypoints)
while zone do
if (not ZoneDB.IsDungeonZone(zone)) then
if not finisherIcons[zone] and waypoints[1] and waypoints[1][1] and waypoints[1][1][1] then
local waypointStart = _GetFirstWaypointCoord(waypoints)
if (not ZoneDB.IsDungeonZone(zone)) and waypointStart then
if not finisherIcons[zone] then
local data = {
Id = questId,
Icon = Questie.ICON_TYPE_COMPLETE,
@@ -1490,12 +1500,13 @@ function QuestieQuest:AddFinisher(quest)
data.Icon = Questie.ICON_TYPE_REPEATABLE_COMPLETE
end
finisherIcons[zone] = QuestieMap:DrawWorldIcon(data, zone, waypoints[1][1][1],
waypoints[1][1][2])
finisherLocs[zone] = { waypoints[1][1][1], waypoints[1][1][2] }
finisherIcons[zone] = QuestieMap:DrawWorldIcon(data, zone, waypointStart[1], waypointStart[2])
finisherLocs[zone] = { waypointStart[1], waypointStart[2] }
end
QuestieMap:DrawWaypoints(finisherIcons[zone], waypoints, zone)
if finisherIcons[zone] then
QuestieMap:DrawWaypoints(finisherIcons[zone], waypoints, zone)
end
end
zone, waypoints = next(finisher.waypoints, zone)
end