Skip to content

Commit

Permalink
Venue Selector
Browse files Browse the repository at this point in the history
  • Loading branch information
@LlysiX
LlysiX committed Oct 14, 2024
1 parent 376bd52 commit 12f0624
Show file tree
Hide file tree
Showing 4 changed files with 282 additions and 24 deletions.
179 changes: 164 additions & 15 deletions _ark/ps4/config/rb_venues.dta
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,167 @@
#define VENUE_SELECT
(
{cond
({file_exists "settings/venue/none.dta"}
ui/shared/fake_bg.scene
)
({file_exists "settings/venue/big_club_toys.dta"}
venue/big_club/big_club_toys/big_club_toys.scene
)
({file_exists "settings/venue/big_club_standard.dta"}
venue/big_club/big_club_standard/big_club_standard.scene
)
({file_exists "settings/venue/big_club_industrial.dta"}
venue/big_club/big_club_industrial/big_club_industrial.scene
)
({file_exists "settings/venue/big_club_gym.dta"}
venue/big_club/big_club_gym/big_club_gym.scene
)
({file_exists "settings/venue/big_club_arcade.dta"}
venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene
)
({file_exists "settings/venue/big_club_arcade_empty.dta"}
venue/big_club/big_club_arcade/big_club_arcade.scene
)
({file_exists "settings/venue/big_club_boat.dta"}
venue/big_club/big_club_boat/big_club_boat.scene
)
({file_exists "settings/venue/big_club_desert.dta"}
venue/big_club/big_club_desert/big_club_desert.scene
)
({file_exists "settings/venue/small_club_vwhall.dta"}
venue/small_club/small_club_vwhall/small_club_vwhall.scene
)
({file_exists "settings/venue/small_club_basement.dta"}
venue/small_club/small_club_basement/small_club_basement.scene
)
({file_exists "settings/venue/small_club_industrial.dta"}
venue/small_club/small_club_industrial/small_club_industrial.scene
)
({file_exists "settings/venue/small_club_roadhouse.dta"}
venue/small_club/small_club_roadhouse/small_club_roadhouse.scene
)
({file_exists "settings/venue/small_club_trashed.dta"}
venue/small_club/small_club_trashed/small_club_trashed.scene
)
({file_exists "settings/venue/arena.dta"}
venue/arena/arena_standard/arena_standard.scene
)
}
)
(venues
(big_club_toys {if_else {file_exists "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/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 "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_trashed/small_club_trashed.scene} kSmallClub kRBEntitlementInvalid)
(arena {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/arena/arena_standard/arena_standard.scene} kArena kRBEntitlementInvalid))
(big_club_toys
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_toys/big_club_toys.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_standard
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_standard/big_club_standard.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_industrial
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_industrial/big_club_industrial.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_gym
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_gym/big_club_gym.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_arcade
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_arcade_terry
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_arcade/big_club_arcade.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_boat
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_boat/big_club_boat.scene
}
kLargeClub
kRBEntitlementInvalid
)
(big_club_desert
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/big_club/big_club_desert/big_club_desert.scene
}
kLargeClub
kRBEntitlementInvalid
)
(small_club_vwhall
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/small_club/small_club_vwhall/small_club_vwhall.scene
}
kSmallClub
kRBEntitlementInvalid
)
(small_club_basement
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/small_club/small_club_basement/small_club_basement.scene
}
kSmallClub
kRBEntitlementInvalid
)
(small_club_industrial
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/small_club/small_club_industrial/small_club_industrial.scene
}
kSmallClub
kRBEntitlementInvalid
)
(small_club_roadhouse
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/small_club/small_club_roadhouse/small_club_roadhouse.scene
}
kSmallClub
kRBEntitlementInvalid
)
(small_club_trashed
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/small_club/small_club_trashed/small_club_trashed.scene
}
kSmallClub
kRBEntitlementInvalid
)
(arena
{if_else {file_exists "settings/venue/enabled.dta"}
VENUE_SELECT
venue/arena/arena_standard/arena_standard.scene
}
kArena
kRBEntitlementInvalid
)
)
(locked_venues)
(default_venue big_club_standard)
(practice_venue_scene {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
(practice_venue_scene {if_else {file_exists "settings/venue/none.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
20 changes: 20 additions & 0 deletions _ark/ps4/dx/macros/dx_macros.dta
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include dx_overshell_macros.dta
#include dx_controller_macros.dta

#define SET_TRACK_SPEEDS
(
{set_elem {find $syscfg track_graphics view_times drum easy} 1 {* {if_else $syncspeeds 1.2 2.4} {/ $speedmod 100}}}
Expand All @@ -16,4 +17,23 @@
{set_elem {find $syscfg track_graphics view_times guitar medium} 1 {* {if_else $syncspeeds 1.2 2.0} {/ $speedmod 100}}}
{set_elem {find $syscfg track_graphics view_times guitar hard} 1 {* {if_else $syncspeeds 1.2 1.6} {/ $speedmod 100}}}
{set_elem {find $syscfg track_graphics view_times guitar expert} 1 {* 1.2 {/ $speedmod 100}}}
)

#define DELETE_INVALID_VENUE_DTAS
(
{dx_file_delete "settings/venue/none.dta"}
{dx_file_delete "settings/venue/big_club_toys.dta"}
{dx_file_delete "settings/venue/big_club_standard.dta"}
{dx_file_delete "settings/venue/big_club_industrial.dta"}
{dx_file_delete "settings/venue/big_club_gym.dta"}
{dx_file_delete "settings/venue/big_club_arcade.dta"}
{dx_file_delete "settings/venue/big_club_arcade_empty.dta"}
{dx_file_delete "settings/venue/big_club_boat.dta"}
{dx_file_delete "settings/venue/big_club_desert.dta"}
{dx_file_delete "settings/venue/small_club_vwhall.dta"}
{dx_file_delete "settings/venue/small_club_basement.dta"}
{dx_file_delete "settings/venue/small_club_industrial.dta"}
{dx_file_delete "settings/venue/small_club_roadhouse.dta"}
{dx_file_delete "settings/venue/small_club_trashed.dta"}
{dx_file_delete "settings/venue/arena.dta"}
)
98 changes: 89 additions & 9 deletions _ark/ps4/dx/overshell/dx_states.dta
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include dx_state_overrides.dta

; max number of entries in a state = 7
; max number of entries in a state = 7 (only when in game!)

#define RB4DXMAIN_DATA
(
Expand Down Expand Up @@ -344,7 +344,7 @@
(
{$this setup_confirm_actions a
(
{if_else $blackbg "Black Venue: ON" "Black Venue: OFF"}
"Select Venue"
{if_else $60fpsbg "60 FPS Venues: ON" "60 FPS Venues: OFF"}
{if_else $crowdmeter "Crowd Meter: OFF" "Crowd Meter: ON"}
{if_else $noui "HUD: OFF" "HUD: ON"}
Expand All @@ -366,13 +366,8 @@
(SELECT_MSG
{local $list_data {($objId UIListCom) get_data_in_column token}}
{switch $list_data
(("Black Venue: ON" "Black Venue: OFF")
{set $blackbg {! $blackbg}}
{if_else $blackbg
{dx_write_null_file "settings/visuals/blackbg.dta"}
{dx_file_delete "settings/visuals/blackbg.dta"}
}
{$this show_state kState_RB4DXDelayedEffectWarn}
("Select Venue"
{$this show_state kState_RB4DXVenueSelector}
{$this trigger_select_effects}
)
(("60 FPS Venues: ON" "60 FPS Venues: OFF")
Expand Down Expand Up @@ -597,6 +592,91 @@
)
)

;Venue Selector
(kState_RB4DXVenueSelector
(view {$this get_auto_list_view})
(enter
{$this setup_confirm_actions a
(
"[Random]"
"[None]"
"The Big Cassettes"
"The Club"
"The Industrial Club"
big_club_gym
big_club_arcade
"The Arcade (1 Audience Member)"
big_club_boat
big_club_desert
small_club_vwhall
small_club_basement
"The Barn"
"The Roadhouse"
"The Basement (Trashed)"
"The Arena"
)
}
)
(SELECT_MSG
{local $list_data {($objId UIListCom) get_data_in_column token}}
DELETE_INVALID_VENUE_DTAS
{dx_write_null_file "settings/venue/enabled.dta"}
{if_else
{||
{== $list_data "[None]"}
{== $list_data "The Big Cassettes"}
{== $list_data "The Club"}
{== $list_data "The Industrial Club"}
{== $list_data "The Arcade (1 Audience Member)"}
{== $list_data "The Barn"}
{== $list_data "The Roadhouse"}
{== $list_data "The Basement (Trashed)"}
{== $list_data "The Arena"}
{== $list_data "[Random]"}
}
{switch $list_data
("[None]"
{dx_write_null_file "settings/venue/none.dta"}
)
("The Big Cassettes"
{dx_write_null_file "settings/venue/big_club_toys.dta"}
)
("The Club"
{dx_write_null_file "settings/venue/big_club_standard.dta"}
)
("The Industrial Club"
{dx_write_null_file "settings/venue/big_club_industrial.dta"}
)
("The Arcade (1 Audience Member)"
{dx_write_null_file "settings/venue/big_club_arcade_empty.dta"}
)
("The Barn"
{dx_write_null_file "settings/venue/small_club_industrial.dta"}
)
("The Roadhouse"
{dx_write_null_file "settings/venue/small_club_roadhouse.dta"}
)
("The Basement (Trashed)"
{dx_write_null_file "settings/venue/small_club_trashed.dta"}
)
("The Arena"
{dx_write_null_file "settings/venue/arena.dta"}
)
("[Random]"
{dx_file_delete "settings/venue/enabled.dta"}
)
}
{dx_write_null_file {sprint "settings/venue/" $list_data ".dta"}}
}
{$this show_state kState_RB4DXDelayedEffectWarn}
{$this trigger_select_effects}
)
(on_cancel
{$this show_state kState_RB4DXVisSettings}
{$this trigger_cancel_effects}
)
)

;Song Title Type Selector
(kState_RB4DXSongTitleSelector
(view confirm_action)
Expand Down
9 changes: 9 additions & 0 deletions _ark/ps4/dx/ui/init_dev.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(
{dx_file_mkdir "settings"}
{dx_file_mkdir "settings/visuals"}
{dx_file_mkdir "settings/venue"}
{dx_file_mkdir "settings/gameplay"}
{dx_file_mkdir "settings/sfx"}
{dx_file_mkdir "settings/controller"}
Expand Down Expand Up @@ -29,6 +30,11 @@
{dx_file_delete "blackbg.dta"}
{dx_write_null_file "settings/visuals/blackbg.dta"}
}
{if {file_exists "settings/visuals/blackbg.dta"}
{dx_file_delete "settings/visuals/blackbg.dta"}
{dx_write_null_file "settings/venue/enabled.dta"}
{dx_write_null_file "settings/venue/none.dta"}
}
{if {file_exists "60fpsbg.dta"}
{dx_file_delete "60fpsbg.dta"}
{dx_write_null_file "settings/visuals/60fpsbg.dta"}
Expand Down Expand Up @@ -196,6 +202,9 @@ UPDATE_SETTINGS
}

;clear invalid files
{if {! {file_exists "settings/venue/enabled.dta"}}
DELETE_INVALID_VENUE_DTAS
}
{if {dx_file_exists "ps4/config/include/beatmatcher.dta_dta_ps4"}
{dx_file_delete "ps4/config/include/beatmatcher.dta_dta_ps4"}
}
Expand Down

0 comments on commit 12f0624

Please sign in to comment.