From 996af43299442fc2d576b6884d1cd56ec36ec6d7 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 5 Aug 2020 10:45:27 +0200 Subject: [PATCH] Added some missing game platforms. Also updated scrapers with some additional missing systems. --- es-app/src/PlatformId.cpp | 15 ++++++++++++- es-app/src/PlatformId.h | 15 ++++++++++++- es-app/src/scrapers/GamesDBJSONScraper.cpp | 13 +++++++++-- es-app/src/scrapers/ScreenScraper.cpp | 26 ++++++++++++++++++++-- 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index cd99a017c..d178724f0 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -15,8 +15,11 @@ namespace PlatformIds "3do", "amiga", + "amigacd32", "amstradcpc", + "gx4000", "apple2", + "apple2gs", "arcade", "atari800", "atari2600", @@ -27,14 +30,17 @@ namespace PlatformIds "atarijaguar", "atarijaguarcd", "atarixe", + "atomiswave", "colecovision", "c64", // Commodore 64 + "cdtv", "intellivision", "macintosh", "xbox", "xbox360", "msx", "neogeo", + "neogeocd", "ngp", // Neo Geo Pocket "ngpc", // Neo Geo Pocket Color "n3ds", // Nintendo 3DS @@ -51,6 +57,9 @@ namespace PlatformIds "wiiu", "virtualboy", "gameandwatch", + "pokemini", + "satellaview", + "sufami", "openbor", "dos", "pc", @@ -88,7 +97,6 @@ namespace PlatformIds "bbcmicro", "cavestory", "daphne", - "doom", "dragon32", "famicom", "love", @@ -104,6 +112,11 @@ namespace PlatformIds "videopac", "zmachine", "ti99", + "naomi", + "thomson", + "uzebox", + "spectravideo", + "palm", "ignore", // Do not allow scraping for this system. "invalid" diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index ba8444103..b8d9d35fe 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -15,8 +15,11 @@ namespace PlatformIds THREEDO, // Name can't start with a constant. AMIGA, + AMIGACD32, AMSTRAD_CPC, + AMSTRAD_GX4000, APPLE_II, + APPLE_IIGS, ARCADE, ATARI_800, ATARI_2600, @@ -27,14 +30,17 @@ namespace PlatformIds ATARI_JAGUAR, ATARI_JAGUAR_CD, ATARI_XE, + ATOMISWAVE, COLECOVISION, COMMODORE_64, + COMMODORE_CDTV, INTELLIVISION, MAC_OS, XBOX, XBOX_360, MSX, NEOGEO, + NEOGEO_CD, NEOGEO_POCKET, NEOGEO_POCKET_COLOR, NINTENDO_3DS, @@ -51,6 +57,9 @@ namespace PlatformIds NINTENDO_WII_U, NINTENDO_VIRTUAL_BOY, NINTENDO_GAME_AND_WATCH, + NINTENDO_POKEMON_MINI, + NINTENDO_SATELLAVIEW, + SUFAMI_TURBO, OPENBOR, DOS, PC, @@ -88,7 +97,6 @@ namespace PlatformIds BBCMICRO, CAVESTORY, DAPHNE, - DOOM, DRAGON32, FAMICOM, LOVE, @@ -104,6 +112,11 @@ namespace PlatformIds VIDEOPAC, ZMACHINE, TI99, + SEGA_NAOMI, + THOMSON_TO_MO, + UZEBOX, + SPECTRAVIDEO, + PALM_OS, PLATFORM_IGNORE, // Do not allow scraping for this system. PLATFORM_COUNT diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index e98d0233d..5fbc42075 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -42,6 +42,7 @@ TheGamesDBJSONRequestResources resources; const std::map gamesdb_new_platformid_map { { THREEDO, "25" }, { AMIGA, "4911" }, + { AMIGACD32, "4947" }, { AMSTRAD_CPC, "4914" }, { APPLE_II, "4942" }, { ARCADE, "23" }, @@ -54,14 +55,17 @@ const std::map gamesdb_new_platformid_map { { ATARI_LYNX, "4924" }, { ATARI_ST, "4937" }, { ATARI_XE, "30" }, + { CAVESTORY, "1" }, { COLECOVISION, "31" }, { COMMODORE_64, "40" }, { INTELLIVISION, "32" }, { MAC_OS, "37" }, { XBOX, "14" }, { XBOX_360, "15" }, + { MOONLIGHT, "1" }, { MSX, "4929" }, { NEOGEO, "24" }, + { NEOGEO_CD, "24" }, { NEOGEO_POCKET, "4922" }, { NEOGEO_POCKET_COLOR, "4923" }, { NINTENDO_3DS, "4912" }, @@ -77,8 +81,12 @@ const std::map gamesdb_new_platformid_map { { NINTENDO_WII_U, "38" }, { NINTENDO_VIRTUAL_BOY, "4918" }, { NINTENDO_GAME_AND_WATCH, "-1" }, + { NINTENDO_POKEMON_MINI, "4957" }, + { NINTENDO_SATELLAVIEW, "6" }, + { SUFAMI_TURBO, "6" }, { DOS, "1" }, { PC, "1" }, + { PCFX, "4930" }, { SEGA_32X, "33" }, { SEGA_CD, "21" }, { SEGA_DREAMCAST, "16" }, @@ -95,8 +103,9 @@ const std::map gamesdb_new_platformid_map { { PLAYSTATION_VITA, "39" }, { PLAYSTATION_PORTABLE, "13" }, { SUPER_NINTENDO, "6" }, - { TURBOGRAFX_16, "34" }, // HuCards only. - { TURBOGRAFX_CD, "4955" }, // CD-ROMs only. + { SUPERGRAFX, "34" }, // Combined with TurboGrafx-16 + { TURBOGRAFX_16, "34" }, // HuCards only. + { TURBOGRAFX_CD, "4955" }, // CD-ROMs only. { WONDERSWAN, "4925" }, { WONDERSWAN_COLOR, "4926" }, { ZX_SPECTRUM, "4913" }, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index 2c7aba895..edaf4014b 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -26,10 +26,13 @@ using namespace PlatformIds; const std::map screenscraper_platformid_map { { THREEDO, 29 }, { AMIGA, 64 }, + { AMIGACD32, 130 }, { AMSTRAD_CPC, 65 }, + { AMSTRAD_GX4000, 87 }, { APPLE_II, 86 }, + { APPLE_IIGS, 217 }, { ARCADE, 75 }, - { ATARI_800, 26 }, // Use ATARI_2600 as an alias for atari 800. + { ATARI_800, 43 }, { ATARI_2600, 26 }, { ATARI_5200, 40 }, { ATARI_7800, 41 }, @@ -37,15 +40,22 @@ const std::map screenscraper_platformid_map { { ATARI_JAGUAR_CD, 171 }, { ATARI_LYNX, 28 }, { ATARI_ST, 42}, + { ATOMISWAVE, 53 }, // Missing Atari XE ? + { CAVESTORY, 135 }, { COLECOVISION, 48 }, { COMMODORE_64, 66 }, + { COMMODORE_CDTV, 129 }, + { DAPHNE, 49 }, { INTELLIVISION, 115 }, + { LUTRO, 206 }, { MAC_OS, 146 }, { XBOX, 32 }, { XBOX_360, 33 }, + { MOONLIGHT, 138 }, { MSX, 113 }, { NEOGEO, 142 }, + { NEOGEO_CD, 142 }, { NEOGEO_POCKET, 25}, { NEOGEO_POCKET_COLOR, 82 }, { NINTENDO_3DS, 17 }, @@ -62,9 +72,14 @@ const std::map screenscraper_platformid_map { { NINTENDO_WII_U, 18 }, { NINTENDO_VIRTUAL_BOY, 11 }, { NINTENDO_GAME_AND_WATCH, 52 }, + { NINTENDO_POKEMON_MINI, 211 }, + { NINTENDO_SATELLAVIEW, 107 }, + { SUFAMI_TURBO, 108 }, { DOS, 135 }, { PC, 135 }, + { PCFX, 72 }, { OPENBOR, 214 }, + { ORIC, 131 }, { SCUMMVM, 123}, { SEGA_32X, 19 }, { SEGA_CD, 20 }, @@ -83,7 +98,9 @@ const std::map screenscraper_platformid_map { // Missing Sony Playstation 4 ? { PLAYSTATION_VITA, 62 }, { PLAYSTATION_PORTABLE, 61 }, + { SAMCOUPE, 213 }, { SUPER_NINTENDO, 4 }, + { SUPERGRAFX, 105 }, { TURBOGRAFX_16, 31 }, { TURBOGRAFX_CD, 114 }, { WONDERSWAN, 45 }, @@ -93,7 +110,12 @@ const std::map screenscraper_platformid_map { { VIDEOPAC_ODYSSEY2, 104 }, { VECTREX, 102 }, { TRS80_COLOR_COMPUTER, 144 }, - { TANDY, 144 } + { TANDY, 144 }, + { SEGA_NAOMI, 56 }, + { THOMSON_TO_MO, 141 }, + { UZEBOX, 216 }, + { SPECTRAVIDEO, 218 }, + { PALM_OS, 219 } }; // Helper XML parsing method, finding a node-by-name recursively.