Add CanTargetSelf option to DetectTargetRadius 2D and 3D decision nodes.

Author: marcosecchi

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

@@ -0,0 +1,15 @@
+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.AIActionChangeWeapon"/> action.
+    /// </summary>
+    [CreateNodeMenu("AI/Action/Invert Patrol Direction")]
+    public class AIActionInvertPatrolDirectionNode : AIActionNode
+    {
+    }
+}

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

@@ -0,0 +1,11 @@
+using TheBitCave.MMToolsExtensions.AI.Graph;
+using UnityEditor;
+using XNodeEditor;
+
+namespace TheBitCave.TopDownEngineExensions.AI.Graph
+{
+    [CustomNodeEditor(typeof(AIActionInvertPatrolDirectionNode))]
+    public class AIActionInvertPatrolDirectionNodeEditor : AIActionNodeEditor
+    {
+    }
+}

Common/Scripts/AI/Graph/Actions/Editor/AIActionInvertPatrolDirectionNodeEditor.cs

@@ -16,6 +16,7 @@ public class AIDecisionDetectTargetRadius2DNode : AIDecisionNode
         public LayerMask targetLayer;
         public bool obstacleDetection = true;
         public LayerMask obstacleMask;
+        public bool canTargetSelf = false;
 
         public override AIDecision AddDecisionComponent(GameObject go)
         {
@@ -26,6 +27,7 @@ public override AIDecision AddDecisionComponent(GameObject go)
             decision.TargetLayer = targetLayer;
             decision.ObstacleDetection = obstacleDetection;
             decision.ObstacleMask = obstacleMask;
+            decision.CanTargetSelf = canTargetSelf;
             return decision;
         }
     }

Common/Scripts/AI/Graph/Actions/Editor/AIActionInvertPatrolDirectionNodeEditor.cs.meta

@@ -14,17 +14,17 @@ public class AIDecisionDetectTargetRadius3DNode : AIDecisionNode
         public float radius = 3f;
         public Vector3 detectionOriginOffset = new Vector3(0, 0, 0);
         public LayerMask targetLayerMask;
-        public bool obstacleDetection = true;
         public LayerMask obstacleMask;
         public float targetCheckFrequency = 1f;
+        public bool canTargetSelf = false;
 
         public override AIDecision AddDecisionComponent(GameObject go)
         {
             var decision = go.AddComponent<AIDecisionDetectTargetRadius3D>();
             decision.Label = label;
             decision.Radius = radius;
             decision.DetectionOriginOffset = detectionOriginOffset;
-            decision.ObstacleDetection = obstacleDetection;
+            decision.CanTargetSelf = canTargetSelf;
             decision.TargetLayerMask = targetLayerMask;
             decision.ObstacleMask = obstacleMask;
             decision.TargetCheckFrequency = targetCheckFrequency;

Common/Scripts/AI/Graph/Decisions/AIDecisionDetectTargetRadius2DNode.cs

@@ -12,6 +12,7 @@ public class AIDecisionDetectTargetRadius2DNodeEditor : AIDecisionNodeEditor
         private SerializedProperty _targetLayer;
         private SerializedProperty _obstacleDetection;
         private SerializedProperty _obstacleMask;
+        private SerializedProperty _canTargetSelf;
 
         public override void OnBodyGUI()
         {
@@ -22,6 +23,7 @@ public override void OnBodyGUI()
             _targetLayer = serializedObject.FindProperty("targetLayer");
             _obstacleDetection = serializedObject.FindProperty("obstacleDetection");
             _obstacleMask = serializedObject.FindProperty("obstacleMask");
+            _canTargetSelf = serializedObject.FindProperty("canTargetSelf");
 
             serializedObject.Update();
             EditorGUIUtility.labelWidth = 120;
@@ -30,6 +32,7 @@ public override void OnBodyGUI()
             NodeEditorGUILayout.PropertyField(_targetLayer);
             NodeEditorGUILayout.PropertyField(_obstacleDetection);
             NodeEditorGUILayout.PropertyField(_obstacleMask);
+            NodeEditorGUILayout.PropertyField(_canTargetSelf);
             serializedObject.ApplyModifiedProperties();
         }
     }

Common/Scripts/AI/Graph/Decisions/AIDecisionDetectTargetRadius3DNode.cs

@@ -10,27 +10,27 @@ public class AIDecisionDetectTargetRadius3DNodeEditor : AIDecisionNodeEditor
         private SerializedProperty _radius;
         private SerializedProperty _detectionOriginOffset;
         private SerializedProperty _targetLayerMask;
-        private SerializedProperty _obstacleDetection;
         private SerializedProperty _obstacleMask;
         private SerializedProperty _targetCheckFrequency;
+        private SerializedProperty _canTargetSelf;
 
         protected override void SerializeAdditionalProperties()
         {
             _radius = serializedObject.FindProperty("radius");
             _detectionOriginOffset = serializedObject.FindProperty("detectionOriginOffset");
-            _obstacleDetection = serializedObject.FindProperty("obstacleDetection");
             _targetLayerMask = serializedObject.FindProperty("targetLayerMask");
             _obstacleMask = serializedObject.FindProperty("obstacleMask");
             _targetCheckFrequency = serializedObject.FindProperty("targetCheckFrequency");
+            _canTargetSelf = serializedObject.FindProperty("canTargetSelf");
 
             serializedObject.Update();
             EditorGUIUtility.labelWidth = 150;
             NodeEditorGUILayout.PropertyField(_radius);
             NodeEditorGUILayout.PropertyField(_detectionOriginOffset);
-            NodeEditorGUILayout.PropertyField(_obstacleDetection);
             NodeEditorGUILayout.PropertyField(_targetLayerMask);
             NodeEditorGUILayout.PropertyField(_obstacleMask);
             NodeEditorGUILayout.PropertyField(_targetCheckFrequency);
+            NodeEditorGUILayout.PropertyField(_canTargetSelf);
             serializedObject.ApplyModifiedProperties();
         }
     }