Fixed AI integration with manual missile fire

Author: Halbann

GameData/KCS/Changelog.txt

@@ -1,18 +1,18 @@
-v0.1.2
+v0.2.0
 
 Patch notes:
 
 - Added a smaller scanner based on the medium ore scanner.
-- Tech tree and cargo compatibility added to parts.
 - Added automatic support for horizontal missile launches via RCS.
+- Missiles now point forward based on thrust direction.
+- Support for docking ports and radial decouplers as weapon separators.
 - Added a target prioritisation setting based on a mass range, only applies to targets within 2x max weapons range.
+- Tech tree and cargo compatibility added to parts.
 - Added a setting to toggle the automatic playing of animations on scanners.
 - Added a 'Salvo Interval' setting to the ship controller for controlling the time between missile salvos.
 - Added a setting to the ship controller to toggle evasion.
 - Added a 'Forward Fire Throttle Limit' setting to the ship controller to limit the throttle while missiles are launching from the front of the ship. Zero by default.
 - Added a setting for time between firework bursts.
-- Support for docking ports and radial decouplers as weapon separators.
-- Missiles now point forward based on thrust direction.
 - Support for angled thrusters in thrust calculations.
 - Improved support for RCS missiles.
 - Added savegame settings for gameplay preferences. Currently a retreat override and scanning range multiplers.
@@ -38,5 +38,6 @@ Patch notes:
 - Fixed a bug that was preventing firer collision avoidance for missiles.
 - Increased minimum value for firework burst spacing above 0.
 - Fixed manual fire for rockets.
+- Fixed AI integration with manual missile fire.
 - Removed Phoenia.
 - Sated the snow leopard.

Source/KerbalCombatSystems/MainController.cs

@@ -291,7 +291,7 @@ void OnGUI()
         }
 
         private void DrawGUI() =>
