From 99f1406ac22ef8517fa9a4527f99537bdcc13689 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 15 May 2023 11:56:01 -0400 Subject: [PATCH] Add logs folder to RA config setup Add RetroAchievements logout Configurator option Disabled AI Service in RetroArch by default --- emu-configs/retroarch/retroarch.cfg | 2 +- functions/prepare_emulator.sh | 2 ++ functions/presets.sh | 3 +-- tools/configurator.sh | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg index 12b35c49..a94d4984 100644 --- a/emu-configs/retroarch/retroarch.cfg +++ b/emu-configs/retroarch/retroarch.cfg @@ -1,6 +1,6 @@ accessibility_enable = "false" accessibility_narrator_speech_speed = "5" -ai_service_enable = "true" +ai_service_enable = "false" ai_service_mode = "1" ai_service_pause = "false" ai_service_source_lang = "0" diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index 0a8120a9..480f4be2 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -83,6 +83,7 @@ prepare_emulator() { set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch" set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch" set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" + set_setting_value "$raconf" "log_dir" "$logs_folder" "retroarch" fi # PPSSPP @@ -126,6 +127,7 @@ prepare_emulator() { set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch" set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch" set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" + set_setting_value "$raconf" "log_dir" "$logs_folder" "retroarch" fi fi diff --git a/functions/presets.sh b/functions/presets.sh index 9fe0d067..5626137c 100644 --- a/functions/presets.sh +++ b/functions/presets.sh @@ -101,9 +101,8 @@ build_preset_config(){ local system_being_changed="$1" shift local presets_being_changed="$*" - for preset in $presets_being_changed + for current_preset in $presets_being_changed do - current_preset="$preset" local preset_section=$(sed -n '/\['"$current_preset"'\]/, /\[/{ /\['"$current_preset"'\]/! { /\[/! p } }' $rd_conf | sed '/^$/d') while IFS= read -r system_line do diff --git a/tools/configurator.sh b/tools/configurator.sh index fe1c1149..9c2f3115 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -183,6 +183,7 @@ configurator_global_presets_and_settings_dialog() { "Enable/Disable Borders" "Enable or disable borders in supported systems" \ "Enable/Disable Widescreen" "Enable or disable widescreen in supported systems" \ "RetroAchievements Login" "Log into the RetroAchievements service in supported systems" \ + "RetroAchievements Logout" "Disable RetroAchievements service in supported systems" \ "RetroAchievements Hardcore Mode" "Enable RetroAchievements hardcore mode (no cheats, rewind, save states etc.) in supported emulators" \ "Nintendo Button Layout" "Enable or disable Nintendo button layout (swapped A/B and X/Y) in supported systems" ) @@ -210,6 +211,11 @@ configurator_global_presets_and_settings_dialog() { configurator_global_presets_and_settings_dialog ;; + "RetroAchievements Logout" ) # This is a workaround to allow disabling cheevos without having to enter login credentials + change_preset_dialog "cheevos" + configurator_global_presets_and_settings_dialog + ;; + "RetroAchievements Hardcore Mode" ) change_preset_dialog "cheevos_hardcore" configurator_global_presets_and_settings_dialog