Commit 4a6e31f 1 parent 822e4f8 commit 4a6e31f Copy full SHA for 4a6e31f
File tree 2 files changed +6
-2
lines changed
fighters/common/src/general_statuses
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ mod catchattack;
6
6
#[ skyline:: hook( replace = L2CFighterCommon_sub_transition_group_check_ground_catch ) ]
7
7
unsafe fn sub_transition_group_check_ground_catch ( fighter : & mut L2CFighterCommon ) -> L2CValue {
8
8
// 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 ( ) {
10
10
return false . into ( ) ;
11
11
}
12
12
call_original ! ( fighter)
Original file line number Diff line number Diff line change @@ -213,7 +213,7 @@ pub unsafe fn check_cstick_escape_oos(fighter: &mut L2CFighterCommon) -> L2CValu
213
213
let boma = fighter. module_accessor ;
214
214
215
215
let c_stick_override = fighter. is_button_on ( Buttons :: CStickOverride ) ;
216
- let c_stick_on = dbg ! (
216
+ let c_stick_on = (
217
217
!VarModule :: is_flag (
218
218
fighter. battle_object ,
219
219
vars:: common:: instance:: DISABLE_CSTICK_BUFFER_ROLL_OOS
@@ -231,6 +231,10 @@ pub unsafe fn check_cstick_escape_oos(fighter: &mut L2CFighterCommon) -> L2CValu
231
231
} ;
232
232
let stick_vertical = sub_stick_y. abs ( ) >= sub_stick_x. abs ( ) && sub_stick_y < 0.0 ;
233
233
234
+ if sub_stick_y > 0.2 && sub_stick_x. abs ( ) < 0.4 {
235
+ return false . into ( ) ;
236
+ }
237
+
234
238
let escapes = [
235
239
(
236
240
* FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE ,
You can’t perform that action at this time.
0 commit comments