Skip to content

Commit 6b8770f

Browse files
LlysiXLlysiX
committed
move controller type dtas again
1 parent e5a4b89 commit 6b8770f

File tree

4 files changed

+94
-57
lines changed

4 files changed

+94
-57
lines changed

‎_ark/ps4/config/include/joypad.dta

+43-38
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,9 @@
22
(hold_ms 180)
33
(repeat_ms 50)
44
(midi_joypad
5-
(disable FALSE))
6-
#define VOX_SLOT_OVERRIDE
7-
(
8-
{if_else {file_exists "settings/controller/type/voxgtr.dta"}
9-
kControllerGuitar
10-
{if_else {file_exists "settings/controller/type/voxdrum.dta"}
11-
kControllerDrum
12-
kControllerVocals
13-
}
14-
}
15-
)
16-
#define GTR_SLOT_OVERRIDE
17-
(
18-
{if_else {file_exists "settings/controller/type/gtrvox.dta"}
19-
kControllerVocals
20-
{if_else {file_exists "settings/controller/type/gtrdrum.dta"}
21-
kControllerDrum
22-
kControllerGuitar
23-
}
24-
}
25-
)
26-
#define DRUM_SLOT_OVERRIDE
27-
(
28-
{if_else {file_exists "settings/controller/type/drumvox.dta"}
29-
kControllerVocals
30-
{if_else {file_exists "settings/controller/type/drumgtr.dta"}
31-
kControllerGuitar
32-
kControllerDrum
33-
}
34-
}
5+
(disable FALSE)
356
)
7+
368
(controller_mapping
379
;(ro_guitar guitar)
3810
;(ro_guitar_xbox ro_guitar_xbox)
@@ -79,7 +51,39 @@
7951
;(wii_drums_rb2 wii_drums)
8052
;(wii_roguitar wii_guitar)
8153
;(wii_rodrums wii_rodrums)
82-
(none joypad))
54+
(none joypad)
55+
)
56+
57+
#define VOX_SLOT_OVERRIDE
58+
(
59+
{if_else {file_exists "settings/controller/type/vox/gtr.dta"}
60+
kControllerGuitar
61+
{if_else {file_exists "settings/controller/type/vox/drum.dta"}
62+
kControllerDrum
63+
kControllerVocals
64+
}
65+
}
66+
)
67+
#define GTR_SLOT_OVERRIDE
68+
(
69+
{if_else {file_exists "settings/controller/type/gtr/vox.dta"}
70+
kControllerVocals
71+
{if_else {file_exists "settings/controller/type/gtr/drum.dta"}
72+
kControllerDrum
73+
kControllerGuitar
74+
}
75+
}
76+
)
77+
#define DRUM_SLOT_OVERRIDE
78+
(
79+
{if_else {file_exists "settings/controller/type/drum/vox.dta"}
80+
kControllerVocals
81+
{if_else {file_exists "settings/controller/type/drum/gtr.dta"}
82+
kControllerGuitar
83+
kControllerDrum
84+
}
85+
}
86+
)
8387
(instrument_mapping
8488
;(ro_guitar GTR_SLOT_OVERRIDE)
8589
;(ro_guitar_xbox GTR_SLOT_OVERRIDE)
@@ -96,12 +100,12 @@
96100
;(wii_guitar GTR_SLOT_OVERRIDE)
97101
;(wii_guitar_rb2 GTR_SLOT_OVERRIDE)
98102
;(wii_roguitar GTR_SLOT_OVERRIDE)
99-
; (hx_midi_guitar_xbox kControllerRealGuitar)
100-
; (hx_midi_keys_xbox kControllerKeys)
101-
; (hx_midi_guitar_ps3 kControllerRealGuitar)
102-
; (hx_midi_keys_ps3 kControllerKeys)
103-
; (hx_midi_guitar_wii kControllerRealGuitar)
104-
; (hx_midi_keys_wii kControllerKeys)
103+
;(hx_midi_guitar_xbox kControllerRealGuitar)
104+
;(hx_midi_keys_xbox kControllerKeys)
105+
;(hx_midi_guitar_ps3 kControllerRealGuitar)
106+
;(hx_midi_keys_ps3 kControllerKeys)
107+
;(hx_midi_guitar_wii kControllerRealGuitar)
108+
;(hx_midi_keys_wii kControllerKeys)
105109
(midi DRUM_SLOT_OVERRIDE)
106110
(hx_drums_xbox DRUM_SLOT_OVERRIDE)
107111
(hx_drums_xbox_rb2 DRUM_SLOT_OVERRIDE)
@@ -125,4 +129,5 @@
125129
;(wii_remote VOX_SLOT_OVERRIDE)
126130
;(wii_classic VOX_SLOT_OVERRIDE)
127131
;(gamecube VOX_SLOT_OVERRIDE)
128-
(none kControllerNone))
132+
(none kControllerNone)
133+
)

