Skip to content

Bring upstream ship management and empty-shortcut fixes into play - #304

Merged
Guffawaffle merged 3 commits into
playfrom
integration/play-upstream-283-290
Sep 20, 2026
Merged

Guffawaffle merged 3 commits into
playfrom
integration/play-upstream-283-290

Conversation

@Guffawaffle

Copy link
Copy Markdown
Owner

Brings upstream #283 and #290 into current play after fork #299:

  • Arrow navigation between docks, Enter to assign a ship, and matching pinned/instant-warp ships by their localized display names.
  • Explicit empty shortcut strings disable bindings, like NONE; missing or invalid values retain defaults.

Preserves the shared Warp/Jump resolver so the course-button label and confirmation use the same decision. Corrects two issues found in the imported name-matching implementation: convert UTF-16 names to UTF-8 and retain 64-bit localization IDs on Windows. Adds an accented/Cyrillic matching fixture and ID type assertion.

Validation: all three final review lanes clear; Windows releasedbg DLL build, ship-name matching fixture, settings/selection/fleet-arrival fixtures, shortcut dispatch/hint fixture, all 11 example configs, and diff check passed. Native dock/Enter interaction smoke and Mac runtime validation remain outstanding. No deployment or game cycle performed for this integration.

Upstream #263 and #244 are excluded, as requested.

GingerNinja-STFC and others added 3 commits September 20, 2026 14:09
* feat: arrow navigation to switch docks

* feat: enter to assign ship

* refactor: match ship names via the game's localized display names

Resolves the exact name the game UI shows by looking up the ship's
locale id (ILocaId) with identifier ship_name_<id> through the game's
Localizer, replacing HullSpec.Name/IdStr matching plus every manual
alias. Config entries are matched against that display name so pinned
ships and instant-warp filters accept the names used in game (and
listed on stfc.space).
@Guffawaffle
Guffawaffle merged commit 81bd700 into play Sep 20, 2026
7 checks passed
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