Skip to content

fix(solo): sync personal best score and max combo on pregame screen (#4) #45

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
Hsiii merged 2 commits into from
Jul 22, 2026
Merged

fix(solo): sync personal best score and max combo on pregame screen (#4) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d96e87
fix(solo): sync personal best score and max combo on pregame screen (#4)
Jul 21, 2026
e1672e9
fix(godot): replace invalid accessibility_name property with built-in…
Jul 21, 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
20 changes: 10 additions & 10 deletions godot/scripts/screens/main.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,7 +2187,7 @@ func _show_player_name_dialog() -> void:
player_name_input.text = battle_player_name
player_name_input.max_length = SaveManager.PLAYER_NAME_LIMIT
player_name_input.placeholder_text = BATTLE_GUEST_NAME
player_name_input.accessibility_name = "Username"
player_name_input.tooltip_text = "Username"
player_name_input.position = Vector2(14, 104)
player_name_input.size = Vector2(DIALOG_WIDTH - 28.0, 44)
player_name_input.alignment = HORIZONTAL_ALIGNMENT_CENTER
Expand Down Expand Up @@ -4282,7 +4282,7 @@ func _make_home_title() -> HBoxContainer:

func _make_home_blob_button(text: String, callback: Callable, color: Color, icon_kind: String) -> Button:
var button := Button.new()
button.accessibility_name = text
button.tooltip_text = text
button.custom_minimum_size = Vector2(HOME_BLOB_SIZE, HOME_BLOB_SIZE)
button.size = Vector2(HOME_BLOB_SIZE, HOME_BLOB_SIZE)
button.text = ""
Expand Down Expand Up @@ -4339,7 +4339,7 @@ func _start_home_blob_idle(button: Button, starts_raised: bool) -> void:

func _make_home_menu_button() -> Button:
var button := Button.new()
button.accessibility_name = "Close menu" if home_menu_open else "Menu"
button.tooltip_text = "Close menu" if home_menu_open else "Menu"
button.size = Vector2(HOME_MENU_BUTTON_SIZE, HOME_MENU_BUTTON_SIZE)
button.custom_minimum_size = Vector2(HOME_MENU_BUTTON_SIZE, HOME_MENU_BUTTON_SIZE)
button.text = ""
Expand All @@ -4353,7 +4353,7 @@ func _make_home_menu_button() -> Button:

func _make_home_menu_item(icon_kind: String, tooltip: String, callback: Callable) -> Button:
var button := Button.new()
button.accessibility_name = tooltip
button.tooltip_text = tooltip
button.text = ""
button.custom_minimum_size = Vector2(48, 48)
button.flat = true
Expand All @@ -4368,7 +4368,7 @@ func _prefers_reduced_motion() -> bool:

func _make_header_icon_button(text: String, callback: Callable) -> Button:
var button := Button.new()
button.accessibility_name = "Back" if text == "←" else text
button.tooltip_text = "Back" if text == "←" else text
button.text = "" if text == "←" else text
button.size = Vector2(44, 44)
button.custom_minimum_size = Vector2(44, 44)
Expand All @@ -4381,7 +4381,7 @@ func _make_header_icon_button(text: String, callback: Callable) -> Button:

func _make_page_back_button(callback: Callable) -> Button:
var button := Button.new()
button.accessibility_name = "Back"
button.tooltip_text = "Back"
button.text = ""
button.size = Vector2(44, 44)
button.custom_minimum_size = Vector2(44, 44)
Expand All @@ -4393,7 +4393,7 @@ func _make_page_back_button(callback: Callable) -> Button:

func _make_pause_icon_button() -> Button:
var button := Button.new()
button.accessibility_name = "Pause"
button.tooltip_text = "Pause"
button.size = Vector2(44, 44)
button.custom_minimum_size = Vector2(44, 44)
button.text = ""
Expand Down Expand Up @@ -4510,15 +4510,15 @@ func _build_prime_keypad_controls(

backspace_button = _make_icon_text_button("", COLOR_PRIMARY_STRONG, COLOR_INK, 28, "backspace")
backspace_button.name = "BackspaceButton"
backspace_button.accessibility_name = "Backspace"
backspace_button.tooltip_text = "Backspace"
backspace_button.custom_minimum_size = Vector2(SOLO_KEY_SIZE, SOLO_KEY_SIZE)
_add_delete_icon(backspace_button, SOLO_KEY_SIZE, SOLO_KEY_SIZE, _get_button_text_color(COLOR_PRIMARY_STRONG))
backspace_button.pressed.connect(backspace_callback)
action_column.add_child(backspace_button)

submit_button = _make_icon_text_button("", COLOR_PRIMARY_STRONG, COLOR_INK, 34, "submit")
submit_button.name = "SubmitButton"
submit_button.accessibility_name = "Submit combo"
submit_button.tooltip_text = "Submit combo"
submit_button.custom_minimum_size = Vector2(SOLO_KEY_SIZE, (SOLO_KEY_SIZE * 2.0) + SOLO_KEY_GAP)
_add_submit_icon(submit_button, SOLO_KEY_SIZE, (SOLO_KEY_SIZE * 2.0) + SOLO_KEY_GAP, _get_button_text_color(COLOR_PRIMARY_STRONG))
submit_button.pressed.connect(submit_callback)
Expand Down Expand Up @@ -4560,7 +4560,7 @@ func _animate_tutorial_card(card: Panel) -> void:

func _make_prime_key_button(text: String) -> Button:
var button := Button.new()
button.accessibility_name = "Prime %s" % text
button.tooltip_text = "Prime %s" % text
button.text = text
button.custom_minimum_size = Vector2(SOLO_KEY_SIZE, SOLO_KEY_SIZE)
_apply_button_theme(button, THEME_BUTTON_KEYPAD)
Expand Down
20 changes: 11 additions & 9 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ async function syncAuthenticatedLeaderboardProfile({
onPlayerName: (name: string) => void;
}) {
const userId = currentSession.user.id;
const fallbackHighScore = loadBestScore().score;
const fallbackBest = loadBestScore();
const fallbackHighScore = fallbackBest.score;
const fallbackExperience = loadExperience();
const existingRecordResponse = await authClient
.from('combo_leaderboard')
Expand All @@ -213,6 +214,10 @@ async function syncAuthenticatedLeaderboardProfile({
experience: number;
updated_at: string | null;
} | null;
const nextMaxCombo = Math.max(
existingRecord?.max_combo ?? 0,
fallbackBest.maxCombo
);
const nextHighScore = Math.max(
normalizeHistoricSoloHighScore(
existingRecord?.high_score ?? 0,
Expand All @@ -225,19 +230,15 @@ async function syncAuthenticatedLeaderboardProfile({
fallbackExperience
);

if (nextHighScore > 0) {
saveBestScore(nextHighScore, 0);
if (nextHighScore > 0 || nextMaxCombo > 0) {
saveBestScore(nextHighScore, nextMaxCombo);
}

const localBest = loadBestScore();
const stats: ProfileStats = {
games_played: existingRecord?.games_played ?? 0,
wins: existingRecord?.wins ?? 0,
losses: existingRecord?.losses ?? 0,
max_combo: Math.max(
existingRecord?.max_combo ?? 0,
localBest.maxCombo || 0
),
max_combo: nextMaxCombo,
high_score: nextHighScore,
experience: nextExperience,
updated_at: existingRecord?.updated_at,
Expand Down Expand Up @@ -500,7 +501,7 @@ export default function App(): JSX.Element {
const soloGame = useSoloGame({
screen,
onScreenChange,
onNewBest: (score) => {
onNewBest: (score, maxCombo) => {
const userId = session?.user.id;
if (!supabaseAuthClient || !userId || !playerName) {
return;
Expand All @@ -512,6 +513,7 @@ export default function App(): JSX.Element {
user_id: userId,
player_name: playerName,
high_score: score,
max_combo: maxCombo,
},
{ onConflict: 'user_id' }
)
Expand Down
22 changes: 22 additions & 0 deletions src/hooks/useSoloGame.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,28 @@ export function useSoloGame({
isPausedRef.current = isPaused;
}, [isPaused]);

useEffect(() => {
function syncBestScore() {
setBestScore(loadBestScore());
}

syncBestScore();

globalThis.addEventListener(
'atomize:best-score-updated',
syncBestScore
);
globalThis.addEventListener('storage', syncBestScore);

return () => {
globalThis.removeEventListener(
'atomize:best-score-updated',
syncBestScore
);
globalThis.removeEventListener('storage', syncBestScore);
};
}, [screen]);

useEffect(() => {
if (screen !== 'single') {
return undefined;
Expand Down
10 changes: 9 additions & 1 deletion src/lib/app-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,26 @@ export function loadBestScore(): BestScoreRecord {
export function saveBestScore(score: number, maxCombo: number): boolean {
const current = loadBestScore();
const isNewHighScore = score > current.score;
const isNewMaxCombo = maxCombo > current.maxCombo;

if (isNewHighScore) {
globalThis.localStorage.setItem(bestScoreStorageKey, String(score));
}

if (maxCombo > current.maxCombo) {
if (isNewMaxCombo) {
globalThis.localStorage.setItem(
bestMaxComboStorageKey,
String(maxCombo)
);
}

if (
(isNewHighScore || isNewMaxCombo) &&
typeof globalThis.dispatchEvent === 'function'
) {
globalThis.dispatchEvent(new Event('atomize:best-score-updated'));
}

return isNewHighScore;
}

Expand Down