Got rid of FSMBaseState and added RemainState bool to FSMState #1. Fi…

…xed scriptable references #2. Removed RemainState #3.
XamkGamelab · Mar 25, 2023 · 6cf7f72 · 6cf7f72
1 parent 8f5c716
commit 6cf7f72
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 47 deletions.
diff --git a/...FSMScriptables/States/RemainInState.asset → ...s/FSMScriptables/States/RemainState.asset b/...FSMScriptables/States/RemainInState.asset → ...s/FSMScriptables/States/RemainState.asset
@@ -9,6 +9,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2acdbe22ce1dc2a499e3937dd7c25642, type: 3}
-  m_Name: RemainInState
+  m_Script: {fileID: 11500000, guid: 568f58b8f3dcbe048bf5380145a1305a, type: 3}
+  m_Name: RemainState
   m_EditorClassIdentifier: 
+  Action: []
+  Transitions: []
+  RemainState: 0
diff --git a/...riptables/States/RemainInState.asset.meta → ...Scriptables/States/RemainState.asset.meta b/...riptables/States/RemainInState.asset.meta → ...Scriptables/States/RemainState.asset.meta
diff --git a/Assets/Scripts/CharacterAndAI/Characters/FSMCharacter.cs b/Assets/Scripts/CharacterAndAI/Characters/FSMCharacter.cs
@@ -6,8 +6,8 @@
 
 public class FSMCharacter : NavMeshAgentCharacter
 {
-    [SerializeField, Tooltip("State from which the AI starts executing next states depending on decisions.")] private FSMBaseState _initialState;    
-    [ReadOnly, Tooltip("Current state for debugging.")] public FSMBaseState CurrentState;
+    [SerializeField, Tooltip("State from which the AI starts executing next states depending on decisions.")] private FSMState _initialState;    
+    [ReadOnly, Tooltip("Current state for debugging.")] public FSMState CurrentState;
 
     public enum EmotionalState { Default, Interested, Afraid }
     public EmotionalState CurrentEmotionalState = EmotionalState.Default;

diff --git a/Assets/Scripts/CharacterAndAI/FSMActions/FSMActionInterestingObject.cs b/Assets/Scripts/CharacterAndAI/FSMActions/FSMActionInterestingObject.cs
@@ -7,6 +7,7 @@ public class FSMActionInterestingObject : FSMAction
 {
     public override void Execute(FSMCharacter stateMachine)
     {
+        base.Execute(stateMachine);
         Debug.Log("Execute sight interesting object");
         var navMeshAgent = stateMachine.GetComponent<NavMeshAgent>();
         AISensor enemySightSensor = stateMachine.GetComponent<AISensor>();

diff --git a/Assets/Scripts/CharacterAndAI/FSMActions/FSMActionPatrol.cs b/Assets/Scripts/CharacterAndAI/FSMActions/FSMActionPatrol.cs
@@ -8,6 +8,8 @@ public class FSMActionPatrol : FSMAction
     public float CloseEnoughDistance = 0.5f;
     public override void Execute(FSMCharacter stateMachine)
     {
+        base.Execute(stateMachine);
+        Debug.Log("Execute Patrol Action");
         if (!stateMachine.Agent.hasPath || stateMachine.Agent.remainingDistance < CloseEnoughDistance)
         {
             stateMachine.SetNextPatrolPointDestination();

diff --git a/Assets/Scripts/CharacterAndAI/FSMBaseState.cs b/Assets/Scripts/CharacterAndAI/FSMBaseState.cs
diff --git a/Assets/Scripts/CharacterAndAI/FSMBaseState.cs.meta b/Assets/Scripts/CharacterAndAI/FSMBaseState.cs.meta
diff --git a/Assets/Scripts/CharacterAndAI/FSMRemainState.cs b/Assets/Scripts/CharacterAndAI/FSMRemainState.cs
diff --git a/Assets/Scripts/CharacterAndAI/FSMRemainState.cs.meta b/Assets/Scripts/CharacterAndAI/FSMRemainState.cs.meta
diff --git a/Assets/Scripts/CharacterAndAI/FSMState.cs b/Assets/Scripts/CharacterAndAI/FSMState.cs
@@ -2,17 +2,26 @@
 using UnityEngine;
 
 [CreateAssetMenu(menuName = "FSM/State")]
-public sealed class FSMState : FSMBaseState
+public class FSMState : ScriptableObject
 {
     public List<FSMAction> Action = new List<FSMAction>();
     public List<FSMTransition> Transitions = new List<FSMTransition>();
+    public bool RemainState = false;
 
-    public override void Execute(FSMCharacter machine)
+    public virtual void Execute(FSMCharacter machine)
     {
         foreach (var action in Action)
         {
-            if (action.ExecuteOnce && !action.Executed)
+            Debug.Log("Execute state action: " + action);
+            if (action.ExecuteOnce/* && !action.Executed*/)
+            {
+                if (!action.Executed)
+                    action.Execute(machine);
+            }
+            else
+            {
                 action.Execute(machine);
+            }
         }
 
         foreach (var transition in Transitions)

diff --git a/Assets/Scripts/CharacterAndAI/FSMTransition.cs b/Assets/Scripts/CharacterAndAI/FSMTransition.cs
@@ -4,18 +4,18 @@
 public sealed class FSMTransition : ScriptableObject
 {
     public FSMDecision Decision;
-    public FSMBaseState TrueState;
-    public FSMBaseState FalseState;
+    public FSMState TrueState;
+    public FSMState FalseState;
 
     public void Execute(FSMCharacter stateMachine)
     {
-        if (Decision.Decide(stateMachine) && !(TrueState is FSMRemainState))
+        if (Decision.Decide(stateMachine) && !TrueState.RemainState)
         {
             //TrueState and falseState to simply FSMState instead of base state.
             //
             stateMachine.CurrentState = TrueState;
         }
-        else if (!(FalseState is FSMRemainState))
+        else if (!FalseState.RemainState)
         {
             stateMachine.CurrentState = FalseState;
         }