Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-28 04:44:06 +00:00
Code Issues Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/common/button_config.rs
This commit is contained in:
jugeeya 2022-10-10 17:54:33 -07:00
commit 3c3ac301fc
3 changed files with 64 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/common/button_config.rs
View file

@ -21,16 +21,25 @@ lazy_static! {
]);
}
static mut BUTTON_COMBO_CONFIG: BtnComboConfig = BtnComboConfig {
open_menu: BtnList{ hold: vec![], press: vec![] },
save_state: BtnList{ hold: vec![], press: vec![] },
load_state: BtnList{ hold: vec![], press: vec![] },
open_menu: BtnList {
hold: vec![],
press: vec![],
},
save_state: BtnList {
hold: vec![],
press: vec![],
},
load_state: BtnList {
hold: vec![],
press: vec![],
},
};
#[derive(Debug)]
pub enum ButtonCombo {
OpenMenu,
SaveState,
LoadState
LoadState,
}
#[derive(Deserialize, Default)]
@ -55,11 +64,16 @@ pub fn validate_config(data: &str) -> bool {
let conf: TopLevelBtnComboConfig = toml::from_str(data).unwrap();
let conf = conf.button_config;
let configs = [conf.open_menu, conf.save_state, conf.load_state];
let bad_keys = configs.iter().flat_map(|btn_list| {
btn_list.hold.iter()
let bad_keys = configs
.iter()
.flat_map(|btn_list| {
btn_list
.hold
.iter()
.chain(btn_list.press.iter())
.filter(|x| !BUTTON_MAPPING.contains_key(x.to_uppercase().as_str()))
}).collect::<Vec<&String>>();
})
.collect::<Vec<&String>>();
if !bad_keys.is_empty() {
skyline::error::show_error(
@ -67,7 +81,10 @@ pub fn validate_config(data: &str) -> bool {
"Training Modpack custom button\nconfiguration is invalid!\0",
&format!(
"The following keys are invalid in\nsd:/TrainingModpack/training_modpack.toml:\n\
{:?}\n\nPossible Keys: {:#?}\0", &bad_keys, BUTTON_MAPPING.keys())
{:?}\n\nPossible Keys: {:#?}\0",
&bad_keys,
BUTTON_MAPPING.keys()
),
);
false
} else {
@ -78,10 +95,19 @@ pub fn validate_config(data: &str) -> bool {
pub fn save_all_btn_config_from_defaults() {
let conf = TopLevelBtnComboConfig {
button_config: BtnComboConfig {
open_menu: BtnList { hold: vec!["SPECIAL".to_string()], press: vec!["UPTAUNT".to_string()] },
save_state: BtnList { hold: vec!["GRAB".to_string()], press: vec!["DOWNTAUNT".to_string()] },
load_state: BtnList { hold: vec!["GRAB".to_string()], press: vec!["UPTAUNT".to_string()] },
}
open_menu: BtnList {
hold: vec!["SPECIAL".to_string()],
press: vec!["UPTAUNT".to_string()],
},
save_state: BtnList {
hold: vec!["GRAB".to_string()],
press: vec!["DOWNTAUNT".to_string()],
},
load_state: BtnList {
hold: vec!["GRAB".to_string()],
press: vec!["UPTAUNT".to_string()],
},
},
};
unsafe {
// This println is necessary. Why?.......
@ -99,17 +125,30 @@ pub fn save_all_btn_config_from_toml(data: &str) {
}
}
pub fn combo_passes(module_accessor: *mut smash::app::BattleObjectModuleAccessor, combo: ButtonCombo) -> bool{
pub fn combo_passes(
module_accessor: *mut smash::app::BattleObjectModuleAccessor,
combo: ButtonCombo,
) -> bool {
unsafe {
let (hold, press) = match combo {
ButtonCombo::OpenMenu => (&BUTTON_COMBO_CONFIG.open_menu.hold, &BUTTON_COMBO_CONFIG.open_menu.press),
ButtonCombo::SaveState => (&BUTTON_COMBO_CONFIG.save_state.hold, &BUTTON_COMBO_CONFIG.save_state.press),
ButtonCombo::LoadState => (&BUTTON_COMBO_CONFIG.load_state.hold, &BUTTON_COMBO_CONFIG.load_state.press),
ButtonCombo::OpenMenu => (
&BUTTON_COMBO_CONFIG.open_menu.hold,
&BUTTON_COMBO_CONFIG.open_menu.press,
),
ButtonCombo::SaveState => (
&BUTTON_COMBO_CONFIG.save_state.hold,
&BUTTON_COMBO_CONFIG.save_state.press,
),
ButtonCombo::LoadState => (
&BUTTON_COMBO_CONFIG.load_state.hold,
&BUTTON_COMBO_CONFIG.load_state.press,
),
};
hold.iter()
.map(|hold| *BUTTON_MAPPING.get(&*hold.to_uppercase()).unwrap())
.all(|hold| ControlModule::check_button_on(module_accessor, hold))
&& press.iter()
&& press
.iter()
.map(|press| *BUTTON_MAPPING.get(&*press.to_uppercase()).unwrap())
.all(|press| ControlModule::check_button_trigger(module_accessor, press))
}

4
src/common/menu.rs
View file

@ -34,9 +34,7 @@ pub unsafe fn menu_condition(module_accessor: &mut smash::app::BattleObjectModul
// Only check for button combination if the counter is 0 (not locked out)
match frame_counter::get_frame_count(FRAME_COUNTER_INDEX) {
0 => {
button_config::combo_passes(module_accessor, button_config::ButtonCombo::OpenMenu)
}
0 => button_config::combo_passes(module_accessor, button_config::ButtonCombo::OpenMenu),
1..MENU_LOCKOUT_FRAMES => false,
_ => {
// Waited longer than the lockout time, reset the counter so the menu can be opened again

3
src/training/save_states.rs
View file

@ -237,7 +237,8 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
&& is_dead(module_accessor);
let mut triggered_reset: bool = false;
if !is_operation_cpu(module_accessor) {
triggered_reset = button_config::combo_passes(module_accessor, button_config::ButtonCombo::LoadState);
triggered_reset =
button_config::combo_passes(module_accessor, button_config::ButtonCombo::LoadState);
}
if (autoload_reset || triggered_reset) && !fighter_is_nana {
if save_state.state == NoAction {