diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index 30150df5..a178eb11 100644 --- 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) diff --git a/Modules/CalcsView.lua b/Modules/CalcsView.lua index b5678add..57d3d17e 100644 --- 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" }, } } diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index ae9496f4..34fe8804 100644 --- 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 diff --git a/README.md b/README.md index c51263e9..e09d6a56 100644 --- 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 diff --git a/changelog.txt b/changelog.txt index d6389000..9a5206ee 100644 --- 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] diff --git a/manifest.xml b/manifest.xml index 2976c8cc..a82a0da0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -39,13 +39,13 @@ - - + + - +