From e2cedb462bf1714fc4702e3f22bab091181947f7 Mon Sep 17 00:00:00 2001 From: jugeeya Date: Fri, 15 Sep 2023 00:23:23 -0700 Subject: [PATCH] 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 --- .github/workflows/rust.yml | 2 +- src/static/layout.arc | Bin 3652284 -> 3823684 bytes src/training/input_log.rs | 14 +++++++++++++- src/training/ui/input_log.rs | 13 +++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0a1100b..83f708d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -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: diff --git a/src/static/layout.arc b/src/static/layout.arc index ab05c96e95b504ceaf8aa8a4ad72f4e370487d3f..75611c47d9263e3f485fe873c85ed1b9533e2bff 100644 GIT binary patch delta 41113 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 diff --git a/src/training/input_log.rs b/src/training/input_log.rs index f21baf2..1d089d1 100644 --- a/src/training/input_log.rs +++ b/src/training/input_log.rs @@ -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 } diff --git a/src/training/ui/input_log.rs b/src/training/ui/input_log.rs index 374b5fc..0f209d8 100644 --- a/src/training/ui/input_log.rs +++ b/src/training/ui/input_log.rs @@ -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 {