Disable up special changes (for now)

Author: SkewedAskew

fighters/common/src/function_hooks/edge_slipoffs.rs

@@ -190,6 +190,9 @@ unsafe fn check_fighter_edge_slipoffs(boma: &mut BattleObjectModuleAccessor) ->
 
     // DAISY
     if (fighter_kind == *FIGHTER_KIND_DAISY && status_kind == *FIGHTER_PEACH_STATUS_KIND_SPECIAL_S_AWAY_END) { return true.into(); }
+
+    // SEPHIROTH
+    if (fighter_kind == *FIGHTER_KIND_EDGE && status_kind == *FIGHTER_EDGE_STATUS_KIND_SPECIAL_HI_RUSH) { return true.into(); }
 
     // YOSHI
     if (fighter_kind == *FIGHTER_KIND_YOSHI && status_kind == *FIGHTER_STATUS_KIND_SPECIAL_HI) { return true.into(); }

fighters/edge/src/acmd/ground.rs

@@ -1,4 +1,3 @@
-
 use super::*;
 
 #[acmd_script( agent = "edge", script = "game_attack11", category = ACMD_GAME, low_priority )]
@@ -31,6 +30,31 @@ unsafe fn sephiroth_attack_11_game(fighter: &mut L2CAgentBase) {
     }
 }
 
+#[acmd_script( agent = "edge", script = "expression_attack11", category = ACMD_EXPRESSION, low_priority )]
+unsafe fn sephiroth_attack_11_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, 3.0);
+    if is_excute(fighter) {
+        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE_INTP, *SLOPE_STATUS_R, 4);
+    }
+    frame(lua_state, 4.5);
+    if is_excute(fighter) {
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+    frame(lua_state, 6.5);
+    if is_excute(fighter) {
+        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
+    }
+    frame(lua_state, 35.0);
+    if is_excute(fighter) {
+        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE_INTP, *SLOPE_STATUS_LR, 13);
+    }
+}
+
 #[acmd_script( agent = "edge", script = "game_attack12", category = ACMD_GAME, low_priority )]
 unsafe fn sephiroth_attack_12_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
@@ -134,31 +158,6 @@ unsafe fn sephiroth_attack_13_effect(fighter: &mut L2CAgentBase) {
 
 }
 
-#[acmd_script( agent = "edge", script = "expression_attack11", category = ACMD_EXPRESSION, low_priority )]
-unsafe fn sephiroth_attack_11_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, 3.0);
-    if is_excute(fighter) {
-        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE_INTP, *SLOPE_STATUS_R, 4);
-    }
-    frame(lua_state, 4.5);
-    if is_excute(fighter) {
-        ControlModule::set_rumble(boma, Hash40::new("rbkind_nohitm"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
-    }
-    frame(lua_state, 6.5);
-    if is_excute(fighter) {
-        macros::RUMBLE_HIT(fighter, Hash40::new("rbkind_attackm"), 0);
-    }
-    frame(lua_state, 35.0);
-    if is_excute(fighter) {
-        slope!(fighter, *MA_MSC_CMD_SLOPE_SLOPE_INTP, *SLOPE_STATUS_LR, 13);
-    }
-}
-
 #[acmd_script( agent = "edge", script = "game_attackdash" , category = ACMD_GAME , low_priority)]
 unsafe fn sephiroth_attack_dash_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
@@ -190,12 +189,10 @@ unsafe fn sephiroth_attack_dash_game(fighter: &mut L2CAgentBase) {
 pub fn install() {
     install_acmd_scripts!(
         sephiroth_attack_11_game,
-        sephiroth_attack_11_effect,
         sephiroth_attack_11_expression,
         sephiroth_attack_12_game,
         sephiroth_attack_13_game,
         sephiroth_attack_13_effect,
         sephiroth_attack_dash_game,
     );
-}
-
+}

fighters/edge/src/acmd/specials.rs

@@ -491,12 +491,13 @@ unsafe fn edge_special_hi1_end_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
     let boma = fighter.boma();
     if is_excute(fighter) {
-        if VarModule::is_flag(boma.object(), vars::edge::instance::SPECIAL_HI_BLADE_DASH_NO_HITBOX) {
-            MotionModule::set_rate(boma, 2.0);
-        }
-        else{
-            MotionModule::set_rate(boma, 0.9);
-        }
+        MotionModule::set_rate(boma, 1.08);
+        // if VarModule::is_flag(boma.object(), vars::edge::instance::SPECIAL_HI_BLADE_DASH_NO_HITBOX) {
+        //     MotionModule::set_rate(boma, 2.0);
+        // }
+        // else{
+        //     MotionModule::set_rate(boma, 0.9);
+        // }
     }
 }
 
@@ -570,12 +571,13 @@ pub fn install() {
         edge_special_air_n1_game,
         edge_special_n2_game,
         edge_special_air_n2_game,
-        game_specialhistart,
-        effect_specialhistart,
+        //game_specialhistart,
+        //effect_specialhistart,
+        //game_specialairhistart,
         edge_special_hi2_game,
         edge_special_hi2_effect,
-        game_specialhi1,
-        effect_specialhi1,
+        //game_specialhi1,
+        //effect_specialhi1,
         edge_special_hi1_end_game,
         game_specialairhi1end,
         edge_special_hi2_end_game,