Use the state machine to change Game State to and from Combat

uChema · uChema · commit 5ea8ea13f643 · 2021-07-14T17:59:14.000+02:00
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Alert.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Alert.asset
@@ -15,3 +15,4 @@ MonoBehaviour:
   _actions:
   - {fileID: 11400000, guid: 4b49e9d3d876bba458ffce6292758942, type: 2}
   - {fileID: 11400000, guid: b3e528708050add49837de9f6a3d6b48, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Dying.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Dying.asset
@@ -15,3 +15,4 @@ MonoBehaviour:
   _actions:
   - {fileID: 11400000, guid: 0b27e7b7a119315429d153652b19d7ba, type: 2}
   - {fileID: 11400000, guid: 3df03613ad6365246bd2d591eddabc10, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Fighting.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Fighting.asset
@@ -14,3 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _actions:
   - {fileID: 11400000, guid: 4b49e9d3d876bba458ffce6292758942, type: 2}
+  - {fileID: 11400000, guid: 19db8963f6fcdb74ea7f0f13ef76d687, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Idle.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/States/Idle.asset
@@ -14,3 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _actions:
   - {fileID: 11400000, guid: 5cc2ce97159d08647a4577ccf90bd204, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/Actions/ChasingTargetAction.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/Actions/ChasingTargetAction.asset
@@ -14,3 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _targetTransform: {fileID: 11400000, guid: 35fc4039342b6ba458d0d4429e89ee74, type: 2}
   _chasingSpeed: 2
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Alert.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Alert.asset
@@ -17,3 +17,4 @@ MonoBehaviour:
   - {fileID: 11400000, guid: b3e528708050add49837de9f6a3d6b48, type: 2}
   - {fileID: 11400000, guid: 46af8bb2ed6efed4ab26d05dfc1b560f, type: 2}
   - {fileID: 11400000, guid: 865756d55a4aa2644be7ab9959c408fb, type: 2}
+  - {fileID: 11400000, guid: 19db8963f6fcdb74ea7f0f13ef76d687, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Dying.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Dying.asset
@@ -16,3 +16,4 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0b27e7b7a119315429d153652b19d7ba, type: 2}
   - {fileID: 11400000, guid: 3df03613ad6365246bd2d591eddabc10, type: 2}
   - {fileID: 11400000, guid: 071fecb332ceabb4ba338d86d34759ac, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Idle.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Idle.asset
@@ -16,3 +16,4 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 5cc2ce97159d08647a4577ccf90bd204, type: 2}
   - {fileID: 11400000, guid: d33b24ef9d2a6ac4fb91c11c189b81f2, type: 2}
   - {fileID: 11400000, guid: 071fecb332ceabb4ba338d86d34759ac, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Roaming.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/States/Roaming.asset
@@ -15,3 +15,4 @@ MonoBehaviour:
   _actions:
   - {fileID: 11400000, guid: 46af8bb2ed6efed4ab26d05dfc1b560f, type: 2}
   - {fileID: 11400000, guid: 976208a7240935042a5f8bbcb0d35914, type: 2}
+  - {fileID: 11400000, guid: cb39249adcc9b7048993808ba9aa4d92, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnEnter.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnEnter.asset
@@ -0,0 +1,17 @@
+%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: 3be03a75143f41647ac5a3e0f60e7462, type: 3}
+  m_Name: ChangeGameStateToCombatOnEnter
+  m_EditorClassIdentifier: 
+  _newGameState: 6
+  _whenToRun: 0
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnEnter.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnEnter.asset.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnExit.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnExit.asset
@@ -0,0 +1,17 @@
+%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: 3be03a75143f41647ac5a3e0f60e7462, type: 3}
+  m_Name: ChangeGameStateToCombatOnExit
+  m_EditorClassIdentifier: 
+  _newGameState: 6
+  _whenToRun: 1
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnExit.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToCombatOnExit.asset.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnEnter.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnEnter.asset
@@ -0,0 +1,17 @@
+%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: 3be03a75143f41647ac5a3e0f60e7462, type: 3}
+  m_Name: ChangeGameStateToGamePlayOnEnter
+  m_EditorClassIdentifier: 
+  _newGameState: 0
+  _whenToRun: 0
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnEnter.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnEnter.asset.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnExit.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnExit.asset
@@ -0,0 +1,17 @@
+%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: 3be03a75143f41647ac5a3e0f60e7462, type: 3}
+  m_Name: ChangeGameStateToGamePlayOnExit
+  m_EditorClassIdentifier: 
+  _newGameState: 0
+  _whenToRun: 1
+  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnExit.asset.meta b/UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Actions/ChangeGameStateToGamePlayOnExit.asset.meta
diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChangeGameStateActionSO.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChangeGameStateActionSO.cs
@@ -0,0 +1,76 @@
+﻿using UnityEngine;
+using UOP1.StateMachine;
+using UOP1.StateMachine.ScriptableObjects;
+using Moment = UOP1.StateMachine.StateAction.SpecificMoment;
+
+/// <summary>
+/// This Action handles horizontal movement while in the air, keeping momentum, simulating air resistance, and accelerating towards the desired speed.
+/// </summary>
+[CreateAssetMenu(fileName = "ChangeGameState", menuName = "State Machines/Actions/Change GameState")]
+public class ChangeGameStateActionSO : StateActionSO
+{
+	public GameState NewGameState => _newGameState;
+	[Tooltip("GameState to change to")]
+	[SerializeField] GameState _newGameState = default;
+	[SerializeField] Moment _whenToRun = default;
+	[SerializeField] private GameStateSO _gameState = default;
+	protected override StateAction CreateAction() => new ChangeGameStateAction(_newGameState, _gameState, _whenToRun);
+}
+
+public class ChangeGameStateAction : StateAction
+{
+
+
+	[Tooltip("GameState to change to")]
+	private GameState _newGameState = default;
+	private GameStateSO _gameStateSO = default;
+	private Moment _whenToRun = default;
+	public ChangeGameStateAction()
+	{
+
+	}
+	public ChangeGameStateAction(GameState newGameState, GameStateSO gameStateSO, Moment whenToRun)
+	{
+		_newGameState = newGameState;
+		_gameStateSO = gameStateSO;
+		_whenToRun = whenToRun;
+	}
+	Transform _transform = default;
+
+	public override void Awake(StateMachine stateMachine)
+	{
+
+		_transform = stateMachine.transform;
+	}
+	void ChangeState()
+	{
+		switch (_newGameState)
+		{
+			case GameState.Combat:
+				_gameStateSO.ChangeStateToCombat(_transform);
+				break;
+			case GameState.Gameplay:
+				_gameStateSO.ChangeStateFromCombat(_transform);
+				break;
+			default:
+				_gameStateSO.UpdateGameState(_newGameState);
+				break;
+		}
+	}
+	public override void OnStateEnter()
+	{
+		if (_whenToRun == Moment.OnStateEnter)
+			ChangeState();
+
+
+	}
+	public override void OnStateExit()
+	{
+		if (_whenToRun == Moment.OnStateExit)
+			ChangeState();
+
+	}
+	public override void OnUpdate()
+	{
+	}
+}
diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChangeGameStateActionSO.cs.meta b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChangeGameStateActionSO.cs.meta
diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChasingTargetActionSO.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ChasingTargetActionSO.cs
@@ -25,6 +25,8 @@ public class ChasingTargetAction : StateAction
 	private NavMeshAgent _agent;
 	private bool _isActiveAgent;
 
+
+
 	public override void Awake(StateMachine stateMachine)
 	{
 		_config = (ChasingTargetActionSO)OriginSO;
@@ -48,4 +50,6 @@ public override void OnStateEnter()
 			_agent.speed = _config.ChasingSpeed;
 		}
 	}
+
+
 }
