new autotargettinf script, dash

Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs

@@ -233,13 +233,13 @@ namespace Beyond
         {
             return !isAttacking && base.JumpConditions();
         }
-
+/*
         protected override bool RollConditions()
         {
             return base.RollConditions() && !isAttacking && !cc.animator.IsInTransition(cc.upperBodyLayer) &&
                    !cc.animator.IsInTransition(cc.fullbodyLayer);
         }
-
+*/
         #endregion Conditions
 
         #region Update Animations
@@ -355,20 +355,20 @@ namespace Beyond
 
         protected override void RollInput()
         {
-            if (rollInput.GetButtonDown())
+            if (rollInput.GetButtonDown() && RollConditions())
             {
-                if (horizontalInput.GetAxis() != 0f || verticallInput.GetAxis() != 0f)
+                cc.Roll();
+                /*
+                if (horizontalInput.GetAxis() != 0f && verticallInput.GetAxis() != 0f)
                 {
-                    if (RollConditions())
-                    {
-                        cc.Roll();
-                    }
+                    cc.Roll();
                 }
                 else
                 {
                     bThirdPersonController beyondController = (bThirdPersonController)cc;
                     beyondController.Dash();
                 }
+                */
             }
         }