Skip to content

Commit

Permalink
Revert "dx func cleanup" :(
Browse files Browse the repository at this point in the history 
This reverts commits f36513d and c75dfd8.
  • Loading branch information
@LlysiX
LlysiX committed Oct 11, 2024
1 parent c75dfd8 commit 43b4081
Show file tree
Hide file tree
Showing 8 changed files with 233 additions and 252 deletions.
18 changes: 0 additions & 18 deletions _ark/ps4/dx/funcs/dx_funcs.dta
View file

This file was deleted.

32 changes: 16 additions & 16 deletions _ark/ps4/dx/macros/dx_controller_macros.dta
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define WRITE_SLOT_DTA
(
{dx_write_null_file {sprint "settings/controller/type/" $slot_changed "/" $slot_to ".dta"}}
{write_file {sprint "data:/GoldHEN/RB4DX/settings/controller/type/" $slot_changed "/" $slot_to ".dta"} $dx_write_nul}
)

#define SET_SLOT_VAR
Expand All @@ -22,35 +22,35 @@
(
{switch $slot_changed
(gtr
{dx_file_delete "settings/controller/type/gtr/drum.dta"}
{dx_file_delete "settings/controller/type/gtr/vox.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/drum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/vox.dta"}
)
(drum
{dx_file_delete "settings/controller/type/drum/gtr.dta"}
{dx_file_delete "settings/controller/type/drum/vox.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/gtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/vox.dta"}
)
(vox
{dx_file_delete "settings/controller/type/vox/gtr.dta"}
{dx_file_delete "settings/controller/type/vox/drum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/gtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/drum.dta"}
)
}
)

#define CLEAR_INVALID_SLOT_DTAS
(
{dx_file_delete "settings/controller/type/vox/vox.dta"}
{dx_file_delete "settings/controller/type/drum/drum.dta"}
{dx_file_delete "settings/controller/type/gtr/gtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/vox/vox.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drum/drum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtr/gtr.dta"}
)

#define DELETE_PAD_BINDING_DTAS
(
{dx_file_delete "settings/controller/binding/pad/rbgtr.dta"}
{dx_file_delete "settings/controller/binding/pad/rbdrum.dta"}
{dx_file_delete "settings/controller/binding/pad/rb4gtr.dta"}
{dx_file_delete "settings/controller/binding/pad/rb4drum.dta"}
{dx_file_delete "settings/controller/binding/pad/ghgtr.dta"}
{dx_file_delete "settings/controller/binding/pad/ghdrum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rbgtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rbdrum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rb4gtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rb4drum.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/ghgtr.dta"}
{file_delete "data:/GoldHEN/RB4DX/settings/controller/binding/pad/ghdrum.dta"}
)

#define SET_PAD_BINDING_VAR
Expand Down
76 changes: 38 additions & 38 deletions _ark/ps4/dx/macros/dx_overshell_macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,58 @@
(
{set $songtitletype
{cond
({&& {dx_file_exists "ps4/ui/game/song_artist_overlay.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlaya.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
({&& {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaya.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
default
)
({&& {dx_file_exists "ps4/ui/game/song_artist_overlay.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlaya.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlay1.entity_ps4"}}
({&& {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaya.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay1.entity_ps4"}}
tl
)
({&& {dx_file_exists "ps4/ui/game/song_artist_overlay.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlay1.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
({&& {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay1.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
a
)
({&& {dx_file_exists "ps4/ui/game/song_artist_overlaya.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlay1.entity_ps4"} {dx_file_exists "ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
({&& {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaya.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay1.entity_ps4"} {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaytl.entity_ps4"}}
none
)
}
}
)
#define MOVE_NOFLAMES_FILES_ON
(
{dx_file_rename "ps4/track/smasher/gem_smasher_unlit1.entity_ps4" "ps4/track/smasher/gem_smasher_unlit.entity_ps4"}
{dx_file_rename "ps4/track/smasher/fx_smasher_streaks1.bmp_ps4" "ps4/track/smasher/fx_smasher_streaks.bmp_ps4"}
{dx_file_rename "ps4/track/smasher/gem_smashed_util1.bmp_ps4" "ps4/track/smasher/gem_smashed_util.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_beams1.bmp_ps4" "ps4/track/shared/smasher_beams.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_flash1.bmp_ps4" "ps4/track/shared/smasher_flash.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_shockwave1.bmp_ps4" "ps4/track/shared/smasher_shockwave.bmp_ps4"}
{dx_file_rename "ps4/track/shared/spark01_color1.bmp_ps4" "ps4/track/shared/spark01_color.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_orb1.bmp_ps4" "ps4/track/shared/particles/textures/particle_orb.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_orb_dense1.bmp_ps4" "ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_shockwave1.bmp_ps4" "ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_shockwave_forced_persp1.bmp_ps4" "ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_smoke_plume1.bmp_ps4" "ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark1.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark_cluster1.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark_dense1.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spiral_flare1.bmp_ps4" "ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4"}
{dx_file_rename "ps4/track/shared/fx/flash_pot/particle_smoke1.bmp_ps4" "ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit1.entity_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_beams1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_beams.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_flash1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_flash.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/spark01_color1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/spark01_color.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke1.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4"}
)
#define MOVE_NOFLAMES_FILES_OFF
(
{dx_file_rename "ps4/track/smasher/gem_smasher_unlit.entity_ps4" "ps4/track/smasher/gem_smasher_unlit1.entity_ps4"}
{dx_file_rename "ps4/track/smasher/fx_smasher_streaks.bmp_ps4" "ps4/track/smasher/fx_smasher_streaks1.bmp_ps4"}
{dx_file_rename "ps4/track/smasher/gem_smashed_util.bmp_ps4" "ps4/track/smasher/gem_smashed_util1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_beams.bmp_ps4" "ps4/track/shared/smasher_beams1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_flash.bmp_ps4" "ps4/track/shared/smasher_flash1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/smasher_shockwave.bmp_ps4" "ps4/track/shared/smasher_shockwave1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/spark01_color.bmp_ps4" "ps4/track/shared/spark01_color1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_orb.bmp_ps4" "ps4/track/shared/particles/textures/particle_orb1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4" "ps4/track/shared/particles/textures/particle_orb_dense1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4" "ps4/track/shared/particles/textures/particle_shockwave1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4" "ps4/track/shared/particles/textures/particle_shockwave_forced_persp1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4" "ps4/track/shared/particles/textures/particle_smoke_plume1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark_cluster1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4" "ps4/track/shared/particles/textures/particle_spark_dense1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4" "ps4/track/shared/particles/textures/particle_spiral_flare1.bmp_ps4"}
{dx_file_rename "ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4" "ps4/track/shared/fx/flash_pot/particle_smoke1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit1.entity_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/fx_smasher_streaks1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/smasher/gem_smashed_util1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_beams.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_beams1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_flash.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_flash1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/smasher_shockwave1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/spark01_color.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/spark01_color1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_orb_dense1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_shockwave_forced_persp1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_smoke_plume1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_cluster1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spark_dense1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/particles/textures/particle_spiral_flare1.bmp_ps4"}
{file_rename "/data/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke.bmp_ps4" "/data/GoldHEN/RB4DX/ps4/track/shared/fx/flash_pot/particle_smoke1.bmp_ps4"}
)
12 changes: 6 additions & 6 deletions _ark/ps4/dx/overshell/dx_controller_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,22 @@
{switch $list_data
("[Reset]")
("Rock Band 1-3 Guitar"
{dx_write_null_file "settings/controller/binding/pad/rbgtr.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rbgtr.dta" $dx_write_nul}
)
("Rock Band 1-3 Drums"
{dx_write_null_file "settings/controller/binding/pad/rbdrum.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rbdrum.dta" $dx_write_nul}
)
("Rock Band 4 Guitar"
{dx_write_null_file "settings/controller/binding/pad/rb4gtr.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rb4gtr.dta" $dx_write_nul}
)
("Rock Band 4 Drums"
{dx_write_null_file "settings/controller/binding/pad/rb4drum.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/rb4drum.dta" $dx_write_nul}
)
("Guitar Hero Guitar"
{dx_write_null_file "settings/controller/binding/pad/ghgtr.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/ghgtr.dta" $dx_write_nul}
)
("Guitar Hero Drums"
{dx_write_null_file "settings/controller/binding/pad/ghdrum.dta"}
{write_file "data:/GoldHEN/RB4DX/settings/controller/binding/pad/ghdrum.dta" $dx_write_nul}
)
}
SET_PAD_BINDING_VAR
Expand Down
2 changes: 1 addition & 1 deletion _ark/ps4/dx/overshell/dx_slider_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
})
(on_cancel
{set_elem {find $syscfg beatmatcher watcher slop} 1 $speedmod}
{dx_write_file "speedmod.ini" {array ({/ $speedmod 100})}}
{write_file "data:/GoldHEN/RB4DX/speedmod.ini" {array ({/ $speedmod 100})}}
SET_TRACK_SPEEDS
{$this show_state kState_RB4DXMain}
{$this trigger_cancel_effects})
Expand Down
Loading

0 comments on commit 43b4081

Please sign in to comment.