Release 1.1.8

- Unarmed detection now ignores offhand - Added resistance breakdown section
2016-10-04 23:32:51 +10:00
parent b62452c28b
commit dba3bc8caa
6 changed files with 51 additions and 18 deletions
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -983,7 +983,7 @@ local function finaliseMods(env, output)
 	if data.weaponTypeInfo[weapon1Type] and data.weaponTypeInfo[weapon2Type] then
 		condList["DualWielding"] = true
 	end
-	if weapon1Type == "None" and not data.weaponTypeInfo[weapon2Type] then
+	if weapon1Type == "None" then
 		condList["Unarmed"] = true
 	end
 	if getMiscVal(modDB, "gear", "NormalCount", 0) > 0 then
@@ -2010,6 +2010,15 @@ function calcs.buildOutput(build, input, output, mode)
 			else
 				output["total_"..damageType] = 0
 			end
+			if damageType ~= "physical" then
+				local actual = output["total_"..damageType.."Resist"]
+				local over = output["total_"..damageType.."ResistOverCap"]
+				if over > 0 then
+					output["total_"..damageType.."ResistStr"] = actual .. "+" .. over
+				else
+					output["total_"..damageType.."ResistStr"] = actual
+				end
+			end
 		end
 		output.total_damage = formatRound(output.total_combMin) .. " - " .. formatRound(output.total_combMax)

