Repository navigation
Hold a pistol's slide back from the last shot to the reload - #2248
sunzenshen wants to merge 5 commits into
Conversation
The Tachi and Milso viewmodels have an idle01empty sequence with the slide held back, which neo never played: an emptied pistol held its last fire frame for 2.0 s and then idled with the slide forward. The original NEOTOKYO holds the slide back from the end of the last shot until the reload. Send ACT_VM_IDLE_EMPTY for ACT_VM_IDLE while the clip is empty, as the SDK crossbow does, and go to it as the emptying shot's sequence ends. Models without the sequence are unchanged.
The Tachi and Milso viewmodels ship a drawempty sequence, the normal draw with the slide held back, but it carries no activity, so an empty pistol drew with the slide forward and only pulled it back as the empty idle faded in. Pick drawempty by name in Deploy when the clip is empty. Models without it, and loaded draws, are unchanged.
The shot that emptied a Tachi or Milso played its normal fire sequence, whose slide closes within 0.2 s, and the slide went back only when the empty idle followed 0.4 s later. Both pistols ship a dry fire sequence that is a shot's kick with the slide held back throughout, ending on the empty idle's pose, so the last round's shot plays that instead.
A reload always played the reload sequence, whose slide is forward from its first frame, so the slide of an empty pistol closed as the reload began. The Milso ships a reload for an empty gun (ACT_VM_RELOAD_EMPTY) that keeps the slide back until its release near the end, the same length as the reload; an empty weapon now plays it where the model has one.
|
PR (2259) is the more complete solution, but I am proposing this PR #2248 simultaneously, because I think we need to figure out how to handle the raw precompiled animation files from NeotokyoRebuild/neoAssets#170 . Maybe they shouldn't be in neoAssets? So it might be easier to merge this PR first before we figure out the answer to animation file management. |
| // an empty weapon reloads with its slide held back until the release, where the model has that reload | ||
| if (UsesClipsForAmmo1() && m_iClip1 <= 0 && SelectWeightedSequence(ACT_VM_RELOAD_EMPTY) != ACTIVITY_NOT_AVAILABLE) | ||
| { | ||
| if (!DefaultReload(GetMaxClip1(), GetMaxClip2(), ACT_VM_RELOAD_EMPTY)) |
There was a problem hiding this comment.
do we have any weapons that benefit from this change? It might be a good idea regardless, but from what I can tell the tachi reload has the slide forward when reloading while empty
There was a problem hiding this comment.
That's a fair point, and maybe for consistency, arguably the full animations need to be implemented for this to be cohesive.
This PR is the same idea but with a custom animation to fix the tachi slide back:
These are the differences between master and the two PRs:
case8c-slide-reload-tachi.mp4
|
Drafting in favor of #2259 |
|
Closing in favor of #2259 |
Description
The Tachi and Milso viewmodels have empty-magazine animations that the game did not use. This change keeps the slide locked back after the last shot, while the pistol is drawn empty, and through an empty reload when the model has a
reloademptysequence. Empty reloads also trigger the third-person reload gesture. Other weapons and loaded-pistol animations remain unchanged.The Tachi does not yet include
reloadempty; NeotokyoRebuild/neoAssets#170 adds that asset. #2259 is the same code paired with the asset update. Merge this PR or #2259, not both.Testing: Compared the animation sequence and slide position against master and classic NEOTOKYO. Checked empty and partial reloads, weapon switching, and loaded-pistol and rifle controls. The Debug checks reported only known asserts.
Linked Issues