From 090069ea72a84976309cce4fcc591fc50c65d572 Mon Sep 17 00:00:00 2001 From: Christian Emmer <10749361+emmercm@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:57:39 -0700 Subject: [PATCH] Feature: console token updates (#1168) --- src/types/gameConsole.ts | 10 +++++----- test/outputFactory.test.ts | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/types/gameConsole.ts b/src/types/gameConsole.ts index 183076e99..51824b45a 100644 --- a/src/types/gameConsole.ts +++ b/src/types/gameConsole.ts @@ -579,7 +579,7 @@ export default class GameConsole { retrodeck: 'gameandwatch', romm: 'game-and-watch', }), - new GameConsole(/GameCube/i, [/* '.iso' */], { + new GameConsole(/GameCube/i, ['.gcm', '.gcz'], { batocera: 'gc', emulationstation: 'gc', jelos: 'gamecube', @@ -601,7 +601,7 @@ export default class GameConsole { romm: 'gb', twmenu: 'gb', }), - new GameConsole(/GBA|Game ?Boy Advance/i, ['.gba', '.srl'], { + new GameConsole(/GBA|Game ?Boy Advance/i, ['.gba'], { adam: 'GBA', batocera: 'gba', emulationstation: 'gba', @@ -661,13 +661,13 @@ export default class GameConsole { romm: 'nds', twmenu: 'nds', }), - new GameConsole(/(\W|^)NDSi(\W|$)|Nintendo DSi([Ww]are)?/i, [], { + new GameConsole(/(\W|^)NDSi(\W|$)|Nintendo DSi([Ww]are)?/i, ['.dsi'], { emulationstation: 'nds', retrodeck: 'nds', romm: 'nintendo-dsi', twmenu: 'dsiware', }), // try to map DSiWare - new GameConsole(/(\W|^)NES(\W|$)|Famicom|Nintendo Entertainment System/i, ['.nes', '.nez'], { + new GameConsole(/(\W|^)NES(\W|$)|Famicom|Nintendo Entertainment System/i, ['.fc', '.nes', '.nez'], { adam: 'FC', batocera: 'nes', emulationstation: 'nes', @@ -713,7 +713,7 @@ export default class GameConsole { onion: 'SUFAMI', retrodeck: 'sufami', }), - new GameConsole(/(\W|^)SNES(\W|$)|Super (Nintendo Entertainment System|Famicom)/i, ['.sfc', '.smc'], { + new GameConsole(/(\W|^)SNES(\W|$)|Super (Nintendo Entertainment System|Famicom)/i, ['.fig', '.sfc', '.smc', '.snes'], { adam: 'SFC', batocera: 'snes', emulationstation: 'snes', diff --git a/test/outputFactory.test.ts b/test/outputFactory.test.ts index cdbbb4e99..7ed803a5c 100644 --- a/test/outputFactory.test.ts +++ b/test/outputFactory.test.ts @@ -469,7 +469,6 @@ describe('token replacement', () => { ['game.gb', path.join('Roms', 'Game Boy (GB)', 'game.gb')], ['game.sgb', path.join('Roms', 'Game Boy (GB)', 'game.sgb')], ['game.gba', path.join('Roms', 'Game Boy Advance (GBA)', 'game.gba')], - ['game.srl', path.join('Roms', 'Game Boy Advance (GBA)', 'game.srl')], ['game.gbc', path.join('Roms', 'Game Boy Color (GBC)', 'game.gbc')], ['game.nes', path.join('Roms', 'Nintendo Entertainment System (FC)', 'game.nes')], ['game.nez', path.join('Roms', 'Nintendo Entertainment System (FC)', 'game.nez')], @@ -571,7 +570,6 @@ describe('token replacement', () => { ['game.sgb', path.join('roms', 'GB', 'game.sgb')], ['game.gbc', path.join('roms', 'GB', 'game.gbc')], ['game.gba', path.join('roms', 'GBA', 'game.gba')], - ['game.srl', path.join('roms', 'GBA', 'game.srl')], ['game.nes', path.join('roms', 'NES', 'game.nes')], ['game.fds', path.join('roms', 'NES', 'game.fds')], ['game.sfc', path.join('roms', 'SNES', 'game.sfc')], @@ -812,7 +810,6 @@ describe('token replacement', () => { ['game.sgb', path.join('roms', 'gb', 'game.sgb')], ['game.gbc', path.join('roms', 'gb', 'game.gbc')], ['game.gba', path.join('roms', 'gba', 'game.gba')], - ['game.srl', path.join('roms', 'gba', 'game.srl')], ['game.nds', path.join('roms', 'nds', 'game.nds')], ['game.nes', path.join('roms', 'nes', 'game.nes')], ['game.sfc', path.join('roms', 'snes', 'game.sfc')],