From fe709b059e9a222c0a43070cdc1ecb3ded791b95 Mon Sep 17 00:00:00 2001 From: LysiX Date: Tue, 5 Dec 2023 15:46:05 -0800 Subject: [PATCH] per-instrument hw/streak, warning on rails b/d fix also includes minor adjustments to os flow, 3p rb3 track angle, ps2 nocrowd fix and menu scroll speed --- _ark/dx/track/dx_track_callback.dta | 32 +++++-- _ark/dx/track/dx_track_macros.dta | 107 ++++++++++++++++----- _ark/dx/ui/dx_init.dta | 20 +++- _ark/dx/ui/dx_overshell_macros.dta | 56 +++++++---- _ark/track/player_intro.dta | 56 +++++++---- _ark/ui/eng/locale_updates.dta | 8 +- _ark/ui/overshell_textures.dta | 140 ++++++++++++++++++++++----- _ark/ui/overshell_track.dta | 144 ++++++++++++++++++++++++---- _ark_ps2/config/band.dta | 4 +- _ark_ps2/config/modes.dta | 4 +- 10 files changed, 446 insertions(+), 125 deletions(-) diff --git a/_ark/dx/track/dx_track_callback.dta b/_ark/dx/track/dx_track_callback.dta index b6eed3f0..d1f78115 100644 --- a/_ark/dx/track/dx_track_callback.dta +++ b/_ark/dx/track/dx_track_callback.dta @@ -36,7 +36,7 @@ {if {> {'+' [num_gems_miss] [num_gems_pass]} 0} {{{get_bass_panel} find streak_meter} star_deploy_stop} {bass stop_deploy}} - {if_else {== $highway "_1_none"} + {if_else {== $highwaybass "_1_none"} {do {$this do_streak} {$this do_warning} @@ -69,12 +69,15 @@ {{{get_bass_panel} find indv_player_warning.trig} trigger} {{{get_bass_panel} find warning_track_emissive.anim} stop_animation} {{{get_bass_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find background.tex}} ) (do_customhw_warn_on {if {= {{{{get_track_panel} find crowd_meter} find bass.tnm} frame} 0.32} {unless $nohwwarn {{{get_bass_panel} find warning_track_emissive.anim} animate} + {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find background.tex}} } + {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find background.tex}} } ) (do_customhw_streak @@ -106,7 +109,7 @@ ) (do_rail_warning {if $railwarn - {if_else {> {{{{get_bass_panel} find crowd_meter} find bass.tnm} frame} 0.34} + {if_else {> {{{{get_track_panel} find crowd_meter} find bass.tnm} frame} 0.34} {{{get_bass_panel} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} {{{get_bass_panel} find rails.mat} set diffuse_tex {{get_track_panel} find smasher_plate_orange_nomip.tex}} } @@ -116,7 +119,7 @@ {if {> [num_gems_combo] 38} {if $hwstrk {$this do_customhw_warn_off} - {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {$this do_customhw_streak} } } ) @@ -174,7 +177,7 @@ {if {> {'+' [num_gems_miss] [num_gems_pass]} 0} {{{get_guitar_panel} find streak_meter} star_deploy_stop} {guitar stop_deploy}} - {if_else {== $highway "_1_none"} + {if_else {== $highwaygtr "_1_none"} {do {$this do_streak} {$this do_warning} @@ -217,7 +220,10 @@ ) (do_customhw_streak {if $hwstrk - {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {if_else {== $streakgtr none} + {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find pitch_arrow_effect_old.tex}} + } } ) (do_warning @@ -254,7 +260,7 @@ {if {> [num_gems_combo] 28} {if $hwstrk {$this do_customhw_warn_off} - {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {$this do_customhw_streak} } } ) @@ -312,7 +318,7 @@ {if {> {'+' [num_gems_miss] [num_gems_pass]} 0} {{{get_drum_panel} find streak_meter} star_deploy_stop} {drum stop_deploy}} - {if_else {== $highway "_1_none"} + {if_else {== $highwaydrum "_1_none"} {do {$this do_streak} {$this do_warning} @@ -345,17 +351,23 @@ {{{get_drum_panel} find indv_player_warning.trig} trigger} {{{get_drum_panel} find warning_track_emissive.anim} stop_animation} {{{get_drum_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find black.tex}} ) (do_customhw_warn_on {if {= {{{{get_track_panel} find crowd_meter} find drum.tnm} frame} 0.32} {unless $nohwwarn {{{get_drum_panel} find warning_track_emissive.anim} animate} + {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find black.tex}} } + {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find black.tex}} } ) (do_customhw_streak {if $hwstrk - {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {if_else {== $streakdrum none} + {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find smasher_plate_orange_emiss_nomip.tex}} + } } ) (do_warning @@ -382,7 +394,7 @@ ) (do_rail_warning {if $railwarn - {if_else {> {{{{get_drum_panel} find crowd_meter} find drum.tnm} frame} 0.34} + {if_else {> {{{{get_track_panel} find crowd_meter} find drum.tnm} frame} 0.34} {{{get_drum_panel} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} {{{get_drum_panel} find rails.mat} set diffuse_tex {{get_track_panel} find smasher_plate_orange_nomip.tex}} } @@ -392,7 +404,7 @@ {if {> [num_gems_combo] 28} {if $hwstrk {$this do_customhw_warn_off} - {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {$this do_customhw_streak} } } ) diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta index 4c330079..0ceeae91 100644 --- a/_ark/dx/track/dx_track_macros.dta +++ b/_ark/dx/track/dx_track_macros.dta @@ -7,7 +7,11 @@ {if {== $lanestex rb2} {set $lanestex "none"}} - {if {== $streak rb2} {set $streak "none"}} + {if {== $streakgtr rb2} {set $streakgtr "none"}} + + {if {== $streakbass rb2} {set $streakbass "none"}} + + {if {== $streakdrum rb2} {set $streakdrum "none"}} {if {== $spotlightgtr rb2_guitar} {set $spotlightgtr "none"}} @@ -52,31 +56,50 @@ } {unless $dontrungemdividers - {if_else $nogemdividers - {beatmatch foreach_active_player $player - {switch {$player instrument} - (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}}) - (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}}) - (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})}} - {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player - {switch {$player instrument} - (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}) - (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}) - (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})}} - }} + {if_else $nogemdividers + {beatmatch foreach_active_player $player + {switch {$player instrument} + (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}}) + (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}}) + (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}}) + } + } + {beatmatch foreach_active_player $player + {switch {$player instrument} + (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}) + (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}) + (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}) + } + } + } + } {if $hwalpha_needs_reset {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}} + {{$this find background.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}} ; for some reason these affect the transparency of the hw + {{$this find black.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}} ; } #ifndef HX_EE - {if $highwaycustomtexture - {{$this find track_reflect_warning.tex} set_bitmap {sprint "track_new/highways/" $highway ".png"}} - {set $hwset TRUE} - } + {unless $dontrungemdividers + {if $highwaycustomtexture + {{$this find track_reflect_warning.tex} set_bitmap {sprint "track_new/highways/" $highwaygtr ".png"}} + {{$this find background.tex} set_bitmap {sprint "track_new/highways/" $highwaybass ".png"}} + {{$this find black.tex} set_bitmap {sprint "track_new/highways/" $highwaydrum ".png"}} + {beatmatch foreach_active_player $player + {switch {$player instrument} + (bass {{{get_bass_panel} find surface.mat} set emissive_map {$this find background.tex}}) + (drum {{{get_drum_panel} find surface.mat} set emissive_map {$this find black.tex}}) + } + } + {set $hwset TRUE} + } - {if $hwset - {{$this find track_reflect_warning.tex} iterate_refs $ref {$ref set intensify {!= $highway "_1_none"}}} + {if $hwset + {{$this find track_reflect_warning.tex} iterate_refs $ref {$ref set intensify {!= $highwaygtr "_1_none"}}} + ; {{$this find background.tex} iterate_refs $ref {$ref set intensify {!= $highwaybass "_1_none"}}} ; idk why these texes work differently + ; {{$this find black.tex} iterate_refs $ref {$ref set intensify {!= $highwaydrum "_1_none"}}} ; + } } #endif @@ -207,7 +230,37 @@ } {if $streakcustomtexture - {{$this find bass_superstreak_pattern.tex} set_bitmap {sprint "track_new/streak/" $streak ".png"}} + {unless {== $streakbass none} + {{$this find bass_superstreak_pattern.tex} set_bitmap {sprint "track_new/streak/" $streakbass ".png"}} + } + #ifndef HX_EE ; streak is currently unavailable for g/d on ps2 + {unless $dontrungemdividers + {if_else {&& {!= $streakbass none} {== $streakgtr none}} + {do + {set $streakgtr "rb2"} + {{$this find pitch_arrow_effect_old.tex} set_bitmap {sprint "track_new/streak/" $streakgtr ".png"}} + } + {unless {== $streakgtr none} + {{$this find pitch_arrow_effect_old.tex} set_bitmap {sprint "track_new/streak/" $streakgtr ".png"}} + } + } + {if_else {&& {!= $streakbass none} {== $streakdrum none}} + {do + {set $streakdrum "rb2"} + {{$this find smasher_plate_orange_emiss_nomip.tex} set_bitmap {sprint "track_new/streak/" $streakdrum ".png"}} + } + {unless {== $streakdrum none} + {{$this find smasher_plate_orange_emiss_nomip.tex} set_bitmap {sprint "track_new/streak/" $streakdrum ".png"}} + } + } + {beatmatch foreach_active_player $player + {switch {$player instrument} + (guitar {unless {== $streakgtr none} {{{get_guitar_panel} find bass_superstreak.mat} set diffuse_tex {$this find pitch_arrow_effect_old.tex}}}) + (drum {unless {== $streakdrum none} {{{get_drum_panel} find bass_superstreak.mat} set diffuse_tex {$this find smasher_plate_orange_emiss_nomip.tex}}}) + } + } + } + #endif } {if $railscustomtexture @@ -286,7 +339,7 @@ ;after all of the queued texture updates are completed, set them to false so they do not run again until a new texture is queued via overshell #ifndef HX_EE ; ps2 resets textures once the track is unloaded, so dont do this there {set $voxhwcustomtexture FALSE} -{set $hwalpha_needs_reset FALSE} +;{set $hwalpha_needs_reset FALSE} {set $highwaycustomtexture FALSE} {set $brecustomtexture FALSE} {set $gemcustomtexture FALSE} @@ -318,9 +371,17 @@ {unless {== $lanestex none} set $lanescustomtexture TRUE} -{unless {== $highway _1_none} {set $highwaycustomtexture TRUE}} +{unless {== $highwaygtr _1_none} {set $highwaycustomtexture TRUE}} + +{unless {== $highwaybass _1_none} {set $highwaycustomtexture TRUE}} + +{unless {== $highwaydrum _1_none} {set $highwaycustomtexture TRUE}} + +{unless {== $streakgtr none} {set $streakcustomtexture TRUE}} + +{unless {== $streakbass none} {set $streakcustomtexture TRUE}} -{unless {== $streak none} {set $streakcustomtexture TRUE}} +{unless {== $streakdrum none} {set $streakcustomtexture TRUE}} {unless {== $spotlightgtr none} {set $spotlightgtrcustomtexture TRUE}} diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta index 909660ec..e810be0b 100644 --- a/_ark/dx/ui/dx_init.dta +++ b/_ark/dx/ui/dx_init.dta @@ -29,11 +29,23 @@ ;no gem dividers {set $nogemdividers FALSE} -;highway texture -{set $highway "_1_none"} +;highway texture (guitar) +{set $highwaygtr "_1_none"} -;streak texture -{set $streak "rb4"} +;highway texture (bass) +{set $highwaybass "_1_none"} + +;highway texture (drums) +{set $highwaydrum "_1_none"} + +;streak texture (guitar) +{set $streakgtr "rb4"} + +;streak texture (bass) +{set $streakbass "rb4"} + +;streak texture (drums) +{set $streakdrum "rb4"} ;overdrive texture (guitar) {set $spotlightgtr "rb4"} diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta index 779c815a..b880aaa3 100644 --- a/_ark/dx/ui/dx_overshell_macros.dta +++ b/_ark/dx/ui/dx_overshell_macros.dta @@ -26,9 +26,13 @@ {set $multiringcustomtexture FALSE} {set $multiring FALSE} {set $streakcustomtexture FALSE} - {set $streak FALSE} + {set $streakgtr "none"} + {set $streakbass "none"} + {set $streakdrum "none"} {set $highwaycustomtexture FALSE} - {set $highway _1_none} + {set $highwaygtr _1_none} + {set $highwaybass _1_none} + {set $highwaydrum _1_none} {set $spotlightgtrcustomtexture FALSE} {set $spotlightgtr FALSE} {set $spotlightbasscustomtexture FALSE} @@ -80,7 +84,9 @@ {set $multiringcustomtexture TRUE} {set $multiring rb2dx} {set $streakcustomtexture TRUE} - {set $streak rb4} + {set $streakgtr rb4} + {set $streakbass rb4} + {set $streakdrum rb4} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr rb4} {set $spotlightbasscustomtexture TRUE} @@ -146,10 +152,17 @@ {if_else $texrunonce {do {set $streakcustomtexture TRUE} - {set $streak rb2}} + {set $streakgtr rb2} + {set $streakbass rb2} + {set $streakdrum rb2} + } {do {set $streakcustomtexture FALSE} - {set $streak FALSE}}} + {set $streakgtr "none"} + {set $streakbass "none"} + {set $streakdrum "none"} + } + } {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr rb1_guitar} {set $spotlightbasscustomtexture TRUE} @@ -188,7 +201,9 @@ {set $railscustomtexture TRUE} {set $rails rb2} {set $streakcustomtexture TRUE} - {set $streak rb2} + {set $streakgtr rb2} + {set $streakbass rb2} + {set $streakdrum rb2} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr rb2_guitar} {set $spotlightbasscustomtexture TRUE} @@ -224,14 +239,15 @@ {set $multiringcustomtexture TRUE} {set $multiring rb3} {set $streakcustomtexture TRUE} - {set $streak rb3_guitar} + {set $streakgtr rb3_guitar} + {set $streakbass rb3_guitar} + {set $streakdrum rb3_guitar} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr rb3_guitar} {set $spotlightbasscustomtexture TRUE} {set $spotlightbass rb3_bass} {set $spotlightdrumcustomtexture TRUE} {set $spotlightdrum rb3_drums} - SET_RB3_TRACK_ANGLE ) #define SET_RB4_TEXTURE_PRESET @@ -266,14 +282,15 @@ {set $multiringcustomtexture TRUE} {set $multiring rb4} {set $streakcustomtexture TRUE} - {set $streak rb4} + {set $streakgtr rb4} + {set $streakbass rb4} + {set $streakdrum rb4} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr rb4} {set $spotlightbasscustomtexture TRUE} {set $spotlightbass rb4} {set $spotlightdrumcustomtexture TRUE} {set $spotlightdrum rb4} - SET_RB4_TRACK_ANGLE ) #define SET_LRB_TEXTURE_PRESET @@ -344,7 +361,9 @@ {set $multiringcustomtexture TRUE} {set $multiring lrb} {set $streakcustomtexture TRUE} - {set $streak lrb} + {set $streakgtr lrb} + {set $streakbass lrb} + {set $streakdrum lrb} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr lrb_guitar} {set $spotlightbasscustomtexture TRUE} @@ -385,14 +404,15 @@ {set $multiringcustomtexture TRUE} {set $multiring tbrb} {set $streakcustomtexture TRUE} - {set $streak tbrb} + {set $streakgtr tbrb} + {set $streakbass tbrb} + {set $streakdrum tbrb} {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr tbrb_guitar} {set $spotlightbasscustomtexture TRUE} {set $spotlightbass tbrb_bass} {set $spotlightdrumcustomtexture TRUE} {set $spotlightdrum tbrb_drums} - SET_RB3_TRACK_ANGLE ) #define SET_RR_TRACK_ANGLE @@ -451,12 +471,12 @@ {set $track_fade_start_2p 90} {set $track_fade_length_2p 50} {set $track_cam_offset 0.439} - {set $track_pitch_3p -40.25} + {set $track_pitch_3p -39.25} {set $track_fov_3p 19} {set $track_y_pos_3p -135} {set $track_z_pos_3p 31} - {set $track_fade_start_3p 115} - {set $track_fade_length_3p 50} - {set $track_x_offset 24} - {set $track_side_angle 7.5} + {set $track_fade_start_3p 83} + {set $track_fade_length_3p 115} + {set $track_x_offset 24.6} + {set $track_side_angle 8.75} ) \ No newline at end of file diff --git a/_ark/track/player_intro.dta b/_ark/track/player_intro.dta index a7199eca..7e8b4b5d 100644 --- a/_ark/track/player_intro.dta +++ b/_ark/track/player_intro.dta @@ -94,35 +94,52 @@ (delay 1.0e-2) (script {intro.trig trigger} - {unless {== $highway "_1_none"} - {beatmatch foreach_active_player $player {switch {$player instrument} - (bass - {{{{get_track_panel} find bass} find indv_player_warning_off.trig} trigger} - {{{{get_track_panel} find bass} find warning_track_emissive.anim} animate} - ) - (guitar - {{{{get_track_panel} find guitar} find indv_player_warning_off.trig} trigger} - {{{{get_track_panel} find guitar} find warning_track_emissive.anim} animate} - ) - (vocals) - (drum - {{{{get_track_panel} find drum} find indv_player_warning_off.trig} trigger} - {{{{get_track_panel} find drum} find warning_track_emissive.anim} animate} - )}}} + {unless $dontrungemdividers + {unless {== $highwaygtr "_1_none"} + {beatmatch foreach_active_player $player + {switch {$player instrument} + (guitar + {{{{get_track_panel} find guitar} find indv_player_warning_off.trig} trigger} + {{{{get_track_panel} find guitar} find warning_track_emissive.anim} animate} + ) + } + } + } + {unless {== $highwaybass "_1_none"} + {beatmatch foreach_active_player $player + {switch {$player instrument} + (bass + {{{{get_track_panel} find bass} find indv_player_warning_off.trig} trigger} + {{{{get_track_panel} find bass} find warning_track_emissive.anim} animate} + ) + } + } + } + {unless {== $highwaydrum "_1_none"} + {beatmatch foreach_active_player $player + {switch {$player instrument} + (drum + {{{{get_track_panel} find drum} find indv_player_warning_off.trig} trigger} + {{{{get_track_panel} find drum} find warning_track_emissive.anim} animate} + ) + } + } + } {beatmatch foreach_active_player $player {switch {$player instrument} (bass {{{{get_track_panel} find bass} find streak_meter} star_deploy} - {unless {== $highway "_1_none"} + {unless {== $highwaybass "_1_none"} {{{{get_track_panel} find bass} find indv_player_warning.trig} trigger} {{{{get_track_panel} find bass} find warning_track_emissive.anim} stop_animation} {{{{get_track_panel} find bass} find warning_track_emissive.anim} set_frame 15.0} + {{{get_bass_panel} find surface.mat} set emissive_map {$this find background.tex}} } {{{{get_track_panel} find bass} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} ) (guitar {{{{get_track_panel} find guitar} find streak_meter} star_deploy} - {unless {== $highway "_1_none"} + {unless {== $highwaygtr "_1_none"} {{{{get_track_panel} find guitar} find indv_player_warning.trig} trigger} {{{{get_track_panel} find guitar} find warning_track_emissive.anim} stop_animation} {{{{get_track_panel} find guitar} find warning_track_emissive.anim} set_frame 15.0} @@ -133,14 +150,15 @@ ) (drum {{{{get_track_panel} find drum} find streak_meter} star_deploy} - {unless {== $highway "_1_none"} + {unless {== $highwaydrum "_1_none"} {{{{get_track_panel} find drum} find indv_player_warning.trig} trigger} {{{{get_track_panel} find drum} find warning_track_emissive.anim} stop_animation} {{{{get_track_panel} find drum} find warning_track_emissive.anim} set_frame 15.0} + {{{get_drum_panel} find surface.mat} set emissive_map {$this find black.tex}} } {{{{get_track_panel} find drum} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} )}} - + } )}}) (setup_player ($icon $name) diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta index e7873a70..398b7032 100644 --- a/_ark/ui/eng/locale_updates.dta +++ b/_ark/ui/eng/locale_updates.dta @@ -1037,8 +1037,14 @@ (os_smashers "Strikeline") (os_rails "Track Rails") (os_flames "Flames") -(os_hw "Highway") +(os_hw "Highway...") +(os_hwheader "Highway") +#ifdef HX_EE (os_strk "Streak") +#else +(os_strk "Streak...") +#endif +(os_strkheader "Streak") (os_spotlight "Overdrive...") (os_spotlightheader "Overdrive") (os_spotlightall "All Instruments") diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta index 94e9d739..a4501fd2 100644 --- a/_ark/ui/overshell_textures.dta +++ b/_ark/ui/overshell_textures.dta @@ -8,7 +8,7 @@ #endif (focus sel_section.lst) (enter - {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight os_hw_behavior os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes #endif os_score os_bre os_rails os_odbar os_multi_ring os_voxtrk)} + {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight #ifdef HX_EE os_hw_behavior #endif os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes #endif os_score os_bre os_rails os_odbar os_multi_ring os_voxtrk)} {title.lbl set_localized {localize os_tex1}} {full_selection.mesh set_showing FALSE}) (exit) @@ -50,14 +50,20 @@ ) (os_hw {set $dx_tracked_texture_loader highway} - {ui push_screen overshell_texload_screen} + {ui push_screen overshell_instrument_sel_screen} ) (os_strk {set $dx_tracked_texture_loader streak} + #ifdef HX_EE + {set $dx_tracked_instrument bass} {ui push_screen overshell_texload_screen} + #else + {ui push_screen overshell_instrument_sel_screen} + #endif ) (os_spotlight - {ui push_screen overshell_spotlight_sel_screen} + {set $dx_tracked_texture_loader spotlight} + {ui push_screen overshell_instrument_sel_screen} ) (os_odbar {set $dx_tracked_texture_loader odbar} @@ -96,7 +102,7 @@ ; {new UIPanel - overshell_spotlight_sel_panel + overshell_instrument_sel_panel #ifdef HX_EE (file practice/practice_sel_section_og.milo) #else @@ -104,32 +110,50 @@ #endif (focus sel_section.lst) (enter - {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum)} - {title.lbl set_localized {localize os_spotlightheader}} + {if_else {== $dx_tracked_texture_loader "highway"} + {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum os_hw_behavior)} + {if_else {== $dx_tracked_texture_loader "streak"} + {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum os_strk_behavior)} + {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum)} + } + } + {switch $dx_tracked_texture_loader + (highway + {title.lbl set_localized {localize os_hwheader}} + ) + (spotlight + {title.lbl set_localized {localize os_spotlightheader}} + ) + (streak + {title.lbl set_localized {localize os_strkheader}} + ) + } {full_selection.mesh set_showing FALSE}) (exit) (SELECT_MSG {switch {$component selected_sym} (os_spotlightall - {set $dx_spotlight_tracked_instrument all} - {set $dx_tracked_texture_loader spotlight} + {set $dx_tracked_instrument all} {ui push_screen overshell_texload_screen} ) (os_spotlightgtr - {set $dx_spotlight_tracked_instrument guitar} - {set $dx_tracked_texture_loader spotlight} + {set $dx_tracked_instrument guitar} {ui push_screen overshell_texload_screen} ) (os_spotlightbass - {set $dx_spotlight_tracked_instrument bass} - {set $dx_tracked_texture_loader spotlight} + {set $dx_tracked_instrument bass} {ui push_screen overshell_texload_screen} ) (os_spotlightdrum - {set $dx_spotlight_tracked_instrument drum} - {set $dx_tracked_texture_loader spotlight} + {set $dx_tracked_instrument drum} {ui push_screen overshell_texload_screen} ) + (os_hw_behavior + {ui push_screen overshell_hw_behavior_screen} + ) + (os_strk_behavior + {ui push_screen overshell_strk_behavior_screen} + ) }) (update_helpbar {helpbar @@ -150,9 +174,9 @@ {$this update_helpbar})} {new BandScreen - overshell_spotlight_sel_screen - (panels overshell_spotlight_sel_panel practice_mode_panel practice_lower3rd_panel) - (focus overshell_spotlight_sel_panel)} + overshell_instrument_sel_screen + (panels overshell_instrument_sel_panel practice_mode_panel practice_lower3rd_panel) + (focus overshell_instrument_sel_panel)} ; {new UIPanel @@ -260,17 +284,53 @@ ) (highway {sel_section.lst set_data (#include ../track_new/highways/highways.dta)} - {title.lbl set_localized {localize os_hw}} - {anchor_corner02.tex set_bitmap {sprint "track_new/highways/" $highway ".png"}} + {switch $dx_tracked_instrument + (guitar + {anchor_corner02.tex set_bitmap {sprint "track_new/highways/" $highwaygtr ".png"}} + {title.lbl set_localized {localize os_spotlightgtr}} + ) + (bass + {anchor_corner02.tex set_bitmap {sprint "track_new/highways/" $highwaybass ".png"}} + {title.lbl set_localized {localize os_spotlightbass}} + ) + (drum + {anchor_corner02.tex set_bitmap {sprint "track_new/highways/" $highwaydrum ".png"}} + {title.lbl set_localized {localize os_spotlightdrum}} + ) + (all + {anchor_corner02.tex set_bitmap {sprint "track_new/highways/" $highwaygtr ".png"}} + {title.lbl set_localized {localize os_spotlightall}} + ) + } ) (streak {sel_section.lst set_data (#include ../track_new/streak/streak.dta)} - {title.lbl set_localized {localize os_strk}} - {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streak ".png"}} + {switch $dx_tracked_instrument + (guitar + {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streakgtr ".png"}} + {title.lbl set_localized {localize os_spotlightgtr}} + ) + (bass + {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streakbass ".png"}} + #ifdef HX_EE + {title.lbl set_localized {localize os_strk}} + #else + {title.lbl set_localized {localize os_spotlightbass}} + #endif + ) + (drum + {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streakdrum ".png"}} + {title.lbl set_localized {localize os_spotlightdrum}} + ) + (all + {anchor_corner02.tex set_bitmap {sprint "track_new/streak/" $streakgtr ".png"}} + {title.lbl set_localized {localize os_spotlightall}} + ) + } ) (spotlight {sel_section.lst set_data #ifdef HX_EE (#include ../track_ps2/spotlight/spotlight.dta) #else (#include ../track_new/spotlight/spotlight.dta) #endif} - {switch $dx_spotlight_tracked_instrument + {switch $dx_tracked_instrument (guitar {anchor_corner02.tex set_bitmap {sprint "track_new/spotlight/" $spotlightgtr ".png"}} {title.lbl set_localized {localize os_spotlightgtr}} @@ -359,14 +419,44 @@ ) (highway {set $highwaycustomtexture TRUE} - {set $highway {$component selected_sym}} + {switch $dx_tracked_instrument + (guitar + {set $highwaygtr {$component selected_sym}} + ) + (bass + {set $highwaybass {$component selected_sym}} + ) + (drum + {set $highwaydrum {$component selected_sym}} + ) + (all + {set $highwaygtr {$component selected_sym}} + {set $highwaybass {$component selected_sym}} + {set $highwaydrum {$component selected_sym}} + ) + } ) (streak {set $streakcustomtexture TRUE} - {set $streak {$component selected_sym}} + {switch $dx_tracked_instrument + (guitar + {set $streakgtr {$component selected_sym}} + ) + (bass + {set $streakbass {$component selected_sym}} + ) + (drum + {set $streakdrum {$component selected_sym}} + ) + (all + {set $streakgtr {$component selected_sym}} + {set $streakbass {$component selected_sym}} + {set $streakdrum {$component selected_sym}} + ) + } ) (spotlight - {switch $dx_spotlight_tracked_instrument + {switch $dx_tracked_instrument (guitar {set $spotlightgtrcustomtexture TRUE} {set $spotlightgtr {$component selected_sym}} diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta index 4b5cb5d2..cc7b2299 100644 --- a/_ark/ui/overshell_track.dta +++ b/_ark/ui/overshell_track.dta @@ -81,15 +81,18 @@ ) (os_rb3prst SET_RB3_TEXTURE_PRESET + SET_RB3_TRACK_ANGLE ) (os_rb4prst SET_RB4_TEXTURE_PRESET + SET_RB4_TRACK_ANGLE ) (os_lrbprst SET_LRB_TEXTURE_PRESET ) (os_tbrbprst SET_TBRB_TEXTURE_PRESET + SET_RB3_TRACK_ANGLE ) }) (update_helpbar @@ -162,7 +165,6 @@ {if_else $nogemdividers os_gemdiv0 os_gemdiv1} #ifndef HX_EE {if_else $hwalpha os_hwalpha1 os_hwalpha0} - os_strk_behavior os_warn_behavior #endif )) @@ -198,9 +200,6 @@ {set $hwpos {sel_section.lst selected_sym}} {$this lst_reset} ) - (os_strk_behavior - {ui push_screen overshell_strk_behavior_screen} - ) (os_warn_behavior {ui push_screen overshell_warn_behavior_screen} ) @@ -212,12 +211,14 @@ (confirm helpbar_select))}) (SCROLL_MSG) (BUTTON_DOWN_MSG - {if - {== $action kAction_Cancel} - {synth play button_toggle} - {ui goto_screen overshell_tex_screen} - {ui pop_screen}} - kDataUnhandled) + {if_else + #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif + {do + {synth play button_toggle} + {ui goto_screen overshell_track_screen} + {ui pop_screen} + TRUE} + kDataUnhandled}) (TRANSITION_COMPLETE_MSG {$this update_helpbar})} {new @@ -312,14 +313,50 @@ {switch {$component selected_sym} ((os_hwwarn0 os_hwwarn1) {set $nohwwarn {! $nohwwarn}} - {if_else {&& $nohwwarn {== $highway "_1_none"}} + {if_else $nohwwarn {do - {set $highwaycustomtexture TRUE} - {set $highway _1_black_highway} + {if {== $highwaygtr "_1_none"} + {set $highwaycustomtexture TRUE} + {set $highwaygtr _1_black_highway} + } + {if {== $highwaybass "_1_none"} + {set $highwaycustomtexture TRUE} + {set $highwaybass _1_black_highway} + } + {if {== $highwaydrum "_1_none"} + {set $highwaycustomtexture TRUE} + {set $highwaydrum _1_black_highway} + } } - {if $texrunonce - {set $highwaycustomtexture TRUE} - {set $highway _1_none} + {if_else $texrunonce + {do + {if {== $highwaygtr "_1_black_highway"} + {set $highwaycustomtexture TRUE} + {set $highwaygtr _1_none} + } + {if {== $highwaybass "_1_black_highway"} + {set $highwaycustomtexture TRUE} + {set $highwaybass _1_none} + } + {if {== $highwaydrum "_1_black_highway"} + {set $highwaycustomtexture TRUE} + {set $highwaydrum _1_none} + } + } + {do + {if {== $highwaygtr "_1_black_highway"} + {set $highwaycustomtexture FALSE} + {set $highwaygtr _1_none} + } + {if {== $highwaybass "_1_black_highway"} + {set $highwaycustomtexture FALSE} + {set $highwaybass _1_none} + } + {if {== $highwaydrum "_1_black_highway"} + {set $highwaycustomtexture FALSE} + {set $highwaydrum _1_none} + } + } } } {set $warnpos {sel_section.lst selected_sym}} @@ -403,6 +440,76 @@ ; {elem {find $entry track_fade_length} 1} ; } ; } + ; {if {== {elem $entry 0} {basename multioptimized}} + ; {set $multioptimized + ; {elem {find $entry multioptimized} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_pitch_2p}} + ; {set $track_pitch_2p + ; {elem {find $entry track_pitch_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fov_2p}} + ; {set $track_fov_2p + ; {elem {find $entry track_fov_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_y_pos_2p}} + ; {set $track_y_pos_2p + ; {elem {find $entry track_y_pos_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_z_pos_2p}} + ; {set $track_z_pos_2p + ; {elem {find $entry track_z_pos_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fade_start_2p}} + ; {set $track_fade_start_2p + ; {elem {find $entry track_fade_start_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fade_length_2p}} + ; {set $track_fade_length_2p + ; {elem {find $entry track_fade_length_2p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_cam_offset}} + ; {set $track_cam_offset + ; {elem {find $entry track_cam_offset} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_pitch_3p}} + ; {set $track_pitch_3p + ; {elem {find $entry track_pitch_3p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fov_3p}} + ; {set $track_fov_3p + ; {elem {find $entry track_fov_3p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_y_pos_3p}} + ; {set $track_y_pos_3p + ; {elem {find $entry track_y_pos_3p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_z_pos_3p}} + ; {set $track_z_pos_3p + ; {elem {find $entry track_z_pos_3p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fade_start_3p}} + ; {set $track_fade_start_3p + ; {elem {find $entry track_fade_start_3p} 1} + ; } + ; } + ; {if {== {elem $entry 0} {basename track_fade_length_3p}} + ; {set $track_fade_length_3p + ; {elem {find $entry track_fade_length_3p} 1} + ; } + ; } ; {if {== {elem $entry 0} {basename track_x_offset}} ; {set $track_x_offset ; {elem {find $entry track_x_offset} 1} @@ -413,11 +520,6 @@ ; {elem {find $entry track_side_angle} 1} ; } ; } - ; {if {== {elem $entry 0} {basename track_cam_offset}} - ; {set $track_cam_offset - ; {elem {find $entry track_cam_offset} 1} - ; } - ; } ; } ; ) (rb2 diff --git a/_ark_ps2/config/band.dta b/_ark_ps2/config/band.dta index d460257e..b57257b8 100644 --- a/_ark_ps2/config/band.dta +++ b/_ark_ps2/config/band.dta @@ -59,8 +59,8 @@ #include synth.dta) (joypad (ignore) - (hold_ms 1000) - (repeat_ms 80) + (hold_ms 300) + (repeat_ms 50) (midi_joypad (disable FALSE)) (controller_mapping diff --git a/_ark_ps2/config/modes.dta b/_ark_ps2/config/modes.dta index 40e588e8..8d21fde8 100644 --- a/_ark_ps2/config/modes.dta +++ b/_ark_ps2/config/modes.dta @@ -41,7 +41,7 @@ (max_local_players 4) (min_players 2) (update_crowd_meter TRUE) - (crowd_reacts {if_else {modifier_mgr is_modifier_active mod_nocrowd} FALSE TRUE}) + (crowd_reacts $crowdsfx) (play_star_sfx TRUE) (play_track_intro_sfx TRUE) (play_streak_sfx TRUE) @@ -135,7 +135,7 @@ (intro_category INTRO) (win_camera WIN) (outro_camera OUTRO_MULTI) - (crowd_audio {if_else {modifier_mgr is_modifier_active mod_nocrowd} FALSE TRUE}) + (crowd_audio $crowdsfx) (game_mode_context CONTEXT_GAME_MODE_TYPE_QUICKPLAY) (pause_screen pause_screen) (song_select_mode song_select_quickplay)