diff --git a/_ark/dx/track/dx_h2h_callback.dta b/_ark/dx/track/dx_h2h_callback.dta new file mode 100644 index 00000000..14d5da6a --- /dev/null +++ b/_ark/dx/track/dx_h2h_callback.dta @@ -0,0 +1,263 @@ +; Track 0 +(new Object fc_track_0_callback ;remove FC groove on track_0 miss/pass + (hit + {if {! $track_0_firstnote} {set $track_0_firstnote TRUE}} + {if {! $track_0_milosong} {set $track_0_milosong TRUE} {set [num_gems_hit] 0} {set [num_gems_miss] 0} {set [num_gems_pass] 0} {set [num_gems_combo] 0}} + {$this check_fc} + {set [num_gems_hit] {'+' [num_gems_hit] 1}} + {set [num_gems_combo] {'+' [num_gems_combo] 1}} + ) + (miss + {unless {! $track_0_firstnote} + {set [num_gems_miss] {'+' [num_gems_miss] 1}} + {set [num_gems_combo] 0} + {$this check_missed} + {{{get_track_0_panel} find streak_meter} star_deploy_stop} + {track_0 stop_deploy}} + ) + (pass + {if {! $track_0_firstnote} {set $track_0_firstnote TRUE}} + {if {! $track_0_milosong} {set $track_0_milosong TRUE} {set [num_gems_hit] 1} {set [num_gems_miss] 1} {set [num_gems_pass] 1} {set [num_gems_combo] 1}} + {set [num_gems_pass] {'+' [num_gems_pass] 1}} + {set [num_gems_combo] 0} + {$this check_missed} + {{{get_track_0_panel} find streak_meter} star_deploy_stop} + {track_0 stop_deploy} + ) + (check_fc + {$this check_missed} + {if {== {'+' [num_gems_pass] [num_gems_miss]} 0} + {{{get_track_0_panel} find streak_meter} star_deploy} + {track_0 deploy}} + ) + (check_missed + {if {> {'+' [num_gems_miss] [num_gems_pass]} 0} + {{{get_track_0_panel} find streak_meter} star_deploy_stop} + {track_0 stop_deploy}} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {if_else {== $highwaygtr "_1_none"} + {$this do_streak} + {$this do_customhw} + } + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if_else {== $highwaybass "_1_none"} + {$this do_streak} + {$this do_customhw} + } + {if_else {== $highwaydrum "_1_none"} + {$this do_streak} + {$this do_customhw} + } + } + } + {unless {|| $hwstrk $legacybass {== {{game get_participant_config 0} get_track_sym} bass}} + {$this do_groove} + } + ) + (do_customhw + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if_else {> [num_gems_combo] 38} + {$this do_customhw_streak} + {$this do_customhw_warn_off} + } + {if_else {> [num_gems_combo] 28} + {$this do_customhw_streak} + {$this do_customhw_warn_off} + } + } + ) + (do_customhw_warn_off + {{{get_track_0_panel} find indv_player_warning.trig} trigger} + {{{get_track_0_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_0_panel} find warning_track_emissive.anim} set_frame 15.0} + {unless {== {{game get_participant_config 0} get_track_sym} guitar} + ;{{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find track_reflect.tex}} + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find background.tex}} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find black.tex}} + } + } + ) + (do_customhw_streak + {if $hwstrk + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {if_else {== $streakgtr none} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find pitch_arrow_effect_old.tex}} + } + {if_else {== $streakdrum none} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_track_0_panel} find surface.mat} set emissive_map {{get_track_panel} find smasher_plate_orange_emiss_nomip.tex}} + } + } + } + } + ) + (do_streak + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if {> [num_gems_combo] 38} + {if $hwstrk + {$this do_customhw_warn_off} + {$this do_customhw_streak} + } + } + {if {> [num_gems_combo] 28} + {if $hwstrk + {$this do_customhw_warn_off} + {$this do_customhw_streak} + } + } + } + ) + (do_groove + {if_else {&& {> [num_gems_combo] 29} {! $track_0_groove_active}} + {do + {set $track_0_groove_active TRUE} + {{{get_track_0_panel} find BassSuperStreak_ON.trig} trigger} + } + {if {< [num_gems_combo] 29} + {set $track_0_groove_active FALSE} + {{{get_track_0_panel} find BassSuperStreak_OFF.trig} trigger} + } + } + ) + (num_gems_hit 0) + (num_gems_combo 0) + (num_gems_miss 0) + (num_gems_pass 0) +) + +; Track 1 +(new Object fc_track_1_callback ;remove FC groove on track_1 miss/pass + (hit + {if {! $track_1_firstnote} {set $track_1_firstnote TRUE}} + {if {! $track_1_milosong} {set $track_1_milosong TRUE} {set [num_gems_hit] 0} {set [num_gems_miss] 0} {set [num_gems_pass] 0} {set [num_gems_combo] 0}} + {$this check_fc} + {set [num_gems_hit] {'+' [num_gems_hit] 1}} + {set [num_gems_combo] {'+' [num_gems_combo] 1}} + ) + (miss + {unless {! $track_1_firstnote} + {set [num_gems_miss] {'+' [num_gems_miss] 1}} + {set [num_gems_combo] 0} + {$this check_missed} + {{{get_track_1_panel} find streak_meter} star_deploy_stop} + {track_1 stop_deploy}} + ) + (pass + {if {! $track_1_firstnote} {set $track_1_firstnote TRUE}} + {if {! $track_1_milosong} {set $track_1_milosong TRUE} {set [num_gems_hit] 1} {set [num_gems_miss] 1} {set [num_gems_pass] 1} {set [num_gems_combo] 1}} + {set [num_gems_pass] {'+' [num_gems_pass] 1}} + {set [num_gems_combo] 0} + {$this check_missed} + {{{get_track_1_panel} find streak_meter} star_deploy_stop} + {track_1 stop_deploy} + ) + (check_fc + {$this check_missed} + {if {== {'+' [num_gems_pass] [num_gems_miss]} 0} + {{{get_track_1_panel} find streak_meter} star_deploy} + {track_1 deploy}} + ) + (check_missed + {if {> {'+' [num_gems_miss] [num_gems_pass]} 0} + {{{get_track_1_panel} find streak_meter} star_deploy_stop} + {track_1 stop_deploy}} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {if_else {== $highwaygtr "_1_none"} + {$this do_streak} + {$this do_customhw} + } + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if_else {== $highwaybass "_1_none"} + {$this do_streak} + {$this do_customhw} + } + {if_else {== $highwaydrum "_1_none"} + {$this do_streak} + {$this do_customhw} + } + } + } + {unless {|| $hwstrk $legacybass {== {{game get_participant_config 0} get_track_sym} bass}} + {$this do_groove} + } + ) + (do_customhw + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if_else {> [num_gems_combo] 38} + {$this do_customhw_streak} + {$this do_customhw_warn_off} + } + {if_else {> [num_gems_combo] 28} + {$this do_customhw_streak} + {$this do_customhw_warn_off} + } + } + ) + (do_customhw_warn_off + {{{get_track_1_panel} find indv_player_warning.trig} trigger} + {{{get_track_1_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_1_panel} find warning_track_emissive.anim} set_frame 15.0} + {unless {== {{game get_participant_config 0} get_track_sym} guitar} + ;{{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find track_reflect.tex}} + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find background.tex}} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find black.tex}} + } + } + ) + (do_customhw_streak + {if $hwstrk + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {if_else {== $streakgtr none} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find pitch_arrow_effect_old.tex}} + } + {if_else {== $streakdrum none} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}} + {{{get_track_1_panel} find surface.mat} set emissive_map {{get_track_panel} find smasher_plate_orange_emiss_nomip.tex}} + } + } + } + } + ) + (do_streak + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {if {> [num_gems_combo] 38} + {if $hwstrk + {$this do_customhw_warn_off} + {$this do_customhw_streak} + } + } + {if {> [num_gems_combo] 28} + {if $hwstrk + {$this do_customhw_warn_off} + {$this do_customhw_streak} + } + } + } + ) + (do_groove + {if_else {&& {> [num_gems_combo] 29} {! $track_1_groove_active}} + {do + {set $track_1_groove_active TRUE} + {{{get_track_1_panel} find BassSuperStreak_ON.trig} trigger} + } + {if {< [num_gems_combo] 29} + {set $track_1_groove_active FALSE} + {{{get_track_1_panel} find BassSuperStreak_OFF.trig} trigger} + } + } + ) + (num_gems_hit 0) + (num_gems_combo 0) + (num_gems_miss 0) + (num_gems_pass 0) +) + +; Vocals wen \ No newline at end of file diff --git a/_ark/dx/track/dx_track_callback.dta b/_ark/dx/track/dx_track_callback.dta index d1f78115..b71f1264 100644 --- a/_ark/dx/track/dx_track_callback.dta +++ b/_ark/dx/track/dx_track_callback.dta @@ -426,4 +426,5 @@ (num_gems_pass 0) ) +#include dx_h2h_callback.dta ;for head to head gamemodes (score duel, tug of war) ; Vocals wen \ No newline at end of file diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta index 0ddf4883..cabfd0f1 100644 --- a/_ark/dx/track/dx_track_macros.dta +++ b/_ark/dx/track/dx_track_macros.dta @@ -59,12 +59,12 @@ {if {!= {{game get_participant_config 0} get_track_sym} vocals} {if_else $nogemdividers {do - {{{{get_track_panel} find track_0} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}} - {{{{get_track_panel} find track_1} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}} + {{{get_track_0_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}} + {{{get_track_1_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}} } {do - {{{{get_track_panel} find track_0} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}} - {{{{get_track_panel} find track_1} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}} + {{{get_track_0_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}} + {{{get_track_1_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}} } } } @@ -88,29 +88,22 @@ {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}}} ; + {{$this find background.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}} + {{$this find black.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}} } #ifndef HX_EE - {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"}} + {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"}} + {unless {gamemode get is_h2h_arrangement} {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 {!= $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 @@ -246,23 +239,33 @@ {{$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} {== $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}} + } + {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"}} + } + } + {if_else {gamemode get is_h2h_arrangement} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} {do - {set $streakdrum "rb2"} - {{$this find smasher_plate_orange_emiss_nomip.tex} set_bitmap {sprint "track_new/streak/" $streakdrum ".png"}} + {{{get_track_0_panel} find bass_superstreak.mat} set diffuse_tex {$this find pitch_arrow_effect_old.tex}} + {{{get_track_1_panel} find bass_superstreak.mat} set diffuse_tex {$this find pitch_arrow_effect_old.tex}} } - {unless {== $streakdrum none} - {{$this find smasher_plate_orange_emiss_nomip.tex} set_bitmap {sprint "track_new/streak/" $streakdrum ".png"}} + {if {== {{game get_participant_config 0} get_track_sym} drum} + {{{get_track_0_panel} find bass_superstreak.mat} set diffuse_tex {$this find smasher_plate_orange_emiss_nomip.tex}} + {{{get_track_1_panel} find bass_superstreak.mat} set diffuse_tex {$this find smasher_plate_orange_emiss_nomip.tex}} } } {beatmatch foreach_active_player $player @@ -421,4 +424,151 @@ {unless {== $voxhw none} {set $voxhwcustomtexture TRUE}} +) + +#define DX_CALLBACK_SETUP +( +{if_else {gamemode get is_h2h_arrangement} + {unless {== {{game get_participant_config 0} get_track_sym} vocals} + {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player + {if_else {== {$player track} track0} + {$player add_sink fc_track_0_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_streak do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)} + {$player add_sink fc_track_1_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_streak do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)} + } + } + } + {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player + {switch {$player instrument} + (bass {$player add_sink fc_bass_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) + (guitar {$player add_sink fc_guitar_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) + (drum {$player add_sink fc_drum_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) + } + } +} +) + +#define DX_FC_SETUP +( +{if_else {gamemode get is_h2h_arrangement} + {unless {== {{game get_participant_config 0} get_track_sym} vocals} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {unless {== $highwaygtr "_1_none"} + {{{get_track_0_panel} find indv_player_warning_off.trig} trigger} + {{{get_track_1_panel} find indv_player_warning_off.trig} trigger} + } + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {unless {== $highwaybass "_1_none"} + {{{get_track_0_panel} find indv_player_warning_off.trig} trigger} + {{{get_track_1_panel} find indv_player_warning_off.trig} trigger} + } + {unless {== $highwaydrum "_1_none"} + {{{get_track_0_panel} find indv_player_warning_off.trig} trigger} + {{{get_track_1_panel} find indv_player_warning_off.trig} trigger} + } + } + } + {{{get_track_0_panel} find streak_meter} star_deploy} + {{{get_track_1_panel} find streak_meter} star_deploy} + {if_else {== {{game get_participant_config 0} get_track_sym} guitar} + {unless {== $highwaygtr "_1_none"} + {{{get_track_0_panel} find indv_player_warning.trig} trigger} + {{{get_track_0_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_0_panel} find warning_track_emissive.anim} set_frame 15.0} + ;{{{get_track_0_panel} find surface.mat} set emissive_map {$this find track_reflect.tex}} + {{{get_track_1_panel} find indv_player_warning.trig} trigger} + {{{get_track_1_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_1_panel} find warning_track_emissive.anim} set_frame 15.0} + ;{{{get_track_1_panel} find surface.mat} set emissive_map {$this find track_reflect.tex}} + + } + {if_else {== {{game get_participant_config 0} get_track_sym} bass} + {unless {== $highwaybass "_1_none"} + {{{get_track_0_panel} find indv_player_warning.trig} trigger} + {{{get_track_0_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_0_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_track_0_panel} find surface.mat} set emissive_map {$this find background.tex}} + {{{get_track_1_panel} find indv_player_warning.trig} trigger} + {{{get_track_1_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_1_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_track_1_panel} find surface.mat} set emissive_map {$this find background.tex}} + } + {unless {== $highwaydrum "_1_none"} + {{{get_track_0_panel} find indv_player_warning.trig} trigger} + {{{get_track_0_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_0_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_track_0_panel} find surface.mat} set emissive_map {$this find black.tex}} + {{{get_track_1_panel} find indv_player_warning.trig} trigger} + {{{get_track_1_panel} find warning_track_emissive.anim} stop_animation} + {{{get_track_1_panel} find warning_track_emissive.anim} set_frame 15.0} + {{{get_track_1_panel} find surface.mat} set emissive_map {$this find black.tex}} + } + } + } + } + {do + {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 {== $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 {== $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} + } + {{{{get_track_panel} find guitar} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} + ) + (drum + {{{{get_track_panel} find drum} find streak_meter} star_deploy} + {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}} + ) + } + } + } +} ) \ No newline at end of file diff --git a/_ark/dx/ui/dx_funcs.dta b/_ark/dx/ui/dx_funcs.dta index d60146ec..5144ffa8 100644 --- a/_ark/dx/ui/dx_funcs.dta +++ b/_ark/dx/ui/dx_funcs.dta @@ -7,4 +7,10 @@ } {func get_drum_panel {{get_track_panel} find drum} +} +{func get_track_0_panel + {{get_track_panel} find track_0} +} +{func get_track_1_panel + {{get_track_panel} find track_1} } \ No newline at end of file diff --git a/_ark/track/player_intro.dta b/_ark/track/player_intro.dta index 7e8b4b5d..b6383228 100644 --- a/_ark/track/player_intro.dta +++ b/_ark/track/player_intro.dta @@ -66,20 +66,30 @@ (enabled TRUE) (reset {reset.trig trigger} - {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} - )}} + {if_else {gamemode get is_h2h_arrangement} + {do + {{{get_track_0_panel} find indv_player_warning_off.trig} trigger} + {{{get_track_0_panel} find warning_track_emissive.anim} animate} + {{{get_track_1_panel} find indv_player_warning_off.trig} trigger} + {{{get_track_1_panel} find warning_track_emissive.anim} animate} + } + {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} + ) + (drum + {{{{get_track_panel} find drum} find indv_player_warning_off.trig} trigger} + {{{{get_track_panel} find drum} find warning_track_emissive.anim} animate} + ) + } + } + } ) (intro {if @@ -94,71 +104,7 @@ (delay 1.0e-2) (script {intro.trig trigger} - {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 {== $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 {== $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} - } - {{{{get_track_panel} find guitar} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}} - ) - (vocals - ) - (drum - {{{{get_track_panel} find drum} find streak_meter} star_deploy} - {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}} - )}} - } + DX_FC_SETUP )}}) (setup_player ($icon $name) diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta index 76ae3ade..6806d804 100644 --- a/_ark/ui/game.dta +++ b/_ark/ui/game.dta @@ -71,10 +71,9 @@ {handle ($this intro_start)}}}) (intro_start - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} {script_task kTaskSeconds (delay @@ -106,10 +105,9 @@ {world_panel set_showing FALSE}} kDataUnhandled) (intro_end - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} {handle ($this on_extend)} {if {modifier_mgr is_modifier_active mod_blackvenue} @@ -131,10 +129,9 @@ } kDataUnhandled) (intro_skip - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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 {do @@ -150,10 +147,9 @@ {beatmatch set_intro_real_time 0}} kDataUnhandled) (music_start - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} {ui music_start} kDataUnhandled) (beat @@ -176,10 +172,9 @@ kDataUnhandled) (game_over {if $already_restarted {{{{gamemode get track_panel} find mtv_overlay} find fade.anim} set_frame 0}} ;remove MTV overlay when track disappears, but only if it's already been restarted by script - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} {stagekit_reset} {beatmatch foreach_active_player @@ -233,10 +228,9 @@ {beatmatch set_paused TRUE}})} kDataUnhandled) (game_outro - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} - {set $guitar_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} {beatmatch foreach_active_player $p @@ -561,9 +555,9 @@ ;{session send_msg_to_all {` (set $temproygb $leaderroygb) kNetReliable}} ;{session send_msg_to_all {` (if_else {! $netroygb} {modifier_mgr deactivate_modifier mod_roygb} {modifier_mgr activate_modifier mod_roygb}) kNetReliable}} ;set up the FC indicator here - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} - {set $drum_groove_active FALSE} {set $guitar_groove_active FALSE} {set $bass_groove_active FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_milosong FALSE} + {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} ;setup for venue fps DX_FPS_SETUP ;set all players to autoplay if the modifier is active @@ -619,9 +613,9 @@ DX_FPS_SETUP {gamemode get game_input_limit_type}} {$this milo_setup}) (exit - {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} - {set $bass_groove_active FALSE} {set $drum_groove_active FALSE} {set $guitar_groove_active FALSE} - {set $bass_firstnote FALSE} {set $guitar_firstnote FALSE} {set $drum_firstnote FALSE} + {set $guitar_milosong FALSE} {set $bass_milosong FALSE} {set $drum_milosong FALSE} {set $track_0_milosong FALSE} {set $track_1_groove_active FALSE} + {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} {platform_mgr remove_sink $this ui_changed} {synth stop_playback_all_mics} {if diff --git a/_ark/ui/main/main.dta b/_ark/ui/main/main.dta index a598a7fa..5de46616 100644 --- a/_ark/ui/main/main.dta +++ b/_ark/ui/main/main.dta @@ -148,7 +148,6 @@ #ifdef HX_XBOX {$this iterate PostProc $p {$p set emulate_fps 60}} #endif - {set $dontrungemdividers FALSE} {set $iamingamenow FALSE} {set $splashed 1} ANIMATED_LOGO_ENTER @@ -302,8 +301,6 @@ SessionPanel main_quickplay_panel MAIN_SUBSCREEN_PANEL_HANDLER - (enter - {set $dontrungemdividers FALSE}) (exit {synth reset_mics_changed}) (SELECT_MSG @@ -334,11 +331,9 @@ {ui goto_screen main_bandcoop_screen}) (score_duel.btn {main_panel push_focus} - {set $dontrungemdividers TRUE} {ui goto_screen main_score_duel_screen}) (tug_of_war.btn {main_panel push_focus} - {set $dontrungemdividers TRUE} {ui goto_screen main_tug_of_war_screen})}}}) (session_ready_complete_msg {gamecfg auto_assign_missing_slots} diff --git a/_ark/ui/track_panel.dta b/_ark/ui/track_panel.dta index 4b1ee948..50680a6b 100644 --- a/_ark/ui/track_panel.dta +++ b/_ark/ui/track_panel.dta @@ -7,15 +7,7 @@ {game add_sink $this} #ifndef HX_EE ; why does this not work on ps2 - {unless {gamemode get is_h2h_arrangement} - {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player - {switch {$player instrument} - (bass {$player add_sink fc_bass_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) - (guitar {$player add_sink fc_guitar_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) - (drum {$player add_sink fc_drum_callback (hit miss pass check_fc check_missed do_customhw do_customhw_warn_off do_customhw_warn_on do_customhw_streak do_warning do_rail_warning do_streak do_groove num_gems_hit num_gems_combo num_gems_miss num_gems_pass)}) - } - } - } + DX_CALLBACK_SETUP #endif {{{gamemode get track_panel} loaded_dir} set view_time_easy {* {/ 2.4 $trackspeed} $speedmod}} ;implement track speed modifier @@ -76,7 +68,8 @@ {gamemode get play_track_intro_sfx}} {synth play track_beg.cue} {unless {> {gamecfg get practice_speed} 0} {beatmatch set_music_speed $speedmod}} - {if {> {gamecfg get practice_speed} 0} {beatmatch set_music_speed $modifier}}})) + {if {> {gamecfg get practice_speed} 0} {beatmatch set_music_speed $modifier}}} + #ifndef HX_EE DX_FC_SETUP #endif)) {new TrackPanel coop_track_panel