Fix issue

Add back logic to hide thorns skill unless you have base damage in your build
Fix calc offence logic and remove extra lines

Author: LocalIdentity

src/Data/SkillStatMap.lua

@@ -1023,7 +1023,7 @@ return {
 	mod("ImprovedSpellDamageAppliesToAttacks", "MAX", nil),
 },
 ["additive_thorns_damage_modifiers_apply_to_attack_damage"] = {
-	flag("ThornsModifiersApplyToHits"),
+	flag("ThornsDamageApplyToAttackDamage"),
 },
 ["active_skill_main_hand_weapon_damage_+%_final"] = {
 	mod("Damage", "MORE", nil, 0, 0, { type = "Condition", var = "MainHandAttack" }),

src/Data/Skills/act_str.lua

@@ -16047,6 +16047,7 @@ skills["RollingSlamPlayer"] = {
 skills["ScavengedPlatingPlayer"] = {
 	name = "Scavenged Plating",
 	baseTypeName = "Scavenged Plating",
+	grantsThornsDamage = true,
 	icon = "Art/2DArt/SkillIcons/BruteScavengedPlating.dds",
 	color = 1,
 	description = "While active, uses fragments of armour scavenged from enemies to bolster your own. Fully Breaking an enemy's Armour grants you stacks of Scavenged Plating for a duration based on the enemy's rarity, and you gain Armour and Thorns per stack. Normal enemies grant 1 stack, Magic enemies grant 2 stacks, Rare enemies grant 5 stacks and Unique enemies grant 10 stacks.",
@@ -20759,4 +20760,4 @@ skills["WolfPackPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_int.lua

@@ -2347,6 +2347,7 @@ skills["TriggeredDeadlyCurrentPlayer"] = {
 skills["SupportCracklingBarrierPlayer"] = {
 	name = "Crackling Barrier",
 	description = "Supports Channelling Skills. While Channelling Supported Skills, you gain Lightning Thorns based off of your maximum Mana.",
+	grantsThornsDamage = true,
 	color = 3,
 	support = true,
 	requireSkillTypes = { SkillType.Channel, },
@@ -7997,4 +7998,4 @@ skills["SupportZenithPlayerTwo"] = {
 			},
 		},
 	}
-}
+}

src/Export/Skills/act_str.txt

@@ -925,6 +925,7 @@ end,
 #skillEnd
 
 #skill ScavengedPlatingPlayer
+grantsThornsDamage = true,
 #set ScavengedPlatingPlayer
 #flags duration
 statMap = {
@@ -1237,4 +1238,4 @@ statMap = {
 #set WolfPackPlayer
 #flags minion
 #mods
-#skillEnd
+#skillEnd

src/Export/Skills/sup_int.txt

@@ -413,6 +413,7 @@ statMap = {
 #skillEnd
 
 #skill SupportCracklingBarrierPlayer
+grantsThornsDamage = true,
 #set SupportCracklingBarrierPlayer
 statMap = {
 	["return_%_of_maximum_mana_as_lightning_damage_to_attacker_while_channelling"] = {
@@ -1521,4 +1522,4 @@ statMap = {
 #skill SupportZenithPlayerTwo
 #set SupportZenithPlayerTwo
 #mods
-#skillEnd
+#skillEnd

src/Modules/CalcOffence.lua

@@ -761,33 +761,10 @@ function calcs.offence(env, actor, activeSkill)
 	end
 
 	-- Apply thorns-derived modifiers to hits
-	if skillModList:Flag(nil, "thorns") then
-		-- % increased Thorns damage
+	if skillModList:Flag(nil, "ThornsDamageApplyToAttackDamage") then
 		for _, value in ipairs(skillModList:Tabulate("INC", { flags = ModFlag.Thorns }, "Damage")) do
 			local mod = value.mod
-			skillModList:NewMod("Damage", "INC", mod.value, mod.source, ModFlag.Hit, mod.keywordFlags, unpack(mod))
-		end
-
-		-- Thorns crit chance
-		for _, value in ipairs(skillModList:Tabulate("BASE", { flags = ModFlag.Thorns }, "CritChance")) do
-			local mod = value.mod
-			skillModList:NewMod("CritChance", "BASE", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
-		end
-		for _, value in ipairs(skillModList:Tabulate("INC", { flags = ModFlag.Thorns }, "CritChance")) do
-			local mod = value.mod
-			skillModList:NewMod("CritChance", "INC", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
-		end
-
-		-- Thorns crit multiplier
-		for _, value in ipairs(skillModList:Tabulate("INC", { flags = ModFlag.Thorns }, "CritMultiplier")) do
-			local mod = value.mod
-			skillModList:NewMod("CritMultiplier", "INC", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
-		end
-
-		-- Thorns chance to ignore enemy armour
-		for _, value in ipairs(skillModList:Tabulate("BASE", { flags = ModFlag.Thorns }, "ChanceToIgnoreEnemyArmour")) do
-			local mod = value.mod
-			skillModList:NewMod("ChanceToIgnoreEnemyArmour", "BASE", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
+			skillModList:NewMod("Damage", "INC", mod.value, mod.source, bor(band(mod.flags, bnot(ModFlag.Thorns)), ModFlag.Attack), mod.keywordFlags, unpack(mod))
 		end
 	end
 

src/Modules/CalcSetup.lua

@@ -1491,31 +1491,55 @@ function calcs.initEnv(build, mode, override, specEnv)
 			end
 
 			do
+				local hasThornsDamage = env.modDB:HasMod("BASE", { flags = ModFlag.Thorns }, "PhysicalMin", "PhysicalMax", "FireMin", "FireMax", "ColdMin", "ColdMax", "LightningMin", "LightningMax", "ChaosMin", "ChaosMax")
+				if not hasThornsDamage then
+					for _, socketGroup in pairs(build.skillsTab.socketGroupList) do
+						if socketGroup.source ~= "Thorns" and socketGroup.enabled ~= false then
+							for _, gem in ipairs(socketGroup.gemList) do
+								local grantedEffect = gem.enabled ~= false and env.data.skills[gem.skillId]
+								if grantedEffect and grantedEffect.grantsThornsDamage then
+									hasThornsDamage = true
+									break
+								end
+							end
+						end
+						if hasThornsDamage then
+							break
+						end
+					end
+				end
+
 				local group
 				for _, socketGroup in pairs(build.skillsTab.socketGroupList) do
 					if socketGroup.source == "Thorns" then
 						group = socketGroup
 						break
 					end
 				end
-				if not group then
-					group = { label = "Thorns", enabled = true, gemList = { }, source = "Thorns", noSupports = true }
-					t_insert(build.skillsTab.socketGroupList, group)
-				end
+				if not hasThornsDamage then
+					if group then
+						wipeTable(group.gemList)
+					end
+				else
+					if not group then
+						group = { label = "Thorns", enabled = true, gemList = { }, source = "Thorns", noSupports = true }
+						t_insert(build.skillsTab.socketGroupList, group)
+					end
 
-				group.thornsSources = env.thornsSources
-				wipeTable(group.gemList)
+					group.thornsSources = env.thornsSources
+					wipeTable(group.gemList)
 
-				local activeGemInstance = {
-					skillId = "ThornsPlayer",
-					quality = 0,
-					enabled = true,
-					level = 1,
-					triggered = true,
-				}
-				t_insert(group.gemList, activeGemInstance)
-				markList[group] = true
-				build.skillsTab:ProcessSocketGroup(group)
+					local activeGemInstance = {
+						skillId = "ThornsPlayer",
+						quality = 0,
+						enabled = true,
+						level = 1,
+						triggered = true,
+					}
+					t_insert(group.gemList, activeGemInstance)
+					markList[group] = true
+					build.skillsTab:ProcessSocketGroup(group)
+				end
 			end