Merge pull request #1 from krryan/thorns-support

Fixes and support for Crackling Barrier, Quill Burst, and Scavenged Plating

Author: DS-Koala

src/Data/Skills/act_str.lua

@@ -16007,6 +16007,12 @@ skills["ScavengedPlatingPlayer"] = {
 				["scavenged_plating_armour_+%_final_per_stack"] = {
 					mod("Armour", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
 				},
+				["scavenged_plating_thorns_minimum_physical_damage"] = {
+					mod("PhysicalMin", "BASE", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
+				},
+				["scavenged_plating_thorns_maximum_physical_damage"] = {
+					mod("PhysicalMax", "BASE", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
+				},
 				["scavenged_plating_maximum_stacks_display"] = {
 					mod("Multiplier:ScavengedPlatingStacksLimit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating"}),
 				},

src/Data/Skills/sup_int.lua

@@ -2354,6 +2354,12 @@ skills["SupportCracklingBarrierPlayer"] = {
 			label = "Crackling Barrier",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["return_%_of_maximum_mana_as_lightning_damage_to_attacker_while_channelling"] = {
+					mod("LightningMin", "BASE", nil, ModFlag.Thorns, 0, { type = "PercentStat", stat = "Mana", percent = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Crackling Barrier" }, { type = "Condition", var = "Channelling" }),
+					mod("LightningMax", "BASE", nil, ModFlag.Thorns, 0, { type = "PercentStat", stat = "Mana", percent = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Crackling Barrier" }, { type = "Condition", var = "Channelling" }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {

src/Data/Skills/sup_str.lua

@@ -5251,7 +5251,7 @@ skills["TriggeredQuillburstPlayer"] = {
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "triggered_spiked_gauntlets",
 			baseFlags = {
-				thorns = true
+				thorns = true,
 			},
 			constantStats = {
 				{ "triggered_by_spiked_gauntlets_support_%", 100 },

src/Export/Skills/act_str.txt

@@ -929,6 +929,12 @@ statMap = {
 	["scavenged_plating_armour_+%_final_per_stack"] = {
 		mod("Armour", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
 	},
+	["scavenged_plating_thorns_minimum_physical_damage"] = {
+		mod("PhysicalMin", "BASE", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
+	},
+	["scavenged_plating_thorns_maximum_physical_damage"] = {
+		mod("PhysicalMax", "BASE", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating" }, { type = "Multiplier", var = "ScavengedPlatingStacks", limitVar = "ScavengedPlatingStacksLimit" }),
+	},
 	["scavenged_plating_maximum_stacks_display"] = {
 		mod("Multiplier:ScavengedPlatingStacksLimit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Scavenged Plating"}),
 	},

src/Export/Skills/sup_int.txt

@@ -410,6 +410,12 @@ statMap = {
 
 #skill SupportCracklingBarrierPlayer
 #set SupportCracklingBarrierPlayer
+statMap = {
+	["return_%_of_maximum_mana_as_lightning_damage_to_attacker_while_channelling"] = {
+		mod("LightningMin", "BASE", nil, ModFlag.Thorns, 0, { type = "PercentStat", stat = "Mana", percent = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Crackling Barrier" }, { type = "Condition", var = "Channelling" }),
+		mod("LightningMax", "BASE", nil, ModFlag.Thorns, 0, { type = "PercentStat", stat = "Mana", percent = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Crackling Barrier" }, { type = "Condition", var = "Channelling" }),
+	},
+},
 #mods
 #skillEnd
 

src/Export/Skills/sup_str.txt

@@ -1237,6 +1237,7 @@ statMap = {
 
 #skill TriggeredQuillburstPlayer
 #set TriggeredQuillburstPlayer
+#flags thorns
 #mods thorns area
 #skillEnd
 

src/Modules/CalcOffence.lua

@@ -727,7 +727,7 @@ function calcs.offence(env, actor, activeSkill)
 	end
 
 	-- Apply thorns-derived modifiers to hits
-	if skillModList:Flag(nil, "ThornsModifiersApplyToHits") or skillModList:Flag(nil, "ThornsDamageAppliesToHits") then
+	if skillModList:Flag(nil, "thorns") or skillModList:Flag(nil, "ThornsModifiersApplyToHits") or skillModList:Flag(nil, "ThornsDamageAppliesToHits") then
 		-- % increased Thorns damage
 		for _, value in ipairs(skillModList:Tabulate("INC", { flags = ModFlag.Thorns }, "Damage")) do
 			local mod = value.mod