‎_ark/ps4/dx/macros/dx_controller_macros.dta

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define WRITE_SLOT_DTA
22
(
3-
{write_file {sprint "data:/GoldHEN/RB4DX/settings/controller/type/" $slot_changed $slot_to ".dta"} $dx_write_nul}
3+
{write_file {sprint "data:/GoldHEN/RB4DX/settings/controller/type/" $slot_changed "/" $slot_to ".dta"} $dx_write_nul}
44
)
55

66
#define SET_SLOT_VAR
@@ -22,23 +22,23 @@
2222
(
2323
{switch $slot_changed
2424
(gtr
25-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrdrum.dta"}
26-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrvox.dta"}
25+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/drum.dta"}
26+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/vox.dta"}
2727
)
2828
(drum
29-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumgtr.dta"}
30-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumvox.dta"}
29+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/gtr.dta"}
30+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/vox.dta"}
3131
)
3232
(vox
33-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxgtr.dta"}
34-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxdrum.dta"}
33+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/gtr.dta"}
34+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/drum.dta"}
3535
)
3636
}
3737
)
3838

3939
#define CLEAR_INVALID_SLOT_DTAS
4040
(
41-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxvox.dta"}
42-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumdrum.dta"}
43-
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrgtr.dta"}
41+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/vox.dta"}
42+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/drum.dta"}
43+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/gtr.dta"}
4444
)

‎_ark/ps4/dx/ui/dx_init.dta

