Skip to content

Commit 019655c

Browse files
authored
Merge pull request #2374 from HDR-Development/sephiroth-specials
Sephiroth hotfix
2 parents 9fbcc91 + 096bc98 commit 019655c

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

fighters/edge/src/fire/status.rs

+6-12
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,13 @@ unsafe extern "C" fn sub_fly_main_loop(weapon: &mut L2CWeaponCommon, flare_type:
113113
StopModule::set_other_stop(weapon.module_accessor, 2, StopOtherKind(0));
114114
}
115115
}
116-
if weapon.is_status(*WEAPON_EDGE_FIRE_STATUS_KIND_FLY_S) {
117-
if !AttackModule::is_infliction_status(weapon.module_accessor, *COLLISION_KIND_MASK_HIT | *COLLISION_KIND_MASK_SHIELD) {
118-
return 0.into()
119-
}
120-
}
121-
else {
122-
if !WorkModule::is_flag(weapon.module_accessor, *WEAPON_EDGE_FIRE_INSTANCE_WORK_ID_FLAG_ATTACK) {
123-
return 0.into()
124-
}
116+
if !weapon.is_status(*WEAPON_EDGE_FIRE_STATUS_KIND_FLY_S)
117+
&& WorkModule::is_flag(weapon.module_accessor, *WEAPON_EDGE_FIRE_INSTANCE_WORK_ID_FLAG_ATTACK) {
118+
weapon.change_status(status, false.into());
119+
return 1.into();
125120
}
126-
127-
weapon.change_status(status, false.into());
128-
return 1.into()
121+
122+
return 0.into()
129123
}
130124

131125
unsafe extern "C" fn fly_set_physics(weapon: &mut L2CWeaponCommon, flare_type: i32) {

0 commit comments

Comments
 (0)