fix judgments on ps3/360, add debug option

hmxmilohax · Dec 17, 2024 · b483be1 · b483be1
1 parent 4205712
commit b483be1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/_ark/dx/locale/dx_locale_updates.dta b/_ark/dx/locale/dx_locale_updates.dta
@@ -1803,6 +1803,10 @@
    "Time Remain Dbg: ON")
 (os_time_remain_dbg_off
    "Time Remain Dbg: OFF")
+(os_judgment_dbg_on
+   "Judgment Dbg: ON")
+(os_judgment_dbg_off
+   "Judgment Dbg: OFF")
 (print_objects
    "Print Screen Objects")
 (debug_warning

diff --git a/_ark/dx/overshell/dx_advanced_states.dta b/_ark/dx/overshell/dx_advanced_states.dta
@@ -790,6 +790,7 @@
       {push_back $options print_objects}
       {push_back $options print_platform}
       {push_back $options {if_else $dx_time_remain_dbg os_time_remain_dbg_on os_time_remain_dbg_off}}
+      {push_back $options {if_else $dx_judgment_dbg os_judgment_dbg_on os_judgment_dbg_off}}
       {push_back $options os_cycleaspect} 
 
       {dx_state_setup dxState_Debug FALSE}
@@ -868,6 +869,16 @@
             DX_DEBUG_DATA
             {set $previous_state dxState_Debug}
          )
+         ((os_judgment_dbg_on os_judgment_dbg_off)
+            {set $dx_judgment_dbg {! $dx_judgment_dbg}}
+            {if_else $dx_judgment_dbg
+               {set $dx_tracked_changed os_judgment_dbg_on}
+               {set $dx_tracked_changed os_judgment_dbg_off}
+            }
+            {dx_state_pos_tracker}
+            DX_DEBUG_DATA
+            {set $previous_state dxState_Debug}
+         )
          (generate_updates_dta
             {set $tempwrite {find_exists $syscfg missing_song_data}}
             {foreach $entry {read_file "dx/song_updates/songs_yarg.dta"}

diff --git a/_ark/dx/track/callbacks/dx_track_callbacks.dta b/_ark/dx/track/callbacks/dx_track_callbacks.dta
@@ -129,17 +129,17 @@
                {set [timing] perfect}
                {if {>= [offset] 1} {set [timing] late}}
                {if {<= [offset] -1} {set [timing] early}}
-               {set $dx_wii_window_offset 66.73340006673341}
+               #ifdef HX_WII {set $dx_wii_window_offset 66.73340006673341} #endif
                {cond
-                  ({&& {< [offset] #ifdef HX_WII {+ #endif 25 #ifdef HX_WII $dx_wii_window_offset} #endif} {> [offset] #ifdef HX_WII {+ #endif -25 #ifdef HX_WII $dx_wii_window_offset} #endif}} 
+                  ({&& {< [offset] #ifdef HX_WII {+ 25 $dx_wii_window_offset} #else 25 #endif} {> [offset] #ifdef HX_WII {+ -25 $dx_wii_window_offset} #else -25 #endif}}
                      {dx_perfect_hit $dx_perfects_indicator [track_instrument] [player] [slot] $dx_detailed_hit_stats [timing] perfect}
                      {++ [perfects]} ;increment local counter
                      {dx_perfect_hit_ctr $dx_perfects_ctr [player] [slot] $dx_detailed_hit_stats [perfects]} ;fire on screen
                   )
-                  ({&& {< [offset] #ifdef HX_WII {+ #endif 40 #ifdef HX_WII $dx_wii_window_offset} #endif} {> [offset] #ifdef HX_WII {+ #endif -40 #ifdef HX_WII $dx_wii_window_offset} #endif}} 
+                  ({&& {< [offset] #ifdef HX_WII {+ 40 $dx_wii_window_offset} #else 40 #endif} {> [offset] #ifdef HX_WII {+ -40 $dx_wii_window_offset} #else 40 #endif}}
                      {dx_perfect_hit $dx_perfects_indicator [track_instrument] [player] [slot] $dx_detailed_hit_stats [timing] great}
                   )
-                  ({&& {< [offset] #ifdef HX_WII {+ #endif 55 #ifdef HX_WII $dx_wii_window_offset} #endif} {> [offset] #ifdef HX_WII {+ #endif -55 #ifdef HX_WII $dx_wii_window_offset} #endif}} 
+                  ({&& {< [offset] #ifdef HX_WII {+ 55 $dx_wii_window_offset} #else 55 #endif} {> [offset] #ifdef HX_WII {+ -55 $dx_wii_window_offset} #else -55 #endif}}
                      {dx_perfect_hit $dx_perfects_indicator [track_instrument] [player] [slot] $dx_detailed_hit_stats [timing] good}
                   )
                   {dx_perfect_hit $dx_perfects_indicator [track_instrument] [player] [slot] $dx_detailed_hit_stats [timing] bad}
@@ -155,12 +155,14 @@
                ;}
                {set [total] {+ [total] [offset]}}
                ;debug, show values
-               ;{{coop_track_panel find tracker_broadcast_display} set_showing TRUE}
-               ;{{{coop_track_panel find tracker_broadcast_display} find band_message.lbl} set_showing TRUE}
-               ;{{coop_track_panel find tracker_broadcast_display} set_challenge_type kTrackerChallengeType_Streak}
-               ;{{coop_track_panel find tracker_broadcast_display} set_display_type kBroadcastTrackerDisplay_BandMessage}
-               ;{{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint $sprinting}}}
-               ;{{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint "Accuracy: " #ifdef HX_WII {- #endif [offset] #ifdef HX_WII $dx_wii_window_offset} #endif " Avg: " #ifdef HX_WII {- #endif {/ [total] [num_gems_hit]} #ifdef HX_WII $dx_wii_window_offset} #endif}}}
+               {if $dx_judgment_dbg
+                  {{coop_track_panel find tracker_broadcast_display} set_showing TRUE}
+                  {{{coop_track_panel find tracker_broadcast_display} find band_message.lbl} set_showing TRUE}
+                  {{coop_track_panel find tracker_broadcast_display} set_challenge_type kTrackerChallengeType_Streak}
+                  {{coop_track_panel find tracker_broadcast_display} set_display_type kBroadcastTrackerDisplay_BandMessage}
+                  {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint $sprinting}}}
+                  {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint "Accuracy: " #ifdef HX_WII {- [offset] $dx_wii_window_offset} #else [offset] #endif " Avg: " #ifdef HX_WII {- {/ [total] [num_gems_hit]} $dx_wii_window_offset} #else {/ [total] [num_gems_hit]} #endif}}}
+               }
             }
          }
       )