1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-18 12:26:11 +00:00
Commit graph

40 commits

Author SHA1 Message Date
asimon-1
bf94573193
Increase Resilience to Game Updates by Dynamically Finding Offsets (#661)
* Search for offsets instead of using static offsets

* Collect the rest of the offsets, still need to convert into needle searches

* Finish writing offset search code

* Run rustfmt

* Fix build error

* Fix clippy warnings

* Add additional bytes and use symbols to prevent false-positives

* Replace additional offsets with symbols

* Change add_damage from symbol back to offset
2024-01-10 14:58:27 -08:00
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
069bdd320b clippy allow 2023-09-21 13:25:53 -05:00
GradualSyrup
d7a00e7227 safer option usage 2023-09-21 13:05:37 -05:00
GradualSyrup
05a9073415 Greatly improve recording playback 2023-09-15 13:37:53 -05:00
GradualSyrup
7fa0e933e9
Functional PT Savestates and additional debug (#616)
* 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 for hooking, Working Implementation (No Transform, No Charge)

* Working for Aegis, PT having issues (LRA into state load works, but not regular state load)

* Working ptrainer hats

* debugging ptrainer

* great debug

* Pokemon Swaps to Saved State

* invisible ball, need to silence trainer/ball and hook joint eff

* cpu isn't being saved properly, lra + state load crash fixed

* CPU working, unsure if flag is necessary though

* Visual fixes working, can't load states again if player if trainer, cpu getting stuck?

* working, trainer stuck if no move on state load, switch initialization issue

* PT is saved

* debug cleanup

* rustfmt, still needs clippy and main merge

* clippy fmt

* one more fmt

* prevent flying plate from existing if you load state during death

* debug cleanup

* rustfmt

* cleanup
2023-09-01 17:02:02 -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
jugeeya
c6352651a1
Disallow Users Locking Themselves out of Menu Input (#617)
* Don't use exclusive button combos

* Formatting
2023-09-01 10:55:21 -07:00
Matthew Edell
be74ce9959
Add icons for new features (#611)
* Added icons for input recording, updated menu names

* Added missing input recording icons, added auto update icon

* Added input_record

* Added input_playback

* Added menu_open_start_press

* Added save_state_load

* Added save_state_save

* Added missing icons, fixed size of camera icons

* Fixed save_state_slot icon
2023-08-24 08:51:26 -07:00
jugeeya
0f808320c3
Fix formatting issue (#594) 2023-08-16 06:29:14 -07:00
Austin Traver
e78ab92d4b
Fix soft-freeze on loading Quickplay lobby (#593)
* Fix soft-freeze on loading Quickplay lobby

* Formatting

---------

Co-authored-by: jugeeya <jugeeya@live.com>
2023-08-16 06:15:11 -07:00
jugeeya
6f1e4af332
Don't set CPU controls outside of training 2023-08-15 23:57:38 -07:00
GradualSyrup
7c522c02bc
Option to Crop Recording when it ends with neutral inputs (#587)
* Working neutral end early

* fmt

* Default on

* Normalize namespace
2023-08-12 15:37:27 -07:00
GradualSyrup
acd6c55f48
Fully Match Input Recording Notifications with the Current state (#577)
* Fully Match Input Recording Notifications with the current state

* Switch final record frame variable

* Use new hook for notifications, realign playback notif

* fmt

* Prioritize Frame Advantage

* clippy fmt
2023-08-11 13:33:11 -07:00
GradualSyrup
a76808c838
Ledge Recording Fixes (#585)
* Add reusable print_fighter_info()

* rustfmt

* Clippy

* Standby fix, ngu fix, beginning posY fix, debugging ledge delay

* Fighter specific ledge adjustments

* Fix ledge delay

* Remove debug, fmt

* Fix Savestate Record

* fmt

* clippy
2023-08-11 08:33:46 -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
03cac66d5c
Record Trigger Refactor (#580)
* Initial

* Formatting
2023-08-07 20:11:26 -07:00
jugeeya
85815f87ff
Input Recording Menu Refactor (#579)
* Initial

* Formatting

* Slight name changes
2023-08-07 11:59:47 -07:00
jugeeya
fb9d1648d4
Configurable Recording Frames (#570)
* Playback Slots for Actions and Ledge Options

* Inital attempt

* Fix playback slot

* Fix menu option, probably

* Fix reading from menu option
2023-08-06 17:07:01 -07:00
jugeeya
60f8ffc410
Playback Slots for Actions and Ledge Options (#569) 2023-08-04 15:45:07 -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
c2f5bd5bb1
Input Recording in Button Config (#562)
* Fix standby on Ryujinx; fix playback when no slot is selected

* Add notifications to input recording

* Move to button config
2023-08-03 18:37:18 -07:00
jugeeya
dc6a1f8915
Input Recording Notifications (#561)
* Fix standby on Ryujinx; fix playback when no slot is selected

* Add notifications to input recording
2023-08-03 18:25:25 -07:00
jugeeya
a8f533da47
Fix standby on Ryujinx; fix playback when no slot is selected (#560) 2023-08-03 18:13:02 -07:00
jugeeya
9ef506aac7
[Build] Fix formatting (#557)
* [Build] Fix formatting

* Another set of fixes
2023-08-02 13:53:24 -07:00
jugeeya
1486ad8d05
Fix standby end criteria (#555) 2023-08-02 12:30:34 -07:00
jugeeya
822db3969f
[Build] Clippy Fixes (#554)
* Add slots as menu options, randomize playback slots

* Clippy Fixes
2023-08-02 11:09:02 -07:00
jugeeya
3a40d46fca
Add input recording slots as menu options, randomize playback slots (#553) 2023-08-02 10:27:50 -07:00
GradualSyrup
ba93011069
Dash Attack Fixes (#546)
* Initial (still has parry roll, dash attack is 1 frame late)

* Initial working commit

* Cleanup
2023-07-31 18:37:25 -07:00
GradualSyrup
aed803e449
Update standby function to use controller input (#544)
* Update standby function to use controller input

* Reuse constants
2023-07-30 10:38:58 -07:00
jugeeya
62298ecbc1
Input Recording (#539)
* GCC+tinkering

* First working pass with 8-byte structure usage.
Control scheme is effectively copied for CPU.

* CPU override, sticks not working properly

* Recording working again during record, playback issues.
Also, aerials are all nair, and jump/Dash Attack issues.

* Structure creation cleanup

* Continued testing, still aerial, jump, and dash attack issues

* Fix Dockerfile

* Rework with ControlModuleInternal and ControlModuleStored - same exact issues

* Fix playback inconsistency

* Dead code of trying to find attack air address

* It works! Fix mash.rs overrides of input playback

* Action passing groundwork; Clatter off by default for now

* All Overrides implemented, notes on Snake

* Input Submenu, dummy slots and save state/mash playback interaction

* Nana command fix, mash fix

* Initial Savestate/Ledge record (slight issues)

* Add TODO

* Lasso handled, ledge jump issue fixed, shield decay with input recording fixed, standby setup begun

* first frame playback clear, fix neutral getup

* Standy by groundwork, broken by our frame late record impl

* Prepare for structure change

* On time small structure recording, needs ledge adjustments

* Coloring fix for poessession, lockout implemented and full ledge functionality

* Cleaning and menu fix

* Fix ledge option loop and shield holding on mash

* Fix shielding issues

* turn off playback

* Enable input recording

* Resolving comments 1,2,4,5

* Resolve comments 6, 7, and 8

* External Mash Function

* No Trigger for Overrides, Clatter and Tumble Added

* LR Support, Full Hop Fix

* Starting Status WIP, Structure WIP, LedgeOption PLAYBACK renaming

* WIP Playback Mash - OoS issues - WIP Slots

* Merge branch 'main' into for-restructure prep

* more merge prep

* Return None fix

* More cleanup

* Block -> Shieldstun

* Don't crash on missing menu icons

* Add input recording tab to prevent crash

* Fix general override behavior

* Fix teching overrides

* Additional merge changes

* Nana fixes (also on master so this will be awkward)

* Additional Merge Fixes

* Remove extra tab, prevent panic on missing input recording items

* Remove some TODOs

---------

Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2023-07-27 16:42:21 -07:00
jugeeya
228ff77673
Format; Optimize Imports (#477)
* Run IntelliJ's optimize imports + formatter

* Clippy
2023-02-11 17:07:29 -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
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
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
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
c83371d2c4 add all controller support for input_delay 2020-09-26 00:49:06 +00:00