Add Attack Movement

PlatformerController/Assets/Animation/Animations/Combat/Base/Sword/BaseSword1.anim

@@ -82,6 +82,34 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0.06666667
+    functionName: AnimationStartMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.06666667
+    functionName: AnimationTurnOffFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.2
+    functionName: AnimationStopMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.26666668
+    functionName: AnimationTrunOnFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 0.33333334
     functionName: AnimationFinishTrigger
     data: 

PlatformerController/Assets/Animation/Animations/Combat/Base/Sword/BaseSword2.anim

@@ -82,6 +82,34 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0.06666667
+    functionName: AnimationStartMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.06666667
+    functionName: AnimationTurnOffFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.2
+    functionName: AnimationStopMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.26666668
+    functionName: AnimationTrunOnFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 0.33333334
     functionName: AnimationFinishTrigger
     data: 

PlatformerController/Assets/Animation/Animations/Combat/Base/Sword/BaseSword3.anim

@@ -82,6 +82,34 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0.06666667
+    functionName: AnimationStartMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.06666667
+    functionName: AnimationTurnOffFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.2
+    functionName: AnimationStopMovementTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 0.26666668
+    functionName: AnimationTrunOnFlipTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 0.33333334
     functionName: AnimationFinishTrigger
     data: 

PlatformerController/Assets/Data/Weapons/SwordData.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04aafc5ec35034941bb80fe99b1f925a, type: 3}
+  m_Name: SwordData
+  m_EditorClassIdentifier: 
+  movementSpeed:
+  - 3
+  - 4
+  - 2

PlatformerController/Assets/Scenes/MainScene.unity

@@ -767,6 +767,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f76bcdf370a40c346b14e7917c47dea9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  weaponData: {fileID: 11400000, guid: 348c44c3fa52c50439d4a4275d846945, type: 2}
 --- !u!1 &1258763309
 GameObject:
   m_ObjectHideFlags: 0

PlatformerController/Assets/Scripts/Intermediaries/WeaponAnimationToWeapon.cs

@@ -13,4 +13,24 @@ private void AnimationFinishTrigger()
     {
         _weapon.AnimationFinishTrigger();
     }
+
+    private void AnimationStartMovementTrigger()
+    {
+        _weapon.AnimationStartMovementTrigger();
+    }
+
+    private void AnimationStopMovementTrigger()
+    {
+        _weapon.AnimationStopMovementTrigger();
+    }
+
+    private void AnimationTurnOffFlipTrigger()
+    {
+        _weapon.AnimationTurnOffFlipTrigger();
+    }
+
+    private void AnimationTrunOnFlipTrigger()
+    {
+        _weapon.AnimationTurnOnFlipTrigger();
+    }
 }

PlatformerController/Assets/Scripts/Player/States/Sub States/PlayerAttackState.cs

@@ -1,14 +1,23 @@
 public class PlayerAttackState : PlayerAbilityState
 {
-    private Weapon _weapon;
+    private bool _setVelocity;
+    private bool _shouldCheckFlip;
+
+    private int _xInput;
 
+    private float _velocityToSet;
+
+    private Weapon _weapon;
+
     public PlayerAttackState(Player player, PlayerStateMachine stateMachine, PlayerData playerData, 
         string animationBoolName) 
         : base(player, stateMachine, playerData, animationBoolName) {}
 
     public override void Enter()
     {
         base.Enter();
+
+        _setVelocity = false;
 
         _weapon.EnterWeapon();
     }
@@ -20,12 +29,42 @@ public override void Exit()
         _weapon.ExitWeapon();
     }
 
+    public override void LogicUpdate()
+    {
+        base.LogicUpdate();
+
+        _xInput = _player.InputHandler.NormalizedInputX;
+
+        if (_shouldCheckFlip)
+        {
+            _player.CheckIfShouldFlip(_xInput);   
+        }
+
+        if (_setVelocity)
+        {
+            _player.SetVelocityX(_velocityToSet * _player.FacingDirection);
+        }
+    }
+
     public void SetWeapon(Weapon weapon)
     {
         _weapon = weapon;
         _weapon.InitializeWeapon(this);
     }
 
+    public void SetPlayerVelocity(float velocity)
+    {
+        _player.SetVelocityX(velocity * _player.FacingDirection);
+
+        _velocityToSet = velocity;
+        _setVelocity = true;
+    }
+
+    public void SetFlipCheck(bool value)
+    {
+        _shouldCheckFlip = value;
+    }
+
     #region Animation Triggers
 
     public override void AnimationFinishTrigger()

PlatformerController/Assets/Scripts/ScriptableObjects/Weapons/WeaponData.cs

@@ -0,0 +1,7 @@
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "newWeaponData", menuName = "Data/Weapon Data/Weapon")]
+public class WeaponData : ScriptableObject
+{
+    public float[] movementSpeed;
+}

PlatformerController/Assets/Scripts/Weapons/Weapon.cs

@@ -2,6 +2,10 @@
 
 public class Weapon : MonoBehaviour
 {
+    [SerializeField] private WeaponData weaponData;
+
+    protected int _attackCounter;
+
     protected Animator _baseAnimator;
     protected Animator _weaponAnimator;
 
@@ -23,15 +27,25 @@ public void InitializeWeapon(PlayerAttackState state)
     public virtual void EnterWeapon()
     {
         gameObject.SetActive(true);
+
+        if (_attackCounter >= weaponData.movementSpeed.Length)
+        {
+            _attackCounter = 0;
+        }
 
         _baseAnimator.SetBool("attack", true);
         _weaponAnimator.SetBool("attack", true);
+
+        _baseAnimator.SetInteger("attackCounter", _attackCounter);
+        _weaponAnimator.SetInteger("attackCounter", _attackCounter);
     }
 
     public virtual void ExitWeapon()
     {
         _baseAnimator.SetBool("attack", false);
         _weaponAnimator.SetBool("attack", false);
+
+        _attackCounter++;
 
         gameObject.SetActive(false);
     }
@@ -43,5 +57,25 @@ public virtual void AnimationFinishTrigger()
         _state.AnimationFinishTrigger();
     }
 
+    public virtual void AnimationStartMovementTrigger()
+    {
+        _state.SetPlayerVelocity(weaponData.movementSpeed[_attackCounter]);
+    }
+
+    public virtual void AnimationStopMovementTrigger()
+    {
+        _state.SetPlayerVelocity(0);
+    }
+
+    public virtual void AnimationTurnOffFlipTrigger()
+    {
+        _state.SetFlipCheck(false);
+    }
+
+    public virtual void AnimationTurnOnFlipTrigger()
+    {
+        _state.SetFlipCheck(true);
+    }
+
     #endregion
 }