From 250844ab004ed9ce341b19c7e8f34b7a8ab2aabe Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 10 Sep 2025 14:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=983?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/1.6/Assemblies/ArachnaeSwarm.dll | Bin 190464 -> 190464 bytes .../Hediff_ConfigurableMutant.cs | 4 ++-- .../Hediff_NecroticVirus_Configurable.cs | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index 95065abd74c863263beadf6c8088e1e9bfb3b1fd..8d1c09f82fdeade835dc711eb94a324c42284063 100644 GIT binary patch delta 4664 zcmY+I4RDmz6^8G-*=#l;{KP_GhA2d%fFj0(?5AlIXhDfafdnPVE4(Tik)(w-WK4+4wqsbO{c108>(123;zotw&in z#MI;cC^Iv~!beQoCiGX4*3ZZi>QrYpH~8+u zm|W80s(9>1-)xlHf_H};-;Xi&HY55cw)*CwcnZ^mxc?SU305$fO-nF(DqDE(ui5V_ zLAD`Itpv9+#k^gm2eg(ak(UZ{R0*1xdX#&TM^oQao3`muq0zH4N-%Mnp<8b7sE06D zXkIZi^-m`)raqaHqaH@_oouhJ6hhO%8AkiG(4$IGdY7RO3cvN1;{7~ByUIQ45lp_D zs7Ia6K6bmNeApVdsXHTweG70Q--z|vej)xL)R9Frrod<_Yh=bkl+QG@;Rha7h9;qN zOjm^Zg1<>AL#9rU4Bslu)O1m3-$+`w!3U-NO-swLS0hz8m_p(Kp|(`o<_ObJ~;Ni%e>>>%R4tqmOBudaT}_u^7+&$gF#*xG3W>v4}uL!;OQ*Dn5 zV6hRc^8E3cacqK3|Avh#EjJMb5`RNlj+48oM$qV5W@RH)Qb>) zUS@i6@tInLaM%#{B7|2(qh5sYx@do|xY-I}d^x{=32uG}lgfva31KReqxQQ~#)c4P zG8L{xQ&Qww?2yRGm~O2_T&N$a;7J@18lhCdQ}|`lx_bOtlYajk)vlXSkDerP9nQ(Z zEvW_8I$TK78Za=Vr4?8WxGZ$eU0^*8@8Y2%pq@c4lj&L*K_Ti|80#L>k+xj3VYCve z1iuGi>@~zq45LdlYGN3NM5Fg0jQ66hNq+vvzW|SHXA{U4(;z>%5sVd)u80Vh2vLJ0Sk7eZBiJY!*+;Qii0q@7yNoUP9f_jU5SJT8xoDeg zU2hZt5$TGE;(!ntMsbA6oM;p$n9Mh96t6SULy}t<#UF%Pyt#!N@n@m&8M%d<@UhTQ z6j__`nb4nHc5dMod@1;-C%5pY_)h4ocaCKvWjR%044aU79Zg^|A26EGbe*G9_RY9lGi=|CajRJ44&Dbp(**iA&2vYS97StL;dR81PF~o)rmWf7&4(ddsnQ?GThzuQ^U@|k~;0-2o zgbvOyIclbwuh-eVNugWOpA@JVQs_1OvYk6 z7K`>!`pFx&qc%xv!8*}G?lo2mcG^Rj)?n>GztBDD5$k90t~Q3-GHmNP%x5wdJF!T# z)B1JTiB(BjE9yo2+Wmb_E4EzIpmt#&lewJw>(S~->=v8aO1tB_$HViPCqiDkeYsq1V%GR2n|M=(DHuza|)NLu-^fpg3 znW1S%JCn&fj`Kp4b{sRG8csWoMNHNM&1F9Dj_IF3mu`@fdjTQQLVDc` zXkuDw8vG(&WHb%#!a*Twa2KKtlv*M^Z~e7H{0 z|GGTp)XaC!KG@wbck63w7Jf1N^JU$|2VE6&M!qBexuf@1pFjUn!Zi`S&;K^zn$tb% VQ`i4eT$g8cXMOIvgm_-s{{fg5FXI3J delta 4652 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 O&)82~Um`wj#Qy=NWh}t} diff --git a/Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs b/Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs index d41a322..5cb0165 100644 --- a/Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs +++ b/Source/ArachnaeSwarm/Hediff_ConfigurableMutant.cs @@ -230,8 +230,8 @@ namespace ArachnaeSwarm } pawn.timesRaisedAsShambler++; MutantUtility.RestoreUntilNotDowned(pawn); - - if (pawn.Spawned && stun) + + if (pawn.Spawned && stun) { pawn.Rotation = Rot4.South; if(compProps != null) diff --git a/Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs b/Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs index c8c151b..d5970cf 100644 --- a/Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs +++ b/Source/ArachnaeSwarm/Hediff_NecroticVirus_Configurable.cs @@ -64,6 +64,9 @@ namespace ArachnaeSwarm // **调用我们自己的工具方法,传入从XML获取的mutantDef** NecroticTransformationUtility.ResurrectAsCustomMutant(pawn, comp.Props.mutantDef, faction); + // **关键修复:在成功转化后,立即移除导致转化的Hediff本身,防止其残留** + pawn.health.RemoveHediff(this); + // 添加转化特效 FleckMaker.ThrowSmoke(position.ToVector3Shifted(), map, 1.5f); FleckMaker.ThrowDustPuff(position.ToVector3Shifted(), map, 1.2f);