Skip to content

Commit

Permalink
RB1/LRB: Track Speed adjustment, Sync Diff Speeds
Browse files Browse the repository at this point in the history
  • Loading branch information
lunalawl committed Aug 8, 2024
1 parent 54a00d0 commit 390bae5
Show file tree
Hide file tree
Showing 19 changed files with 159 additions and 20 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Lightweight patches to vanilla RB games that add small quality-of-life improveme
### RB1:

- Adjustable options via external `config.dta` file:
- Track Speed
- Sync Difficulty Speeds
- Venue FPS
- Black Background
- Performance Mode
Expand All @@ -86,6 +88,8 @@ Lightweight patches to vanilla RB games that add small quality-of-life improveme
### LRB:

- Adjustable options via external `config.dta` file:
- Track Speed
- Sync Difficulty Speeds
- Venue FPS
- Vsync
- Instrument Slots
Expand Down
Binary file modified _custom_configs/minimum_all.zip
Binary file not shown.
Binary file modified _custom_configs/minimum_lrb.zip
Binary file not shown.
Binary file modified _custom_configs/minimum_rb1.zip
Binary file not shown.
Binary file modified _custom_configs/recommended_all.zip
Binary file not shown.
Binary file modified _custom_configs/recommended_lrb.zip
Binary file not shown.
Binary file modified _custom_configs/recommended_rb1.zip
Binary file not shown.
2 changes: 2 additions & 0 deletions lrb/_ark/dx/dx_init.dta
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

{set $dx_vsync TRUE}

{set $trackspeed 1.0}

#ifndef _SHIP {tour toggle_all_unlock} #endif
#ifdef _SHIP INIT_DTA_READER #endif

Expand Down
10 changes: 10 additions & 0 deletions lrb/_ark/dx/dx_macros.dta
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
(
{set $dxsettings {read_file #ifdef HX_XBOX "GAME:/config.dta" #endif #ifdef HX_PS3 "GD:/dev_hdd0/game/BLUS30382/USRDIR/config.dta" #endif}}
{foreach $entry $dxsettings
{if {== {elem $entry 0} {basename track_speed}}
{set $trackspeed
{elem {find $entry track_speed} 1}
}
}
{if {== {elem $entry 0} {basename sync_diff_speeds}}
{set $dx_sync_diff_speeds
{elem {find $entry sync_diff_speeds} 1}
}
}
{if {== {elem $entry 0} {basename venue_fps}}
{set $emulatefps
{elem {find $entry venue_fps} 1}
Expand Down
83 changes: 83 additions & 0 deletions lrb/_ark/ui/track_panel.dta
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
#define TRACK_END_FRAME
(1920)
#define TRACK_PANEL_HANDLERS
((enter
{{{gamemode get track_panel} loaded_dir} set view_time_easy {/ {if_else $dx_sync_diff_speeds 1.2 2.4} $trackspeed}}
{{{gamemode get track_panel} loaded_dir} set view_time_expert {/ 1.2 $trackspeed}}
{game add_sink $this}
{$this
set_showing
{if_else
{'||'
$skip_intro
{gamemode get is_drum_trainer}
{gamemode get is_practice}}
{gamemode get show_track}
FALSE}})
(exit
{game remove_sink $this})
(unison_hit)
(unison_miss)
(set_track_out)
(set_track_in)
(animate_track
($start $end $period $units))
(animate_track_out)
(animate_track_out_fast)
(animate_track_in_fast)
(finish_load
{$this set_showing FALSE}
{$this set_track_out})
(intro_start
{$this reset}
{$this
set_showing
{gamemode get show_track}}
{$this set_track_in})
(intro_skip
{$this reset}
{$this
set_showing
{gamemode get show_track}}
{$this set_track_out}
{$this play_intro})
(on_reset
{beatmatch
foreach_active_player
$m
{$m on_new_track}
{{$m track}
init
{$m track}}}
{{$this loaded_dir}
reset})
(on_extend
{$this play_intro}
{if
{&&
{exists gamemode}
{gamemode get play_track_intro_sfx}}
{synth play track_beg.cue}}))
{new
TrackPanel
coop_track_panel
(file ../track/trackpanel.milo)
TRACK_PANEL_HANDLERS}
{new
TrackPanel
h2h_track_panel
(file
{if_else
{==
{{game get_participant_config 0}
get_track_sym}
vocals}
../track/trackpanel_h2h_vocals.milo
../track/trackpanel_h2h.milo})
TRACK_PANEL_HANDLERS}
{func
get_track_panel
{gamemode get track_panel}}
{set
$playback_file
""}
14 changes: 11 additions & 3 deletions lrb/platform/ps3/USRDIR/config.dta
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH WHEN TRYING TO LOAD A SONG --
; -- OR ELSE THE GAME WILL CRASH ON BOOT! --

; Track Speed (1.0: 100%, 1.5: 150%, do not use with BNS in-game)
(track_speed
(track_speed 1.0)
)
; Sync Difficulty Speeds - All tracks run at Expert speed
(sync_diff_speeds
(sync_diff_speeds 0)
)
; Venue FPS (Default: 24, can go up to 60)
(venue_fps
(venue_fps 24)
)
; Vsync (0: Uncapped FPS, 1: 60FPS)
; Vsync (0: Uncapped FPS, 1: 60FPS, only set to 0 on RPCS3!)
(vsync
(vsync 1)
)
Expand All @@ -18,4 +26,4 @@
)
(drum_slot
(drum_slot kControllerDrum)
)
)
16 changes: 10 additions & 6 deletions lrb/platform/xbox/config.dta
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH WHEN TRYING TO LOAD A SONG --
; -- OR ELSE THE GAME WILL CRASH ON BOOT! --

; Track Speed (1.0: 100%, 1.5: 150%, do not use with BNS in-game)
(track_speed
(track_speed 1.0)
)
; Sync Difficulty Speeds - All tracks run at Expert speed
(sync_diff_speeds
(sync_diff_speeds 0)
)
; Venue FPS (Default: 24, can go up to 60)
(venue_fps
(venue_fps 24)
)
; Vsync (0: Uncapped FPS, 1: 60FPS)
(vsync
(vsync 1)
)
; Instrument slot mapping (Options: kControllerVocals, kControllerGuitar, kControllerDrum)
(pad_slot
(pad_slot kControllerVocals)
Expand All @@ -18,4 +22,4 @@
)
(drum_slot
(drum_slot kControllerDrum)
)
)
1 change: 1 addition & 0 deletions lrb/scripts/terminate_rpcs3.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
taskkill /IM rpcs3.exe /F
2 changes: 2 additions & 0 deletions rb1/_ark/dx/dx_init.dta
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

{set $dx_vsync TRUE}

{set $trackspeed 1.0}

INIT_DTA_READER

{rnd set_sync $set_sync}
10 changes: 10 additions & 0 deletions rb1/_ark/dx/dx_macros.dta
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
(
{set $dxsettings {read_file #ifdef HX_XBOX "GAME:/config.dta" #endif #ifdef HX_PS3 "GD:/dev_hdd0/game/BLUS30050/USRDIR/config.dta" #endif}}
{foreach $entry $dxsettings
{if {== {elem $entry 0} {basename track_speed}}
{set $trackspeed
{elem {find $entry track_speed} 1}
}
}
{if {== {elem $entry 0} {basename sync_diff_speeds}}
{set $dx_sync_diff_speeds
{elem {find $entry sync_diff_speeds} 1}
}
}
{if {== {elem $entry 0} {basename venue_fps}}
{set $emulatefps
{elem {find $entry venue_fps} 1}
Expand Down
2 changes: 2 additions & 0 deletions rb1/_ark/ui/track_panel.dta
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
(1920)
#define TRACK_PANEL_HANDLERS
((enter
{{{gamemode get track_panel} loaded_dir} set view_time_easy {/ {if_else $dx_sync_diff_speeds 1.2 2.4} $trackspeed}}
{{{gamemode get track_panel} loaded_dir} set view_time_expert {/ 1.2 $trackspeed}}
{game add_sink $this}
{$this
set_showing
Expand Down
16 changes: 12 additions & 4 deletions rb1/platform/ps3/USRDIR/config.dta
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH ON BOOT --
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH ON BOOT! --

; Track Speed (1.0: 100%, BNS is 1.5: 150%, if you think this is cheating go outside)
(track_speed
(track_speed 1.0)
)
; Sync Difficulty Speeds - All tracks run at Expert speed
(sync_diff_speeds
(sync_diff_speeds 0)
)
; Venue FPS - Default: 24, can go up to 60
(venue_fps
(venue_fps 24)
Expand All @@ -17,7 +25,7 @@
(autoplay
(autoplay 0)
)
; Vsync (0: Uncapped FPS, 1: 60FPS)
; Vsync (0: Uncapped FPS, 1: 60FPS, only set to 0 on RPCS3!)
(vsync
(vsync 1)
)
Expand All @@ -30,4 +38,4 @@
)
(drum_slot
(drum_slot kControllerDrum)
)
)
18 changes: 11 additions & 7 deletions rb1/platform/xbox/config.dta
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH ON BOOT --
; -- THIS CONFIGURATION FILE IS REQUIRED TO BE PRESENT --
; -- OR ELSE THE GAME WILL CRASH ON BOOT! --

; Track Speed (1.0: 100%, BNS is 1.5: 150%, if you think this is cheating go outside)
(track_speed
(track_speed 1.0)
)
; Sync Difficulty Speeds - All tracks run at Expert speed
(sync_diff_speeds
(sync_diff_speeds 0)
)
; Venue FPS - Default: 24, can go up to 60
(venue_fps
(venue_fps 24)
Expand All @@ -17,10 +25,6 @@
(autoplay
(autoplay 0)
)
; Vsync (0: Uncapped FPS, 1: 60FPS)
(vsync
(vsync 1)
)
; Instrument slot mapping (Options: kControllerVocals, kControllerGuitar, kControllerDrum)
(pad_slot
(pad_slot kControllerVocals)
Expand All @@ -30,4 +34,4 @@
)
(drum_slot
(drum_slot kControllerDrum)
)
)
1 change: 1 addition & 0 deletions rb1/scripts/terminate_rpcs3.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
taskkill /IM rpcs3.exe /F

0 comments on commit 390bae5

Please sign in to comment.