diff --git a/source/taunt_toggles.h b/source/taunt_toggles.h
index 02215d5..666443f 100644
--- a/source/taunt_toggles.h
+++ b/source/taunt_toggles.h
@@ -26,7 +26,9 @@ const char* di_items[] = { "None", "Away", "Up Away", "Up", "Up In", "In", "Down
#define MASH_SIDE_B 6
#define MASH_UP_B 7
#define MASH_DOWN_B 8
-const char* attack_items[] = { "Neutral Air", "Forward Air", "Back Air", "Up Air", "Down Air", "Neutral B", "Side B", "Up B", "Down B" };
+#define MASH_UP_SMASH 9
+#define MASH_GRAB 10
+const char* attack_items[] = { "Neutral Air", "Forward Air", "Back Air", "Up Air", "Down Air", "Neutral B", "Side B", "Up B", "Down B", "Up Smash", "Grab" };
// Ledge Option
#define RANDOM_LEDGE 1
@@ -47,8 +49,9 @@ const char* tech_items[] = { "None", "Random", "In-Place", "Roll", "Miss Tech" }
#define MASH_AIRDODGE 1
#define MASH_JUMP 2
#define MASH_ATTACK 3
-#define MASH_RANDOM 4
-const char* mash_items[] = { "None", "Airdodge", "Jump", "Attack", "Random" };
+#define MASH_SPOTDODGE 4
+#define MASH_RANDOM 5
+const char* mash_items[] = { "None", "Airdodge", "Jump", "Attack", "Spotdodge", "Random" };
// Shield States
#define SHIELD_INFINITE 1
diff --git a/source/training/common.hpp b/source/training/common.hpp
index 82f05c1..bcb3c08 100644
--- a/source/training/common.hpp
+++ b/source/training/common.hpp
@@ -30,12 +30,48 @@ bool is_in_hitstun(u64 module_accessor) {
status_kind <= FIGHTER_STATUS_KIND_DAMAGE_FALL;
}
+bool is_in_shieldstun(u64 module_accessor) {
+ int status_kind = StatusModule::status_kind(module_accessor);
+ int prev_status = StatusModule::prev_status_kind(module_accessor, 0);
+ // If we are taking shield damage or we are droping shield from taking shield damage we are in hitstun
+ if(status_kind == FIGHTER_STATUS_KIND_GUARD_DAMAGE || (prev_status == FIGHTER_STATUS_KIND_GUARD_DAMAGE && status_kind == FIGHTER_STATUS_KIND_GUARD_OFF))
+ {
+ return true;
+ }
+
+ return false;
+}
+
+
bool is_in_landing(u64 module_accessor) {
int status_kind = StatusModule::status_kind(module_accessor);
return status_kind >= FIGHTER_STATUS_KIND_LANDING &&
status_kind <= FIGHTER_STATUS_KIND_LANDING_DAMAGE_LIGHT;
}
+bool should_hold_shield(u64 module_accessor)
+{
+ // We should hold shield if the state requires it
+ if (menu.SHIELD_STATE == SHIELD_HOLD || menu.SHIELD_STATE == SHIELD_INFINITE) {
+ // If we are not mashing then we will always hold shield
+ if(menu.MASH_STATE == NONE)
+ return true;
+
+ if(!is_in_shieldstun(module_accessor))
+ return true;
+
+ // We will only drop shield if we are in shieldstun and our attack can be performed OOS
+ if(menu.MASH_STATE == MASH_ATTACK)
+ {
+ if(menu.ATTACK_STATE == MASH_NEUTRAL_B || menu.ATTACK_STATE == MASH_SIDE_B || menu.ATTACK_STATE == MASH_DOWN_B)
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
void perform_defensive_option(u64 module_accessor) {
if (menu.DEFENSIVE_STATE == RANDOM_DEFENSIVE) {
const int NUM_GROUND_STATUSES = 3;
diff --git a/source/training/mash.hpp b/source/training/mash.hpp
index 08fefb1..ac980c1 100644
--- a/source/training/mash.hpp
+++ b/source/training/mash.hpp
@@ -34,7 +34,7 @@ int get_attack_air_kind(u64 module_accessor, bool& replace) {
void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
- if (is_in_hitstun(module_accessor) || is_in_landing(module_accessor)) {
+ if (is_in_hitstun(module_accessor) || is_in_landing(module_accessor) || is_in_shieldstun(module_accessor)) {
if (menu.MASH_STATE == MASH_AIRDODGE)
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
@@ -43,6 +43,10 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
+ if (menu.MASH_STATE == MASH_SPOTDODGE)
+ if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE;
+
if (menu.MASH_STATE == MASH_ATTACK)
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
switch (menu.ATTACK_STATE) {
@@ -52,6 +56,9 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
case MASH_UPAIR:
case MASH_DAIR:
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
+ // If we are performing the attack OOS we also need to jump
+ if(is_in_shieldstun(module_accessor))
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
break;
case MASH_NEUTRAL_B:
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N;
@@ -65,6 +72,12 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
case MASH_DOWN_B:
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW;
break;
+ case MASH_UP_SMASH:
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI4;
+ break;
+ case MASH_GRAB:
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_CATCH;
+ break;
}
}
diff --git a/source/training/shield.hpp b/source/training/shield.hpp
index 9a81460..55ed7b3 100644
--- a/source/training/shield.hpp
+++ b/source/training/shield.hpp
@@ -30,7 +30,7 @@ float get_param_float(u64 module_accessor, u64 param_type, u64 param_hash, bool&
bool check_button_on(u64 module_accessor, int button, bool& replace) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD || button == CONTROL_PAD_BUTTON_GUARD) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
- if (menu.SHIELD_STATE == SHIELD_HOLD || menu.SHIELD_STATE == SHIELD_INFINITE) {
+ if (should_hold_shield(module_accessor)) {
replace = true;
return true;
}
@@ -44,7 +44,7 @@ bool check_button_on(u64 module_accessor, int button, bool& replace) {
bool check_button_off(u64 module_accessor, int button, bool& replace) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD || button == CONTROL_PAD_BUTTON_GUARD) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
- if (menu.SHIELD_STATE == SHIELD_HOLD || menu.SHIELD_STATE == SHIELD_INFINITE) {
+ if (should_hold_shield(module_accessor)) {
replace = true;
return false;
}