Dusk/Guda-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/mailbox-ui

Browse Source
This commit is contained in:
Salikh Gurgenidze
2025-12-27 23:05:58 +04:00
parent e4bae8e4da efc9960358
commit da02c24e1a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Guda.toc
+1 -1
View File
@@ -2,7 +2,7 @@
## Title: Guda ## Title: Guda
## Notes: All-in-one bag and bank addon for Turtle WoW ## Notes: All-in-one bag and bank addon for Turtle WoW
## Author: Vati ## Author: Vati
## Version: 1.4.7 ## Version: 1.4.8
## SavedVariables: Guda_DB ## SavedVariables: Guda_DB
## SavedVariablesPerCharacter: Guda_CharDB ## SavedVariablesPerCharacter: Guda_CharDB
Sorting/SortEngine.lua
+7 -4
View File
@@ -860,6 +860,9 @@ local function ApplySort(bagIDs, items, targetPositions)
PickupContainerItem(move.targetBag, move.targetSlot) PickupContainerItem(move.targetBag, move.targetSlot)
ClearCursor() ClearCursor()
moveCount = moveCount + 1 moveCount = moveCount + 1
else
-- If item is locked, it might be due to server lag or another process.
-- We don't increment moveCount but the item will be picked up in next pass.
end end
end end
@@ -1337,7 +1340,7 @@ function SortEngine:ExecuteSort(sortFunction, analyzeFunction, updateFrame, sort
local passCount = 0 local passCount = 0
local maxPasses = math.max(analysis.passes, 1) -- Use estimated passes, minimum 1 local maxPasses = math.max(analysis.passes, 1) -- Use estimated passes, minimum 1
local safetyLimit = math.max(maxPasses * 2, 6) -- Reasonable upper bound local safetyLimit = math.max(maxPasses * 3, 10) -- Reasonable upper bound
local totalMoves = 0 local totalMoves = 0
local noProgressPasses = 0 local noProgressPasses = 0
@@ -1388,7 +1391,7 @@ function SortEngine:ExecuteSort(sortFunction, analyzeFunction, updateFrame, sort
noProgressPasses = 0 noProgressPasses = 0
end end
if noProgressPasses >= 3 then if noProgressPasses >= 5 then
addon:Print("%s sort stopped due to no progress after %d passes (items remaining: %d/%d)", addon:Print("%s sort stopped due to no progress after %d passes (items remaining: %d/%d)",
sortType, passCount, currentAnalysis.itemsOutOfPlace, currentAnalysis.totalItems) sortType, passCount, currentAnalysis.itemsOutOfPlace, currentAnalysis.totalItems)
-- Final update -- Final update
@@ -1409,8 +1412,8 @@ function SortEngine:ExecuteSort(sortFunction, analyzeFunction, updateFrame, sort
sortType, passCount, moveCount, currentAnalysis.itemsOutOfPlace, currentAnalysis.totalItems, remainingRatio * 100) sortType, passCount, moveCount, currentAnalysis.itemsOutOfPlace, currentAnalysis.totalItems, remainingRatio * 100)
-- PROGRESSIVE DELAY: Calculate delay based on remaining complexity -- PROGRESSIVE DELAY: Calculate delay based on remaining complexity
local baseDelay = 0.7 local baseDelay = 1.2
local complexityDelay = math.min(currentAnalysis.itemsOutOfPlace * 0.05, 2.0) -- max 2 seconds local complexityDelay = math.min(currentAnalysis.itemsOutOfPlace * 0.06, 2.5) -- max 2.5 seconds
local totalDelay = baseDelay + complexityDelay local totalDelay = baseDelay + complexityDelay
addon:Print("Waiting %.1f seconds before next pass...", totalDelay) addon:Print("Waiting %.1f seconds before next pass...", totalDelay)