diff --git a/spec/System/TestTradeQuery_spec.lua.rej b/spec/System/TestTradeQuery_spec.lua.rej new file mode 100644 index 0000000000..17f791b39c --- /dev/null +++ b/spec/System/TestTradeQuery_spec.lua.rej @@ -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 = { diff --git a/src/Classes/TradeQuery.lua.rej b/src/Classes/TradeQuery.lua.rej new file mode 100644 index 0000000000..3100e3c974 --- /dev/null +++ b/src/Classes/TradeQuery.lua.rej @@ -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 }))