Skip to content

[pob1-port] Fix Megalomaniac trader crash #2424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[pob1-port] Fix Megalomaniac trader crash #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions spec/System/TestTradeQuery_spec.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff a/spec/System/TestTradeQuery_spec.lua b/spec/System/TestTradeQuery_spec.lua (rejected hunks)
@@ -62,17 +62,13 @@ describe("TradeQuery", function()
end)
end)
describe("GetResultEvaluation", function()
- local function newMegalomaniacTradeQuery(slotTbl)
- return tq
- end
-
it("evaluates a socketed Megalomaniac by node combination", function()
local slotTbl = {
slotName = "Megalomaniac", unique = true, alreadyCorrupted = true, selectedJewelNodeId = 12345,
}
- local tq = new("TradeQuery", { itemsTab = {} })
+ local tq = new("TradeQuery"):TradeQuery({ itemsTab = {} })
tq.statSortSelectionList = {}
- tq.tradeQueryGenerator = new("TradeQueryGenerator", { itemsTab = {} })
+ tq.tradeQueryGenerator = new("TradeQueryGenerator"):TradeQueryGenerator({ itemsTab = {} })
tq.itemsTab.build = {
spec = {
tree = {
19 changes: 19 additions & 0 deletions src/Classes/TradeQuery.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff a/src/Classes/TradeQuery.lua b/src/Classes/TradeQuery.lua (rejected hunks)
@@ -816,8 +816,7 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
end
local slotTbl = self.slotTables[row_idx]
local jewelNodeId = slotTbl.nodeId or slotTbl.selectedJewelNodeId
- local slotName = jewelNodeId and "Jewel " .. tostring(jewelNodeId) or slotTbl.slotName
- if slotName == "Megalomaniac" then
+ if slotTbl.slotName == "Megalomaniac" then
local addedNodes = {}
for nodeName in (result.item_string.."\r\n"):gmatch("1 Added Passive Skill is (.-)\r?\n") do
t_insert(addedNodes, self.itemsTab.build.spec.tree.clusterNodeMap[nodeName])
@@ -839,6 +838,7 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
}
table.sort(result.evaluation, function(a, b) return a.weight > b.weight end)
else
+ local slotName = jewelNodeId and "Jewel " .. tostring(jewelNodeId) or slotTbl.slotName
local item = new("Item"):Item(result.item_string)

local output = self:ReduceOutput(calcFunc({ repSlotName = slotName, repItem = item }))