Merge pull request #2781 from CombatExtended-Continued/turret-reload-…

…assorted-fix assorted turret reload fix
CombatExtended-Continued · Oct 17, 2023 · 8eba523 · 8eba523
2 parents 180c18e + 7df3b02
commit 8eba523
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Source/CombatExtended/CombatExtended/Jobs/JobDriver_ReloadTurret.cs b/Source/CombatExtended/CombatExtended/Jobs/JobDriver_ReloadTurret.cs
@@ -74,6 +74,9 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
         public override string GetReport()
         {
             string text = CE_JobDefOf.ReloadTurret.reportString;
+            string turretType = (turret.TryGetComp<CompMannable>() != null ? "CE_MannedTurret" : "CE_AutoTurret").Translate();
+            text = text.Replace("TurretType", turretType);
+            text = text.Replace("TargetA", TargetThingA.def.label);
             text = compReloader.UseAmmo
                 ? text.Replace("TargetB", TargetThingB.def.label)
                 : text.Replace("TargetB", "CE_ReloadingGenericAmmo".Translate());
@@ -157,7 +160,14 @@ public override IEnumerable<Toil> MakeNewToils()
             }
 
             // If ammo system is turned off we just need to go to the turret.
-            yield return Toils_Goto.GotoCell(turret.Position, PathEndMode.Touch);
+            if (turret.InteractionCell != null)
+            {
+                yield return Toils_Goto.GotoCell(turret.InteractionCell, PathEndMode.OnCell);
+            }
+            else
+            {
+                yield return Toils_Goto.GotoThing(TargetIndex.A, PathEndMode.Touch);
+            }
 
             //If pawn fails reloading from this point, reset isReloading
             this.AddFinishAction(delegate