Skip to content

fix: Repair warp speeds; refactor ETA function#1280

Merged
EttyKitty merged 2 commits into
Adeptus-Dominus:mainfrom
EttyKitty:fix/purgeworld
Jun 30, 2026
Merged

fix: Repair warp speeds; refactor ETA function#1280
EttyKitty merged 2 commits into
Adeptus-Dominus:mainfrom
EttyKitty:fix/purgeworld

Conversation

@EttyKitty

@EttyKitty EttyKitty commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Summary by cubic

Fixes incorrect warp travel times and refactors the ETA calculation to be clearer and more reliable. Travel time now correctly accounts for warp lanes, warp capability, and storms.

  • Bug Fixes

    • Apply lane bonus only when warp_able; off‑lane travel is 2x; on‑lane without warp uses normal speed.
    • Consistent storm penalty at the destination star.
    • Updated fleet selection and player fleet ETA displays to use the corrected calculation.
  • Refactors

    • Replaced calculate_fleet_eta(xx, yy, xxx, yyy, fleet_speed, star1, star2, warp_able) with calculate_fleet_eta(self_x, self_y, target_x, target_y, fleet_speed, from_star, to_star, warp_able).
    • Updated calls in obj_fleet_select, obj_p_fleet (Alarm_4), and scr_player_fleet_functions.
    • Added {bool} return annotation to is_orbiting.

Written for commit f218bbd. Summary will update on new commits.

Review in cubic

@github-actions github-actions Bot added Size: Small Type: Fix This is a fix for a bug labels Jun 30, 2026

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

1 issue found across 4 files

Confidence score: 3/5

  • In scripts/scr_fleet_functions/scr_fleet_functions.gml, the route-time logic appears to apply the connected-route doubling to non-warpable fleets, making lane-connected paths behave like no-lane travel; this can skew movement balance and AI/player travel decisions if merged as-is — separate the no-lane penalty from the warp-capable speed bonus before merging.

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment thread scripts/scr_fleet_functions/scr_fleet_functions.gml Outdated
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
@EttyKitty EttyKitty merged commit 733821e into Adeptus-Dominus:main Jun 30, 2026
3 checks passed
@EttyKitty EttyKitty deleted the fix/purgeworld branch June 30, 2026 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Small Type: Fix This is a fix for a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant