Merge branch 'master' into dev

Author: LocalIdentity

.github/tweak_changelogs.sh

@@ -37,6 +37,7 @@ sed -i 's/\[learn2draw/\[Lexy/' temp_change.md
 sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md
 sed -i 's/\[PJacek/\[TPlant/' temp_change.md
 sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md
+sed -i 's/\[krryan/\[DragoonWraith/' temp_change.md
 
 cp temp_change.md changelog_temp.txt
 # Append existing CHANGELOG.md content (excluding first line) to temp_change.md

CHANGELOG.md

@@ -13,7 +13,7 @@
 - Update Culling Strike Implementation [\#1952](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1952) ([Peechey](https://github.com/Peechey))
 - Update Deflection formula [\#1937](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1937) ([Edvinas-Smita](https://github.com/Edvinas-Smita))
 ### New to Path of Building
-- Add initial support for Thorns calculations [\#1778](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1778) ([DS-Koala](https://github.com/DS-Koala))
+- Add initial support for Thorns calculations [\#1778](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1778) ([DS-Koala](https://github.com/DS-Koala), [DragoonWraith](https://github.com/krryan))
 - Add build comparison tab [\#1830](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1830), [\#1942](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1942) ([oboking](https://github.com/oboking), [vaisest](https://github.com/vaisest))
 - Add support for advanced copy/paste [\#1986](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1986) ([Wires77](https://github.com/Wires77))
 - Add Loadout management UI [\#1865](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1865) ([FenikSRT4](https://github.com/FenikSRT4))

changelog.txt

@@ -8,7 +8,7 @@ VERSION[0.16.0][2026/05/30]
 * Update Deflection formula (Edvinas-Smita)
 
 --- New to Path of Building ---
-* Add initial support for Thorns calculations (DS-Koala)
+* Add initial support for Thorns calculations (DS-Koala, DragoonWraith)
 * Add build comparison tab (oboking, vaisest)
 * Add support for advanced copy/paste (Wires77)
 * Add Loadout management UI (FenikSRT4)

manifest.xml

@@ -12,4 +12,4 @@ return {
 			Undead=6
 		}
 	}
-}
+}

src/Data/Assets.lua

@@ -16047,7 +16047,6 @@ 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.",
@@ -16098,6 +16097,7 @@ skills["ScavengedPlatingPlayer"] = {
 		[39] = { levelRequirement = 90, spiritReservationFlat = 30, },
 		[40] = { levelRequirement = 90, spiritReservationFlat = 30, },
 	},
+			grantsThornsDamage = true,
 	statSets = {
 		[1] = {
 			label = "Scavenged Plating",
@@ -20760,4 +20760,4 @@ skills["WolfPackPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/act_str.lua

@@ -9377,34 +9377,6 @@ 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",
@@ -9752,4 +9724,32 @@ skills["MirageDeadeyeSpawnPlayer"] = {
 			},
 		},
 	}
-}
+}
+			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] = {},
+						},
+					},
+				}
+			}

src/Data/Skills/other.lua

@@ -2347,7 +2347,6 @@ 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, },
@@ -2358,6 +2357,7 @@ skills["SupportCracklingBarrierPlayer"] = {
 	levels = {
 		[1] = { levelRequirement = 0, },
 	},
+			grantsThornsDamage = true,
 	statSets = {
 		[1] = {
 			label = "Crackling Barrier",
@@ -7998,4 +7998,4 @@ skills["SupportZenithPlayerTwo"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_int.lua

@@ -576,6 +576,7 @@ skills["SupportBarbsPlayer"] = {
 						statDescriptionScope = "skill_stat_descriptions",
 						baseFlags = {
 							thorns = true,
+							triggeredOnHitBySupportedSkill = true,
 						},
 						baseMods = {
 						},
@@ -641,6 +642,7 @@ skills["SupportBarbsPlayerTwo"] = {
 						statDescriptionScope = "skill_stat_descriptions",
 						baseFlags = {
 							thorns = true,
+							triggeredOnHitBySupportedSkill = true,
 						},
 						baseMods = {
 						},
@@ -706,6 +708,7 @@ skills["SupportBarbsPlayerThree"] = {
 						statDescriptionScope = "skill_stat_descriptions",
 						baseFlags = {
 							thorns = true,
+							triggeredOnHitBySupportedSkill = true,
 						},
 						baseMods = {
 							mod("DoubleDamageChance", "BASE", 100, 0, 0),
@@ -5081,7 +5084,7 @@ skills["SupportQuillburstPlayer"] = {
 			statDescriptionScope = "gem_stat_descriptions",
 			statMap = {
 				["trigger_spiked_gauntlets_for_X_hits_after_thorns_trigger"] = {
-					flag("EnableTriggeredQuillburst"),
+					-- display only
 				},
 			},
 			baseFlags = {