Skip to content

Add back #646 - trade ship gold by travelled distance#1085

Merged
evanpelle merged 1 commit intoopenfrontio:mainfrom
Maaxion:1066_return_646
Jun 7, 2025
Merged

Add back #646 - trade ship gold by travelled distance#1085
evanpelle merged 1 commit intoopenfrontio:mainfrom
Maaxion:1066_return_646

Conversation

@Maaxion
Copy link
Contributor

@Maaxion Maaxion commented Jun 7, 2025

Description:

Return #646 - gold from tradeships by travelled distance

#646

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:

maxion_

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jun 7, 2025

Walkthrough

A new private variable now tracks the number of tiles a trade ship moves. The gold earned by the ship is calculated using this traveled tiles count, instead of the Manhattan distance between ports. The counter increments each time the ship moves to a new tile.

Changes

File(s) Change Summary
src/core/execution/TradeShipExecution.ts Added tilesTraveled private member; incremented on each tile movement; gold calculation now uses this counter instead of Manhattan distance.

Poem

The ship now counts each tile it roams,
No longer guessing distance from home.
With every step, its treasure grows,
Counting tiles, not just where it goes.
Gold by the journey, not just the start—
A simple change, a counting heart!
🚢✨

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-07T18_06_01_320Z-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 7a9cc66 and 7484ff5.

📒 Files selected for processing (1)
  • src/core/execution/TradeShipExecution.ts (3 hunks)
🔇 Additional comments (3)
src/core/execution/TradeShipExecution.ts (3)

21-21: Clean field addition with proper initialization.

The new tilesTraveled counter is well-placed and follows TypeScript conventions. Initializing to 0 is correct for a distance counter.


113-113: Correct placement for tile counter increment.

The increment happens at the right time - when the ship actually moves to a new tile. This will properly track the total distance traveled rather than straight-line distance.


128-128:

Details

✅ Verification successful

Good change from distance to actual travel tracking.

Using tilesTraveled instead of calculated distance provides more accurate rewards based on the ship's actual journey. This matches the PR objective perfectly.

Verify that the tradeShipGold config method accepts tile count as expected:


🏁 Script executed:

#!/bin/bash
# Description: Check the tradeShipGold method signature to ensure it accepts tile count parameter

# Search for the tradeShipGold method definition
ast-grep --pattern 'tradeShipGold($PARAM) {
  $$$
}'

# Also search for any interface or type definitions
rg -A 5 "tradeShipGold"

Length of output: 1493


Verified tradeShipGold signature
The method signature in src/core/configuration/DefaultConfig.ts

tradeShipGold(dist: number): Gold

and its interface in src/core/configuration/Config.ts both accept a number. Passing this.tilesTraveled is valid.
No further changes required.


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.

Copy link
Collaborator

@evanpelle evanpelle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@github-project-automation github-project-automation bot moved this from Triage to Final Review in OpenFront Release Management Jun 7, 2025
@evanpelle evanpelle merged commit 9cfbd80 into openfrontio:main Jun 7, 2025
6 of 7 checks passed
@github-project-automation github-project-automation bot moved this from Final Review to Complete in OpenFront Release Management Jun 7, 2025
@scottanderson
Copy link
Contributor

Fixes #1066

@scottanderson scottanderson linked an issue Jun 8, 2025 that may be closed by this pull request
@scottanderson scottanderson added this to the v24 milestone Jun 8, 2025
@VariableVince
Copy link
Contributor

Wasn't this supposed to be a bug fix for v23 instead of waiting for v24?

scottanderson pushed a commit that referenced this pull request Jun 8, 2025
## Description:
Return #646 - gold from tradeships by travelled distance

#646

## Please complete the following:

- [X] I have added screenshots for all UI updates
- [X] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [X] I have added relevant tests to the test directory
- [X] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [X] 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:

maxion_
@scottanderson scottanderson modified the milestones: v24, v23 Jun 8, 2025
evanpelle pushed a commit that referenced this pull request Jun 10, 2025
## Description:
Return #646 - gold from tradeships by travelled distance

#646

## Please complete the following:

- [X] I have added screenshots for all UI updates
- [X] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [X] I have added relevant tests to the test directory
- [X] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [X] 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:

maxion_
El-Magico777 pushed a commit to El-Magico777/OpenFrontIO-Magico that referenced this pull request Jun 28, 2025
…nfrontio#1085)

Return openfrontio#646 - gold from tradeships by travelled distance

openfrontio#646

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

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

Accidentally reverted trade ship gold value by distance travelled

4 participants