Release 1.2.26

- Support Bone Nova and Molten Burst - Add DPS/Average Hit inc. Poison - Fixed mana costs for totem-cast auras
2016-12-14 03:15:05 +10:00
parent 60aabbcae3
commit 5a85d080b0
9 changed files with 93 additions and 20 deletions
--- a/Data/Gems/other.lua
+++ b/Data/Gems/other.lua
@@ -117,6 +117,32 @@ gems["Abberath's Fury"] = {
 		[7] = { },
 	},
 }
+gems["Bone Nova"] = {
+	hidden = true,
+	color = 4,
+	baseFlags = {
+		attack = true,
+		projectile = true,
+	},
+	skillTypes = { [1] = true, [48] = true, [3] = true, [10] = true, [57] = true, [47] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		mod("ProjectileCount", "BASE", 8), --"number_of_additional_projectiles" = 8
+		--"attack_trigger_on_killing_bleeding_enemy_%" = 100
+		--"monster_projectile_variation" = 15
+		--"projectiles_nova" = ?
+		--"spell_uncastable_if_triggerable" = ?
+		--"base_is_projectile" = ?
+		flag("CannotBleed"), --"cannot_cause_bleeding" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+	},
+	levels = {
+		[20] = { },
+	},
+}
 gems["Envy"] = {
 	hidden = true,
 	color = 3,
@@ -283,4 +309,30 @@ gems["Lightning Bolt"] = {
 		[30] = { 1248, 3743, },
 	},
 }
-
+gems["Molten Burst"] = {
+	hidden = true,
+	color = 1,
+	baseFlags = {
+		attack = true,
+		projectile = true,
+		area = true,
+		fire = true,
+	},
+	skillTypes = { [3] = true, [1] = true, [11] = true, [33] = true, [57] = true, [47] = true, [48] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		mod("ProjectileCount", "BASE", 2), --"number_of_additional_projectiles" = 2
+		--"attack_trigger_on_melee_hit_%" = 20
+		--"show_number_of_projectiles" = ?
+		--"base_is_projectile" = ?
+		--"is_area_damage" = ?
+		skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+	},
+	levels = {
+		[16] = { },
+	},
+}
--- a/Data/New.lua
+++ b/Data/New.lua
@@ -202,6 +202,7 @@ Enemies you hit are destroyed on Kill
 ]],[[
 Primordial Might
 Crimson Jewel
+Implicits: 0
 (25-30)% increased Damage if you Summoned a Golem in the past 8 seconds
 Golems Summoned in the past 8 seconds deal (35-45)% increased Damage
 Golems have (18-22)% increased Maximum Life
@@ -210,6 +211,7 @@ Primordial
 ]],[[
 Primordial Harmony
 Cobalt Jewel
+Implicits: 0
 Golem Skills have (20-30)% increased Cooldown Recovery Speed
 Golems have (10-15)% increased Cooldown Recovery Speed
 (16-20)% increased Golem Damage for each Type of Golem you have Summoned
@@ -218,6 +220,7 @@ Primordial
 ]],[[
 Primordial Eminence
 Viridian Jewel
+Implicits: 0
 Golems have (16-20)% increased Attack and Cast Speed
 30% increased Effect of Buffs granted by your Golems
 Golems have +(800-1000) to Armour
@@ -225,6 +228,7 @@ Golems have +(800-1000) to Armour
 The Anima Stone
 Prismatic Jewel
 Limited to: 1
+Implicits: 0
 Can Summon up to 1 additional Golem at a time
 If you have 3 Primordial Jewels, can Summon up to 1 additional Golem at a time
 ]],
--- a/Data/Uniques/mace.lua
+++ b/Data/Uniques/mace.lua
@@ -495,7 +495,7 @@ Requires Level 67, 212 Str
 {variant:2}(30 to 40)% increased Critical Strike Chance
 +(15 to 20)% to all Elemental Resistances
 Hits can't be Evaded
