Skip to content

Commit

Permalink
Better dx settings error message
Browse files Browse the repository at this point in the history
  • Loading branch information
@lunalawl
lunalawl committed Feb 3, 2025
1 parent 5b4077c commit 8227527
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 92 deletions.
28 changes: 14 additions & 14 deletions _ark/dx/locale/dx_locale_updates.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@

; Deluxe notifications
(audition_no_rock_central "Audition mode requires a connection to the game servers, but the game servers are not available at this time. Please try again later.")
(dx_continue "Let's Rock!")
(dx_letsrock "Let's Rock!")
(dx_iunderstand "I Understand")
(localize_it "Hello! ¡Hola! Bonjour! Hallo! Ciao!\nDo you speak another language?\nWant to help translate Deluxe text to your native language?\nJoin the MiloHax discord to help join the fight against English oppressors!\nRock Band 3 supported languages: Spanish, French, German, Italian.")
(no_track_theme_found "Track Theme failed to load from disk!")
Expand Down Expand Up @@ -1165,15 +1165,15 @@
(rb4_beta_drums "RB4 Beta Drums")

; Platforms
(platform_dolphin_rb3e "Detected Platform: Dolphin w/ RB3Enhanced")
(platform_ps3 "Detected Platform: PlayStation 3")
(platform_rpcs3 "Detected Platform: RPCS3")
(platform_xbox "Detected Platform: Xbox 360")
(platform_xbox_rb3e "Detected Platform: Xbox 360 w/ RB3Enhanced")
(platform_xenia_rb3e "Detected Platform: Xenia w/ RB3Enhanced")
(platform_wii "Detected Platform: Wii")
(platform_wii_rb3e "Detected Platform: Wii w/ RB3Enhanced")
(platform_unknown "Detected Platform: Unknown")
(platform_dolphin_rb3e "Platform: Dolphin w/ RB3Enhanced")
(platform_ps3 "Platform: PlayStation 3")
(platform_rpcs3 "Platform: RPCS3")
(platform_xbox "Platform: Xbox 360")
(platform_xbox_rb3e "Platform: Xbox 360 w/ RB3Enhanced")
(platform_xenia_rb3e "Platform: Xenia w/ RB3Enhanced")
(platform_wii "Platform: Wii")
(platform_wii_rb3e "Platform: Wii w/ RB3Enhanced")
(platform_unknown "Platform Unknown")
(print_platform "Print Platform")
(unknown "Unknown")

