Changing venue FPS no longer breaks "photocopy", default to 30FPS

hmxmilohax · Jan 23, 2025 · cda99e6 · cda99e6
1 parent 8d7d1f2
commit cda99e6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/lrb/_ark/dx/dx_init.dta b/lrb/_ark/dx/dx_init.dta
@@ -3,7 +3,7 @@
 {set $dx_guitar_slot kControllerGuitar}
 {set $dx_drum_slot kControllerDrum}
 
-{set $emulatefps 24}
+{set $emulatefps 30}
 
 {set $dx_vsync TRUE}
 

diff --git a/lrb/_ark/dx/dx_macros.dta b/lrb/_ark/dx/dx_macros.dta
@@ -44,9 +44,9 @@
 
 #define DX_FPS_SETUP
 (
-   {if {!= $emulatefps 24} {{$world iterate PostProc $p {$p set emulate_fps $emulatefps}}}
+   {{$world iterate PostProc $p {unless {== $p "photocopy.pp"} {$p set emulate_fps $emulatefps}}}}
    {if {>= {$emulatefps 25} {$char iterate CharHair $hair {$hair reset 35}}
    {$world iterate WorldDir $wd {$wd iterate BandCamShot $bcs
    {foreach $property (shake_noisefreq shake_noiseamp) {$bcs set (keyframes $i $property) {'*' {$bcs get (keyframes $i $property)} 0.25}}}
-   {foreach $component (x y) {$bcs set (keyframes $i shake_maxangle $component) {'*' {$bcs get (keyframes $i shake_maxangle $component)} 0.25}}}}}}}}
+   {foreach $component (x y) {$bcs set (keyframes $i shake_maxangle $component) {'*' {$bcs get (keyframes $i shake_maxangle $component)} 0.25}}}}}}}
 )
diff --git a/lrb/platform/ps3/USRDIR/config.dta b/lrb/platform/ps3/USRDIR/config.dta
@@ -9,9 +9,9 @@
 (sync_diff_speeds
    (sync_diff_speeds 0)
 )
-; Venue FPS (Default: 24, can go up to 60)
+; Venue FPS (Vanilla: 24, can go up to 60)
 (venue_fps
-   (venue_fps 24)
+   (venue_fps 30)
 )
 ; Vsync (0: Uncapped FPS, 1: 60FPS, only set to 0 on RPCS3!)
 (vsync

diff --git a/lrb/platform/xbox/config.dta b/lrb/platform/xbox/config.dta
@@ -9,9 +9,9 @@
 (sync_diff_speeds
    (sync_diff_speeds 0)
 )
-; Venue FPS (Default: 24, can go up to 60)
+; Venue FPS (Vanilla: 24, can go up to 60)
 (venue_fps
-   (venue_fps 24)
+   (venue_fps 30)
 )
 ; Instrument slot mapping (Options: kControllerVocals, kControllerGuitar, kControllerDrum)
 (pad_slot

diff --git a/rb1/_ark/dx/dx_init.dta b/rb1/_ark/dx/dx_init.dta
@@ -3,7 +3,7 @@
 {set $dx_guitar_slot kControllerGuitar}
 {set $dx_drum_slot kControllerDrum}
 
-{set $emulatefps 24}
+{set $emulatefps 30}
 
 {set $dx_vsync TRUE}
 

diff --git a/rb1/_ark/dx/dx_macros.dta b/rb1/_ark/dx/dx_macros.dta
@@ -60,9 +60,9 @@
 
 #define DX_FPS_SETUP
 (
-   {if {!= $emulatefps 24} {{$world iterate PostProc $p {$p set emulate_fps $emulatefps}}}
+   {{$world iterate PostProc $p {unless {== $p "photocopy.pp"} {$p set emulate_fps $emulatefps}}}}
    {if {>= {$emulatefps 25} {$char iterate CharHair $hair {$hair reset 35}}
    {$world iterate WorldDir $wd {$wd iterate BandCamShot $bcs
    {foreach $property (shake_noisefreq shake_noiseamp) {$bcs set (keyframes $i $property) {'*' {$bcs get (keyframes $i $property)} 0.25}}}
-   {foreach $component (x y) {$bcs set (keyframes $i shake_maxangle $component) {'*' {$bcs get (keyframes $i shake_maxangle $component)} 0.25}}}}}}}}
+   {foreach $component (x y) {$bcs set (keyframes $i shake_maxangle $component) {'*' {$bcs get (keyframes $i shake_maxangle $component)} 0.25}}}}}}}
 )
diff --git a/rb1/platform/ps3/USRDIR/config.dta b/rb1/platform/ps3/USRDIR/config.dta
@@ -9,9 +9,9 @@
 (sync_diff_speeds
    (sync_diff_speeds 0)
 )
-; Venue FPS - Default: 24, can go up to 60
+; Venue FPS - Vanilla: 24, can go up to 60
 (venue_fps
-   (venue_fps 24)
+   (venue_fps 30)
 )
 ; Black Background - Completely black background in-game
 (black_background

diff --git a/rb1/platform/xbox/config.dta b/rb1/platform/xbox/config.dta
@@ -9,9 +9,9 @@
 (sync_diff_speeds
    (sync_diff_speeds 0)
 )
-; Venue FPS - Default: 24, can go up to 60
+; Venue FPS - Vanilla: 24, can go up to 60
 (venue_fps
-   (venue_fps 24)
+   (venue_fps 30)
 )
 ; Black Background - Completely black background in-game
 (black_background