Skip to content

Proper fix for 2 handed idle animation#6109

Merged
serprex merged 1 commit intoHarbourMasters:develop-copperfrom
garrettjoecox:actually-fix-2-handed-idle
Jan 8, 2026
Merged

Proper fix for 2 handed idle animation#6109
serprex merged 1 commit intoHarbourMasters:develop-copperfrom
garrettjoecox:actually-fix-2-handed-idle

Conversation

@garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Jan 6, 2026

Upon further investigation, and thanks to the decomp @bug comment documenting the actual bug, the proper fix for 2 handed idle animation is more obvious. (and different than all of our attempts).

TLDR:

(
    (
        (commonType + FIDGET_SWORD_SWING != FIDGET_SWORD_SWING) &&
        (commonType + FIDGET_SWORD_SWING != FIDGET_ADJUST_SHIELD)
    ) ||
    (
        (player->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) &&
        (
            (commonType + FIDGET_SWORD_SWING == FIDGET_ADJUST_SHIELD) ||
-            (Player_GetMeleeWeaponHeld2(player) != 0)
        )
    )
+   || (
+        (commonType + FIDGET_SWORD_SWING == FIDGET_SWORD_SWING) &&
+        (Player_GetMeleeWeaponHeld(player) != 0)
+    )
)

@garrettjoecox garrettjoecox force-pushed the actually-fix-2-handed-idle branch from 604bbc9 to e4dc6ea Compare January 6, 2026 16:42
@garrettjoecox garrettjoecox changed the base branch from develop to develop-copper January 6, 2026 16:42
@serprex serprex mentioned this pull request Jan 6, 2026
@serprex
Copy link
Contributor

serprex commented Jan 8, 2026

@Jepvid can you verify this addresses purpose of your original PRs?

@Jepvid
Copy link
Contributor

Jepvid commented Jan 8, 2026

Imo is a cleaner implementation rather than moving the cvar in a sense. havent tested if it actually idles like the other pr

@serprex serprex merged commit 8584ced into HarbourMasters:develop-copper Jan 8, 2026
1 check passed
@garrettjoecox garrettjoecox deleted the actually-fix-2-handed-idle branch January 8, 2026 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants