1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-12-28 03:09:15 +00:00
Commit graph

465 commits

Author SHA1 Message Date
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
sidschingis
48391ac27c
Revert To Command Flags (#129) 2020-08-11 12:52:46 -07:00
jugeeya
716300b01c Fix DI in/away errors 2020-08-10 20:21:45 -07:00
astraycat
0388a08a16
Tech and Ledge options as bitflags (#127)
* Change TechOptions to TechFlags

* update gitmodules

* shouldn't have pushed that

* change ledge options as well

incorp change from review
2020-08-09 22:32:49 -07:00
jugeeya
e7ec867581 fix frame advantage buffer bug 2020-08-07 17:42:14 -07:00
sidschingis
658c0fe63c
Fix Tech Followup (#123)
* Add Dash Attack

* Extract Method

try_change_status

* Code Formatting

* Fix Tech Followups

Fixed resetting after teching

* Update Mash

Restore mash after footstool
2020-07-31 08:35:05 -07:00
sidschingis
8c03361b8e
Add Dash Attack (#119)
* Add Dash Attack

* Extract Method

try_change_status

* Code Formatting
2020-07-29 13:58:46 -07:00
sidschingis
1063aa5482
Update Mash (#118)
* Update mash.rs

Use StatusModule::change_status_request_from_script

* Extract Method

* Fix Air Dodge

* Add Reset Trigger

* Update Mash

Split up buffering and performing the action

Moved performing hook to fix being a frame late
2020-07-29 12:34:34 -07:00
sidschingis
e4850705fe
Fix Airdodge (#117)
* Update mash.rs

Use StatusModule::change_status_request_from_script

* Extract Method

* Fix Air Dodge
2020-07-29 11:48:07 -07:00
sidschingis
a959a24edc
Update mash.rs (#115)
Use StatusModule::change_status_request_from_script
2020-07-24 10:41:35 -07:00
sidschingis
2aba252f10
Update Character Specifics / Fast Fall (#112)
* Add Module

Added separate module for character specific handling

* Formatting

* Update Fast Fall

Updated status check
Check against possible statuses instead of impossible ones

* Add Character Check

* Apply Character Check
2020-07-18 13:57:23 -07:00
jugeeya
2dc8b1b5b9 ensure falling for fastfall toggle 2020-07-12 10:41:48 -07:00
jugeeya
8b91b452e5 Merge branch 'master' of https://github.com/jugeeya/UltimateTrainingModpack 2020-07-12 10:39:32 -07:00
jugeeya
f8b61f485a add StageManager 2020-07-12 10:39:23 -07:00
sidschingis
c735ad5c6e
Add Bowser UpB Workaround (#109)
* Add Bowser UpB Workaround

Bowser uses a different status during upB for some reason

* Use Constants
2020-07-09 11:35:44 -07:00
jugeeya
6f5c30fd18
missed tech effect with hitbox visualization on 2020-07-07 08:28:54 -07:00
sidschingis
0fc8fdf999
Followups (#108)
* Fix Late Mash

Fixed being a frame late
Flag is now immediately returned until the action is performed

Also restore Airdodge =>  Shield when grounded behavior

* Update TrainingModpackOverlay

* Add Follow Ups WIP

Attack followups will currently overwrite the aerial toggle

* Simplify Shield

Extra attack handling is no longer needed

* Apply Action Enum

Replacing Mash

* Fix Random OOS

* Implement Queued Mashes

* Update Shield Suspension

Removed need for frame counter.
Update shield suspension when the mash buffer is updated.

Fixes follow ups oos

* Cleanup

* Cleanup

* Update Aerial Flags

* Fix Aerial Flag

* Fix Copy Paste Error

* Use Mash Toggles For Ledge Jump

Moved menu logic to buffer_menu_mash
2020-07-05 13:13:54 -07:00
sidschingis
a19245e126
Fix Mash Options (#107)
* Fix Late Mash

Fixed being a frame late
Flag is now immediately returned until the action is performed

Also restore Airdodge =>  Shield when grounded behavior

* Update TrainingModpackOverlay
2020-07-03 15:16:21 -07:00
jugeeya
ee7a485f11
Revert to previous hitbox methods 2020-06-30 07:59:53 -07:00
sidschingis
e665509042
Add Fast Fall Frame Delay + OOS Reaction Frame Delay (#105)
* Fix Full Hop Rising Aerials

* Add Fast Fall Delay

* Fix Frame Counter Reset

Fixed not resetting if landing before being able to fastfall

* Update Frame Counter

Moved delay logic to frame counter module

Update unsafe blocks

* Add OOS Reaction Time
2020-06-29 16:00:01 -07:00
sidschingis
a12ae53140
Add Remaining Smash Attacks (#104) 2020-06-28 14:24:41 -07:00
sidschingis
5cb981c268
Jump Toggles (#103)
* Code Formatting

* Cleanup

* Implement Tilts

* Update TrainingModpackOverlay

* Move is_shielding to Commong

* Fix Flash Shield

Fixed not dropping shield again

* Formatting

* Remove ToDos

* Use Generic OnOff Enum

* Add Falling Aerial Toggle

* Implement Full Hop Toggle

* Add Comments
2020-06-28 13:41:51 -07:00
sidschingis
186c6ddc2d
Implement Tilts (#102)
* Code Formatting

* Cleanup

* Implement Tilts

* Update TrainingModpackOverlay

* Move is_shielding to Commong

* Fix Flash Shield

Fixed not dropping shield again

* Formatting

* Remove ToDos
2020-06-28 12:21:20 -07:00
sidschingis
c6cf52af33
Refactor Mash Module (#101)
* Add Frame Counter Module

* Allow Multiple Frame Counters

* Apply Frame Counter

* Add Enum For Fighter Id

* Simplify Calculation

* Restore Original Indentation

* Add Transition Checks

Check if the transition is possible before setting the flag

* Add Normal Attacks

* Update Mash

Recactored attack options
Extracted sub functions

* Remove deprecated function

* Update Mash Module

Handle all attack options through the mash module.

* Fix Some OOS Options

Jump/Aerial/UpB

* Update Mash Module

Return the flag in get_command_flag so we don't need to borrow a mut

Removed transition check for usmash for now

* Fix Multi Buffer

Fixed buffering more than once per shield interaction

* Fix drop shield options

Options that require shield drop now work

* Use Minimal Checks

Commented out unnecessary checks

* Fix USmash OOS

* Fix Roll/Dodge OOS

* Fix Aerials

Fixed starting 1 frame late

* Fix USmash OOS again

* Remove PrintLns

* Update TrainingModpackOverlay

* Remove unused Methods

* Default To FastFall Off

* Update Defensive Options

Remove Shield Button Checks outside shield module.

* Update Defensive Options

Now handled through mash buffer

* Formatting

* Cleanup

* Reimplement Random Mash

* Add ToDos
2020-06-28 11:02:26 -07:00
sidschingis
63a3358a0f
Add Frame Counter Module (#98)
* Add Frame Counter Module

* Allow Multiple Frame Counters

* Apply Frame Counter

* Add Enum For Fighter Id

* Simplify Calculation

* Restore Original Indentation
2020-06-27 07:22:02 -07:00
sidschingis
099ae06e89
Add Fast Fall Toggle (#97)
* Add Fast Fall Toggle

Spark effect is currently missing

* Change Condition Order

* Fix Spark Effect
2020-06-19 14:54:37 -07:00
jugeeya
a3ea3e7332 fix save states staling, position under stage 2020-06-17 23:01:19 -07:00
jugeeya
0a6a26b6b2 refactor to as_lua_int and lua bools when possible 2020-06-16 22:43:42 -07:00
sidschingis
7befc07555
Frame Advantage Refactor (#91)
* Auto Format

* Remove unused include

* Add Module

Moved Frame advantage code to separate module
2020-06-16 12:22:14 -07:00
jugeeya
ab211a7aee Always remove menu conf file on startup (for version upgrade bug) 2020-06-16 09:16:45 -07:00
jugeeya
79a84fba3a
Calculate Frame Advantage (#85)
* initial attempt

* frame adv correct calculation

* add to menu

* add menu support

* changed menu return button combo
2020-06-15 23:13:03 -07:00
jugeeya
2b2a2eb440
Fix fwrite call 2020-06-15 15:27:41 -07:00
jugeeya
889299eca6
Fix c_str macro 2020-06-15 15:09:26 -07:00
jugeeya
2014d486e3
use c_str macro 2020-06-15 14:10:42 -07:00
jugeeya
41b1ba8717
Add imports necessary for removing conf file 2020-06-15 12:57:18 -07:00
jugeeya
12a6ede92b
Remove conf file on startup 2020-06-15 12:42:19 -07:00
jugeeya
94d9d5623d
Add Directional Air Dodge (#86)
* Rename Enum

DirectionalInfluence => Direction

* Move Angle Calculation To Common

Renamed NO_DI to ANGLE_NONE and moved to common

* Simplify Condition

Removed need to check for no DI twice

* Reuse Angle Calculation

get_random now returns a random direction instead of the angle directly

* Add Left Stick Mod

Currently only used for air dodges

* Extract Shared Condition

* Remove Unused Includes

* Fix Air Dodge Mash

Fixed always flashing shield when set to air dodge mash

* Update Menu

* Update TrainingModpackOverlay
2020-06-15 10:57:08 -07:00
sidschingis
401bf7e98b
Fix Grab OOS (#89)
Fixed skipping the 4f additional shield hold
2020-06-15 07:25:25 -07:00
sidschingis
21b16253cf Update Menu 2020-06-13 22:52:27 +02:00
sidschingis
3287a96b63 Fix Air Dodge Mash
Fixed always flashing shield when set to air dodge mash
2020-06-13 22:51:23 +02:00
sidschingis
8b1713fed0 Remove Unused Includes 2020-06-13 22:35:21 +02:00
sidschingis
ce865a70f2 Extract Shared Condition 2020-06-13 22:34:37 +02:00
sidschingis
be16194528 Add Left Stick Mod
Currently only used for air dodges
2020-06-13 22:15:44 +02:00
sidschingis
2fc1c75ab6 Reuse Angle Calculation
get_random now returns a random direction instead of the angle directly
2020-06-13 21:55:23 +02:00
sidschingis
cca5072185 Simplify Condition
Removed need to check for no DI twice
2020-06-13 21:35:03 +02:00
sidschingis
715c28dd6c Move Angle Calculation To Common
Renamed NO_DI to ANGLE_NONE and moved to common
2020-06-13 21:34:06 +02:00
sidschingis
18290df236 Rename Enum
DirectionalInfluence => Direction
2020-06-13 21:24:15 +02:00
jugeeya
919196c38b account for grounded options when mashing in neutral 2020-06-12 23:04:05 -07:00
sidschingis
32f7fb0808
Add Neutral Mashing Toggle (#84)
* Add Mash Toggle

Added toggle to set the cpu to also mash in neutral

* Add Utility Functions

is_grounded
is_airborne

* Fix Neutral Mashing Aerials

Added jump flag

* Update README.md

* Changed Button Combination

Changed mash Toggle to Attack + Dpad Up/Down

* use Tesla overlay for mash in neutral

* add menu commit for neutral mash

* Update README.md

Co-authored-by: jugeeya <jugeeya@live.com>
2020-06-12 22:45:25 -07:00
sidschingis
e67c69ed63
Code Refactoring (#83)
* Update TrainingModpackOverlay

* Apply Auto Formatter

* Auto Format

* Extract Modding Behaviour

Moved to separate function

* Guard Clause

* Guard Clause

* Use Match Clause

* Fix Comment

* Extract Shared Condition

* Extract Modding Function

* Guard Clause

* Guard Clause

* Guard Clause

* Guard Clause

* Guard Clause

* Extract Shared Code

* Fix Variable Reference

Properly borrow the variables

* Fix Missed Tech Buffering

* Move Training Mode Check To Start

* Guard Clause

* Guard Clause

* Extract Modding Behaviour

* Extract Function

For randomizing the di angle

* Guard Clause

* Guard Clause

* Simplify Loop

Separate condition from behaviour

* Extract Modding Behaviour

* Extract Modding Behaviour

* Formatting

* Fix Typos

* Fix Typos

* Fix Mash Toggle

! was binding stronger than ==

* Move Negation Inwards

* Reduce Nesting

* Extract Shared Condition

* Extract Method

Moved random command list definition to separate function
2020-06-11 14:57:35 -07:00
sidschingis
b3cf1a69f4
Code Formatting (#82)
* Update TrainingModpackOverlay

* Apply Auto Formatter
2020-06-10 11:51:43 -07:00
sidschingis
4363935a1d
Add OOS Offset (#81)
* Add Roll Options

Added forward/backwards roll options

* Update TrainingModpackOverlay

* Change Option Order

* Update TrainingModpackOverlay

* Add OOS Offset

Allow delaying OOS options until a certain number of hits have connected on shield

* Update TrainingModpackOverlay

* get_param_float  fix

Fixed applying to non CPU values

* Remove Debugging
2020-06-10 11:38:01 -07:00
sidschingis
eb0e639122
Add Roll Options (#80)
* Add Roll Options

Added forward/backwards roll options

* Update TrainingModpackOverlay

* Change Option Order

* Update TrainingModpackOverlay
2020-06-09 11:46:18 -07:00
sidschingis
9a1e572a4b
Update Hold Shield Mode (#79)
* Update Hold Shield Mode

Shield decay is paused until hit for the first time to simulate a frame perfect shield hold

* Update Readme

* Remove Debugging Code
2020-06-08 13:21:34 -07:00
jugeeya
a577e7874b add in ground bounce, ceiling, wall techs 2020-06-03 09:45:37 -07:00
jugeeya
d2b56efbb1 fix tech defensive options being slow 2020-05-24 18:17:07 -07:00
jugeeya
e7f661b10a fix tech options 2020-05-23 11:16:15 -07:00
jugeeya
4396dad31c add flash on save state, update Hash40 init 2020-05-23 00:23:02 -07:00
jugeeya
968aba008f
Fix joker jab2 (NIL offsets used instead of 0) 2020-05-22 12:52:54 -07:00
jugeeya
ee695e84de
Reverse visualization for projectiles vs. fighters 2020-05-18 06:22:11 -07:00
jugeeya
c470d54621 turn visuals back on in non-training 2020-05-17 16:20:27 -07:00
jugeeya
43af53dc26 various changes to hitbox visualizer 2020-05-17 14:53:02 -07:00
jugeeya
7b7ab0c1cb remove testing code 2020-05-17 11:23:30 -07:00
jugeeya
49ffcdc31c fix is_operation_cpu 2020-05-16 19:28:37 -07:00
jugeeya
bcd0ca5a28 fix footstool/trump hitstun options 2020-05-16 17:55:59 -07:00
jugeeya
c43da06180 DI fixes 2020-05-16 12:31:42 -07:00
jam1garner
a1a761889c Move DI selection from const to an enum 2020-05-16 02:27:14 -04:00
jam1garner
78e53c29bd Move tech_state from grouped consts to an enum 2020-05-16 02:18:58 -04:00
jam1garner
4d28004367 Move ledge_state from grouped consts to an enum 2020-05-16 02:08:07 -04:00
jam1garner
cb3d829e03 Move defensive_state from grouped constants to an enum 2020-05-16 01:56:58 -04:00
jam1garner
eb03831d3c Update ControlModule usage to compile with latest skyline_smash 2020-05-16 01:49:22 -04:00
jam1garner
95180e6364 Move shield_state from a group of consts to an enum 2020-05-16 01:45:35 -04:00
jam1garner
f86415830d Move mash_state from set of constants to an enum 2020-05-16 01:26:12 -04:00
jam1garner
4342f626f8 Move mash_attack_state from constants to an enum 2020-05-16 01:12:06 -04:00
jam1garner
798e18a71a Fix all style/dead_code lints 2020-05-15 23:40:27 -04:00
jam1garner
a79bedfa7f Prefix underscore to unused variables 2020-05-15 22:02:45 -04:00
jam1garner
4dfc78c98f Remove style lint allows 2020-05-15 21:59:03 -04:00
jam1garner
6eb99546f9 Clean up hook installations by switching to install_hooks 2020-05-15 20:24:35 -04:00
jam1garner
cd3a6d938b Clean up various imports 2020-05-15 19:49:25 -04:00
jam1garner
f75ff6468a Change menu from pointer to reference 2020-05-15 19:43:37 -04:00
jugeeya
12ecda2dce fix graphics bugs 2020-05-15 10:04:57 -07:00
jugeeya
376985e05d OoS quick fixes 2020-05-15 08:48:34 -07:00
jugeeya
5b1b611787 fix save states 2020-05-14 13:54:32 -07:00
jugeeya
6cf353faec reformatting 2020-05-13 13:52:20 -07:00
jugeeya
329f0cd3f0 clean up imports 2020-05-13 13:36:55 -07:00
jugeeya
548b306645 huge migration, get menu working, OoS grab 2020-05-13 12:20:52 -07:00
jugeeya
7a57b8e247 new method of hitbox visualization 2020-05-06 17:50:31 -07:00
jugeeya
a5fc17904f finish porting non-beta features 2020-05-04 18:55:19 -07:00
jugeeya
06137d0929 start training mods 2020-04-30 17:36:56 -07:00
jugeeya
5b94e8907e fix existing common functions 2020-04-30 17:17:03 -07:00
jugeeya
8ab1d8a0d8 initial rust migration 2020-04-30 16:13:49 -07:00
jam1garner
c405f4f76d Update to work with cargo-skyline 2020-04-16 00:55:22 -04:00
jam1garner
100d7126c7 Move template to stdlib 2020-04-12 19:34:43 -04:00
jam1garner
dec9735a55 Move smash to own crate, add bindings for smash C++ API 2020-04-10 00:21:33 -04:00
jam1garner
476fb8788f Add hash40, ability to name plugin 2020-04-09 21:54:01 -04:00
jam1garner
11cc29058e Fix some broken mangled symbols 2020-04-09 05:10:23 -04:00
jam1garner
ba437edf35 Move libc to skyline_libc, Add nn bindings 2020-04-09 02:15:39 -04:00
jam1garner
0f6c365733 Flesh out skyline::libc 2020-04-08 22:39:10 -04:00
jam1garner
bf62626917 Remove old test file 2020-04-08 06:32:09 -04:00
jam1garner
5c1a2083c9 Add skyline macros, begin work on Rust hooking syntax 2020-04-08 06:28:33 -04:00
jam1garner
1cf373d338 Add println to skyline-rs 2020-04-08 01:13:06 -04:00
jam1garner
4e05ea1e95 Move required build objects to skyline subcrate 2020-04-08 00:49:23 -04:00
jam1garner
7bc01022f5 Move extern_alloc to skyline 2020-04-08 00:31:46 -04:00
jam1garner
02347abf7a Initial commit, no_std_test 2020-04-08 00:27:35 -04:00