Add options to the AI Shoot actions to specify what HandleWeapon ability to pilot

Author: marcosecchi

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

@@ -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/AIActionShoot3DNode.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/Editor/AIActionShoot2DNodeEditor.cs

@@ -7,17 +7,28 @@ namespace TheBitCave.TopDownEngineExensions.AI.Graph
     [CustomNodeEditor(typeof(AIActionShoot2DNode))]
     public class AIActionShoot2DNodeEditor : AIActionNodeEditor
     {
+//        private SerializedProperty _targetHandleWeaponAbility;
+        private SerializedProperty _aimOrigin;
         private SerializedProperty _faceTarget;
         private SerializedProperty _aimAtTarget;
 
         protected override void SerializeAdditionalProperties()
         {
+  //          _targetHandleWeaponAbility = serializedObject.FindProperty("targetHandleWeaponAbility");
+            _aimOrigin = serializedObject.FindProperty("aimOrigin");
             _faceTarget = serializedObject.FindProperty("faceTarget");
             _aimAtTarget = serializedObject.FindProperty("aimAtTarget");
 
             serializedObject.Update();
+  //          NodeEditorGUILayout.PropertyField(_targetHandleWeaponAbility);
+            NodeEditorGUILayout.PropertyField(_aimOrigin);
             NodeEditorGUILayout.PropertyField(_faceTarget);
             NodeEditorGUILayout.PropertyField(_aimAtTarget);
+            
+            EditorGUILayout.HelpBox(
+                "Target Handle Weapon Ability property is hidden. You will have to manually add it once the generator has been executed or assign it at runtime.",
+                MessageType.Warning);
+
             serializedObject.ApplyModifiedProperties();
         }
     }

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

@@ -7,21 +7,29 @@ namespace TheBitCave.TopDownEngineExensions.AI.Graph
     [CustomNodeEditor(typeof(AIActionShoot3DNode))]
     public class AIActionShoot3DNodeEditor : AIActionNodeEditor
     {
+//        private SerializedProperty _targetHandleWeaponAbility;
         private SerializedProperty _aimAtTarget;
         private SerializedProperty _shootOffset;
         private SerializedProperty _lockVerticalAim;
 
         protected override void SerializeAdditionalProperties()
         {
+            //          _targetHandleWeaponAbility = serializedObject.FindProperty("targetHandleWeaponAbility");
             _aimAtTarget = serializedObject.FindProperty("aimAtTarget");
             _shootOffset = serializedObject.FindProperty("shootOffset");
             _lockVerticalAim = serializedObject.FindProperty("lockVerticalAim");
 
             serializedObject.Update();
             EditorGUIUtility.labelWidth = 105;
+            //          NodeEditorGUILayout.PropertyField(_targetHandleWeaponAbility);
             NodeEditorGUILayout.PropertyField(_aimAtTarget);
             NodeEditorGUILayout.PropertyField(_shootOffset);
             NodeEditorGUILayout.PropertyField(_lockVerticalAim);
+            
+            EditorGUILayout.HelpBox(
+                "Target Handle Weapon Ability property is hidden. You will have to manually add it once the generator has been executed or assign it at runtime.",
+                MessageType.Warning);
+
             serializedObject.ApplyModifiedProperties();
         }
     }