overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 1.2.3

Browse Source 
- Fixed an error in the Calcs tab
This commit is contained in:
Openarl
2016-11-04 15:21:43 +10:00
parent 6b1ade0c7c
commit 576df18b07
5 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Classes/CalcBreakdownControl.lua
View File

@@ -291,10 +291,12 @@ function CalcBreakdownClass:AddModSection(sectionData)
-- Modifier is from an item, add item name and tooltip
local itemId = row.mod.source:match("Item:(%d+):.+")
local item = build.itemsTab.list[tonumber(itemId)]
row.sourceName = data.colorCodes[item.rarity]..item.name
row.sourceNameTooltip = function()
build.itemsTab:AddItemTooltip(item, row.mod.sourceSlot)
return data.colorCodes[item.rarity], true
if item then
row.sourceName = data.colorCodes[item.rarity]..item.name
row.sourceNameTooltip = function()
build.itemsTab:AddItemTooltip(item, row.mod.sourceSlot)
return data.colorCodes[item.rarity], true
end
end
elseif sourceType == "Tree" then
-- Modifier is from a passive node, add node name, and add node ID (used to show node location)

50
Classes/CalcsTab.lua
View File

@@ -95,7 +95,7 @@ Effective DPS: Curses and enemy properties (such as resistances and status condi
end
section.controls.mainSkill.enabled = #mainSocketGroup.displaySkillList > 1
if mainSocketGroup.displaySkillList[1] then
local activeGem = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill].activeGem
local activeGem = mainSocketGroup.displaySkillList[self.input.skill_activeNumber].activeGem
if activeGem and activeGem.data.parts and #activeGem.data.parts > 1 then
section.controls.mainSkillPart.shown = true
wipeTable(section.controls.mainSkillPart.list)
@@ -182,30 +182,6 @@ function CalcsTabClass:Draw(viewPort, inputEvents)
self.width = viewPort.width
self.height = viewPort.height
for id, event in ipairs(inputEvents) do
if event.type == "KeyDown" then
if event.key == "z" and IsKeyDown("CTRL") then
self:Undo()
self.build.buildFlag = true
elseif event.key == "y" and IsKeyDown("CTRL") then
self:Redo()
self.build.buildFlag = true
end
end
end
self:ProcessControlsInput(inputEvents, viewPort)
for id, event in ipairs(inputEvents) do
if event.type == "KeyUp" then
if event.key == "WHEELDOWN" then
self.controls.scrollBar:Scroll(1)
elseif event.key == "WHEELUP" then
self.controls.scrollBar:Scroll(-1)
end
end
end
main:DrawBackground(viewPort)
-- Arrange the sections
local baseX = viewPort.x + 4
local baseY = viewPort.y + 4
@@ -282,6 +258,30 @@ function CalcsTabClass:Draw(viewPort, inputEvents)
section:UpdatePos()
end
for id, event in ipairs(inputEvents) do
if event.type == "KeyDown" then
if event.key == "z" and IsKeyDown("CTRL") then
self:Undo()
self.build.buildFlag = true
elseif event.key == "y" and IsKeyDown("CTRL") then
self:Redo()
self.build.buildFlag = true
end
end
end
self:ProcessControlsInput(inputEvents, viewPort)
for id, event in ipairs(inputEvents) do
if event.type == "KeyUp" then
if event.key == "WHEELDOWN" then
self.controls.scrollBar:Scroll(1)
elseif event.key == "WHEELUP" then
self.controls.scrollBar:Scroll(-1)
end
end
end
main:DrawBackground(viewPort)
if not self.displayPinned then
self.displayData = nil
end