Skip to content

Commit

Permalink
per-instrument hw/streak, warning on rails b/d fix
Browse files Browse the repository at this point in the history 
also includes minor adjustments to os flow, 3p rb3 track angle, ps2 nocrowd fix and menu scroll speed
  • Loading branch information
@LlysiX
LlysiX committed Dec 5, 2023
1 parent ae60668 commit fe709b0
Show file tree
Hide file tree
Showing 10 changed files with 446 additions and 125 deletions.
32 changes: 22 additions & 10 deletions _ark/dx/track/dx_track_callback.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}}
}
Expand All @@ -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}
}
}
)
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
}
}
)
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand All @@ -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}}
}
Expand All @@ -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}
}
}
)
Expand Down
107 changes: 84 additions & 23 deletions _ark/dx/track/dx_track_macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}}

Expand Down
20 changes: 16 additions & 4 deletions _ark/dx/ui/dx_init.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
Loading

0 comments on commit fe709b0

Please sign in to comment.