fixes neutral b cancels and unfloat confusion for SL2

Author: jaccob101

fighters/mewtwo/src/acmd/specials.rs

@@ -50,11 +50,6 @@ unsafe extern "C" fn mewtwo_special_s_effect(fighter: &mut L2CAgentBase) {
     if is_excute(fighter) {
         EFFECT_FOLLOW_FLIP(fighter, Hash40::new("mewtwo_pk_hand"), Hash40::new("mewtwo_pk_hand"), Hash40::new("havel"), -1.5, 0, 2, 0, 0, 0, 0.4, true, *EF_FLIP_YZ);
     }
-    frame(lua_state, 8.0);
-    if is_excute(fighter) {
-        EFFECT(fighter, Hash40::new("sys_smash_flash_s"), Hash40::new("top"), 0, 8, 13, 0, 0, 0, 1.0, 0, 0, 0, 0, 0, 0, true);
-        LAST_EFFECT_SET_ALPHA(fighter, 0.8);
-    }
     frame(lua_state, 10.0);
     if is_excute(fighter) {
         EFFECT_FOLLOW_NO_STOP(fighter, Hash40::new("mewtwo_nenriki"), Hash40::new("top"), 0, 9, 17, 0, 90, 0, 0.45, true);

fighters/mewtwo/src/opff.rs

@@ -67,29 +67,6 @@ unsafe fn dj_upB_jump_refresh(fighter: &mut L2CFighterCommon) {
     }
 }
 
-unsafe fn nspecial_cancels(boma: &mut BattleObjectModuleAccessor, status_kind: i32, situation_kind: i32) {
-    //PM-like neutral-b canceling
-    if status_kind == *FIGHTER_MEWTWO_STATUS_KIND_SPECIAL_N_CANCEL {
-        if situation_kind == *SITUATION_KIND_AIR {
-            if WorkModule::get_int(boma, *FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS) == *FIGHTER_STATUS_KIND_ESCAPE_AIR {
-                WorkModule::set_int(boma, *STATUS_KIND_NONE, *FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS);
-            }
-            if MotionModule::is_end(boma) {
-                StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL_AERIAL, false);
-            }
-        }
-    }
-}
-
-unsafe fn unfloat_confusion(fighter: &mut smash::lua2cpp::L2CFighterCommon, status_kind: i32) {
-    if status_kind == FIGHTER_STATUS_KIND_SPECIAL_S
-    && StatusModule::is_changing(fighter.module_accessor)
-    && fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0
-    && fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) < VarModule::get_int(fighter.battle_object, vars::common::instance::FLOAT_DURATION) {
-        fighter.on_flag(*FIGHTER_MEWTWO_INSTANCE_WORK_ID_FLAG_SPECIAL_S_BUOYANCY);
-    }
-}
-
 pub unsafe fn mewtwo_teleport_wall_ride(fighter: &mut smash::lua2cpp::L2CFighterCommon, boma: &mut BattleObjectModuleAccessor, status_kind: i32, id: usize) {
     // Wall Ride momentum fixes
     let touch_right = GroundModule::is_wall_touch_line(boma, *GROUND_TOUCH_FLAG_RIGHT_SIDE as u32);
@@ -156,8 +133,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) {
     actionable_teleport_air(fighter, boma, id, status_kind, situation_kind, frame);
-    nspecial_cancels(boma, status_kind, situation_kind);
-    unfloat_confusion(fighter, status_kind);
     mewtwo_teleport_wall_ride(fighter, boma, status_kind, id);
     dj_upB_jump_refresh(fighter);
     fastfall_specials(fighter);

fighters/mewtwo/src/status.rs

@@ -10,8 +10,72 @@ pub unsafe extern "C" fn attack_air(fighter: &mut L2CFighterCommon) -> L2CValue
     common::djc::attack_air_main_status(fighter)
 }
 
