Compare commits

...

8 commits

Author SHA1 Message Date
Cohee 3929965b18
Merge bc9272345c into e78c75a241 2024-12-04 08:47:58 -05:00
laz e78c75a241 lunarfixes
Some checks are pending
Build RetroDECK / Build_RetroDECK (push) Waiting to run
Build RetroDECK / GitHub-publish (push) Blocked by required conditions
2024-12-04 11:19:55 +01:00
Cohee bc9272345c Fix a comment in global.sh too
cause why not?
2024-12-02 20:14:57 +02:00
Cohee 23b2cf9ada Fix path to default PPSSPP configs in preset 2024-12-02 20:13:29 +02:00
Cohee f3a2d29204 Implement disabled state for rewrite case 2024-12-02 20:02:14 +02:00
Cohee d9f5a03d4a Fix cheevos logout 2024-12-02 20:00:54 +02:00
Cohee 885f3efd89 Fix target file rewrite 2024-12-02 19:03:22 +02:00
Cohee 699de9d7ed PPSSPP: Add RetroAchievements support
Rebased onto cooker
2024-12-02 12:01:30 +00:00
11 changed files with 56 additions and 12 deletions

View file

@ -1,5 +1,6 @@
config_file_format^ppsspp
change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$config/ppssppdl/ppsspp.ini
change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$config/ppssppdl/ppsspp.ini
change^cheevos^AchievementsUserName^Achievements^$cheevos_username^$ppssppconf^$config/ppssppdl/ppsspp.ini
change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$config/ppssppdl/ppsspp.ini
change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$config/ppssppsdl/ppsspp.ini
change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini
change^cheevos^AchievementsUserName^$cheevos_username^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini
rewrite^cheevos^^$cheevos_token^^$ppssppcheevosconf^$config/ppssppsdl/ppsspp_retroachievements.dat
change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini

View file

@ -730,8 +730,14 @@
"path": "dc"
},
"f355bios.zip": {
"md5": "882f2c1cf8ec030955c48fe6aa6929ea",
"system": "dreamcast",
"md5": [
"547f3d12aed389058ca06148f1cca0ed",
"882f2c1cf8ec030955c48fe6aa6929ea",
],
"system": [
"dreamcast",
"arcade",
],
"description": "Naomi Ferrari F355 Challenge Twin/Deluxe BIOS",
"path": "dc"
},

View file

@ -69,7 +69,7 @@
"filename": "placeholder.svg"
},
"chinese_new_year": {
"start_date": "0209",
"start_date": "0128",
"end_date": "0212",
"start_time": "0000",
"end_time": "2359",
@ -82,7 +82,7 @@
"end_time": "2359",
"filename": "rd-valentines-splash.svg"
},
"retrodeck_birthday": {
"retrodeck_birthday_gmday": {
"start_date": "0304",
"end_date": "0304",
"start_time": "0000",
@ -110,6 +110,13 @@
"end_time": "2359",
"filename": "rd-kodomo-golden.svg"
},
"midsommarafton": {
"start_date": "0620",
"end_date": "0621",
"start_time": "0000",
"end_time": "2359",
"filename": "placeholder.svg"
},
"tanabata": {
"start_date": "0707",
"end_date": "0707",

View file

@ -42,11 +42,13 @@ portmaster_reload_esde=true
duckstation=false
pcsx2=false
retroarch=false
ppsspp=false
[cheevos_hardcore]
duckstation=false
pcsx2=false
retroarch=false
ppsspp=false
[rewind]
gb=false

View file

@ -110,10 +110,11 @@ pcsx2gsconf="/var/config/PCSX2/inis/GS.ini" # This file should be deprecated sin
pcsx2uiconf="/var/config/PCSX2/inis/PCSX2_ui.ini" # This file should be deprecated since moving to PCSX2-QT
pcsx2vmconf="/var/config/PCSX2/inis/PCSX2_vm.ini" # This file should be deprecated since moving to PCSX2-QT
# PPSSPPDL config files
# PPSSPP-SDL config files
ppssppconf="/var/config/ppsspp/PSP/SYSTEM/ppsspp.ini"
ppssppcontrolsconf="/var/config/ppsspp/PSP/SYSTEM/controls.ini"
ppssppcheevosconf="/var/config/ppsspp/PSP/SYSTEM/ppsspp_retroachievements.dat"
# Primehack config files

View file

@ -523,6 +523,10 @@ prepare_component() {
dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA"
dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE"
dir_prep "$texture_packs_folder/PPSSPP" "/var/config/ppsspp/PSP/TEXTURES"
# Reset default preset settings
set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos")" "retrodeck" "cheevos"
set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore"
fi
if [[ "$action" == "postmove" ]]; then # Run only post-move commands
set_setting_value "$ppssppconf" "CurrentDirectory" "$roms_folder/psp" "ppsspp" "General"

View file

@ -210,6 +210,27 @@ build_preset_config() {
fi
;;
"rewrite" )
if [[ "$read_preset" == "$current_preset" ]]; then
if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
eval target_file=$target_file
fi
local read_target_file="$target_file"
if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
eval defaults_file=$defaults_file
fi
local read_defaults_file="$defaults_file"
if [[ "$read_system_enabled" == "true" ]]; then
if [[ "$new_setting_value" = \$* ]]; then
eval new_setting_value=$new_setting_value
fi
echo -n "$new_setting_value" > "$read_target_file"
else
cat "$read_defaults_file" > "$read_target_file"
fi
fi
;;
"enable" )
if [[ "$read_preset" == "$current_preset" ]]; then
if [[ "$read_system_enabled" == "true" ]]; then

View file

@ -255,7 +255,7 @@ configurator_global_presets_and_settings_dialog() {
local cheevos_emulators=$(sed -n '/\[cheevos\]/, /\[/{ /\[cheevos\]/! { /\[/! p } }' $rd_conf | sed '/^$/d')
for setting_line in $cheevos_emulators; do
emulator=$(get_setting_name "$setting_line" "retrodeck")
set_setting_value "$rdconf" "$emulator" "false" "retrodeck" "cheevos"
set_setting_value "$rd_conf" "$emulator" "false" "retrodeck" "cheevos"
build_preset_config "$emulator" "cheevos"
done
configurator_generic_dialog "RetroDECK Configurator Utility - RetroAchievements" "RetroAchievements has been disabled in all supported systems."

View file

@ -28,12 +28,14 @@
"cheevos": {
"duckstation": false,
"pcsx2": false,
"retroarch": false
"retroarch": false,
"ppsspp": false
},
"cheevos_hardcore": {
"duckstation": false,
"pcsx2": false,
"retroarch": false
"retroarch": false,
"ppsspp": false
},
"options": {
"akai_ponzu": false,