Frame Counter fixes

ryujinx_build.ps1

@@ -26,4 +26,4 @@ if(-not(Test-path $RYUJINX_PLUGIN_PATH -PathType leaf))
 }
 
 C:\Users\Josh\Documents\Games\Ryujinx\publish\Ryujinx.exe "C:\Users\Josh\Documents\Games\ROMs\Super Smash Bros Ultimate [Base Game]\Super Smash Bros Ultimate[01006A800016E000][US][v0].nsp"
-cargo skyline listen --ip=$IP
+# cargo skyline listen --ip=$IP

src/common/input.rs

@@ -216,9 +216,9 @@ bitflags! {
 
 // This requires some imports to work
 use training_mod_consts::{random_option, ToggleTrait};
-impl Buttons {
-    fn as_str(self) -> Option<&'static str> {
-        todo!();
+impl std::fmt::Display for Buttons {
+    fn fmt(&self, _f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        todo!()
     }
 }
 

src/training/frame_counter.rs

@@ -1,17 +1,27 @@
 static mut SHOULD_COUNT: Vec<bool> = vec![];
+static mut NO_RESET: Vec<bool> = vec![];
 static mut COUNTERS: Vec<u32> = vec![];
 
-pub fn register_counter() -> usize {
+fn _register_counter(no_reset: bool) -> usize {
     unsafe {
         let index = COUNTERS.len();
 
         COUNTERS.push(0);
         SHOULD_COUNT.push(false);
+        NO_RESET.push(no_reset);
 
         index
     }
 }
 
+pub fn register_counter_no_reset() -> usize {
+    _register_counter(true)
+}
+
+pub fn register_counter() -> usize {
+    _register_counter(false)
+}
+
 pub fn start_counting(index: usize) {
     unsafe {
         SHOULD_COUNT[index] = true;
@@ -81,6 +91,9 @@ pub fn tick() {
 pub fn reset_all() {
     unsafe {
         for (index, _frame) in COUNTERS.iter().enumerate() {
+            if NO_RESET[index] {
+                continue;
+            }
             full_reset(index);
         }
     }

src/training/input_log.rs

@@ -8,7 +8,7 @@ static mut FRAME_COUNTER: usize = 0;
 
 pub fn init() {
     unsafe {
-        FRAME_COUNTER = frame_counter::register_counter();
+        FRAME_COUNTER = frame_counter::register_counter_no_reset();
         frame_counter::start_counting(FRAME_COUNTER);
     }
 }
@@ -87,6 +87,8 @@ pub fn handle_final_input_mapping(
     unsafe {
         if player_idx == 0 {
             let current_frame = frame_counter::get_frame_count(FRAME_COUNTER);
+            // We should always be counting
+            frame_counter::start_counting(FRAME_COUNTER);
 
             let potential_input_log = InputLog {
                 ttl: 600,
@@ -95,6 +97,8 @@ pub fn handle_final_input_mapping(
                 smash_inputs: *out,
             };
 
+            let mut should_update_ttl = true;
+
             let input_logs = &mut *P1_INPUT_LOGS.lock();
             let latest_input_log = input_logs.first_mut().unwrap();
             // Use different "different" function depending on menu option
@@ -104,12 +108,15 @@ pub fn handle_final_input_mapping(
                 frame_counter::tick_idx(FRAME_COUNTER);
                 insert_in_front(input_logs, potential_input_log);
             } else {
+                let prev_frames = latest_input_log.frames;
+                // Only update TTL if we are on a new frame according to the latest log
+                should_update_ttl = prev_frames != current_frame;
                 latest_input_log.frames = std::cmp::min(current_frame, 99);
             }
 
             // For the remainder, decrease TTL
             for input_log in input_logs.iter_mut().take(NUM_LOGS).skip(1) {
-                if input_log.ttl > 0 {
+                if input_log.ttl > 0 && should_update_ttl {
                     input_log.ttl -= 1;
                 }
             }

src/training/ui/input_log.rs

@@ -29,7 +29,7 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
     log_pane.set_visible(!QUICK_MENU_ACTIVE);
     if log.ttl < 100 {
         // Fade out
-        let alpha = (log.ttl as f32 / 100.0) as u8 * 255;
+        let alpha = (log.ttl as f32 / 100.0 * 255.0) as u8;
         log_pane.alpha = alpha;
         log_pane.global_alpha = alpha;
     } else {
@@ -163,15 +163,14 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
         input_pane.set_text_string("");
     }
 
-    let lstick_x = match log.smash_binned_lstick() {
-        (DirectionStrength::Strong, angle) if angle > 0.0 => ">>",
-        (DirectionStrength::Weak, angle) if angle > 0.0 => ">",
-        (DirectionStrength::Weak, angle) if angle < 0.0 => "<",
-        (DirectionStrength::Strong, angle) if angle < 0.0 => "<<",
-        _ => "",
+    let (lstick_strength, lstick_angle) = log.smash_binned_lstick();
+    let lstick_icon = match lstick_strength {
+        DirectionStrength::Strong => ">>",
+        DirectionStrength::Weak => ">",
+        DirectionStrength::None => "",
     };
 
-    let lstick_icon_exists = !lstick_x.is_empty();
+    let lstick_icon_exists = !lstick_icon.is_empty();
     if lstick_icon_exists {
         let input_pane = log_pane
             .find_pane_by_name_recursive("InputTxt0")
@@ -180,7 +179,8 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
 
         input_pane.set_default_material_colors();
         input_pane.set_color(255, 255, 255, 255);
-        input_pane.set_text_string(lstick_x);
+        input_pane.set_text_string(lstick_icon);
+        input_pane.rot_z = lstick_angle;
     }
 
     for (idx, icon) in icons.iter().enumerate() {
@@ -198,11 +198,7 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
         set_colored_icon_text(input_pane, &vec![icon.0], icon.1);
     }
 
-    let frame_text = if log.frames > 0 {
-        format!("{}", log.frames)
-    } else {
-        "".to_string()
-    };
+    let frame_text = format!("{}", log.frames);
     log_pane
         .find_pane_by_name_recursive("FrameTxt")
         .unwrap()