--- a/Modules/CalcsView.lua
+++ b/Modules/CalcsView.lua
@@ -41,10 +41,6 @@ columns[1] = {
 		{ "output", data.colorCodes.DEXTERITY.."Dexterity^7:", "total_dex" },
 		{ "output", data.colorCodes.INTELLIGENCE.."Intelligence^7:", "total_int" },
 		{ },
-		{ "Monsters:" },
-		{ "input", "Monster level:", "monster_level" },
-		{ "output", "Experience:", "monster_xp", formatPercent },
-		{ },
 		{ "Life:" },
 		{ "output", "Base from Tree:", "spec_lifeBase" },
 		{ "output", "Inc. from Tree %:", "spec_lifeInc" },
@@ -73,6 +69,15 @@ columns[1] = {
 		{ "output", "Inc. Regen from Gear %:", "gear_manaRegenInc" },
 		{ "output", "Total Regen:", "total_manaRegen", getFormatRound(1) },
 		{ },
+		{ "Block and Stun:" },
+		{ "output", "Attack Block Chance:", "total_blockChance", formatPercent },
+		{ "output", "Spell Block Chance:", "total_spellBlockChance", formatPercent },
+		{ "output", "Chance to Avoid Stun:", "stun_avoidChance", formatPercent },
+		{ "output", "Stun Duration on You:", "stun_duration", getFormatSec(2) },
+		{ "output", "Block Duration on You:", "stun_blockDuration", getFormatSec(2) },
+		{ "output", "Duration on Enemies:", "stun_enemyDuration", getFormatSec(2) },
+		{ "output", "Enemy Threshold Mod:", "stun_enemyThresholdMod", formatPercent },
+		{ },
 		{ "Supporting Skills:" },
 	}, 
 	auxSkillList
@@ -80,6 +85,10 @@ columns[1] = {

 columns[3] = {
 	{
+		{ "Monsters:" },
+		{ "input", "Monster level:", "monster_level" },
+		{ "output", "Experience:", "monster_xp", formatPercent },
+		{ },
 		{ "Energy Shield:" },
 		{ "output", "Base from Tree:", "spec_energyShieldBase" },
 		{ "output", "Inc. from Tree %:", "spec_energyShieldInc" },
@@ -106,14 +115,19 @@ columns[3] = {
 		{ "output", "Inc. from Gear %:", "gear_armourInc" },
 		{ "output", "Total:", "total_armour", formatRound },
 		{ },
-		{ "Block and Stun:" },
-		{ "output", "Attack Block Chance:", "total_blockChance", formatPercent },
-		{ "output", "Spell Block Chance:", "total_spellBlockChance", formatPercent },
-		{ "output", "Chance to Avoid Stun:", "stun_avoidChance", formatPercent },
-		{ "output", "Stun Duration on You:", "stun_duration", getFormatSec(2) },
-		{ "output", "Block Duration on You:", "stun_blockDuration", getFormatSec(2) },
-		{ "output", "Duration on Enemies:", "stun_enemyDuration", getFormatSec(2) },
-		{ "output", "Enemy Threshold Mod:", "stun_enemyThresholdMod", formatPercent },
+		{ "Resistances:" },
+		{ "output", "Fire from Tree:", "spec_fireResist" }, 
+		{ "output", "Cold from Tree:", "spec_coldResist" },
+		{ "output", "Lightning from Tree:", "spec_lightningResist" },
+		{ "output", "Chaos from Tree:", "spec_chaosResist" },
+		{ "output", "Fire from Gear:", "gear_fireResist" }, 
+		{ "output", "Cold from Gear:", "gear_coldResist" },
+		{ "output", "Lightning from Gear:", "gear_lightningResist" },
+		{ "output", "Chaos from Gear:", "gear_chaosResist" },
+		{ "output", "Fire Resistance:", "total_fireResistStr", "string" }, 
+		{ "output", "Cold Resistance:", "total_coldResistStr", "string" },
+		{ "output", "Lightning Resistance:", "total_lightningResistStr", "string" },
+		{ "output", "Chaos Resistance:", "total_chaosResistStr", "string" },
 	}
 }

--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -284,6 +284,7 @@ local preSpaceList = {
 	["^socketed gems deal "] = "SocketedIn:X_all_",
 	["^socketed curse gems have "] = "SocketedIn:X_curse_",
 	["^socketed melee gems have "] = "SocketedIn:X_melee_",
+	["^your flasks grant "] = "",
 }

 -- List of special namespaces
--- a/README.md
+++ b/README.md
@@ -48,6 +48,11 @@ 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.8 - 2016/10/04
+ * Added support for the "Your flasks grant" modifiers on Doryani's Invitation
+ * Detection of the Unarmed state now ignores the offhand
+ * Added resistance breakdown section to the Calcs tab
+
 ### 1.1.7 - 2016/10/03
 * Fixed stun modifiers from several active and support gems

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+VERSION[1.1.8][2016/10/04]
+ * Added support for the "Your flasks grant" modifiers on Doryani's Invitation
+ * Detection of the Unarmed state now ignores the offhand
+ * Added resistance breakdown section to the Calcs tab
 VERSION[1.1.7][2016/10/03]
 * Fixed stun modifiers from several active and support gems
 VERSION[1.1.6][2016/10/02]
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.1.7"/>
+	<Version number="1.1.8"/>
 	<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="ee51635bfc224977b9e02a5d4371d8929f2175b1" name="changelog.txt" part="program"/>
+	<File sha1="ab696c2fc00e92769f1abb693ce1873db855d0b6" 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"/>
@@ -39,13 +39,13 @@
 	<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="d4c43f953611164dae1b9d0bbc9cfa4e2d5d5571" name="Modules/Calcs.lua" part="program"/>
-	<File sha1="6e2943ab0c70471d11925bc6dbf842f28c5357f3" name="Modules/CalcsView.lua" part="program"/>
+	<File sha1="9717fbd75a080297fd8d8e5631d91e54f1793467" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="99f3eee122e56fcdc14f0e9fe7460f4516dc193f" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="f8a0dc45e26374329ab6f7029831fdded248f8e7" name="Modules/Common.lua" part="program"/>
 	<File sha1="2ffd6b80329ac005726e8e1123d89529c6680eb9" name="Modules/Data.lua" part="program"/>
 	<File sha1="c4e87504da94d176b2c20e8b61b1c09dc5d1c09b" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="1e41282a4085c740967e81a05650a1f7d5781fd3" name="Modules/Main.lua" part="program"/>
-	<File sha1="47c551a1730c8b783379a563cbf4545cd7e7a55f" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="d7a9f819e7c165e1c5caf1b98469ee47dbe8737d" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="bc49ce1b5e15da40476a9c99c4c690b323c0e7ad" name="Modules/ModTools.lua" part="program"/>
 	<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
 	<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>