From 21b9ec45f68b0fc7a5ae931fc27238805069317c Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Thu, 24 Jul 2025 12:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=8C=BB=E7=94=9F=E6=8A=A2=E5=96=82?= =?UTF-8?q?=E9=A3=9F=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/Assemblies/WulaFallenEmpire.dll | Bin 57344 -> 57344 bytes .../.vs/WulaFallenEmpire/v17/.suo | Bin 107008 -> 107008 bytes .../WulaFallenEmpire/v17/DocumentLayout.json | 2 +- .../CompApparelInterceptor.cs | 11 ++-- .../WorkGiver_FeedWulaPatient.cs | 2 +- .../WorkGiver_Warden_DeliverEnergy.cs | 2 +- .../WorkGiver_Warden_FeedWula.cs | 56 +++++++++++------- 7 files changed, 44 insertions(+), 29 deletions(-) diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll index 83cc57b4651411f20134026a74fb51fc6199b4d4..496d2b40def058375fc85a6bc793754bb7d9da6e 100644 GIT binary patch delta 18506 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 diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo index fb8809b8cdc310d3c26f38bc95d1ff8cbb5ad9e9..688a4b7c299c32f9b8e0981595b699ac7f0ad2dd 100644 GIT binary patch delta 1112 zcma)&ZD>7_-#+MP#sn(hth!%X4)M2Y&FtkN*c+p%SnA_@*X1Z+xez=3o&PDCBJ zw(m0fdQv>fu=)t4>B|7>w+F>wXA__&{eK&MfJxY#YI*x>;X9ei<(C=St5u=$KY$N1 zRBw!lF})I~84{s$aq>(CL||wb^aNvgXjm1F(MKkJNy5?2ixf2*eOG044BM$z#6-#k znCYT8>C9_CSNCd4=@6lx<7V`v4q)Nc@p4Q3odhh8#Y`EC5jm@?7sENs=ZLVMH)7 zO2balL5z?dLDEEo5L1Z?;&mdFuo2;eSXWMR7O{zlCOpJkLc~iNm-k4YL;6cZ<$pf@ zxoiUKMlw=}R|ydeztJbcR=lC#qCXrOn_I{?8dQj#N3$ZtG?FAnQ%S}WW+I5N(t*Mo z%4Kk3mT|c$nOtI-5%(D9hQyCs2_y~tyfIBTP5jaXV*i9Lqy;aV!}V73P9iNr7G=Oy z=J?==MKgt?)*OTVW-A^um*6@}a6`EjotAT2B-5-+b1==$v^b_MVU6(>kb<5#FQqmV z=QUK*=8hz+oK=bYN@YDGQ^I>8Pa4H7=!DVxmjn9@w*3`R0Lkc?de#KumJAQfp;92@ zX4|*e9hQN<@Crj5O}@tP_T<~(z@h10!w2MO4#&!f0+S@pZG2$2C4-Daf(9Qg0@j!~ z2;n%C=mi^klDvA6N*f=JSOO*xWdyP((gGuTrtE68#`E|&#S90X(OB;+gAg2YdQr)j z`R3$8ol%s0tW4vF!9mwKdHMrkEQ`okNYKF1$2?$0&wMYKaA^KA)7Z6&&bj}iGtrag z)r%4o@?m$7+__*7ETSr+UuocImIw6c$@YSbL)q0(g>U2>;_>O1f*SLE!Bw5V61)Rh_+bPikTM5x)y)}Y9JjF)pZM@xzm;d*zI;>MR+aDKuCCD zl4t@kKBQ1B#7DR>;Sh{8to}t?$#$nhz&iY?epOCLP2DG^&V=NTL(cdI-Ub&mtd8L^ zPxqNrTN;$|(vp49Ie#%2MJQ3MiIZZ*+FIP6>Ef=^9%yuRneqxJ$tdx9s zEtMs^oAM2H^TC&c9ojmE-_>luzN7Q-2VXQlz9Sp7Du(gZYp^w7#$I0}K38`Pm0baK zQ#xIJ>1rd7+BN_jBLtYfbV)fw12HzbIVU69`3Hs)IZBT?6d^!}^0( zZtb`Zv!lJpsRIcx zrzishMT+Xn1x3AykgATn1yQ{4>X9&HCC_7PzX5;NqA}2K$EJQK0LC&qb{sU~PyI7d zxsrk@S8V%zR{-07O~T&>BG5OG<%a^u1JnKHKKKSws%KT`nn)+9d1F6RNTh67j&D zXQ_OQzCP^kBRZ4xy&9VUdFlooELE3J29x^d6u7L;*1=QSX{I(fAjALV3fOBI^Ml1- zJOvI%?XH4MwR0zw+^;x9`e8ea26Z)o4OH7!IH?}5180{4>u3Ad&wwU-dlkLjsr~Em z;xjh&t9R+|r}jmMzgdNqy7nEw_{a?-^WSWNKLAhulj*;^7tR94we9rpY=q5W{{psc BbR+-( diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json index 49f5745a..94916b87 100644 --- a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json +++ b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json @@ -90,7 +90,7 @@ "RelativeDocumentMoniker": "CompApparelInterceptor.cs", "ToolTip": "C:\\Steam\\steamapps\\common\\RimWorld\\Mods\\3516260226\\Source\\WulaFallenEmpire\\CompApparelInterceptor.cs", "RelativeToolTip": "CompApparelInterceptor.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAFMBAAAMAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAFQBAAAMAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-23T10:03:31.989Z", "EditorCaption": "" diff --git a/Source/WulaFallenEmpire/CompApparelInterceptor.cs b/Source/WulaFallenEmpire/CompApparelInterceptor.cs index c4395323..21a9222b 100644 --- a/Source/WulaFallenEmpire/CompApparelInterceptor.cs +++ b/Source/WulaFallenEmpire/CompApparelInterceptor.cs @@ -52,7 +52,7 @@ namespace WulaFallenEmpire [StaticConstructorOnStartup] public class CompApparelInterceptor : ThingComp { - // ״̬ + // 状态变量 private int lastInterceptTicks = -999999; private int startedChargingTick = -1; private bool shutDown; @@ -62,17 +62,17 @@ namespace WulaFallenEmpire private int ticksToReset; private int activatedTick = -999999; - // ӾЧ + // 视觉效果变量 private float lastInterceptAngle; private bool drawInterceptCone; - // ̬Դ + // 静态资源 private static readonly Material ForceFieldMat = MaterialPool.MatFrom("Other/ForceField", ShaderDatabase.MoteGlow); private static readonly Material ForceFieldConeMat = MaterialPool.MatFrom("Other/ForceFieldCone", ShaderDatabase.MoteGlow); private static readonly MaterialPropertyBlock MatPropertyBlock = new MaterialPropertyBlock(); private static readonly Color InactiveColor = new Color(0.2f, 0.2f, 0.2f); - // + // 属性 public CompProperties_ApparelInterceptor Props => (CompProperties_ApparelInterceptor)props; private Pawn PawnOwner => (parent as Apparel)?.Wearer; @@ -320,6 +320,7 @@ namespace WulaFallenEmpire } } + [StaticConstructorOnStartup] public class Gizmo_EnergyShieldStatus : Gizmo { public CompApparelInterceptor shield; @@ -355,4 +356,4 @@ namespace WulaFallenEmpire return new GizmoResult(GizmoState.Clear); } } -} \ No newline at end of file +} diff --git a/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs b/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs index d7cf0668..d764eafe 100644 --- a/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs +++ b/Source/WulaFallenEmpire/WorkGiver_FeedWulaPatient.cs @@ -45,7 +45,7 @@ namespace WulaFallenEmpire return false; } - if (!pawn.CanReserve(patient, 1, -1, null, forced)) + if (!pawn.CanReserveAndReach(patient, PathEndMode.Touch, Danger.Deadly, 1, -1, null, forced)) { return false; } diff --git a/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs b/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs index 1fe1bb8e..fd15a043 100644 --- a/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs +++ b/Source/WulaFallenEmpire/WorkGiver_Warden_DeliverEnergy.cs @@ -51,7 +51,7 @@ namespace WulaFallenEmpire return false; } - if (!pawn.CanReserve(prisoner, 1, -1, null, forced)) + if (!pawn.CanReserveAndReach(prisoner, PathEndMode.Touch, Danger.Deadly, 1, -1, null, forced)) { return false; } diff --git a/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs b/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs index dc069ff3..94985d34 100644 --- a/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs +++ b/Source/WulaFallenEmpire/WorkGiver_Warden_FeedWula.cs @@ -5,41 +5,55 @@ using System.Linq; namespace WulaFallenEmpire { - public class WorkGiver_Warden_FeedWula : WorkGiver_Warden + public class WorkGiver_Warden_FeedWula : WorkGiver_Scanner { - public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false) + public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForGroup(ThingRequestGroup.Pawn); + + public override PathEndMode PathEndMode => PathEndMode.ClosestTouch; + + public override Danger MaxPathDanger(Pawn pawn) => Danger.Deadly; + + public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false) { - if (!(t is Pawn prisoner) || !ShouldFeed(pawn, prisoner)) - { - return null; - } + if (!(t is Pawn prisoner) || pawn == prisoner) + return false; + + if (!ShouldFeed(pawn, prisoner)) + return false; Need_WulaEnergy energyNeed = prisoner.needs.TryGetNeed(); var extension = def.GetModExtension(); if (energyNeed == null || energyNeed.CurLevelPercentage >= extension.feedThreshold) - { - return null; - } + return false; if (prisoner.health.hediffSet.HasHediff(DefDatabase.GetNamed("WULA_ChargingHediff"))) - { - return null; - } + return false; - // 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 false; + + if (!pawn.CanReserveAndReach(prisoner, PathEndMode.Touch, Danger.Deadly, 1, -1, null, forced)) + return false; + + if (!TryFindBestEnergySourceFor(pawn, prisoner, out _, out _)) { - return null; + JobFailReason.Is("NoWulaEnergyToFeed".Translate(prisoner.LabelShort, prisoner)); + return false; } - if (!TryFindBestEnergySourceFor(pawn, prisoner, out Thing energySource, out _)) - { - return null; - } + return true; + } - Job job = JobMaker.MakeJob(DefDatabase.GetNamed("WULA_FeedWulaPatient"), energySource, prisoner); - job.count = 1; - return job; + public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false) + { + Pawn prisoner = (Pawn)t; + if (TryFindBestEnergySourceFor(pawn, prisoner, out Thing energySource, out _)) + { + Job job = JobMaker.MakeJob(DefDatabase.GetNamed("WULA_FeedWulaPatient"), energySource, prisoner); + job.count = 1; + return job; + } + return null; } private bool ShouldFeed(Pawn warden, Pawn prisoner)