From 99d3743c657edbf283b5984e393dd189ed209c20 Mon Sep 17 00:00:00 2001 From: Tovarichtch Date: Sun, 15 Dec 2024 12:10:26 -0500 Subject: [PATCH 1/2] (snes9x) add m.a.c.s. rifle support first merge https://github.com/batocera-linux/batocera-emulationstation/pull/1827 --- .../configgen/configgen/generators/libretro/libretroConfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py index 4c8111bb479..5dc3d62680a 100644 --- a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py +++ b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroConfig.py @@ -904,6 +904,7 @@ def update_n64_controller_config(controller_number): "snes9x" : { "default" : { "device": 260, "p2": 0, "p3": 1, "gameDependant": [ { "key": "type", "value": "justifier", "mapkey": "device", "mapvalue": "516" }, { "key": "type", "value": "justifier", "mapkey": "device_p3", "mapvalue": "772" }, + { "key": "type", "value": "macsrifle", "mapkey": "device", "mapvalue": "1028" }, { "key": "reversedbuttons", "value": "true", "mapcorekey": "snes9x_superscope_reverse_buttons", "mapcorevalue": "enabled" } ] } }, "snes9x_next" : { "default" : { "device": 260, "p2": 0, "gameDependant": [ { "key": "type", "value": "justifier", "mapkey": "device", "mapvalue": "516" } ]} }, From dbcfdd2db8d0d2ded08fc032ac8ba38d8431e577 Mon Sep 17 00:00:00 2001 From: Tovarichtch Date: Sun, 15 Dec 2024 23:44:47 -0500 Subject: [PATCH 2/2] add crosshair for macs rifle device --- .../configgen/configgen/generators/libretro/libretroOptions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py index 9447cce9266..b8a5a230b9a 100644 --- a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py +++ b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroOptions.py @@ -1852,6 +1852,7 @@ def generateCoreSettings(coreSettings: UnixSettings, system: Emulator, rom: Path coreSettings.save('snes9x_superscope_crosshair', '"' + system.config['superscope_crosshair'] + '"') coreSettings.save('snes9x_justifier1_crosshair', '"' + system.config['superscope_crosshair'] + '"') coreSettings.save('snes9x_justifier2_crosshair', '"' + system.config['superscope_crosshair'] + '"') + coreSettings.save('snes9x_rifle_crosshair', '"' + system.config['superscope_crosshair'] + '"') else: if controllersConfig.gunsNeedCrosses(guns): status = '"2"' @@ -1860,6 +1861,7 @@ def generateCoreSettings(coreSettings: UnixSettings, system: Emulator, rom: Path coreSettings.save('snes9x_superscope_crosshair', status) coreSettings.save('snes9x_justifier1_crosshair', status) coreSettings.save('snes9x_justifier2_crosshair', status) + coreSettings.save('snes9x_rifle_crosshair', status) if system.isOptSet('use_guns') and system.getOptBoolean('use_guns') and len(guns) >= 1: coreSettings.save('snes9x_superscope_reverse_buttons', '"disabled"')