zc

1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml

@@ -134,7 +134,6 @@
         <chargeIntervalTicks>-1</chargeIntervalTicks>
         <chargeDurationTicks>0</chargeDurationTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_ForceTargetable" />
     </comps>
     <placeWorkers>
       <li>PlaceWorker_NotUnderRoof</li>
@@ -282,7 +281,6 @@
         <chargeIntervalTicks>-1</chargeIntervalTicks>
         <chargeDurationTicks>0</chargeDurationTicks>
       </li>
-      <li Class="WulaFallenEmpire.CompProperties_ForceTargetable" />
     </comps>
     <modExtensions>
       <li Class="WulaFallenEmpire.PocketMapProperties">

Source/WulaFallenEmpire/WULA_Shuttle/Building_ArmedShuttle.cs

@@ -11,7 +11,7 @@ using Verse.Sound;
 namespace WulaFallenEmpire
 {
     [StaticConstructorOnStartup]
-    public class Building_ArmedShuttle : Building_PassengerShuttle, IAttackTargetSearcher
+    public class Building_ArmedShuttle : Building_PassengerShuttle, IAttackTarget, IAttackTargetSearcher
     {
         // --- TurretTop nested class ---
         public class TurretTop
@@ -116,6 +116,9 @@ namespace WulaFallenEmpire
         protected CompHackable hackableComp;
 
         // --- PROPERTIES ---
+        Thing IAttackTarget.Thing => this;
+        public LocalTargetInfo TargetCurrentlyAimingAt => CurrentTarget;
+        public float TargetPriorityFactor => 1f;
         public virtual Material TurretTopMaterial => def.building.turretTopMat;
         protected bool IsStunned
         {
@@ -129,7 +132,6 @@ namespace WulaFallenEmpire
                 return stunner != null && stunner.Stunned;
             }
         }
-        public LocalTargetInfo TargetCurrentlyAimingAt => CurrentTarget;
         public Verb CurrentEffectiveVerb => AttackVerb;
         public LocalTargetInfo LastAttackedTarget => lastAttackedTarget;
         public int LastAttackTargetTick => lastAttackTargetTick;