+9-9
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,39 @@
5050
;controller type
5151
{set $voxslt
5252
{cond
53-
({file_exists "settings/controller/type/voxgtr.dta"}
53+
({file_exists "settings/controller/type/vox/gtr.dta"}
5454
gtr
5555
)
56-
({file_exists "settings/controller/type/voxdrum.dta"}
56+
({file_exists "settings/controller/type/vox/drum.dta"}
5757
drum
5858
)
59-
({&& {! {file_exists "settings/controller/type/voxdrum.dta"}} {! {file_exists "settings/controller/type/voxgtr.dta"}}}
59+
({&& {! {file_exists "settings/controller/type/vox/drum.dta"}} {! {file_exists "settings/controller/type/vox/gtr.dta"}}}
6060
vox
6161
)
6262
}
6363
}
6464
{set $gtrslt
6565
{cond
66-
({file_exists "settings/controller/type/gtrvox.dta"}
66+
({file_exists "settings/controller/type/gtr/vox.dta"}
6767
vox
6868
)
69-
({file_exists "settings/controller/type/gtrdrum.dta"}
69+
({file_exists "settings/controller/type/gtr/drum.dta"}
7070
drum
7171
)
72-
({&& {! {file_exists "settings/controller/type/gtrdrum.dta"}} {! {file_exists "settings/controller/type/gtrvox.dta"}}}
72+
({&& {! {file_exists "settings/controller/type/gtr/drum.dta"}} {! {file_exists "settings/controller/type/gtr/vox.dta"}}}
7373
gtr
7474
)
7575
}
7676
}
7777
{set $drmslt
7878
{cond
79-
({file_exists "settings/controller/type/drumgtr.dta"}
79+
({file_exists "settings/controller/type/drum/gtr.dta"}
8080
gtr
8181
)
82-
({file_exists "settings/controller/type/drumvox.dta"}
82+
({file_exists "settings/controller/type/drum/vox.dta"}
8383
vox
8484
)
85-
({&& {! {file_exists "settings/controller/type/drumvox.dta"}} {! {file_exists "settings/controller/type/drumgtr.dta"}}}
85+
({&& {! {file_exists "settings/controller/type/drum/vox.dta"}} {! {file_exists "settings/controller/type/drum/gtr.dta"}}}
8686
drum
8787
)
8888
}

‎_ark/ps4/dx/ui/init_dev.dta

+32
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
{file_mkdir "data:/GoldHEN/RB4DX/settings/sfx"}
99
{file_mkdir "data:/GoldHEN/RB4DX/settings/controller"}
1010
{file_mkdir "data:/GoldHEN/RB4DX/settings/controller/type"}
11+
{file_mkdir "data:/GoldHEN/RB4DX/settings/controller/type/gtr"}
12+
{file_mkdir "data:/GoldHEN/RB4DX/settings/controller/type/drum"}
13+
{file_mkdir "data:/GoldHEN/RB4DX/settings/controller/type/vox"}
1114
;{file_mkdir "data:/GoldHEN/RB4DX/settings/controller/binding"} ;TODO
1215
)
1316
#define UPDATE_SETTINGS
@@ -55,26 +58,55 @@
5558
{file_delete "data:/GoldHEN/RB4DX/voxgtr.dta"}
5659
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/voxgtr.dta" $dx_write_nul}
5760
}
61+
{if {file_exists "settings/controller/type/voxgtr.dta"}
62+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxgtr.dta"}
63+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/vox/gtr.dta" $dx_write_nul}
64+
}
65+
5866
{if {file_exists "voxdrum.dta"}
5967
{file_delete "data:/GoldHEN/RB4DX/voxdrum.dta"}
6068
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/voxdrum.dta" $dx_write_nul}
6169
}
70+
{if {file_exists "settings/controller/type/voxdrum.dta"}
71+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxdrum.dta"}
72+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/vox/drum.dta" $dx_write_nul}
73+
}
74+
6275
{if {file_exists "gtrvox.dta"}
6376
{file_delete "data:/GoldHEN/RB4DX/gtrvox.dta"}
6477
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/gtrvox.dta" $dx_write_nul}
6578
}
79+
{if {file_exists "settings/controller/type/gtrvox.dta"}
80+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrvox.dta"}
81+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/gtr/vox.dta" $dx_write_nul}
82+
}
83+
6684
{if {file_exists "gtrdrum.dta"}
6785
{file_delete "data:/GoldHEN/RB4DX/gtrdrum.dta"}
6886
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/gtrdrum.dta" $dx_write_nul}
6987
}
88+
{if {file_exists "settings/controller/type/gtrdrum.dta"}
89+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrdrum.dta"}
90+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/gtr/drum.dta" $dx_write_nul}
91+
}
92+
7093
{if {file_exists "drumgtr.dta"}
7194
{file_delete "data:/GoldHEN/RB4DX/drumgtr.dta"}
7295
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/drumgtr.dta" $dx_write_nul}
7396
}
97+
{if {file_exists "settings/controller/type/drumgtr.dta"}
98+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumgtr.dta"}
99+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/drum/gtr.dta" $dx_write_nul}
100+
}
101+
74102
{if {file_exists "drumvox.dta"}
75103
{file_delete "data:/GoldHEN/RB4DX/drumvox.dta"}
76104
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/drumvox.dta" $dx_write_nul}
77105
}
106+
{if {file_exists "settings/controller/type/drumvox.dta"}
107+
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumvox.dta"}
108+
{write_file "data:/GoldHEN/RB4DX/settings/controller/type/drum/vox.dta" $dx_write_nul}
109+
}
78110
)
79111

80112
CREATE_SETTINGS_DIRS

0 commit comments

Comments
 (0)