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

Use just text for now

Browse source
This commit is contained in:
jugeeya 2023-08-18 00:46:23 -07:00
parent 70e0f844c6
commit 3b795c8362
4 changed files with 150 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

253
src/training/ui/input_log.rs
View file

@ -1,32 +1,125 @@
use std::collections::VecDeque;
use itertools::Itertools;
use skyline::nn::ui2d::*;
use smash::ui2d::{SmashPane, SmashTextBox};
use training_mod_consts::ButtonConfig;
use training_mod_consts::{InputDisplay, MENU};
use crate::{
common::{
button_config::name_to_font_glyph,
input::Buttons,
menu::{P1_CONTROLLER_STYLE, QUICK_MENU_ACTIVE},
},
common::{input::Buttons, menu::QUICK_MENU_ACTIVE},
training::input_log::{DirectionStrength, InputLog, P1_INPUT_LOGS},
};
use super::set_colored_icon_text;
macro_rules! log_parent_fmt {
($x:ident) => {
format!("TrModInputLog{}", $x).as_str()
};
}
const GREEN: ResColor = ResColor {
r: 0,
g: 255,
b: 0,
a: 255,
};
const RED: ResColor = ResColor {
r: 255,
g: 0,
b: 0,
a: 255,
};
const CYAN: ResColor = ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
};
const BLUE: ResColor = ResColor {
r: 0,
g: 255,
b: 0,
a: 255,
};
const PURPLE: ResColor = ResColor {
r: 255,
g: 0,
b: 255,
a: 255,
};
const YELLOW: ResColor = ResColor {
r: 255,
g: 255,
b: 0,
a: 255,
};
const WHITE: ResColor = ResColor {
r: 255,
g: 255,
b: 255,
a: 255,
};
fn smash_inputs(log: &InputLog) -> VecDeque<(&str, ResColor)> {
let mut icons = log
.smash_inputs
.buttons
.to_vec()
.iter()
.filter_map(|button| {
Some(match *button {
Buttons::ATTACK | Buttons::ATTACK_RAW => ("A", GREEN),
Buttons::SPECIAL | Buttons::SPECIAL_RAW | Buttons::SPECIAL_RAW2 => ("B", RED),
Buttons::JUMP => ("X", CYAN),
Buttons::GUARD | Buttons::GUARD_HOLD => ("L", BLUE),
Buttons::CATCH => ("ZR", PURPLE),
Buttons::STOCK_SHARE => ("+", WHITE),
Buttons::APPEAL_HI => ("^", WHITE),
Buttons::APPEAL_LW => ("v", WHITE),
Buttons::APPEAL_SL => (">", WHITE),
Buttons::APPEAL_SR => ("<", WHITE),
_ => return None,
})
})
.unique_by(|(s, _)| *s)
.collect::<VecDeque<(&str, ResColor)>>();
let (rstick_strength, _rstick_angle) = log.smash_binned_rstick();
let rstick_icon = match rstick_strength {
DirectionStrength::Strong => ">>",
DirectionStrength::Weak => ">",
DirectionStrength::None => "",
};
if !rstick_icon.is_empty() {
icons.push_front((rstick_icon, YELLOW));
}
let (lstick_strength, _lstick_angle) = log.smash_binned_lstick();
let lstick_icon = match lstick_strength {
DirectionStrength::Strong => ">>",
DirectionStrength::Weak => ">",
DirectionStrength::None => "",
};
if !lstick_icon.is_empty() {
icons.push_front((lstick_icon, WHITE));
}
icons
}
unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
let log_pane = root_pane
.find_pane_by_name_recursive(log_parent_fmt!(log_idx))
.unwrap();
// TODO: And menu option for input log is on
log_pane.set_visible(!QUICK_MENU_ACTIVE);
log_pane.set_visible(!QUICK_MENU_ACTIVE && MENU.input_display != InputDisplay::None);
if log.ttl < 100 {
// Fade out
let alpha = (log.ttl as f32 / 100.0 * 255.0) as u8;
@ -37,120 +130,7 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
log_pane.global_alpha = 255;
}
let p1_style_ptr = P1_CONTROLLER_STYLE.data_ptr();
if p1_style_ptr.is_null() {
return;
}
let icons = log
.smash_inputs
.buttons
.to_vec()
.iter()
.filter_map(|button| {
Some(match *button {
Buttons::ATTACK | Buttons::ATTACK_RAW => (
name_to_font_glyph(ButtonConfig::A, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 0,
a: 255,
},
),
Buttons::SPECIAL | Buttons::SPECIAL_RAW | Buttons::SPECIAL_RAW2 => (
name_to_font_glyph(ButtonConfig::B, *p1_style_ptr),
ResColor {
r: 255,
g: 0,
b: 0,
a: 255,
},
),
Buttons::JUMP => (
name_to_font_glyph(ButtonConfig::X, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
Buttons::GUARD | Buttons::GUARD_HOLD => (
name_to_font_glyph(ButtonConfig::L, *p1_style_ptr),
ResColor {
r: 0,
g: 0,
b: 255,
a: 255,
},
),
Buttons::CATCH => (
name_to_font_glyph(ButtonConfig::ZR, *p1_style_ptr),
ResColor {
r: 255,
g: 0,
b: 255,
a: 255,
},
),
Buttons::STOCK_SHARE => (
name_to_font_glyph(ButtonConfig::PLUS, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
Buttons::APPEAL_HI => (
name_to_font_glyph(ButtonConfig::DPAD_UP, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
Buttons::APPEAL_LW => (
name_to_font_glyph(ButtonConfig::DPAD_DOWN, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
Buttons::APPEAL_SL => (
name_to_font_glyph(ButtonConfig::DPAD_LEFT, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
Buttons::APPEAL_SR => (
name_to_font_glyph(ButtonConfig::DPAD_RIGHT, *p1_style_ptr),
ResColor {
r: 0,
g: 255,
b: 255,
a: 255,
},
),
_ => return None,
})
})
.filter_map(|(icon_opt, color)| {
if let Some(icon) = icon_opt {
return Some((icon, color));
}
None
})
.unique_by(|(icon, _)| *icon)
.collect::<Vec<(u16, ResColor)>>();
let icons = smash_inputs(log);
// Empty them first
const NUM_ICON_SLOTS: usize = 5;
@ -163,28 +143,7 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
input_pane.set_text_string("");
}
let (lstick_strength, lstick_angle) = log.smash_binned_lstick();
let lstick_icon = match lstick_strength {
DirectionStrength::Strong => ">>",
DirectionStrength::Weak => ">",
DirectionStrength::None => "",
};
let lstick_icon_exists = !lstick_icon.is_empty();
if lstick_icon_exists {
let input_pane = log_pane
.find_pane_by_name_recursive("InputTxt0")
.unwrap()
.as_textbox();
input_pane.set_default_material_colors();
input_pane.set_color(255, 255, 255, 255);
input_pane.set_text_string(lstick_icon);
input_pane.rot_z = lstick_angle;
}
for (idx, icon) in icons.iter().enumerate() {
let idx = if lstick_icon_exists { idx + 1 } else { idx };
// todo: handle this better
if idx >= NUM_ICON_SLOTS {
continue;
@ -195,7 +154,9 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
.unwrap()
.as_textbox();
set_colored_icon_text(input_pane, &vec![icon.0], icon.1);
input_pane.set_text_string(icon.0);
input_pane.set_default_material_colors();
input_pane.set_color(icon.1.r, icon.1.g, icon.1.b, icon.1.a);
}
let frame_text = format!("{}", log.frames);

6
src/training/ui/mod.rs
View file

@ -15,12 +15,6 @@ mod input_log;
mod menu;
pub mod notifications;
pub unsafe fn set_colored_icon_text(pane: &mut TextBox, icons: &Vec<u16>, color: ResColor) {
pane.set_default_material_colors();
pane.set_color(color.r, color.g, color.b, color.a);
set_icon_text(pane, icons);
}
pub unsafe fn set_icon_text(pane: &mut TextBox, icons: &Vec<u16>) {
pane.set_text_string("");

9
training_mod_consts/src/lib.rs
View file

@ -35,6 +35,7 @@ pub struct TrainingModpackMenu {
pub frame_advantage: OnOff,
pub full_hop: BoolFlag,
pub hitbox_vis: OnOff,
pub input_display: InputDisplay,
pub hud: OnOff,
pub input_delay: Delay,
pub ledge_delay: LongDelay,
@ -140,6 +141,7 @@ pub static DEFAULTS_MENU: TrainingModpackMenu = TrainingModpackMenu {
frame_advantage: OnOff::Off,
full_hop: BoolFlag::TRUE,
hitbox_vis: OnOff::On,
input_display: InputDisplay::Smash,
hud: OnOff::On,
input_delay: Delay::D0,
ledge_delay: LongDelay::empty(),
@ -757,6 +759,13 @@ pub unsafe fn ui_menu(menu: TrainingModpackMenu) -> UiMenu {
true,
&(menu.hitbox_vis as u32),
);
misc_tab.add_submenu_with_toggles::<InputDisplay>(
"Input Display".to_string(),
"input_display".to_string(),
"Input Display: Log inputs in a queue on the left of the screen".to_string(),
true,
&(menu.input_display as u32),
);
misc_tab.add_submenu_with_toggles::<Delay>(
"Input Delay".to_string(),
"input_delay".to_string(),

34
training_mod_consts/src/options.rs
View file

@ -1704,3 +1704,37 @@ impl ToggleTrait for UpdatePolicy {
UpdatePolicy::iter().map(|i| i.to_string()).collect()
}
}
#[repr(u32)]
#[derive(
Debug, Clone, Copy, PartialEq, FromPrimitive, EnumIter, Serialize_repr, Deserialize_repr,
)]
pub enum InputDisplay {
None,
Smash,
Raw,
}
impl fmt::Display for InputDisplay {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(
f,
"{}",
match *self {
InputDisplay::None => "None",
InputDisplay::Smash => "Smash Inputs",
InputDisplay::Raw => "Raw Inputs",
}
)
}
}
impl ToggleTrait for InputDisplay {
fn to_toggle_vals() -> Vec<u32> {
InputDisplay::iter().map(|i| i as u32).collect()
}
fn to_toggle_strings() -> Vec<String> {
InputDisplay::iter().map(|i| i.to_string()).collect()
}
}