Merge remote-tracking branch 'origin/develop'

Common/Scripts/Agents/AI/Graph/Actions/AIActionMMFeedbacksNode.cs

@@ -0,0 +1,27 @@
+using MoreMountains.CorgiEngine;
+using MoreMountains.Feedbacks;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a Corgi <see cref="MoreMountains.CorgiEngine.AIActionMMFeedbacks"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/MMFeedbacks")]
+    public class AIActionMMFeedbacksNode : AIActionNode
+    {
+        public MMFeedbacks targetFeedbacks;
+        public bool onlyPlayWhenEnteringState = true;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionMMFeedbacks>();
+            action.Label = label;
+            action.OnlyPlayWhenEnteringState = onlyPlayWhenEnteringState;
+            action.TargetFeedbacks = targetFeedbacks;
+            return action;
+        }
+    }
+}

Common/Scripts/Agents/AI/Graph/Actions/AIActionSwapBrainNode.cs

@@ -0,0 +1,24 @@
+using MoreMountains.CorgiEngine;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a Corgi <see cref="MoreMountains.CorgiEngine.AIActionSwapBrain"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/Swap Brain")]
+    public class AIActionSwapBrainNode : AIActionNode
+    {
+        public AIBrain newAIBrain;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionSwapBrain>();
+            action.Label = label;
+            action.NewAIBrain = newAIBrain;
+            return action;
+        }
+    }
+}

Common/Scripts/Agents/AI/Graph/Actions/AIActionUnityEventsNode.cs

@@ -0,0 +1,27 @@
+using MoreMountains.CorgiEngine;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+using UnityEngine.Events;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a Corgi <see cref="MoreMountains.CorgiEngine.AIActionUnityEvents"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/Unity Events")]
+    public class AIActionUnityEventsNode : AIActionNode
+    {
+        public UnityEvent targetEvent;
+        public bool onlyPlayWhenEnteringState = true;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionUnityEvents>();
+            action.Label = label;
+            action.OnlyPlayWhenEnteringState = onlyPlayWhenEnteringState;
+            action.TargetEvent = targetEvent;
+            return action;
+        }
+    }
+}

Common/Scripts/Agents/AI/Graph/Actions/Editor/AIActionMMFeedbacksNodeEditor.cs

@@ -0,0 +1,24 @@
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEditor;
+using XNodeEditor;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    [CustomNodeEditor(typeof(AIActionMMFeedbacksNode))]
+    public class AIActionMMFeedbacksNodeEditor : AIActionNodeEditor
+    {
+        private SerializedProperty _targetFeedbacks;
+        private SerializedProperty _onlyPlayWhenEnteringState;
+
+        protected override void SerializeAdditionalProperties()
+        {
+            _targetFeedbacks = serializedObject.FindProperty("targetFeedbacks");
+            _onlyPlayWhenEnteringState = serializedObject.FindProperty("onlyPlayWhenEnteringState");
+
+            serializedObject.Update();
+            NodeEditorGUILayout.PropertyField(_targetFeedbacks);
+            NodeEditorGUILayout.PropertyField(_onlyPlayWhenEnteringState);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

Common/Scripts/Agents/AI/Graph/Actions/Editor/AIActionShootNodeEditor.cs

@@ -23,6 +23,5 @@ protected override void SerializeAdditionalProperties()
             NodeEditorGUILayout.PropertyField(_targetOffset);
             serializedObject.ApplyModifiedProperties();
         }
-
     }
 }

Common/Scripts/Agents/AI/Graph/Actions/Editor/AIActionSwapBrainNodeEditor.cs

@@ -0,0 +1,21 @@
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEditor;
+using XNodeEditor;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    [CustomNodeEditor(typeof(AIActionSwapBrainNode))]
+    public class AIActionSwapBrainNodeEditor : AIActionNodeEditor
+    {
+        private SerializedProperty _newAIBrain;
+
+        protected override void SerializeAdditionalProperties()
+        {
+            _newAIBrain = serializedObject.FindProperty("newAIBrain");
+
+            serializedObject.Update();
+            NodeEditorGUILayout.PropertyField(_newAIBrain);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

Common/Scripts/Agents/AI/Graph/Actions/Editor/AIActionUnityEventsNodeEditor.cs

@@ -0,0 +1,24 @@
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEditor;
+using XNodeEditor;
+
+namespace TheBitCave.CorgiExensions.AI.Graph
+{
+    [CustomNodeEditor(typeof(AIActionUnityEventsNode))]
+    public class AIActionUnityEventsNodeEditor : AIActionNodeEditor
+    {
+        private SerializedProperty _targetEvent;
+        private SerializedProperty _onlyPlayWhenEnteringState;
+
+        protected override void SerializeAdditionalProperties()
+        {
+            _targetEvent = serializedObject.FindProperty("targetEvent");
+            _onlyPlayWhenEnteringState = serializedObject.FindProperty("onlyPlayWhenEnteringState");
+
+            serializedObject.Update();
+            NodeEditorGUILayout.PropertyField(_targetEvent);
+            NodeEditorGUILayout.PropertyField(_onlyPlayWhenEnteringState);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}