diff --git a/UOP1_Project/Assets/Scripts/Gameplay/GameStateSO.cs b/UOP1_Project/Assets/Scripts/Gameplay/GameStateSO.cs
@@ -18,15 +18,38 @@ public class GameStateSO : ScriptableObject
 	private GameState _currentGameState = default;
 	private GameState _previousGameState = default;
 	public GameState CurrentGameState => _currentGameState;
+	List<Transform> _enemiesInCombat = new List<Transform>();
+	public void ChangeStateToCombat(Transform enemy)
+	{
+		if (!_enemiesInCombat.Exists(o => o == enemy))
+		{
+			_enemiesInCombat.Add(enemy);
+		}
 
+		UpdateGameState(GameState.Combat);
+	}
+	public void ChangeStateFromCombat(Transform enemy)
+	{
+		if (_enemiesInCombat.Exists(o => o == enemy))
+		{
+			_enemiesInCombat.Remove(enemy);
+		}
+		if (_enemiesInCombat.Count > 0)
+		{
+			UpdateGameState(GameState.Combat);
+		}
+		else
+		{
+			UpdateGameState(GameState.Gameplay);
+		}
+	}
 	public void UpdateGameState(GameState newGameState)
 	{
 		if (newGameState != CurrentGameState)
 		{
 			_previousGameState = _currentGameState;
 			_currentGameState = newGameState;
 		}
-
 	}
 	public void ResetToPreviousGameState()
 	{
diff --git a/UOP1_Project/Assets/Scripts/StateMachine/Debugging/StateMachineDebugger.cs b/UOP1_Project/Assets/Scripts/StateMachine/Debugging/StateMachineDebugger.cs
@@ -115,7 +115,7 @@ private void PrintDebugLog()
 			_logBuilder.AppendLine();
 			_logBuilder.Append("--------------------------------");
 
-			Debug.Log(_logBuilder.ToString());
+			//	Debug.Log(_logBuilder.ToString());
 		}
 	}
 }
