From 22bd4c780b0e607937e082524c7abbe83060169e Mon Sep 17 00:00:00 2001 From: unrealdreamz <132005717+unrealdreamz@users.noreply.github.com> Date: Mon, 18 May 2026 18:22:17 -0400 Subject: [PATCH 1/2] Fix Palm skill quarterstaff damage flags --- spec/System/TestAttacks_spec.lua | 20 +++++++++++++++++++- src/Data/Skills/act_int.lua | 5 +---- src/Export/Skills/act_int.txt | 8 ++++---- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/spec/System/TestAttacks_spec.lua b/spec/System/TestAttacks_spec.lua index ce1b60373a..c8535e95d2 100644 --- a/spec/System/TestAttacks_spec.lua +++ b/spec/System/TestAttacks_spec.lua @@ -18,6 +18,24 @@ describe("TestAttacks", function() assert.are.equals(build.calcsTab.mainOutput.CritChance, 5 * build.calcsTab.mainOutput.HitChance / 100) end) + it("Staggering Palm uses equipped quarterstaff damage and crit", function() + build.itemsTab:CreateDisplayItemFromRaw([[ + New Item + Long Quarterstaff + Quality: 0 + ]]) + build.itemsTab:AddDisplayItem() + runCallback("OnFrame") + + build.skillsTab:PasteSocketGroup("Staggering Palm 1/0 1") + runCallback("OnFrame") + + assert.are.equals(10, build.calcsTab.mainOutput.CritChance) + assert.True(build.calcsTab.mainOutput.AverageDamage > data.unarmedWeaponData[0].PhysicalMax) + assert.are_not.equals(true, build.calcsTab.mainEnv.player.activeSkillList[1].skillFlags.unarmed) + assert.are.equals(true, build.calcsTab.mainEnv.player.activeSkillList[1].skillFlags.melee) + end) + it("creates an item and has the correct crit multi", function() assert.are.equals(2, build.calcsTab.mainOutput.CritMultiplier) build.itemsTab:CreateDisplayItemFromRaw([[ @@ -99,4 +117,4 @@ describe("TestAttacks", function() local incSpeed = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Speed") assert.are.equals(incSpeed, 99) end) -end) \ No newline at end of file +end) diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua index fdc49b8630..bfee60303e 100644 --- a/src/Data/Skills/act_int.lua +++ b/src/Data/Skills/act_int.lua @@ -11074,7 +11074,6 @@ skills["HandOfChayulaPlayer"] = { attack = true, melee = true, area = true, - unarmed = true, }, constantStats = { { "melee_conditional_step_distance", 10 }, @@ -13597,7 +13596,6 @@ skills["KillingPalmPlayer"] = { attack = true, area = true, melee = true, - unarmed = true, }, constantStats = { { "melee_conditional_step_distance", 10 }, @@ -17013,7 +17011,6 @@ skills["ShatteringPalmPlayer"] = { attack = true, area = true, melee = true, - unarmed = true, }, constantStats = { { "melee_conditional_step_distance", 10 }, @@ -20066,7 +20063,7 @@ skills["StaggeringPalmPlayer"] = { baseFlags = { attack = true, area = true, - unarmed = true, + melee = true, }, constantStats = { { "melee_conditional_step_distance", 10 }, diff --git a/src/Export/Skills/act_int.txt b/src/Export/Skills/act_int.txt index d083e214a5..5925ab6fc8 100644 --- a/src/Export/Skills/act_int.txt +++ b/src/Export/Skills/act_int.txt @@ -762,7 +762,7 @@ statMap = { #skill HandOfChayulaPlayer #set HandOfChayulaPlayer -#flags attack melee area unarmed +#flags attack melee area #mods #skillEnd @@ -930,7 +930,7 @@ statMap = { #skill KillingPalmPlayer #set KillingPalmPlayer -#flags attack area melee unarmed +#flags attack area melee #mods #skillEnd @@ -1153,7 +1153,7 @@ statMap = { #skill ShatteringPalmPlayer #set ShatteringPalmPlayer -#flags attack area melee unarmed +#flags attack area melee #mods #skillEnd @@ -1336,7 +1336,7 @@ statMap = { #skill StaggeringPalmPlayer #set StaggeringPalmPlayer -#flags attack area unarmed +#flags attack area melee #mods #skillEnd From f6028904c767979f1926750f57a6e16f9719a1b7 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 20 May 2026 16:37:45 +1000 Subject: [PATCH 2/2] Remove test --- spec/System/TestAttacks_spec.lua | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/spec/System/TestAttacks_spec.lua b/spec/System/TestAttacks_spec.lua index c8535e95d2..ce1b60373a 100644 --- a/spec/System/TestAttacks_spec.lua +++ b/spec/System/TestAttacks_spec.lua @@ -18,24 +18,6 @@ describe("TestAttacks", function() assert.are.equals(build.calcsTab.mainOutput.CritChance, 5 * build.calcsTab.mainOutput.HitChance / 100) end) - it("Staggering Palm uses equipped quarterstaff damage and crit", function() - build.itemsTab:CreateDisplayItemFromRaw([[ - New Item - Long Quarterstaff - Quality: 0 - ]]) - build.itemsTab:AddDisplayItem() - runCallback("OnFrame") - - build.skillsTab:PasteSocketGroup("Staggering Palm 1/0 1") - runCallback("OnFrame") - - assert.are.equals(10, build.calcsTab.mainOutput.CritChance) - assert.True(build.calcsTab.mainOutput.AverageDamage > data.unarmedWeaponData[0].PhysicalMax) - assert.are_not.equals(true, build.calcsTab.mainEnv.player.activeSkillList[1].skillFlags.unarmed) - assert.are.equals(true, build.calcsTab.mainEnv.player.activeSkillList[1].skillFlags.melee) - end) - it("creates an item and has the correct crit multi", function() assert.are.equals(2, build.calcsTab.mainOutput.CritMultiplier) build.itemsTab:CreateDisplayItemFromRaw([[ @@ -117,4 +99,4 @@ describe("TestAttacks", function() local incSpeed = build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("INC", nil, "Speed") assert.are.equals(incSpeed, 99) end) -end) +end) \ No newline at end of file