Expand Down Expand Up @@ -1571,9 +1571,9 @@
(leaderboards_not_available_rock_central "You will only be able to see local leaderboards while logged out or offline.")
(linking_code_connect_error "You need to be connected to GoCentral in order to see an account-linking code.")
#ifdef RB3E
(main_menu_welcome "Welcome to Rock Band 3 Deluxe + RB3Enhanced!\n\nTry heading to 'Deluxe Settings' in your player menu, there you'll be able to fully customize the game to your liking.\n\nRB3DX and RB3E are free modifications; if you paid for these mods, you were scammed!")
(dx_main_menu_welcome "Welcome to Rock Band 3 Deluxe + RB3Enhanced!\n\nTry heading to 'Deluxe Settings' in your player menu, there you'll be able to fully customize the game to your liking.\n\nRB3DX and RB3E are free modifications; if you paid for these mods, you were scammed!")
#else
(main_menu_welcome "Welcome to Rock Band 3 Deluxe!\n\nTry heading to 'Deluxe Settings' in your player menu, there you'll be able to fully customize the game to your liking.\n\nRB3DX is a free modification by MiloHax; if you paid for this mod, you were scammed!")
(dx_main_menu_welcome "Welcome to Rock Band 3 Deluxe!\n\nTry heading to 'Deluxe Settings' in your player menu, there you'll be able to fully customize the game to your liking.\n\nRB3DX is a free modification by MiloHax; if you paid for this mod, you were scammed!")
#endif
(male "Masculine")
(matchmaker_choose_gender "Select Body Type")
Expand Down Expand Up @@ -1735,10 +1735,10 @@
(reboot_theme_warning_rb3e "Default theme wont load properly until game reboot if you have already played a song.\nReboot now?")
(reboot_to_apply "Reboot the game to apply changes")
(reboot_warning "Are you sure you want to reboot the game?")
(relative_writes_warn "WARNING\n\nRock Band 3 Deluxe will not be able to properly save your settings because game relative writes are disabled in Xenia.\n\nGo to xenia-canary.config.toml and set allow_game_relative_writes to TRUE.")
(save_warning "Would you like to save these settings for future sessions?")
(screensaver_warning "This will hide everything and display the menu background. All unsaved progress will be lost and you won't be able to interact with the game until you restart. Are you sure?")
(settings_error "There was an error saving your settings, please ensure game relative writes are enabled in Xenia.")
(settings_error "ERROR: Failed to save Deluxe Settings!\nJoin the MiloHax Discord server for assistance.\n\ndiscord.gg/milohax")
(settings_error_short "ERROR: Failed to save Deluxe Settings!")
(settings_warning "A dx.dta file already exists. You must delete this first before saving new settings.")
(swap_gender_warning "This option will allow you to equip cosmetic items not originally supported on the current body type. Requires Reboot. Continue?")
(theme_save_warning "Would you like to save this track theme for future sessions?")
Expand Down
24 changes: 24 additions & 0 deletions _ark/dx/ui/dx_funcs.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,30 @@
{set $speed {/ $speed 20}}
$speed
}
{func
dx_check_settings_written
#ifndef HX_WII
{script_task kTaskSeconds
(delay #ifdef HX_PS3 2 #else 0.5 #endif)
(script
{if_else {file_exists DX_SETTINGS_FILE_PATH}
{set $dx_settings_error FALSE}
{do
{dx_log_writer info {sprint "ERROR: Failed to save Deluxe Settings!"}}
{set $dx_settings_error TRUE}
{if_else $dx_settings_error_modal_seen
{dx_passive_messenger settings_error_short}
{do
{ui push_screen dx_settings_error_screen}
{set $dx_settings_error_modal_seen TRUE}
}
}
}
}
)
}
#endif
}
{func
dx_randomize_backup_band
{if
Expand Down
78 changes: 47 additions & 31 deletions _ark/dx/ui/dx_ui_screens.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
{new
UIPanel
hint_dx_welcome_panel
dx_welcome_panel
(file
"../../ui/hints/hint_rb3_welcome.milo")
(focus
Expand All @@ -21,32 +21,35 @@
add_sink
$this
(primary_profile_changed_msg)}
{customize.btn set text_token dx_letsrock}
{$this disable continue.btn}
{continue.btn set_showing FALSE}
{customize.btn set text_token dx_continue})
{description.lbl set text_token dx_main_menu_welcome})
(exit
{profile_mgr remove_sink $this primary_profile_changed_msg})
(primary_profile_changed_msg
{ui pop_screen})
{dx_settings_dta_writer}
{dx_modifier_dta_writer}
{dx_values_dta_writer}
{ui pop_screen}
{dx_check_settings_written}
)
(SELECT_MSG
{switch
$component
(customize.btn
{do {dx_settings_dta_writer} {dx_modifier_dta_writer} {dx_values_dta_writer}}
{set $dxwelcomeseen TRUE}
{ui pop_screen})
(continue.btn
{do {dx_settings_dta_writer} {dx_modifier_dta_writer} {dx_values_dta_writer}}
{set $dxwelcomeseen TRUE}
{ui pop_screen})})}
{dx_settings_dta_writer}
{dx_modifier_dta_writer}
{dx_values_dta_writer}
{ui pop_screen}
{dx_check_settings_written}
)
}
{new
BandScreen
hint_dx_welcome_screen
(panels hint_dx_welcome_panel)
(focus hint_dx_welcome_panel)}
dx_welcome_screen
(panels dx_welcome_panel)
(focus dx_welcome_panel)}
{new
UIPanel
hint_relative_writes_panel
dx_settings_error_panel
(file
"../../ui/hints/hint_rb3_welcome.milo")
(focus
Expand All @@ -56,28 +59,41 @@
add_sink
$this
(primary_profile_changed_msg)}
{$this disable continue.btn}
{continue.btn set_showing FALSE}
{customize.btn set text_token dx_iunderstand}
{description.lbl set text_token relative_writes_warn})
{$this disable continue.btn}
{switch $dx_detected_platform
(platform_rpcs3
{continue.btn set text_token platform_rpcs3})
(platform_ps3
{continue.btn set text_token platform_ps3})
(platform_xbox
{continue.btn set text_token platform_xbox})
(platform_xbox_rb3e
{continue.btn set text_token platform_xbox_rb3e})
(platform_xenia_rb3e
{continue.btn set text_token platform_xenia_rb3e})
(platform_wii
{continue.btn set text_token platform_wii})
(platform_wii_rb3e
{continue.btn set text_token platform_wii_rb3e})
(platform_dolphin_rb3e
{continue.btn set text_token platform_dolphin_rb3e})
(platform_unknown
{continue.btn set text_token platform_unknown})
}
{description.lbl set text_token settings_error})
(exit
{profile_mgr remove_sink $this primary_profile_changed_msg})
(primary_profile_changed_msg
{ui pop_screen})
(SELECT_MSG
{switch
$component
(customize.btn
{set $dx_settings_error TRUE}
{ui pop_screen})
(continue.btn
{set $dx_settings_error TRUE}
{ui pop_screen})})}
{ui pop_screen})
}
{new
BandScreen
hint_relative_writes_screen
(panels hint_relative_writes_panel)
(focus hint_relative_writes_panel)}
dx_settings_error_screen
(panels dx_settings_error_panel)
(focus dx_settings_error_panel)}
;oops all demo
{new
UIPanel
Expand Down
33 changes: 12 additions & 21 deletions _ark/dx/ui/main/dx_main_handles.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,28 +235,19 @@
)
}
)
(dx_check_dx
{unless $dx_event_mode
{unless {file_exists DX_SETTINGS_FILE_PATH}
{unless $dxwelcomeseen
{profile_mgr set_voice_chat_volume 0}
{dx_log_writer info {sprint "Cannot find DX.dta"}}
{ui push_screen hint_dx_welcome_screen}
}
}
}
)
(dx_check_xeniawrites
{unless $dx_event_mode
{unless {file_exists DX_SETTINGS_FILE_PATH}
{if $dxwelcomeseen
{unless $dx_settings_error
{dx_log_writer info {sprint "Cannot write DX.dta"}}
{ui push_screen hint_relative_writes_screen}
}
}
}
(dx_check_first_time
#ifndef HX_WII
{if
{&&
{! $dx_event_mode}
{! {file_exists DX_SETTINGS_FILE_PATH}}
{! $dx_welcome_seen}}
{profile_mgr set_voice_chat_volume 0}
{dx_log_writer info {sprint "Delxue Settings not found, showing welcome screen"}}
{ui push_screen dx_welcome_screen}
{set $dx_welcome_seen TRUE}
}
#endif
)
(dx_check_birthday
{unless $dx_event_mode
Expand Down
6 changes: 3 additions & 3 deletions _ark/ui/locale/esl/locale_updates_keep.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
(songs_updates_generated "Generar mejoras para YARG")

; Deluxe notifications
(dx_continue "¡A Rockear!")
(dx_letsrock "¡A Rockear!")
(dx_iunderstand "Entiendo")
(no_track_theme_found "La Apariencia de Pista no se ha cargado correctamente")
(os_iunderstand "Entiendo")
Expand Down Expand Up @@ -1398,9 +1398,9 @@
(leaderboards_solo_vocals "<alt>V</alt> Vocales")
(linking_code_connect_error "Debes estar conectado a los servidores del juego para poder ver el código de vinculación de cuenta.")
#ifdef RB3E
(main_menu_welcome "¡Bienvenido a Rock Band 3 Deluxe + RB3Enhanced!\n\nPrueba dirigirte a 'Configuración Deluxe' en tu menú de jugador, allí podrás personalizar completamente el juego a tu gusto.\n\nRB3DX y RB3E son modificaciones gratuitas; si pagaste por estas modificaciones, fuiste estafado/a!")
(dx_main_menu_welcome "¡Bienvenido a Rock Band 3 Deluxe + RB3Enhanced!\n\nPrueba dirigirte a 'Configuración Deluxe' en tu menú de jugador, allí podrás personalizar completamente el juego a tu gusto.\n\nRB3DX y RB3E son modificaciones gratuitas; si pagaste por estas modificaciones, fuiste estafado/a!")
#else
(main_menu_welcome "¡Bienvenido a Rock Band 3 Deluxe!\n\nPrueba dirigirte a 'Configuración Deluxe' en tu menú de jugador, allí podrás personalizar completamente el juego a tu gusto.\n\nRB3DX es una modificación gratuita creada por MiloHax; si pagaste por esta modificación, fuiste estafado/a!")
(dx_main_menu_welcome "¡Bienvenido a Rock Band 3 Deluxe!\n\nPrueba dirigirte a 'Configuración Deluxe' en tu menú de jugador, allí podrás personalizar completamente el juego a tu gusto.\n\nRB3DX es una modificación gratuita creada por MiloHax; si pagaste por esta modificación, fuiste estafado/a!")
#endif
(main_hub_drum_freestyle "Improvisación de Batería")
(male "Masculino")
Expand Down
6 changes: 3 additions & 3 deletions _ark/ui/locale/ptb/dx_locale_updates.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@

; Deluxe notifications
(audition_no_rock_central "O Modo Audition requer uma coneção com os servidores do jogo, mas os servidores não estão disponíveis no momento. Por favor, tente novamente mais tarde.")
(dx_continue "Let's Rock!")
(dx_letsrock "Let's Rock!")
(dx_iunderstand "Eu Entendo")
(localize_it "Olá! Hello! ¡Hola! Bonjour! Hallo! Ciao!\nVocê sabe falar em outro idioma?\nVocê gostaria de traduzir o RB3 Deluxe para seu idioma nativo?\nJunte-se ao Discord do grupo MiloHax para ajudar na luta contra a opressão linguística inglesa!")
(no_track_theme_found "Ocorreu um erro ao tentar carregar o Tema das Pistas do disco!")
Expand Down Expand Up @@ -1543,9 +1543,9 @@
(leaderboards_not_available_rock_central "Você só poderá ver os rankings locais enquanto desconectado ou offline.")
(linking_code_connect_error "Você deve estar conectado aos servidores para ver o código de conexão de conta.")
#ifdef RB3E
(main_menu_welcome "Bem-vindo ao Rock Band 3 Deluxe + RB3Enhanced!\n\nDê uma olhada nas 'Opções Deluxe' no seu menu, lá você poderá personalizar cada aspecto do jogo ao seu gosto!\n\nRock Band 3 Deluxe e RB3Enhanced são MODs gratuítos, se você pagou por estes MODs, você foi vítima de um golpe!")
(dx_main_menu_welcome "Bem-vindo ao Rock Band 3 Deluxe + RB3Enhanced!\n\nDê uma olhada nas 'Opções Deluxe' no seu menu, lá você poderá personalizar cada aspecto do jogo ao seu gosto!\n\nRock Band 3 Deluxe e RB3Enhanced são MODs gratuítos, se você pagou por estes MODs, você foi vítima de um golpe!")
#else
(main_menu_welcome "Bem-vindo ao Rock Band 3 Deluxe!\n\nDê uma olhada nas 'Opções Deluxe' no seu menu, lá você poderá personalizar cada aspecto do jogo ao seu gosto!\n\nRock Band 3 Deluxe é um MOD desenvolvido pelo grupo MiloHax, se você pagou por estes MODs, você foi vítima de um golpe!")
(dx_main_menu_welcome "Bem-vindo ao Rock Band 3 Deluxe!\n\nDê uma olhada nas 'Opções Deluxe' no seu menu, lá você poderá personalizar cada aspecto do jogo ao seu gosto!\n\nRock Band 3 Deluxe é um MOD desenvolvido pelo grupo MiloHax, se você pagou por estes MODs, você foi vítima de um golpe!")
#endif
(male "Masculino")
(matchmaker_choose_gender "Selecione o Tipo do Corpo")
Expand Down
25 changes: 5 additions & 20 deletions _ark/ui/main/main_hub.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,7 @@
{$this cycle_next_message})
({== $action kAction_ViewModify}
{profile_mgr set_primary_profile_by_user $user}
#ifndef HX_WII
{$this dx_check_dx}
{$this dx_check_xeniawrites}
#endif)
{$this dx_check_first_time})
#ifndef HX_WII
({|| {== $action kAction_PageUp} {== $action kAction_PageDown}}
{if {! {ui in_transition}}
Expand Down Expand Up @@ -854,10 +851,7 @@
add_award
award_gamestop
campaign_award_reason_preorder}
#ifndef HX_WII
{$this dx_check_dx}
{$this dx_check_xeniawrites}
#endif}}})
{$this dx_check_first_time}}}})
(unlock_x79_award
($pad_num)
{if
Expand All @@ -874,10 +868,7 @@
add_award
award_bonus_x79
campaign_award_reason_preorder}
#ifndef HX_WII
{$this dx_check_dx}
{$this dx_check_xeniawrites}
#endif}}})
{$this dx_check_first_time}}}})
(unlock_d2010_award
($pad_num)
{if
Expand All @@ -894,10 +885,7 @@
add_award
award_bonus_d2010
campaign_award_reason_preorder}
#ifndef HX_WII
{$this dx_check_dx}
{$this dx_check_xeniawrites}
#endif}}})
{$this dx_check_first_time}}}})
(check_rewards_and_hints
{if
{session_mgr is_local}
Expand All @@ -910,10 +898,7 @@
{ui goto_screen meta_loading_main_screen}
{show_hint hint_rb3_welcome_screen}}})
(TRANSITION_COMPLETE_MSG
#ifndef HX_WII
{$this dx_check_dx}
{$this dx_check_xeniawrites}
#endif
{$this dx_check_first_time}
DX_AUTOSAVE)
(update_finding_help
{finding_continue.ihp
Expand Down

0 comments on commit 8227527

Please sign in to comment.