Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00
Code Issues Activity

Format Rust code using rustfmt

Browse source
This commit is contained in:
github-actions[bot] 2022-11-07 05:19:10 +00:00 committed by GitHub
parent 53a60e477f
commit 57530ba72f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/training/tech.rs
View file

@ -1,6 +1,6 @@
use crate::common::consts::*; use crate::common::consts::*;
use crate::common::*; use crate::common::*;
use crate::training::{ frame_counter, mash }; use crate::training::{frame_counter, mash};
use smash::app::sv_system; use smash::app::sv_system;
use smash::app::{self, lua_bind::*}; use smash::app::{self, lua_bind::*};
use smash::hash40; use smash::hash40;
@ -8,7 +8,6 @@ use smash::lib::lua_const::*;
use smash::lib::L2CValue; use smash::lib::L2CValue;
use smash::lua2cpp::L2CFighterBase; use smash::lua2cpp::L2CFighterBase;
static mut TECH_ROLL_DIRECTION: Direction = Direction::empty(); static mut TECH_ROLL_DIRECTION: Direction = Direction::empty();
static mut MISS_TECH_ROLL_DIRECTION: Direction = Direction::empty(); static mut MISS_TECH_ROLL_DIRECTION: Direction = Direction::empty();
static mut FRAME_COUNTER: usize = 0; static mut FRAME_COUNTER: usize = 0;
@ -195,7 +194,6 @@ pub unsafe fn get_command_flag_cat(module_accessor: &mut app::BattleObjectModule
return; return;
} }
let status = StatusModule::status_kind(module_accessor) as i32; let status = StatusModule::status_kind(module_accessor) as i32;
let mut requested_status: i32 = 0; let mut requested_status: i32 = 0;
if [ if [
@ -221,7 +219,9 @@ pub unsafe fn get_command_flag_cat(module_accessor: &mut app::BattleObjectModule
} else if status == *FIGHTER_STATUS_KIND_LAY_DOWN { } else if status == *FIGHTER_STATUS_KIND_LAY_DOWN {
// Snake down throw // Snake down throw
let lockout_time = get_snake_laydown_lockout_time(module_accessor); let lockout_time = get_snake_laydown_lockout_time(module_accessor);
if frame_counter::should_delay(lockout_time, FRAME_COUNTER) { return; }; if frame_counter::should_delay(lockout_time, FRAME_COUNTER) {
return;
};
requested_status = match MENU.miss_tech_state.get_random() { requested_status = match MENU.miss_tech_state.get_random() {
MissTechFlags::GETUP => *FIGHTER_STATUS_KIND_DOWN_STAND, MissTechFlags::GETUP => *FIGHTER_STATUS_KIND_DOWN_STAND,
MissTechFlags::ATTACK => *FIGHTER_STATUS_KIND_DOWN_STAND_ATTACK, MissTechFlags::ATTACK => *FIGHTER_STATUS_KIND_DOWN_STAND_ATTACK,
@ -312,7 +312,8 @@ unsafe fn get_snake_laydown_lockout_time(
); );
let damage: f32 = DamageModule::damage(module_accessor, 0); let damage: f32 = DamageModule::damage(module_accessor, 0);
std::cmp::min( std::cmp::min(
(base_lockout_time + (damage / max_lockout_damage) * (max_lockout_time - base_lockout_time)) as u32, (base_lockout_time + (damage / max_lockout_damage) * (max_lockout_time - base_lockout_time))
max_lockout_time as u32 as u32,
max_lockout_time as u32,
) )
} }