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

115 commits

Author SHA1 Message Date
jugeeya
7e0617e377
Input Logger (#591)
* Initial

* Begin to use font glyphs, small refactor

* Colored icons in 5 slots

* Dedupe, some color changes

* Add 10 input log spaces

* Add lots, but glitchy fade out needs fixing

* Frame Counter fixes

* Remove testing bflyt

* Use just text for now

* Add support for raw inputs, menu option

* Fix stick thresholding for the most part?

* Small change

* Add statuses!

* Some fixes

* Fix softlock thing, in general fix frame-by-frame + TTL weirdness

* Mid-refactor

* Use i8 for thresholds; update layout.arc to master's

* Merge fixes

* More fixes

* Formatting

* Last fixes for clippy / formatting

* Input Display Status Breakdown

* More formatting

* More fixes

* Fix again

* Replaced input log bflyt, added input icon bflyt

* Fixed sizes of all top level frames

* Added Icon part pane

* Got icons imported to bflyt

* Added icon parts to Icons Pane

* Raised size of layout

* Commented out handling of icons as text

* Added most icons, updated icons to match names

* Added plus and minus

* Added analog stick panes to layout

* Got icons working in game

* Fix for lua consts; update print_fighter_info to use consts with names

* Update for consts

* Fix again

* into_iter

* from_iter

* import trait

* Try setting colors

* Fixes

* deref

* Clippy

* Try white color

* Use same upstream skyline-smash

* Try black color with alpha of 0

* Use white for lstick

* Added input display menu icon, removed breakdown from input status display

* Fix formatting + clippy

* Fixed layout, updated icon colours

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-09-01 13:53:04 -07:00
jugeeya
00f2284397
Open Menu with Start Press (#598)
* Initial

* Another fix

* Don't allow opening our menu when vanilla menu is active

* Add menu option ; remove delay to close menu

* Fix issues when closing menu

* Show button config first, log fade

* Fix test

* Fix test again

* Fix initial notification, turn off hitbox visualization by default
2023-08-22 16:12:12 -07:00
asimon-1
cc78dc7e4a
Automatically Keep the Modpack Up-to-Date (#595)
* Grab releases from Github and install

* Refactor

* Fix crash

* Work on fixing install() crash

* Fix the crash by increasing stack size

* Block main() execution on the auto-updater

* Improve error handling

* Delete hash.txt

* Fix get_update_policy()

* Use current time as default last_update_version; Compare publish date to last_update_version to determine if update should be applied.

* Use skyline_web dialogs for user_wants_to_install. Use default selections on emulator instead.

* Fix some logic

* Convert CURRENT_VERSION to a Mutex; implement functions to update the config file

* Adjust logging

* Remove unneeded file

* Allow unwrap after is_some() check

* Fix format

* Auto-updater (squashed)

* Move update policy from config file to menu

* Skip version check on emulator

* Rustfmt, clippy

---------

Co-authored-by: jugeeya <jugeeya@live.com>
2023-08-17 21:21:59 -07:00
Austin Traver
10ebff5a6f
Refactor string representation for buttons and menus (#592)
* Refactor string representation for buttons and menus

* Pass test cases

* Update help text
2023-08-15 19:37:35 -07:00
jugeeya
00268b3d72
Refactor Menu Input (#584) 2023-08-10 09:34:28 -07:00
jugeeya
77f527c99a
Use Native Smash Input for All Input Processing (#581)
* Initial

* Finishing up with button config

* Formatting, some clippy

* Move button config to menu

* Consts formatting

* Fix input_record_press (thanks test!)

* Properly migrate menu button inputs

* Updates to triggers, including text

* Convert to multi-select
2023-08-10 07:28:13 -07:00
GradualSyrup
fe8ae6f39f
Buff Health Fixes (#571)
* Hooked AddDamage, pointer manipulation trouble

* Working Wii Fit Fix

* Inline Hook Setup for Sephiroth Wing (crashes)

* Revert Broken Wing Chanes

* Further revert

* Fix Sephiroth Buff Percentage glitches
2023-08-05 14:36:27 -07:00
GradualSyrup
dcb1e831dc
Shulk Monado Art Buffs, SFX and Visual Buff Fixes (#564)
* Monado Buffs, Shulk Dial on Input Recording, Silent Buffs

* All Buffs Silent

* Shulk Flash removed, working on KO UI update

* Little Mac Meter Update

* Remove a few debug functions

* More cleanup

* merge with main

* Paren

* Paren

* rustfmt

* Clippy Fixes

* Fix further Shulk effect issues, improve buff functions
2023-08-04 10:23:22 -07:00
jugeeya
24ffba4e09
Satisfy clippy for fn_null_check (#534)
* Satisfy clippy for fn_null_check

* Update lib.rs

* Update lib.rs

* Use comparison with 0

* Update mod.rs

* Update lib.rs

* Update mod.rs

* Update lib.rs
2023-07-13 09:46:34 -07:00
asimon-1
7eec409086
Mash Overrides (#533)
* Merge from CookieScythe branch

* Rename block to shieldstun, add icons to layout.arc, add new options to ui_menu

* Address clippy warnings and reformat

* Add fn_null_check back to whitelist

* Pray to clippy gods
2023-07-12 11:36:32 -07:00
Chris McDonald
5b2e4c7319
Add rustfmt CI checker and format (#518)
* Add rustfmt CI checker

Minimal checker that just runs `cargo fmt --check` on all targets.

* rustfmt
2023-04-11 14:56:14 -07:00
Chris McDonald
67948f7373
Fix clippy CI: once_cell is stabilized (#517)
This feature has been stabilized in 1.70-nightly, so remove the feature
flag so that Clippy stops complaining about it.
2023-04-11 14:01:21 -07:00
jugeeya
330976f490
Change default button config for save states: load/save to Shield, slots to Grab (#510)
* initial

* Change references to grab/shield

* Update README.md
2023-03-22 14:22:27 -07:00
jugeeya
f268137bc4
Don't panic on failure to remove legacy dir (#495) 2023-02-24 11:22:06 -08:00
jugeeya
e981a0bfd0
Move files to sd:/ultimate/TrainingModpack (#480)
* Initial

* Move filepaths

* Small fix

* Notification on save state save
2023-02-13 19:58:22 -08:00
jugeeya
228ff77673
Format; Optimize Imports (#477)
* Run IntelliJ's optimize imports + formatter

* Clippy
2023-02-11 17:07:29 -08:00
jugeeya
94ff25a921
Save State Slots across game load + Fixes galore: overwrite button config if invalid; exclusive button combos; remove wait when opening menu (#476)
* Overwrite button config if invalid; exclusive button combos

* Tons of fixes

* Fix save state settings load from file
2023-02-11 16:49:05 -08:00
jugeeya
bf78f06f7d
Initial Save State Slots (#474) 2023-02-10 22:02:56 -08:00
jugeeya
d23dcdf968
Deprecate Web Menu (#472)
* Initial

* Fixes
2023-02-07 06:01:52 -08:00
jugeeya
9c590df189
Fail on clippy warnings in CI (#470)
* Update lib.rs

* Remaining fixes
2023-02-05 12:45:35 -08:00
jugeeya
d5c0d636a0
UI Code Refactor; Notifications; Save Defaults for Quick Menu (#461)
* Initial refactor

* Full refactor

* Depend only on pane creator flags

* Small refactor

* Small refactors; notification support

* Don't push event for every quick menu change

* Backend for defaults almost done

* Run tests on CI

* Finish save + reset defaults without confirmation

* Added slider menu UI

---------

Co-authored-by: xhudaman <edell.matthew@gmail.com>
2023-02-02 15:01:11 -08:00
jugeeya
5bb12d04fb
[Github Action] no-dkp image; Move to cargo clippy as simple runner to fix PRs (#462)
* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Fixes for clippy

* Fix clippy again

* Also run check

* Add names

* Remove rustfmt
2023-01-31 15:17:00 -08:00
github-actions[bot]
37360c787a
Format Rust code using rustfmt 2023-01-27 19:24:09 +00:00
asimon-1
77f439a6eb
Improve Error Handling (#459)
* Add error messages by changing unwrap() calls to expect()

* Improve error messages by changing println! to info!/warn!/error!

* Address nits

* Change panic message

* details in panic
2023-01-27 11:19:18 -08:00
jugeeya
ed425d78e5
Add UI backing to text options in menu, always do new damage display (#451)
* A bunch of things

* Current progress

* Fix for ResAnimationContent

* Figure out Parts*

* Cleanup, just because

* New pane working!!!

* New null pane for hierarchy

* Success with parent pane

* Generate multiple panes

* Multiple panes, almost working text color

* MaterialColor test, but fails

* Forgot bitfield-struct

* Vtable for material. Fixes SetWhiteColor!

* Refactor color changing, change naming scheme

* Just Frame Advantage

* Merge

* Delete T_test.txt

* Delete set_txt_num_01.txt

* Delete libtraining_modpack.nro

* Format Rust code using rustfmt

* Ignore shell scripts in repo languages

* General refactor, add basis for quick menu

* Small refactor, fix ordering of submenu options

* Toggles, sliders

* Tons of progress...

* Correct dmg updater, remove old quick menu backend

* Fix damage percentage display

* Small QoL

* Format Rust code using rustfmt

* More edits. Use Quit Training button as Modpack Menu header

* Finish merge

* Format Rust code using rustfmt

* Use vanilla backgrounds for text options

* Format ui_hacks, also always do new percent display

* Fix merge

* That was the most awful merge ever

* Address clippy warnings

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 11:33:17 -08:00
jugeeya
a1c9e35b19
Use UI text box for Frame Advantage; add ui2d backend (#449)
* A bunch of things

* Current progress

* Fix for ResAnimationContent

* Figure out Parts*

* Cleanup, just because

* New pane working!!!

* New null pane for hierarchy

* Success with parent pane

* Generate multiple panes

* Multiple panes, almost working text color

* MaterialColor test, but fails

* Forgot bitfield-struct

* Vtable for material. Fixes SetWhiteColor!

* Refactor color changing, change naming scheme

* Just Frame Advantage

* Merge

* Delete T_test.txt

* Delete set_txt_num_01.txt

* Delete libtraining_modpack.nro

* Format Rust code using rustfmt

* Ignore shell scripts in repo languages

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-22 14:22:37 -08:00
asimon-1
74e374db6d
Refactor untechables (#446)
* Fix rust-analyzer config

* Refactor tech.rs to no longer depend on a static mut
2022-12-15 19:56:36 -08:00
asimon-1
1c5a5a71fa
Don't tech untechables (#442) 2022-12-12 19:55:15 -08:00
github-actions[bot]
30cdd61e26
Format Rust code using rustfmt 2022-11-01 20:58:36 +00:00
asimon-1
fa451986e0
Randomized percent on load (#394)
* Create save states tab

* Initial work - crashes on boot

* Change usizes to u32's.
Refactor toggle "checked" logic.
Add blujay's panic tracker.

* Rename tui mins/maxes

* Fix misc. TUI bugs

* Fix panic caused by prematurely setting the submenu state to GaugeState::None

Set submenu state to GaugeState::MinHover when opening a slider menu so that the slider is immediately loaded

When changing from GaugeState::Min/MaxSelected to Min/MaxHover, commit changes from App.current_sub_menu_slider to SubMenu.slider so that it can be exported to JSON

* Merge save_damage and save_state_pct_rand_enable settings

* Add comments to training_mod_tui::lib.rs

* Add icon

* Initial work on web slider

Todo:
Styling polish
Bugfix for initial settings load
Handle dragging using gamepad

* Style and fix web slider

* Add separate settings for player random damage

* TUI styling fixes

* Paginate TUI tabs

* Address CR comments
2022-11-01 13:52:38 -07:00
asimon-1
4314251664
Don't preload session by default (#392) 2022-10-16 16:32:24 -07:00
jugeeya
0e2500c77f Revert to use web session 2022-10-12 16:19:43 -07:00
jugeeya
458758faf9 Spawn web session normally; use web_session feature gate for experimental version 2022-10-10 17:53:08 -07:00
jugeeya
2f032c1fc0 Fix button config parsing 2022-10-10 17:17:20 -07:00
asimon-1
a1d5fe7fac
Instead of hardcoding, load button combo configuration from a file (#388)
* Instead of hardcoding, load button combo configuration from a file

* Rename conf files, remove extra logging

* Inform the user which keys are invalid
2022-10-09 14:09:47 -07:00
jugeeya
3f5e8398d7 Fix Quick Menu selection (failed to r/w hitbox vis + quick menu previously) 2022-10-04 01:23:55 -07:00
github-actions[bot]
afb8427c0d
Format Rust code using rustfmt 2022-10-03 16:06:19 +00:00
jugeeya
ef5fb1c1e4
Don't spawn web menu thread on emulator 2022-10-03 08:52:12 -07:00
github-actions[bot]
17f2b05940
Format Rust code using rustfmt 2022-09-08 02:39:14 +00:00
asimon-1
36c6e8859a
Refactor to use Web Sessions (#384)
* Initial commit

* don't rewrite file each time

* Format Rust code using rustfmt

* Receive menu settings from web via message

* Adjust logic

* Stub changes for json messages

* Rust: receive menu as json

* Small JS changes for desktop

* Attempt to fix exit issues

* Fix filename issue

* JS: Export menu as json

* Use JSON for Rust -> JS message

* Update .conf file schema to json

* Tear down session when leaving training mode

* Remove URL behavior, rename WebAppletResponse -> MenuJsonStruct

* Update TUI to use JSON

Co-authored-by: jugeeya <jugeeya@live.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-07 19:34:39 -07:00
jugeeya
283279b10c
Fixes for Quick Menu Multi-selections (#362) 2022-05-31 20:43:00 -07:00
jugeeya
9cc4c6b73b
Update to cargo-skyline 3.0.0 (with updated Rust STD!) (#359)
* Try cargo-skyline 3.0.0

* Update Cargo.toml

* Update lib.rs

* Update combo.rs
2022-05-25 15:07:56 -07:00
jugeeya
ac78fb4a4d
Save States with items (#350)
* initial

* Complete refactor, add save state autoload

* forgot to commit consts folder

* Format Rust code using rustfmt

* Refactor, attempt CPU as well

* Update items.rs

* Format Rust code using rustfmt

* Fix web menu

* Format Rust code using rustfmt

* Fix crashes due to cpu kind not set

* Format Rust code using rustfmt

* Prevent Nana from Spawning with Items (#353)

Simple check before giving items

* somehow this code caused blackscreens on ryujinx?

* remerge

* Link and Diddy fixes, Players spawning with CPU item fixes (#355)

* Format Rust code using rustfmt

* Delete mash buffer queue entirely when spawning items to fix diddy as cpu; nits

* fix merge

* nit

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2022-05-21 17:57:41 -07:00
jugeeya
71c30990e4
Quick Menu: B Button hold fix, update from web menu (#345)
* Fix prev_frame_is_pressed

* Update menu when not active

* Update lib.rs

* Actual fix using frame_counter

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-09 21:40:09 -07:00
asimon-1
866035ce7f
Fix SDI crest bug (#336)
* Fix SDI crest bug

* Fix clippy warnings
2022-04-22 12:45:14 -07:00
github-actions[bot]
3255a0349d
Format Rust code using rustfmt 2022-04-09 22:14:25 +00:00
asimon-1
a6bed95de3
Tabbed Web Menu (#333)
* Web menu refactor

* Fix some menu items

* Fixes for quick_menu, general clippy fixes

* Revert small testing change

* Add quick menu SVG

* Fix defaults saving/loading

* Log the last URL from the web menu

Co-authored-by: jugeeya <jugeeya@live.com>
2022-04-09 15:10:44 -07:00
jugeeya
6da6aa41b7
Clippy Linter Fixes (#323)
* initial

* small fix

* Update rust.yml

* Update lib.rs

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-03-24 23:48:50 -07:00
jugeeya
63d31499f5
Use colors in Quick Menu (#325) 2022-03-24 09:27:14 -07:00
jugeeya
42ab764757 Some Quick Menu fixes 2022-03-21 10:03:08 -07:00