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

69 commits

Author SHA1 Message Date
asimon-1
65f87df1e0
Weighted Probability Menu Selections + TUI Backend Redesign (#655)
* Add replacement training_mod_tui crate

* Begin work on converting over to byteflags

* Allow StatefulTable.iter_mut()

* Additional merge work

* Fixing more compile errors from the merge

* Replace training_mod_tui with training_mod_tui_2, update byteflags dependency for random selection

* Fix button_config, hero buffs, caps issues. Move button logic into App

* Restore some functions that I cut too agressively

* Move to_vec into byteflags crate

* Fix src/training/ui

* Set `_` match arms on byteflags to `unreachable!()`

* Fix final few compiler errors

* Run formatter

* Reconsider whether unreachable parts are actually unreachable

* Adjust logging and remove dead code

* Fix some menu bugs

* Adjust icon sizes

* Separate checkmark from is_single_option

* Allow fast increment / decrement of slider handles with up/down

* Allow resetting current menu

* Change button behavior: `R/Z` now resets either the whole menu or the selected submenu depending on app.page, and `Y` now clears the current toggle so you don't have to press A six times. Only show keyhelp for `Y` if its relevant.

* Remove unneeded command line interface

* Take care of some minor nomenclature TODO's

* Increase stack size for menu::load_from_file() to avoid crashes

* Implement confirmation page before restoring from defaults

* Run rustfmt

* Fix warnings
2023-12-02 09:02:43 -08:00
GradualSyrup
82a0cf1d35
Save State Random Slots, other bugfixes (#649)
* Fix UI function hook

* Save State Slot Changes

* Random Slots need a static >.<

* Cargo optimization changes

* fix early return (again)
2023-10-06 20:18:38 -07:00
jugeeya
587db532f3
Upgrade to 6.0.1 2023-09-17 16:46:48 -07:00
jugeeya
1c6103a9ce
Update to 6.0.0 2023-09-15 00:25:38 -07:00
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
GradualSyrup
9e94ef72a9
Pikmin Save States and Skyline Smash update (#613)
* Add reusable print_fighter_info()

* rustfmt

* Clippy

* starting charge

* Working Pikmin Save States, motion not working, order can be messed up by loading during an aerial, if you save too quickly you lose pikmin in the state

* often failing boid read

* notes

* Prevent Pikmin from being cleaned up by the regular cleanup process

* migration progress

* skyline-smash branch, more pikmin work

* Using buff to spawn pikmin, character specific file for cleanliness

* failed reordering attempt

* more failed ordering

* almost kind of works but out of order

* failed all, need to try individual hold and status change

* hard reorder crash

* battleobject not boma

* comment clarification

* messing around with printing

* printing, about to try to find where autonomy is being set

* solution found, going to hook backshield to find where autonomy is being set to true

* found where to hook, will start hooking

* switched to charge, issues with inline hook

* need to only have autonomy ignored on save state load

* distance and status controls (doesn't work perfectly)

* Christmas Miracle

* Working w/ Cleanup

* training mode check, improved owner check

* debug feature print methods

* Pikmin debug assertions

* clippy print fix

* appease clippy
2023-08-30 19:00:29 -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
jugeeya
f862abacaf
Remove references to NN HID hook (#590) 2023-08-14 08:55:05 -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
jugeeya
1ce2850af3
Save State Slots as Menu Option (#520)
* Initial

* Clippy + Format

* Update save_states.rs

* selected vs random

* fix

* Formats

* Format

* Format

* Updated copy, 2 randomize_slots, 2 save_slot_state

* Update to 5.1, fix random logic

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-04-14 15:48:22 -07:00
jugeeya
cd399eb922
Update README for 5.0 (#479)
* Update README.md

* Update README.md

* Update Cargo.toml

* Update README.md

* Update README.md

* Add files via upload

* Update README.md

* Add files via upload

* Delete 2022051021130700-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021131000-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021131300-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021134700-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022051021135400-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022060221360900-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Delete 2022060221415900-0E7DF678130F4F0FA2C88AE72B47AFDF.jpg

* Update README.md

* Add files via upload

* Add files via upload

* Delete mash_trigger_tumble.mp4

* Update README.md

* Add files via upload

* Update README.md

* Add files via upload

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update rust.yml
2023-03-04 19:12:58 -08:00
jugeeya
8e5b180d7e
Update Cargo.toml (#500) 2023-03-01 16:54:07 -08:00
jugeeya
7fb93ea309
Minreq/Native TLS: Ignore handshake failure (#487)
* Ignore handshake failure

* Update Cargo.toml
2023-02-19 22:44:21 -08:00
Austin Traver
d128b902ed
Add icons to the new menu (#482)
* Added test icons to layout,
toggle visibility of icon based on submenu_id

* disable icon container pane when menu is open

* Add icons to 'layout.arc'

* Add remaining icons to 'layout.arc'

* Apply suggestions from code review

Co-authored-by: jugeeya <jugeeya@live.com>

* Incorporate feedback, remove deltas from formatting differences

* Updated some icon textures, updated layout

* Swapped x for check icon on selected toggles

* Moved logic to collect submenu id's to app impl

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
Co-authored-by: jugeeya <jugeeya@live.com>
2023-02-15 22:47:36 -08:00
jugeeya
3d6ea34eeb
Use layout.arc to Build UI (#473)
* Update lib.rs

* Remaining fixes

* Initial

* Forgot to commit

* Clippy

* Initial

* Use feature gate

* Fixes

* layout.arc actually working. Add training_mod_menu_button

* Add docstring, fix from static

* Use include_flate to keep binary smaller

* Add most menu features back

* Add help, tabs

* Add help, tabs

* Small refactor

* Fix clippy, some other issues

* Updated menu buttons, inactive text colour (btns), layouts

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-02-09 07:51:40 -08: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
7ec7928c55
Use nnsdk and smash upstreams for ui2d (#453)
* 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

* Last impls for resources, small cleanup

* Use macro for pane names

* Format

* Add HUD toggle

* Small change

* Fix for reentering training mode

* Last cleanup

* Format Rust code using rustfmt

* Try using nnsdk/smash upstream

* Format Rust code using rustfmt

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 19:22:30 -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
jugeeya
3ecc6aae0a
Update NRO hook for compatibility with Smashline mods like HDR (#444)
* Update NRO hook

* Update rust.yml
2022-12-15 10:01:45 -08:00
jugeeya
a69dc8c096
Fix beta crashing after 8 event pushes (#441) 2022-12-05 10:54:41 -08:00
Austin Traver
c067612291
Add vendored 'native-tls' as dependency (#437)
Necessary for build to succeed on macOS
2022-11-23 13:49:04 -08:00
jugeeya
0e708423b3 REMOVE RING FROM THE DEPENDENCIES NGHHHHHH 2022-11-23 12:27:57 -08: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
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
7bbae26f35
Pokemon Trainer: Save State Fix (#387)
* Initial; stay same pokemon, but still go through ball throw animation

* Remove PTrainer ball throw animation

* Merge with master

* Needed import

* Format Rust code using rustfmt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-06 13:49:03 -07:00
asimon-1
e42e046b87
Make ganon's aerial sideb untechable (#375) 2022-06-22 03:49:57 -10: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
2664a4f75f
Update to 4.0.0 2022-05-22 17:02:00 -07:00
jugeeya
1849e36ff5
Fix Diddy/Link save state items by removing LuaConst caching 2022-05-22 15:27:52 -07:00
jugeeya
e4e2de0a79
Quick Menu + Ryujinx Compatibility (#313)
* Initial commit

* Format Rust code using rustfmt

* Add back fs calls

* working with drawing

* wow we're almost there

* multi-lists working, selection within tui working

* working with tabs

* working with smash

* amend warnings, fix menu actually saving inputs

* small refactors

* Fully working!

* Fix warnings

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-03-20 11:09:25 -07:00
jugeeya
884c00b069
Metrics Pipeline (#278)
* initial commit

* plotting working

* allow plotting

* Change spacing in workflow YML

* Fix get_random_option calls

* Format Rust code using rustfmt

* Amend removed feature

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-02-20 19:14:22 -08:00
jugeeya
1d8c3bcf48
Update to 3.2.0 2021-12-27 13:10:50 -08:00
jugeeya
86ac1724bc
Update to v3.1.0 2021-10-26 10:47:03 -07:00
jugeeya
b52a956f61
Enable save states toggle (#276)
* enable save state toggle

* update version to beta version

* fix

* fix 2

* Add icon
2021-09-29 08:37:11 -07:00
jugeeya
d45871cf68
Update to latest skyline-smash (#267)
* Try latest skyline-smash

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml
2021-09-15 07:50:14 -07:00
jugeeya
198bf23031
Add Firebase logging via HTTPS (#248)
* trying

* trying

* try with json to compile

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update Cargo.toml

* Update lib.rs

* Update Cargo.toml

* further testing

* continually testing

* simplify

* remove unnecessary diffs

* working!

* Use cargo-skyline image with devkitpro

* Update rust.yml

* Update rust.yml

* Remove clippy PR for now
2021-09-13 08:24:43 -07:00
jugeeya
5ac46b4d29
Use NRO hook v0.3.0 to remove intermittent crashes (#256)
* Use NRO hook v0.3.0 to remove intermittent crashes

* Update rust.yml
2021-09-09 11:29:44 -07:00
jugeeya
345fd619a1 use nn_hid hook for compatibility with results screen skip 2021-08-20 18:48:40 +00:00
jugeeya
46484bafff
Make changes to satisfy clippy; add cargo clippy PR commenter (#223)
* raygun print frame advantage

* Don't release, but allow action for raygun-print branch

* Add as menu option, only print in that case

* revert change to workflow file

* fixes

* add workflow clippy spec
2021-08-14 19:06:25 -07:00
jugeeya
3d563b9450
Add back frame advantage using raygun shot printer (#219)
* raygun print frame advantage

* Don't release, but allow action for raygun-print branch

* Add as menu option, only print in that case

* revert change to workflow file
2021-08-09 21:33:03 -07:00
asimon-1
cd8755012c
Fix GH Actions Workflow (#208)
* Add workflow_dispatch

* Add specific lock_api version

* Update to latest cargo-skyline version

* Update workflow with skyline-rs toolchain

* Separate cargo-skyline install and toolchain update

* Use Rust docker container

* Try rustocker/rustup container

* Revert "Try rustocker/rustup container"

This reverts commit 26fff6a44f.

* Try fork of cargo-skyline

* Revert "Try fork of cargo-skyline"

This reverts commit 0465c39e94.

* Try installing own Rust

* Fix syntax error

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-06-22 13:47:29 -07:00
jugeeya
18a5cee052
Update parking_lot dependency 2021-06-15 20:06:37 -07:00
jugeeya
2281e36556 small changes 2021-04-15 19:44:42 -07:00
jugeeya
1a273f7cbf
Initial Web Menu Implementation (#170)
* initial commit with some nice css

* add beginnings of templating. revert to qa model

* add most options visually

* add parser and full input checks

* separate menu code, use ControlModule

* add tests for menu rendering locally

* wip sliders

* add AttackAngle

* remove tesla overlay

* begin with into_string

* add slider.js

* don't use in html yet

Co-authored-by: jugeeya <jugeeya@llive.com>
2021-04-14 10:21:51 -07:00
jugeeya
7b0daca018 add outside_training_mode to uploaded artifacts 2021-01-22 19:21:17 +00:00
jugeeya
42f77abed6
Fix Cargo.toml version 2020-10-24 10:53:20 -07:00
jugeeya
224dac24b8
Make release version for 2.6 (#171)
* Update Makefile

* Update Cargo.toml

* Update Cargo.toml

* Update README.md
2020-10-24 10:47:10 -07:00
jugeeya
67a03dd38a satisfy clippy rules 2020-09-27 22:24:50 +00:00
jugeeya
c83371d2c4 add all controller support for input_delay 2020-09-26 00:49:06 +00:00