Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-16 11:26:11 +00:00
Code Issues Activity

Add Remaining Smash Attacks (#104)

Browse source
This commit is contained in:
sidschingis 2020-06-28 23:24:41 +02:00 • committed by GitHub
parent 5cb981c268
commit a12ae53140
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TrainingModpackOverlay

@ -1 +1 @@
Subproject commit 60ae2fbb5260f074c4c1763d2b4cc0b6d1070744
Subproject commit 3e021a300d05516600fbee9c11eefa539ecfcdea

24
src/common/consts.rs
View file

@ -75,11 +75,13 @@ pub enum Attack {
UpB = 7,
DownB = 8,
UpSmash = 9,
Grab = 10,
Jab = 11,
Ftilt = 12,
Utilt = 13,
Dtilt = 14,
FSmash = 10,
DSmash = 11,
Grab = 12,
Jab = 13,
Ftilt = 14,
Utilt = 15,
Dtilt = 16,
Nothing = 9999,
}
@ -98,11 +100,13 @@ impl From<i32> for Attack {
7 => UpB,
8 => DownB,
9 => UpSmash,
10 => Grab,
11 => Jab,
12 => Ftilt,
13 => Utilt,
14 => Dtilt,
10 => FSmash,
11 => DSmash,
12 => Grab,
13 => Jab,
14 => Ftilt,
15 => Utilt,
16 => Dtilt,
_ => Nothing,
}
}

12
src/training/mash.rs
View file

@ -218,9 +218,15 @@ unsafe fn get_attack_flag(module_accessor: &mut app::BattleObjectModuleAccessor)
}
UpSmash => {
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI4;
// ATTACK_HI4 transition returns false while in shield
// transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_HI4;
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_JUMP_SQUAT_BUTTON;
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_HI4_START;
}
FSmash => {
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S4;
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_S4_START;
}
DSmash => {
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW4;
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_LW4_START;
}
Grab => {
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_CATCH;