+// FIGHTER_MEWTWO_STATUS_KIND_SPECIAL_N_CANCEL //
+
+unsafe extern "C" fn special_n_cancel_main(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if fighter.global_table[SITUATION_KIND] == SITUATION_KIND_GROUND {
+        GroundModule::correct(fighter.module_accessor, GroundCorrectKind(*GROUND_CORRECT_KIND_GROUND_CLIFF_STOP));
+        KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_GROUND_STOP);
+        MotionModule::change_motion(fighter.module_accessor, Hash40::new("special_n_cancel"), 0.0, 1.0, false, 0.0, false, false);
+    } else {
+        if fighter.get_int(*FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS) == *FIGHTER_STATUS_KIND_JUMP_AERIAL {
+            fighter.change_status(FIGHTER_STATUS_KIND_JUMP_AERIAL.into(), false.into());
+        } // jump cancel
+        else {
+            GroundModule::correct(fighter.module_accessor, GroundCorrectKind(*GROUND_CORRECT_KIND_AIR));
+            KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_AIR_STOP);
+            MotionModule::change_motion(fighter.module_accessor, Hash40::new("special_air_n_cancel"), 0.0, 1.0, false, 0.0, false, false);
+        }
+    }
+    let status = fighter.get_int(*FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS);
+    if status == *STATUS_KIND_NONE || status == *FIGHTER_STATUS_KIND_GUARD_ON {fighter.set_int(*FIGHTER_STATUS_KIND_WAIT,*FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS); }
+    ControlModule::set_add_jump_mini_button_life(fighter.module_accessor, 8);
+    fighter.main_shift(special_n_cancel_main_loop)
+}
+
+unsafe extern "C" fn special_n_cancel_main_loop(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if fighter.global_table[PREV_SITUATION_KIND] == SITUATION_KIND_GROUND && fighter.global_table[SITUATION_KIND] == SITUATION_KIND_AIR {
+        GroundModule::correct(fighter.module_accessor, GroundCorrectKind(*GROUND_CORRECT_KIND_AIR));
+        KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_AIR_STOP);
+        MotionModule::change_motion_inherit_frame(fighter.module_accessor, Hash40::new("special_air_n_cancel"), -1.0, 1.0, 0.0, false, false);
+    }
+    else if fighter.global_table[PREV_SITUATION_KIND] == SITUATION_KIND_AIR && fighter.global_table[SITUATION_KIND] == SITUATION_KIND_GROUND {
+        fighter.set_int(*FIGHTER_STATUS_KIND_WAIT, *FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS);
+        GroundModule::correct(fighter.module_accessor, GroundCorrectKind(*GROUND_CORRECT_KIND_GROUND_CLIFF_STOP));
+        KineticModule::change_kinetic(fighter.module_accessor, *FIGHTER_KINETIC_TYPE_GROUND_STOP);
+        MotionModule::change_motion_inherit_frame(fighter.module_accessor, Hash40::new("special_n_cancel"), -1.0, 1.0, 0.0, false, false);
+    }
+    if CancelModule::is_enable_cancel(fighter.module_accessor) {
+        if fighter.is_situation(*SITUATION_KIND_GROUND) {
+            let status = fighter.get_int(*FIGHTER_MEWTWO_SPECIAL_N_STATUS_WORK_ID_INT_CANCEL_STATUS);
+            fighter.change_status(L2CValue::I32(status).into(), false.into());
+            return 1.into();
+        }
+        if fighter.sub_air_check_fall_common().get_bool()
+        || fighter.sub_wait_ground_check_common(false.into()).get_bool() {
+            return 0.into();
+        }
+    }    
+    if MotionModule::is_end(fighter.module_accessor) {
+        if fighter.is_situation(*SITUATION_KIND_GROUND) {fighter.change_status(FIGHTER_STATUS_KIND_WAIT.into(), false.into()); }
+        else {fighter.change_status(FIGHTER_STATUS_KIND_FALL_AERIAL.into(), false.into()); }
+    }
+    return 0.into();
+}
+
+// FIGHTER_STATUS_KIND_SPECIAL_S //
+
+pub unsafe extern "C" fn special_s_pre(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if fighter.is_flag(*FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
+        fighter.on_flag(*FIGHTER_MEWTWO_INSTANCE_WORK_ID_FLAG_SPECIAL_S_BUOYANCY);
+    }
+    smashline::original_status(Pre, fighter, *FIGHTER_STATUS_KIND_SPECIAL_S)(fighter)
+}
+
 pub fn install() {
     smashline::Agent::new("mewtwo")
         .status(Main, *FIGHTER_STATUS_KIND_ATTACK_AIR, attack_air)
+        .status(Main, *FIGHTER_MEWTWO_STATUS_KIND_SPECIAL_N_CANCEL, special_n_cancel_main)
+        .status(Pre, *FIGHTER_STATUS_KIND_SPECIAL_S, special_s_pre)
         .install();
 }