Skip to content

Commit 779d922

Browse files
committed
adds fastfall check, float restoration fixed
1 parent c3a1d37 commit 779d922

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

fighters/common/src/opff/floats.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::*;
22

3-
pub unsafe fn run(fighter: &mut L2CFighterCommon, situation_kind: i32) {
4-
if situation_kind != *SITUATION_KIND_AIR {
3+
pub unsafe fn run(fighter: &mut L2CFighterCommon, status_kind: i32, situation_kind: i32) {
4+
if situation_kind == *SITUATION_KIND_GROUND || status_kind == *FIGHTER_STATUS_KIND_REBIRTH {
55
VarModule::off_flag(fighter.battle_object, vars::common::instance::IS_FLOAT);
66
}
77
}

fighters/common/src/opff/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub unsafe fn moveset_edits(fighter: &mut L2CFighterCommon, info: &FrameInfo) {
121121

122122
// Character Moveset Changes
123123
// moveset_changes::run(boma, id, cat, status_kind, situation_kind, motion_kind, fighter_kind, stick_x, stick_y, facing, frame);
124-
floats::run(fighter, info.situation_kind);
124+
floats::run(fighter, info.status_kind, info.situation_kind);
125125
}
126126

127127
pub fn install() {

fighters/mewtwo/src/status/attack_air.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ pub unsafe extern "C" fn attack_air_main(fighter: &mut L2CFighterCommon) -> L2CV
4242
if let Some(log) = log {
4343
notify_event_msc_cmd!(fighter, Hash40::new_raw(0x2b94de0d96), FIGHTER_LOG_ACTION_CATEGORY_KEEP, log);
4444
}
45-
45+
// allow fast fall during float release aerials
46+
if !StopModule::is_stop(fighter.module_accessor) {
47+
fighter.sub_fall_common_uniq(false.into());
48+
}
49+
fighter.global_table[SUB_STATUS].assign(&L2CValue::Ptr(L2CFighterCommon_sub_fall_common_uniq as *const () as _));
4650
// fighter.status_AttackAir_Main_common();
4751
WorkModule::set_int64(fighter.module_accessor, motion as i64, *FIGHTER_STATUS_ATTACK_AIR_WORK_INT_MOTION_KIND);
4852
fighter.sub_shift_status_main(L2CValue::Ptr(L2CFighterCommon_status_AttackAir_Main as *const () as _))

0 commit comments

Comments
 (0)