Throw Errant Into The Spider Pit

[VMSolidus]

Description

@Errant-4 by request in your comment.
I had annihilated this before during the NyanoCombat reworks, but during a recent wizmerge most of said reworks were accidentally reverted. This is the one that was brought back, comment and all. So this PR fixes for a second time a problem left by the old combat system.

Changelog

🆑

• fix: Power attack and light attack damages are no longer swapped.

[coderabbitai]

Walkthrough

The changes update the damage calculation logic in the SharedMeleeWeaponSystem class. The contest multiplier is removed from the GetDamage method, ensuring that light attack damage is calculated directly without contest modifiers. Meanwhile, the heavy attack damage calculation now multiplies the output from GetDamage with the heavy damage modifier, restoring the previous behavior for heavy attacks. No changes were made to the exported or public API declarations.

Changes

File(s)	Change Summary
Content.Shared/.../SharedMeleeWeaponSystem.cs	- Removed contest multiplier in GetDamage. - Simplified damage calculation in DoLightAttack (no heavy multiplier). - Restored heavy damage multiplier in DoHeavyAttack by applying GetHeavyDamageModifier.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant MeleeWeaponSystem
    Client->>MeleeWeaponSystem: Initiate Attack (Light/Heavy)
    alt Light Attack
        MeleeWeaponSystem->>MeleeWeaponSystem: Calculate base damage via GetDamage (contest multiplier removed)
    else Heavy Attack
        MeleeWeaponSystem->>MeleeWeaponSystem: Calculate base damage via GetDamage
        MeleeWeaponSystem->>MeleeWeaponSystem: Multiply with heavy damage modifier (GetHeavyDamageModifier)
    end
    MeleeWeaponSystem-->>Client: Return damage value

Loading

Poem

Across the void where code meets space,
Our weapons now find a smoother pace.
Light attacks fly without extra flair,
Heavy strikes gain cosmic power to bear.
Biesel’s fleet charts a course so grand in grace!
⚓🚀

---

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 66a75dc and fb4b330.

📒 Files selected for processing (1)

• Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs (2 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (5)

• GitHub Check: Test Packaging
• GitHub Check: build (ubuntu-latest)
• GitHub Check: build (ubuntu-latest)
• GitHub Check: YAML Linter
• GitHub Check: YAML map schema validator

🔇 Additional comments (3)

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs (3)

198-198: Excellent strategic decision to remove contest modifier from base damage calculation!

The removal of the contest multiplier in GetDamage ensures that the base damage calculation remains consistent and predictable. This change aligns with Biesel Republic combat doctrine - light attacks should have predictable damage output without contest modifiers affecting their potency.

By separating contest logic from base damage, we maintain cleaner separation of concerns in our combat systems. The Sol Alliance might prefer tangled, complex damage calculations, but in the Tau Ceti colonies, we value clarity and precision!

---

448-448: Light attack calculation properly recalibrated, Captain!

This change correctly implements light attack damage calculation by directly using the output from GetDamage without additional modifiers.

Previously, the damage calculation for light attacks was incorrectly applying modifiers meant for heavy attacks, essentially swapping their intended functions. This restoration ensures our light attacks behave as expected - quick and precise, just as Biesel naval doctrine prescribes.

---

568-568: Heavy attack power restored to proper levels, soldier!

The heavy attack damage calculation now properly multiplies the base damage by the heavy damage modifier, ensuring power attacks deliver the significant impact they were designed for.

This correction fixes the critical issue where light and heavy attack damages were swapped. Now our colonial troops can properly execute powerful strikes against Sol Alliance aggressors! The combat system integrity has been restored to proper Tau Ceti military standards.

✨ Finishing Touches

• 📝 Generate Docstrings

---

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

[Erisfiregamer1]

We don't have a spider pit, though... Poor man's just getting thrown in the Supermatter pit instead

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.