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

Fix OoS Offset/Reaction Time + Start Button in Frame-by-Frame (#614)

Browse source 
* Initial

* Test to fix parrying

---------

Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
This commit is contained in:
jugeeya 2023-08-30 13:10:10 -07:00 committed by GitHub
parent 230943ac70
commit 68a16f66fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/menu.rs
View file

@ -201,17 +201,6 @@ pub fn handle_final_input_mapping(
EVENT_QUEUE.push(Event::menu_open(menu_json)); EVENT_QUEUE.push(Event::menu_open(menu_json));
} }
}); });
(button_mapping(ButtonConfig::PLUS, style, button_presses)
|| button_mapping(ButtonConfig::MINUS, style, button_presses))
.then(|| {
received_input = true;
// Leave menu.
frame_counter::start_counting(*MENU_CLOSE_FRAME_COUNTER);
QUICK_MENU_ACTIVE = false;
let menu_json = app.get_menu_selections();
set_menu_from_json(&menu_json);
EVENT_QUEUE.push(Event::menu_open(menu_json));
});
button_mapping(ButtonConfig::X, style, button_presses).then(|| { button_mapping(ButtonConfig::X, style, button_presses).then(|| {
app.save_defaults(); app.save_defaults();
received_input = true; received_input = true;

10
src/training/mash.rs
View file

@ -264,15 +264,6 @@ unsafe fn get_buffered_action(
} else { } else {
None None
} }
} else if is_in_shieldstun(module_accessor) {
let action = MENU.shieldstun_override.get_random();
if action != Action::empty() {
Some(action)
} else if MENU.mash_triggers.contains(MashTrigger::SHIELDSTUN) {
Some(MENU.mash_state.get_random())
} else {
None
}
} else if is_in_footstool(module_accessor) { } else if is_in_footstool(module_accessor) {
let action = MENU.footstool_override.get_random(); let action = MENU.footstool_override.get_random();
if action != Action::empty() { if action != Action::empty() {
@ -312,6 +303,7 @@ unsafe fn get_buffered_action(
{ {
Some(MENU.mash_state.get_random()) Some(MENU.mash_state.get_random())
} else { } else {
// SHIELD handled in shield.rs
// LEDGE handled in ledge.rs // LEDGE handled in ledge.rs
None None
} }

12
src/training/shield.rs
View file

@ -241,6 +241,18 @@ unsafe fn mod_handle_sub_guard_cont(fighter: &mut L2CFighterCommon) {
return; return;
} }
if is_in_parry(module_accessor) {
return;
}
if MENU.mash_triggers.contains(MashTrigger::SHIELDSTUN) {
if MENU.shieldstun_override == Action::empty() {
mash::external_buffer_menu_mash(MENU.mash_state.get_random())
} else {
mash::external_buffer_menu_mash(MENU.shieldstun_override.get_random())
}
}
let action = mash::get_current_buffer(); let action = mash::get_current_buffer();
if handle_escape_option(fighter, module_accessor) { if handle_escape_option(fighter, module_accessor) {