Skip to content

Commit 4a6e31f

Browse files
committed
prevent up on cstick weirdness
1 parent 822e4f8 commit 4a6e31f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

fighters/common/src/general_statuses/catch/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod catchattack;
66
#[skyline::hook(replace = L2CFighterCommon_sub_transition_group_check_ground_catch)]
77
unsafe fn sub_transition_group_check_ground_catch(fighter: &mut L2CFighterCommon) -> L2CValue {
88
// prevents c-stick grabs, making c-stick roll feel smooth
9-
if super::shield::misc::check_cstick_escape_oos(fighter).get_bool() {
9+
if super::shield::misc::check_cstick_escape_oos(fighter).get_bool() || super::shield::misc::check_escape_oos(fighter).get_bool() {
1010
return false.into();
1111
}
1212
call_original!(fighter)

fighters/common/src/general_statuses/shield/misc.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ pub unsafe fn check_cstick_escape_oos(fighter: &mut L2CFighterCommon) -> L2CValu
213213
let boma = fighter.module_accessor;
214214

215215
let c_stick_override = fighter.is_button_on(Buttons::CStickOverride);
216-
let c_stick_on = dbg!(
216+
let c_stick_on = (
217217
!VarModule::is_flag(
218218
fighter.battle_object,
219219
vars::common::instance::DISABLE_CSTICK_BUFFER_ROLL_OOS
@@ -231,6 +231,10 @@ pub unsafe fn check_cstick_escape_oos(fighter: &mut L2CFighterCommon) -> L2CValu
231231
};
232232
let stick_vertical = sub_stick_y.abs() >= sub_stick_x.abs() && sub_stick_y < 0.0;
233233

234+
if sub_stick_y > 0.2 && sub_stick_x.abs() < 0.4 {
235+
return false.into();
236+
}
237+
234238
let escapes = [
235239
(
236240
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE,

0 commit comments

Comments
 (0)