Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-01-31 22:47:25 +00:00
Code Issues Activity

remove dash attack for now

Browse source
This commit is contained in:
jugeeya 2020-08-19 20:40:49 -07:00
parent bec36ec897
commit 15767e8cf7
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TrainingModpackOverlay/include/taunt_toggles.hpp
View file

@ -154,8 +154,8 @@ of hitstun or out of specific states.
x(type,Nair,"Neutral Air") x(type,Fair,"Forward Air") x(type,Bair,"Back Air") x(type,Uair,"Up Air") x(type,Dair,"Down Air") \
x(type,NeutralB,"Neutral B") x(type,SideB,"Side B") x(type,UpB,"Up B") x(type,DownB,"Down B") \
x(type,FSmash,"Forward Smash") x(type,USmash,"Up Smash") x(type,DSmash,"Down Smash") \
x(type,Jab,"Jab") x(type,FTilt,"Filt") x(type,UTilt,"Utilt") x(type,Dtilt,"Dtilt") \
x(type,DashAttack,"Dash Attack") x(type,Grab,"Grab")
x(type,Jab,"Jab") x(type,FTilt,"Ftilt") x(type,UTilt,"Utilt") x(type,Dtilt,"Dtilt") \
x(type,Grab,"Grab") //x(type,DashAttack,"Dash Attack")
// clang-format on
DEFINE_ENUM_CLASS(ActionFlag);

5
src/common/consts.rs
View file

@ -208,8 +208,9 @@ bitflags! {
const F_TILT = 0x80000;
const U_TILT = 0x100000;
const D_TILT = 0x200000;
const DASH_ATTACK = 0x400000;
const GRAB = 0x800000;
const GRAB = 0x400000;
// TODO: Make work
// const DASH_ATTACK = 0x400000;
}
}

29
src/training/mash.rs
View file

@ -345,24 +345,25 @@ unsafe fn get_attack_flag(
command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW3;
status = *FIGHTER_STATUS_KIND_ATTACK_LW3;
}
Action::DASH_ATTACK => {
let current_status = StatusModule::status_kind(module_accessor);
let is_dashing = current_status == *FIGHTER_STATUS_KIND_DASH;
// TODO: Make work
// Action::DASH_ATTACK => {
// let current_status = StatusModule::status_kind(module_accessor);
// let is_dashing = current_status == *FIGHTER_STATUS_KIND_DASH;
// Start Dash First
if !is_dashing {
let dash_transition = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_DASH;
let dash_status = *FIGHTER_STATUS_KIND_DASH;
// // Start Dash First
// if !is_dashing {
// let dash_transition = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_DASH;
// let dash_status = *FIGHTER_STATUS_KIND_DASH;
try_change_status(module_accessor, dash_status, dash_transition);
return 0;
}
// try_change_status(module_accessor, dash_status, dash_transition);
// return 0;
// }
command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
status = *FIGHTER_STATUS_KIND_ATTACK_DASH;
// command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
// status = *FIGHTER_STATUS_KIND_ATTACK_DASH;
return get_flag(module_accessor, status, command_flag);
}
// return get_flag(module_accessor, status, command_flag);
// }
_ => return 0,
}