fnfestival multirings

hmxmilohax · Jan 24, 2024 · 09dae6b · 09dae6b
1 parent 8afb9fc
commit 09dae6b
Show file tree

Hide file tree

Showing 42 changed files with 4 additions and 2 deletions.
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_cap_fc_fnfestival_beta.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_cap_glass_vox_fnfestival_beta.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_fnfestival_beta.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_glow_fnfestival_beta.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival.png_xbox
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_ps2 b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_ps2
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_ps3 b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_ps3
diff --git a/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_xbox b/_ark/track/multiplier_ring/gen/multiplier_meter_solid_fnfestival_beta.png_xbox
diff --git a/_ark/track/multiplier_ring/multiplier_ring.dta b/_ark/track/multiplier_ring/multiplier_ring.dta
@@ -3,5 +3,7 @@
 "rb1"
 "rb3"
 "rb4"
+"fnfestival"
+"fnfestival_beta"
 "lrb"
 "tbrb"
diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta
@@ -111,7 +111,7 @@
      {handle
          ($this on_extend)}
 	  {if {modifier_mgr is_modifier_active mod_blackvenue}
-         {if {! $already_restarted} ;cheap attempt to fix the "notes too quick bug" by restarting once automatically on initial song start, this should work all the time
+         {if {&& {! {gamemode get is_online}} {! $already_restarted}} ;cheap attempt to fix the "notes too quick bug" by restarting once automatically on initial song start, this should work all the time
             {do
                {set $already_restarted TRUE}
                {game_restart}
@@ -133,7 +133,7 @@
       {set $bass_groove_active FALSE} {set $drum_groove_active FALSE} {set $guitar_groove_active FALSE} {set $track_0_groove_active FALSE} {set $track_1_groove_active FALSE}
       {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} {set $track_0_firstnote FALSE} {set $track_1_firstnote FALSE}
 	  {if {modifier_mgr is_modifier_active mod_blackvenue}
-         {if {! $already_restarted} ;cheap attempt to fix the "notes too quick bug" by restarting once automatically on initial song start, this should work all the time
+         {if {&& {! {gamemode get is_online}} {! $already_restarted}} ;cheap attempt to fix the "notes too quick bug" by restarting once automatically on initial song start, this should work all the time
             {do
                {set $already_restarted TRUE}
                {game_restart}

diff --git a/custom_textures/multiplier_ring/multiplier_cap_fc_fnfestival.png b/custom_textures/multiplier_ring/multiplier_cap_fc_fnfestival.png
diff --git a/custom_textures/multiplier_ring/multiplier_cap_fc_fnfestival_beta.png b/custom_textures/multiplier_ring/multiplier_cap_fc_fnfestival_beta.png
diff --git a/custom_textures/multiplier_ring/multiplier_cap_glass_vox_fnfestival.png b/custom_textures/multiplier_ring/multiplier_cap_glass_vox_fnfestival.png
diff --git a/custom_textures/multiplier_ring/multiplier_cap_glass_vox_fnfestival_beta.png b/custom_textures/multiplier_ring/multiplier_cap_glass_vox_fnfestival_beta.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_fnfestival.png b/custom_textures/multiplier_ring/multiplier_meter_fnfestival.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_fnfestival_beta.png b/custom_textures/multiplier_ring/multiplier_meter_fnfestival_beta.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_glow_fnfestival.png b/custom_textures/multiplier_ring/multiplier_meter_glow_fnfestival.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_glow_fnfestival_beta.png b/custom_textures/multiplier_ring/multiplier_meter_glow_fnfestival_beta.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_solid_fnfestival.png b/custom_textures/multiplier_ring/multiplier_meter_solid_fnfestival.png
diff --git a/custom_textures/multiplier_ring/multiplier_meter_solid_fnfestival_beta.png b/custom_textures/multiplier_ring/multiplier_meter_solid_fnfestival_beta.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,7 @@ @@
     "rb1"
     "rb3"
     "rb4"
+    "fnfestival"
+    "fnfestival_beta"
     "lrb"
     "tbrb"