TurretAxisManager + Bugfixes

BDArmory/Ammo/PooledBullet.cs

@@ -539,15 +539,22 @@ public void PostCollisions()
                         {
                             if (fuzeType == BulletFuzeTypes.Delay || fuzeType == BulletFuzeTypes.Penetrating)
                             {
-                                fuzeTriggered = true;
-                                delayedDetonationRoutine = StartCoroutine(DelayedDetonationRoutine());
+                                if (!fuzeTriggered)
+                                {
+                                    fuzeTriggered = true;
+                                    delayedDetonationRoutine = StartCoroutine(DelayedDetonationRoutine());
+                                }
                             }
                             else //if (fuzeType != BulletFuzeTypes.None)
                             {
                                 if (HEType != PooledBulletTypes.Slug)
+                                {
                                     ExplosionFx.CreateExplosion(currentPosition, tntMass, explModelPath, explSoundPath, ExplosionSourceType.Bullet, caliber, null, sourceVesselName, null, null, default, -1, false, bulletMass, -1, dmgMult);
+                                }
                                 if (nuclear)
+                                {
                                     NukeFX.CreateExplosion(currentPosition, ExplosionSourceType.Bullet, sourceVesselName, bullet.DisplayName, 0, tntMass * 200, tntMass, tntMass, EMP, blastSoundPath, flashModelPath, shockModelPath, blastModelPath, plumeModelPath, debrisModelPath, "", "");
+                                }
                                 hasDetonated = true;
                                 if (BDArmorySettings.waterHitEffect && FlightGlobals.currentMainBody.ocean) FXMonger.Splash(currentPosition, caliber / 2);
                                 KillBullet();
@@ -1510,7 +1517,11 @@ bool BulletHitAnalysis(BulletHit bulletHit, float period)
                         // Should penetrating fuzes also get triggered here? I guess they should...
                         if (fuzeType == BulletFuzeTypes.Delay || fuzeType == BulletFuzeTypes.Penetrating)
                         {
-                            fuzeTriggered = true;
+                            if (!fuzeTriggered)
+                            {
+                                fuzeTriggered = true;
+                                delayedDetonationRoutine = StartCoroutine(DelayedDetonationRoutine());
+                            }
                         }
                     }
                 }

BDArmory/BDArmory.csproj

@@ -345,6 +345,7 @@
     <Compile Include="WeaponMounts\MissileTurret.cs" />
     <Compile Include="WeaponMounts\ModuleCustomTurret.cs" />
     <Compile Include="WeaponMounts\ModuleTurret.cs" />
+    <Compile Include="WeaponMounts\TurretAxisManager.cs" />
     <Compile Include="WeaponMounts\WMTurretGroup.cs" />
     <Compile Include="Weapons\BDCustomWarhead.cs" />
     <Compile Include="Weapons\BDWarheadBase.cs" />

BDArmory/Radar/RadarWarningReceiver.cs

@@ -160,11 +160,11 @@ public override void OnStart(StartState state)
             if (HighLogic.LoadedSceneIsFlight)
             {
                 pingsData = new RWRSignatureData[dataCount];
-                MWSData = new RWRSignatureData[dataCount];
+                MWSData = new RWRSignatureData[2 *dataCount];
                 //pingWorldPositions = new Vector3[dataCount];
                 RWRSignatureData.ResetRWRSDArray(ref pingsData);
-                launchWarnings = new RWRSignatureData[dataCount]; //new List<TargetSignatureData>();
-                missileLockData = new RWRSignatureData[dataCount];
+                launchWarnings = new RWRSignatureData[2 * dataCount]; //new List<TargetSignatureData>();
+                missileLockData = new RWRSignatureData[2 * dataCount];
 
                 rwrIconLabelStyle = new GUIStyle();
                 rwrIconLabelStyle.alignment = TextAnchor.MiddleCenter;
@@ -431,7 +431,7 @@ private void CleanPings()
 
         private void CleanMissileLocks()
         {
-            float currentTime = Time.time;
+            float currentTime = Time.time + Time.fixedDeltaTime;
             while (_missileLockSize > 0)
             {
                 int idx = _missileLockHead;

BDArmory/WeaponMounts/MissileTurret.cs

@@ -94,6 +94,7 @@ public bool slavedGuard
         [KSPField] public bool deployBlocksYaw = false; // Turret must deploy before yawing, turret must return to yaw standby position to stow/"undeploy".
         [KSPField] public bool deployBlocksPitch = false; // Turret must deploy before pitching, turret must return to pitch standby position to stow/"undeploy".
         public bool isReloading = false;
+        float _reloadUntil = 0;
         [KSPField] public bool startsDeployed = false; //Turret starts in deployed position and only uses deploy anim for relaoding. TODO: proper reload anim support for turrets independent of deployAnim
 
         //animation
@@ -112,7 +113,7 @@ public bool isDeployed()
         //special
         [KSPField] public bool activeMissileOnly = false;
 
-        MissileFire WeaponManager
+        public MissileFire WeaponManager
         {
             get
             {
@@ -123,6 +124,54 @@ MissileFire WeaponManager
         }
         MissileFire _weaponManager;
 
+        public float DeployIfBlocking(bool yaw)
+        {
+            if (!hasDeployAnimation)
+            {
+                turret.SetDeployFlag(true, true);
+                return 0;
+            }
+
+            // If not blocking, return 0 without doing anything
+            if (!(yaw ? deployBlocksYaw : deployBlocksPitch))
+            {
+                if (yaw)
+                {
+                    turret.SetYawDeployFlag(true);
+                }
+                else
+                {
+                    turret.SetPitchDeployFlag(true);
+                }
+                return 0;
+            }
+
+            bool reloadBlock = deployBlocksReload && isReloading;
+
+            // If no deploy animation or deployed and not reloading
+            if (!(deployAnimState.normalizedTime < 1 || reloadBlock)) return 0;
+
+            // If not blocked by reload
+            if (!reloadBlock)
+            {
+                if (deployAnimRoutine != null)
+                {
+                    StopCoroutine(deployAnimRoutine);
+                }
+
+                deployAnimRoutine = StartCoroutine(DeployAnimation(true));
+
+                hasReturned = false;
+
+                return deployAnimState.length - deployAnimState.time;
+            }
+            else
+            {
+                // If blocked by reload, return time that reload completes at
+                return _reloadUntil - Time.fixedDeltaTime;
+            }
+        }
+
         IEnumerator DeployAnimation(bool forward)
         {
             var wait = new WaitForFixedUpdate();
@@ -137,13 +186,19 @@ IEnumerator DeployAnimation(bool forward)
                 }
 
                 deployAnimState.normalizedTime = 1;
+
+                // Unblock turret
+                turret.SetDeployFlag(true, true);
             }
             else
             {
                 deployAnimState.speed = 0;
 
                 yield return new WaitWhileFixed(() => pausingAfterShot);
 
+                // Block turret prior to undeploy
+                turret.SetDeployFlag(!deployBlocksYaw, !deployBlocksPitch);
+
                 while (deployAnimState.normalizedTime > 0)
                 {
                     deployAnimState.speed = -deployAnimationSpeed;
@@ -279,7 +334,7 @@ IEnumerator ReturnRoutine()
             bool pitch = !turretEnabled || (deployBlocksPitch && deployBlocksReload);
             bool yaw = !turretEnabled || (deployBlocksYaw && deployBlocksReload);
 
-            while (turret != null && !turret.ReturnTurret(pitch, yaw))
+            while (turret != null && !turret.ReturnTurret(pitch, yaw, isReloading))
             {
                 UpdateMissilePositions();
                 yield return new WaitForFixedUpdate();
@@ -325,6 +380,7 @@ public override void OnStart(StartState state)
                     if (tur.Current == null) continue;
                     if (tur.Current.turretID != turretID) continue;
                     turret = tur.Current;
+                    turret.turretMissile = this;
                     break;
                 }
                 tur.Dispose();
@@ -473,12 +529,34 @@ public void SetSlavedGuard(bool slavedGuard, MissileBase ml)
             }
         }
 
+        public bool IsCurrentWMMissile()
+        {
+            MissileFire wm;
+            if (!(wm = WeaponManager)) return false;
+
+            if (!wm.CurrentMissile) return false;
+
+            return slavedGuard || wm.CurrentMissile.GetPartName() == activeMissile.GetPartName();
+        }
+
         public void SlavedAim()
         {
             if (pausingAfterShot) return;
-            bool deployCond = hasDeployAnimation && (deployAnimState.normalizedTime < 1 || isReloading);
+            bool deployCond = hasDeployAnimation && (deployAnimState.normalizedTime < 1 || (deployBlocksReload && isReloading));
+
+            turret.AimToTarget(slavedTargetPosition, !(deployCond && deployBlocksPitch), !(deployCond && deployBlocksYaw), IsCurrentWMMissile());
+        }
+
+        public void SetReloadBlock(float duration)
+        {
+            // Deploy must block reload and a deploy animation must exist before we block the turret
+            if (!(deployBlocksReload && hasDeployAnimation)) return;
+
+            _reloadUntil = Time.fixedDeltaTime + duration;
 
-            turret.AimToTarget(slavedTargetPosition, !(deployCond && deployBlocksPitch), !(deployCond && deployBlocksYaw));
+            // We only block if the respective toggle is also enabled
+            if (deployBlocksPitch && turret.pitchAxisManager) turret.pitchAxisManager.SetTurretBlock(_reloadUntil);
+            if (deployBlocksYaw && turret.yawAxisManager) turret.yawAxisManager.SetTurretBlock(_reloadUntil);
         }
 
         const int mouseAimLayerMask = (int)(LayerMasks.Parts | LayerMasks.Scenery | LayerMasks.EVA | LayerMasks.Unknown19 | LayerMasks.Unknown23 | LayerMasks.Wheels);
@@ -523,8 +601,8 @@ void MouseAim()
                                  FlightCamera.fetch.mainCamera.transform.position;
             }
 
-            bool deployCond = hasDeployAnimation && (deployAnimState.normalizedTime < 1 || isReloading);
-            turret.AimToTarget(targetPosition, !(deployCond && deployBlocksPitch), !(deployCond && deployBlocksYaw));
+            bool deployCond = hasDeployAnimation && (deployAnimState.normalizedTime < 1 || (deployBlocksReload && isReloading));
+            turret.AimToTarget(targetPosition, !(deployCond && deployBlocksPitch), !(deployCond && deployBlocksYaw), IsCurrentWMMissile());
         }
 
         public void UpdateMissileChildren()