From bb66694e39695fa8212b5ce5d99df181bcf9cd04 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 12 Dec 2025 09:07:11 +0100 Subject: [PATCH] fix: support of guncon2 for model3 --- .../supermodel/supermodelControllers.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/projects/configgen/configgen/generators/supermodel/supermodelControllers.py b/projects/configgen/configgen/generators/supermodel/supermodelControllers.py index 941caf6651..65cb2e253c 100644 --- a/projects/configgen/configgen/generators/supermodel/supermodelControllers.py +++ b/projects/configgen/configgen/generators/supermodel/supermodelControllers.py @@ -422,6 +422,21 @@ def generateControllerConfig(self, playersControllers: ControllerPerPlayer): inp = pad.Input(DIGITAL_JOYSTICK_P2[x]) supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '"{}_{}"'.format(padIndex, getConfigValueJ2(inp))) +<<<<<<< Updated upstream +======= + if pad.PlayerIndex == 2 and is_guncon: + for x in GUNCON_JOY: + supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '"{}_{}"'.format(padIndex, GUNCON_JOY[x])) + + if pad.PlayerIndex == 2 and is_jamma: + for x in JAMMA_CONTROL_P2: + if JAMMA_CONTROL_P2[x] != -1: + print("CONFIGURE P2") + supermodelControllersSettings.setString(self.SECTION_GLOBAL, "{}2".format(x), '"{}_BUTTON{}"'.format(padIndex, JAMMA_CONTROL_P2[x] + 1)) + else: + supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '') + +>>>>>>> Stashed changes break # Save configuration -- GitLab