Fixes unsupported Thorns calculations and related support interactions (#1778)

* Add support for thorns crit and ignore armour passives

* Add thorns damage support and thorns-based support interactions

* Fix thorns ailment handling and mana scaling (modflag not yet implemented)

* Removed CannotBleed and CannotPoison from ThornsPlayer

* Added support for Stag Idol's Bonded modifier (Thorns Damage has 40% chance to ignore Enemy Armour)

* Update to use ModFlag.Thorns

Changed the calcs to use a ModFlag as it reduces the amount of extra code required
Still need to fix implementation for when Thorns damage is applied to hits

* Fix crash

* Fix Thornskin not working

* Fix Quill Burst thorns damage calculation

* Fix Quill Burst support so it won't be overwritten when re-exporting skills data

* Support for Crackling Barrier support

* Support for thorns damage from Scavenged Plating

* Fix Quill Burst damage calculation more/better?

* Fix thorns damage calculation to consider thorns-flagged skills

* Add basic Barbs support, make Thorns skill unsupportable, remove some unused code

* 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

* Fix thorns mod finding logic

* Fix Blistering Bond test

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
Co-authored-by: DragoonWraith (github: krryan) <dragoonwraith@gmail.com>
Co-authored-by: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com>

Author: 4 people

spec/System/TestItemMods_spec.lua

@@ -684,7 +684,6 @@ describe("TetsItemMods", function()
 			{variant:2}{range:0.5}Adds (8-12) to (16-18) Physical Damage
 			{range:0.5}+(10-15) to Strength
 			Causes Bleeding on Hit
-			{range:0.5}(4-5) to (8-10) Physical Thorns damage
 		]])
 		build.itemsTab:AddDisplayItem()
 		runCallback("OnFrame")

src/Data/Global.lua

@@ -225,6 +225,7 @@ ModFlag.Spell =		 0x0000000000000002
 ModFlag.Hit =		 0x0000000000000004
 ModFlag.Dot =		 0x0000000000000008
 ModFlag.Cast =		 0x0000000000000010
+ModFlag.Thorns =	 0x0000000000000020
 -- Damage sources
 ModFlag.Melee =		 0x0000000000000100
 ModFlag.Area =		 0x0000000000000200

src/Data/ModCache.lua

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

src/Data/SkillStatMap.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.",
@@ -16107,6 +16108,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"}),
 				},
@@ -20753,4 +20760,4 @@ skills["WolfPackPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/act_str.lua

@@ -9377,6 +9377,34 @@ skills["VoidIllusionSpawnPlayer"] = {
 					},
 				}
 			}
