idz, idac, swdc: switched to [xinput] config instead of [io]

Package.mk

@@ -95,7 +95,7 @@ $(BUILD_DIR_ZIP)/swdc.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
 		$(BUILD_DIR_64)/swdchook/swdchook.dll \
-		$(DIST_DIR)/chusan/config_hook.json \
+		$(DIST_DIR)/swdc/config_hook.json \
 		$(DIST_DIR)/swdc/segatools.ini \
 		$(DIST_DIR)/swdc/start.bat \
     	$(BUILD_DIR_ZIP)/swdc

dist/idac/segatools.ini

@@ -87,6 +87,8 @@ coin=0x33
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
 mode=xinput
+
+[xinput]
 ; Automatically reset the simulated shifter to Neutral when XInput Start is
 ; pressed (e.g. when navigating menus between races).
 autoNeutral=1

dist/idz/segatools.ini

@@ -11,8 +11,10 @@ appdata=
 [aime]
 ; Controls emulation of the Aime card reader assembly.
 enable=1
+; Necessary for IDZ Version 2+ to work
 aimePath=DEVICE\aime.txt
 felicaGen=0
+aimeGen=1
 
 [dns]
 ; Insert the hostname or IP address of the server you wish to use here.
@@ -25,7 +27,7 @@ default=127.0.0.1
 ; 4: Export (some UI elements in English)
 ;
 ; NOTE: Changing this setting causes a factory reset.
-region=1
+region=4
 
 [netenv]
 ; Simulate an ideal LAN environment. This may interfere with head-to-head play.
@@ -33,11 +35,17 @@ region=1
 ; setting enabled is recommended.
 enable=1
 
+; The final octet of the local host's IP address on the virtualized subnet 
+; (so, if the keychip subnet is 192.168.32.0 and this value is set to 11, 
+; then the local host's virtualized LAN IP is 192.168.32.11).
+; Needed for in store battle, one needs to set it to 12.
+;addrSuffix=12
+
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
 ; If you disable netenv then you must set this to your LAN's IP subnet, and
 ; that subnet must start with 192.168.
-subnet=192.168.100.0
+subnet=192.168.158.0
 
 [gpio]
 ; Emulated Nu DIP switch for Distribution Server setting.
@@ -79,6 +87,8 @@ coin=0x33
 ; Input API selection for JVS input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
 mode=xinput
+
+[xinput]
 ; Automatically reset the simulated shifter to Neutral when XInput Start is
 ; pressed (e.g. when navigating menus between races).
 autoNeutral=1

dist/idz/start.bat

@@ -3,8 +3,12 @@
 pushd %~dp0
 
 inject -k idzhook.dll InitialD0_DX11_Nu.exe
+rem Set dipsw1=0 and uncomment the ServerBox for in store battle?
+rem inject -k idzhook.dll ServerBoxD8_Nu_x64.exe
 inject -d -k idzhook.dll amdaemon.exe -c configDHCP_Final_Common.json configDHCP_Final_JP.json configDHCP_Final_JP_ST1.json configDHCP_Final_JP_ST2.json configDHCP_Final_EX.json configDHCP_Final_EX_ST1.json configDHCP_Final_EX_ST2.json
 
+taskkill /im ServerBoxD8_Nu_x64.exe > nul 2>&1
+
 echo.
 echo Game processes have terminated
 pause

dist/swdc/segatools.ini

@@ -26,7 +26,8 @@ enable=1
 
 [keychip]
 ; The /24 LAN subnet that the emulated keychip will tell the game to expect.
-; You must set this to your LAN's IP subnet, and that subnet must start with 192.168.
+; You must set this to your LAN's IP subnet, and that subnet must start with 192.168, 
+; in order to find the MAIN cabinet.
 subnet=192.168.100.0
 
 [aimeio]
@@ -58,10 +59,12 @@ test=0x31
 service=0x32
 ; Keyboard button to increment coin counter. Default is the 3 key.
 coin=0x33
+
 ; Input API selection for IO4 input emulator.
 ; Set "xinput" to use a gamepad and "dinput" to use a steering wheel.
-
 mode=xinput
+
+[xinput]
 ; Use the left thumbstick for steering instead of both on XInput Controllers.
 ; Not recommended as it will not give you the precision needed for this game.
 singleStickSteering=1

idacio/config.c

@@ -77,25 +77,25 @@ void idac_xi_config_load(struct idac_xi_config *cfg, const wchar_t *filename)
     assert(filename != NULL);
 
     cfg->single_stick_steering = GetPrivateProfileIntW(
-                                L"io4",
+                                L"xinput",
                                 L"singleStickSteering",
                                 0,
                                 filename);
 
     cfg->linear_steering = GetPrivateProfileIntW(
-                           L"io4",
+                           L"xinput",
                            L"linearSteering",
                            0,
                            filename);
 
     cfg->left_stick_deadzone = GetPrivateProfileIntW(
-                                L"io4",
+                                L"xinput",
                                 L"leftStickDeadzone",
                                 7849,
                                 filename);
         
     cfg->right_stick_deadzone = GetPrivateProfileIntW(
-                                L"io4",
+                                L"xinput",
                                 L"rightStickDeadzone",
                                 8689,
                                 filename);

idzio/config.c

@@ -77,25 +77,25 @@ void idz_xi_config_load(struct idz_xi_config *cfg, const wchar_t *filename)
     assert(filename != NULL);
 
     cfg->single_stick_steering = GetPrivateProfileIntW(
-                                L"io3",
+                                L"xinput",
                                 L"singleStickSteering",
                                 0,
                                 filename);
 
     cfg->linear_steering = GetPrivateProfileIntW(
-                           L"io3",
+                           L"xinput",
                            L"linearSteering",
                            0,
                            filename);
     
     cfg->left_stick_deadzone = GetPrivateProfileIntW(
-                               L"io3",
+                               L"xinput",
                                L"leftStickDeadzone",
                                7849,
                                filename);
     
     cfg->right_stick_deadzone = GetPrivateProfileIntW(
-                                L"io3",
+                                L"xinput",
                                 L"rightStickDeadzone",
                                 8689,
                                 filename);

swdcio/config.c

@@ -67,25 +67,25 @@ void swdc_xi_config_load(struct swdc_xi_config *cfg, const wchar_t *filename)
     assert(filename != NULL);
 
     cfg->single_stick_steering = GetPrivateProfileIntW(
-                                L"io4",
+                                L"xinput",
                                 L"singleStickSteering",
                                 0,
                                 filename);
 
     cfg->linear_steering = GetPrivateProfileIntW(
-                           L"io4",
+                           L"xinput",
                            L"linearSteering",
                            0,
                            filename);
     
     cfg->left_stick_deadzone = GetPrivateProfileIntW(
-                               L"io4",
+                               L"xinput",
                                L"leftStickDeadzone",
                                7849,
                                filename);
     
     cfg->right_stick_deadzone = GetPrivateProfileIntW(
-                                L"io4",
+                                L"xinput",
                                 L"rightStickDeadzone",
                                 8689,
                                 filename);