Side B4 Back Reimpl

Author: WuBoytH

dynamic/src/consts.rs

@@ -942,7 +942,10 @@ pub mod vars {
         pub mod instance {
             // flags
             pub const TRAIL_EFFECT: i32 = 0x0100;
-            pub const REVERSE_SIDEB: i32 = 0x0101;
+        }
+        pub mod status {
+            // flags
+            pub const SIDE_B_REVERSE : i32 = 0x1150;
         }
     }
 

fighters/roy/src/acmd/specials.rs

@@ -330,12 +330,6 @@ unsafe fn roy_special_air_n_end3_game(fighter: &mut L2CAgentBase) {
 unsafe fn game_specials1(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
     let boma = fighter.boma();
-
-    frame(lua_state, 1.0);
-    if is_excute(fighter) {
-        VarModule::off_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-    }
-
     frame(lua_state, 6.0);
     if is_excute(fighter) {
         ATTACK(fighter, 0, 0, Hash40::new("colonells"), 5.0, 60, 25, 0, 50, 2.34, 0.0, 0.0, 0.0, None, None, None, 0.9, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 3, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_cutup"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_ROY_HIT, *ATTACK_REGION_SWORD);

fighters/roy/src/opff.rs

@@ -3,32 +3,6 @@ utils::import_noreturn!(common::opff::fighter_common_opff);
 use super::*;
 use globals::*;
 
-pub unsafe fn double_edge_dance_backwards(fighter: &mut L2CFighterCommon) {
-    if StatusModule::status_kind(fighter.module_accessor) == *FIGHTER_ROY_STATUS_KIND_SPECIAL_S3 {
-        if StatusModule::situation_kind(fighter.module_accessor) == *SITUATION_KIND_GROUND {
-            if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_MARTH_STATUS_SPECIAL_S_FLAG_MOTION_CHANGE_ENABLE) {
-                let lrc = PostureModule::lr(fighter.module_accessor);
-                let stick_x = ControlModule::get_stick_x(fighter.module_accessor);
-                if lrc == 1.0 && stick_x < 0.0 && ControlModule::check_button_on(fighter.module_accessor, *CONTROL_PAD_BUTTON_SPECIAL){
-                } else if lrc == -1.0 && stick_x > 0.0 && ControlModule::check_button_on(fighter.module_accessor, *CONTROL_PAD_BUTTON_SPECIAL) {
-                    VarModule::on_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-                }
-            }
-        }
-        else if StatusModule::situation_kind(fighter.module_accessor) == *SITUATION_KIND_AIR {
-            if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_MARTH_STATUS_SPECIAL_S_FLAG_MOTION_CHANGE_ENABLE) {
-                let lrc = PostureModule::lr(fighter.module_accessor);
-                let stick_x = ControlModule::get_stick_x(fighter.module_accessor);
-                if lrc == 1.0 && stick_x < 0.0 && ControlModule::check_button_on(fighter.module_accessor, *CONTROL_PAD_BUTTON_SPECIAL) {
-                    VarModule::on_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-                } else if lrc == -1.0 && stick_x > 0.0 && ControlModule::check_button_on(fighter.module_accessor, *CONTROL_PAD_BUTTON_SPECIAL) {
-                    VarModule::on_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-                }
-            }
-        }
-    }
-}
-
 pub unsafe fn double_edge_dance_vertical_momentum(boma: &mut BattleObjectModuleAccessor){
     let fighter_gravity = KineticModule::get_energy(boma, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY) as *mut FighterKineticEnergyGravity;
     if boma.is_status_one_of(&[*FIGHTER_STATUS_KIND_SPECIAL_S, *FIGHTER_ROY_STATUS_KIND_SPECIAL_S2]) && boma.is_situation(*SITUATION_KIND_AIR) {
@@ -66,9 +40,14 @@ pub unsafe fn double_edge_dance_during_hitlag(fighter: &mut L2CFighterCommon) {
             if enable_hi_lw == 0 {
                 return;
             }
+            let stick_x = fighter.global_table[STICK_X].get_f32();
             let stick_y = fighter.global_table[STICK_Y].get_f32();
             let squat_stick_y = WorkModule::get_param_float(fighter.module_accessor, hash40("common"), hash40("squat_stick_y"));
-            if stick_y > -squat_stick_y {
+            let lr = PostureModule::lr(fighter.module_accessor);
+            if fighter.is_status(*FIGHTER_ROY_STATUS_KIND_SPECIAL_S3) && stick_x * lr < squat_stick_y {
+                VarModule::on_flag(fighter.battle_object, vars::roy::status::SIDE_B_REVERSE);
+            }
+            else if stick_y > -squat_stick_y {
                 WorkModule::on_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_INPUT_HI);
             }
             else if stick_y < squat_stick_y {
@@ -128,7 +107,6 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
 
 pub unsafe fn moveset(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, id: usize, cat: [i32 ; 4], status_kind: i32, situation_kind: i32, motion_kind: u64, stick_x: f32, stick_y: f32, facing: f32, frame: f32) {
     double_edge_dance_vertical_momentum(boma);
-    double_edge_dance_backwards(fighter);
     double_edge_dance_during_hitlag(fighter);
     up_special_proper_landing(fighter);
     fastfall_specials(fighter);

fighters/roy/src/status.rs

@@ -5,7 +5,7 @@ use globals::*;
 pub fn install() {
     install_status_scripts!(
         init_specials,
-        special_s_back
+        special_s4_main
     );
 }
 
@@ -16,40 +16,6 @@ pub fn set_gravity_delay_resume_frame(energy: *mut FighterKineticEnergyGravity,
     }
   }
 
-#[status_script(agent = "roy", status = FIGHTER_ROY_STATUS_KIND_SPECIAL_S4, condition = LUA_SCRIPT_STATUS_FUNC_STATUS_MAIN)]
-pub unsafe fn special_s_back(fighter: &mut L2CFighterCommon) -> L2CValue {
-    if VarModule::is_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB) {
-        let lrc = PostureModule::lr(fighter.module_accessor);
-        let stick_x = ControlModule::get_stick_x(fighter.module_accessor);
-
-        if fighter.global_table[SITUATION_KIND] == SITUATION_KIND_GROUND {
-            MotionModule::change_motion_inherit_frame(fighter.module_accessor, Hash40::new("special_s4_back"), 0.0, 1.0, 0.0, false, false);
-            VarModule::off_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-
-            if lrc == 1.0 && stick_x < 0.0 {
-                PostureModule::set_lr(fighter.module_accessor, -1.0);
-            } else if lrc == -1.0 && stick_x > 0.0 {
-                PostureModule::set_lr(fighter.module_accessor, 1.0);
-            }
-
-            return 0.into();
-        } else {
-            MotionModule::change_motion_inherit_frame(fighter.module_accessor, Hash40::new("special_air_s4_back"), 0.0, 1.0, 0.0, false, false);
-            VarModule::off_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB);
-
-            if lrc == 1.0 && stick_x < 0.0 {
-                PostureModule::set_lr(fighter.module_accessor, -1.0);
-            } else if lrc == -1.0 && stick_x > 0.0 {
-                PostureModule::set_lr(fighter.module_accessor, 1.0);
-            }
-
-            return 0.into();
-        }
-    }
-
-    original!(fighter)
-}
-
 #[status_script(agent = "roy", status = FIGHTER_STATUS_KIND_SPECIAL_S, condition = LUA_SCRIPT_STATUS_FUNC_INIT_STATUS)]
 pub unsafe fn init_specials(fighter: &mut L2CFighterCommon, arg: u64) -> L2CValue {
     let fighter_kind = WorkModule::get_int(fighter.module_accessor, *FIGHTER_INSTANCE_WORK_ID_INT_KIND);
@@ -111,10 +77,6 @@ pub unsafe fn init_specials(fighter: &mut L2CFighterCommon, arg: u64) -> L2CValu
             smash::app::lua_bind::KineticEnergy::enable(motion_energy);
             smash::app::lua_bind::KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_STOP);
             smash::app::lua_bind::KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_GRAVITY);
-
-            if VarModule::is_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB) {
-                MotionModule::change_motion(fighter.module_accessor, Hash40::new("special_s4_back"), 0.0, 1.0, false, 0.0, false, false);
-            }
         }
         else if current_situation_kind == *SITUATION_KIND_AIR {
             let reset_speed_2f = smash::phx::Vector2f { x: 0.0, y: 0.0 };
@@ -123,13 +85,98 @@ pub unsafe fn init_specials(fighter: &mut L2CFighterCommon, arg: u64) -> L2CValu
             smash::app::lua_bind::KineticEnergy::reset_energy(gravity_energy, *ENERGY_GRAVITY_RESET_TYPE_GRAVITY, &reset_speed_2f, &reset_speed_3f, fighter.module_accessor);
             smash::app::lua_bind::KineticEnergy::enable(stop_energy);
             smash::app::lua_bind::KineticEnergy::enable(gravity_energy);
-
-            if VarModule::is_flag(fighter.battle_object, vars::roy::instance::REVERSE_SIDEB) {
-                MotionModule::change_motion(fighter.module_accessor, Hash40::new("special_air_s4_back"), 0.0, 1.0, false, 0.0, false, false);
-            }
         }
     }
     KineticModule::unable_energy(fighter.module_accessor, *FIGHTER_KINETIC_ENERGY_ID_CONTROL);
 
     0.into()
-}
+}
+
+#[status_script(agent = "roy", status = FIGHTER_ROY_STATUS_KIND_SPECIAL_S4, condition = LUA_SCRIPT_STATUS_FUNC_STATUS_MAIN)]
+pub unsafe fn special_s4_main(fighter: &mut L2CFighterCommon, arg: u64) -> L2CValue {
+    WorkModule::off_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_CONTINUE_MOT);
+    let mot = if VarModule::is_flag(fighter.battle_object, vars::roy::status::SIDE_B_REVERSE) {
+        (hash40("special_s4_back") as i64, hash40("special_air_s4_back") as i64)
+    }
+    else if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_INPUT_LW) {
+        (hash40("special_s4_lw") as i64, hash40("special_air_s4_lw") as i64)
+    }
+    else if WorkModule::is_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_INPUT_HI) {
+        (hash40("special_s4_hi") as i64, hash40("special_air_s4_hi") as i64)
+    }
+    else {
+        (hash40("special_s4_s") as i64, hash40("special_air_s4_s") as i64)
+    };
+    WorkModule::set_int64(fighter.module_accessor, mot.0, *FIGHTER_ROY_STATUS_SPECIAL_S_WORK_INT_MOTION_KIND);
+    WorkModule::set_int64(fighter.module_accessor, mot.1, *FIGHTER_ROY_STATUS_SPECIAL_S_WORK_INT_MOTION_KIND_AIR);
+    VarModule::off_flag(fighter.battle_object, vars::roy::status::SIDE_B_REVERSE);
+    WorkModule::off_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_INPUT_HI);
+    WorkModule::off_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_INPUT_LW);
+    fighter.sub_shift_status_main(L2CValue::Ptr(special_s4_main_loop as *const () as _))
+}
+
+unsafe extern "C" fn special_s4_main_loop(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if !StatusModule::is_changing(fighter.module_accessor) {
+        if StatusModule::is_situation_changed(fighter.module_accessor) {
+            special_s_mot_helper(fighter);
+        }
+    }
+    else {
+        special_s_mot_helper(fighter);
+    }
+    if CancelModule::is_enable_cancel(fighter.module_accessor) {
+        if fighter.sub_wait_ground_check_common(false.into()).get_bool()
+        || fighter.sub_air_check_fall_common().get_bool() {
+            return 0.into();
+        }
+    }
+    if MotionModule::is_end(fighter.module_accessor) {
+        let sit = fighter.global_table[SITUATION_KIND].get_i32();
+        if sit != *SITUATION_KIND_GROUND {
+            fighter.change_status(FIGHTER_STATUS_KIND_FALL.into(), false.into());
+        }
+        else {
+            fighter.change_status(FIGHTER_STATUS_KIND_WAIT.into(), false.into());
+        }
+    }
+    0.into()
+}
+
+unsafe extern "C" fn special_s_mot_helper(fighter: &mut L2CFighterCommon) {
+    let sit = fighter.global_table[SITUATION_KIND].get_i32();
+    let correct;
+    let mot;
+    if sit != *SITUATION_KIND_GROUND {
+        correct = *GROUND_CORRECT_KIND_AIR;
+        mot = WorkModule::get_int64(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_WORK_INT_MOTION_KIND_AIR);
+    }
+    else {
+        correct = *GROUND_CORRECT_KIND_GROUND_CLIFF_STOP;
+        mot = WorkModule::get_int64(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_WORK_INT_MOTION_KIND);
+    }
+    GroundModule::correct(fighter.module_accessor, GroundCorrectKind(correct));
+    if !WorkModule::is_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_CONTINUE_MOT) {
+        MotionModule::change_motion(
+            fighter.module_accessor,
+            Hash40::new_raw(mot),
+            0.0,
+            1.0,
+            false,
+            0.0,
+            false,
+            false
+        );
+        WorkModule::on_flag(fighter.module_accessor, *FIGHTER_ROY_STATUS_SPECIAL_S_FLAG_CONTINUE_MOT);
+    }
+    else {
+        MotionModule::change_motion_inherit_frame(
+            fighter.module_accessor,
+            Hash40::new_raw(mot),
+            -1.0,
+            1.0,
+            0.0,
+            false,
+            false
+        );
+    }
+}

romfs/source/fighter/roy/motion/body/motion_patch.yaml

@@ -171,7 +171,7 @@ attack_lw4:
 special_s4_back:
     game_script: game_specials4back
     flags:
-      turn: false
+      turn: true
       loop: false
       move: true
       fix_trans: false
@@ -201,7 +201,7 @@ special_s4_back:
 special_air_s4_back:
     game_script: game_specials4back
     flags:
-      turn: false
+      turn: true
       loop: false
       move: true
       fix_trans: false