-Your Critical Strikes do not deal increased Damage
+Your Critical Strikes do not deal extra Damage
 You gain Onslaught for 2 seconds on Critical Strike
 ]],[[
 Marohi Erqi
--- a/Modules/Build.lua
+++ b/Modules/Build.lua
@@ -237,6 +237,8 @@ function buildMode:Init(dbFileName, buildName)
 		{ mod = "IgniteDPS", label = "Ignite DPS", fmt = ".1f", compPercent = true },
 		{ mod = "PoisonDPS", label = "Poison DPS", fmt = ".1f", compPercent = true },
 		{ mod = "PoisonDamage", label = "Total Damage per Poison", fmt = ".1f", compPercent = true },
+		{ mod = "WithPoisonDPS", label = "Total DPS inc. Poison", fmt = ".1f", compPercent = true },
+		{ mod = "WithPoisonAverageHit", label = "Average Hit inc. Poison", fmt = ".1f", compPercent = true },
 		{ mod = "ManaCost", label = "Mana Cost", fmt = "d", compPercent = true, lowerIsBetter = true, condFunc = function() return true end },
 		{ },
 		{ mod = "Str", label = "Strength", fmt = "d" },
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -1091,7 +1091,7 @@ local function performCalcs(env)
 		end

 		-- Calculate reservations
-		if activeSkill.skillTypes[SkillType.ManaCostReserved] then
+		if activeSkill.skillTypes[SkillType.ManaCostReserved] and not activeSkill.skillFlags.totem then
 			local baseVal = activeSkill.skillData.manaCostOverride or activeSkill.skillData.manaCost
 			local suffix = activeSkill.skillTypes[SkillType.ManaCostPercent] and "Percent" or "Base"
 			local mult = skillModList:Sum("MORE", skillCfg, "ManaCost")
@@ -1992,15 +1992,9 @@ local function performCalcs(env)
 	output.TotalMax = totalMax

 	-- Update enemy hit-by-damage-type conditions
-	if output.FireAverage > 0 then
-		enemyDB.conditions.HitByFireDamage = true
-	end
-	if output.ColdAverage > 0 then
-		enemyDB.conditions.HitByColdDamage = true
-	end
-	if output.LightningAverage > 0 then
-		enemyDB.conditions.HitByLightningDamage = true
-	end
+	enemyDB.conditions.HitByFireDamage =  output.FireAverage > 0
+	enemyDB.conditions.HitByColdDamage = output.ColdAverage > 0
+	enemyDB.conditions.HitByLightningDamage = output.LightningAverage > 0

 	-- Calculate average damage and final DPS
 	output.AverageHit = (totalMin + totalMax) / 2 * output.CritEffect
@@ -2049,6 +2043,9 @@ local function performCalcs(env)
 		local inc = modDB:Sum("INC", skillCfg, "ManaCost")
 		local base = modDB:Sum("BASE", skillCfg, "ManaCost")
 		output.ManaCost = m_floor(m_max(0, (skillData.manaCost or 0) * more * (1 + inc / 100) + base))
+		if env.mainSkill.skillTypes[SkillType.ManaCostPercent] and skillFlags.totem then
+			output.ManaCost = m_floor(output.Mana * output.ManaCost / 100)
+		end
 		if breakdown and output.ManaCost ~= (skillData.manaCost or 0) then
 			breakdown.ManaCost = {
 				s_format("%d ^8(base mana cost)", skillData.manaCost or 0)
@@ -2383,8 +2380,10 @@ local function performCalcs(env)
 	if skillFlags.poison then
 		if env.mode_average then
 			output.CombinedDPS = output.CombinedDPS + output.PoisonChance / 100 * output.PoisonDamage
+			output.WithPoisonAverageHit = output.CombinedDPS
 		else
 			output.CombinedDPS = output.CombinedDPS + output.PoisonChance / 100 * output.PoisonDamage * output.Speed
+			output.WithPoisonDPS = output.CombinedDPS
 		end
 	end
 	if skillFlags.ignite then
--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -508,6 +508,8 @@ local specialModList = {
 	["grants level (%d+) (.+)"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["casts level (%d+) (.+) when equipped"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["cast level (%d+) (.+) when you deal a critical strike"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
+	["%d+%% chance to attack with level (%d+) (.+) on melee hit"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
+	["attack with level (%d+) (.+) when you kill a bleeding enemy"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
 	["curse enemies with (%D+) on %a+"] = function(_, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill] or "Unknown", level = 1, noSupports = true }, { type = "SocketedIn" }) } end,
 	["curse enemies with level (%d+) (.+) on %a+"] = function(num, _, skill) return { mod("ExtraSkill", "LIST", { name = gemNameLookup[skill] or "Unknown", level = num, noSupports = true }, { type = "SocketedIn" }) } end,
 	["socketed .*gems are supported by level (%d+) (.+)"] = function(num, _, support) return { mod("ExtraSupport", "LIST", { name = gemNameLookup[support] or "Unknown", level = num }, { type = "SocketedIn" }) } end,
@@ -529,6 +531,7 @@ local specialModList = {
 	["your chaos damage poisons enemies"] = { mod("PoisonChance", "BASE", 100) },
 	["melee attacks cause bleeding"] = { mod("BleedChance", "BASE", 100, nil, ModFlag.Melee) },
 	["melee attacks poison on hit"] = { mod("PoisonChance", "BASE", 100, nil, ModFlag.Melee) },
+	["attacks cause bleeding when hitting cursed enemies"] = { mod("BleedChance", "BASE", 100, { type = "Condition", var = "EnemyCursed" }) },
 	["traps and mines deal (%d+)%-(%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,
 	["traps and mines deal (%d+) to (%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,
 	["traps and mines have a (%d+)%% chance to poison on hit"] = function(num) return { mod("PoisonChance", "BASE", num, nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,
--- a/README.md
+++ b/README.md
@@ -49,6 +49,13 @@ 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.2.26 - 2016/12/14
+ * The sidebar now displays a DPS or Average Hit total that factors in Poison
+ * Added support for the Bone Nova skill granted by Uul-Netol's Embrace
+ * Added support for the Molten Burst skill granted by Ngamahu's Flame
+ * Fixed the handling of mana costs for totem-cast auras
+ * Corrected the no-crit-multiplier modifier on Kongor's Undying Rage
+
 ### 1.2.25 - 2016/12/13
 * Added support for the Abberath's Fury skill granted by Abberath's Hooves
 * Added support for the Lightning Bolt skill granted by Choir of the Storm and Voice of the Storm
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+VERSION[1.2.26][2016/12/14]
+ * The sidebar now displays a DPS or Average Hit total that factors in Poison
+ * Added support for the Bone Nova skill granted by Uul-Netol's Embrace
+ * Added support for the Molten Burst skill granted by Ngamahu's Flame
+ * Fixed the handling of mana costs for totem-cast auras
+ * Corrected the no-crit-multiplier modifier on Kongor's Undying Rage
 VERSION[1.2.25][2016/12/13]
 * Added support for the Abberath's Fury skill granted by Abberath's Hooves
 * Added support for the Lightning Bolt skill granted by Choir of the Storm and Voice of the Storm
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.2.25"/>
+	<Version number="1.2.26"/>
 	<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="46a39bc720b0339359fe598ea2828a9a43ecbcea" name="Launch.lua" part="program"/>
 	<File sha1="d8e42beeb38baabcc197d658e4c0af33419eeff3" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="274f1b0d56f23c32084b303dc7e9b54eb7b091a7" name="changelog.txt" part="program"/>
+	<File sha1="5f305c4ef988faa6a298d63e8fea7ded3429f400" name="changelog.txt" part="program"/>
 	<File sha1="231a4fe264d84294427edacbf3e29ec4b301712e" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="47c28993f5653955c9e76714775d87ac22b077da" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="5a4b4930533a97f4d87231a6024b7f48ff0bad89" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -42,24 +42,24 @@
 	<File sha1="a4f9cc96ba474d0a75c768a0eabec92837e027cf" name="Classes/TextListControl.lua" part="program"/>
 	<File sha1="74e2261bb0803451c80e4eeef83834a7c3930b92" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
-	<File sha1="2a571ebca5ac07e4cbe68927f50ffff28b61f447" name="Modules/Build.lua" part="program"/>
+	<File sha1="691acfe73dfa05be2c49adc42321cf770fd1f6a2" name="Modules/Build.lua" part="program"/>
 	<File sha1="8a07fe01c53b785ebb6256236e781fbaabd36c0e" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="c19be35c6aa6943fce525a57ac443e9faf858d3f" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="e95d50a18558174840992346f482f6a07f2c9ffa" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="602c7ba4d1792162a43d2f64160ca7d7d624194f" name="Modules/CalcSections.lua" part="program"/>
 	<File sha1="f207df4010cb3c7bc6cce98be2529a3b8a708b8f" name="Modules/Common.lua" part="program"/>
 	<File sha1="2b393e960721c36dc4c99645a507d7232cbd6f0e" name="Modules/Data.lua" part="program"/>
 	<File sha1="f9da7f619a30c41c69a54a341f37d0499e7fd767" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="6165a0baf0c7d1cb6adf9bef68bfa9d9d3ad67ec" name="Modules/Main.lua" part="program"/>
-	<File sha1="dc2e45ecbe47cffae65080cbe06ab01899ba3b40" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="be5fdf2809274483ba8ec0962e20f4a4171ce733" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="5f93a9d8f58e0d5990a1f84e1ab1d53fbd35fb56" 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"/>
-	<File sha1="a512c8ef41dc8dd559104e3ebe557d0f7c96b6f2" name="Data/New.lua" part="program"/>
+	<File sha1="31f81f103a7e8735ffdd104b386eddcd42be24a6" name="Data/New.lua" part="program"/>
 	<File sha1="dc2595dd73bab52832752e096398e51c10c48cfe" name="Data/Rares.lua" part="program"/>
 	<File sha1="fdb03ca4905c93b22b4954ec92fe1933d4733816" name="Data/Gems/act_dex.lua" part="program"/>
 	<File sha1="70e0589dc2370e5431c041e6e35e8c94558d3983" name="Data/Gems/act_int.lua" part="program"/>
 	<File sha1="79343ddf8c2ff5b0e4f73e5ff83bce5d8222a4af" name="Data/Gems/act_str.lua" part="program"/>
-	<File sha1="b5786c88aefa9636b6d3e513b4664ea3a08f2825" name="Data/Gems/other.lua" part="program"/>
+	<File sha1="05201b4e14ff50dbc887e7cca37f1d476fb931aa" name="Data/Gems/other.lua" part="program"/>
 	<File sha1="b2f6b177821de87288760644f2ecdbde07a9c4c9" name="Data/Gems/sup_dex.lua" part="program"/>
 	<File sha1="d570226995c9312e9d5ad31d6555d72ed2b4f542" name="Data/Gems/sup_int.lua" part="program"/>
 	<File sha1="9d7d4d58b9f6204897b8aee8e6bb32ac7659bc6e" name="Data/Gems/sup_str.lua" part="program"/>
@@ -92,7 +92,7 @@
 	<File sha1="e0d201ffe0c8d9b308cd956673ce8098f9c5f662" name="Data/Uniques/gloves.lua" part="program"/>
 	<File sha1="fb9cedded1fb2ba5b274acdc001ac6991de32537" name="Data/Uniques/helmet.lua" part="program"/>
 	<File sha1="6c5fc615f4712d447d957b7b7b802838a3a9d38e" name="Data/Uniques/jewel.lua" part="program"/>
-	<File sha1="86cbfeea1b96753947811cd3d95d8f2f28d1cb5e" name="Data/Uniques/mace.lua" part="program"/>
+	<File sha1="4bef9e7daffccc8c9cb06aae8594e82eec9a8d10" name="Data/Uniques/mace.lua" part="program"/>
 	<File sha1="909e345169252d738717f32ff3de2f4176702dfc" name="Data/Uniques/quiver.lua" part="program"/>
 	<File sha1="fa3421b77bd9633bbcd78c207de6df31e30f20d5" name="Data/Uniques/ring.lua" part="program"/>
 	<File sha1="6991300b610dd76cbaba826e450a7ac601cd8881" name="Data/Uniques/shield.lua" part="program"/>