Skip to content
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.

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

Fix MP5K using incorrect NPC activities #252

Merged

Conversation

Blixibon
Copy link
Collaborator

@Blixibon Blixibon commented Mar 2, 2024

The MP5K currently uses ACT_RANGE_ATTACK_AR2 as its attack activity, while using SMG1 activities for everything else. This causes the hand position of NPCs to snap to the AR2 position, which isn't correct and looks unnatural. This PR changes it to use ACT_RANGE_ATTACK_SMG1 instead.

However, the SMG2 worldmodel's animations are designed to use ACT_RANGE_ATTACK_AR2, so in order to fix that without recompiling the model or breaking workshop addons, a hack is included for the worldmodel to fall back to ACT_RANGE_ATTACK_AR2 if ACT_RANGE_ATTACK_SMG1 isn't available.

This PR also fixes the SMG2 using pistol holster/unholster animations.

@Blixibon Blixibon requested a review from 1upD March 2, 2024 21:41
Copy link

@1upD 1upD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little bit surprised by this. Do they really use an attack animation that doesn't line up with the model? Does the SMG1 animation look better for this? I think you've already validated this so approved

@1upD 1upD merged commit 40076ab into entropy-zero:ez2/mapbase Mar 7, 2024
5 checks passed
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.

None yet

2 participants