no crowd meter

hmxmilohax · Jan 18, 2024 · 5c2cb6a · 5c2cb6a
1 parent de70482
commit 5c2cb6a
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 21 deletions.
diff --git a/_ark/ps4/config/rb_venues.dta b/_ark/ps4/config/rb_venues.dta
@@ -1,18 +1,18 @@
 (venues 
-   (big_club_toys {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_toys/big_club_toys.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_standard {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_standard/big_club_standard.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_industrial {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_industrial/big_club_industrial.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_gym {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_gym/big_club_gym.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_arcade {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_arcade_terry {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade/big_club_arcade.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_boat {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_boat/big_club_boat.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_desert {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_desert/big_club_desert.scene} kLargeClub kRBEntitlementInvalid) 
-   (small_club_vwhall {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_vwhall/small_club_vwhall.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_basement {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_basement/small_club_basement.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_industrial {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_industrial/small_club_industrial.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_roadhouse {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_roadhouse/small_club_roadhouse.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_trashed {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_trashed/small_club_trashed.scene} kSmallClub kRBEntitlementInvalid) 
-   (arena {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/arena/arena_standard/arena_standard.scene} kArena kRBEntitlementInvalid))
+   (big_club_toys {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_toys/big_club_toys.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_standard {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_standard/big_club_standard.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_industrial {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_industrial/big_club_industrial.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_gym {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_gym/big_club_gym.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_arcade {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_arcade_terry {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade/big_club_arcade.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_boat {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_boat/big_club_boat.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_desert {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_desert/big_club_desert.scene} kLargeClub kRBEntitlementInvalid) 
+   (small_club_vwhall {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_vwhall/small_club_vwhall.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_basement {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_basement/small_club_basement.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_industrial {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_industrial/small_club_industrial.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_roadhouse {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_roadhouse/small_club_roadhouse.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_trashed {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_trashed/small_club_trashed.scene} kSmallClub kRBEntitlementInvalid) 
+   (arena {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/arena/arena_standard/arena_standard.scene} kArena kRBEntitlementInvalid))
 (locked_venues)
 (default_venue big_club_standard)
-(practice_venue_scene {if_else {file_exists "data:/GoldHEN/blackbg.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
+(practice_venue_scene {if_else {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
diff --git a/_ark/ps4/dx/overshell/dx_states.dta b/_ark/ps4/dx/overshell/dx_states.dta
@@ -1,8 +1,20 @@
+#define RB4DXMAIN_DATA
+(
+   {$this setup_confirm_actions a 
+      (
+         "Instrument Options"
+         {if_else $blackbg "Black Venue: ON" "Black Venue: OFF"}
+         {if_else $crowdmeter "Crowd Meter: OFF" "Crowd Meter: ON"}
+         "song speed"
+      )
+   }
+)
 (kState_RB4DXMain
    (view list_medium) 
    (enter
       #include ../ui/dx_init.dta
-      {$this setup_confirm_actions a ("Instrument Options" {if_else $blackbg "Black Venue: ON" "Black Venue: OFF"} "song speed")}) 
+      RB4DXMAIN_DATA
+      ) 
    (SELECT_MSG 
       {local $list_data 
          {
@@ -15,18 +27,38 @@
             {set $dx_write_test {array ()}}
             {push_back $dx_write_test {sprint $this}}
             {write_file "data:/GoldHEN/AFR/CUSA02084/ps4/dx/overshell/this.dta" $dx_write_test}
-            )
+         )
          (("Black Venue: ON" "Black Venue: OFF")
             {set $blackbg {! $blackbg}}
             {if_else $blackbg
                {do
                   {set $dx_write_blackbg {array ()}}
-                  {write_file "data:/GoldHEN/blackbg.dta" $dx_write_blackbg}
+                  {write_file "data:/GoldHEN/RB4DX/blackbg.dta" $dx_write_blackbg}
                }
-               {file_delete "data:/GoldHEN/blackbg.dta"}
+               {file_delete "data:/GoldHEN/RB4DX/blackbg.dta"}
             }
             {$this show_state kState_RB4DXDelayedEffectWarn}
-            )
+            {$this trigger_select_effects }
+         )
+         (("Crowd Meter: OFF" "Crowd Meter: ON")
+            {set $crowdmeter {! $crowdmeter}}
+            {if_else $crowdmeter
+               {do
+                  {set $dx_write_blackbg {array ()}}
+                  {write_file "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4" $dx_write_blackbg}
+                  {write_file "data:/GoldHEN/RB4DX/ps4/ui/game/join_band.entity_ps4" $dx_write_blackbg}
+               }
+               {do
+                  {file_delete "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4"}
+                  {file_delete "data:/GoldHEN/RB4DX/ps4/ui/game/join_band.entity_ps4"}
+               }
+            }
+            {if_else {$this in_song}
+               {$this show_state kState_RB4DXInGameWarn}
+               RB4DXMAIN_DATA
+            }
+            {$this trigger_select_effects }
+         )
          ("song speed"
             {$this show_state kState_RB4DXSongSpeed}
             {$this trigger_select_effects })
@@ -60,6 +92,20 @@
       {$this trigger_cancel_effects }
    )
 )
+(kState_RB4DXInGameWarn
+   (view confirm_action)
+   (enter 
+      {$this setup_confirm_actions "This option will take effect when you go back to music library." ("Ok")}
+   )
+   (SELECT_MSG
+      {$this show_state kState_RB4DXMain}
+      {$this trigger_select_effects }
+   )
+   (on_cancel 
+      {$this show_state kState_RB4DXMain}
+      {$this trigger_cancel_effects }
+   )
+)
 (kState_RB4DXSongSpeed
    (view confirm_action) 
    (enter 

diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -1,5 +1,6 @@
 {unless $dx_initialized
 	{set $speedmod 100}
 	{set $dx_initialized TRUE}
-	{set $blackbg {file_exists "data:/GoldHEN/blackbg.dta"}}
+	{set $blackbg {file_exists "data:/GoldHEN/RB4DX/blackbg.dta"}}
+	{set $crowdmeter {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4"}}
 }
diff --git a/_ark/ps4/ui/game/game.txt b/_ark/ps4/ui/game/game.txt