initial modifier cleanup

hmxmilohax · Oct 25, 2023 · 6dcd190 · 6dcd190
1 parent a0cab62
commit 6dcd190
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 67 deletions.
diff --git a/_ark/config/modifiers.dta b/_ark/config/modifiers.dta
@@ -25,25 +25,15 @@
    (mod_mididrum unlocked)
    (mod_padguitar (activate {modifier_mgr deactivate_modifier mod_paddrum}) unlocked) ;updated padguitar to disable paddrum
    (mod_paddrum (activate {modifier_mgr deactivate_modifier mod_padguitar}) unlocked) ;paddrum disables padguitar
-   (mod_selectdeploy unlocked) ;select button to activate OD for drums and vox
+   ;(mod_selectdeploy unlocked) ;select button to activate OD for drums and vox (look into fixing later)
    (mod_noquickrestart unlocked)
    ;(mod_forceguitar unlocked) ;commented out for 1.04, will probably explore further later
    #ifndef HX_EE (mod_vocalgender unlocked) #endif
-   (mod_gemdivider unlocked)
-   #ifndef HX_EE ; callbacks don't work on ps2 atm
-   (mod_legacybass unlocked)
-   (mod_hwstreak unlocked)
-   (mod_hwalpha (activate {set $hwalpha_needs_reset TRUE}) (deactivate {set $hwalpha_needs_reset TRUE}) unlocked)
-   (mod_nohwwarn unlocked)
-   (mod_railwarn unlocked)
-   #endif
-   (mod_nosustain unlocked)
-   (mod_rb3sustain unlocked)
-   (mod_nowhammyfx unlocked)
-   (mod_nocrowd unlocked)
-   (mod_nomuting unlocked)
+   (mod_nowhammyfx unlocked) ;;;;;;;;;;;;;;;;
+   (mod_nocrowd unlocked) ; sfx menu
+   (mod_nomuting unlocked) ;;;;;;;;;;;;;;;;;;
    #ifndef HX_EE
-   (mod_noflames (activate {modifier_mgr deactivate_modifier mod_flashbang}) unlocked)
+   (mod_noflames (activate {modifier_mgr deactivate_modifier mod_flashbang}) unlocked) ; maybe rework this to use textures? -LX
    (mod_flashbang (activate {modifier_mgr deactivate_modifier mod_noflames}) unlocked)
    #endif
    (mod_auto_play (disables (modifier_saving_feature modifier_achievements_feature modifier_online_feature)) (deactivate {modifier_mgr deactivate_modifier mod_fakejuke}) (activate {modifier_mgr deactivate_modifier mod_staticfills}) unlocked)

diff --git a/_ark/config/track_graphics.dta b/_ark/config/track_graphics.dta
@@ -154,20 +154,20 @@
   (tail_glow 'tail_glow_%s')
   (star 'gem_starpower_%s')
   (dot 'dot_top_hopo2_%s'))
- (tail_glow_width {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0 1.7})
- (tail_glow_tight_width {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 1.2 2})
+ (tail_glow_width {if_else {== $sustains "rb3"} 0 1.7})
+ (tail_glow_tight_width {if_else {== $sustains "rb3"} 1.2 2})
  (sparkle_len 1000)
- (tail_pulse_rate {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 32 64})
- (tail_pulse_smoothing {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0.3 0.5})
- (tail_offset_x {if_else {modifier_mgr is_modifier_active mod_nosustain} 9999 {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0.1 0}})
- (tail_min_alpha {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0.3 0.5})
+ (tail_pulse_rate {if_else {== $sustains "rb3"} 32 64})
+ (tail_pulse_smoothing {if_else {== $sustains "rb3"} 0.3 0.5})
+ (tail_offset_x {if_else {== $sustains "_1_none"} 9999 {if_else {== $sustains "rb3"} 0.1 0}})
+ (tail_min_alpha {if_else {== $sustains "rb3"} 0.3 0.5})
  (tail_max_alpha 1)
  (tail_alpha_smoothing 0.25)
- (tail_fade_distance {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 30 20})
+ (tail_fade_distance {if_else {== $sustains "rb3"} 30 20})
  (tail_min_freq 15)
  (tail_max_freq 4.5)
- (tail_min_amp {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0.15 0.25})
- (tail_max_amp {if_else {modifier_mgr is_modifier_active mod_rb3sustain} 0.9 1.5})
+ (tail_min_amp {if_else {== $sustains "rb3"} 0.15 0.25})
+ (tail_max_amp {if_else {== $sustains "rb3"} 0.9 1.5})
  (parts
   ((gem
     (type kMeshGem))

diff --git a/_ark/dx/config/dx_macros.dta b/_ark/dx/config/dx_macros.dta
@@ -143,7 +143,7 @@
    }
 
    {unless $dontrungemdividers
-   {if_else {modifier_mgr is_modifier_active mod_gemdivider}
+   {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}})
@@ -157,7 +157,7 @@
    }}
 
    {if $hwalpha_needs_reset
-      {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {! {modifier_mgr is_modifier_active mod_hwalpha}}}}
+      {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}}
    }
 
    #ifndef HX_EE

