Merge pull request #2234 from HDR-Development/killager

Revert "reimplement can canceling"

Author: SuddyN

fighters/murabito/src/acmd/specials.rs

@@ -25,20 +25,6 @@ unsafe fn murabito_special_lw1_game(fighter: &mut L2CAgentBase) {
     }
 }
 
-#[acmd_script( agent = "murabito", scripts = ["game_speciallw2", "game_specialairlw2"] , category = ACMD_GAME , low_priority)]
-unsafe fn game_speciallw2(fighter: &mut L2CAgentBase) {
-    let lua_state = fighter.lua_state_agent;
-    let boma = fighter.boma();
-    frame(lua_state, 5.0);
-    if is_excute(fighter) {
-        WorkModule::on_flag(boma, *FIGHTER_MURABITO_INSTANCE_WORK_ID_FLAG_WATER);
-    }
-    frame(lua_state, 31.0);
-    if is_excute(fighter) {
-        WorkModule::off_flag(boma, *FIGHTER_MURABITO_INSTANCE_WORK_ID_FLAG_WATER);
-    }
-}
-
 #[acmd_script( agent = "murabito", script = "game_speciallw3hit" , category = ACMD_GAME , low_priority)]
 unsafe fn murabito_special_lw3_hit_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
@@ -69,7 +55,6 @@ unsafe fn murabito_special_air_lw3_hit_game(fighter: &mut L2CAgentBase) {
 pub fn install() {
     install_acmd_scripts!(
         murabito_special_lw1_game,
-        game_speciallw2,
         murabito_special_lw3_hit_game,
         murabito_special_air_lw3_hit_game,
     );

fighters/murabito/src/opff.rs

@@ -4,10 +4,10 @@ use super::*;
 use globals::*;
 
 unsafe fn dspecial_cancels(boma: &mut BattleObjectModuleAccessor, situation_kind: i32, frame: f32) {
-    if frame < 12.0
-    || boma.is_button_on(Buttons::SpecialAll)
-    || StatusModule::is_changing(boma)
-    || !boma.is_status_one_of(&[*FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_AIR, 
+    if StatusModule::is_changing(boma) {
+        return;
+    }
+    if boma.is_status_one_of(&[*FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_AIR, 
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_DASH_B, 
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_DASH_F, 
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_JUMP,
@@ -17,13 +17,18 @@ unsafe fn dspecial_cancels(boma: &mut BattleObjectModuleAccessor, situation_kind
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_WALK_B,
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_WALK_BRAKE_B,
         *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_WALK_BRAKE_F,
-        *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_WALK_F]) {
-        return;
+        *FIGHTER_MURABITO_STATUS_KIND_SPECIAL_LW_WATER_WALK_F])
+    && frame > 12.0
+    && boma.is_button_on(Buttons::Guard) {
+        if situation_kind == *SITUATION_KIND_AIR {
+            WorkModule::unable_transition_term_group(boma, *FIGHTER_STATUS_TRANSITION_GROUP_CHK_AIR_ESCAPE);
+            ControlModule::clear_command_one(boma, *FIGHTER_PAD_COMMAND_CATEGORY1, *FIGHTER_PAD_CMD_CAT1_AIR_ESCAPE);
+            StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, false);
+        }
+        if situation_kind == *SITUATION_KIND_GROUND {
+            StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_WAIT, false);
+        }
     }
-    WorkModule::off_flag(boma, *FIGHTER_MURABITO_INSTANCE_WORK_ID_FLAG_WATER);
-    EffectModule::kill_kind(boma, Hash40::new("murabito_water"), false, false);
-    SoundModule::stop_se(boma, Hash40::new("se_murabito_special_l02"), 0);
-    CancelModule::enable_cancel(boma);
 }
 
 unsafe fn uspecial_cancels(boma: &mut BattleObjectModuleAccessor, situation_kind: i32, frame: f32) {