Make the gloves be a damage source vs added damage

The gloves are meant to become the damage source instead of granting added damage. It was incorrectly adding the base unarmed damage to attackss
Now also correctly interacts with hollow palm

Author: LocalIdentity

spec/System/TestFacebreaker_spec.lua

@@ -24,9 +24,9 @@ describe("TestFacebreaker", function()
 
 	it("grants its base Physical damage to Unarmed attacks", function()
 		equipFacebreaker()
-		local modDB = build.calcsTab.mainEnv.player.modDB
-		assert.are.equals(8, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMin"))
-		assert.are.equals(12, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMax"))
+		local weaponData1 = build.calcsTab.mainEnv.player.weaponData1
+		assert.are.equals(8, weaponData1.FacebreakerPhysicalMin)
+		assert.are.equals(12, weaponData1.FacebreakerPhysicalMax)
 	end)
 
 	it("lets you attack as though using a One Hand Mace while unarmed", function()
@@ -40,10 +40,10 @@ describe("TestFacebreaker", function()
 		build.configTab.input.configBossFaceBroken = 10
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
-		local modDB = build.calcsTab.mainEnv.player.modDB
+		local weaponData1 = build.calcsTab.mainEnv.player.weaponData1
 		-- 8 base + 3 per face broken * 10, 12 base + 4 per face broken * 10
-		assert.are.equals(8 + 3 * 10, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMin"))
-		assert.are.equals(12 + 4 * 10, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMax"))
+		assert.are.equals(8 + 3 * 10, weaponData1.FacebreakerPhysicalMin)
+		assert.are.equals(12 + 4 * 10, weaponData1.FacebreakerPhysicalMax)
 	end)
 
 	it("matches the in-game resolved damage at 60 Boss's Faces Broken (188-252)", function()
@@ -52,9 +52,13 @@ describe("TestFacebreaker", function()
 		build.configTab.input.configBossFaceBroken = 60
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
-		local modDB = build.calcsTab.mainEnv.player.modDB
-		assert.are.equals(188, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMin"))
-		assert.are.equals(252, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "PhysicalMax"))
+		build.skillsTab:PasteSocketGroup("Boneshatter 1/0  1")
+		runCallback("OnFrame")
+		build.calcsTab:BuildOutput()
+		runCallback("OnFrame")
+		local mainHand = build.calcsTab.mainOutput.MainHand
+		assert.are.equals(188, mainHand.PhysicalMinBase)
+		assert.are.equals(252, mainHand.PhysicalMaxBase)
 	end)
 
 	it("makes One Hand Mace skills usable unarmed and applies 'more Unarmed Damage per Strength' to them", function()
@@ -105,8 +109,32 @@ describe("TestFacebreaker", function()
 		]])
 		build.itemsTab:AddDisplayItem()
 		runCallback("OnFrame")
-		local modDB = build.calcsTab.mainEnv.player.modDB
-		assert.are.equals(9, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "FireMin"))
-		assert.are.equals(14, modDB:Sum("BASE", { flags = ModFlag.Unarmed }, "FireMax"))
+		local weaponData1 = build.calcsTab.mainEnv.player.weaponData1
+		assert.are.equals(9, weaponData1.FacebreakerFireMin)
+		assert.are.equals(14, weaponData1.FacebreakerFireMax)
+	end)
+
+	it("uses Facebreaker item damage instead of Hollow Palm added Physical damage for mace-compatible staff skills", function()
+		equipFacebreaker()
+		build.configTab.input.customMods = "Hollow Palm Technique"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		build.skillsTab:PasteSocketGroup("Rain of Blades 1/0  1")
+		runCallback("OnFrame")
+		local skillModList = build.calcsTab.mainEnv.player.mainSkill.skillModList
+		assert.are.equals(0, skillModList:Sum("BASE", { flags = ModFlag.Attack }, "PhysicalMin"))
+		assert.are.equals(0, skillModList:Sum("BASE", { flags = ModFlag.Attack }, "PhysicalMax"))
+	end)
+
+	it("keeps Hollow Palm added Physical damage for quarterstaff-only skills", function()
+		equipFacebreaker()
+		build.configTab.input.customMods = "Hollow Palm Technique"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		build.skillsTab:PasteSocketGroup("Quarterstaff Strike 1/0  1")
+		runCallback("OnFrame")
+		local skillModList = build.calcsTab.mainEnv.player.mainSkill.skillModList
+		assert.is_true(skillModList:Sum("BASE", { flags = ModFlag.Attack }, "PhysicalMin") > 0)
+		assert.is_true(skillModList:Sum("BASE", { flags = ModFlag.Attack }, "PhysicalMax") > 0)
 	end)
 end)

src/Data/ModCache.lua

@@ -5579,7 +5579,7 @@ c["Has 2 Charm Slots"]={{[1]={flags=0,keywordFlags=0,name="CharmLimit",type="BAS
 c["Has 3 Charm Slot"]={{[1]={flags=0,keywordFlags=0,name="CharmLimit",type="BASE",value=3}},nil}
 c["Has 3 Charm Slots"]={{[1]={flags=0,keywordFlags=0,name="CharmLimit",type="BASE",value=3}},nil}
 c["Has 4 Augment Sockets"]={nil,"Has 4 Augment Sockets "}
-c["Has 8 to 12 Physical damage, +3 to +4 per Boss's Face Broken"]={{[1]={flags=16777216,keywordFlags=0,name="PhysicalMin",type="BASE",value=8},[2]={flags=16777216,keywordFlags=0,name="PhysicalMax",type="BASE",value=12},[3]={[1]={type="Multiplier",var="BossFaceBroken"},flags=16777216,keywordFlags=0,name="PhysicalMin",type="BASE",value=3},[4]={[1]={type="Multiplier",var="BossFaceBroken"},flags=16777216,keywordFlags=0,name="PhysicalMax",type="BASE",value=4}},nil}
+c["Has 8 to 12 Physical damage, +3 to +4 per Boss's Face Broken"]={{[1]={flags=0,keywordFlags=0,name="FacebreakerPhysicalMin",type="BASE",value=8},[2]={flags=0,keywordFlags=0,name="FacebreakerPhysicalMax",type="BASE",value=12},[3]={[1]={type="Multiplier",var="BossFaceBroken"},flags=0,keywordFlags=0,name="FacebreakerPhysicalMin",type="BASE",value=3},[4]={[1]={type="Multiplier",var="BossFaceBroken"},flags=0,keywordFlags=0,name="FacebreakerPhysicalMax",type="BASE",value=4}},nil}
 c["Has no Attribute Requirements"]={{[1]={flags=0,keywordFlags=0,name="NoAttributeRequirements",type="FLAG",value=true}},nil}
 c["Hazards have 15% chance to rearm after they are triggered"]={{[1]={[1]={skillType=203,type="SkillType"},flags=0,keywordFlags=0,name="HazardRearmChance",type="BASE",value=15}},nil}
 c["Hazards have 5% chance to rearm after they are triggered"]={{[1]={[1]={skillType=203,type="SkillType"},flags=0,keywordFlags=0,name="HazardRearmChance",type="BASE",value=5}},nil}
@@ -6418,7 +6418,7 @@ c["Trusted Kinship"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",v
 c["Unaffected by Chill during Dodge Roll"]={nil,"Unaffected by Chill during Dodge Roll "}
 c["Unaffected by Chill while Leeching Mana"]={{[1]={[1]={type="Condition",var="LeechingMana"},flags=0,keywordFlags=0,name="SelfChillEffect",type="MORE",value=-100}},nil}
 c["Unaffected by Elemental Weakness"]={nil,"Unaffected by Elemental Weakness "}
-c["Unarmed Attacks that would use an Equipped One Hand Mace's damage use this Item's damage"]={{},nil}
+c["Unarmed Attacks that would use an Equipped One Hand Mace's damage use this Item's damage"]={{[1]={flags=0,keywordFlags=0,name="UseFacebreakerItemDamage",type="FLAG",value=true}},nil}
 c["Undead Minions have 25% less maximum Life"]={{[1]={[1]={skillType=127,type="SkillType"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="MORE",value=-25}}}},nil}
 c["Unique Tamed Beasts are Possessed by random Azmeri Spirits, changing every 20 seconds"]={nil,"Unique Tamed Beasts are Possessed by random Azmeri Spirits, changing every 20 seconds "}
 c["Unique Tamed Beasts have 30% increased movement speed"]={nil,"Unique Tamed Beasts have 30% increased movement speed "}

src/Modules/CalcActiveSkill.lua

@@ -826,7 +826,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 	end
 
 	-- Hollow Palm Technique added phys for skills that would use Quarterstaff
-	if activeSkill.actor.modDB.conditions.HollowPalm and ((activeEffect.grantedEffect.weaponTypes and activeEffect.grantedEffect.weaponTypes.Staff) or skillModList:Flag(activeSkill.skillCfg, "UseHollowPalmDamage")) then
+	if activeSkill.actor.modDB.conditions.HollowPalm and not (skillModList:Flag(nil, "UseFacebreakerItemDamage") and activeEffect.grantedEffect.weaponTypes and activeEffect.grantedEffect.weaponTypes["One Hand Mace"]) and ((activeEffect.grantedEffect.weaponTypes and activeEffect.grantedEffect.weaponTypes.Staff) or skillModList:Flag(activeSkill.skillCfg, "UseHollowPalmDamage")) then
 		local gemLevel = activeEffect.level
 		local physMin = data.hollowPalmAddedPhys[gemLevel and gemLevel or 1][1]
 		local physMax = data.hollowPalmAddedPhys[gemLevel and gemLevel or 1][2]

src/Modules/CalcOffence.lua

@@ -2385,6 +2385,12 @@ function calcs.offence(env, actor, activeSkill)
 					source.CritChance = skillData.CritChance
 				end
 			end
+			if source.FacebreakerItemDamage and activeSkill.activeEffect.grantedEffect.weaponTypes and activeSkill.activeEffect.grantedEffect.weaponTypes["One Hand Mace"] then
+				for _, damageType in ipairs(dmgTypeList) do
+					source[damageType.."Min"] = source["Facebreaker"..damageType.."Min"] or 0
+					source[damageType.."Max"] = source["Facebreaker"..damageType.."Max"] or 0
+				end
+			end
 			if critOverride and source.type and source.type ~= "None" then
 				source.CritChance = critOverride
 			end

src/Modules/CalcSetup.lua

@@ -1598,6 +1598,13 @@ function calcs.initEnv(build, mode, override, specEnv)
 				env.player.weaponData1.asThoughUsing = env.player.weaponData1.asThoughUsing or { }
 				env.player.weaponData1.asThoughUsing["One Hand Mace"] = true
 			end
+			if (not env.player.itemList["Weapon 1"]) and env.modDB:Flag(nil, "UseFacebreakerItemDamage") then
+				env.player.weaponData1.FacebreakerItemDamage = true
+				for _, damageType in ipairs({ "Physical", "Lightning", "Cold", "Fire", "Chaos" }) do
+					env.player.weaponData1["Facebreaker"..damageType.."Min"] = env.modDB:Sum("BASE", nil, "Facebreaker"..damageType.."Min")
+					env.player.weaponData1["Facebreaker"..damageType.."Max"] = env.modDB:Sum("BASE", nil, "Facebreaker"..damageType.."Max")
+				end
+			end
 			env.player.weaponData2 = env.player.weaponData2 or { }
 		else
 			env.player.weaponData2 = env.player.itemList["Weapon 2"].weaponData and env.player.itemList["Weapon 2"].weaponData[2] or { }

src/Modules/ModParser.lua

@@ -5879,20 +5879,19 @@ local specialModList = {
 		mod("CritChance", "BASE", tonumber(critNum), nil, ModFlag.Attack, { type = "Condition", var = "HollowPalm" }, { type = "PerStat", stat = "EnergyShieldOnAllArmourItems", div = tonumber(esNum) }),
 	} end,
 	-- Facebreaker (and its Fire variant): the gloves grant base weapon damage that empty-handed One Hand Mace attacks use.
-	-- The base damage is modelled as flat damage on Unarmed attacks; the empty-hand "use a One Hand Mace" part is handled in CalcSetup.
+	-- The base damage is stored separately and copied onto the attack source when a compatible skill uses the item damage.
 	-- "Boss's Face Broken" is a stacking counter exposed through the Configuration tab (Multiplier:BossFaceBroken).
 	["has (%d+) to (%d+) (%a+) damage, %+(%d+) to %+(%d+) per boss's face broken"] = function(min, _, max, dmgType, perMin, perMax)
 		local dmg = dmgType:sub(1, 1):upper() .. dmgType:sub(2)
 		return {
-			mod(dmg.."Min", "BASE", tonumber(min), nil, ModFlag.Unarmed),
-			mod(dmg.."Max", "BASE", tonumber(max), nil, ModFlag.Unarmed),
-			mod(dmg.."Min", "BASE", tonumber(perMin), nil, ModFlag.Unarmed, { type = "Multiplier", var = "BossFaceBroken" }),
-			mod(dmg.."Max", "BASE", tonumber(perMax), nil, ModFlag.Unarmed, { type = "Multiplier", var = "BossFaceBroken" }),
+			mod("Facebreaker"..dmg.."Min", "BASE", tonumber(min)),
+			mod("Facebreaker"..dmg.."Max", "BASE", tonumber(max)),
+			mod("Facebreaker"..dmg.."Min", "BASE", tonumber(perMin), { type = "Multiplier", var = "BossFaceBroken" }),
+			mod("Facebreaker"..dmg.."Max", "BASE", tonumber(perMax), { type = "Multiplier", var = "BossFaceBroken" }),
 		}
 	end,
 	["can attack as though using a one handed mace while both of your hand slots are empty"] = { flag("CanAttackAsOneHandMaceUnarmed") },
-	-- The item's damage (parsed above) is already applied to Unarmed attacks, so this line just needs to be recognised (no extra effect)
-	["unarmed attacks that would use an equipped one hand mace's damage use this item's damage"] = { },
+	["unarmed attacks that would use an equipped one hand mace's damage use this item's damage"] = { flag("UseFacebreakerItemDamage") },
 	["storm and plant spells: deal (%d+)%% more damage cost (%d+)%% less have (%d+)%% less duration"] = function(damageNum, _, costNum, durationNum) return { -- Wildsurge Incantation
 		mod("Damage", "MORE", damageNum, nil, 0, KeywordFlag.Spell, { type = "SkillType", skillTypeList = { SkillType.Storm, SkillType.Plant } } ),
 		mod("Cost", "MORE", -tonumber(costNum), nil, 0, KeywordFlag.Spell, { type = "SkillType", skillTypeList = { SkillType.Storm, SkillType.Plant } } ),