mirror of
https://github.com/jugeeya/UltimateTrainingModpack.git
synced 2025-06-21 10:42:35 +00:00
Update mash.rs (#115)
Use StatusModule::change_status_request_from_script
This commit is contained in:
parent
2aba252f10
commit
a959a24edc
1 changed files with 50 additions and 31 deletions
|
@ -202,7 +202,7 @@ unsafe fn perform_action(module_accessor: &mut app::BattleObjectModuleAccessor)
|
||||||
return get_flag(
|
return get_flag(
|
||||||
module_accessor,
|
module_accessor,
|
||||||
*FIGHTER_STATUS_KIND_ESCAPE_AIR,
|
*FIGHTER_STATUS_KIND_ESCAPE_AIR,
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE,
|
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE_AIR,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Jump => {
|
Jump => {
|
||||||
|
@ -212,21 +212,21 @@ unsafe fn perform_action(module_accessor: &mut app::BattleObjectModuleAccessor)
|
||||||
return get_flag(
|
return get_flag(
|
||||||
module_accessor,
|
module_accessor,
|
||||||
*FIGHTER_STATUS_KIND_ESCAPE,
|
*FIGHTER_STATUS_KIND_ESCAPE,
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
|
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
RollForward => {
|
RollForward => {
|
||||||
return get_flag(
|
return get_flag(
|
||||||
module_accessor,
|
module_accessor,
|
||||||
*FIGHTER_STATUS_KIND_ESCAPE_F,
|
*FIGHTER_STATUS_KIND_ESCAPE_F,
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_F,
|
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE_F,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
RollBack => {
|
RollBack => {
|
||||||
return get_flag(
|
return get_flag(
|
||||||
module_accessor,
|
module_accessor,
|
||||||
*FIGHTER_STATUS_KIND_ESCAPE_B,
|
*FIGHTER_STATUS_KIND_ESCAPE_B,
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_B,
|
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE_B,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Shield => {
|
Shield => {
|
||||||
|
@ -237,7 +237,7 @@ unsafe fn perform_action(module_accessor: &mut app::BattleObjectModuleAccessor)
|
||||||
return get_flag(
|
return get_flag(
|
||||||
module_accessor,
|
module_accessor,
|
||||||
*FIGHTER_STATUS_KIND_GUARD_ON,
|
*FIGHTER_STATUS_KIND_GUARD_ON,
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE,
|
*FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_GUARD_ON,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
_ => return get_attack_flag(module_accessor, action),
|
_ => return get_attack_flag(module_accessor, action),
|
||||||
|
@ -246,20 +246,20 @@ unsafe fn perform_action(module_accessor: &mut app::BattleObjectModuleAccessor)
|
||||||
|
|
||||||
unsafe fn update_jump_flag(module_accessor: &mut app::BattleObjectModuleAccessor) -> i32 {
|
unsafe fn update_jump_flag(module_accessor: &mut app::BattleObjectModuleAccessor) -> i32 {
|
||||||
let check_flag: i32;
|
let check_flag: i32;
|
||||||
|
let transition_flag: i32;
|
||||||
|
|
||||||
if is_grounded(module_accessor) {
|
if is_grounded(module_accessor) {
|
||||||
check_flag = *FIGHTER_STATUS_KIND_JUMP_SQUAT;
|
check_flag = *FIGHTER_STATUS_KIND_JUMP_SQUAT;
|
||||||
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_JUMP_SQUAT;
|
||||||
} else if is_airborne(module_accessor) {
|
} else if is_airborne(module_accessor) {
|
||||||
check_flag = *FIGHTER_STATUS_KIND_JUMP_AERIAL;
|
check_flag = *FIGHTER_STATUS_KIND_JUMP_AERIAL;
|
||||||
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_JUMP_AERIAL;
|
||||||
} else {
|
} else {
|
||||||
check_flag = *FIGHTER_STATUS_KIND_JUMP;
|
check_flag = *FIGHTER_STATUS_KIND_JUMP;
|
||||||
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_JUMP_AERIAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return get_flag(
|
return get_flag(module_accessor, check_flag, transition_flag);
|
||||||
module_accessor,
|
|
||||||
check_flag,
|
|
||||||
*FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe fn get_attack_flag(
|
unsafe fn get_attack_flag(
|
||||||
|
@ -268,7 +268,7 @@ unsafe fn get_attack_flag(
|
||||||
) -> i32 {
|
) -> i32 {
|
||||||
use Action::*;
|
use Action::*;
|
||||||
|
|
||||||
let action_flag: i32;
|
let transition_flag: i32;
|
||||||
let status: i32;
|
let status: i32;
|
||||||
|
|
||||||
match action {
|
match action {
|
||||||
|
@ -276,35 +276,43 @@ unsafe fn get_attack_flag(
|
||||||
return get_aerial_flag(module_accessor, action);
|
return get_aerial_flag(module_accessor, action);
|
||||||
}
|
}
|
||||||
NeutralB => {
|
NeutralB => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_SPECIAL_N;
|
||||||
status = *FIGHTER_STATUS_KIND_SPECIAL_N;
|
status = *FIGHTER_STATUS_KIND_SPECIAL_N;
|
||||||
}
|
}
|
||||||
SideB => {
|
SideB => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_SPECIAL_S;
|
||||||
status = *FIGHTER_STATUS_KIND_SPECIAL_S;
|
status = *FIGHTER_STATUS_KIND_SPECIAL_S;
|
||||||
}
|
}
|
||||||
UpB => {
|
UpB => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_SPECIAL_HI;
|
||||||
status = *FIGHTER_STATUS_KIND_SPECIAL_HI;
|
status = *FIGHTER_STATUS_KIND_SPECIAL_HI;
|
||||||
}
|
}
|
||||||
DownB => {
|
DownB => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_SPECIAL_LW;
|
||||||
status = *FIGHTER_STATUS_KIND_SPECIAL_LW;
|
status = *FIGHTER_STATUS_KIND_SPECIAL_LW;
|
||||||
}
|
}
|
||||||
UpSmash => {
|
UpSmash => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI4;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_HI4_START;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_HI4_START;
|
status = *FIGHTER_STATUS_KIND_ATTACK_HI4_START;
|
||||||
}
|
}
|
||||||
FSmash => {
|
FSmash => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S4;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_S4_START;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_S4_START;
|
status = *FIGHTER_STATUS_KIND_ATTACK_S4_START;
|
||||||
}
|
}
|
||||||
DSmash => {
|
DSmash => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW4;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_LW4_START;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_LW4_START;
|
status = *FIGHTER_STATUS_KIND_ATTACK_LW4_START;
|
||||||
}
|
}
|
||||||
Grab => {
|
Grab => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_CATCH;
|
let cannot_grab = WorkModule::get_int(
|
||||||
|
module_accessor,
|
||||||
|
*FIGHTER_INSTANCE_WORK_ID_INT_INVALID_CATCH_FRAME,
|
||||||
|
) != 0;
|
||||||
|
if cannot_grab {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_CATCH;
|
||||||
status = *FIGHTER_STATUS_KIND_CATCH;
|
status = *FIGHTER_STATUS_KIND_CATCH;
|
||||||
}
|
}
|
||||||
Jab => {
|
Jab => {
|
||||||
|
@ -313,25 +321,25 @@ unsafe fn get_attack_flag(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK;
|
status = *FIGHTER_STATUS_KIND_ATTACK;
|
||||||
}
|
}
|
||||||
Ftilt => {
|
Ftilt => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S3;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_S3;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_S3;
|
status = *FIGHTER_STATUS_KIND_ATTACK_S3;
|
||||||
}
|
}
|
||||||
Utilt => {
|
Utilt => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI3;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_HI3;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_HI3;
|
status = *FIGHTER_STATUS_KIND_ATTACK_HI3;
|
||||||
}
|
}
|
||||||
Dtilt => {
|
Dtilt => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW3;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_LW3;
|
||||||
status = *FIGHTER_STATUS_KIND_ATTACK_LW3;
|
status = *FIGHTER_STATUS_KIND_ATTACK_LW3;
|
||||||
}
|
}
|
||||||
_ => return 0,
|
_ => return 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
return get_flag(module_accessor, status, action_flag);
|
return get_flag(module_accessor, status, transition_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe fn get_aerial_flag(
|
unsafe fn get_aerial_flag(
|
||||||
|
@ -342,7 +350,13 @@ unsafe fn get_aerial_flag(
|
||||||
|
|
||||||
// If we are grounded we also need to jump
|
// If we are grounded we also need to jump
|
||||||
if is_grounded(module_accessor) {
|
if is_grounded(module_accessor) {
|
||||||
flag |= *FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
|
let jump_flag = *FIGHTER_STATUS_KIND_JUMP_SQUAT;
|
||||||
|
let transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_JUMP_SQUAT;
|
||||||
|
let allow_transition =
|
||||||
|
WorkModule::is_enable_transition_term(module_accessor, transition_flag);
|
||||||
|
if allow_transition {
|
||||||
|
StatusModule::change_status_request_from_script(module_accessor, jump_flag, true);
|
||||||
|
}
|
||||||
|
|
||||||
// Delay attack until we are airborne to get a full hop
|
// Delay attack until we are airborne to get a full hop
|
||||||
if MENU.full_hop == OnOff::On {
|
if MENU.full_hop == OnOff::On {
|
||||||
|
@ -356,7 +370,7 @@ unsafe fn get_aerial_flag(
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
let action_flag: i32;
|
let transition_flag: i32;
|
||||||
use Action::*;
|
use Action::*;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -365,16 +379,16 @@ unsafe fn get_aerial_flag(
|
||||||
*/
|
*/
|
||||||
match action {
|
match action {
|
||||||
Nair | Fair | Bair | UpAir | Dair => {
|
Nair | Fair | Bair | UpAir | Dair => {
|
||||||
action_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
|
transition_flag = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ATTACK_AIR;
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
action_flag = 0;
|
transition_flag = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
set_aerial(action);
|
set_aerial(action);
|
||||||
|
|
||||||
flag |= get_flag(module_accessor, status, action_flag);
|
flag |= get_flag(module_accessor, status, transition_flag);
|
||||||
|
|
||||||
flag
|
flag
|
||||||
}
|
}
|
||||||
|
@ -385,7 +399,7 @@ unsafe fn get_aerial_flag(
|
||||||
unsafe fn get_flag(
|
unsafe fn get_flag(
|
||||||
module_accessor: &mut app::BattleObjectModuleAccessor,
|
module_accessor: &mut app::BattleObjectModuleAccessor,
|
||||||
expected_status: i32,
|
expected_status: i32,
|
||||||
action_flag: i32,
|
transition_flag: i32,
|
||||||
) -> i32 {
|
) -> i32 {
|
||||||
// let current_status = StatusModule::prev_status_kind(module_accessor,0);
|
// let current_status = StatusModule::prev_status_kind(module_accessor,0);
|
||||||
let current_status = StatusModule::status_kind(module_accessor);
|
let current_status = StatusModule::status_kind(module_accessor);
|
||||||
|
@ -399,7 +413,12 @@ unsafe fn get_flag(
|
||||||
reset();
|
reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
return action_flag;
|
let allow_transition = WorkModule::is_enable_transition_term(module_accessor, transition_flag);
|
||||||
|
if allow_transition {
|
||||||
|
StatusModule::change_status_request_from_script(module_accessor, expected_status, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub unsafe fn perform_defensive_option() {
|
pub unsafe fn perform_defensive_option() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue