Skip to content

Fixes Krav Maga Damage Boosts#2285

Closed
Tirochora wants to merge 3 commits intoSimple-Station:release-candidatefrom
Tirochora:kravmagafix
Closed

Fixes Krav Maga Damage Boosts#2285
Tirochora wants to merge 3 commits intoSimple-Station:release-candidatefrom
Tirochora:kravmagafix

Conversation

@Tirochora
Copy link
Copy Markdown
Contributor

@Tirochora Tirochora commented Apr 19, 2025

Description

Minor bugfix to rectify one of the issues I inadvertently created with my last accepted PR. I had forgotten to ensure that the melee damage from the krav maga gloves only applies if you are attacking while unarmed, so I changed that.


TODO

  • Task
  • Completed Task

Media

Einstein.Engines.2025-04-20.12-30-31.mp4


Changelog

🆑

  • tweak: Krav Maga no longer increases all melee damage.

@github-actions github-actions Bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: YML Changes any yml files labels Apr 19, 2025
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 19, 2025

Walkthrough

A guard clause was introduced in the OnKravMagaAttackPerformed method within the Krav Maga martial arts system. This clause ensures that damage is only applied if the attacker's active hand is both retrievable and empty during a ComboAttackType.Harm action. If these conditions are not met, the method exits early, preventing further logic execution. All other existing behaviors, including conditional extra damage, remain unchanged.

Changes

Files/Paths Change Summary
Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.KravMaga.cs Added a guard clause to ensure damage is only dealt if the active hand is retrievable and empty.

Suggested labels

Changes: C#

Poem

A guard stands firm, hand empty and free,
No sneaky strikes—just as it should be!
Krav Maga’s logic, now sharp as a blade,
No Sol Alliance hacks will ever invade.
In Tau Ceti’s code, discipline rings true—
For order and clarity, we code anew!
🪐

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 40ab3c5 and dd059ba.

📒 Files selected for processing (1)
  • Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.KravMaga.cs (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
  • GitHub Check: YAML Linter
  • GitHub Check: YAML map schema validator
  • GitHub Check: build (ubuntu-latest)
🔇 Additional comments (1)
Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.KravMaga.cs (1)

61-63: Combat protocol correction properly implemented, soldier!

This guard clause ensures the Krav Maga damage bonus only applies when using bare hands - as it should be! The Sol Alliance saboteurs had this incorrectly applying damage bonuses to all weapons. This fix aligns with proper Biesel Republic combat doctrine by checking that:

  1. We can retrieve the active hand
  2. The hand is empty (unarmed)

This maintains the integrity of our martial arts system. A disciplined approach to combat mechanics!

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
  • @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.

@Tirochora Tirochora changed the title Kravmagafix Fixes Krav Maga Damage Boosts Apr 19, 2025
@Tirochora Tirochora changed the base branch from master to release-candidate May 3, 2025 04:56
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the branch Simple-Station:release-candidate May 7, 2025 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: C# Changes any cs files Changes: YML Changes any yml files Status: Needs Review Someone please review this

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants