Skip to content

Fix/dancing dervish unarmed - #10519

Open
Jayensee wants to merge 7 commits into
PathOfBuildingCommunity:devfrom
Jayensee:fix/dancing-dervish-unarmed
Open

Jayensee wants to merge 7 commits into
PathOfBuildingCommunity:devfrom
Jayensee:fix/dancing-dervish-unarmed

Conversation

@Jayensee

Copy link
Copy Markdown

Fixes #8696.
Fixes #10516.

Description of the problem being solved:

When Manifest Dancing Dervishes is active, its "Weapon Disabled" buff should disable both weapon slots. PoB only partly applied this, which caused several bugs:

  • The weapon's global mods still applied. The Dancing Dervish's accuracy (The Dancing Dervish's implicit of 60% increased global accuracy is being calculated in unarmed/unencumbered builds #8696) and movement speed counted even while the dervishes were manifested. The special handling in CalcSetup looked for the granted skill id UniqueAnimateWeapon, which no longer exists (the skill is now ManifestDancingDervishes). So that handling never ran, and the weapon's mods always went into the player's modDB.
  • Attacks were only half unarmed. DisableWeapons was only handled late in CalcPerform, where it swapped weaponData1 to unarmed. By then the skill weapon flags, the weapon conditions (UsingSword, UsingTwoHandedWeapon, UsingMeleeWeapon, ...) and support matching had already used the sword. Unarmed attacks therefore got Sword / Two Handed / Weapon modifiers, while modifiers to Unarmed Attacks (which check the weapon flag) didn't apply.
  • Hollow Palm Technique got no off hand. It only adds the unarmed off hand when itemList["Weapon 1"] is empty, and the Dervish still occupies that slot. So there was no dual wielding, and main-hand-only modifiers such as Ambidexterity's "60% increased Attack Damage with Main Hand while Dual Wielding" applied to every hit.
  • Hide of the Vendigo didn't work. "Can Attack as though using a Claw while main hand is empty" also checked itemList["Weapon 1"], so Claw-only skills stayed disabled.
  • Battlemage and Spellblade added the (unarmed) main hand damage to spells, because they detect a weapon via itemList["Weapon 1"].
  • Skills socketed in the Dervish stayed active. In game, skills socketed in the disabled weapon (e.g. auras) can't be used while the dervishes are manifested. Supports socketed in it still apply to the dervishes (the dervishes snapshot their supports when summoned, before the weapon slot gets disabled).

Hide of the Vendigo also had two skill usability issues, both checked in game. They aren't specific to the Dervish:

  • Smite (Unarmed but not Claw) was usable with Hide of the Vendigo. In game, Vendigo makes you count as using a Claw when checking which skills can be used, so Smite can't be used.
  • With Hollow Palm Technique, skills that can be used with a Claw but not Unarmed, such as Cobra Lash or Spectral Throw (Spectral Throw cannot be used with Hide of the Vendigo #10516), were disabled ("Off Hand weapon is not usable with this skill") because the unarmed off hand isn't a Claw. In game, Vendigo only decides which skills can be used, based on the main hand. Once a skill can be used, Hollow Palm still dual wields with it. Dual Strike still can't be used.

Changes:

  • CalcSetup works out whether an active socket group has a DisableWeapons skill before the items are processed, using the same gating as active skill creation and buff application (main group or enabled group in the active weapon set, gem enabled, global effect enabled, buffs mode). The result is stored as env.player.weaponsDisabled.
  • While it's set, the items in the active weapon slots are treated as not equipped. They go into env.player.disabledItemList instead of itemList, and their mods aren't added, except the Dancing Dervish's Rampage (the dervishes die when Rampage ends). Their requirements still count. Everything that reads the equipped weapons then sees empty slots without special-casing: weapon data, weapon flags and conditions, Hollow Palm, Hide of the Vendigo, Battlemage, Spellblade, Energy Blade, UsingShield / OffHandIsEmpty / Unencumbered. The broken Dervish special case and the late weapon swap in CalcPerform are removed.
  • Item-granted socket groups are only updated after the items are processed, so on the first calculation after equipping the Dervish the check can't see its skill yet. If the result changes once the groups are updated, initEnv runs once more (override.weaponsDisabledRechecked), like the existing Energy Blade re-run. Item comparison tooltips ignore the granted skill of the item being replaced.
  • Minions that use the player's weapons (the Dancing Dervishes, Animate Weapon) still get the disabled weapon via disabledItemList. Minion DPS is unchanged, except that auras socketed in the disabled weapon (now disabled) no longer affect the Dancing Dervishes.
  • Skills socketed in the disabled weapons are disabled ("This skill is socketed in a disabled weapon"), as are other skills they grant ("This skill is granted by a disabled weapon"). Only the skill that disables the weapons is exempt, and supports socketed in the weapon still support it.
  • With Hide of the Vendigo, only the weapon types you attack as though using (asThoughUsing) decide which skills you can use. If the main hand can use the skill, the unarmed Hollow Palm off hand attacks with it too, unless the skill is dual wield only.

Turning off the Manifest Dancing Dervishes socket group still gives the normal armed behaviour (weapon mods apply, attacks use the sword).

Steps taken to verify a working solution:

  • Tested in game: accuracy and movement speed from the Dervish are lost while manifested, only unarmed modifiers apply, the Ambidexterity off hand attack speed works with Hollow Palm (also with Hide of the Vendigo), socketed auras are disabled, and with Hide of the Vendigo Cobra Lash can be used but Smite and Dual Strike can't.
  • Added spec/System/TestDancingDervish_spec.lua with 15 tests. Each one checks the result with the dervishes manifested and, where relevant, with the group disabled:
    • weapon mods apply only when the dervishes aren't manifested
    • skills socketed in the weapon are disabled, but its supports still support the dervishes
    • Rampage is kept
    • weapon flags and conditions are unarmed
    • Hollow Palm dual wields, and a main-hand-only "while Dual Wielding" mod raises only main hand damage
    • Hide of the Vendigo enables a Claw skill
    • Battlemage and Spellblade don't use the disabled weapon
    • the minions keep the sword's weapon data
    • the weapon slots are disabled on the first calculation after equipping the Dervish
    • comparing another weapon against the Dervish isn't affected
    • the disabled weapon's requirements are kept
    • Energy Blade doesn't replace the disabled weapons
    • only the active weapon set is disabled
  • Added 5 Hide of the Vendigo tests to TestAttacks_spec.lua: Smite is disabled, Cobra Lash and Spectral Throw (Spectral Throw cannot be used with Hide of the Vendigo #10516) with Hollow Palm attack with both hands, Cyclone with Hollow Palm still attacks with both hands, and Dual Strike with Hollow Palm is still disabled.
  • Ran the new tests against dev's source: all 15 Dervish tests and the Smite, Cobra Lash and Spectral Throw tests fail. The Cyclone and Dual Strike tests pass on dev too; they guard against regressions.
  • Full busted suite passes (765 successes, 0 failures).
  • Checked that Manifest Dancing Dervishes minion DPS is identical before and after the change, except for auras socketed in the weapon: Hatred socketed in the Dervish buffed the minions before (1580 DPS in the showcase build) and doesn't after (1155 DPS, the same as without Hatred).

Link to a build that showcases this PR:

https://pobb.in/GIzUP6PXCv8E

Before and after screenshots:

1-socketed-in-dervish 2-cyclone-unarmed 3-vendigo-hollow-palm

🤖 Generated with Claude Code
(reviewed and tested by me, the human telling claude to do stuff)

Jayensee and others added 7 commits November 19, 2026 09:24
The Dancing Dervish's mods were never separated from the player's as
the special handling checked for a skill id that no longer exists, so
its global accuracy and movement speed always applied.

Weapons disabled by Manifest Dancing Dervishes were also only handled
late in CalcPerform, after weapon flags, conditions, Hollow Palm
Technique's off hand and Hide of the Vendigo had been set up using the
sword. Determine it in CalcSetup before the weapon data is built so
both weapon slots count as empty. Battlemage and Spellblade no longer
use the disabled weapon, and the Dervish minions keep using the sword.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…bility

Skills socketed in the weapons disabled by Manifested Dancing Dervishes
(e.g. auras) can no longer be used. Supports socketed in them still
support the Manifest Dancing Dervishes skill.

Hide of the Vendigo makes you count as using a Claw for which skills can
be used, so skills that can be used Unarmed but not with a Claw (Smite)
are disabled. With Hollow Palm Technique, Claw skills (Cobra Lash) are no
longer disabled by the unarmed off hand; they only attack with the main
hand.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Hide of the Vendigo only decides which skills can be used, based on the
main hand. Once a skill can be used, the unarmed off hand from Hollow Palm
Technique attacks with it as well, unless the skill is dual wield only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The weapon checks overwrote the reason with "No usable weapon equipped",
so the check now runs after them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Work out whether the weapon slots are disabled before the items are
processed, and leave the disabled weapons out of the equipped item list
(keeping them in disabledItemList for their requirements and for minions
that use them). Everything that reads the equipped items then sees empty
weapon slots, so the Dancing Dervish specific workarounds for its
modifiers, Battlemage, Spellblade and the off hand conditions are no
longer needed. Rampage from the Dancing Dervish still applies.

Item-granted skill groups are only created after the items are
processed, so the calculation is redone if that changes whether the
weapons are disabled, e.g. right after equipping The Dancing Dervish.
Skills granted by an item being replaced when comparing items no longer
disable the weapon slots.

Only the skill that disables the weapons is exempt from being disabled
when it comes from a weapon slot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Without an off hand hit the test compared nil with nil and passed on dev.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… Palm

Regression test for PathOfBuildingCommunity#10516.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

1 participant