Merge remote-tracking branch 'origin/dev'
This commit is contained in:
Dayve
@@ -438,13 +438,14 @@ function ItemsTabClass:AddItemTooltip(item, slot, dbMode)
|
||||
if item.jewelRadiusIndex then
|
||||
main:AddTooltipLine(16, "^x7F7F7FRadius: ^7"..data.jewelRadius[item.jewelRadiusIndex].label)
|
||||
end
|
||||
if item.jewelRadiusData then
|
||||
if item.jewelRadiusData and slot and item.jewelRadiusData[slot.nodeId] then
|
||||
local radiusData = item.jewelRadiusData[slot.nodeId]
|
||||
local line
|
||||
local labels = { "Str", "Dex", "Int" }
|
||||
local codes = { data.colorCodes.MARAUDER, data.colorCodes.RANGER, data.colorCodes.WITCH }
|
||||
for i, stat in ipairs({"strBase","dexBase","intBase"}) do
|
||||
if item.jewelRadiusData[stat] and item.jewelRadiusData[stat] ~= 0 then
|
||||
line = (line and line .. ", " or "") .. s_format("%s%d %s^7", codes[i], item.jewelRadiusData[stat], labels[i])
|
||||
if radiusData[stat] and radiusData[stat] ~= 0 then
|
||||
line = (line and line .. ", " or "") .. s_format("%s%d %s^7", codes[i], radiusData[stat], labels[i])
|
||||
end
|
||||
end
|
||||
if line then
|
||||
|
||||
@@ -485,7 +485,7 @@ function PassiveTreeViewClass:AddNodeTooltip(node, build)
|
||||
if node.type == "socket" and node.alloc then
|
||||
local socket, jewel = build.itemsTab:GetSocketAndJewelForNodeID(node.id)
|
||||
if jewel then
|
||||
build.itemsTab:AddItemTooltip(jewel)
|
||||
build.itemsTab:AddItemTooltip(jewel, { nodeId = node.id })
|
||||
else
|
||||
main:AddTooltipLine(24, "^7"..node.dn..(launch.devMode and IsKeyDown("ALT") and " ["..node.id.."]" or ""))
|
||||
end
|
||||
|
||||
@@ -347,7 +347,10 @@ local function buildNodeModList(env, nodeList, finishJewels)
|
||||
for _, rad in pairs(env.radiusJewelList) do
|
||||
rad.func(nil, modList, rad.data)
|
||||
if env.mode == "MAIN" then
|
||||
rad.item.jewelRadiusData = rad.data
|
||||
if not rad.item.jewelRadiusData then
|
||||
rad.item.jewelRadiusData = { }
|
||||
end
|
||||
rad.item.jewelRadiusData[rad.nodeId] = rad.data
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -567,6 +570,7 @@ local function mergeMainMods(env, repSlotName, repItem)
|
||||
y = node.y,
|
||||
func = func,
|
||||
item = item,
|
||||
nodeId = slot.nodeId,
|
||||
data = { }
|
||||
})
|
||||
end
|
||||
|
||||
@@ -48,6 +48,9 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
|
||||
|
||||
|
||||
## Changelog
|
||||
### 1.1.6 - 2016/10/02
|
||||
* Fixed bug causing issues with the new jewel attribute totals when a jewel is used multiple times
|
||||
|
||||
### 1.1.5 - 2016/10/01
|
||||
* Jewel tooltips now show totals for any relevant attributes (Str, Dex, Int) allocated within their radius
|
||||
* For example, Eldritch Knowledge shows Intelligence, and Spire of Stone shows Strength
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
VERSION[1.1.6][2016/10/02]
|
||||
* Fixed bug causing issues with the new jewel attribute totals when a jewel is used multiple times
|
||||
VERSION[1.1.5][2016/10/01]
|
||||
* Jewel tooltips now show totals for any relevant attributes (Str, Dex, Int) allocated within their radius
|
||||
* For example, Eldritch Knowledge shows Intelligence, and Spire of Stone shows Strength
|
||||
|
||||
10
manifest.xml
10
manifest.xml
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<PoBVersion>
|
||||
<Version number="1.1.5"/>
|
||||
<Version number="1.1.6"/>
|
||||
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
|
||||
<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
|
||||
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
|
||||
<File sha1="889ff24936021c18a2b2d6893fc087cb3bc7018a" name="Launch.lua" part="program"/>
|
||||
<File sha1="cb07c8d4819eb81df9e98ab9039e0c9adf74c150" name="UpdateCheck.lua" part="program"/>
|
||||
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
|
||||
<File sha1="ad19b49c513ccf213bc02f553a37365afa63d5e4" name="changelog.txt" part="program"/>
|
||||
<File sha1="7d04b1c2a3237bfd6580bf5fb4a6a7d489d55a47" name="changelog.txt" part="program"/>
|
||||
<File sha1="aef7145f378d0a1d5dc6f5f2d3c08d2a1b6ef264" name="Classes/BuildListControl.lua" part="program"/>
|
||||
<File sha1="34fdf53db3b3231ce446749227e178847b982771" name="Classes/ButtonControl.lua" part="program"/>
|
||||
<File sha1="edc1ebdb3ad5ddbd9ae688ca93c0326c3d18b554" name="Classes/CalcsTab.lua" part="program"/>
|
||||
@@ -22,11 +22,11 @@
|
||||
<File sha1="f850636099479449de2e888a2b66846ccc912376" name="Classes/ItemDBControl.lua" part="program"/>
|
||||
<File sha1="84ddcc1358c4c6a9c7f047cc882031d0696533d7" name="Classes/ItemListControl.lua" part="program"/>
|
||||
<File sha1="0f5b3a31134cba2c08d7b57e865d4c7db0c04d27" name="Classes/ItemSlotControl.lua" part="program"/>
|
||||
<File sha1="fd3e947bd6e927309ff07b44f7da1309ba7a6bd6" name="Classes/ItemsTab.lua" part="program"/>
|
||||
<File sha1="9ac7e672648f36db3c94ea302e8099f5c2db65b3" name="Classes/ItemsTab.lua" part="program"/>
|
||||
<File sha1="e577edeea7685cb2b0cd0d00b901a458ae45add0" name="Classes/LabelControl.lua" part="program"/>
|
||||
<File sha1="6f8f98d6ee505af53441c1fe9ad74fbff86d56ad" name="Classes/PassiveSpec.lua" part="program"/>
|
||||
<File sha1="03dde914f7ad75d26f2ba0845b11986d198b6e94" name="Classes/PassiveTree.lua" part="program"/>
|
||||
<File sha1="dde58c025a12f3b9bd9291ceb34726b4b3e6a17e" name="Classes/PassiveTreeView.lua" part="program"/>
|
||||
<File sha1="c12957aa116eade7fe6be963da7749734ea00695" name="Classes/PassiveTreeView.lua" part="program"/>
|
||||
<File sha1="b5d4e4e7cedcabefa029cdefc74db5ac0a82d87f" name="Classes/PopupDialog.lua" part="program"/>
|
||||
<File sha1="86fee3127d9520144fc741f6fccc3c1d9f1aa532" name="Classes/ScrollBarControl.lua" part="program"/>
|
||||
<File sha1="261dcf54a4542e6160fd7024d8edf4fc095d9c71" name="Classes/SectionControl.lua" part="program"/>
|
||||
@@ -39,7 +39,7 @@
|
||||
<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
|
||||
<File sha1="b704a9a73b318e4a605a4b1a44bf044a35945f10" name="Modules/Build.lua" part="program"/>
|
||||
<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
|
||||
<File sha1="6ddc774de8f3f00d7ef1064fcad5b3fd70ce3a23" name="Modules/Calcs.lua" part="program"/>
|
||||
<File sha1="d4c43f953611164dae1b9d0bbc9cfa4e2d5d5571" name="Modules/Calcs.lua" part="program"/>
|
||||
<File sha1="6e2943ab0c70471d11925bc6dbf842f28c5357f3" name="Modules/CalcsView.lua" part="program"/>
|
||||
<File sha1="f8a0dc45e26374329ab6f7029831fdded248f8e7" name="Modules/Common.lua" part="program"/>
|
||||
<File sha1="2ffd6b80329ac005726e8e1123d89529c6680eb9" name="Modules/Data.lua" part="program"/>
|
||||
|
||||
Reference in New Issue
Block a user