+			skills["ThornsPlayer"] = {
+				name = "Thorns",
+				hidden = true,
+				fromItem = true,
+				skillTypes = { [SkillType.Damage] = true },
+				cannotBeSupported = true,
+				qualityStats = {},
+				levels = {
+					[1] = { levelRequirement = 0 },
+				},
+				statSets = {
+					[1] = {
+						label = "Thorns",
+						incrementalEffectiveness = 0,
+						statDescriptionScope = "skill_stat_descriptions",
+						baseFlags = {
+							thorns = true,
+						},
+						baseMods = {
+						},
+						constantStats = {},
+						stats = {},
+						levels = {
+							[1] = {},
+						},
+					},
+				}
+			}
 
 skills["MetaMirageDeadeyePlayer"] = {
 	name = "Mirage Deadeye",

src/Data/Skills/other.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, },
@@ -2362,6 +2363,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 = {
@@ -7991,4 +7998,4 @@ skills["SupportZenithPlayerTwo"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_int.lua

@@ -541,6 +541,11 @@ skills["SupportBarbsPlayer"] = {
 			label = "Barbs I",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["deal_thorns_damage_on_hit_for_X_hits_after_thorns_trigger"] = {
+					-- handled by TriggeredBarbsPlayer as an additionalGrantedEffect hard-coded in Modules/Data.lua
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -554,6 +559,35 @@ skills["SupportBarbsPlayer"] = {
 		},
 	}
 }
+			skills["TriggeredBarbsPlayer"] = {
+				name = "Barbs I",
+				hidden = true,
+				description = "Deal your thorns damage.",
+				skillTypes = { [SkillType.Damage] = true, [SkillType.SkillGrantedBySupport] = true, [SkillType.AttackInPlace] = true },
+				cannotBeSupported = true,
+				qualityStats = {},
+				levels = {
+					[1] = { levelRequirement = 0 },
+				},
+				statSets = {
+					[1] = {
+						label = "Barbs I",
+						incrementalEffectiveness = 0,
+						statDescriptionScope = "skill_stat_descriptions",
+						baseFlags = {
+							thorns = true,
+						},
+						baseMods = {
+						},
+						constantStats = {},
+						stats = {},
+						levels = {
+							[1] = {},
+						},
+					},
+				},
+			}
+
 skills["SupportBarbsPlayerTwo"] = {
 	name = "Barbs II",
 	description = "Supports Melee Strike Skills. Supported Skills deal your Thorns Damage on Hit after you've Retaliated with Thorns Damage.",
@@ -572,6 +606,11 @@ skills["SupportBarbsPlayerTwo"] = {
 			label = "Barbs II",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["deal_thorns_damage_on_hit_for_X_hits_after_thorns_trigger"] = {
+					-- handled by TriggeredBarbsPlayerTwo as an additionalGrantedEffect hard-coded in Modules/Data.lua
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -585,6 +624,35 @@ skills["SupportBarbsPlayerTwo"] = {
 		},
 	}
 }
+			skills["TriggeredBarbsPlayerTwo"] = {
+				name = "Barbs II",
+				hidden = true,
+				description = "Deal your thorns damage.",
+				skillTypes = { [SkillType.Damage] = true, [SkillType.SkillGrantedBySupport] = true, [SkillType.AttackInPlace] = true },
+				cannotBeSupported = true,
+				qualityStats = {},
+				levels = {
+					[1] = { levelRequirement = 0 },
+				},
+				statSets = {
+					[1] = {
+						label = "Barbs II",
+						incrementalEffectiveness = 0,
+						statDescriptionScope = "skill_stat_descriptions",
+						baseFlags = {
+							thorns = true,
+						},
+						baseMods = {
+						},
+						constantStats = {},
+						stats = {},
+						levels = {
+							[1] = {},
+						},
+					},
+				},
+			}
+
 skills["SupportBarbsPlayerThree"] = {
 	name = "Barbs III",
 	description = "Supports Melee Strike Skills. Supported Skills deal your Thorns Damage on Hit twice after you've Retaliated with Thorns Damage.",
@@ -603,6 +671,11 @@ skills["SupportBarbsPlayerThree"] = {
 			label = "Barbs III",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["deal_thorns_damage_twice_on_hit_for_X_hits_after_thorns_trigger"] = {
+					-- handled by TriggeredBarbsPlayerThree as an additionalGrantedEffect hard-coded in Modules/Data.lua
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -616,6 +689,36 @@ skills["SupportBarbsPlayerThree"] = {
 		},
 	}
 }
+			skills["TriggeredBarbsPlayerThree"] = {
+				name = "Barbs III",
+				hidden = true,
+				description = "Deal twice your thorns damage.",
+				skillTypes = { [SkillType.Damage] = true, [SkillType.SkillGrantedBySupport] = true, [SkillType.AttackInPlace] = true },
+				cannotBeSupported = true,
+				qualityStats = {},
+				levels = {
+					[1] = { levelRequirement = 0 },
+				},
+				statSets = {
+					[1] = {
+						label = "Barbs III",
+						incrementalEffectiveness = 0,
+						statDescriptionScope = "skill_stat_descriptions",
+						baseFlags = {
+							thorns = true,
+						},
+						baseMods = {
+							mod("DoubleDamageChance", "BASE", 100, 0, 0),
+						},
+						constantStats = {},
+						stats = {},
+						levels = {
+							[1] = {},
+						},
+					},
+				},
+			}
+
 skills["SupportBattershoutPlayer"] = {
 	name = "Battershout",
 	description = "Supports Warcry Skills. Supported Skills Consume Fully Broken Armour to trigger Physical Damage explosions on Enemies within their range but cannot themselves Break Armour. ",
@@ -4976,6 +5079,11 @@ skills["SupportQuillburstPlayer"] = {
 			label = "Quill Burst",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["trigger_spiked_gauntlets_for_X_hits_after_thorns_trigger"] = {
+					flag("EnableTriggeredQuillburst"),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -5006,7 +5114,13 @@ skills["TriggeredQuillburstPlayer"] = {
 			label = "Quill Burst",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "triggered_spiked_gauntlets",
+			statMap = {
+				["display_skill_deals_thorns_damage"] = {
+					-- display only
+				},
+			},
 			baseFlags = {
+				thorns = true,
 			},
 			constantStats = {
 				{ "triggered_by_spiked_gauntlets_support_%", 100 },
@@ -6714,7 +6828,7 @@ skills["SupportThornskinPlayer"] = {
 			statDescriptionScope = "gem_stat_descriptions",
 			statMap = {
 				["support_thorns_spirit_cost_thorns_damage_+%"] = {
-					mod("ThornsDamage", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Thornskin I" }),
+					mod("Damage", "INC", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Thornskin I" }),
 				},
 			},
 			baseFlags = {
@@ -6749,7 +6863,7 @@ skills["SupportThornskinPlayerTwo"] = {
 			statDescriptionScope = "gem_stat_descriptions",
 			statMap = {
 				["support_thorns_spirit_cost_thorns_damage_+%"] = {
-					mod("ThornsDamage", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Thornskin II" }),
+					mod("Damage", "INC", nil, ModFlag.Thorns, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Thornskin II" }),
 				},
 			},
 			baseFlags = {

src/Data/Skills/sup_str.lua

@@ -925,12 +925,19 @@ end,
 #skillEnd
 
 #skill ScavengedPlatingPlayer
+grantsThornsDamage = true,
 #set ScavengedPlatingPlayer
 #flags duration
 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"}),
 	},
@@ -1231,4 +1238,4 @@ statMap = {
 #set WolfPackPlayer
 #flags minion
 #mods
-#skillEnd
+#skillEnd

src/Export/Skills/act_str.txt

@@ -801,3 +801,32 @@ statMap = {
 #flags
 #mods
 #skillEnd
+
+skills["ThornsPlayer"] = {
+	name = "Thorns",
+	hidden = true,
+	fromItem = true,
+	skillTypes = { [SkillType.Damage] = true },
+	cannotBeSupported = true,
+	qualityStats = {},
+	levels = {
+		[1] = { levelRequirement = 0 },
+	},
+	statSets = {
+		[1] = {
+			label = "Thorns",
+			incrementalEffectiveness = 0,
+			statDescriptionScope = "skill_stat_descriptions",
+			baseFlags = {
+				thorns = true,
+			},
+			baseMods = {
+			},
+			constantStats = {},
+			stats = {},
+			levels = {
+				[1] = {},
+			},
+		},
+	}
+}