Skip to content

Make setting for go to player on spawn (default on) #3874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanpelle merged 4 commits into from
May 11, 2026
+32 −1
Merged

Make setting for go to player on spawn (default on) #3874

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d68986
Make setting for go to player on spawn (default on)
frederikja163 May 6, 2026
56dbbde
Update coderabbit suggestions
frederikja163 May 6, 2026
365a018
Make code more standard with other settings in the modal
frederikja163 May 6, 2026
5235b30
Move logic for turning gotoplayer off to event call
frederikja163 May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@
"coordinate_grid_desc": "Toggle the alphanumeric grid overlay",
"attacking_troops_overlay_label": "Attacking Troops Overlay",
"attacking_troops_overlay_desc": "Show attacker vs defender troop counts on active front lines.",
"go_to_player_label": "Go to player on start",
"go_to_player_desc": "Toggle zooming in on the player in the beginning of a game.",
"performance_overlay_label": "Performance Overlay",
"performance_overlay_desc": "Toggle the performance overlay. When enabled, the performance overlay will be displayed. Press shift-D during game to toggle.",
"easter_writing_speed_label": "Writing Speed Multiplier",
Expand Down
4 changes: 3 additions & 1 deletion src/client/ClientGameRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ async function createClientGame(
worker,
gameView,
soundManager,
userSettings,
);
} catch (err) {
soundManager.dispose();
Expand Down Expand Up @@ -322,6 +323,7 @@ export class ClientGameRunner {
private worker: WorkerClient,
private gameView: GameView,
private soundManager: SoundManager,
private userSettings: UserSettings,
) {
this.lastMessageTime = Date.now();
}
Expand Down Expand Up @@ -452,7 +454,7 @@ export class ClientGameRunner {
this.transport.rejoinGame(this.turnsSeen);
};

let hasGoneToPlayer = false;
let hasGoneToPlayer = !this.userSettings.goToPlayer();
Copy link
Copy Markdown
Collaborator

@evanpelle evanpelle May 7, 2026

Choose a reason for hiding this comment

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

I think this is a bit confusing, becasue we haven't already gone to the player. instead just return early if gotoplayer is disabled.

Copy link
Copy Markdown
Contributor Author

@frederikja163 frederikja163 May 8, 2026

Choose a reason for hiding this comment

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

@evanpelle this should be fixed in the latest commit.

const onmessage = (message: ServerMessage) => {
this.lastMessageTime = Date.now();
if (message.type === "start") {
Expand Down
9 changes: 9 additions & 0 deletions src/client/UserSettingModal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,15 @@ export class UserSettingModal extends BaseModal {
@change=${this.toggleTerritoryPatterns}
></setting-toggle>

<!-- 🔍 Go to player -->
<setting-toggle
label="${translateText("user_setting.go_to_player_label")}"
description="${translateText("user_setting.go_to_player_desc")}"
id="go-to-player-toggle"
.checked=${this.userSettings.goToPlayer()}
@change=${this.userSettings.toggleGoToPlayer}
></setting-toggle>

<!-- 📱 Performance Overlay -->
<setting-toggle
label="${translateText("user_setting.performance_overlay_label")}"
Expand Down
8 changes: 8 additions & 0 deletions src/core/game/UserSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ export class UserSettings {
return this.getBool("settings.territoryPatterns", true);
}

goToPlayer() {
return this.getBool("settings.goToPlayer", true);
}

attackingTroopsOverlay() {
return this.getBool("settings.attackingTroopsOverlay", true);
}
Expand Down Expand Up @@ -225,6 +229,10 @@ export class UserSettings {
this.setBool("settings.territoryPatterns", !this.territoryPatterns());
}

toggleGoToPlayer() {
this.setBool("settings.goToPlayer", !this.goToPlayer());
}

toggleDarkMode() {
this.setBool(DARK_MODE_KEY, !this.darkMode());
}
Expand Down
Loading