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

428 commits

Author SHA1 Message Date
Matthew Edell
24441c2b26
Update UI for quickmenu slider values (#458)
* Updated devcontainer to remove unused config

* Added slider menu background and text labels

* Finished layout of UI components

* Reordered slider values

* Fixed alignment of labels

* Adjusted label postion to be centered vertically

* TEST for colors

* Updated UI to look better with colours

* Changed menu to only have 'min' & 'max', fixed layout

* Created macro for slider button labels, cleaned up warnings

* Updated default case to panic

* Added text outline and shadow, updated text colours to match the game

* Updated default cases to panic
2023-02-02 11:02:59 -08:00
asimon-1
8866d1a2ce
Only write HTML on Console (#464) 2023-02-01 07:29:22 -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]
6d312521d1
Format Rust code using rustfmt 2023-01-29 03:11:32 +00:00
techyCoder81
1a9dea2f52
Update infinite shield logic to work for modded gameplay (#460)
* update infinite shield logic

uses the originally loaded shield mul param rather than a hardcoded vanilla param that may be different than what the game (read: mods) had loaded initially.

* use option instead of a magic float
2023-01-28 19:06:35 -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
github-actions[bot]
b28522a6ce
Format Rust code using rustfmt 2023-01-18 01:28:14 +00:00
jugeeya
a364a214e2 Fix for recent rust-analyzer checkOnSave change; clippy fix 2023-01-17 17:23:24 -08:00
jugeeya
180f6f4228 Quick Menu: Change selected option bg color to blue 2023-01-17 16:54:55 -08:00
jugeeya
84fbe98d0d Quick Menu: fix speed, potential to deadlock 2023-01-17 16:02:19 -08:00
jugeeya
e174daeb6f Fix Quick Menu when used with joycons 2023-01-04 17:10:58 -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
asimon-1
f35f10e4f4
Fix two bugs which caused some OnOffs to work incorrectly (#454) 2022-12-31 12:02:49 -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
github-actions[bot]
b40427465d
Format Rust code using rustfmt 2022-11-21 20:53:11 +00:00
asimon-1
9fc6df6e52
Fix the is_in_clatter(0 function so that it no longer triggers after the fighter leaves the clatter status (#435) 2022-11-21 12:46:32 -08:00
github-actions[bot]
fdd20b9dd2
Format Rust code using rustfmt 2022-11-12 00:12:55 +00:00
jugeeya
196949d499 Fix compatibility with Arcropolis 2022-11-11 16:07:48 -08:00
jugeeya
4cb5152c28
Fix Pokemon Trainer: Pokemon switch and save states are functional 2022-11-11 08:46:55 -08:00
gnaomo
8ffee85d2b
Adjusted button mapping for attack and special (#429) 2022-11-11 07:00: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
jugeeya
d0c7a106ca
Fix issue with side taunt acting as Special input with button config 2022-11-10 15:43:56 -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]
146146f4b9
Format Rust code using rustfmt 2022-11-07 19:12:55 +00:00
jugeeya
dba668430c
Bugfix: pausing hitbox visualization 2022-11-07 11:06:40 -08:00
jugeeya
ccac7c958d
Keep effects for most statuses including double jump, missed tech 2022-11-07 10:55:13 -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
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
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
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
github-actions[bot]
bb923b2124
Format Rust code using rustfmt 2022-10-11 01:00:53 +00: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
github-actions[bot]
c868fac2c3
Format Rust code using rustfmt 2022-10-04 08:28:51 +00: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
jugeeya
88abeadfdd Fix issue with not being able to reopen menu after fighter reset/reentry into training 2022-10-02 09:38:40 -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
gnaomo
55ee4733e2
Fix Touchscreen Back Button (#381)
Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
2022-08-05 09:10:04 -07:00
Matthew Edell
16f975a9d0
Update web UI for better maintenance (#380)
* Updated menu buttons and icons

* Cleaned up .devcotainer

* removed dockerfile from .devcontainer in favour
of using image

* Added JS settings, updated menu template, css, js

* Updated tab width to 4

* Refactored openTab and closeAllItems,
default tab content to be hidden,
added polyfill for NodeList.forEach

* Refactored openItem, made targeting modals easier

* Refactored toggleOption

* Fixed clicking tab not closing active modals

* Updated aerial delay and falling aerial icons

* Updated colours of defensive settings menu icons

* Updated misc tab menu icon colours

* Fixed oos_offset, shield_state, and shield_tilt

* Fixed all tabs defaulting to active,
Updated modals to be outside menu_items,
Refactored JS to work with new HTML hierarchy

* Updated settings to be JSON

* Fixed single options not populating correctly from url

* Updated menu to edit settings object when toggled

* Removed updating settings from menu before exit

* Refactored comments to fewer lines

* Refactored to use const,
Refactored to use camelCase,
Refactored resetCurrentSubmenu & resetAllSubmenus

* Fixed size and alignment of menu item text,
Fixed size of option button's text,
Fixed colour of crouch icon

* Updated stroke width for crouch icon feet & arms

* Updated check to use fontawesome as a base,
Changed colour to have better contrast,
Added outline for better contrast

* Updated one-winged angel option to 1-winged angel

* Updated openTab and resetCurrentMenu to play sfx
2022-08-04 19:34:25 -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
8c5f4ec67a
Menu icon for Character Item 2022-05-22 10:57:21 -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
asimon-1
aa416d8065
Menu fixes (#347)
* Menu style nits

* Avoid creating junk folders
2022-05-10 18:45:24 -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
f948ceec53
Version check for v3.3 (#344)
* Version check for v3.3

* Use enum instead of Option<bool>
2022-05-08 15:48:13 -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
asimon-1
a6d12eb3e9
Remove fonts (#334) 2022-04-11 13:58:52 -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
3f049605c3 Merge branch 'master' of https://github.com/jugeeya/UltimateTrainingModpack 2022-03-24 17:12:10 -07:00
jugeeya
24c3e8a020 Embed shaders & font into menu NRO 2022-03-24 17:11: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
jugeeya
491b8f975f Fix quick menu disabling 2022-03-21 00:57:30 -07:00
jugeeya
2c3e0d752c Fixes to menu; use left side of screen 2022-03-21 00:51:58 -07:00
jugeeya
3a9dae3576 Move external Quick Menu dependencies to static/ 2022-03-20 11:50:56 -07:00
jugeeya
6976c53172 Small fixes to Quick Menu 2022-03-20 11:23:45 -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
asimon-1
e2a5620ee3
Change from remote to local resource files (#315)
* Extract css into standalone file

* Move images to static folder

* Add fonts, fix focus animation

* Remove Nintendo JS dependencies

* Remove unused sliders templating

* Fix shadows

* Fix back button

* Work on Sound Effects

* Change htdocs folder

* Move fonts to a folder

* Refactor JS to remove jquery as a dependency

* Fix broken JS

* Update rust.yml
2022-03-05 13:55:13 -08: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
asimon-1
b52112bb12
Configurable default menu (#288)
* Allow saving current menu as new defaults

* Save menu defaults in the HTML file. Write html when saving

* Add effect when saving defaults

* Adjust effect size

* Use URL param to save defaults instead of ingame chord

* Update the menu to include checkbox for saving defaults

* Fix menu styling

* Update README

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-12-19 17:43:57 -08:00
jam1garner
9d1d2ca76b
Common module cleanup (#290)
* Cleanup src/common/consts.rs

* Cleanup src/common/events.rs

* Cleanup src/common/menu.rs

* Cleanup src/common/mod.rs

* Cleanup src/common/raygun_printer.rs

* Finish cleanup for common module
2021-12-19 13:03:44 -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
asimon-1
195e52dad7
Remove tumble from statuses on is_in_hitstun (#284) 2021-11-10 14:55:04 -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
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
asimon-1
40eec371b2
Add green glow to check.svg (#254)
* Add green glow to check.svg

* Remove inkscape metadata

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-09-03 08:02:16 -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
asimon-1
516c85ec30
Menu help text (#234)
* Add footer with help text

* Set help text strings

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-17 16:43:01 -07:00
asimon-1
b4627d29ce
Fix question icon opacity (#233)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-17 09:23:00 -07:00
jugeeya
841ea5e8fe
Single Option Menu (#231)
* add flag

* Update clickToggle() to handle single-option submenus (#232)

Co-authored-by: asimon-1 <asimon1@protonmail.com>

Co-authored-by: asimon-1 <40246417+asimon-1@users.noreply.github.com>
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-16 17:09:51 -07:00
jugeeya
a4533a4810
Inclusive range for alphabet 2021-08-16 17:05:52 -07:00
jugeeya
40a5a08754 add simple macros for onoff/single option menus 2021-08-16 13:48:58 -07:00
asimon-1
49c30bb30d
Menu export bugfix (#229)
* Use jQuery to handle class addition/removal

* Use .is-appear class instead of innerHTML for goBackHook

* Revert unrelated comment

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-16 11:48:00 -07:00
asimon-1
dcdb670a42
Use jQuery to handle class addition/removal (#227)
Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-16 10:55:32 -07:00
jugeeya
6ffec53204
Remove threading from file write (#226) 2021-08-16 09:35:11 -07:00
asimon-1
2271d533c0
Add Menu Icons (#225)
* Center icons

* Add icons

* Adjust CI to upload all artifacts

* Also include icons in .zip

Co-authored-by: asimon-1 <asimon1@protonmail.com>
2021-08-15 18:55:51 -07:00