Skip to content

Fix Ambush modifiers incorrectly applying to unarmed attacks and channeled attacks #10122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Trifall wants to merge 1 commit into
base: dev
Choose a base branch
from
+85 −5
Open

Fix Ambush modifiers incorrectly applying to unarmed attacks and channeled attacks #10122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions spec/System/TestSkills_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,82 @@ describe("TestAttacks", function()
assert.are.equals(0, nonDurationSkill.skillModList:Sum("BASE", nonDurationSkill.skillCfg, "BaseFlagTest"))
assert.are.equals(1, nonDurationSkill.skillModList:Sum("BASE", nonDurationSkill.skillCfg, "NegatedBaseFlagTest"))
end)


-- 4 Tests for Ambush
-- - unarmed check (Doryani's Fist)
-- - one handed check (double strike)
-- - non-exertable check (Cyclone)
-- - two handed check (rage vortex with weapon swap)
for _, case in ipairs({
{
description = "does not apply Ambush to the unarmed Doryani's Touch attack",
item = "Doryani's Fist\nVaal Gauntlets\nGrants Level 20 Doryani's Touch Skill",
skill = "Doryani's Touch",
expectedCritChance = 0,
expectedCritMultiplier = 0,
},
{
description = "applies Ambush to one handed weapon attacks",
item = "New Item\nSabre",
socketGroup = "Slot: Weapon 1\nDouble Strike 20/0 1\n",
skill = "Double Strike",
expectedCritChance = 25,
expectedCritMultiplier = 138,
},
{
description = "does not apply Ambush to channelling attacks",
item = "New Item\nSabre",
socketGroup = "Slot: Weapon 1\nCyclone 20/0 1\n",
skill = "Cyclone",
expectedCritChance = 0,
expectedCritMultiplier = 0,
},
{
description = "applies Ambush to two handed Rage Vortex after a modelled weapon swap",
item = "New Item\nCorroded Blade",
socketGroup = "Slot: Weapon 1\nRage Vortex 20/0 1\n",
skill = "Rage Vortex",
expectedCritChance = 25,
expectedCritMultiplier = 138,
},
}) do
it(case.description, function()
build.itemsTab:CreateDisplayItemFromRaw(case.item)
build.itemsTab:AddDisplayItem()
if case.socketGroup then
build.skillsTab:PasteSocketGroup(case.socketGroup)
end
build.skillsTab:PasteSocketGroup("Ambush 20/0 1\n")
local ambushGem = build.skillsTab.socketGroupList[#build.skillsTab.socketGroupList].gemList[1]
runCallback("OnFrame")

local skillWithAmbush
for _, skill in ipairs(build.calcsTab.mainEnv.player.activeSkillList) do
if skill.activeEffect.grantedEffect.name == case.skill then
skillWithAmbush = skill
end
end
assert.is_not_nil(skillWithAmbush)
local critChanceWithAmbush = skillWithAmbush.skillModList:Sum("BASE", skillWithAmbush.skillCfg, "CritChance")
local critMultiplierWithAmbush = skillWithAmbush.skillModList:Sum("BASE", skillWithAmbush.skillCfg, "CritMultiplier")

ambushGem.enableGlobal1 = false
build.buildFlag = true
runCallback("OnFrame")

local skillWithoutAmbush
for _, skill in ipairs(build.calcsTab.mainEnv.player.activeSkillList) do
if skill.activeEffect.grantedEffect.name == case.skill then
skillWithoutAmbush = skill
end
end
assert.is_not_nil(skillWithoutAmbush)
local critChanceWithoutAmbush = skillWithoutAmbush.skillModList:Sum("BASE", skillWithoutAmbush.skillCfg, "CritChance")
local critMultiplierWithoutAmbush = skillWithoutAmbush.skillModList:Sum("BASE", skillWithoutAmbush.skillCfg, "CritMultiplier")

assert.are.equals(case.expectedCritChance, critChanceWithAmbush - critChanceWithoutAmbush)
assert.are.equals(case.expectedCritMultiplier, critMultiplierWithAmbush - critMultiplierWithoutAmbush)
end)
end
end)
7 changes: 4 additions & 3 deletions src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,13 @@ skills["Ambush"] = {
castTime = 0.3,
statMap = {
["ambush_additional_critical_strike_chance_permyriad"] = {
mod("CritChance", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }),
mod("CritChance", "BASE", nil, bit.bor(ModFlag.Melee, ModFlag.Weapon), 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }, { type = "SkillType", skillType = SkillType.NeverExertable, neg = true }, { type = "SkillType", skillType = SkillType.Triggered, neg = true }, { type = "SkillType", skillType = SkillType.Channel, neg = true }, { type = "SkillType", skillType = SkillType.OtherThingUsesSkill, neg = true }),
div = 100,
},
["vanishing_ambush_critical_strike_multiplier_+"] = {
mod("CritMultiplier", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }),
mod("CritMultiplier", "BASE", nil, bit.bor(ModFlag.Melee, ModFlag.Weapon), 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }, { type = "SkillType", skillType = SkillType.NeverExertable, neg = true }, { type = "SkillType", skillType = SkillType.Triggered, neg = true }, { type = "SkillType", skillType = SkillType.Channel, neg = true }, { type = "SkillType", skillType = SkillType.OtherThingUsesSkill, neg = true }),
},
-- needing a Weapon excludes unarmed attacks, SkillType restrictions mirror attacks that can be exerted
-- not excluding Exert for Two-Handed weapons, to simulate a potential weapon swap for skills with a duration ( Rage Vortex )
},
baseFlags = {
Expand Down Expand Up @@ -18480,4 +18481,4 @@ skills["QuickstepHardMode"] = {
[9] = { cooldown = 10, levelRequirement = 1, storedUses = 1, },
[10] = { cooldown = 10, levelRequirement = 1, storedUses = 1, },
},
}
}
5 changes: 3 additions & 2 deletions src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ local skills, mod, flag, skill = ...
#flags spell movement duration travel
statMap = {
["ambush_additional_critical_strike_chance_permyriad"] = {
mod("CritChance", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }),
mod("CritChance", "BASE", nil, bit.bor(ModFlag.Melee, ModFlag.Weapon), 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }, { type = "SkillType", skillType = SkillType.NeverExertable, neg = true }, { type = "SkillType", skillType = SkillType.Triggered, neg = true }, { type = "SkillType", skillType = SkillType.Channel, neg = true }, { type = "SkillType", skillType = SkillType.OtherThingUsesSkill, neg = true }),
div = 100,
},
["vanishing_ambush_critical_strike_multiplier_+"] = {
mod("CritMultiplier", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }),
mod("CritMultiplier", "BASE", nil, bit.bor(ModFlag.Melee, ModFlag.Weapon), 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }, { type = "SkillType", skillType = SkillType.NeverExertable, neg = true }, { type = "SkillType", skillType = SkillType.Triggered, neg = true }, { type = "SkillType", skillType = SkillType.Channel, neg = true }, { type = "SkillType", skillType = SkillType.OtherThingUsesSkill, neg = true }),
},
-- needing a Weapon excludes unarmed attacks, SkillType restrictions mirror attacks that can be exerted
-- not excluding Exert for Two-Handed weapons, to simulate a potential weapon swap for skills with a duration ( Rage Vortex )
},
#mods
Expand Down
Loading