Add support for generic DamageGainAs (#154)

From tree (essence of the mountain, pure chaos) etc

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

Author: deathbeam

src/Data/SkillStatMap.lua

@@ -897,46 +897,22 @@ return {
 	mod("LightningDamageGainAsChaos", "BASE", nil),
 },
 ["non_skill_base_all_damage_%_to_gain_as_lightning_with_attacks"] = {
-	mod("PhysicalDamageGainAsLightning", "BASE", nil, ModFlag.Attack),
-	mod("LightningDamageGainAsLightning", "BASE", nil, ModFlag.Attack),
-	mod("ColdDamageGainAsLightning", "BASE", nil, ModFlag.Attack),
-	mod("FireDamageGainAsLightning", "BASE", nil, ModFlag.Attack),
-	mod("ChaosDamageGainAsLightning", "BASE", nil, ModFlag.Attack),
+	mod("DamageGainAsLightning", "BASE", nil, ModFlag.Attack),
 },
 ["non_skill_base_all_damage_%_to_gain_as_cold_with_attacks"] = {
-	mod("PhysicalDamageGainAsCold", "BASE", nil, ModFlag.Attack),
-	mod("LightningDamageGainAsCold", "BASE", nil, ModFlag.Attack),
-	mod("ColdDamageGainAsCold", "BASE", nil, ModFlag.Attack),
-	mod("FireDamageGainAsCold", "BASE", nil, ModFlag.Attack),
-	mod("ChaosDamageGainAsCold", "BASE", nil, ModFlag.Attack),
+	mod("DamageGainAsCold", "BASE", nil, ModFlag.Attack),
 },
 ["non_skill_base_all_damage_%_to_gain_as_fire_with_attacks"] = {
-	mod("PhysicalDamageGainAsFire", "BASE", nil, ModFlag.Attack),
-	mod("LightningDamageGainAsFire", "BASE", nil, ModFlag.Attack),
-	mod("ColdDamageGainAsFire", "BASE", nil, ModFlag.Attack),
-	mod("FireDamageGainAsFire", "BASE", nil, ModFlag.Attack),
-	mod("ChaosDamageGainAsFire", "BASE", nil, ModFlag.Attack),
+	mod("DamageGainAsFire", "BASE", nil, ModFlag.Attack),
 },
 ["non_skill_base_all_damage_%_to_gain_as_chaos_with_attacks"] = {
-	mod("PhysicalDamageGainAsChaos", "BASE", nil, ModFlag.Attack),
-	mod("LightningDamageGainAsChaos", "BASE", nil, ModFlag.Attack),
-	mod("ColdDamageGainAsChaos", "BASE", nil, ModFlag.Attack),
-	mod("FireDamageGainAsChaos", "BASE", nil, ModFlag.Attack),
-	mod("ChaosDamageGainAsChaos", "BASE", nil, ModFlag.Attack),
+	mod("DamageGainAsChaos", "BASE", nil, ModFlag.Attack),
 },
 ["non_skill_base_all_damage_%_to_gain_as_fire_with_attacks_vs_burning_enemies"] = {
-	mod("PhysicalDamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
-	mod("LightningDamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
-	mod("ColdDamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
-	mod("FireDamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
-	mod("ChaosDamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
+	mod("DamageGainAsFire", "BASE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Burning" }),
 },
 ["support_innervate_buff_grant_%_added_lightning_attack_damage"] = {
-	mod("PhysicalDamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
-	mod("LightningDamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
-	mod("ColdDamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
-	mod("FireDamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
-	mod("ChaosDamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
+	mod("DamageGainAsLightning", "BASE", nil, ModFlag.Attack, 0, { type = "Condition", var = "KilledShockedLast3Seconds" }),
 },
 ["base_physical_damage_%_to_convert_to_lightning"] = {
 	mod("PhysicalDamageConvertToLightning", "BASE", nil),

src/Modules/CalcOffence.lua

@@ -1883,10 +1883,12 @@ function calcs.offence(env, actor, activeSkill)
 		activeSkill.gainTable[damageType] = {}
 		for _, toType in ipairs(dmgTypeList) do
 			local globalGain = m_max(skillModList:Sum("BASE", skillCfg,
+				"DamageGainAs"..toType,
 				damageType.."DamageGainAs"..toType,
 				isElemental[damageType] and "ElementalDamageGainAs"..toType or nil,
 				damageType ~= "Chaos" and "NonChaosDamageGainAs"..toType or nil), 0)
 			local skillGain = m_max(skillModList:Sum("BASE", skillCfg,
+				"SkillDamageGainAs"..toType,
 				"Skill"..damageType.."DamageGainAs"..toType,
 				isElemental[damageType] and "SkillElementalDamageGainAs"..toType or nil,
 				damageType ~= "Chaos" and "SkillNonChaosDamageGainAs"..toType or nil), 0)

src/Modules/CalcSections.lua

@@ -25,7 +25,10 @@ local function fillConvert(damageType)
 	local convert = {}
 	for _, type in ipairs({ "Physical", "Lightning", "Cold", "Fire", "Chaos" }) do
 		table.insert(convert, "Skill"..damageType.."DamageConvertTo"..type)
+		table.insert(convert, "SkillDamageGainAs"..type)
+		table.insert(convert, "Skill"..damageType.."DamageGainAs"..type)
 		table.insert(convert, damageType.."DamageConvertTo"..type)
+		table.insert(convert, "DamageGainAs"..type)
 		table.insert(convert, damageType.."DamageGainAs"..type)
 
 		if type ~= "Chaos" and type ~= "Physical" then

src/Modules/ModParser.lua

@@ -2349,13 +2349,6 @@ local specialModList = {
 	["warcries exert twice as many attacks"] = { mod("ExtraExertedAttacks", "MORE", 100) },
 	--Blood Mage
 	["skills gain a base life cost equal to base mana cost"] = { mod("ManaCostAsLifeCost", "BASE", 100) },
-	["gain (%d+)%% of damage as extra physical damage"] = function(num) return {
-		mod("PhysicalDamageGainAsPhysical", "BASE", num),
-		mod("ColdDamageGainAsPhysical", "BASE", num),
-		mod("LightningDamageGainAsPhysical", "BASE", num),
-		mod("FireDamageGainAsPhysical", "BASE", num),
-		mod("ChaosDamageGainAsPhysical", "BASE", num),
-	} end,
 	["gain energy shield from equipped body armour as extra maximum life"] = {
 		mod("Life", "BASE", 1, { type = "PerStat", stat = "EnergyShieldOnBody Armour", div = 1 }),
 	},
@@ -5148,6 +5141,9 @@ local unsupportedModList = {
 
 -- Special lookups used for various modifier forms
 local suffixTypes = {
+	["as extra physical damage"] = "GainAsPhysical",
+	["added as physical damage"] = "GainAsPhysical",
+	["gained as extra physical damage"] = "GainAsPhysical",
 	["as extra lightning damage"] = "GainAsLightning",
 	["added as lightning damage"] = "GainAsLightning",
 	["gained as extra lightning damage"] = "GainAsLightning",