Update dx_countdown_funcs.dta

pulsed3x · Mar 18, 2024 · 00314da · 00314da
1 parent b9ba925
commit 00314da
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/_ark/dx/countdown/dx_countdown_funcs.dta b/_ark/dx/countdown/dx_countdown_funcs.dta
@@ -92,14 +92,14 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {{PLAYER_FEEDBACK_VOX find solo_start.trig} trigger}
                }
                {set $solo_box_up_vocals TRUE}
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {{PLAYER_FEEDBACK_00 find solo_start.trig} trigger}
                }
                {switch $dx_current_checked_slot
@@ -195,7 +195,7 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {PLAYER_FEEDBACK_VOX set_showing TRUE}
                   {PLAYER_FEEDBACK_VOX end_solo}
                   {{PLAYER_FEEDBACK_VOX find solo_end.trig} trigger}
@@ -207,7 +207,7 @@
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {PLAYER_FEEDBACK_00 set_showing TRUE}
                   {PLAYER_FEEDBACK_00 end_solo}
                   {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger}
@@ -356,13 +356,13 @@
    ;      {time
             #ifdef RB3DX
             {if {== $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_VOX_INT} #else set_text {sprintf "%d" SOLO_PERCENT_VOX_INT} #endif}
                }
             }
             #endif
             {if {!= $dx_current_checked_instrument vocals}
-               {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE}
+               {if {&& {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {! {&& {game want_coda} {game is_playing}}}}
                   {switch $dx_current_checked_instrument
                      ((guitar real_guitar)
                         {{PLAYER_FEEDBACK_00 find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_GUITAR_INT} #else set_text {sprintf "%d" SOLO_PERCENT_GUITAR_INT} #endif}