Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-01-31 22:47:25 +00:00
Code Issues Activity

add back attack toggle

Browse source
This commit is contained in:
jugeeya 2019-06-28 18:31:53 -07:00
parent c6afbcb335
commit 0d47295215
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/taunt_toggles.h
View file

@ -51,9 +51,9 @@ int TOGGLE_STATE = MASH_TOGGLES;
#define MASH_AIRDODGE 1 #define MASH_AIRDODGE 1
#define MASH_JUMP 2 #define MASH_JUMP 2
#define MASH_RANDOM 3 #define MASH_RANDOM 3
#define MASH_ATTACK 4
int MASH_STATE = NONE; int MASH_STATE = NONE;
#define NUM_MASH_STATES 4 #define NUM_MASH_STATES 5
#define MASH_ATTACK 4 // unused for now
// Escape States // Escape States
#define ESCAPE_LEDGE 1 #define ESCAPE_LEDGE 1

14
source/training_mods.hpp
View file

@ -468,20 +468,22 @@ int vsnprintf_intercept(char* s, size_t maxlen, const char* format, va_list arg)
format = "mel_shortmsg_3"; format = "mel_shortmsg_3";
if (MASH_STATE == MASH_RANDOM) if (MASH_STATE == MASH_RANDOM)
format = "mel_shortmsg_4"; format = "mel_shortmsg_4";
if (MASH_STATE == MASH_ATTACK)
format = "mel_shortmsg_5";
} else if (strcmp(format, "mel_training_help_shift1") == 0) { } else if (strcmp(format, "mel_training_help_shift1") == 0) {
TOGGLE_STATE = ESCAPE_TOGGLES; TOGGLE_STATE = ESCAPE_TOGGLES;
if (ESCAPE_STATE == NONE) if (ESCAPE_STATE == NONE)
format = "mel_shortmsg_5";
if (ESCAPE_STATE == ESCAPE_LEDGE)
format = "mel_shortmsg_6"; format = "mel_shortmsg_6";
if (ESCAPE_STATE == ESCAPE_LEDGE)
format = "mel_shortmsg_7";
} else if (strcmp(format, "mel_training_help_shift2") == 0) { } else if (strcmp(format, "mel_training_help_shift2") == 0) {
TOGGLE_STATE = SHIELD_TOGGLES; TOGGLE_STATE = SHIELD_TOGGLES;
if (SHIELD_STATE == NONE) if (SHIELD_STATE == NONE)
format = "mel_shortmsg_7";
if (SHIELD_STATE == SHIELD_INFINITE)
format = "mel_shortmsg_8"; format = "mel_shortmsg_8";
if (SHIELD_STATE == SHIELD_HOLD) if (SHIELD_STATE == SHIELD_INFINITE)
format = "mel_shortmsg_9"; format = "mel_shortmsg_9";
if (SHIELD_STATE == SHIELD_HOLD)
format = "mel_shortmsg_10";
} }
int ret = vsnprintf(s, maxlen, format, arg); int ret = vsnprintf(s, maxlen, format, arg);
@ -497,7 +499,7 @@ void change_motion_replace(u64 module_accessor, u64 motion_kind,
if (TOGGLE_STATE == MASH_TOGGLES) { if (TOGGLE_STATE == MASH_TOGGLES) {
MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES; MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES;
const char* toggle_strings[NUM_MASH_STATES] = { const char* toggle_strings[NUM_MASH_STATES] = {
"NONE", "AIRDODGE", "JUMP", "RANDOM"}; "NONE", "AIRDODGE", "JUMP", "RANDOM", "ATTACK"};
print_string(module_accessor, toggle_strings[MASH_STATE]); print_string(module_accessor, toggle_strings[MASH_STATE]);
} }