Now it's possible to specify unavailable projectiles for Verb (can be…

… useful for CIWS)
CombatExtended-Continued · Nov 30, 2024 · b8d4434 · b8d4434
1 parent fb38321
commit b8d4434
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs b/Source/CombatExtended/CombatExtended/Things/Building_TurretGunCE.cs
@@ -419,6 +419,10 @@ public virtual void TryStartShootSomething(bool canBeginBurstImmediately)    //
 
         public virtual LocalTargetInfo TryFindNewTarget()    // Core method
         {
+            if (!AttackVerb.Available())
+            {
+                return null;
+            }
             IAttackTargetSearcher attackTargetSearcher = this.TargSearcher();
             Faction faction = attackTargetSearcher.Thing.Faction;
             float range = this.AttackVerb.verbProps.range;

diff --git a/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs b/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs
@@ -18,5 +18,6 @@ public class VerbPropertiesCE : VerbProperties
         public bool ejectsCasings = true;
         public bool ignorePartialLoSBlocker = false;
         public bool interruptibleBurst = true;
+        public List<ThingDef> cantShotWith = new List<ThingDef>();
     }
 }
diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs
@@ -268,7 +268,7 @@ public override bool Available()
                 }
             }
 
-            return Projectile != null;
+            return Projectile != null && !VerbPropsCE.cantShotWith.Contains(Projectile);
         }
 
         /// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -268,7 +268,7 @@ public override bool Available() @@
                     }
                 }
-                return Projectile != null;
+                return Projectile != null && !VerbPropsCE.cantShotWith.Contains(Projectile);
             }
             /// <summary>
@@ Expand Down @@