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 issue #376: Death by Residual Damage leaving you stuck in combat #402

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

TheNinja-RPG
Copy link
Collaborator

This pull request fixes #376.

The changes made directly address both reported issues through a targeted fix in the combat processing logic. By adding the leftBattle = true flag when a player's health reaches 0 from residual damage, the code now properly handles these deaths the same way as regular combat deaths.

Specifically:

  1. The stuck-in-combat issue is resolved because setting leftBattle = true explicitly marks the player as no longer being in combat when they die from residual damage, which was previously missing.

  2. The Kage challenge issue is fixed because the combat system uses this same leftBattle flag to determine battle outcomes. When a defending Kage dies from residual damage, they will now be properly marked as having left the battle, which triggers the normal Kage loss processing.

The change is minimal but effective - it adds the critical state update that was missing for residual damage deaths, bringing them in line with how other types of combat deaths are handled. The passing combat-related tests confirm that the basic combat functionality remains intact while adding this new behavior.

The fix is logically complete since it addresses the root cause (missing battle exit state for residual damage deaths) rather than just treating symptoms, and it handles both reported issues through a single coherent change to the core combat logic.

Automatic fix generated by OpenHands 🙌

Copy link

vercel bot commented Feb 24, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
tnr ❌ Failed (Inspect) Feb 24, 2025 3:50pm

Copy link
Contributor

coderabbitai bot commented Feb 24, 2025

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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 using 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 generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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 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 for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

📦 Next.js Bundle Analysis for tnr

This analysis was generated by the Next.js Bundle Analysis action. 🤖

🎉 Global Bundle Size Decreased

Page Size (compressed)
global 92.62 KB (-3 B)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

@theeneon
Copy link
Collaborator

When a player is inactive and dies by residual damage the player that dies is stuck in combat @openhands-agent

@TheNinja-RPG
Copy link
Collaborator Author

OpenHands started fixing the pr! You can monitor the progress here.

@TheNinja-RPG
Copy link
Collaborator Author

Overview of Changes:

✅ Issue 1 - Combat State After Residual Damage Death

  • Fixed by properly marking player as dead rather than fled
  • Solution appears complete and aligned with system design

✅ Issue 2 - Kage Challenge Residual Damage

  • Added specific handling for Kage challenges
  • Correctly removes Kage status on residual damage death
  • Solution appears complete

Additional Improvement:

  • Enhanced user feedback for residual damage deaths

Status: RESOLVED

  • Both reported issues appear to be fully addressed
  • Solutions are properly integrated into existing systems
  • No apparent remaining issues or side effects

The changes seem thorough and well-implemented, with no obvious gaps or remaining concerns.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Death by Residual Damage leaving you stuck in combat
3 participants