Skip to content

DO NOT MERGE allow counter attack - #1126

Closed
evanpelle wants to merge 1 commit into
mainfrom
evan-counter-attack
Closed

evanpelle wants to merge 1 commit into
mainfrom
evan-counter-attack

Conversation

@evanpelle

Copy link
Copy Markdown
Collaborator

Description:

Please complete the following:

  • I have added screenshots for all UI updates
  • I process any text displayed to the user through translateText() and I've added it to the en.json file
  • I have added relevant tests to the test directory
  • I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced
  • I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors

Please put your Discord username so you can be contacted if a bug or regression is found:

@coderabbitai

coderabbitai Bot commented Jun 10, 2025 •

Copy link
Copy Markdown
Contributor

Walkthrough

The logic for canceling out opposing attacks between players has been disabled by commenting out the relevant code. Additionally, the merging of outgoing attacks targeting the same player was changed: merging now only happens if the current attack's source tile is null, and the direction of troop addition and deletion has been reversed.

Changes

File Change Summary
src/core/execution/AttackExecution.ts Disabled opposing attack cancellation logic; changed merge condition and reversed troop merging direction.

Poem

In the land where armies clash and meet,
The old cancel dance has faced defeat.
Merging flows with a different song,
Troops now gather where they belong.
No more battles canceled in the night—
Just merging forces, ready to fight!
⚔️✨

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

npm error Exit handler never called!
npm error This is an error with npm itself. Please report this error at:
npm error https://github.com/npm/cli/issues
npm error A complete log of this run can be found in: /.npm/_logs/2025-06-10T00_14_53_951Z-debug-0.log


📜 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 9401f20 and cd4af2e.

📒 Files selected for processing (1)
  • src/core/execution/AttackExecution.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (2)
src/core/execution/AttackExecution.ts (2)

125-138: Major gameplay change: Counter attack cancellation disabled.

The entire opposing attack cancellation mechanism has been commented out. This means attacks from opposing players will no longer automatically cancel each other out based on troop counts. While this aligns with the PR objective to "allow counter attack," consider the gameplay implications:

  • Players can now have simultaneous attacks against each other
  • Attack timing and coordination become more strategic
  • Potential for more complex battle scenarios

Ensure this change has been thoroughly tested for balance and edge cases.


139-149:

Details

❓ Verification inconclusive

Modified attack merging logic with reversed direction.

Two significant changes to the attack merging logic:

  1. Condition change: Now only merges when this.attack.sourceTile() === null (was previously checking if source tiles matched)
  2. Direction reversal: Now adds outgoing attack troops to current attack and deletes the outgoing attack (was previously the opposite)

The condition change is quite specific and may create edge cases. The direction reversal could impact which attack object survives the merge.

Consider adding comments to explain when sourceTile is null and why this specific condition triggers merging:

      if (
        outgoing !== this.attack &&
        outgoing.target() === this.attack.target() &&
+        // Only merge attacks without a specific source tile
        this.attack.sourceTile() === null
      ) {

Verify this logic handles all expected scenarios correctly:


🏁 Script executed:

#!/bin/bash
# Search for other attack merging or sourceTile usage to understand the pattern
rg -A 5 -B 5 "sourceTile.*null|\.sourceTile\(\)"

Length of output: 5586


I’m still gathering context on how AttackExecution initializes and uses sourceTile. To confirm when this.attack.sourceTile() === null is expected—and ensure merging only applies in those cases—let’s inspect the constructor and creation of this.attack in AttackExecution.ts.


🏁 Script executed:

#!/bin/bash
# Show how the Attack object is created inside AttackExecution
rg -n "createAttack" -A3 src/core/execution/AttackExecution.ts
rg -n "new AttackImpl" -A3 src/core/execution/AttackExecution.ts

Length of output: 255


Clarify merge intent in AttackExecution.ts

The merge code now only fires when the new attack has no sourceTile, and it lets the new attack absorb troops from existing ones (then deletes the old). This is a deliberate change from merging on matching source tiles, but it isn’t obvious why we only merge “untargeted” attacks or why we reverse which object survives.

Please add an inline comment and test coverage for both cases:

• File: src/core/execution/AttackExecution.ts
Lines: ~139–149

     if (
       outgoing !== this.attack &&
       outgoing.target() === this.attack.target() &&
+        // we only merge attacks created without a sourceTile so that
+        // explicitly‐sourced attacks stay separate
       this.attack.sourceTile() === null
     ) {
       this.attack.setTroops(this.attack.troops() + outgoing.troops());
       outgoing.delete();
       return;
     }

• Verify that:

  • Attacks with a non-null sourceTile never merge.
  • Attacks with sourceTile === null merge as expected.
  • Unit tests cover both behaviors.

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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 sequence diagram to generate a sequence diagram of the changes in 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.

@VariableVince

Copy link
Copy Markdown
Contributor

The oldest still open PR #156 was meant to introduce this. Nice to see the newest one picking it up

@evanpelle
evanpelle marked this pull request as ready for review June 10, 2025 00:47
@evanpelle
evanpelle requested a review from a team as a code owner June 10, 2025 00:47
@evanpelle evanpelle closed this Jun 10, 2025
@github-project-automation github-project-automation Bot moved this from Triage to Complete in OpenFront Release Management Jun 10, 2025
@evanpelle evanpelle reopened this Jun 10, 2025
@github-project-automation github-project-automation Bot moved this from Complete to Triage in OpenFront Release Management Jun 10, 2025
@evanpelle evanpelle changed the title allow counter attack DO NOT MERGE allow counter attack Jun 10, 2025
@evanpelle evanpelle closed this Jun 10, 2025
@github-project-automation github-project-automation Bot moved this from Triage to Complete in OpenFront Release Management Jun 10, 2025

This branch was previously deployed

1 inactive deployment
staging — cd4af2e7 Deployed Jun 10, 2025 by openfrontio[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

2 participants