From 0dcebba34338cf2db49733b7fc83a6c4acf811c9 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Tue, 22 Jul 2025 19:31:18 +0800 Subject: [PATCH] =?UTF-8?q?hediff=E8=83=BD=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/Assemblies/WulaFallenEmpire.dll | Bin 41984 -> 42496 bytes 1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml | 4 +-- .../.vs/WulaFallenEmpire/v17/.suo | Bin 90624 -> 90624 bytes .../JobDriver_FeedWulaPatient.cs | 3 ++- .../WorkGiver_FeedWulaPatient.cs | 10 +++----- .../WorkGiver_Warden_DeliverEnergy.cs | 24 +++++++++++++++++- .../WorkGiver_Warden_FeedWula.cs | 6 +++++ .../WulaFallenEmpire/WulaFallenEmpire.csproj | 1 - 8 files changed, 36 insertions(+), 12 deletions(-) diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll index 5fdb18bb007a7b73893771eb55914205e4d62b75..08ded61b322dd2a34f179928fe5dc82ab3fa2bb8 100644 GIT binary patch delta 16416 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 G&i?}i3%E)E diff --git a/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml b/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml index 248dfafd..381947bd 100644 --- a/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml +++ b/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml @@ -185,8 +185,10 @@
  • + true 0.3 0.9 + 9.5
  • @@ -275,8 +277,6 @@
  • true - 30 - 1 0.3 0.9 9.5 diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo index 555d3d8c576b0ecbaa52b826b6a0ad31212f9010..f4e6a58615a29d775caee2b14ff9af6176c6f170 100644 GIT binary patch delta 1333 zcmaKqe@t6d6vun+d#}7AwOwI_3Bnt6=&&ON7sVzLWQ0sdmO@NT7DcuUGFgQV+HLX& zc4{^v3(_8>bK=~t+L*8y=q1It#o$2x*pTQljlnM4A6sIGG5yQ3Eg4Db+woNu+6Or{(nmng=qa^XQc zxk93ZSU1+atRZz%+(~>)d`g%Jg-{7S?J((9!&j0f4F3S>d142F6LJY`i?;4TS(&h| zZKxiMw&vrUB3nb0mW`jKAPnGL<&-5Of4@m@;&Bl+BPbrqx)J@ z@hX0!UTb>ANYT@}$p?(R-f<84UZT&4={Y0h!^Zw7=`lj2EoZFong|yTs~EAXLTw31 z<}y0D?8SlYC%Goa+`Dncr@7vz-~{mjagO+qs3txl^z!-=r`;jom5e(WMqDo8s!r$d zI+@oqUcizE?l6nvMa!?h(})k@bnscUclqLWKWMnJOT)#Nyh&#WpdZ6e569cep#wX* z4zkRXVzJ8$@hg5PidVNlquAG+0N%j(bBs4Ke527LJcqsoUdnhI<1Q9`UK5)CHY6Vn zfq5sr&S+&HdH9wl%?6JzAxCG_UvL=jO=T!^-osawc=LWt8o z>aKa!pkAyCvx<6X4+^H}Q#6SCc6}!vmoq z98Kopm&b2l{Y=rn#WKh2dHgfRQ!@H!Al|VO3|tC|#St&)0pT5UF?2H(&!3P*_t;qp z8z%FFeW95lo36yUaaFuE9)WDsjLCif3&7n|ILH?Be*$5Qx=O8btaM z)r^FXqJ6$dj9lph)PkjGAE*-zvnT&M_T%-XDiK+VF^PIZXv!DYFINNB-d#r5eA>9v zErynsf!|=zi5K47j15gP2A8??f~gmu`Jq^>tW*MDH6!b47wx}riKk_rW*B|BFg|I6 zRRMpjGyXG6Fkt*QGr9P8HmI1bFvCqLnE_eA+Bzgu$W1tbVNGUNyu${2W=Ha%Pf0o9 zwt|jYXZ-JSN+ I8)mlr10dY_&;S4c delta 1272 zcmaixT}&KR6vy}6ote(!?sna!u(r4iux%*fcEw5>Ot7R|Qe|rv((piPvnIr^Rz*6C zifti%&;$zY?x79}w)J91v(co^ZN&7U!3`4agF$0_K#WMR)ubg&A8KOy;Tb!Pyr`4> z@;~R?^L6j^Ps{z&^05@G`LuN%^Q1f{FaGi8k5C~pY!F}_f)w)I>vFkP5k*89R!F6t zA+l~eU#Vk99KA{LTCz)s4~UPPxI!vBw(2M+)d|z_?{U;_jpI@oXxY{ll;m;W-W4ZZ z+13zF$x_8FX9Zg_l+Z)Gz9Ml9f0f_z#K(3&Yu_m@G75sckrHlZpDxE*HPE-7oS;*2 zzoQR0diN3r`R@~6CvHzGckC+Cv6_eyb`Qm6xc!XiU78TJa=E2f*xAG9RxidVM zjz3}#9j3@p;uwL1JSO@xU`;vM2X+EzVHhMgpiq-mozT8CwKX+mpX0KSFs z4wl=xj({lR7W>(AjUeUD=xkun19pyAw34QHAf_#S3Gvn2gz*4|sJd5f6Y_xUQ= zfK7S`H$Sx&FYBsN_b`OfpHXwVgb97E7}q;jTc`4}(N+ycy5&UMj9}Gsk!i9r}MD>NkfK6LN zBD8cx=GPgX8Q%3z!NS+ee3^2UvjCESi?`kUx@0OK8Bhd6V(99AH~w;Eo00ZG%j9qo zbc6A&52{4fji2163hHOYu;9VEgl5)*YKB2FYrt!!fEnPYik31M0qpvH4W=)9DaC6P W+97QCD?yozG{Yj8F;L7Tl>7xiIQcmM diff --git a/Source/WulaFallenEmpire/JobDriver_FeedWulaPatient.cs b/Source/WulaFallenEmpire/JobDriver_FeedWulaPatient.cs index 03143dfd..07e5d124 100644 --- a/Source/WulaFallenEmpire/JobDriver_FeedWulaPatient.cs +++ b/Source/WulaFallenEmpire/JobDriver_FeedWulaPatient.cs @@ -29,7 +29,8 @@ namespace WulaFallenEmpire protected override IEnumerable MakeNewToils() { this.FailOnDespawnedNullOrForbidden(PatientInd); - this.FailOn(() => !FeedPatientUtility.ShouldBeFed(Patient)); + // The job should fail if the patient is no longer in bed. + this.FailOn(() => !Patient.InBed()); if (pawn.inventory != null && pawn.inventory.Contains(Food)) { diff --git a/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs b/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs index bdadd0db..d7cf0668 100644 --- a/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs +++ b/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs @@ -16,7 +16,7 @@ namespace WulaFallenEmpire public override IEnumerable PotentialWorkThingsGlobal(Pawn pawn) { - return pawn.Map.mapPawns.AllPawns.Where(p => p.needs.TryGetNeed() != null && FeedPatientUtility.ShouldBeFed(p)); + return pawn.Map.mapPawns.AllPawns.Where(p => p.needs.TryGetNeed() != null && p.InBed()); } public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false) @@ -39,12 +39,8 @@ namespace WulaFallenEmpire return false; } - if (!FeedPatientUtility.ShouldBeFed(patient)) - { - return false; - } - - if (WardenFeedUtility.ShouldBeFed(patient)) + // A Wula patient should be fed if they are in bed. If the job is not forced, they must also be unable to move. + if (!patient.InBed() || (!forced && patient.health.capacities.CapableOf(PawnCapacityDefOf.Moving))) { return false; } diff --git a/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs b/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs index ceac6c22..b64dd690 100644 --- a/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs +++ b/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs @@ -19,6 +19,11 @@ namespace WulaFallenEmpire return null; } + if (EnergyAvailableInRoomTo(prisoner)) + { + return null; + } + if (!TryFindBestEnergySourceFor(pawn, prisoner, out Thing energySource, out _)) { return null; @@ -26,10 +31,27 @@ namespace WulaFallenEmpire Job job = JobMaker.MakeJob(JobDefOf.DeliverFood, energySource, prisoner); job.count = 1; - job.targetC = RCellFinder.SpotToChewStandingNear(prisoner, energySource); return job; } + private bool EnergyAvailableInRoomTo(Pawn prisoner) + { + if (prisoner.GetRoom() == null) + { + return false; + } + + var allThings = prisoner.GetRoom().ContainedAndAdjacentThings; + foreach (Thing thing in allThings) + { + if (thing.def.GetModExtension() != null) + { + return true; + } + } + return false; + } + private bool TryFindBestEnergySourceFor(Pawn getter, Pawn eater, out Thing energySource, out ThingDef energyDef) { energySource = null; diff --git a/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs b/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs index c5f0caad..dc069ff3 100644 --- a/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs +++ b/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs @@ -26,6 +26,12 @@ namespace WulaFallenEmpire return null; } + // The prisoner must be in bed to be fed by a warden. If the job is not forced, they must also be unable to move. + if (!prisoner.InBed() || (!forced && prisoner.health.capacities.CapableOf(PawnCapacityDefOf.Moving))) + { + return null; + } + if (!TryFindBestEnergySourceFor(pawn, prisoner, out Thing energySource, out _)) { return null; diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index 7f3f35ce..21f71995 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -81,7 +81,6 @@ -