From 0f24b38d71bff813241aa69e604537286dd18b42 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Mon, 21 Jul 2025 19:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=8C=E6=8B=89=E8=87=AA=E5=B7=B1=E6=89=BE?= =?UTF-8?q?=E5=90=83=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/Assemblies/WulaFallenEmpire.dll | Bin 56832 -> 57856 bytes 1.6/Defs/JobDefs/WULA_Jobs.xml | 2 +- .../ThingDefs_Misc/Weapons/WULA_Weapon.xml | 4 + .../ThingDefs_Races/Races_Wulaspecies.xml | 3 +- 1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml | 25 +++++ 1.6/Defs/WorkGivers/Wula_WorkGivers.xml | 1 + .../.vs/WulaFallenEmpire/v17/.suo | Bin 76800 -> 78848 bytes .../WulaFallenEmpire/v17/DocumentLayout.json | 50 ++++----- .../3516260226.code-workspace | 3 + ...roperties_AbilityEmergencyEnergyRestore.cs | 3 +- .../EmergencyAbilityPatches.cs | 8 +- .../JobGiverDefExtension_WulaGetEnergy.cs | 12 +++ .../JobGiver_WulaGetEnergy.cs | 98 ++++++++++++++++++ .../NeedDefExtension_Energy.cs | 2 + .../VerbPropertiesExplosiveBeam.cs | 3 +- .../Verb_ShootBeamExplosive.cs | 5 +- .../WulaFallenEmpire/WulaFallenEmpire.csproj | 2 + 17 files changed, 182 insertions(+), 39 deletions(-) create mode 100644 1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml create mode 100644 Source/WulaFallenEmpire/JobGiverDefExtension_WulaGetEnergy.cs create mode 100644 Source/WulaFallenEmpire/JobGiver_WulaGetEnergy.cs diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll index 99ba3dbfa3ef343c256f14b2a199fa3dddb7af85..5cc44fa7f9571fbbca692c32ffcdb9bade9e13f6 100644 GIT binary patch delta 19057 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 - WULA_IngestEnergy + WULA_IngestWulaEnergy WulaFallenEmpire.JobDriver_IngestWulaEnergy 正在摄取能量。 true diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index eb558176..f1448a90 100644 --- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -1777,6 +1777,8 @@ Mote_Wula_Dark_Matter_Beam GraserBeam_End + 0.75 + 0.6 0.6 @@ -1875,6 +1877,8 @@ Mote_Wula_Dark_Matter_Beam GraserBeam_End + 0.75 + 0.6 0.6 diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 7906ae27..21499553 100644 --- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -414,8 +414,7 @@ WULA_Fleshtype - Humanlike - HumanlikeConstant + WULA_Humanlike Humanlike diff --git a/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml b/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml new file mode 100644 index 00000000..2c2d26b7 --- /dev/null +++ b/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml @@ -0,0 +1,25 @@ + + + + WULA_Humanlike + + + +
  • + 0.3 + 0.1 + 5.0 + 9.5 +
  • + +
  • + Humanlike +
  • + +
  • + HumanlikeConstant +
  • +
    +
    +
    +
    diff --git a/1.6/Defs/WorkGivers/Wula_WorkGivers.xml b/1.6/Defs/WorkGivers/Wula_WorkGivers.xml index 1cf2fe0e..fd5b99b1 100644 --- a/1.6/Defs/WorkGivers/Wula_WorkGivers.xml +++ b/1.6/Defs/WorkGivers/Wula_WorkGivers.xml @@ -106,4 +106,5 @@ +
    diff --git a/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo b/Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo index aefcac3b448e236cea36353f92b14dd9a76ab1e9..9017a721243e5461e768628ee818c2d6c907935b 100644 GIT binary patch delta 3607 zcmeHJeN0nV6u;;7wG^ZXR6a!HL(4a4EBJxaS-u26GKv<^QH6@AM8v8sQ)Vnqmn_3M z>|u8QESth&Hl0e}G8RJ+!(vEgw*8}-m}UO47@eETqD|1K?A#}HEiOjQmi^;ve(#-k z?>WEoaqoG(Z9j@_*Ts$npzc{XQwU=hhZNcOu0R1}Y#;?&g(Vu6O7cX)C|y_)se{9k zS6Bvc7z@Nf*oI2w@r*4rZyVF$dJhS9zjp`8Erk7eS=p({tt{hCGH5_{(#k1SiJ(!@ zNEjiFAY!sQW^x2c69^v?A_*}B?jQ;))TJ6Fy-gwn5o+;M^|ujgNLowa0o2j65%&hC z!F%{w@Np#{dni?u9RpWb8S0JMpp_h9PJnpyP8@|O^oBbj6CDvw$dJ5rhahz1cA+Uj zjkZJ)La-n~tK_8!Cn+W=nj{`iEMYPsjv)IWKT}CYdqNTxCrlEv=tVk_UskidUZ}^GpRXnSIV2gQ%DjBOnQ*05M8Nv zAQHW)PKZE9np4FK*v;@>Ml0UQjK_}5^=LGUIFh*=CZHp$-4#}(0U#w_ZJ*z#fn72ueS)?-#&Ws?SSEBc~LHU`Cx2< zPbTt7c`tgF-T_x7t8Sy~LCd|kC; zv%Fc+zO0SdrIGSZQF}8dr-!jBdkmBn9?IT0LQ9Qk&cGq_*HD6cD;K%?jIOF*g3tX~ zvpJI*bQ4+|mtgoRliQXCNjN+;3C~wQ6!z!i`BlZJ7esku#jSpoHjMQ8>J!S%yj`oA zgEcWLTgmKnx3gl_z&5aQ!VFf=b}$}dY2orEyy!)2E89X}j!GJDU?rrpfu8kbRqMyI znKcq)6Em~z#MsE1NoPA+YqZWPF0pl_y^?JruB~KQNMlxFEnz!}xrxShkWCAX2KwiP z^Vyq-Wh-fOHalrIkj<0!KIX?fW;u~$A}S-3^<>Bss3p@aGSx=9H&Z&hXhaU0Z6tYx zOm8QL+evy%CUfa&aknKyqO*Xq;#oIRJly<63A6pGJf73P+T%RTc#fDUe>vugzgK>f zT*D?R39nfb%I zXMZ+!Wkuluj~ajKpWbCW3zDU^JIFI+QKNC-lvdC5EQj#u$0dd*2PWf{ffUJju0_x= z_6iFj_5%J-iTef@0>g8IizLhGZl!D3qIb}llOK9@4RhzrZOF}^le2D4ZeC8Fb)Ge6 zp21+qnQh2#n4Oz%)f?*blx!IH-aCZVSAUZ#ZdU=meX$hJK3Ik^mo}s2jERyx4X(bn z@p)GKJO@7-St7w7-v|>a4*9@HPFbVTM>zGliy;}$o`M%Fz|FGMXUjJrO)2Jp-xT6r5kkjITh-!!Vp6(YI%w(r zDjq^av~3M@hv{He??4hP2KTCDi0iFOfI1;y#t6rZI@)R3HKFbcsgT!eOo28yoCe)) g6Ya|IyI&|RMVfaHeje;e%{ivI;OP7;D*v#uk4h ziy8*+kiKYK6ov~5e@L%N;@r|^hAo>*TsAW2mSr(!*^gvq#Frs4bm!p^mN>U8p5%M) zyZ4@V&-b0Yd&57e!q-(@&w_Ed%*`3Q5_Z$EyWc{Eg2IXInsyMG#MJ-@SfTm|no+GD zESgFr5-pTKujzP|cwo+WKk+ug>-dej$B=fk=QwRyL=&@HYI4AkMiWT{Gob*V)LJuC z#8L=71Pft4L9SrMwc1q%4UN0tL7D5Bz2zDeFz$SAuyc<%Ph4!TgY3 zcG*9@q)-U@YVE@uYqBVzjl;?Ob}(Yl8Nz_mj-~=0ef886|681}$d7*Gu-ueI51N9K zI|MomdP0zllIH+7^bEEy-UqepZt5PnTm6r%1Kv-P=6Z)92FpTVN2x3^*Da(nsXW9z z)Wkh*R%_LaR$J{~t&!U<#{n82B%rCdmZkZyR7HJB+P62OcQJ{TG(A@7Ysa^hUq(zUF;I20j>2Hj~TY zNF&D1UdC&?ZFu#9UAPrS->nVUmElDXr^Wg4g=$dHiN@}h73hoKV*H2i05-H(@XKGn z!`ok(L4hz<9vy4rQe2*u-U^qu%3lf?|GFIOBI)ScX=0y#T&nLoFAD(o8ajOPHIrA$ zH#YLy7W1xU+e@~&ynHdSW!@6kQhw>yt;O4Tp7)fh6>RMv>j4k_z6u?8YnXNXXF$j0 zOgz`DWuxyO=76IM#!pI3eR23V?O`1cK$zGf@Zc@G069q9O5+eFp7|qb6 z!z)?oVs;*!z}|Z+v0=Pdp3VgM&J~q9D2wQzP;AnHZNz7XnEGNK#Gr3VBW5LoeZ;PT zVkO>e^@*JZXnn*tVQwVmgenk6^Wl(); + if (energyNeed == null) + { + return 0f; + } + + // 如果能量充足,则不需要寻找能量核心 + if (energyNeed.CurLevelPercentage > minEnergyLevelPercentage) + { + return 0f; + } + + // 如果能量非常低,给予高优先级 + if (energyNeed.CurLevelPercentage < emergencyThreshold) + { + return emergencyPriority; + } + + // 否则,给予中等优先级 + return normalPriority; + } + + protected override Job TryGiveJob(Pawn pawn) + { + Need_WulaEnergy energyNeed = pawn.needs.TryGetNeed(); + if (energyNeed == null || energyNeed.CurLevelPercentage > minEnergyLevelPercentage) + { + return null; + } + + // 寻找最佳能量核心 + Thing bestEnergySource = GenClosest.ClosestThingReachable( + pawn.Position, + pawn.Map, + ThingRequest.ForGroup(ThingRequestGroup.HaulableEver), // 扫描所有可搬运的物品 + PathEndMode.ClosestTouch, + TraverseParms.For(pawn, Danger.Deadly, TraverseMode.ByPawn, false), + 9999f, + (Thing t) => + { + // 检查物品是否是能量核心 + ThingDefExtension_EnergySource energySourceExt = t.def.GetModExtension(); + if (energySourceExt == null) + { + return false; + } + // 检查物品是否可摄取 + if (!t.IngestibleNow) + { + return false; + } + // 检查物品是否被禁止或无法预留 + if (t.IsForbidden(pawn) || !pawn.CanReserve(t, 1, -1, null, false)) + { + return false; + } + return true; + } + ); + + if (bestEnergySource != null) + { + // 创建摄取能量核心的Job + Job job = JobMaker.MakeJob(DefDatabase.GetNamed("WULA_IngestWulaEnergy"), bestEnergySource); + job.count = 1; // 每次摄取一个 + return job; + } + + return null; + } + } +} diff --git a/Source/WulaFallenEmpire/NeedDefExtension_Energy.cs b/Source/WulaFallenEmpire/NeedDefExtension_Energy.cs index 2f7f5bc5..b6895d4f 100644 --- a/Source/WulaFallenEmpire/NeedDefExtension_Energy.cs +++ b/Source/WulaFallenEmpire/NeedDefExtension_Energy.cs @@ -10,5 +10,7 @@ namespace WulaFallenEmpire public float maxLevel = 1.0f; // 运送能量的阈值 public float deliverEnergyThreshold = 0.5f; + // 自动摄取能量的阈值 + public float autoIngestThreshold = 0.5f; } } diff --git a/Source/WulaFallenEmpire/VerbPropertiesExplosiveBeam.cs b/Source/WulaFallenEmpire/VerbPropertiesExplosiveBeam.cs index cd033e97..0cbbc66f 100644 --- a/Source/WulaFallenEmpire/VerbPropertiesExplosiveBeam.cs +++ b/Source/WulaFallenEmpire/VerbPropertiesExplosiveBeam.cs @@ -39,6 +39,7 @@ namespace WulaFallenEmpire public bool applyDamageToExplosionCellsNeighbors = true; public float chanceToStartFire = 0f; public bool damageFalloff = true; + public float screenShakeFactor = 0f; // 新增:屏幕震动因子 public VerbPropertiesExplosiveBeam() { @@ -46,4 +47,4 @@ namespace WulaFallenEmpire verbClass = typeof(Verb_ShootBeamExplosive); } } -} \ No newline at end of file +} diff --git a/Source/WulaFallenEmpire/Verb_ShootBeamExplosive.cs b/Source/WulaFallenEmpire/Verb_ShootBeamExplosive.cs index a10a9812..b75e18a3 100644 --- a/Source/WulaFallenEmpire/Verb_ShootBeamExplosive.cs +++ b/Source/WulaFallenEmpire/Verb_ShootBeamExplosive.cs @@ -71,7 +71,8 @@ namespace WulaFallenEmpire doVisualEffects: true, propagationSpeed: 0.6f, excludeRadius: 0f, - doSoundEffects: false // 我们手动处理音效 + doSoundEffects: false, // 我们手动处理音效 + screenShakeFactor: explosiveProps.screenShakeFactor // 新增:屏幕震动因子 ); // 生成额外的视觉效果 @@ -89,4 +90,4 @@ namespace WulaFallenEmpire Scribe_Values.Look(ref explosionShotCounter, "explosionShotCounter", 0); } } -} \ No newline at end of file +} diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index df0101bf..847349bc 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -86,6 +86,8 @@ + +