fix vocal progress bar and add harms

hmxmilohax · Nov 5, 2024 · 69f879f · 69f879f
1 parent 3ead866
commit 69f879f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/_ark/dx/locale/dx_locale_updates.dta b/_ark/dx/locale/dx_locale_updates.dta
@@ -71,7 +71,8 @@
 (inst_icon_drum "<alt>D</alt>")
 (inst_icon_keys "<alt>K</alt>")
 (inst_icon_vocals "<alt>V</alt>")
-(inst_icon_harm "<alt>3</alt>")
+(inst_icon_harm2 "<alt>2</alt>")
+(inst_icon_harm3 "<alt>3</alt>")
 (inst_icon_real_guitar "<alt>g</alt>")
 (inst_icon_real_bass "<alt>b</alt>")
 (inst_icon_real_drum "<alt>d</alt>")

diff --git a/_ark/dx/track/hud_ui/dx_hud_ui_funcs.dta b/_ark/dx/track/hud_ui/dx_hud_ui_funcs.dta
@@ -197,7 +197,9 @@
             ((drum real_drum) inst_icon_drum)
             ((keys real_keys) inst_icon_keys)
             (vocals inst_icon_vocals)
-            (harm inst_icon_harm)
+            (harm2 inst_icon_harm2)
+            (harm3 inst_icon_harm3)
+            inst_icon_guitar
          }
       }
       #endif
@@ -227,8 +229,27 @@
             ((real_bass bass) {set $size2 {size $bass_note_tracker}} {set $outarray $bass_note_tracker} {set $progress_bar_inst bass})
             ((real_drum drum) {set $size3 {size $drum_note_tracker}} {set $outarray $drum_note_tracker} {set $progress_bar_inst drum})
             ((real_keys keys) {set $size4 {size $keys_note_tracker}} {set $outarray $keys_note_tracker} {set $progress_bar_inst keys})
-            (vocals {set $size5 {size $vocals_note_tracker}} {set $outarray $vocals_note_tracker} {set $progress_bar_inst vocals})
-            ;(harm {set $size6 {size $harm_note_tracker}} {set $outarray $harm_note_tracker} {set $progress_bar_inst harm})
+            (vocals
+               {if_else {== {{$player get_user} get_track_icon} $dx_icon_harmony_2}
+                  {do
+                     {set $size6 {size $harm_note_tracker}}
+                     {set $outarray $harm_note_tracker}
+                     {set $progress_bar_inst harm2}
+                  }
+                  {if_else {== {{$player get_user} get_track_icon} $dx_icon_harmony_3}
+                     {do
+                        {set $size6 {size $harm_note_tracker}}
+                        {set $outarray $harm_note_tracker}
+                        {set $progress_bar_inst harm3}
+                     }
+                     {do
+                        {set $size5 {size $vocals_note_tracker}}
+                        {set $outarray $vocals_note_tracker}
+                        {set $progress_bar_inst vocals}
+                     }
+                  }
+               }
+            )
          }
          {set $this_local_player_count {+ $this_local_player_count 1}}
          {if {> $this_local_player_count 1}
@@ -253,10 +274,13 @@
                {set $outarray $vocals_note_tracker}
                {set $progress_bar_inst vocals}
             }
-            ;{if {&& {> $size6 $size1} {> $size6 $size2} {> $size6 $size3} {> $size6 $size4} {> $size6 $size5}}
-            ;   {set $outarray $harm_note_tracker}
-            ;   {set $progress_bar_inst harm}
-            ;}
+            {if {&& {> $size6 $size1} {> $size6 $size2} {> $size6 $size3} {> $size6 $size4} {> $size6 $size5}}
+               {set $outarray $harm_note_tracker}
+               {if_else {== {{$player get_user} get_track_icon} $dx_icon_harmony_2}
+                  {set $progress_bar_inst harm2}
+                  {set $progress_bar_inst harm3}
+               }
+            }
          }
       }
    }
@@ -270,6 +294,12 @@
          ((real_bass bass) {set $out_end $dx_final_note_bass})
          ((real_drum drum) {set $out_end $dx_final_note_drum})
          ((real_keys keys) {set $out_end $dx_final_note_keys})
+         (vocals
+            {if_else {> {$player get_singer_count} 1}
+               {set $out_end $dx_final_note_harm}
+               {set $out_end $dx_final_note_vocals}
+            }
+         )
       }
    }
    $out_end