From 15767e8cf7d13dcd90fcf75327a9c47fe14664a2 Mon Sep 17 00:00:00 2001
From: jugeeya <jugeeya@live.com>
Date: Wed, 19 Aug 2020 20:40:49 -0700
Subject: [PATCH] remove dash attack for now
---
.../include/taunt_toggles.hpp | 4 +--
src/common/consts.rs | 5 ++--
src/training/mash.rs | 29 ++++++++++---------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/TrainingModpackOverlay/include/taunt_toggles.hpp b/TrainingModpackOverlay/include/taunt_toggles.hpp
index a673f60..44d1ea4 100644
--- a/TrainingModpackOverlay/include/taunt_toggles.hpp
+++ b/TrainingModpackOverlay/include/taunt_toggles.hpp
@@ -154,8 +154,8 @@ of hitstun or out of specific states.
x(type,Nair,"Neutral Air") x(type,Fair,"Forward Air") x(type,Bair,"Back Air") x(type,Uair,"Up Air") x(type,Dair,"Down Air") \
x(type,NeutralB,"Neutral B") x(type,SideB,"Side B") x(type,UpB,"Up B") x(type,DownB,"Down B") \
x(type,FSmash,"Forward Smash") x(type,USmash,"Up Smash") x(type,DSmash,"Down Smash") \
- x(type,Jab,"Jab") x(type,FTilt,"Filt") x(type,UTilt,"Utilt") x(type,Dtilt,"Dtilt") \
- x(type,DashAttack,"Dash Attack") x(type,Grab,"Grab")
+ x(type,Jab,"Jab") x(type,FTilt,"Ftilt") x(type,UTilt,"Utilt") x(type,Dtilt,"Dtilt") \
+ x(type,Grab,"Grab") //x(type,DashAttack,"Dash Attack")
// clang-format on
DEFINE_ENUM_CLASS(ActionFlag);
diff --git a/src/common/consts.rs b/src/common/consts.rs
index 49e8459..0acbe49 100644
--- a/src/common/consts.rs
+++ b/src/common/consts.rs
@@ -208,8 +208,9 @@ bitflags! {
const F_TILT = 0x80000;
const U_TILT = 0x100000;
const D_TILT = 0x200000;
- const DASH_ATTACK = 0x400000;
- const GRAB = 0x800000;
+ const GRAB = 0x400000;
+ // TODO: Make work
+ // const DASH_ATTACK = 0x400000;
}
}
diff --git a/src/training/mash.rs b/src/training/mash.rs
index 96a635f..0924796 100644
--- a/src/training/mash.rs
+++ b/src/training/mash.rs
@@ -345,24 +345,25 @@ unsafe fn get_attack_flag(
command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW3;
status = *FIGHTER_STATUS_KIND_ATTACK_LW3;
}
- Action::DASH_ATTACK => {
- let current_status = StatusModule::status_kind(module_accessor);
- let is_dashing = current_status == *FIGHTER_STATUS_KIND_DASH;
+ // TODO: Make work
+ // Action::DASH_ATTACK => {
+ // let current_status = StatusModule::status_kind(module_accessor);
+ // let is_dashing = current_status == *FIGHTER_STATUS_KIND_DASH;
- // Start Dash First
- if !is_dashing {
- let dash_transition = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_DASH;
- let dash_status = *FIGHTER_STATUS_KIND_DASH;
+ // // Start Dash First
+ // if !is_dashing {
+ // let dash_transition = *FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_DASH;
+ // let dash_status = *FIGHTER_STATUS_KIND_DASH;
- try_change_status(module_accessor, dash_status, dash_transition);
- return 0;
- }
+ // try_change_status(module_accessor, dash_status, dash_transition);
+ // return 0;
+ // }
- command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
- status = *FIGHTER_STATUS_KIND_ATTACK_DASH;
+ // command_flag = *FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
+ // status = *FIGHTER_STATUS_KIND_ATTACK_DASH;
- return get_flag(module_accessor, status, command_flag);
- }
+ // return get_flag(module_accessor, status, command_flag);
+ // }
_ => return 0,
}