1
1
use super :: * ;
2
-
2
+
3
3
utils:: import_noreturn!( common:: opff:: fighter_common_opff) ;
4
4
5
5
unsafe fn soaring_slash_drift ( fighter : & mut L2CFighterCommon ) {
@@ -21,10 +21,10 @@ unsafe fn soaring_slash_cancel(fighter: &mut L2CFighterCommon) {
21
21
if StatusModule :: is_changing ( fighter. module_accessor ) {
22
22
return ;
23
23
}
24
- if fighter. is_status ( * FIGHTER_STATUS_KIND_SPECIAL_HI )
24
+ if fighter. is_status ( * FIGHTER_STATUS_KIND_SPECIAL_HI )
25
25
&& fighter. is_situation ( * SITUATION_KIND_GROUND )
26
26
&& AttackModule :: is_infliction_status ( fighter. module_accessor , * COLLISION_KIND_MASK_HIT ) {
27
- VarModule :: on_flag ( fighter. battle_object , vars:: chrom:: instance:: SOARING_SLASH_HIT )
27
+ VarModule :: on_flag ( fighter. battle_object , vars:: chrom:: instance:: SOARING_SLASH_HIT )
28
28
}
29
29
if fighter. is_status ( * FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_2 )
30
30
&& 28.0 < fighter. motion_frame ( ) && fighter. motion_frame ( ) < 31.0
@@ -38,7 +38,7 @@ unsafe fn soaring_slash_cancel(fighter: &mut L2CFighterCommon) {
38
38
}
39
39
}
40
40
if VarModule :: is_flag ( fighter. battle_object , vars:: chrom:: instance:: SOARING_SLASH_HIT ) {
41
- if ( ( fighter. is_situation ( * SITUATION_KIND_GROUND ) || fighter. is_situation ( * SITUATION_KIND_CLIFF ) )
41
+ if ( ( fighter. is_situation ( * SITUATION_KIND_GROUND ) || fighter. is_situation ( * SITUATION_KIND_CLIFF ) )
42
42
&& !fighter. is_status_one_of ( & [ * FIGHTER_STATUS_KIND_SPECIAL_HI , * FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_2 ] ) )
43
43
|| fighter. is_status_one_of ( & [
44
44
* FIGHTER_STATUS_KIND_DAMAGE ,
@@ -206,7 +206,7 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
206
206
* FIGHTER_ROY_STATUS_KIND_SPECIAL_N_TURN ,
207
207
* FIGHTER_ROY_STATUS_KIND_SPECIAL_N_END_MAX ,
208
208
* FIGHTER_ROY_STATUS_KIND_SPECIAL_LW_HIT
209
- ] )
209
+ ] )
210
210
&& fighter. is_situation ( * SITUATION_KIND_AIR ) {
211
211
fighter. sub_air_check_dive ( ) ;
212
212
if fighter. is_flag ( * FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_DIVE ) {
@@ -218,7 +218,7 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
218
218
fighter. clear_lua_stack ( ) ;
219
219
lua_args ! ( fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY , ENERGY_GRAVITY_RESET_TYPE_GRAVITY , 0.0 , speed_y, 0.0 , 0.0 , 0.0 ) ;
220
220
app:: sv_kinetic_energy:: reset_energy ( fighter. lua_state_agent ) ;
221
-
221
+
222
222
fighter. clear_lua_stack ( ) ;
223
223
lua_args ! ( fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY ) ;
224
224
app:: sv_kinetic_energy:: enable ( fighter. lua_state_agent ) ;
@@ -229,17 +229,6 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
229
229
}
230
230
}
231
231
232
- // Up Special Reverse
233
- unsafe fn up_special_reverse ( fighter : & mut smash:: lua2cpp:: L2CFighterCommon ) {
234
- if StatusModule :: is_changing ( fighter. module_accessor ) {
235
- return ;
236
- }
237
- // No reversal for Chrom
238
- if fighter. kind ( ) == * FIGHTER_KIND_CHROM {
239
- return ;
240
- }
241
- }
242
-
243
232
unsafe fn sword_length ( boma : & mut BattleObjectModuleAccessor ) {
244
233
let long_sword_scale = Vector3f { x : 1.015 , y : 1.065 , z : 1.045 } ;
245
234
ModelModule :: set_joint_scale ( boma, smash:: phx:: Hash40 :: new ( "havel" ) , & long_sword_scale) ;
@@ -255,7 +244,6 @@ pub unsafe extern "C" fn chrom_frame_wrapper(fighter: &mut smash::lua2cpp::L2CFi
255
244
double_edge_dance_vertical_momentum ( fighter) ;
256
245
fastfall_specials ( fighter) ;
257
246
sword_length ( & mut * ( fighter. module_accessor ) ) ;
258
- up_special_reverse ( fighter) ;
259
247
}
260
248
261
249
pub fn install ( ) {
0 commit comments