Skip to content

Fix Dance with Death incorrectly working with Hollow Palm Technique #1360

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

Merged
merged 1 commit into from
Sep 12, 2025
Merged

Fix Dance with Death incorrectly working with Hollow Palm Technique #1360

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
52 changes: 27 additions & 25 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,31 +194,33 @@ local function doActorAttribsConditions(env, actor)
end
end
if actor.weaponData2.type then
local info = env.data.weaponTypeInfo[actor.weaponData2.type]
condList["Using"..info.flag] = true
if actor.weaponData2.countsAsAll1H then
actor.weaponData2["AddedUsingAxe"] = not condList["UsingAxe"]
condList["UsingAxe"] = true
actor.weaponData2["AddedUsingSword"] = actor.weaponData2.name:match("Varunastra") or not condList["UsingSword"] --Varunastra is a sword
condList["UsingSword"] = true
actor.weaponData2["AddedUsingDagger"] = not condList["UsingDagger"]
condList["UsingDagger"] = true
actor.weaponData2["AddedUsingMace"] = not condList["UsingMace"]
condList["UsingMace"] = true
actor.weaponData2["AddedUsingClaw"] = not condList["UsingClaw"]
condList["UsingClaw"] = true
actor.weaponData2["AddedUsingSpear"] = not condList["UsingSpear"]
condList["UsingSpear"] = true
-- GGG stated that a single Varunastra satisfied requirement for wielding two different weapons
condList["WieldingDifferentWeaponTypes"] = true
end
if info.melee then
condList["UsingMeleeWeapon"] = true
end
if info.oneHand then
condList["UsingOneHandedWeapon"] = true
else
condList["UsingTwoHandedWeapon"] = true
if actor.weaponData2.type ~= "None" then
local info = env.data.weaponTypeInfo[actor.weaponData2.type]
condList["Using"..info.flag] = true
if actor.weaponData2.countsAsAll1H then
actor.weaponData2["AddedUsingAxe"] = not condList["UsingAxe"]
condList["UsingAxe"] = true
actor.weaponData2["AddedUsingSword"] = actor.weaponData2.name:match("Varunastra") or not condList["UsingSword"] --Varunastra is a sword
condList["UsingSword"] = true
actor.weaponData2["AddedUsingDagger"] = not condList["UsingDagger"]
condList["UsingDagger"] = true
actor.weaponData2["AddedUsingMace"] = not condList["UsingMace"]
condList["UsingMace"] = true
actor.weaponData2["AddedUsingClaw"] = not condList["UsingClaw"]
condList["UsingClaw"] = true
actor.weaponData2["AddedUsingSpear"] = not condList["UsingSpear"]
condList["UsingSpear"] = true
-- GGG stated that a single Varunastra satisfied requirement for wielding two different weapons
condList["WieldingDifferentWeaponTypes"] = true
end
if info.melee then
condList["UsingMeleeWeapon"] = true
end
if info.oneHand then
condList["UsingOneHandedWeapon"] = true
else
condList["UsingTwoHandedWeapon"] = true
end
end
end
if actor.weaponData1.type and actor.weaponData2.type then
Expand Down