From 2849e7e2659e4fa3949417e24b48b841b558efd4 Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Mon, 10 Jul 2023 19:12:53 +0200 Subject: [PATCH] (Windows) Added support for the Future Pinball (fpinball) game system --- es-app/assets/Windows_Portable_README.txt | 1 + es-app/src/PlatformId.cpp | 1 + es-app/src/PlatformId.h | 1 + es-app/src/scrapers/ScreenScraper.cpp | 1 + resources/sorting/hwtype_year/es_systems_sorting.xml | 4 ++++ .../manufacturer_hwtype_year/es_systems_sorting.xml | 4 ++++ .../sorting/manufacturer_year/es_systems_sorting.xml | 4 ++++ resources/sorting/year/es_systems_sorting.xml | 4 ++++ resources/systems/macos/es_systems.xml | 9 +++++++++ resources/systems/unix/es_systems.xml | 9 +++++++++ resources/systems/windows/es_find_rules.xml | 10 ++++++++++ resources/systems/windows/es_find_rules_portable.xml | 7 +++++++ resources/systems/windows/es_systems.xml | 9 +++++++++ 13 files changed, 64 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 10a1d3606..e7a9db243 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -51,6 +51,7 @@ Emulators\fbneo\fbneo64.exe Emulators\fbneo\fbneo.exe Emulators\flycast\flycast.exe Emulators\Fuse\fuse.exe +Emulators\Future Pinball\Future Pinball.exe Emulators\gargoyle\gargoyle.exe Emulators\Gearboy\Gearboy.exe Emulators\gopher2600\gopher2600_windows_amd64.exe diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 9dc6df86b..94ef59173 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -57,6 +57,7 @@ namespace PlatformIds "fds", // Nintendo Famicom Disk System "flash", // Adobe Flash "fmtowns", // Fujitsu FM Towns + "fpinball", // Future Pinball "gameandwatch", // Nintendo Game and Watch "gamecom", // Tiger Electronics Game.com "gamegear", // Sega Game Gear diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 506ef20ef..85c87f4cd 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -56,6 +56,7 @@ namespace PlatformIds NINTENDO_FAMICOM_DISK_SYSTEM, ADOBE_FLASH, FUJITSU_FM_TOWNS, + FUTURE_PINBALL, NINTENDO_GAME_AND_WATCH, TIGER_GAME_COM, SEGA_GAME_GEAR, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index d140edc13..5ace1a4e3 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -152,6 +152,7 @@ namespace {SEGA_NAOMI, 56}, {THOMSON_MOTO, 141}, {UZEBOX, 216}, + {FUTURE_PINBALL, 199}, {WATARA_SUPERVISION, 207}, {SPECTRAVIDEO, 218}, {PALM_OS, 219}}; diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml index 361f5fae1..1d65d4094 100644 --- a/resources/sorting/hwtype_year/es_systems_sorting.xml +++ b/resources/sorting/hwtype_year/es_systems_sorting.xml @@ -213,6 +213,10 @@ <name>fmtowns</name> <systemsortname>Console - 1993</systemsortname> </system> + <system> + <name>fpinball</name> + <systemsortname>Engine - 2005</systemsortname> + </system> <system> <name>gameandwatch</name> <systemsortname>Portable - 1980</systemsortname> diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml index 70cd6611c..3f4b5d6a1 100644 --- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml +++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml @@ -213,6 +213,10 @@ <name>fmtowns</name> <systemsortname>Fujitsu - Console - 1993</systemsortname> </system> + <system> + <name>fpinball</name> + <systemsortname>Christopher Leathley - Engine - 2005</systemsortname> + </system> <system> <name>gameandwatch</name> <systemsortname>Nintendo - Portable - 1980</systemsortname> diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml index 4b4470d2d..82d724dfc 100644 --- a/resources/sorting/manufacturer_year/es_systems_sorting.xml +++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml @@ -213,6 +213,10 @@ <name>fmtowns</name> <systemsortname>Fujitsu - 1993</systemsortname> </system> + <system> + <name>fpinball</name> + <systemsortname>Christopher Leathley - 2005</systemsortname> + </system> <system> <name>gameandwatch</name> <systemsortname>Nintendo - 1980</systemsortname> diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml index 1c85486d8..c426f5bd1 100644 --- a/resources/sorting/year/es_systems_sorting.xml +++ b/resources/sorting/year/es_systems_sorting.xml @@ -213,6 +213,10 @@ <name>fmtowns</name> <systemsortname>1993</systemsortname> </system> + <system> + <name>fpinball</name> + <systemsortname>2005</systemsortname> + </system> <system> <name>gameandwatch</name> <systemsortname>1980</systemsortname> diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index c23ec00a1..6869a0226 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -577,6 +577,15 @@ <platform>fmtowns</platform> <theme>fmtowns</theme> </system> + <system> + <name>fpinball</name> + <fullname>Future Pinball</fullname> + <path>%ROMPATH%/fpinball</path> + <extension>.fpt .FPT</extension> + <command label="Future Pinball (Standalone)">PLACEHOLDER %ROM%</command> + <platform>fpinball</platform> + <theme>fpinball</theme> + </system> <system> <name>gameandwatch</name> <fullname>Nintendo Game and Watch</fullname> diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 7b7c006c2..cef682a64 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -594,6 +594,15 @@ <platform>fmtowns</platform> <theme>fmtowns</theme> </system> + <system> + <name>fpinball</name> + <fullname>Future Pinball</fullname> + <path>%ROMPATH%/fpinball</path> + <extension>.fpt .FPT</extension> + <command label="Future Pinball (Standalone)">PLACEHOLDER %ROM%</command> + <platform>fpinball</platform> + <theme>fpinball</theme> + </system> <system> <name>gameandwatch</name> <fullname>Nintendo Game and Watch</fullname> diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 775fa1d99..16ae9fc03 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -268,6 +268,16 @@ <entry>%ESPATH%\..\Emulators\Fuse\fuse.exe</entry> </rule> </emulator> + <emulator name="FUTURE-PINBALL"> + <!-- Pinball simulator Future Pinball --> + <rule type="systempath"> + <entry>Future Pinball.exe</entry> + </rule> + <rule type="staticpath"> + <entry>%ESPATH%\Emulators\Future Pinball\Future Pinball.exe</entry> + <entry>%ESPATH%\..\Emulators\Future Pinball\Future Pinball.exe</entry> + </rule> + </emulator> <emulator name="GARGOYLE"> <!-- Interactive fiction player Gargoyle --> <rule type="systempath"> diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index bd7690e77..7b6aeffe0 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -174,6 +174,13 @@ <entry>%ESPATH%\..\Emulators\Fuse\fuse.exe</entry> </rule> </emulator> + <emulator name="FUTURE-PINBALL"> + <!-- Pinball simulator Future Pinball --> + <rule type="staticpath"> + <entry>%ESPATH%\Emulators\Future Pinball\Future Pinball.exe</entry> + <entry>%ESPATH%\..\Emulators\Future Pinball\Future Pinball.exe</entry> + </rule> + </emulator> <emulator name="GARGOYLE"> <!-- Interactive fiction player Gargoyle --> <rule type="staticpath"> diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 1ee98fb5a..0f38ab356 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -595,6 +595,15 @@ <platform>fmtowns</platform> <theme>fmtowns</theme> </system> + <system> + <name>fpinball</name> + <fullname>Future Pinball</fullname> + <path>%ROMPATH%\fpinball</path> + <extension>.fpt .FPT</extension> + <command label="Future Pinball (Standalone)">%EMULATOR_FUTURE-PINBALL% /Exit /Play /Open %ROM%</command> + <platform>fpinball</platform> + <theme>fpinball</theme> + </system> <system> <name>gameandwatch</name> <fullname>Nintendo Game and Watch</fullname>