Merge branch 'feature/combat-update-consume-input' into main

amel-unity · amel-unity · commit 676d768bd37e · 2021-03-19T11:55:55.000+01:00
diff --git a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit.anim b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit.anim
@@ -75675,6 +75675,13 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0.68333334
+    functionName: ConsumeAttackInput
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 0.73333335
     functionName: PlaySlashEffect
     data: 
diff --git a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit2.anim b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit2.anim
@@ -80121,6 +80121,13 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0.78333336
+    functionName: ConsumeAttackInput
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 0.8666667
     functionName: PlayReverseSlashEffect
     data: 
diff --git a/UOP1_Project/Assets/Prefabs/Audio/Accessories.meta b/UOP1_Project/Assets/Prefabs/Audio/Accessories.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_AttackAnimation.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_AttackAnimation.asset
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_AttackAnimation.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/Timer_AttackAnimation.asset.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
@@ -169,26 +169,20 @@ MonoBehaviour:
   - FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
     ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
     Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 373ff606aeb23834eb964bdf9a6f6e3c, type: 2}
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
       Operator: 0
     - ExpectedResult: 0
       Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
       Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
-      Operator: 0
   - FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
     ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
     Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 373ff606aeb23834eb964bdf9a6f6e3c, type: 2}
-      Operator: 0
     - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
       Operator: 0
     - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
     ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Attack.asset
@@ -14,3 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _actions:
   - {fileID: 11400000, guid: 5cb6e4529b034ff4dbc7a7aa863ce969, type: 2}
+  - {fileID: 11400000, guid: 23e8862a3aca1b6439bda3bf27d03897, type: 2}
diff --git a/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs b/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs
@@ -44,7 +44,6 @@ private void OnEnable()
 		_inputReader.startedRunning += OnStartedRunning;
 		_inputReader.stoppedRunning += OnStoppedRunning;
 		_inputReader.attackEvent += OnStartedAttack;
-		_inputReader.attackCanceledEvent += OnStoppedAttack;
 		//...
 	}
 
@@ -58,7 +57,6 @@ private void OnDisable()
 		_inputReader.startedRunning -= OnStartedRunning;
 		_inputReader.stoppedRunning -= OnStoppedRunning;
 		_inputReader.attackEvent -= OnStartedAttack;
-		_inputReader.attackCanceledEvent -= OnStoppedAttack;
 		//...
 	}
 
@@ -123,5 +121,7 @@ private void OnOpenInventory()
 	}
 
 	private void OnStartedAttack() => attackInput = true;
-	private void OnStoppedAttack() => attackInput = false;
+
+	// Triggered from Animation Event
+	public void ConsumeAttackInput() => attackInput = false;
 }
diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ClearInputCache_OnEnterSO.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ClearInputCache_OnEnterSO.cs
@@ -26,7 +26,6 @@ public override void OnUpdate()
 	public override void OnStateEnter()
 	{
 		_protagonist.jumpInput = false;
-		_protagonist.attackInput = false;
 		_interactionManager.currentInteractionType = InteractionType.None;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ private void OnEnable()`
`44`	`44`	`_inputReader.startedRunning += OnStartedRunning;`
`45`	`45`	`_inputReader.stoppedRunning += OnStoppedRunning;`
`46`	`46`	`_inputReader.attackEvent += OnStartedAttack;`
`47`		`- _inputReader.attackCanceledEvent += OnStoppedAttack;`
`48`	`47`	`//...`
`49`	`48`	`}`
`50`	`49`
`@@ -58,7 +57,6 @@ private void OnDisable()`
`58`	`57`	`_inputReader.startedRunning -= OnStartedRunning;`
`59`	`58`	`_inputReader.stoppedRunning -= OnStoppedRunning;`
`60`	`59`	`_inputReader.attackEvent -= OnStartedAttack;`
`61`		`- _inputReader.attackCanceledEvent -= OnStoppedAttack;`
`62`	`60`	`//...`
`63`	`61`	`}`
`64`	`62`
`@@ -123,5 +121,7 @@ private void OnOpenInventory()`
`123`	`121`	`}`
`124`	`122`
`125`	`123`	`private void OnStartedAttack() => attackInput = true;`
`126`		`- private void OnStoppedAttack() => attackInput = false;`
	`124`	`+`
	`125`	`+ // Triggered from Animation Event`
	`126`	`+ public void ConsumeAttackInput() => attackInput = false;`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ public override void OnUpdate()`
`26`	`26`	`public override void OnStateEnter()`
`27`	`27`	`{`
`28`	`28`	`_protagonist.jumpInput = false;`
`29`		`- _protagonist.attackInput = false;`
`30`	`29`	`_interactionManager.currentInteractionType = InteractionType.None;`
`31`	`30`	`}`
`32`	`31`	`}`