1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-28 04:44:06 +00:00
Commit graph

325 commits

Author SHA1 Message Date
github-actions[bot]
b28522a6ce
Format Rust code using rustfmt 2023-01-18 01:28:14 +00:00
jugeeya
180f6f4228 Quick Menu: Change selected option bg color to blue 2023-01-17 16:54:55 -08:00
github-actions[bot]
2b66f0ee13
Format Rust code using rustfmt 2022-12-31 21:45:48 +00:00
asimon-1
7ca9e5fb77
Save States: Handle Ledges and Asymmetric Stages (#455)
* Don't save situation_kind_cliff

* Handle asymmetric stages
2022-12-31 13:41:01 -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
c1a6f6626d
Add HUD toggle (#452)
* 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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 15:56:35 -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
52e3528292
Use ui2d-based Quick Menu; show dmg percentage on save state % reload with random damage (#450)
* 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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 20:09:22 -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
github-actions[bot]
c8349005c3
Format Rust code using rustfmt 2022-12-18 21:49:48 +00:00
GradualSyrup
c7457cf0fd
Keep Crafting Table on state load (#448)
* Keep Crafting Table on state load

* Better Table Reference

* Use for..in loop for clearer code

* Remove Crafting Table jugeeya edition
2022-12-18 13:43:40 -08:00
github-actions[bot]
01a2c60a29
Format Rust code using rustfmt 2022-12-16 04:03:44 +00: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
github-actions[bot]
cf39454991
Format Rust code using rustfmt 2022-12-13 04:01:32 +00:00
asimon-1
1c5a5a71fa
Don't tech untechables (#442) 2022-12-12 19:55:15 -08:00
jugeeya
4cb5152c28
Fix Pokemon Trainer: Pokemon switch and save states are functional 2022-11-11 08:46:55 -08:00
asimon-1
97c2dc5fd0
Get the correct amount to reduce clatter time from start_clatter (#428) 2022-11-10 21:37:01 -08:00
gnaomo
6466918f7b
Refine Mash Trigger Distances (#426)
Fixes #408
2022-11-10 17:26:45 -08:00
github-actions[bot]
156c2c5f32
Format Rust code using rustfmt 2022-11-07 20:01:23 +00:00
jugeeya
93155a2788
Remove all articles on save state load 2022-11-07 11:55:59 -08:00
github-actions[bot]
57530ba72f
Format Rust code using rustfmt 2022-11-07 05:19:10 +00:00
asimon-1
8858fbcedd
Add a lockout timer to snake dthrow mistech options (#419)
* Add a lockout timer to snake dthrow mistech options

* Remove print statement
2022-11-06 09:44:40 -08: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
github-actions[bot]
aea5011a89
Format Rust code using rustfmt 2022-10-16 23:39:38 +00:00
GradualSyrup
7f3a8e8674
No Star KOs (#391)
* Turn off Star KOs

* Remove Star KO Debug
2022-10-16 16:34:05 -07:00
jugeeya
3c3ac301fc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/common/button_config.rs
2022-10-10 17:54:33 -07:00
jugeeya
458758faf9 Spawn web session normally; use web_session feature gate for experimental version 2022-10-10 17:53:08 -07:00
github-actions[bot]
dee5e56433
Format Rust code using rustfmt 2022-10-11 00:24:04 +00:00
jugeeya
2f032c1fc0 Fix button config parsing 2022-10-10 17:17:20 -07:00
GradualSyrup
0b99a611e3
Keep attributes for delayed input (#390) 2022-10-09 17:14:07 -07:00
github-actions[bot]
43b516aa56
Format Rust code using rustfmt 2022-10-09 21:14:11 +00: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
asimon-1
bbc0c93c9a
Refactor input_delay from i32 to Delay (#386)
* Change input_delay to use Delay structure instead of i32

* Update input_delay.rs
2022-10-06 16:03:41 -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
github-actions[bot]
d25583cda2
Format Rust code using rustfmt 2022-10-06 19:20:07 +00:00
asimon-1
945ef21f60
Mash Triggers (#385)
* Create mash triggers; remove mash in neutral and escape options

* Add landing condition

* Make default more readable
2022-10-06 12:15:36 -07:00
asimon-1
e42e046b87
Make ganon's aerial sideb untechable (#375) 2022-06-22 03:49:57 -10:00
asimon-1
9d2f87290b
Add Crouch Setting (#373)
* Hold stick down when requesting crouch

* Add icon
2022-06-16 07:38:33 -10:00
GradualSyrup
5d94e57d70
Bonus Fruit thrown when charged (#372) 2022-06-07 22:26:04 -07:00
GradualSyrup
e4248c2857
State load mash fix (#370)
* Reset queue again to clear mash

* Remove unnecessary reset
2022-06-07 18:36:44 -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
2d37bc22e4
Link's bomb should be 1st variant 2022-05-22 17:07:27 -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
41ecb8aa38
Save state autoload (#352)
* Add save state autoload option

* Add autoload option

* Format Rust code using rustfmt

* Update save_states.rs

* Add files via upload

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-16 21:58:32 -07:00
github-actions[bot]
cef391b519
Format Rust code using rustfmt 2022-05-08 20:43:20 +00:00
GradualSyrup
365d8107dc
Reset percent after potential healing from deep breathing (#343) 2022-05-08 13:39:12 -07:00
asimon-1
adef866456
Fix shieldgrabs (#341) 2022-05-07 10:59:28 -07:00
asimon-1
2cd382e0bc
Feature: Clatter Strength (#337)
* Initial clatter work

* Add clatter to menus

* Change joint to hip

* Update SDI and Clatter to use the same enum

* Avoid early clatter/sdi input
2022-05-03 23:23:01 -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
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
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
GradualSyrup
c6c4105fc3
cleanup and psyche up fix (#321) 2022-03-18 10:53:06 -07:00
GradualSyrup
b879762f0d
remove white flash on state load, handler will add it back if it's required (#320) 2022-03-17 20:04:40 -07:00
GradualSyrup
5422cf5e1f
Ledge Trump Fix (#317)
* initial fix with frame 19 override, need to remove debug and fix delay

* trump avoidance working, debug still present

* Cleanup
2022-03-17 09:26:58 -04:00
GradualSyrup
01a0d51548
Steve save states (#316)
* Mario, Samus, Sheik, GnW, Wii Fit, Hero. Wario incomplete.

* Wario, Mewtwo, Plant

* Rob, Lucario, Squirtle

* Steve, Sora, Incin attempted, all easy ones done

* Steve!

* Donkey Kong

* Most flashes, Samus/Gunner effects

* All except Sheik and DK

* Sheik and DK

* Hero Fix

* First Cleanup

* Cleanup 2

* Full Implementation

* subtract instead of handle

* option tweaking

* made default tools the actual defaults

* remove tar from setup

* prepare for skyline update
2022-03-14 19:45:57 -04:00
GradualSyrup
720f904985
Special charge (#303)
* Mario, Samus, Sheik, GnW, Wii Fit, Hero. Wario incomplete.

* Wario, Mewtwo, Plant

* Rob, Lucario, Squirtle

* Steve, Sora, Incin attempted, all easy ones done

* Steve!

* Donkey Kong

* Most flashes, Samus/Gunner effects

* All except Sheik and DK

* Sheik and DK

* Hero Fix

* First Cleanup

* Cleanup 2

* Remove Steve

* Cleanup with labelling and Pac-Man improvement

* Add charge from problematic merge

* ChargeState struct added, all getters converted

* All charges implemented, matching with Sheik, slight cleanup

* charge getter cleanup

* setter syntax sugar

* more getter cleanup
2022-02-28 20:47:12 -08:00
github-actions[bot]
3992b2cd58
Format Rust code using rustfmt 2022-02-25 00:17:20 +00:00
GradualSyrup
057502e02a
Use NpadGcState instead of handheld state to save trigger info (#312) 2022-02-24 16:13:34 -08: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
github-actions[bot]
54f4e002fa
Format Rust code using rustfmt 2022-02-20 21:56:22 +00:00
GradualSyrup
e18b02e985
Save State Loading Enhancements (#305)
* First attempt. Issue with beginning of misfoot voice lines being played, trying to debug and fix.

* SFX fix, additional GFX fix
2022-02-20 13:52:36 -08:00
github-actions[bot]
42ca84b820
Format Rust code using rustfmt 2022-02-10 05:07:23 +00:00
GradualSyrup
ed528c95d7
Stale Move hooks and buff cleanup (#304) 2022-02-09 21:03:30 -08:00
github-actions[bot]
d2c7ebe9ea
Format Rust code using rustfmt 2022-01-27 22:03:11 +00:00
GradualSyrup
b598aaeee2
Buffing (#297)
* continued testing

* Scuffed Acceleratle Implementation

* Cleanup and Groundwork, Only Accel

* Wii Fit complete, Joker, Hero and Cloud WIP.

* Preparing for multiple spells

* Implemented Multi Buffing

* Cloud Hook, Hero Improvements

* Nearly complete, still messing around with KO Punch

* Works for both fighters now

* Add buff icon

* Wii Fit sound cut, Sepiroth darken fixed

* Cleanup

* Fix Hero Screen Shake

* Clean up buff a bit more

* slight clean up

* Update README.md

Add Buff Options info/file
2022-01-27 13:59:41 -08:00
github-actions[bot]
35a80f83c5
Format Rust code using rustfmt 2022-01-06 07:51:23 +00:00
GradualSyrup
050792a01c
Bugfix: Save State Jostle (#299)
* Fix in !is_dead

* Move fix to get_param_int to fix all deaths

* Update save_states.rs

Reword comment to reflect the situation the code is called in
2022-01-05 23:47:36 -08:00
github-actions[bot]
a67b7af6ff
Format Rust code using rustfmt 2022-01-03 07:44:52 +00:00
GradualSyrup
ff6569b93b
Smooth save state (#298)
* Initial Test

* clean up
2022-01-02 23:41:23 -08:00
github-actions[bot]
e0645a071c
Format Rust code using rustfmt 2021-12-27 21:14:24 +00:00
GradualSyrup
b4d5afd791
Bugfix: Ice Climbers savestates (#294)
* Fix working in frame by frame. Debug commands still present.

* Save States and Menu Delay fixed

* Full basic save state functionality, Debug removed

* NanaPosMove cleanup
2021-12-26 15:28:22 -08:00
github-actions[bot]
ac81ef810f
Format Rust code using rustfmt 2021-12-26 18:11:18 +00:00
GradualSyrup
6f6ce58a88
Throw options (#293)
* Initial Creation

* Initial attempt, no pummeling or actual throw directions implemented

* All throw directions + Throw Delay working

* Medium Delay

* Cleanup and warning fixing

* Menu grammar fix

* Menu Images

* Image Fix and Language Fix

* Renormalize line endings

* Fixed into_string() vs. as_str()

* Update README

* Update Version

* Update to 3.2.0

* Update Cargo.toml

Corrected version number
2021-12-26 10:07:17 -08:00
asimon-1
f9522d2699
Bugfix: PT savestates (#292)
* Prevent PT from respawning twice during save_state loads

* Save fighter_kind in state

* Fix bug where save states might not be loaded immediately if ptrainer status was wait

* Avoid endless loop with PT if loading a save state which was set without PT

* Move is_dead to common::mod.rs
2021-12-23 20:46:17 -08:00
github-actions[bot]
81d0e34e5b
Format Rust code using rustfmt 2021-12-13 05:23:46 +00:00
asimon-1
f19bf47e2a
Slip options (#286)
* Try adding KIND_DOWN_SPOT for snake dthrow

* Fix snake dthrow status_kind

* Add slip conditions for diddy banana
2021-12-12 21:20:01 -08: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
bc3d2d8df5
Add rustfmt action (#265)
* Add rustfmt action

* Update rust.yml

* Format Rust code using rustfmt

* Update consts.rs

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-09-14 14:05:48 -07:00
jugeeya
b454ffecfe
Fix Frame Advantage stuck at zero (#251)
* change init function

* Use menu::init
2021-09-01 10:40:08 -07:00
asimon-1
3fef1a78df
Restrict menu opening multiple times in rapid succession (#245)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-27 16:38:23 -07:00
jugeeya
cd01730af3
Allow frame advantage on hit for moves that send into tumble 2021-08-26 12:36:50 -07:00
jugeeya
c82cd073f4 Revert "Blujay's visualizer"
This reverts commit f8dba57044.
2021-08-24 19:27:29 -07:00
asimon-1
ee56f99652 Change menu file name to training_menu.html (#239)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-24 19:27:04 -07:00
jugeeya
f8dba57044 Blujay's visualizer
Use blujay's visualizer plugin for hitbox/hurtbox visualization (#236)

* working

* Update rust.yml

Fix GH Action for getting visualizer.nro

Fix to visualization, allow hitbox/hurtbox toggle
2021-08-24 19:27:04 -07:00
jugeeya
555bc6927e
add nn hid hook function 2021-08-20 12:05:01 -07:00
jugeeya
345fd619a1 use nn_hid hook for compatibility with results screen skip 2021-08-20 18:48:40 +00:00
jugeeya
f41bfff9f8
Load menu from file, write on menu exit (#222)
* Load menu from file, write on menu exit

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update lib.rs

* Update menu.rs

* Try response as well

* Don't hold response variable

* use static mut option

* everything in a thread

* remove brace

* Try GH actions change

* try

* try

* use container tag

* test

* try abs path

* try checkout

* try showing

* try installing

* test proj

* try stable toolchain spec

* try image

* explicit version

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Try clippy

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* Update rust.yml

* fixes

* only if the conf makes sense

* small clippy fixes
2021-08-15 18:41:40 -07: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
b57cf538f5
Mirrored save states (#216)
* Add mirrored save states to menu and save_states.rs

* Update LongDelay.into_string()

* Add missing submenus

* Add mirrored save states to menu and save_states.rs

* Fix outdated reference to MENU_STRUCT

* Change MIRROR_STATE type from bool to f32

* Move should_mirror call

* Add to_url_param() for SaveStateMirroring

* Fix Facing Direction mirroring bug

Co-authored-by: asimon-1 <asimon1@protonmail.com>
Co-authored-by: jugeeya <jugeeya@live.com>
2021-08-01 12:53:00 -07:00
asimon-1
8757bb9a0e
Web Menu Improvements (#214)
* Add workflow_dispatch

* Fix menu items that are too wide

* Add logic to goBackHook() to only exit if all submenus are closed, and otherwise to close the submenus

* Display question icons

* Complete into_string() for Action, Delay, and BoolFlag structs

* Update into_string() for Direction, Shield, OnOff, Action, Delay, BoolFlag, and SdiStrength to address compiler warnings

* Fix menu items that are too wide

* Add logic to goBackHook() to only exit if all submenus are closed, and otherwise to close the submenus

* Display question icons

* Complete into_string() for Action, Delay, and BoolFlag structs

* Update into_string() for Direction, Shield, OnOff, Action, Delay, BoolFlag, and SdiStrength to address compiler warnings

* Complete into_string() for LongDelay

* Reformat menu.html and fix tag pairs

* Add onoff submenu type in HTML

* Add onoff submenu type

* Add push line to add_sub_menu_onoff

* Refactor settings export to use jQuery.param()

* Set initial menu settings per URL GET parameters

* Add macro to build URL parameter string

* Fix bitflag export error

* Write menu file when modpack is loaded

* Fix OnOff displays

* Remove dev files

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-07-28 20:51:41 -07:00
asimon-1
6b87295216
Only apply ledge::is_enable_transition_term to CPU (#212)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-07-21 14:45:47 -07:00
asimon-1
3973ff6d65
Implement Longer Ledge Delays (#211)
* Add workflow_dispatch

* Add LongDelay bitflag type for ledge delays, and change into_index() calls to into_delay/into_longdelay

* Override default ledge climb

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-07-20 10:17:56 -04:00
asimon-1
bbbf2ac898
Launch indicator fix for #205 (#210)
* Add workflow_dispatch

* Use persistent variable to track DI case instead of trying to roll only on the first frame of hitstun

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-07-16 08:24:12 -04:00
asimon-1
5fa0ff135d
DI Indicator Fix and Left/Right Directions (#207)
* Only change DI direction on the first frame of the animation

* Add left/right DI directions

* Add L/R airdodge direction

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-06-15 19:54:19 -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
sidschingis
d24a94835e
Wall Tech Options (#188)
* Extract Method

* Untangle conditions

* Extract Method

* Fix Swapped Constants

* Apply No Tech Option

* Fix Bugs

* Return early on match

* Also cleanup ground tech

* Fix unused warning

* Support Wall Tech Jumps
2021-01-22 11:04:58 -08:00
sidschingis
8189c07e30
Add SDI Strength Toggle (#182) 2020-12-21 07:09:37 -08:00
asimon-1
509f2383ac
Ledge hang (#180)
* Initial work on ledge hang

* Change ledge hang logic from a delay to a persistent selected option

* Disallow ledge-climb if WAIT is picked

* Move is_enable_transition_term hook from lib.rs into existing mod.rs hook

Co-authored-by: Andrew Simon <asimon@domeng.com>
2020-12-10 10:03:42 -08:00
sidschingis
ebc046db1d
Add Save State Damage Toggle (#176)
Added toggle to not overwrite the damage when loading a save state
2020-11-20 09:48:14 -08:00
sidschingis
950407553f
Add Attack Angle (#174)
* Add Attack Angle

Added toggle for chosing angled attacks

* Add Help Text

* Actually Apply Help Text
2020-11-09 17:57:35 -08:00
sidschingis
30e38b1256
Add Constant Shield Toggle (#173)
* Extract Method

* Add Constant Shield

Shield that takes damage but doesn't decay

* Constant Shield Fix

* Update Shield Hold Interaction

Only set decay flag if shield hold is selected
2020-11-06 13:30:48 -08:00
jugeeya
9746349a69 refactor, disable input delay outside training, disable recording 2020-10-01 02:46:25 +00:00
jugeeya
c6d9c9c322
Small buffer mash fix 2020-09-29 08:48:24 -07:00
jugeeya
c81d996312
Fix buffer action when empty 2020-09-28 14:00:45 -07:00
jugeeya
e62d602895 refactor ANGLE_NONE 2020-09-27 23:56:18 +00:00
jugeeya
67dec0402d merge with master 2020-09-27 23:24:52 +00:00
jugeeya
67a03dd38a satisfy clippy rules 2020-09-27 22:24:50 +00:00
jugeeya
0aa387552f
input record typo 2020-09-25 21:04:34 -07:00
jugeeya
c6c600aae1 enable janky input_recording 2020-09-26 01:07:13 +00:00
jugeeya
8301d73790 use nnsdk hid imports 2020-09-26 00:57:25 +00:00
jugeeya
c83371d2c4 add all controller support for input_delay 2020-09-26 00:49:06 +00:00
sidschingis
0107e31b85
Fix Shield: Hold (#164)
Fixed the first hit not applying damage when  normal shield hold is selected
2020-09-16 13:07:06 -07:00
sidschingis
2471b4acf9
Enable Dash Attack Again (#163) 2020-09-14 14:00:42 -07:00
jugeeya
7b362c8330
Params hook refactor, basis for input delay (#162)
* use Params hook

* Add input delay
2020-09-14 13:43:06 -07:00
jugeeya
1885258c4e Refactor to use param object 2020-09-08 23:04:49 -07:00
jugeeya
e74ee787f3 Fix infinite shield with projectiles 2020-09-08 21:10:27 -07:00
jugeeya
33419b30c4 Fix tech bugs; hazards control refactor 2020-09-07 22:05:17 -07:00
jugeeya
ba939b3be1
Remove enable transition check for ground tech 2020-08-30 01:16:14 -07:00
jugeeya
02f4095c37 Add Miss Tech Options; Save States Control bug 2020-08-29 11:03:33 -07:00
sidschingis
4753258874
Shield Tilt & Refactor Training Checks (#150)
* Rename Module

left_stick => air_dodge_direction

* Extract Method

Added shared hook that is called once per frame per fighter

* Refactor Training Mode Checks

Moved checks to skyline hook

* Add Reset Module

Unlink SDI from mash toggle

* Add Shield Tilt Toggle

* Version +

* Fix Rumble

* Remove Debugging Code
2020-08-27 16:35:38 -07:00
sidschingis
7d153da81c
Add Ledge/Aerial Delay Options (#147)
* Fix Multi Followups

* Add Aerial Delay Toggle

* Add Ledge Delay Toggle

* Add More Delay Options

* Add More Delay Options

* Add Dash Toggle

* Version +
2020-08-24 13:57:22 -07:00
sidschingis
22e2852df7
Reduce SDI Pulses (#146)
Reduced SDI to every 8 frames to match the stock "CPU Shuffling: A lot"  option
2020-08-22 15:33:07 -07:00
jugeeya
aa757da61d Merge branch 'master' of https://github.com/jugeeya/UltimateTrainingModpack 2020-08-21 15:17:48 -07:00
jugeeya
1db42feab8 check_hit_stop_delay_command is not in the common NRO 2020-08-21 15:17:37 -07:00
sidschingis
1e4fa4e006
Deref Constants (style) (#144) 2020-08-21 08:42:47 -07:00
sidschingis
22c68f1b92
Reset Counter when choosing direction (#143) 2020-08-20 17:34:03 -07:00
jugeeya
15767e8cf7 remove dash attack for now 2020-08-19 20:40:49 -07:00
jugeeya
bec36ec897 fix empty mash option breaking 2020-08-19 20:31:15 -07:00
sidschingis
5fee828169
Fix Aerials (#142)
* Revert "Unnecessary global for aerial action buffer (#141)"

This reverts commit 4cc66547c0.

* Remove Check

Non Aerials will just return None in
into_attack_air_kind()
2020-08-19 15:28:33 -07:00
sidschingis
4cc66547c0
Unnecessary global for aerial action buffer (#141)
Can just use the current buffer value
2020-08-18 10:34:57 -07:00
sidschingis
53c361686f
Mash Fixes (#140)
* Fix Shield Toggle

Fixed air dodging when shield is buffered

* Update Mash Reset

Fixed followups not being cleared on reset (training mode/ save state/ tech)

Fixed resetting when landing after a mash toggle

* Version +

* Use Existing Constant

* Adjust Versioning
2020-08-17 15:05:40 -07:00
sidschingis
1835be9cfb
Add SDI Toggle (#139) 2020-08-17 12:37:02 -07:00
jugeeya
9b0ede64b9 turn off sound effects for save states 2020-08-16 18:05:45 -07:00
jugeeya
7e1d8a054f refactor Save States to structs-- fix plat issues 2020-08-16 16:57:46 -07:00
jugeeya
abf7d34332 merge with master 2020-08-16 16:33:54 -07:00
jugeeya
a7da2c15bc fix Save State bugs with Link, Richter 2020-08-16 16:33:27 -07:00
jugeeya
647e7fe27e
Save States ledge bug 2020-08-16 12:45:38 -07:00
sidschingis
c961d028d0
Apply Bit Flag (#138)
* Apply Bit Flag

Fast Fall
Full Hop
Falling Aerial

* Fix DI

Fixed neutral DI not overwriting previously set DI
2020-08-16 11:52:09 -07:00
sidschingis
da66544104
Bit Flag Refactors: Delay, Direction (#137)
* Cleanup

* Add Bit Flag

Directions

* Apply Bit Flag

Delay options

* Version +
2020-08-15 08:52:29 -07:00
sidschingis
7ff8185a65
Apply Bit Flags to Mash/Defensive Options (#136)
* Apply Bit Flag

Defensive Options

* Apply Bit Flag

Followups

* Apply Bit Flag

Mash options

* Update Version String
2020-08-14 12:12:50 -07:00
sidschingis
12807258be
Add Bitflag Macro (#135)
get_random
2020-08-14 10:35:57 -07:00
sidschingis
8feab4cf17
Shield Flash Workaround (#134)
* Fix Shield Buffer

Shield doesn't work with cat_flags

* Move unsafe declaration inwards
2020-08-13 14:20:56 -07:00
jugeeya
6dd2f395fd use alternative DI method: based on player relative position 2020-08-13 13:34:22 -07:00
jugeeya
ca4f0b3122 use alternative DI method: based on player facing direction 2020-08-12 20:29:31 -07:00
jugeeya
4f779c6f57 More mash bug fixes 2020-08-11 17:28:37 -07:00
sidschingis
3247ecb711
Bug Fixes (#133)
* Revert To Command Flags

* Fix Rising Aerial

* Fix Roll/SpotDodge
2020-08-11 15:46:46 -07:00
sidschingis
96008c6ea3
Separate Tech Rolls (#126)
* Add Wrapper for rand

* Separate Tech Rolls
2020-08-11 12:57:40 -07:00