-            windowRect = GUILayout.Window(GUIUtility.GetControlID(FocusType.Passive), windowRect, FillWindow, "Kerbal Combat Systems", GUILayout.Height(0), GUILayout.Width(mode != "Log" ? windowWidth : windowWidth * 1.25f));
+            windowRect = GUILayout.Window(GUIUtility.GetControlID(FocusType.Passive), windowRect, FillWindow, "KCS Beta v0.2.0", GUILayout.Height(0), GUILayout.Width(mode != "Log" ? windowWidth : windowWidth * 1.25f));
 
         private void FillWindow(int windowID)
         {

Source/KerbalCombatSystems/MissileGuidance.cs

@@ -16,9 +16,9 @@ public class ModuleMissile : ModuleWeapon
         private Vessel firer;
         private float igniteDelay;
         private float terminalVelocity;
-        private ModuleWeaponController targetWeapon;
         private bool isInterceptor;
         private int shutoffDistance;
+        private ModuleWeaponController targetWeapon;
 
         // Missile guidance variables.
 
@@ -34,7 +34,6 @@ public class ModuleMissile : ModuleWeapon
         private bool drift;
         public float maxAcceleration;
         private Vector3 rcs;
-        private float targetSize;
         private Vector3 propulsionVector;
 
         // Components
@@ -44,7 +43,9 @@ public class ModuleMissile : ModuleWeapon
         private ModuleWeaponController controller;
         private List<ModuleRCSFX> rcsThrusters;
         private List<ModuleEngines> engines;
-        private int partCount = -1;
+
+        //private float targetSize;
+        //private int partCount = -1;
 
         // Debugging line variables.
 
@@ -53,6 +54,45 @@ public class ModuleMissile : ModuleWeapon
 
         private IEnumerator Launch()
         {
+            // 0. Failsafes for manual fire.
+            // todo: some of this should probably transferred to the weapon controller.
+
+            if (controller.target == null && vessel.targetObject == null) 
+                yield break;
+
+            if (controller.target == null)
+            {
+                // The missile was fired manually.
+
+                target = vessel.targetObject.GetVessel();
+                controller.target = target;
+
+                ModuleShipController firerController = FindController(firer);
+                if (firerController != null)
+                {
+                    // Don't require a ship controller and only consider ship-side limitations
+                    // if a ship controller exists. It is probably more fun this way.
+
+                    controller.side = firerController.side;
+
+                    if (firerController.maxDetectionRange == 0)
+                        firerController.UpdateDetectionRange();
+
+                    if (FromTo(vessel, target).magnitude > firerController.maxDetectionRange)
+                        yield break;
+                }
+
+                ModuleShipController targetController = FindController(target);
+                if (targetController != null && !targetController.incomingWeapons.Contains(controller))
+                    targetController.AddIncoming(controller);
+            }
+            else
+                target = controller.target;
+
+            if (!KCSController.weaponsInFlight.Contains(controller))
+                KCSController.weaponsInFlight.Add(controller);
+
+
             // 1. Separate from firer.
 
             // find decoupler
@@ -129,9 +169,8 @@ private IEnumerator Launch()
 
             maxThrust = propulsionVector.magnitude;
             maxAcceleration = maxThrust / vessel.GetTotalMass();
-
-            // Set the in-game target.
             vessel.targetObject = target;
+            shutoffDistance = isInterceptor ? 3 : 10;
 
 
             // 3. Start moving away from firer.
@@ -300,22 +339,20 @@ private IEnumerator Launch()
             interceptLine = KCSDebug.CreateLine(Color.cyan);
             thrustLine = KCSDebug.CreateLine(new Color(255f / 255f, 165f / 255f, 0f, 1f)); //orange
 
-            // enable autopilot
-            engageAutopilot = true;
-
-            shutoffDistance = isInterceptor ? 3 : 10;
-            var targetController = FindController(target);
-            targetSize = targetController != null ? targetController.averagedSize : AveragedSize(target);
-            partCount = vessel.parts.Count;
-
+            // Rename the new vessel.
             string oldName = vessel.vesselName;
             string missileName = controller.weaponCode == "" ? "Missile" : controller.weaponCode;
             string firerName = ShortenName(firer.vesselName);
             vessel.vesselName = !isInterceptor ? $"{missileName} ({firerName} >> {ShortenName(target.vesselName)})" : $"Interceptor ({firerName})";
             GameEvents.onVesselRename.Fire(new GameEvents.HostedFromToAction<Vessel, string>(vessel, oldName, vessel.vesselName));
 
+            engageAutopilot = true;
             controller.launched = true;
 
+            //var targetController = FindController(target);
+            //targetSize = targetController != null ? targetController.averagedSize : AveragedSize(target);
+            //partCount = vessel.parts.Count;
+
             //if (isInterceptor)
             //{
             //    prediction = GameObject.CreatePrimitive(PrimitiveType.Sphere);
@@ -415,9 +452,6 @@ public override void Setup()
         {
             controller = part.FindModuleImplementing<ModuleWeaponController>();
 
-            if (controller.target == null && vessel.targetObject == null) return;
-            target = controller.target ?? vessel.targetObject.GetVessel();
-
             terminalVelocity = controller.terminalVelocity;
             isInterceptor = controller.isInterceptor;
             targetWeapon = controller.targetWeapon;

Source/KerbalCombatSystems/ShipController.cs

@@ -31,7 +31,7 @@ public class ModuleShipController : PartModule
         internal KCSFlightController fc;
 
         public Vessel target;
-        private ModuleShipController targetController;
+        internal ModuleShipController targetController;
 
         private Coroutine shipControllerCoroutine;
         private Coroutine behaviourCoroutine;
@@ -958,7 +958,7 @@ private bool CheckWithdraw()
             return Mathf.Abs(RelVel(vessel, nearest.vessel).magnitude) < 200;
         }
 
-        private void UpdateDetectionRange()
+        internal void UpdateDetectionRange()
         {
             var sensors = vessel.FindPartModulesImplementing<ModuleObjectTracking>();