Merge pull request HDR-Development#2255 from robertyur/Sora-run-loop

Sora run loop fix

Author: WuBoytH

fighters/trail/src/acmd/other.rs

@@ -190,7 +190,6 @@ unsafe fn escape_air_game(fighter: &mut L2CAgentBase) {
 unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
     let boma = fighter.boma();
-    
     frame(lua_state, 29.0);
     if is_excute(fighter) {
         WorkModule::on_flag(boma, *FIGHTER_STATUS_ESCAPE_AIR_FLAG_SLIDE_ENABLE_CONTROL);
@@ -201,6 +200,25 @@ unsafe fn escape_air_slide_game(fighter: &mut L2CAgentBase) {
     }
 }
 
+#[acmd_script( agent = "trail", script = "sound_run" , category = ACMD_SOUND , low_priority)]
+unsafe fn run_sound(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    for _ in 0..i32::MAX {
+        frame(lua_state, 1.0);
+        if is_excute(fighter) {
+            PLAY_SE(fighter, Hash40::new("se_trail_step_right_l"));
+        }
+        frame(lua_state, 16.0);
+        if is_excute(fighter) {
+            PLAY_SE(fighter, Hash40::new("se_trail_step_left_l"));
+        }
+        fighter.clear_lua_stack();
+        sv_animcmd::wait_loop_sync_mot(lua_state);
+        fighter.pop_lua_stack(1);
+    }
+}
+
 pub fn install() {
     install_acmd_scripts!(
         escape_air_game,
@@ -212,6 +230,7 @@ pub fn install() {
         damageflylw_sound,
         damageflyn_sound,
         damageflyroll_sound,
-        damageflytop_sound
+        damageflytop_sound,
+        run_sound,
     );
 }

fighters/trail/src/acmd/smashes.rs

@@ -164,7 +164,6 @@ unsafe fn effect_attacklw4(fighter: &mut L2CAgentBase) {
     }
 }
 
-
 pub fn install() {
     install_acmd_scripts!(
         game_attacks4,

fighters/trail/src/opff.rs

@@ -317,17 +317,6 @@ unsafe fn training_cycle(fighter: &mut L2CFighterCommon, boma: &mut BattleObject
     }
 }
 
-// plays footstep sounds during sora's new run animation (acmd does not seem to work for this, as it will not loop)
-unsafe fn run_sfx(fighter: &mut L2CFighterCommon, frame: f32) {
-    if fighter.is_motion(Hash40::new("run")) {
-        if frame as i32 == 30 {
-            PLAY_SE(fighter, Hash40::new("se_trail_step_left_l"));
-        } else if frame as i32 == 16 {
-            PLAY_SE(fighter, Hash40::new("se_trail_step_right_l"));
-        }
-    }
-}
-
 unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
     if !fighter.is_in_hitlag()
     && !StatusModule::is_changing(fighter.module_accessor)
@@ -372,7 +361,6 @@ pub unsafe fn moveset(fighter: &mut smash::lua2cpp::L2CFighterCommon, boma: &mut
     side_special_walljump(boma, cat[0]);
     //aerial_sweep_hit_actionability(boma, frame);
     training_cycle(fighter, boma, frame);
-    run_sfx(fighter, frame);
     fastfall_specials(fighter);
 }