Release 1.2.28

- Add skill parts to Blade Vortex - Add hit rate override, used by Blade Vortex - Added configuration option for ignite base damage calculation mode
2016-12-22 03:08:04 +10:00
parent af799bb700
commit a4c27f9aba
8 changed files with 86 additions and 25 deletions
--- a/Classes/ConfigTab.lua
+++ b/Classes/ConfigTab.lua
@@ -17,6 +17,7 @@ local varList = {
 	{ var = "conditionFullLife", type = "check", label = "Are you always on Full Life?", tooltip = "You will automatically be considered to be on Full Life if you have Chaos Innoculation,\nbut you can use this option to force it if necessary.", apply = function(val, modList, enemyModList)
 		modList:NewMod("Misc", "LIST", { type = "Condition", var = "FullLife" }, "Config")
 	end },
+	{ var = "igniteMode", type = "list", label = "Ignite calculation mode:", tooltip = "Controls how the base damage for ignite is calculated:\nAverage Damage: Ignite is based on the average damage dealt, factoring in crits and non-crits.\nCrit Damage: Ignite is based on crit damage only.", list = {{val="AVERAGE",label="Average Damage"},{val="CRIT",label="Crit Damage"}} },
 	{ section = "When In Combat" },
 	{ var = "usePowerCharges", type = "check", label = "Do you use Power Charges?" },
 	{ var = "useFrenzyCharges", type = "check", label = "Do you use Frenzy Charges?" },
@@ -166,7 +167,7 @@ local ConfigTabClass = common.NewClass("ConfigTab", "UndoHandler", "ControlHost"
 	local lastSection
 	for _, varData in ipairs(varList) do
 		if varData.section then
-			lastSection = common.New("SectionControl", {"TOPLEFT",self,"TOPLEFT"}, 0, 0, 300, 0, varData.section)
+			lastSection = common.New("SectionControl", {"TOPLEFT",self,"TOPLEFT"}, 0, 0, 350, 0, varData.section)
 			lastSection.varControlList = { }
 			lastSection.height = function(self)
 				local height = 20
@@ -195,6 +196,13 @@ local ConfigTabClass = common.NewClass("ConfigTab", "UndoHandler", "ControlHost"
 					self:BuildModList()
 					self.build.buildFlag = true
 				end) 
+			elseif varData.type == "list" then
+				control = common.New("DropDownControl", {"TOPLEFT",lastSection,"TOPLEFT"}, 216, 0, 126, 16, varData.list, function(sel, selVal)
+					self.input[varData.var] = selVal.val
+					self:AddUndoState()
+					self:BuildModList()
+					self.build.buildFlag = true
+				end)
 			end
 			if varData.ifNode then
 				control.shown = function()
@@ -206,7 +214,7 @@ local ConfigTabClass = common.NewClass("ConfigTab", "UndoHandler", "ControlHost"
 			else
 				control.tooltip = varData.tooltip
 			end
-			t_insert(self.controls, common.New("LabelControl", {"RIGHT",control,"LEFT"}, -4, 2, 0, 14, "^7"..varData.label))
+			t_insert(self.controls, common.New("LabelControl", {"RIGHT",control,"LEFT"}, -4, 0, 0, 14, "^7"..varData.label))
 			self.varControls[varData.var] = control
 			t_insert(self.controls, control)
 			t_insert(lastSection.varControlList, control)
@@ -259,6 +267,8 @@ function ConfigTabClass:UpdateControls()
 			control:SetText(tostring(self.input[var] or ""))
 		elseif control._className == "CheckBoxControl" then
 			control.state = self.input[var]
+		elseif control._className == "DropDownControl" then
+			control:SelByValue(self.input[var])
 		end
 	end
 end
@@ -288,7 +298,8 @@ function ConfigTabClass:Draw(viewPort, inputEvents)
 		local y = 14
 		for _, varControl in ipairs(section.varControlList) do
 			if varControl:IsShown() then
-				varControl.y = y
+				local width, height = varControl:GetSize()
+				varControl.y = y + (18 - height) / 2
 				y = y + 20
 			end
 		end
@@ -301,7 +312,7 @@ function ConfigTabClass:Draw(viewPort, inputEvents)
 			end
 			col = col + 1
 		end
-		section.x = 10 + (col - 1) * 310
+		section.x = 10 + (col - 1) * 360
 		section.y = colY[col]
 		colY[col] = colY[col] + height + 18
 	end
--- a/Data/Gems/act_dex.lua
+++ b/Data/Gems/act_dex.lua
@@ -278,6 +278,20 @@ gems["Blade Vortex"] = {
 	spell = true,
 	area = true,
 	duration = true,
+	parts = {
+		{
+			name = "0 Blades",
+		},
+		{
+			name = "5 Blades",
+		},
+		{
+			name = "10 Blades",
+		},
+		{
+			name = "20 Blades",
+		},
+	},
 	color = 2,
 	baseFlags = {
 		spell = true,
@@ -298,8 +312,15 @@ gems["Blade Vortex"] = {
 		--"is_area_damage" = ?
 		--"skill_can_add_multiple_charges_per_action" = ?
 		--"action_ignores_crit_tracking" = ?
-		skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ?
+		nil, --"base_skill_show_average_damage_instead_of_dps" = ?
 		skill("deliciouslyOverpowered", true), 
+		mod("Damage", "MORE", 150, ModFlag.Spell, 0, { type = "SkillPart", skillPart = 2 }), 
+		mod("Damage", "MORE", 300, ModFlag.Spell, 0, { type = "SkillPart", skillPart = 3 }), 
+		mod("Damage", "MORE", 600, ModFlag.Spell, 0, { type = "SkillPart", skillPart = 4 }), 
+		skill("hitTimeOverride", 0.6, { type = "SkillPart", skillPart = 1 }), 
+		skill("hitTimeOverride", 0.4, { type = "SkillPart", skillPart = 2 }), 
+		skill("hitTimeOverride", 0.3, { type = "SkillPart", skillPart = 3 }), 
+		skill("hitTimeOverride", 0.2, { type = "SkillPart", skillPart = 4 }), 
 	},
 	qualityMods = {
 		mod("AreaRadius", "INC", 0.5), --"base_skill_area_of_effect_+%" = 0.5
--- a/Modules/Build.lua
+++ b/Modules/Build.lua
@@ -228,6 +228,7 @@ function buildMode:Init(dbFileName, buildName)
 		{ mod = "AverageHit", label = "Average Hit", fmt = ".1f", compPercent = true },
 		{ mod = "Speed", label = "Attack Rate", fmt = ".2f", compPercent = true, flag = "attack" },
 		{ mod = "Speed", label = "Cast Rate", fmt = ".2f", compPercent = true, flag = "spell" },
+		{ mod = "HitSpeed", label = "Hit Rate", fmt = ".2f" },
 		{ mod = "CritChance", label = "Crit Chance", fmt = ".2f%%" },
 		{ mod = "CritMultiplier", label = "Crit Multiplier", fmt = "d%%", pc = true, condFunc = function(v,o) return o.CritChance > 0 end },
 		{ mod = "HitChance", label = "Hit Chance", fmt = "d%%", flag = "attack" },
--- a/Modules/CalcSections.lua
+++ b/Modules/CalcSections.lua
@@ -77,10 +77,10 @@ return {
 	},
 	{ label = "Hit Damage", textSize = 12,
 		{ format = "{0:output:TotalMin} to {0:output:TotalMax}", },
-		{ format = "{0:output:PhysicalMin} to {0:output:PhysicalMax}", { breakdown = "Physical" }, { label = "Conversions", modName = { "SkillPhysicalDamageConvertToLightning", "SkillPhysicalDamageConvertToCold", "SkillPhysicalDamageConvertToFire", "SkillPhysicalDamageConvertToChaos", "PhysicalDamageConvertToLightning", "PhysicalDamageConvertToCold", "PhysicalDamageConvertToFire", "PhysicalDamageConvertToChaos", "PhysicalDamageGainAsLightning", "PhysicalDamageGainAsCold", "PhysicalDamageGainAsFire", "PhysicalDamageGainAsChaos" }, modType = "BASE", skill = true }, },
-		{ format = "{0:output:LightningMin} to {0:output:LightningMax}", { breakdown = "Lightning" }, { label = "Conversions", modName = { "LightningDamageConvertToCold", "LightningDamageConvertToFire", "LightningDamageConvertToChaos", "LightningDamageGainAsCold", "LightningDamageGainAsFire", "LightningDamageGainAsChaos" }, modType = "BASE", skill = true }, },
-		{ format = "{0:output:ColdMin} to {0:output:ColdMax}", { breakdown = "Cold" }, { label = "Conversions", modName = { "SkillColdDamageConvertToFire", "ColdDamageConvertToFire", "ColdDamageConvertToChaos", "ColdDamageGainAsFire", "ColdDamageGainAsChaos" }, modType = "BASE", skill = true }, },
-		{ format = "{0:output:FireMin} to {0:output:FireMax}", { breakdown = "Fire" }, { label = "Conversions", modName = { "FireDamageConvertToChaos", "FireDamageGainAsChaos" }, modType = "BASE", skill = true }, },
+		{ format = "{0:output:PhysicalMin} to {0:output:PhysicalMax}", { breakdown = "Physical" }, { label = "Conversions", modName = { "SkillPhysicalDamageConvertToLightning", "SkillPhysicalDamageConvertToCold", "SkillPhysicalDamageConvertToFire", "SkillPhysicalDamageConvertToChaos", "PhysicalDamageConvertToLightning", "PhysicalDamageConvertToCold", "PhysicalDamageConvertToFire", "PhysicalDamageConvertToChaos", "PhysicalDamageGainAsLightning", "PhysicalDamageGainAsCold", "PhysicalDamageGainAsFire", "PhysicalDamageGainAsChaos" }, modType = "BASE", cfg = "skill" }, },
+		{ format = "{0:output:LightningMin} to {0:output:LightningMax}", { breakdown = "Lightning" }, { label = "Conversions", modName = { "LightningDamageConvertToCold", "LightningDamageConvertToFire", "LightningDamageConvertToChaos", "LightningDamageGainAsCold", "LightningDamageGainAsFire", "LightningDamageGainAsChaos" }, modType = "BASE", cfg = "skill" }, },
+		{ format = "{0:output:ColdMin} to {0:output:ColdMax}", { breakdown = "Cold" }, { label = "Conversions", modName = { "SkillColdDamageConvertToFire", "ColdDamageConvertToFire", "ColdDamageConvertToChaos", "ColdDamageGainAsFire", "ColdDamageGainAsChaos" }, modType = "BASE", cfg = "skill" }, },
+		{ format = "{0:output:FireMin} to {0:output:FireMax}", { breakdown = "Fire" }, { label = "Conversions", modName = { "FireDamageConvertToChaos", "FireDamageGainAsChaos" }, modType = "BASE", cfg = "skill" }, },
 		{ format = "{0:output:ChaosMin} to {0:output:ChaosMax}", { breakdown = "Chaos" }, },
 	},
 	{ label = "Average Hit", { format = "{1:output:AverageHit}", { breakdown = "AverageHit" }, }, },
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -1838,6 +1838,10 @@ local function performCalcs(env)
 				simpleBreakdown(baseSpeed, skillCfg, "Speed")
 			end
 		end
+		if skillData.hitTimeOverride then
+			output.HitTime = skillData.hitTimeOverride
+			output.HitSpeed = 1 / output.HitTime
+		end
 	end

 	-- Calculate crit chance, crit multiplier, and their combined effect
@@ -2004,7 +2008,7 @@ local function performCalcs(env)
 	-- Calculate average damage and final DPS
 	output.AverageHit = (totalMin + totalMax) / 2 * output.CritEffect
 	output.AverageDamage = output.AverageHit * output.HitChance / 100
-	output.TotalDPS = output.AverageDamage * output.Speed * (skillData.dpsMultiplier or 1)
+	output.TotalDPS = output.AverageDamage * (output.HitSpeed or output.Speed) * (skillData.dpsMultiplier or 1)
 	if env.mode == "CALCS" then
 		if env.mode_average then
 			output.DisplayDamage = s_format("%.1f average damage", output.AverageDamage)
@@ -2028,12 +2032,12 @@ local function performCalcs(env)
 			}
 			breakdown.TotalDPS = {
 				s_format("%.1f ^8(average damage)", output.AverageDamage),
-				s_format("x %.2f ^8(attack rate)", output.Speed),
+				output.HitSpeed and s_format("x %.2f ^8(hit rate)", output.HitSpeed) or s_format("x %.2f ^8(attack rate)", output.Speed),
 			}
 		else
 			breakdown.TotalDPS = {
 				s_format("%.1f ^8(average hit)", output.AverageDamage),
-				s_format("x %.2f ^8(cast rate)", output.Speed),
+				output.HitSpeed and s_format("x %.2f ^8(hit rate)", output.HitSpeed) or s_format("x %.2f ^8(cast rate)", output.Speed),
 			}
 		end
 		if skillData.dpsMultiplier then
@@ -2251,6 +2255,7 @@ local function performCalcs(env)
 	if modDB:Sum("FLAG", skillCfg, "CannotIgnite") then
 		output.IgniteChance = 0
 	else
+		local igniteMode = env.configInput.igniteMode or "AVERAGE"
 		output.IgniteChance = m_min(100, modDB:Sum("BASE", skillCfg, "EnemyIgniteChance") + enemyDB:Sum("BASE", nil, "SelfIgniteChance"))
 		local sourceDmg = 0
 		if canDeal.Fire and not modDB:Sum("FLAG", skillCfg, "FireCannotIgnite") then
@@ -2259,7 +2264,7 @@ local function performCalcs(env)
 		if canDeal.Cold and modDB:Sum("FLAG", skillCfg, "ColdCanIgnite") then
 			sourceDmg = sourceDmg + output.ColdAverage
 		end
-		if canDeal.Fire and output.IgniteChance > 0 and sourceDmg > 0 then
+		if canDeal.Fire and (output.IgniteChance > 0 or igniteMode == "CRIT") and sourceDmg > 0 then
 			skillFlags.ignite = true
 			local dotCfg = {
 				slotName = skillCfg.slotName,
@@ -2267,7 +2272,12 @@ local function performCalcs(env)
 				keywordFlags = skillCfg.keywordFlags,
 			}
 			env.mainSkill.igniteCfg = dotCfg
-			local baseVal = sourceDmg * output.CritEffect * 0.2
+			local baseVal
+			if igniteMode == "CRIT" then
+				baseVal = sourceDmg * output.CritMultiplier * 0.2
+			else
+				baseVal = sourceDmg * output.CritEffect * 0.2
+			end
 			local effMult = 1
 			if env.mode_effective then
 				local resist = output["EnemyFireResist"]
@@ -2285,11 +2295,18 @@ local function performCalcs(env)
 			output.IgniteDuration = 4 * (1 + incDur / 100) * debuffDurationMult
 			if breakdown then
 				breakdown.IgniteDPS = {
+					s_format("Ignite mode: %s ^8(can be changed in the Configuration tab)", igniteMode == "CRIT" and "Crit Damage" or "Average Damage"),
 					"Base damage:",
-					s_format("%.1f ^8(average non-crit damage from sources)", sourceDmg)
+					s_format("%.1f ^8(average non-crit damage from sources)", sourceDmg),
 				}
-				if output.CritEffect ~= 1 then
-					t_insert(breakdown.IgniteDPS, s_format("x %.3f ^8(crit effect modifier)", output.CritEffect))
+				if igniteMode == "CRIT" then
+					if output.CritMultiplier ~= 1 then
+						t_insert(breakdown.IgniteDPS, s_format("x %.2f ^8(crit multiplier)", output.CritMultiplier))
+					end
+				else
+					if output.CritEffect ~= 1 then
+						t_insert(breakdown.IgniteDPS, s_format("x %.3f ^8(crit effect modifier)", output.CritEffect))
+					end
 				end
 				t_insert(breakdown.IgniteDPS, "x 0.2 ^8(ignite deals 20% per second)")
 				t_insert(breakdown.IgniteDPS, s_format("= %.1f", baseVal, 1))
@@ -2387,7 +2404,7 @@ local function performCalcs(env)
 			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.CombinedDPS = output.CombinedDPS + output.PoisonChance / 100 * output.PoisonDamage * (output.HitSpeed or output.Speed)
 			output.WithPoisonDPS = output.CombinedDPS
 		end
 	end
--- 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.2.28 - 2016/12/22
+ * Added skill parts to Blade Vortex to enable calculation of DPS with different blade counts
+    * Blade Vortex now has a hit rate override which replaces the cast rate when calculating the skill's DPS
+	* This will allow you to see the skill's true DPS at a given blade count
+ * The calculation of Ignite base damage can now be controlled using a new option in the Configuration tab
+
 ### 1.2.27 - 2016/12/21
 * Cast when Channelling now overrides the cast rate of the triggered skill, allowing the DPS of that skill 
   to be calculated correctly
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+VERSION[1.2.28][2016/12/22]
+ * Added skill parts to Blade Vortex to enable calculation of DPS with different blade counts
+    * Blade Vortex now has a hit rate override which replaces the cast rate when calculating the skill's DPS
+	* This will allow you to see the skill's true DPS at a given blade count
+ * The calculation of Ignite base damage can now be controlled using a new option in the Configuration tab
 VERSION[1.2.27][2016/12/21]
 * Cast when Channelling now overrides the cast rate of the triggered skill, allowing the DPS of that skill 
   to be calculated correctly
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.2.27"/>
+	<Version number="1.2.28"/>
 	<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="102a0652df57d352f9a493a84a3438d4f024bb11" name="changelog.txt" part="program"/>
+	<File sha1="7f913e2df1d28fb0404738f385282a56277e75bd" 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"/>
 	<File sha1="23171916fa590c5344b17e67bd8d378574922388" name="Classes/CalcSectionControl.lua" part="program"/>
 	<File sha1="0256fbb994946900a82b45ec4108a94643bd0c91" name="Classes/CalcsTab.lua" part="program"/>
 	<File sha1="5d30e33c23cabf22917c02eb7df1963a5a27cb6a" name="Classes/CheckBoxControl.lua" part="program"/>
-	<File sha1="680b3f1a2a08478e2af2702e4e8399c5d907764e" name="Classes/ConfigTab.lua" part="program"/>
+	<File sha1="1c6c724463fa29dfedd1c6bb47f2b8c06ed5c7f4" name="Classes/ConfigTab.lua" part="program"/>
 	<File sha1="bbb08f183746d6ec023e2bd08fb7a89d365381da" name="Classes/Control.lua" part="program"/>
 	<File sha1="ae55fe1093e727872bc01cc94fa987395f944313" name="Classes/ControlHost.lua" part="program"/>
 	<File sha1="3e1ac525cb454844527ee3c586ed21b9e2b0446b" name="Classes/DropDownControl.lua" part="program"/>
@@ -42,10 +42,10 @@
 	<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="691acfe73dfa05be2c49adc42321cf770fd1f6a2" name="Modules/Build.lua" part="program"/>
+	<File sha1="acb2b28aaf4acfa4c7d0801a26672e1fedc752c8" name="Modules/Build.lua" part="program"/>
 	<File sha1="8a07fe01c53b785ebb6256236e781fbaabd36c0e" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="d725f7834a28b23d85c632b4b0dab602240d1ae7" name="Modules/Calcs.lua" part="program"/>
-	<File sha1="602c7ba4d1792162a43d2f64160ca7d7d624194f" name="Modules/CalcSections.lua" part="program"/>
+	<File sha1="ef180f0e30c4737b7dc87d670f064824fe55aaeb" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="5f4cb49ac9956007505e8ed599918946c2daf0e0" name="Modules/CalcSections.lua" part="program"/>
 	<File sha1="0f9df7b91a548b008693102854b108693205309c" name="Modules/Common.lua" part="program"/>
 	<File sha1="2b393e960721c36dc4c99645a507d7232cbd6f0e" name="Modules/Data.lua" part="program"/>
 	<File sha1="96b7b7c46896daee375be295cd27e4bb9f213203" name="Modules/ItemTools.lua" part="program"/>
@@ -56,7 +56,7 @@
 	<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
 	<File sha1="24596d013ecc9170990670c4e02f1b38c326db9e" 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="d74215f5f768cd3ef5a778b8d8dcf83611c1d98f" 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="05201b4e14ff50dbc887e7cca37f1d476fb931aa" name="Data/Gems/other.lua" part="program"/>