diff --git a/_ark/dx/track/dx_track_callback.dta b/_ark/dx/track/dx_track_callback.dta
@@ -43,7 +43,7 @@
          }
          {$this do_customhw}
       }
-      {unless {|| {modifier_mgr is_modifier_active mod_hwstreak} {modifier_mgr is_modifier_active mod_legacybass}}
+      {unless {|| $hwstrk $legacybass}
          {$this do_groove}
       }
       {$this do_rail_warning}
@@ -56,7 +56,7 @@
          }
          {do
             {$this do_customhw_warn_on}
-            {if {modifier_mgr is_modifier_active mod_nohwwarn}
+            {if $nohwwarn
                {if_else {> [num_gems_combo] 38}
                   {$this do_customhw_streak}
                   {$this do_customhw_warn_off}
@@ -72,18 +72,18 @@
    )
    (do_customhw_warn_on
       {if {= {{{{get_track_panel} find crowd_meter} find bass.tnm} frame} 0.32}
-         {unless {modifier_mgr is_modifier_active mod_nohwwarn}
+         {unless $nohwwarn
             {{{get_bass_panel} find warning_track_emissive.anim} animate}
          }
       }
    )
    (do_customhw_streak
-      {if {modifier_mgr is_modifier_active mod_hwstreak} 
+      {if $hwstrk 
          {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
       }
    )
    (do_warning
-      {if_else {modifier_mgr is_modifier_active mod_nohwwarn}
+      {if_else $nohwwarn
          {unless {> [num_gems_combo] 38}
             {{{get_bass_panel} find indv_player_warning_off.trig} trigger}
             {{{get_bass_panel} find warning_track_emissive.anim} stop_animation}
@@ -105,7 +105,7 @@
       }
    )
    (do_rail_warning
-      {if {modifier_mgr is_modifier_active mod_railwarn}
+      {if $railwarn
          {if_else {> {{{{get_bass_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}}
@@ -114,7 +114,7 @@
    )
    (do_streak
       {if {> [num_gems_combo] 38}
-         {if {modifier_mgr is_modifier_active mod_hwstreak}
+         {if $hwstrk
             {$this do_customhw_warn_off}
             {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
          }
@@ -181,7 +181,7 @@
          }
          {$this do_customhw}
       }
-      {unless {|| {modifier_mgr is_modifier_active mod_hwstreak} {modifier_mgr is_modifier_active mod_legacybass}}
+      {unless {|| $hwstrk $legacybass}
          {$this do_groove}
       }
       {$this do_rail_warning}
@@ -194,7 +194,7 @@
          }
          {do
             {$this do_customhw_warn_on}
-            {if {modifier_mgr is_modifier_active mod_nohwwarn}
+            {if $nohwwarn
                {if_else {> [num_gems_combo] 28}
                   {$this do_customhw_streak}
                   {$this do_customhw_warn_off}
@@ -210,18 +210,18 @@
    )
    (do_customhw_warn_on
       {if {= {{{{get_track_panel} find crowd_meter} find guitar.tnm} frame} 0.32}
-         {unless {modifier_mgr is_modifier_active mod_nohwwarn}
+         {unless $nohwwarn
             {{{get_guitar_panel} find warning_track_emissive.anim} animate}
          }
       }
    )
    (do_customhw_streak
-      {if {modifier_mgr is_modifier_active mod_hwstreak} 
+      {if $hwstrk 
          {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
       }
    )
    (do_warning
-      {if_else {modifier_mgr is_modifier_active mod_nohwwarn}
+      {if_else $nohwwarn
          {unless {> [num_gems_combo] 28}
             {{{get_guitar_panel} find indv_player_warning_off.trig} trigger}
             {{{get_guitar_panel} find warning_track_emissive.anim} stop_animation}
@@ -243,7 +243,7 @@
       }
    )
    (do_rail_warning
-      {if {modifier_mgr is_modifier_active mod_railwarn}
+      {if $railwarn
          {if_else {> {{{{get_track_panel} find crowd_meter} find guitar.tnm} frame} 0.34}
             {{{get_guitar_panel} find rails.mat} set diffuse_tex {{get_track_panel} find rails.tex}}
             {{{get_guitar_panel} find rails.mat} set diffuse_tex {{get_track_panel} find smasher_plate_orange_nomip.tex}}
@@ -252,7 +252,7 @@
    )
    (do_streak
       {if {> [num_gems_combo] 28}
-         {if {modifier_mgr is_modifier_active mod_hwstreak}
+         {if $hwstrk
             {$this do_customhw_warn_off}
             {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
          }
@@ -319,7 +319,7 @@
          }
          {$this do_customhw}
       }
-      {unless {|| {modifier_mgr is_modifier_active mod_hwstreak} {modifier_mgr is_modifier_active mod_legacybass}}
+      {unless {|| $hwstrk $legacybass}
          {$this do_groove}
       }
       {$this do_rail_warning}
@@ -332,7 +332,7 @@
          }
          {do
             {$this do_customhw_warn_on}
-            {if {modifier_mgr is_modifier_active mod_nohwwarn}
+            {if $nohwwarn
                {if_else {> [num_gems_combo] 28}
                   {$this do_customhw_streak}
                   {$this do_customhw_warn_off}
@@ -348,18 +348,18 @@
    )
    (do_customhw_warn_on
       {if {= {{{{get_track_panel} find crowd_meter} find drum.tnm} frame} 0.32}
-         {unless {modifier_mgr is_modifier_active mod_nohwwarn}
+         {unless $nohwwarn
             {{{get_drum_panel} find warning_track_emissive.anim} animate}
          }
       }
    )
    (do_customhw_streak
-      {if {modifier_mgr is_modifier_active mod_hwstreak} 
+      {if $hwstrk 
          {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
       }
    )
    (do_warning
-      {if_else {modifier_mgr is_modifier_active mod_nohwwarn}
+      {if_else $nohwwarn
          {unless {> [num_gems_combo] 28}
             {{{get_drum_panel} find indv_player_warning_off.trig} trigger}
             {{{get_drum_panel} find warning_track_emissive.anim} stop_animation}
@@ -381,7 +381,7 @@
       }
    )
    (do_rail_warning
-      {if {modifier_mgr is_modifier_active mod_railwarn}
+      {if $railwarn
          {if_else {> {{{{get_drum_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}}
@@ -390,7 +390,7 @@
    )
    (do_streak
       {if {> [num_gems_combo] 28}
-         {if {modifier_mgr is_modifier_active mod_hwstreak}
+         {if $hwstrk
             {$this do_customhw_warn_off}
             {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
          }

diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta
@@ -23,6 +23,9 @@
 ;strikeline texture
 {set $smasher "rb2dx"}
 
+;no gem dividers
+{set $nogemdividers FALSE}
+
 ;highway texture
 {set $highway "_1_none"}
 
@@ -85,8 +88,24 @@
 {set $track_fade_start 70} ;start point of the fadeout at the end of the track
 {set $track_fade_length 50} ;length of the fadeout at the end of the track
 
+;sustain style
+{set $sustains "rb2"}
+
 #ifndef HX_EE
-{modifier_mgr activate_modifier mod_hwalpha}
+;highway transparency
+{set $hwalpha TRUE}
+
+;legacy bass groove
+{set $legacybass FALSE}
+
+;streak on highway instead of overlay
+{set $hwstreak FALSE}
+
+;no highway warning
+{set $nohwwarn FALSE}
+
+;rail warning
+{set $railwarn FALSE}
 #endif
 ;{modifier_mgr activate_modifier mod_nofail}
 ;{modifier_mgr activate_modifier mod_doublespeed}
@@ -298,7 +317,7 @@
       }
       {if {== {elem $entry 0} {basename mod_legacybass}}
          {if {== {elem {find $entry mod_legacybass} 1} 1}
-            {modifier_mgr activate_modifier mod_legacybass}
+            {set $legacybass TRUE}
          }
       }
       {if {== {elem $entry 0} {basename mod_nosustain}}
@@ -318,7 +337,7 @@
       }
       {if {== {elem $entry 0} {basename mod_gemdivider}}
          {if {== {elem {find $entry mod_gemdivider} 1} 1}
-            {modifier_mgr activate_modifier mod_gemdivider}
+            {set $gemdividers TRUE}
          }
       }
       {if {== {elem $entry 0} {basename mod_nocrowd}}

diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta
@@ -1048,6 +1048,10 @@
 (os_trkset "Appearance")
 (os_tex "[CUSTOMIZE]")
 (os_tex1 "Customize Track Theme")
+(os_sus "Sustains")
+(os_hw_behavior "Highway Behavior")
+(os_strk_behavior "Streak Behavior")
+(os_warn_behavior "Low Health Behavior")
 (os_score "Score")
 (os_bre "Big Rock Ending")
 (os_voxtrk "Vocal Track...")
@@ -1078,6 +1082,19 @@
 (os_lrbprst "LEGO Rock Band")
 (os_tbrbprst "Beatles Rock Band")
 (os_trkresetmsg "This will reset everything used to set custom textures. If you do this after being in-game, it will do nothing.\nAre you sure?")
+(os_gemdiv1 "Gem Dividers: ON")
+(os_gemdiv0 "Gem Dividers: OFF")
+(os_hwalpha1 "Highway Transparency: ON")
+(os_hwalpha0 "Highway Transparency: OFF")
+(os_legacybass1 "Legacy Streak Behavior: ON")
+(os_legacybass0 "Legacy Streak Behavior: OFF")
+(os_hwstrk1 "Streak as Overlay: OFF")
+(os_hwstrk0 "Streak as Overlay: ON")
+(os_hwwarn1 "Highway Warning: ON")
+(os_hwwarn0 "Highway Warning: OFF")
+(os_railwarn1 "Warning On Rails: ON")
+(os_railwarn0 "Warning On Rails: OFF")
+;texture names
 (rb1 "Rock Band 1")
 (rb2 "Rock Band 2")
 (rb3 "Rock Band 3")