Skip to content

feat: useRate directly forR instead of max#2308

Merged
mkmccarty merged 1 commit intomainfrom
mm-branch-1
Apr 2, 2026
Merged

feat: useRate directly forR instead of max#2308
mkmccarty merged 1 commit intomainfrom
mm-branch-1

Conversation

@mkmccarty
Copy link
Copy Markdown
Owner

No description provided.

Copilot AI review requested due to automatic review settings April 2, 2026 21:22
@mkmccarty mkmccarty merged commit d68d15d into main Apr 2, 2026
12 checks passed
@mkmccarty mkmccarty deleted the mm-branch-1 branch April 2, 2026 21:23
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates the contract booster ordering logic for ContractOrderELR in the boost system so that ELR ordering uses egg laying rate directly instead of combining rates via max(...).

Changes:

  • Change ELR sort key from max(LayRate, ShipRate) to LayRate in reorderBoosters.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 1761 to 1765
elrPairs = append(elrPairs, ELRPair{
Name: el,
ELR: max(contract.Boosters[el].ArtifactSet.LayRate, contract.Boosters[el].ArtifactSet.ShipRate),
ELR: contract.Boosters[el].ArtifactSet.LayRate,
//ELR: max(contract.Boosters[el].ArtifactSet.LayRate, contract.Boosters[el].ArtifactSet.ShipRate),
})
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

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

ContractOrderELR now sorts using ArtifactSet.LayRate, but the boost list display still shows ELR as min(LayRate, ShipRate) (see boost_draw.go). This means users may see an "ELR" value that doesn’t match the actual sort key, which can make the ordering look wrong. Consider aligning the displayed metric with the sort key (or renaming the label if the intended metric is the effective min rate). Also, please remove the commented-out previous max(...) line to avoid confusion about which metric is authoritative.

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants