From 5b233dc12f2be71a3a31d621f8b1659a6bdd0329 Mon Sep 17 00:00:00 2001 From: KylianB Date: Tue, 19 Jul 2022 14:56:50 +0200 Subject: [PATCH] PipeSystem: Add extractTime option to CompResourceStorage --- 1.3/Assemblies/PipeSystem.dll | Bin 86016 -> 86016 bytes .../CompProperties_ResourceStorage.cs | 1 + .../Jobs/JobDriver_DrainFromMarkedStorage.cs | 42 ++++++++++-------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/1.3/Assemblies/PipeSystem.dll b/1.3/Assemblies/PipeSystem.dll index 8f2a81905cb63223b122e52940a3bc56768b6bf5..806a7b91b39ac7053414cf4f41d5da0737ea19ab 100644 GIT binary patch delta 29824 zcmb8Y33yah5;k1-cK7X0XYF+MeNSgkNLUgQc7(8sf-J%q77-9=AdG^YrV~~X6yik? zMF@+6$|wjU?!pKNqoRz0GJ+GteH@o@Uk3lT>fS8s%>R8~d{XzkRduTBRGo9~8fz~rC7_*Kb9dmbQKbeKrlw0*GBUB6OYnQ|+UHR`g(?Ql6NEvy~m4(id0 zBf0FpTlKHiF3JWy*HQ{P&Qcmv5A|%9)3*Uff36Ac(zjZ=DYqUtW7(i6yYyMMzRIox zdu^{M+Hz?4*60CyY+G}S{R^f3!0nC#oATs=Cqv(JD$gI-8uy{^$+BO$AONN54O8hr9beH@uQ~w2ZD92Y2V1WPDm6XBC2z^M(5M{W2S4w`& z2nY(ZRUaRHG3Zzr2cVxx$x9dx7OE2(R5+GYA0uxZ6wuV;QuEQjf9i~Q>6avIX(ppN zK7>siO`QTyxoM>V5oAK(a`>`v@MeSXaK&r3kNdbZ-)anPoS%Ui4x5d^^l-YIg=MC; zD0h-yw#Hmm+`+Ek!Z1@K)}JHh4JDTr@zZq!}{qY2FGmA>>P9Ie~pW(H==Y?os$bQN~Q z{2RFubCIj4Q_S7auRUfD$J`wpiMceptQ6auH9teO_@&{D&A&qRT+i#8_Z}bbDETR> z@5(lP{&@@jrI9GV`(4Ob%6Sj~oUx5INf>qxr{W*^(z%0AxFT4$mLKAxk?;u%N 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 delta 29328 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 CPL*f? diff --git a/Source/PipeSystem/PipeSystem/Comps/CompProperties/CompProperties_ResourceStorage.cs b/Source/PipeSystem/PipeSystem/Comps/CompProperties/CompProperties_ResourceStorage.cs index 2fae3d7e..85c12cdc 100644 --- a/Source/PipeSystem/PipeSystem/Comps/CompProperties/CompProperties_ResourceStorage.cs +++ b/Source/PipeSystem/PipeSystem/Comps/CompProperties/CompProperties_ResourceStorage.cs @@ -32,6 +32,7 @@ public class ExtractOptions public string labelKey; public string descKey; + public int extractTime = 150; public int extractAmount; public ThingDef thing; diff --git a/Source/PipeSystem/PipeSystem/Jobs/JobDriver_DrainFromMarkedStorage.cs b/Source/PipeSystem/PipeSystem/Jobs/JobDriver_DrainFromMarkedStorage.cs index 16b919d2..22024c2d 100644 --- a/Source/PipeSystem/PipeSystem/Jobs/JobDriver_DrainFromMarkedStorage.cs +++ b/Source/PipeSystem/PipeSystem/Jobs/JobDriver_DrainFromMarkedStorage.cs @@ -16,29 +16,35 @@ protected override IEnumerable MakeNewToils() this.FailOnDespawnedOrNull(TargetIndex.A); this.FailOn(() => Map.designationManager.DesignationOn(TargetThingA, PSDefOf.PS_Drain) == null); + ThingWithComps thingWithComps = (ThingWithComps)pawn.CurJob.targetA.Thing; + CompResourceStorage compRS = null; + + for (int i = 0; i < thingWithComps.AllComps.Count; i++) + { + if (thingWithComps.AllComps[i] is CompResourceStorage cps) + compRS = cps; + } + + this.FailOn(() => compRS == null); + yield return Toils_Goto.GotoThing(TargetIndex.A, PathEndMode.Touch); - yield return Toils_General.Wait(150).FailOnCannotTouch(TargetIndex.A, PathEndMode.Touch).FailOnDestroyedOrNull(TargetIndex.A).WithProgressBarToilDelay(TargetIndex.A); + yield return Toils_General.Wait(compRS.Props.extractOptions.extractTime).FailOnCannotTouch(TargetIndex.A, PathEndMode.Touch).FailOnDestroyedOrNull(TargetIndex.A).WithProgressBarToilDelay(TargetIndex.A); - Toil finalize = new Toil(); - finalize.initAction = delegate + Toil finalize = new Toil { - Pawn actor = finalize.actor; - ThingWithComps thingWithComps = (ThingWithComps)actor.CurJob.targetA.Thing; - for (int i = 0; i < thingWithComps.AllComps.Count; i++) + initAction = delegate { - if (thingWithComps.AllComps[i] is CompResourceStorage cPS && cPS.extractResourceAmount <= cPS.AmountStored) - { - cPS.DrawResource(cPS.extractResourceAmount); - - var opt = cPS.Props.extractOptions; - Thing createdThing = ThingMaker.MakeThing(opt.thing); - createdThing.stackCount = opt.extractAmount; - GenSpawn.Spawn(createdThing, pawn.Position, Map, WipeMode.VanishOrMoveAside); - } - } - Map.designationManager.DesignationOn(thingWithComps, PSDefOf.PS_Drain)?.Delete(); + compRS.DrawResource(compRS.extractResourceAmount); + + var opt = compRS.Props.extractOptions; + Thing createdThing = ThingMaker.MakeThing(opt.thing); + createdThing.stackCount = opt.extractAmount; + GenSpawn.Spawn(createdThing, pawn.Position, Map, WipeMode.VanishOrMoveAside); + + Map.designationManager.DesignationOn(thingWithComps, PSDefOf.PS_Drain)?.Delete(); + }, + defaultCompleteMode = ToilCompleteMode.Instant }; - finalize.defaultCompleteMode = ToilCompleteMode.Instant; yield return finalize; } }