1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-24 02:44:17 +00:00

Add menu and remainder of input icons; Fix notification wonkiness (#633)

* Add files via upload

* Add files via upload

* Build with layout_arc_from_file

* Add files via upload

* Updated bumper and trigger button icons

* Added dpad icons and added them to raw inputs

* Added icons for strong direction inputs

* Added missing icon names to list, fixed missing trailing comma

* Updated dodge staling icon

* Fixed b icon showing on side taunt

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
This commit is contained in:
jugeeya 2023-09-15 00:23:23 -07:00 committed by GitHub
parent 720e95810b
commit e2cedb462b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 2 deletions

View file

@ -60,7 +60,7 @@ jobs:
cargo-skyline skyline update-std
- name: Build release NRO
id: build_release
run: RUSTFLAGS=-g cargo-skyline skyline build --release
run: RUSTFLAGS=-g cargo-skyline skyline build --release --features layout_arc_from_file
- name: Upload plugin artifact
uses: actions/upload-artifact@v3
with:

Binary file not shown.

View file

@ -181,7 +181,7 @@ impl InputLog {
.filter_map(|button| {
Some(match *button {
Buttons::ATTACK | Buttons::ATTACK_RAW => ("a", GREEN),
Buttons::SPECIAL | Buttons::SPECIAL_RAW | Buttons::SPECIAL_RAW2 => ("b", RED),
Buttons::SPECIAL | Buttons::SPECIAL_RAW2 => ("b", RED),
Buttons::JUMP => ("x", CYAN),
Buttons::GUARD | Buttons::GUARD_HOLD => ("lb", BLUE),
Buttons::CATCH => ("zr", PURPLE),
@ -230,6 +230,18 @@ impl InputLog {
if buttons.minus() {
icons.push_front(("minus", WHITE));
}
if buttons.dpad_up() {
icons.push_front(("dpad_up", WHITE));
}
if buttons.dpad_down() {
icons.push_front(("dpad_down", WHITE));
}
if buttons.dpad_left() {
icons.push_front(("dpad_left", WHITE));
}
if buttons.dpad_right() {
icons.push_front(("dpad_right", WHITE));
}
icons
}

View file

@ -120,6 +120,19 @@ unsafe fn draw_log(root_pane: &Pane, log_idx: usize, log: &InputLog) {
"l_stick",
"r_stick",
"gcc_c_stick",
"dpad_up",
"dpad_down",
"dpad_left",
"dpad_right",
"dpad_left_right",
"up_strong",
"down_strong",
"left_strong",
"right_strong",
"up_left_strong",
"down_left_strong",
"up_right_strong",
"down_right_strong",
];
for idx in 0..NUM_ICON_SLOTS {