Release 1.1.5

- Fixed Trypanon crit issue - Add stat totals to jewel tooltips
2016-10-01 01:54:24 +10:00
parent 449394e45b
commit 4a70a0c373
5 changed files with 55 additions and 18 deletions
--- a/Classes/ItemsTab.lua
+++ b/Classes/ItemsTab.lua
@@ -438,6 +438,19 @@ 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
+			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])
+				end
+			end
+			if line then
+				main:AddTooltipLine(16, "^x7F7F7FIn Radius: "..line)
+			end
+		end
 		if item.limit then
 			main:AddTooltipLine(16, "^x7F7F7FLimited to: ^7"..item.limit)
 		end
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -346,6 +346,9 @@ local function buildNodeModList(env, nodeList, finishJewels)
 		-- Finalise radius jewels
 		for _, rad in pairs(env.radiusJewelList) do
 			rad.func(nil, modList, rad.data)
+			if env.mode == "MAIN" then
+				rad.item.jewelRadiusData = rad.data
+			end
 		end
 	end

@@ -546,15 +549,24 @@ local function mergeMainMods(env, repSlotName, repItem)
 			-- Slot is a jewel socket, check if socket is allocated
 			if not build.spec.allocNodes[slot.nodeId] then
 				item = nil
-			elseif item and item.jewelRadiusIndex and item.jewelFunc then
-				-- Jewel has a defined radius function, add it to the list
+			elseif item and item.jewelRadiusIndex then
+				-- Jewel has a radius,  add it to the list
+				local func = item.jewelFunc or function(nodeMods, out, data)
+					-- Default function just tallies all stats in radius
+					if nodeMods then
+						data.strBase = (data.strBase or 0) + (nodeMods.strBase or 0)
+						data.dexBase = (data.dexBase or 0) + (nodeMods.dexBase or 0)
+						data.intBase = (data.intBase or 0) + (nodeMods.intBase or 0)
+					end
+				end
 				local radiusInfo = data.jewelRadius[item.jewelRadiusIndex]
 				local node = build.spec.nodes[slot.nodeId]
 				t_insert(env.radiusJewelList, {
 					rSq = radiusInfo.rad * radiusInfo.rad,
 					x = node.x,
 					y = node.y,
-					func = item.jewelFunc,
+					func = func,
+					item = item,
 					data = { }
 				})
 			end
@@ -882,11 +894,10 @@ local function finaliseMods(env, output)
 	if env.skillFlags.showAverage then
 		env.mode_average = true
 	end
-	local buffMode = env.buffMode
-	if buffMode == "BUFFED" then
+	if env.buffMode == "BUFFED" then
 		env.mode_buffs = true
 		env.mode_effective = false
-	elseif buffMode == "EFFECTIVE" then
+	elseif env.buffMode == "EFFECTIVE" then
 		env.mode_buffs = true
 		env.mode_effective = true
 	else
@@ -1449,15 +1460,17 @@ local function performCalcs(env, output)
 			else
 				baseCrit = getMiscVal(modDB, "skill", "critChanceBase", 0)
 			end
-			output.total_critChance = calcVal(modDB, "critChance", baseCrit) / 100
-			if env.mode_effective then
-				output.total_critChance = output.total_critChance + getMiscVal(modDB, "effective", "additionalCritChance", 0) / 100
-			end
-			if baseCrit < 100 then
+			if baseCrit == 100 then
+				output.total_critChance = 1
+			else
+				output.total_critChance = calcVal(modDB, "critChance", baseCrit) / 100
+				if env.mode_effective then
+					output.total_critChance = output.total_critChance + getMiscVal(modDB, "effective", "additionalCritChance", 0) / 100
+				end
 				output.total_critChance = m_min(output.total_critChance, 0.95)
-			end
-			if baseCrit > 0 then
-				output.total_critChance = m_max(output.total_critChance, 0.05)
+				if baseCrit > 0 then
+					output.total_critChance = m_max(output.total_critChance, 0.05)
+				end
 			end
 			if getMiscVal(modDB, nil, "noCritMult", false) then
 				output.total_critMultiplier = 1
--- a/README.md
+++ b/README.md
@@ -48,6 +48,12 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
 ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)

 ## Changelog
+### 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
+    * For unsupported radius jewels (particularly threshold jewels) all attributes are shown by default
+ * Fixed crit chance with Trypanon deviating from 100% under some conditions
+ 
 ### 1.1.4 - 2016/09/30
 * The tooltip for socket groups now includes gems which aren't part of any of the group's active skills
    * This includes gems which aren't supported, or are disabled, and any support gems which can't apply to the active skills
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+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
+    * For unsupported radius jewels (particularly threshold jewels) all attributes are shown by default
+ * Fixed crit chance with Trypanon deviating from 100% under some conditions
 VERSION[1.1.4][2016/09/30]
 * The tooltip for socket groups now includes gems which aren't part of any of the group's active skills
    * This includes gems which aren't supported, or are disabled, and any support gems which can't apply to the active skills
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.1.4"/>
+	<Version number="1.1.5"/>
 	<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="7bdc23e3b9a8e609143aac41ab91ea25dbcf6f82" name="changelog.txt" part="program"/>
+	<File sha1="ad19b49c513ccf213bc02f553a37365afa63d5e4" 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,7 +22,7 @@
 	<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="af89712175b921aa1ce118a3e5c8901c8682fe2e" name="Classes/ItemsTab.lua" part="program"/>
+	<File sha1="fd3e947bd6e927309ff07b44f7da1309ba7a6bd6" 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"/>
@@ -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="e3ca8be60de09ecc8101e7465955e74f601a2879" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="6ddc774de8f3f00d7ef1064fcad5b3fd70ce3a23" 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"/>