Merge branch 'develop'

Author: marcosecchi

Common/Scripts/AI/Graph/Actions/AIActionMoveAwayFromTarget2DNode.cs

@@ -0,0 +1,25 @@
+using MoreMountains.TopDownEngine;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+
+namespace TheBitCave.TopDownEngineExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a TopDown Engine <see cref="MoreMountains.TopDownEngine.AIActionMoveAwayFromTarget2D"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/2D/Move Away From Target")]
+    public class AIActionMoveAwayFromTarget2DNode : AIActionNode
+    {
+        public float maximumDistance = 5.0f;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionMoveAwayFromTarget2D>();
+            action.Label = label;
+            action.MaximumDistance = maximumDistance;
+            
+            return action;
+        }
+    }
+}

Common/Scripts/AI/Graph/Actions/AIActionMoveAwayFromTarget2DNode.cs.meta

@@ -0,0 +1,25 @@
+using MoreMountains.TopDownEngine;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+
+namespace TheBitCave.TopDownEngineExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a TopDown Engine <see cref="MoreMountains.TopDownEngine.AIActionMoveAwayFromTarget3D"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/3D/Move Away From Target")]
+    public class AIActionMoveAwayFromTarget3DNode : AIActionNode
+    {
+        public float maximumDistance = 10.0f;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionMoveAwayFromTarget3D>();
+            action.Label = label;
+            action.MaximumDistance = maximumDistance;
+            
+            return action;
+        }
+    }
+}

Common/Scripts/AI/Graph/Actions/AIActionMoveAwayFromTarget3DNode.cs

@@ -0,0 +1,25 @@
+using MoreMountains.TopDownEngine;
+using MoreMountains.Tools;
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEngine;
+
+namespace TheBitCave.TopDownEngineExensions.AI.Graph
+{
+    /// <summary>
+    /// A node representing a TopDown Engine <see cref="MoreMountains.TopDownEngine.AIActionReload"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/Reload")]
+    public class AIActionReloadNode : AIActionNode
+    {
+        public bool onlyReloadOnceInThisState = true;
+
+        public override AIAction AddActionComponent(GameObject go)
+        {
+            var action = go.AddComponent<AIActionReload>();
+            action.Label = label;
+            action.OnlyReloadOnceInThisSate = onlyReloadOnceInThisState;
+            
+            return action;
+        }
+    }
+}

Common/Scripts/AI/Graph/Actions/AIActionMoveAwayFromTarget3DNode.cs.meta

@@ -11,12 +11,19 @@ namespace TheBitCave.TopDownEngineExensions.AI.Graph
     [CreateNodeMenu("AI/Action/2D/Shoot")]
     public class AIActionShoot2DNode : AIActionNode
     {
+   //     [Header("Binding")] 
+   //     public CharacterHandleWeapon targetHandleWeaponAbility;
+
+        [Header("Behaviour")] 
+        public AIActionShoot2D.AimOrigins aimOrigin = AIActionShoot2D.AimOrigins.Transform;
         public bool faceTarget = true;
         public bool aimAtTarget = false;
 
         public override AIAction AddActionComponent(GameObject go)
         {
             var action = go.AddComponent<AIActionShoot2D>();
+   //         action.TargetHandleWeaponAbility = targetHandleWeaponAbility;
+            action.AimOrigin = aimOrigin;
             action.FaceTarget = faceTarget;
             action.AimAtTarget = aimAtTarget;
             action.Label = label;

Common/Scripts/AI/Graph/Actions/AIActionReloadNode.cs

@@ -11,13 +11,18 @@ namespace TheBitCave.TopDownEngineExensions.AI.Graph
     [CreateNodeMenu("AI/Action/3D/Shoot")]
     public class AIActionShoot3DNode : AIActionNode
     {
+        //     [Header("Binding")] 
+        //     public CharacterHandleWeapon targetHandleWeaponAbility;
+
+        [Header("Behaviour")] 
         public bool aimAtTarget = false;
         public Vector3 shootOffset;
         public bool lockVerticalAim = false;
 
         public override AIAction AddActionComponent(GameObject go)
         {
             var action = go.AddComponent<AIActionShoot3D>();
+            //         action.TargetHandleWeaponAbility = targetHandleWeaponAbility;
             action.AimAtTarget = aimAtTarget;
             action.ShootOffset = shootOffset;
             action.LockVerticalAim = lockVerticalAim;

Common/Scripts/AI/Graph/Actions/AIActionReloadNode.cs.meta

@@ -38,6 +38,5 @@ protected override void SerializeAdditionalProperties()
                 "Game Object to Aim property is hidden. You will have to manually add it once the generator has been executed or assign it at runtime.",
                 MessageType.Warning);
         }
-
     }
 }

Common/Scripts/AI/Graph/Actions/AIActionShoot2DNode.cs

@@ -0,0 +1,23 @@
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEditor;
+using UnityEngine;
+using XNodeEditor;
+
+namespace TheBitCave.TopDownEngineExensions.AI.Graph
+{
+    [CustomNodeEditor(typeof(AIActionMoveAwayFromTarget2DNode))]
+    public class AIActionMoveAwayFromTarget2DNodeEditor : AIActionNodeEditor
+    {
+        private SerializedProperty _maximumDistance;
+
+        protected override void SerializeAdditionalProperties()
+        {
+            _maximumDistance = serializedObject.FindProperty("maximumDistance");
+
+            serializedObject.Update();
+            EditorGUIUtility.labelWidth = 150;
+            NodeEditorGUILayout.PropertyField(_maximumDistance);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}