Cubed-Development / Modern-Warfare-Cubed

Welcome to the official GitHub Repository for Modern Warfare Cubed!
Apache License 2.0
87 stars 58 forks source link

Fix Weapon reload freeze #418

Open Koud-Wind opened 3 months ago

Koud-Wind commented 3 months ago

๐Ÿ“ Description

Fix Unable to find magazine while reload, resulting in weapon freezing

๐ŸŽฏ Goals

Weapon reload freeze

โŒ Non Goals

Code abbreviation is not the goal

๐Ÿšฆ Testing

When reload cannot find the magazine, it will roll back the status

In the creation mode, perform weapon reload, instant sneak, the weapon will not freeze In survival mode, the weapon reload and instantly discards the only available magazine, the weapon will not freeze

โฎ๏ธ Backwards Compatibility

Fully compatible

๐Ÿ–ผ๏ธ Screenshots/Recordings

https://discord.com/channels/801852948854079489/1078839351468892241/1219634858368696412

๐Ÿ“– Added to documentation?

๐Ÿ˜„ [optional] What gif best describes this PR or how it makes you feel?

I discovered this issue in June last year 4}137ZH~VVP6IFUK6REA)95

coderabbitai[bot] commented 3 months ago
Walkthrough ## Walkthrough The recent updates to the weapon handling code primarily address enhancements in reloading logic and state transitions. These changes include adding a transition to `WeaponState.PAUSED` when specific conditions are met during compound reloads, improving the handling of magazine attachments, and refining the rendering state logic to differentiate between recoiled and shooting states for both first-person and third-person views. ## Changes | File | Change Summary | |-------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------| | `.../paneedah/weaponlib/WeaponReloadAspect.java`| - Added transition to `WeaponState.PAUSED` during `COMPOUND_RELOAD_FINISH`. | | | - Updated reloading logic based on attachment presence. | | | - Refactored magazine attachment handling during compound reloads. | | `.../paneedah/weaponlib/WeaponRenderer.java` | - Changed state assignments in rendering logic: `NORMAL` โ†’ `RECOILED` in some cases and `NORMAL` โ†’ `SHOOTING` in others.| ## Sequence Diagram(s) ```mermaid sequenceDiagram participant Player participant WeaponReloadAspect participant WeaponRenderer participant WeaponState Player ->> WeaponReloadAspect: Initiate reloadMainHeldItem WeaponReloadAspect ->> WeaponState: Check attachment presence WeaponState -->> WeaponReloadAspect: Attachment info alt Attachment Present WeaponReloadAspect ->> WeaponState: Transition to PAUSED end WeaponReloadAspect -->> Player: Complete reloadMainHeldItem Player ->> WeaponReloadAspect: Initiate clientCompoundReload WeaponReloadAspect ->> WeaponState: Check attachment presence WeaponState -->> WeaponReloadAspect: Attachment info alt Attachment Present WeaponReloadAspect ->> WeaponState: Transition to PAUSED end WeaponReloadAspect -->> Player: Complete clientCompoundReload Player ->> WeaponRenderer: Render weapon alt First Person View WeaponRenderer ->> WeaponRenderer: Assign state RECOILED/SHOOTING else Third Person View WeaponRenderer ->> WeaponRenderer: Assign state RECOILED/SHOOTING end WeaponRenderer -->> Player: Render state updated ```

[!TIP]

Early access features: enabled We are currently testing the following features in early access: - **OpenAI `gpt-4o` model for code reviews and chat**: OpenAI claims that this model is better at understanding and generating code than the previous models. We seek your feedback over the next few weeks before making it generally available. Note: - You can enable or disable early access features from the CodeRabbit UI or by updating the CodeRabbit configuration file. - Please join our [Discord Community](https://discord.com/invite/GsXnASn26c) to provide feedback and report issues. - OSS projects are always opted into early access features.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)
Tips ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit .` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai generate interesting stats about this repository and render them as a table.` - `@coderabbitai show all the console.log statements in this repository.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (invoked as PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. ### CodeRabbit Configration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit. - Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.
dark-steveneq commented 3 months ago

In my opinion the reload should proceed "as usual", as in it shouldn't reset your ammo count back to 0 but to full and whatnot

Koud-Wind commented 3 months ago

In my opinion the reload should proceed "as usual", as in it shouldn't reset your ammo count back to 0 but to full and whatnot

It did not reset Ammo to 0, and it should not be reset to full either

Desoroxxx commented 3 months ago

Shouldn't get rollbacked either, should just not load this be unloaded

Koud-Wind commented 3 months ago

Shouldn't get rollbacked either, should just not load this be unloaded

I tried to unload it, but the animation between reload and unload didn't connect well Even in reality, when a soldier's magazine runs out, he should insert it back in

Desoroxxx commented 3 months ago

I tried to unload it, but the animation between reload and unload didn't connect well

You shouldn't animate unload again, when the stall point is reached the magazine is already unloaded, you just need to get it back to ready

Koud-Wind commented 3 months ago

You shouldn't animate unload again, when the stall point is reached the magazine is already unloaded, you just need to get it back to ready

If not rolled back, it will cause the magazine to disappear

Desoroxxx commented 2 weeks ago

Will go back to this after the thing