diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 4b7b83f5..8da2bf6e 100644 Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ diff --git a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobDriver_DroneSelfShutdown.cs b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobDriver_DroneSelfShutdown.cs deleted file mode 100644 index 6205f7df..00000000 --- a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobDriver_DroneSelfShutdown.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Collections.Generic; -using RimWorld; -using Verse; -using Verse.AI; - -namespace WulaFallenEmpire -{ - public class JobDriver_DroneSelfShutdown : JobDriver - { - public const TargetIndex RestSpotIndex = TargetIndex.A; - - public override bool TryMakePreToilReservations(bool errorOnFailed) - { - return pawn.Reserve(base.TargetA, job, 1, -1, null, errorOnFailed); - } - - protected override IEnumerable MakeNewToils() - { - yield return Toils_Goto.GotoCell(TargetIndex.A, PathEndMode.OnCell); - Toil layDown = SelfShutdown(); - layDown.PlaySoundAtStart(SoundDefOf.MechSelfShutdown); - yield return layDown; - } - - public static Toil SelfShutdown() - { - Toil layDown = ToilMaker.MakeToil("WULA_DroneSelfShutdown"); - layDown.initAction = delegate - { - Pawn actor = layDown.actor; - actor.pather?.StopDead(); - JobDriver curDriver = actor.jobs.curDriver; - actor.jobs.posture = PawnPosture.Standing; - actor.mindState.lastBedDefSleptIn = null; - curDriver.asleep = true; - }; - layDown.defaultCompleteMode = ToilCompleteMode.Never; - layDown.AddFinishAction(delegate - { - layDown.actor.jobs.curDriver.asleep = false; - }); - return layDown; - } - } -} \ No newline at end of file diff --git a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobGiver_DroneSelfShutdown.cs b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobGiver_DroneSelfShutdown.cs index 9edf3ba3..088b75a0 100644 --- a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobGiver_DroneSelfShutdown.cs +++ b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/JobGiver_DroneSelfShutdown.cs @@ -8,13 +8,13 @@ namespace WulaFallenEmpire { protected override Job TryGiveJob(Pawn pawn) { - if (RCellFinder.TryFindNearbyMechSelfShutdownSpot(pawn.Position, pawn, pawn.Map, out var result, allowForbidden: true)) + if (!RCellFinder.TryFindNearbyMechSelfShutdownSpot(pawn.Position, pawn, pawn.Map, out var result, allowForbidden: true)) { - Job job = JobMaker.MakeJob(WulaDefOf.WULA_DroneSelfShutdown, result); - job.forceSleep = true; - return job; + result = pawn.Position; } - return null; + Job job = JobMaker.MakeJob(JobDefOf.SelfShutdown, result); + job.forceSleep = true; + return job; } } } \ No newline at end of file diff --git a/Source/WulaFallenEmpire/WulaDefOf.cs b/Source/WulaFallenEmpire/WulaDefOf.cs index dbe19054..9d545ef0 100644 --- a/Source/WulaFallenEmpire/WulaDefOf.cs +++ b/Source/WulaFallenEmpire/WulaDefOf.cs @@ -80,7 +80,6 @@ namespace WulaFallenEmpire [DefOf] public static class WulaDefOf { - public static JobDef WULA_DroneSelfShutdown; public static DroneWorkModeDef Work; public static DroneWorkModeDef Recharge; public static DroneWorkModeDef Shutdown; diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index 87e01a73..5f7afa9f 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -70,336 +70,7 @@ ..\..\..\..\..\..\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +