Support for base damage conversion

spec/System/TestSkills_spec.lua

@@ -99,6 +99,30 @@ describe("TestSkills #skills", function ()
 		-- The Full DPS value should not be affected by the removed mod
 		assert.are.equals(48.048, round(build.calcsTab.mainOutput.FullDPS, 4))
 	end)
+
+	it("Test skill damage conversion", function ()
+		-- Use skill Harvest and includes it in full DPS
+		build.spec:SelectClass(3)
+		build.skillsTab:SelSkill(1, "Harvest")
+		build.spec:BuildAllDependsAndPaths()
+		-- Add a bit of dexterity to test added damage of harvest skill
+		build.configTab.input.customMods = "+10 Dexterity"
+		build.configTab:BuildModList()
+		build.skillsTab.socketGroupList[1].includeInFullDPS = true
+		runCallback("OnFrame")
+		-- The original Full DPS
+		assert.are.equals(43.91, round(build.calcsTab.mainOutput.FullDPS, 2))
+
+		-- Select the skill node that convert Necrotic damage to Cold
+		local node = build.spec.nodes["ha84-29"]
+		build.spec:AllocNode(node)
+		build.buildFlag = true
+		runCallback("OnFrame")
+
+		assert.are.equals(0, round(build.calcsTab.mainOutput.NecroticDamageBase, 2))
+		assert.are.equals(22, round(build.calcsTab.mainOutput.ColdDamageBase, 2))
+		assert.are.equals(54.01, round(build.calcsTab.mainOutput.FullDPS, 2))
+	end)
 end)
 
 -- Check that at least all skills can load without crash

spec/TestBuilds/1.2/tornado_dot.lua

@@ -15,11 +15,11 @@
 		["AttackDodgeChanceOverCap"] = 0,
 		["AttackTakenHitMult"] = 1,
 		["AverageBlockChance"] = 0,
-		["AverageBurstDamage"] = 146.5344,
+		["AverageBurstDamage"] = 110.52,
 		["AverageBurstHits"] = 1,
-		["AverageDamage"] = 146.5344,
+		["AverageDamage"] = 110.52,
 		["AverageEvadeChance"] = 0,
-		["AverageHit"] = 146.5344,
+		["AverageHit"] = 110.52,
 		["AverageNotHitChance"] = 0,
 		["AvoidAllDamageFromHitsChance"] = 0,
 		["AvoidColdDamageChance"] = 0,
@@ -84,9 +84,9 @@
 		["ColdTakenReflect"] = 1,
 		["ColdTotalHitPool"] = 3786,
 		["ColdTotalPool"] = 3786,
 		["ColdtakenFlat"] = 0,
-		["CombinedAvg"] = 9844.4328,
-		["CombinedDPS"] = 9844.4328,
+		["CombinedAvg"] = 7424.9235,
+		["CombinedDPS"] = 7424.9235,
 		["ConfiguredDamageChance"] = 100,
 		["ConfiguredEvadeChance"] = 0,
 		["ConfiguredNotHitChance"] = 0,
@@ -108,7 +108,7 @@
 		["DoubleDamageEffect"] = 0,
 		["Duration"] = 6.4,
 		["DurationMod"] = 1.6,
 		["EHPsurvivalTime"] = 2.2708,
 		["ESCost"] = 0,
 		["ESHasCost"] = false,
 		["ESPerSecondCost"] = 0,
@@ -162,13 +162,13 @@
 		["FireTakenReflect"] = 1,
 		["FireTotalHitPool"] = 3786,
 		["FireTotalPool"] = 3786,
 		["FiretakenFlat"] = 0,
 		["FistOfWarAilmentEffect"] = 1,
 		["FistOfWarCooldown"] = 0,
 		["FistOfWarHitEffect"] = 1,
 		["FrostShieldDamageMitigation"] = 0,
 		["FrostShieldLife"] = 0,
-		["FullDPS"] = 9844.4328,
+		["FullDPS"] = 7424.9235,
 		["FullLifePercentage"] = 100,
 		["HealingEffectiveness"] = 181,
 		["HitChance"] = 100,
@@ -213,7 +213,7 @@
 		["LightningAttackTakenHitMult"] = 1,
 		["LightningBaseTakenHitMult"] = 0.1589,
 		["LightningCritAverage"] = 0,
-		["LightningDamageBase"] = 9,
+		["LightningDamageBase"] = 0,
 		["LightningDamageReduction"] = 36.4236,
 		["LightningDotEHP"] = 15144,
 		["LightningEffectiveAppliedArmour"] = 3330,
@@ -222,7 +222,7 @@
 		["LightningEnemyOverwhelm"] = 0,
 		["LightningEnemyPen"] = 0,
 		["LightningGuardAbsorbRate"] = 0,
-		["LightningHitAverage"] = 36.0144,
+		["LightningHitAverage"] = 0,
 		["LightningMaximumHitTaken"] = 23820.1507,
 		["LightningResist"] = 75,
 		["LightningResistOver75"] = 0,
@@ -238,7 +238,7 @@
 		["LightningTakenReflect"] = 1,
 		["LightningTotalHitPool"] = 3786,
 		["LightningTotalPool"] = 3786,
 		["LightningtakenFlat"] = 0,
 		["LowLifePercentage"] = 50,
 		["LowestOfArmourAndEvasion"] = 164,
 		["LowestOfMaximumLifeAndMaximumMana"] = 304,
@@ -334,7 +334,7 @@
 		["NecroticTakenReflect"] = 1,
 		["NecroticTotalHitPool"] = 3786,
 		["NecroticTotalPool"] = 3786,
 		["NecrotictakenFlat"] = 0,
 		["NumberOfDamagingHits"] = 3.2439,
 		["NumberOfMitigatedDamagingHits"] = 3.2439,
 		["OffensiveWarcryEffect"] = 1,
@@ -368,7 +368,7 @@
 		["PhysicalTakenReflect"] = 1,
 		["PhysicalTotalHitPool"] = 3786,
 		["PhysicalTotalPool"] = 3786,
 		["PhysicaltakenFlat"] = 0,
 		["PoisonAegis"] = 0,
 		["PoisonAfterReductionTakenHitMulti"] = 1,
 		["PoisonAttackTakenHitMult"] = 1,
@@ -399,7 +399,7 @@
 		["PoisonTakenReflect"] = 1,
 		["PoisonTotalHitPool"] = 3786,
 		["PoisonTotalPool"] = 3786,
 		["PoisontakenFlat"] = 0,
 		["PreEffectiveCritChance"] = 0,
 		["ProjectileEvadeChance"] = 0,
 		["ProjectileEvasion"] = 164,
@@ -433,7 +433,7 @@
 		["SkillDPS"] = {
 			[1] = {
 				["count"] = 1,
-				["dps"] = 9844.4328,
+				["dps"] = 7424.9235,
 				["name"] = "Tornado",
 			},
 		},
@@ -464,8 +464,8 @@
 		["TheoreticalOffensiveWarcryEffect"] = 1,
 		["Time"] = 0.3175,
 		["TotalAttr"] = 194,
-		["TotalAvg"] = 146.5344,
-		["TotalDPS"] = 9844.4328,
+		["TotalAvg"] = 110.52,
+		["TotalDPS"] = 7424.9235,
 		["TotalEHP"] = 22707.5331,
 		["TotalNumberOfHits"] = 3.2439,
 		["TotemAllyDamageMitigation"] = 0,
@@ -530,14 +530,14 @@
 		["VoidTakenReflect"] = 1,
 		["VoidTotalHitPool"] = 3786,
 		["VoidTotalPool"] = 3786,
 		["VoidtakenFlat"] = 0,
 		["Ward"] = 0,
 		["WardDecayThreshold"] = 68,
 		["WardPerSecond"] = 0,
 		["WardRetention"] = 62,
-		["WithBleedDPS"] = 9844.4328,
-		["WithIgniteDPS"] = 9844.4328,
-		["WithPoisonDPS"] = 9844.4328,
+		["WithBleedDPS"] = 7424.9235,
+		["WithIgniteDPS"] = 7424.9235,
+		["WithPoisonDPS"] = 7424.9235,
 		["WitherEffectOnSelf"] = 100,
 		["allMult"] = 1,
 		["ehpSectionAnySpecificTypes"] = false,

spec/TestBuilds/1.2/tornado_dot.xml

@@ -1,13 +1,13 @@
 <LastEpochPlanner>
 	<Build ascendClassName="Druid" bandit="None" characterLevelAutoMode="false" className="Primalist" level="98" mainSocketGroup="3" pantheonMajorGod="None" pantheonMinorGod="None" targetVersion="1_4" viewMode="TREE">
-		<PlayerStat stat="AverageHit" value="146.5344"></PlayerStat>
-		<PlayerStat stat="AverageBurstDamage" value="146.5344"></PlayerStat>
+		<PlayerStat stat="AverageHit" value="110.52"></PlayerStat>
+		<PlayerStat stat="AverageBurstDamage" value="110.52"></PlayerStat>
 		<PlayerStat stat="Speed" value="3.1491430370939"></PlayerStat>
 		<PlayerStat stat="PreEffectiveCritChance" value="0"></PlayerStat>
 		<PlayerStat stat="CritChance" value="0"></PlayerStat>
 		<PlayerStat stat="CritMultiplier" value="0"></PlayerStat>
-		<PlayerStat stat="TotalDPS" value="9844.4327563676"></PlayerStat>
-		<PlayerStat stat="CombinedDPS" value="9844.4327563676"></PlayerStat>
+		<PlayerStat stat="TotalDPS" value="7424.9234871385"></PlayerStat>
+		<PlayerStat stat="CombinedDPS" value="7424.9234871385"></PlayerStat>
 		<PlayerStat stat="ManaCost" value="0"></PlayerStat>
 		<PlayerStat stat="ManaPercentCost" value="0"></PlayerStat>
 		<PlayerStat stat="ManaPerSecondCost" value="0"></PlayerStat>
@@ -61,8 +61,8 @@
 		<PlayerStat stat="VoidResist" value="68"></PlayerStat>
 		<PlayerStat stat="VoidResistOverCap" value="0"></PlayerStat>
 		<PlayerStat stat="EffectiveMovementSpeedMod" value="1.8"></PlayerStat>
-		<PlayerStat stat="FullDPS" value="9844.4327563676"></PlayerStat>
-		<FullDPSSkill skillPart="" source="" stat="Tornado" value="9844.4327563676"></FullDPSSkill>
+		<PlayerStat stat="FullDPS" value="7424.9234871385"></PlayerStat>
+		<FullDPSSkill skillPart="" source="" stat="Tornado" value="7424.9234871385"></FullDPSSkill>
 	</Build>
 	<Calcs>
 		<Input name="misc_buffMode" string="EFFECTIVE"></Input>
@@ -72,7 +72,7 @@
 		<Section collapsed="false" id="Speed" subsection="AttackCastRate"></Section>
 		<Section collapsed="false" id="Crit" subsection="Crits"></Section>
 		<Section collapsed="false" id="SkillTypeStats" subsection="SkilltypespecificStats"></Section>
 		<Section collapsed="false" id="LeechGain" subsection="LeechGainonHit"></Section>
 		<Section collapsed="false" id="MiscEffects" subsection="OtherEffects"></Section>
 		<Section collapsed="false" id="Attributes" subsection="Attributes"></Section>
 		<Section collapsed="false" id="Life" subsection="Health"></Section>
@@ -89,7 +89,7 @@
 		<Section collapsed="false" id="DamageTaken" subsection="DamagingHits"></Section>
 		<Section collapsed="false" id="DamageTaken" subsection="EffectiveHealthPool"></Section>
 		<Section collapsed="false" id="DamageTaken" subsection="MaximumHitTaken"></Section>
 		<Section collapsed="false" id="DamageTaken" subsection="DotsandDegens"></Section>
 	</Calcs>
 	<Config>
 		<Input name="bandit" string="None"></Input>

src/Classes/CalcsTab.lua

@@ -16,6 +16,9 @@ local buffModeDropList = {
 	{ label = "Effective DPS", buffMode = "EFFECTIVE" }
 }
 
+---@class CalcsTab : UndoHandler
+---@field build Build
+---@field calcs Calcs
 local CalcsTabClass = newClass("CalcsTab", "UndoHandler", "ControlHost", "Control", function (self, build)
 	self.UndoHandler()
 	self.ControlHost()

src/Classes/PassiveSpec.lua

@@ -16,6 +16,8 @@ local b_rshift = bit.rshift
 local band = bit.band
 local bor = bit.bor
 
+---@class PassiveSpec : UndoHandler
+---@field build Build
 local PassiveSpecClass = newClass("PassiveSpec", "UndoHandler", function (self, build, treeVersion, convert)
 	self.UndoHandler()
 

src/Classes/PassiveTree.lua

@@ -46,6 +46,7 @@ local function getFile(URL)
 	return #page > 0 and page
 end
 
+---@class PassiveTree
 local PassiveTreeClass = newClass("PassiveTree", function (self, treeVersion)
 	self.treeVersion = treeVersion
 	local versionNum = treeVersions[treeVersion].num

src/Classes/PassiveTreeView.lua

@@ -60,6 +60,7 @@ function PassiveTreeViewClass:Save(xml)
 end
 
 function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
+	---@cast build Build
 	local spec = build.spec
 	local tree = spec.tree
 

src/Classes/SkillsTab.lua

@@ -22,6 +22,8 @@ local sortGemTypeList = {
 	{ label = "Effective Hit Pool", type = "TotalEHP" },
 }
 
+---@class SkillsTab : UndoHandler
+---@field build Build
 local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Control", function (self, build)
 	self.UndoHandler()
 	self.ControlHost()

src/Classes/UndoHandler.lua

@@ -9,6 +9,7 @@
 local t_insert = table.insert
 local t_remove = table.remove
 
+---@class UndoHandler
 local UndoHandlerClass = newClass("UndoHandler", function (self)
 	self.undo = {}
 	self.redo = {}