Skip to content

Commit

Permalink
track angles
Browse files Browse the repository at this point in the history
  • Loading branch information
@LlysiX
LlysiX committed Oct 14, 2024
1 parent 6ff7f08 commit 39b1e50
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 5 deletions.
19 changes: 19 additions & 0 deletions _ark/ps4/dx/macros/dx_overshell_macros.dta
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
#define TRACKANGLE_CHECK
(
{set $trackangletype
{cond
({&& {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb2.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb3.scene_ps4"}}
rr
)
({&& {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb3.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rr.scene_ps4"}}
rb2
)
({&& {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb2.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rr.scene_ps4"}}
rb3
)
({&& {dx_file_exists "ps4/track/guitar_unlit_rr.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb2.scene_ps4"} {dx_file_exists "ps4/track/guitar_unlit_rb3.scene_ps4"}}
none
)
}
}
)
#define SONGTITLE_CHECK
(
{set $songtitletype
Expand Down
123 changes: 118 additions & 5 deletions _ark/ps4/dx/overshell/dx_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
{if_else $noshine "Track Shine: OFF" "Track Shine: ON"}
{if_else $noflames "Flames: OFF" "Flames: ON"}
{if_else $micwarn "Hide Mic Warning: ON" "Hide Mic Warning: OFF"}
{if_else $menubg "Menu BGs: OFF" "Menu BGs: ON"}
"Next"
)
}
)
Expand All @@ -461,7 +461,6 @@
{set $noshine {dx_file_exists "ps4/track/shared/fx_noise_b_util.bmp_ps4"}}
{set $noflames {dx_file_exists "ps4/track/smasher/gem_smasher_unlit.entity_ps4"}}
{set $micwarn {! {dx_file_exists "ps4/ui/game/hud1.scene_ps4"}}}
{set $menubg {dx_file_exists "ps4/ui/background/meta_background.scene_ps4"}}
{set $dx_cur_state vis1}
RB4DXVIS1_DATA
)
Expand All @@ -484,15 +483,15 @@
{set $songtitle FALSE}
{switch $songtitletype
(default
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "/data/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay1.entity_ps4"}
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "ps4/ui/game/song_artist_overlay1.entity_ps4"}
{dx_file_delete "settings/visuals/songtitletype1.dta"}
)
(tl
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "/data/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaytl.entity_ps4"}
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "ps4/ui/game/song_artist_overlaytl.entity_ps4"}
{dx_file_delete "settings/visuals/songtitletypetl.dta"}
)
(a
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "/data/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlaya.entity_ps4"}
{dx_file_rename "ps4/ui/game/song_artist_overlay.entity_ps4" "ps4/ui/game/song_artist_overlaya.entity_ps4"}
{dx_file_delete "settings/visuals/songtitletypea.dta"}
)
(none
Expand Down Expand Up @@ -583,6 +582,90 @@
{$this show_state kState_RB4DXVisSettings}
{$this trigger_select_effects }
)
("Next"
{$this show_state kState_RB4DXVisSettings2}
{$this trigger_select_effects}
)
}
)
(on_cancel
{set $dx_cur_state FALSE}
{$this show_state kState_RB4DXMain}
{$this trigger_cancel_effects}
)
)
; next page (TODO: Integrate this into one state)
#define RB4DXVIS2_DATA
(
{$this setup_confirm_actions a
(
"Back"
{if_else $trackangle "Custom Track Angle: ON" "Custom Track Angle: OFF"}
{if_else $menubg "Menu BGs: OFF" "Menu BGs: ON"}
)
}
)
(kState_RB4DXVisSettings2
(view {$this get_auto_list_view})
(enter
{set $trackangle {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"}}
TRACKANGLE_CHECK
{set $menubg {dx_file_exists "ps4/ui/background/meta_background.scene_ps4"}}
{set $dx_cur_state vis2}
RB4DXVIS2_DATA
)
(SELECT_MSG
{local $list_data {($objId UIListCom) get_data_in_column token}}
{switch $list_data
("Custom Track Angle: ON"
{set $trackangle FALSE}
{switch $trackangletype
(rr
{dx_file_rename "ps4/track/guitar_unlit.scene_ps4" "ps4/track/guitar_unlit_rr.scene_ps4"}
{dx_file_delete "settings/visuals/trackanglerr.dta"}
)
(rb2
{dx_file_rename "ps4/track/guitar_unlit.scene_ps4" "ps4/track/guitar_unlit_rb2.scene_ps4"}
{dx_file_delete "settings/visuals/trackanglerb2.dta"}
)
(rb3
{dx_file_rename "ps4/track/guitar_unlit.scene_ps4" "ps4/track/guitar_unlit_rb3.scene_ps4"}
{dx_file_delete "settings/visuals/trackanglerb3.dta"}
)
(none
{dx_file_delete "ps4/track/guitar_unlit.scene_ps4"}
)
}
{dx_file_delete "settings/visuals/trackangle.dta"}
{if_else {$this in_song}
{$this show_state kState_RB4DXInGameWarn}
RB4DXVIS2_DATA
}
{$this trigger_select_effects}
)
("Custom Track Angle: OFF"
{$this show_state kState_RB4DXTrackAngleSelector}
{$this trigger_select_effects}
)
(("Menu BGs: OFF" "Menu BGs: ON")
{set $menubg {! $menubg}}
{if_else $menubg
{do
{dx_file_rename "ps4/ui/background/meta_background1.scene_ps4" "ps4/ui/background/meta_background.scene_ps4"}
{dx_write_null_file "settings/visuals/menubg.dta"}
}
{do
{dx_file_rename "ps4/ui/background/meta_background.scene_ps4" "ps4/ui/background/meta_background1.scene_ps4"}
{dx_file_delete "settings/visuals/menubg.dta"}
}
}
{$this show_state kState_RB4DXDelayedEffectWarn}
{$this trigger_select_effects}
)
("Back"
{$this show_state kState_RB4DXVisSettings1}
{$this trigger_select_effects }
)
}
)
(on_cancel
Expand Down Expand Up @@ -721,6 +804,36 @@
)
)

;Track Angle Type Selector
(kState_RB4DXTrackAngleSelector
(view confirm_action)
(enter
{$this setup_confirm_actions "Which Track Angle do you want?" ("Rock Revolution" "Rock Band 2" "Rock Band 3")}
)
(SELECT_MSG
{local $list_data {($objId UIListCom) get_data_in_column token}}
{switch $list_data
("Rock Revolution"
{set $trackangletype rr}
{$this show_state kState_RB4DXAnglesWarn}
)
("Rock Band 2"
{set $trackangletype rb2}
{$this show_state kState_RB4DXAnglesWarn}
)
("Rock Band 3"
{set $trackangletype rb3}
{$this show_state kState_RB4DXAnglesWarn}
)
}
{$this trigger_select_effects}
)
(on_cancel
{$this show_state kState_RB4DXVisSettings2}
{$this trigger_cancel_effects}
)
)

;Extras
#define RB4DXEXTRA_DATA
(
Expand Down
59 changes: 59 additions & 0 deletions _ark/ps4/dx/overshell/dx_warn_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
(vis1
{$this show_state kState_RB4DXVisSettings1}
)
(vis2
{$this show_state kState_RB4DXVisSettings2}
)
(sfx
{$this show_state kState_RB4DXSFXSettings}
)
Expand All @@ -58,6 +61,9 @@
(vis1
{$this show_state kState_RB4DXVisSettings1}
)
(vis2
{$this show_state kState_RB4DXVisSettings2}
)
(sfx
{$this show_state kState_RB4DXSFXSettings}
)
Expand All @@ -82,6 +88,9 @@
(vis1
{$this show_state kState_RB4DXVisSettings1}
)
(vis2
{$this show_state kState_RB4DXVisSettings2}
)
(sfx
{$this show_state kState_RB4DXSFXSettings}
)
Expand All @@ -96,6 +105,12 @@
(vis
{$this show_state kState_RB4DXVisSettings}
)
(vis1
{$this show_state kState_RB4DXVisSettings1}
)
(vis2
{$this show_state kState_RB4DXVisSettings2}
)
(sfx
{$this show_state kState_RB4DXSFXSettings}
)
Expand All @@ -104,6 +119,50 @@
)
)

(kState_RB4DXAnglesWarn
(view confirm_action)
(enter
{$this setup_confirm_actions "Track Angles are EXPERIMENTAL, and may not work in multiplayer. Do you want to continue?" (overshell_confirm_yes overshell_confirm_no)}
)
(SELECT_MSG
{local $list_data {($objId UIListCom) get_data_in_column token}
}
{switch $list_data
(overshell_confirm_yes
{switch $trackangletype
(rr
{dx_write_null_file "settings/visuals/trackanglerr.dta"}
{dx_file_rename "ps4/track/guitar_unlit_rr.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
)
(rb2
{dx_write_null_file "settings/visuals/trackanglerb2.dta"}
{dx_file_rename "ps4/track/guitar_unlit_rb2.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
)
(rb3
{dx_write_null_file "settings/visuals/trackanglerb3.dta"}
{dx_file_rename "ps4/track/guitar_unlit_rb3.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
)
}
{set $trackangle TRUE}
{dx_write_null_file "settings/visuals/trackangle.dta"}
{if_else {$this in_song}
{$this show_state kState_RB4DXInGameWarn}
{$this show_state kState_RB4DXVisSettings2}
}
)
(overshell_confirm_no
{set $trackangletype FALSE}
{$this show_state kState_RB4DXVisSettings2}
)
}
{$this trigger_select_effects}
)
(on_cancel
{$this show_state kState_RB4DXVisSettings2}
{$this trigger_cancel_effects}
)
)

(kState_RB4DXAutoplayHowTo
(view confirm_action)
(enter
Expand Down
20 changes: 20 additions & 0 deletions _ark/ps4/dx/ui/init_dev.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,26 @@ UPDATE_SETTINGS
}
)
}
{cond
({&& {file_exists "settings/visuals/trackangle.dta"} {file_exists "settings/visuals/trackanglerr.dta"} {dx_file_exists "ps4/track/guitar_unlit_rr.scene_ps4"}}
{if_else {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"}
{dx_file_delete "ps4/track/guitar_unlit_rr.scene_ps4"}
{dx_file_rename "ps4/track/guitar_unlit_rr.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
}
)
({&& {file_exists "settings/visuals/trackangle.dta"} {file_exists "settings/visuals/trackanglerb2.dta"} {dx_file_exists "ps4/track/guitar_unlit_rb2.scene_ps4"}}
{if_else {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"}
{dx_file_delete "ps4/track/guitar_unlit_rb2.scene_ps4"}
{dx_file_rename "ps4/track/guitar_unlit_rb2.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
}
)
({&& {file_exists "settings/visuals/trackangle.dta"} {file_exists "settings/visuals/trackanglerb3.dta"} {dx_file_exists "ps4/track/guitar_unlit_rb3.scene_ps4"}}
{if_else {dx_file_exists "ps4/track/guitar_unlit.scene_ps4"}
{dx_file_delete "ps4/track/guitar_unlit_rb3.scene_ps4"}
{dx_file_rename "ps4/track/guitar_unlit_rb3.scene_ps4" "ps4/track/guitar_unlit.scene_ps4"}
}
)
}

;reset settings that shouldn't save
{if {dx_file_exists "ps4/ui/game/game.layout_ps4"}
Expand Down
Binary file added _ark/ps4/track/guitar_unlit_og.scene_ps4
View file
Binary file not shown.
Binary file added _ark/ps4/track/guitar_unlit_rb2.scene_ps4
View file
Binary file not shown.
Binary file added _ark/ps4/track/guitar_unlit_rb3.scene_ps4
View file
Binary file not shown.
Binary file added _ark/ps4/track/guitar_unlit_rr.scene_ps4
View file
Binary file not shown.

0 comments on commit 39b1e50

Please sign in to comment.