1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-30 22:00:16 +00:00
Commit graph

810 commits

Author SHA1 Message Date
asimon-1
83cd079352
Remove references to Ryujinx and emulator installation (#703) 2024-10-07 09:40:06 -07:00
asimon-1
254578982b
Fix random spells being picked for hero (#694) 2024-08-19 05:17:15 -07:00
asimon-1
29f1d5b68e
Fix clippy warnings (#695) 2024-07-21 18:29:34 -07:00
asimon-1
69d30d5a6d
Hide modpack notifications according to vanilla menu (#685)
* Hide notifications according to vanilla menu

* Whoops
2024-07-20 19:33:37 -07:00
asimon-1
c6e03b98d3
Prevent button combos from passing if either the (#684)
vanilla or mod menu is open
2024-04-23 20:43:46 -07:00
asimon-1
c3ab2adbd7
Fix crash when playing back w/o playback slot selected (#683) 2024-04-15 18:12:23 -07:00
GradualSyrup
716562c88c
Save Levin Aerial Usage (#678) 2024-03-29 15:36:47 -07:00
jugeeya
c88a0991c7
Remove references to deprecated emulator (#674)
* Update rust.yml

* Update README.md
2024-03-11 12:05:30 -07:00
jugeeya
1148cd7ec6
Fix frame advantage double-counting (#672) 2024-03-08 20:21:06 -08:00
jugeeya
afecfcc48c Fix Clippy 2024-03-08 23:15:08 +00:00
jugeeya
5b0b5490cc Don't use once-per-cpu-frame to fix input recording/save state issues 2024-02-19 21:22:54 -08:00
jugeeya
7dd05f1afd
13.0.2 Support - With ui2d update; fix notification ticking (#667)
* Correct bytecode for most of the offset searches

* Fix Offset for GET_BATTLE_OBJECT_FROM_ID

* Revert to make it crash on MALLOC

* MALLOC crashing so TODOing it, up to crash on fixed_camera

* attempt to hardcode SET_TRAINING_FIXED_CAMERA_VALUES, which causes the crash whether hardcoded or replaced, maybe due to next hook failing?

* initial

* Small changes to fix notification ticks

---------

Co-authored-by: asimon-1 <40246417+asimon-1@users.noreply.github.com>
Co-authored-by: GradualSyrup <68757075+GradualSyrup@users.noreply.github.com>
2024-02-19 18:16:40 -08:00
GradualSyrup
6862c235fe
Toggleable L + R + A Reset (#663)
* Working w/ raw offset and no icon

* Use dynamic offsets

* Add icon

* Fixed layout.arc

* Cargo fmt
2024-02-05 14:01:32 -08:00
GradualSyrup
312363d744
Hide Notifications when Combo Counter is Off (#662)
* Hides all notifications

* Working Notification Hiding

* Add and use PauseMenu structure

* Cargo fmt

* Clean-up

* Access Fields instead of magic offsets, use struct ptr instead of retyping
2024-01-28 16:04:09 -08:00
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
jugeeya
b2ef9b85a7
Fix Clippy again (#657)
* Fix clippy

* More fixes

* More fixes

* More fixes

* More fixes

* More fixes

* More fixes

* More fixes

* Fix test

* More fixes
2023-12-13 17:52:54 -08:00
GradualSyrup
1475fb2509
Add Status Only option for input logger (#653)
* Initial attempt, working but menu crashing

* Assign raw enum values to fix crash

* Merge main into add-status-display

---------

Co-authored-by: asimon-1 <40246417+asimon-1@users.noreply.github.com>
2023-12-06 00:27:26 -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
Zarek Syed
3130b5ad30
Fixes status names for echoes (#654)
Fixes issue where status names did not display for echoes because their statuses often use their parent characters' (Wolf included in that)
2023-11-03 06:19:13 -07:00
jugeeya
8203e54430
Update Yuzu install path guide (#651)
* Update README.md

* Update rust.yml
2023-10-09 11:53:55 -07: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
GradualSyrup
f34f2b0cbb
Merge pull request #635 from GradualSyrup/playback-fix
Improve recording playback
2023-09-22 09:44:00 -05: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
7e6267817e Merge branch 'main' of https://github.com/jugeeya/UltimateTrainingModpack into playback-fix 2023-09-21 12:43:30 -05:00
jugeeya
587db532f3
Upgrade to 6.0.1 2023-09-17 16:46:48 -07:00
asimon-1
c81ad0ad41
Change is_older_than_installed so that it no longer detects the current update as a new one (#639) 2023-09-17 11:17:45 -07:00
GradualSyrup
05a9073415 Greatly improve recording playback 2023-09-15 13:37:53 -05:00
GradualSyrup
04e56a2f48
Switch to No for default on update (#634) 2023-09-15 08:32:22 -07:00
jugeeya
1c6103a9ce
Update to 6.0.0 2023-09-15 00:25:38 -07:00
jugeeya
9dc7b626b6
Fix feature on beta build 2023-09-15 00:24:06 -07:00
jugeeya
e2cedb462b
Add menu and remainder of input icons; Fix notification wonkiness (#633)
* Add files via upload

* Add files via upload

* Build with layout_arc_from_file

* Add files via upload

* Updated bumper and trigger button icons

* Added dpad icons and added them to raw inputs

* Added icons for strong direction inputs

* Added missing icon names to list, fixed missing trailing comma

* Updated dodge staling icon

* Fixed b icon showing on side taunt

---------

Co-authored-by: Matthew Edell <edell.matthew@gmail.com>
2023-09-15 00:23:23 -07:00
jugeeya
720e95810b
[Input Display] Use 15 total logs; Small optimizations (#632)
* Initial, also up to 15 logs

* Add files via upload

* Add files via upload

* Fix positions

* Add files via upload

* Add files via upload

* Small fixes
2023-09-12 09:49:53 -07:00
jugeeya
267cb0c310
[Input Display] Remove stutters by using smart positioning; Frame drops from notifications (#631)
* [Input Display] Remove stutters by using smart positioning

* Fixes to notifications
2023-09-11 21:14:22 -07:00
jugeeya
427609ba8e
[Menu Open] Switch hold vs press, immediately take input if holding for >= 10 frames (#630)
* Switch hold vs press, immediately take input if holding for >= 10 frames

* Update README.md
2023-09-10 11:21:16 -07:00
GradualSyrup
d8ecebfe12
Fix Duck Hunt's Reticle being destroyed (#629)
* Fix Duck Hunt's Reticle being destroyed

* fmt
2023-09-10 09:29:10 -07:00
GradualSyrup
40f3133e54
Add Support for Custom Stages in Training Mode (#628)
* Add patch for Custom Stages

* fmt

* Changelog
2023-09-09 23:24:59 -07:00
jugeeya
14b76e3c2b
UI Optimizations: Reduce stutter in menu and input display (#627)
* Initial

* Small fix

* Set drawn logs...

* Mutable, formatting

* Update lib.rs
2023-09-07 12:49:08 -07:00
Mohammad Saad
633686c6c1
Add Wario waft options to buff menu (#626)
* add wario waft options to buff menu

* remove comment

* get waft threshold values from params rather than guessing

* more friendly menu names

* set GASS_LEVEL to be safe

* format and cleanup

* use match instead of if

* fix compile warning

* Fix clippy

* Fix clippy again

* fix formatting again

---------

Co-authored-by: jugeeya <jugeeya@live.com>
2023-09-07 10:40:37 -07:00
jugeeya
696376930d
Turn off Input Display by default since it has stutters 2023-09-06 22:59:09 -07:00
jugeeya
20c35b71d8
README Updates: Yuzu Installation, More Beta Changelog (#618)
* Some updates

* More
2023-09-06 10:12:08 -07:00
GradualSyrup
4a2da1b0ca
Save Incineroar Revenge Power (#625)
* Working, needs follow effects

* Revenge Effects Added

* Fix forgotten bool check

* Remove debug
2023-09-04 23:23:50 -07:00
GradualSyrup
adf59618af
Robin Charges (#624) 2023-09-04 22:19:40 -07:00
GradualSyrup
9ffe3c7ceb
Save Sora Spell (#623)
* Initial implementation, getting the wrong pointer somewhere

* Working build w/ Kirby

* Sound Fix

* appease clippy
2023-09-04 21:24:37 -07:00
GradualSyrup
872911dbb8
Early Reaction Toggle For Tech Chasing (#621)
* Working, fixed camera keeps tag on

* Hide Cursor in Fixed Camera

* quake removal attempt

* testing camera zoom

* camera debug in progress

* All Stages

* first attempt no testing

* smashville adjustment, cleanup

* fmt

* Change clarification
2023-09-04 14:18:09 -07:00
GradualSyrup
7721a34fc0
Add Power Dragon to Buff Options (#620)
* Initial attempt at hooking power dragon func, will be better just to rewrite

* working translation

* cleanup, add buff option

* Rename Power Dragon buff

* Fixed Null ptr comparison (kinda)

* clippy >.>
2023-09-02 17:45:12 -07:00
GradualSyrup
d867616f4f
Kirby Hat Charges (#619)
* 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

* fmt fmt fmt

* Working Samus Charge, debug

* Sheik, improved debug

* No Lucario, many broken

* Try to match main better

* Working Compile

* sun salutation debug

* disable debug assert while debug build is broken

* All charges working, copy ability tracking for save states broken, debug needs cleanup

* no copy state load not working

* Working build

* debug and formatting cleanup

* turn off hitbox vis for jugeeya
2023-09-02 11:49:20 -07: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
GradualSyrup
ebe6393143
Add Kirby Hats to Save States (#615)
* 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

* fmt fmt fmt
2023-09-01 11:10:03 -07:00