From fd777365cd3376e32e069e701fa75fc87fdffd16 Mon Sep 17 00:00:00 2001 From: Steam Deck User Date: Wed, 22 Jun 2022 22:55:01 +0200 Subject: [PATCH] ES-DE: updated to 1.2.5 --- es-configs/es_find_rules.xml | 80 +++++++++++++++++++++--------------- es-configs/es_systems.xml | 71 ++++++++++++++++++++++++-------- net.retrodeck.retrodeck.yml | 2 +- retrodeck.sh | 4 +- 4 files changed, 103 insertions(+), 54 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 35dd2b74..76a3e9f4 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -24,6 +24,8 @@ + + /app/share/libretro/cores ~/snap/retroarch/current/.config/retroarch/cores @@ -40,8 +42,6 @@ /usr/local/lib/libretro /usr/pkg/lib/libretro - - /app/share/libretro/cores @@ -78,7 +78,6 @@ citra citra-emu.citra-nightly org.citra_emu.citra - citra-qt /var/lib/flatpak/exports/bin/org.citra_emu.citra @@ -105,9 +104,9 @@ /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/Applications/Dolphin_Emulator.AppImage - ~/.local/bin/Dolphin_Emulator.AppImage - ~/bin/Dolphin_Emulator.AppImage + ~/Applications/Dolphin_Emulator*.AppImage + ~/.local/bin/Dolphin_Emulator*.AppImage + ~/bin/Dolphin_Emulator*.AppImage @@ -211,9 +210,9 @@ /var/lib/flatpak/exports/bin/io.mgba.mGBA ~/.local/share/flatpak/exports/bin/io.mgba.mGBA - ~/Applications/mGBA.AppImage - ~/.local/bin/mGBA.AppImage - ~/bin/mGBA.AppImage + ~/Applications/mGBA*.AppImage + ~/.local/bin/mGBA*.AppImage + ~/bin/mGBA*.AppImage @@ -237,6 +236,17 @@ ~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia + + + + Oricutron + + + ~/Applications/oricutron/Oricutron + ~/.local/bin/oricutron/Oricutron + ~/bin/oricutron/Oricutron + + @@ -249,14 +259,26 @@ ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 + + + + pico8 + + + ~/retrodeck/bios/pico-8/pico8 + ~/Applications/pico-8/pico8 + ~/.local/bin/pico-8/pico8 + ~/bin/pico-8/pico8 + + /var/lib/flatpak/exports/bin/org.purei.Play ~/.local/share/flatpak/exports/bin/org.purei.Play - ~/Applications/Play!.AppImage - ~/.local/bin/Play!.AppImage - ~/bin/Play!.AppImage + ~/Applications/Play!*.AppImage + ~/.local/bin/Play!*.AppImage + ~/bin/Play!*.AppImage @@ -287,9 +309,9 @@ redream - ~/Applications/redream - ~/.local/bin/redream - ~/bin/redream + ~/Applications/redream/redream + ~/.local/bin/redream/redream + ~/bin/redream/redream @@ -298,14 +320,13 @@ rpcs3 rpcs3-emu.rpcs3 net.rpcs3.RPCS3 - rpcs3.AppImage /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/Applications/rpcs3.AppImage - ~/.local/bin/rpcs3.AppImage - ~/bin/rpcs3.AppImage + ~/Applications/rpcs3*.AppImage + ~/.local/bin/rpcs3*.AppImage + ~/bin/rpcs3*.AppImage @@ -347,9 +368,9 @@ /var/lib/flatpak/exports/bin/app.xemu.xemu ~/.local/share/flatpak/exports/bin/app.xemu.xemu - ~/Applications/Xemu.AppImage - ~/.local/bin/Xemu.AppImage - ~/bin/Xemu.AppImage + ~/Applications/Xemu*.AppImage + ~/.local/bin/Xemu*.AppImage + ~/bin/Xemu*.AppImage @@ -357,22 +378,13 @@ yuzu org.yuzu_emu.yuzu - yuzu.AppImage /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu - ~/Applications/yuzu.AppImage - ~/.local/bin/yuzu.AppImage - ~/bin/yuzu.AppImage - - - - - pico8 - - - ~/retrodeck/bios/pico-8/pico8 + ~/Applications/yuzu*.AppImage + ~/.local/bin/yuzu*.AppImage + ~/bin/yuzu*.AppImage \ No newline at end of file diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index ad482ba4..95fc9e0b 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -318,6 +318,24 @@ colecovision colecovision + + cps + Capcom Play System + %ROMPATH%/cps + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/arcade %BASENAME% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM% + arcade + cps + daphne Daphne Arcade LaserDisc Emulator @@ -640,6 +658,24 @@ mess mess + + model2 + Sega Model 2 + %ROMPATH%/model2 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + arcade + model2 + + + model3 + Sega Model 3 + %ROMPATH%/model3 + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + arcade + model3 + moonlight Moonlight Game Streaming @@ -843,8 +879,8 @@ oric Tangerine Computer Systems Oric %ROMPATH%/oric - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .dsk .DSK .ort .ORT .tap .TAP .wav .WAV + %EMULATOR_ORICUTRON% %STARTDIR%=%EMUDIR% %ROM% oric oric @@ -905,6 +941,18 @@ pcfx pcfx + + pico8 + PICO-8 Fantasy Console + Lexaloffle + 2015 + console + %ROMPATH%/pico8 + .p8 .P8 .png .PNG + %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico8 -run %ROM% + pico8 + pico8 + pokemini Nintendo Pokémon Mini @@ -939,7 +987,8 @@ Sony PlayStation 3 %ROMPATH%/ps3 .ps3 .PS3 .ps3dir .PS3DIR - %EMULATOR_RPCS3% --no-gui %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_RPCS3% --no-gui %ROM% ps3 ps3 @@ -1247,8 +1296,8 @@ ti99 Texas Instruments TI-99 %ROMPATH%/ti99 - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .rpk .RPK .7z .7Z .zip .ZIP + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/ti99 ti99_4a -ioport peb -ioport:peb:slot3 speech -cart %BASENAME% ti99 ti99 @@ -1434,16 +1483,4 @@ tools tools - - pico-8 - Pico-8 - Lexaloffle - 2015 - console - %ROMPATH%/pico-8 - .p8 .png - %EMULATOR_PICO-8% -desktop ~/retrodeck/screenshots -windowed 0 -root_path %ROMPATH%/pico-8 -run %ROM% - pico-8 - pico-8 - \ No newline at end of file diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index bd7be3a1..a4b695f7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -200,7 +200,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 5a76fef25ffc659f098ee65215281c51a63c3198 + branch: 8b0a5c63367e46b95f124f5aba70abcaa3ff888a - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp diff --git a/retrodeck.sh b/retrodeck.sh index 6713191e..c2e30371 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -246,7 +246,7 @@ finit() { mkdir -pv $rdhome/saves mkdir -pv $rdhome/states mkdir -pv $rdhome/screenshots - mkdir -pv $rdhome/bios/pico-8 + mkdir -pv $rdhome/bios/pico8 mkdir -pv $rdhome/.logs # XMLSTARLET HERE @@ -257,7 +257,7 @@ finit() { dir_prep "$rdhome/.themes" "/var/config/emulationstation/.emulationstation/themes" # PICO-8 - dir_prep "$roms_folder/pico-8" "$rdhome/bios/pico-8/bbs/carts" #this is the folder where pico-8 is saving the carts + dir_prep "$roms_folder/pico8" "$rdhome/bios/pico8/bbs/carts" #this is the folder where pico-8 is saving the carts ra_init standalones_init