Rumble Fixes

Author: WuBoytH

fighters/sheik/src/acmd/smashes.rs

@@ -111,6 +111,30 @@ unsafe fn sheik_attack_hi4_effect(fighter: &mut L2CAgentBase) {
     }
 }
 
+#[acmd_script( agent = "sheik", script = "expression_attackhi4" , category = ACMD_EXPRESSION , low_priority)]
+unsafe fn sheik_attack_hi4_expression(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    if is_excute(fighter) {
+        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
+    }
+    frame(lua_state, 7.0);
+    sv_animcmd::execute(lua_state, 7.0);
+    if WorkModule::is_flag(boma, *FIGHTER_STATUS_ATTACK_FLAG_SMASH_SMASH_HOLD_TO_ATTACK) {
+        if is_excute(fighter) {
+            slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
+        }
+    }
+    frame(lua_state, 8.0);
+    if is_excute(fighter) {
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitl"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+    frame(lua_state, 10.0);
+    if is_excute(fighter) {
+        RUMBLE_HIT(fighter, Hash40::new("rbkind_attackl"), 0);
+    }
+}
+
 #[acmd_script( agent = "sheik", script = "game_attacklw4" , category = ACMD_GAME , low_priority)]
 unsafe fn sheik_attack_lw4_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
@@ -157,6 +181,7 @@ pub fn install() {
         sheik_attack_s4_s_game,
         sheik_attack_hi4_game,
         sheik_attack_hi4_effect,
+        sheik_attack_hi4_expression,
         sheik_attack_lw4_game,
     );
 }

fighters/sonic/src/acmd/aerials.rs

@@ -250,6 +250,24 @@ unsafe fn sonic_attack_air_hi_effect(fighter: &mut L2CAgentBase) {
 
 }
 
+#[acmd_script( agent = "sonic", script = "expression_attackairhi" , category = ACMD_EXPRESSION , low_priority)]
+unsafe fn sonic_attack_air_hi_expression(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    frame(lua_state, 4.0);
+    if is_excute(fighter) {
+        RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
+    }
+    frame(lua_state, 10.0);
+    if is_excute(fighter) {
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+    frame(lua_state, 13.0);
+    if is_excute(fighter) {
+        RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
+    }
+}
+
 #[acmd_script( agent = "sonic", script = "game_attackairlw" , category = ACMD_GAME , low_priority)]
 unsafe fn sonic_attack_air_lw_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
@@ -310,6 +328,7 @@ pub fn install() {
         sonic_attack_air_b_effect,
         sonic_attack_air_hi_game,
         sonic_attack_air_hi_effect,
+        sonic_attack_air_hi_expression,
         sonic_attack_air_lw_game,
     );
 }

fighters/toonlink/src/acmd/aerials.rs

@@ -219,15 +219,15 @@ unsafe extern "C" fn toonlink_attack_air_hi_expression(fighter: &mut L2CAgentBas
     }
     frame(lua_state, 11.0);
     if is_excute(fighter) {
-        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_spinattack"), 0);
+        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_pierces"), 0);
     }
     frame(lua_state, 31.0);
     if is_excute(fighter) {
         ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
     }
     frame(lua_state, 33.0);
     if is_excute(fighter) {
-        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_pierces"), 0);
+        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_piercem"), 0);
     }
     frame(lua_state, 55.0);
     if is_excute(fighter) {

fighters/wolf/src/acmd/specials.rs

@@ -141,6 +141,41 @@ unsafe fn wolf_special_lw_start_effect (fighter: &mut L2CAgentBase) {
     }
 }
 
+#[acmd_script( agent = "wolf", script = "expression_speciallwstart" , category = ACMD_EXPRESSION , low_priority)]
+unsafe fn wolf_special_lw_start_expression(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    if is_excute(fighter) {
+        ItemModule::set_have_item_visibility(boma, false, 0);
+        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE, *SLOPE_STATUS_LR);
+    }
+    frame(lua_state, 1.0);
+    if is_excute(fighter) {
+        RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
+    }
+    frame(lua_state, 3.0);
+    if is_excute(fighter) {
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_shield_on"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+}
+
+#[acmd_script( agent = "wolf", script = "expression_specialairlwstart" , category = ACMD_EXPRESSION , low_priority)]
+unsafe fn wolf_special_air_lw_start_expression(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    if is_excute(fighter) {
+        ItemModule::set_have_item_visibility(boma, false, 0);
+    }
+    frame(lua_state, 1.0);
+    if is_excute(fighter) {
+        RUMBLE_HIT(fighter, Hash40::new("rbkind_attacks"), 0);
+    }
+    frame(lua_state, 3.0);
+    if is_excute(fighter) {
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_shield_on"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+}
+
 #[acmd_script( agent = "wolf", scripts = ["sound_speciallwstart", "sound_specialairlwstart"] , category = ACMD_SOUND , low_priority)]
 unsafe fn wolf_special_lw_start_sound (fighter: &mut L2CAgentBase) {
 	let lua_state = fighter.lua_state_agent;
@@ -307,6 +342,8 @@ pub fn install() {
         wolf_special_s_effect,
         wolf_special_lw_start_effect,
         wolf_special_lw_start_sound,
+        wolf_special_lw_start_expression,
+        wolf_special_air_lw_start_expression,
 
         wolf_special_air_n_game,
         wolf_special_n_effect,