Skip to content

Commit 208366f

Browse files
committed
cleanup
1 parent 65c3261 commit 208366f

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

fighters/chrom/src/opff.rs

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::*;
2-
2+
33
utils::import_noreturn!(common::opff::fighter_common_opff);
44

55
unsafe fn soaring_slash_drift(fighter: &mut L2CFighterCommon) {
@@ -21,10 +21,10 @@ unsafe fn soaring_slash_cancel(fighter: &mut L2CFighterCommon) {
2121
if StatusModule::is_changing(fighter.module_accessor) {
2222
return;
2323
}
24-
if fighter.is_status(*FIGHTER_STATUS_KIND_SPECIAL_HI)
24+
if fighter.is_status(*FIGHTER_STATUS_KIND_SPECIAL_HI)
2525
&& fighter.is_situation(*SITUATION_KIND_GROUND)
2626
&& 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)
2828
}
2929
if fighter.is_status(*FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_2)
3030
&& 28.0 < fighter.motion_frame() && fighter.motion_frame() < 31.0
@@ -38,7 +38,7 @@ unsafe fn soaring_slash_cancel(fighter: &mut L2CFighterCommon) {
3838
}
3939
}
4040
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))
4242
&& !fighter.is_status_one_of(&[*FIGHTER_STATUS_KIND_SPECIAL_HI, *FIGHTER_ROY_STATUS_KIND_SPECIAL_HI_2]))
4343
|| fighter.is_status_one_of(&[
4444
*FIGHTER_STATUS_KIND_DAMAGE,
@@ -206,7 +206,7 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
206206
*FIGHTER_ROY_STATUS_KIND_SPECIAL_N_TURN,
207207
*FIGHTER_ROY_STATUS_KIND_SPECIAL_N_END_MAX,
208208
*FIGHTER_ROY_STATUS_KIND_SPECIAL_LW_HIT
209-
])
209+
])
210210
&& fighter.is_situation(*SITUATION_KIND_AIR) {
211211
fighter.sub_air_check_dive();
212212
if fighter.is_flag(*FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_DIVE) {
@@ -218,7 +218,7 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
218218
fighter.clear_lua_stack();
219219
lua_args!(fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY, ENERGY_GRAVITY_RESET_TYPE_GRAVITY, 0.0, speed_y, 0.0, 0.0, 0.0);
220220
app::sv_kinetic_energy::reset_energy(fighter.lua_state_agent);
221-
221+
222222
fighter.clear_lua_stack();
223223
lua_args!(fighter, FIGHTER_KINETIC_ENERGY_ID_GRAVITY);
224224
app::sv_kinetic_energy::enable(fighter.lua_state_agent);
@@ -229,17 +229,6 @@ unsafe fn fastfall_specials(fighter: &mut L2CFighterCommon) {
229229
}
230230
}
231231

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-
243232
unsafe fn sword_length(boma: &mut BattleObjectModuleAccessor) {
244233
let long_sword_scale = Vector3f{x: 1.015, y: 1.065, z: 1.045};
245234
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
255244
double_edge_dance_vertical_momentum(fighter);
256245
fastfall_specials(fighter);
257246
sword_length(&mut *(fighter.module_accessor));
258-
up_special_reverse(fighter);
259247
}
260248

261249
pub fn install() {

0 commit comments

Comments
 (0)