From 100e69f1dc0751a97e2398e6acc8ee129e0dded8 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Mon, 1 Sep 2025 12:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.6/1.6/Assemblies/ArachnaeSwarm.dll          | Bin 10752 -> 12288 bytes
 .../Thing_building/ARA_InteractiveEggSac.xml  |   1 +
 Source/ArachnaeSwarm/CompSpawnPawnFromList.cs |  62 ++++++++++++++----
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index fec69070680a3b7425876f6c0b9c6c4f5d7a20e8..9311a0078a39b928efa277a1d4fe1983d4163e50 100644
GIT binary patch
delta 4771
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

delta 3385
zcmZWr4R93I9sj?#yKnb4mxJBpF5hsM&m{@@D5V4lX=-Ey${_M3j0LH{FhOZTP*Fm-
zyQ&l@wz=6V6_Ej3S}A1;lY*opG^v#8R2)E=T4%su>kLk(EvR+SGO@q+?g(ff+;9Ki
zU;E$PB$g)@^lmNnUf!~wGG~ZNqgkwhs1yQ`7XGU>^{Yjp-K|7-OTluY<2)712_}ew
z;1jJx#eR&}`b$`q{Yexe`78Cevl>?JA7fR_^DnW|g0rm<<IKR1lR?EE(aL-x<~Mqi
z{JH!v`?k-t32i0BdACKRd$z2BhkHygJhw;6sG4#bCQ&_;F~}i}cNY=a9mRlrmkoyv
zq9W6ORrBI}IE)U8EcgEjZ8(gWMS)zL2#&nw%9d$NuB#7+k*UbhZ&5G_M<VM>ki;7U
zutg^ASTGqf3NqrwfR)@s;<)Gr>bV}`+Bt?})V9!V#VVV$iB|@ThbLhYw}r~}%B7!h
zgy^UMg??pJ(TxW69MdstM`glAIx3Z3PR67=(S#-^<5!4S9AoM<^CEe95w8kH9!72l
zYXaOGrwFpDk0EZg^yi!8n7hzpXE@@)u?8YJ@~){6d6;$$Rkz%{8{T;7Q@w_Jb;?=m
z3BZ(l_27E4Kq4j;_5D!<Sc@D$?bx%jK`$3H?+(F0O{W8^W=DpxDUqO6TTi@eDU#i0
z;5GU|tAl;b-(-zr_5Lrc=J6_F^*nU%%9Py>&_ki(OXcK9omcOV3Jiz|NYe3j|3Y9o
zo9GwWEpxsBL67u9LhL>g7J^Zcx>2U>HA$E(VG1Cv9u`<uu^!W~3p3l2o0}I|-|YX=
zu4dEx^Y(+Nvn8trb*{-;Hf=X*D%(tCVKQ@Z|H|e++|~ZQ)$1`BT8#1ra4lOnpYk!2
z(UQJv;Y@k=<cykqBUr^|_~V0lh&(;m7+<U7mf#55s{LFDdP!ln_5(4BPRYffZ)#<_
zpm({{zM{oJzhp}M50C3My(RW@LETivY&xw;`ccRQ#Z;VGN`6Dh7bB*ibIR9NHhYa(
zaZ}J*7zr9?vrL;78T+|SXLN~$ppl+rnkoDpXyZ!zF_YStS*KA?%T$RGRZ6##Z&x;5
zrnD(hagOU<DDFT&N&<ElaxGRd4anm*y{k#}Ohe)oRBF>zCF$l;GK8RlUQ`b4=oNuT
z;yjh6RpFnN%?2S0%|lr>J!?pOTNQK=aRjyLQv1G&a8=E$z`~s3bWte^RHYS`3|*;e
zp9YDbLrOc<mh?&#5u!htYhd$+`3@c{qW2^a!#`r9=`}9Qk`b;Gw?J|nztQyjz)pP}
zXiafL;Fgj}{*$4)_<nr{!tWA427VflIM$YuMq{U>*)q7yf(@et%LAU^lHMI?0xo5e
z&e3<lGNkZ^*aJxuy$I~3CdgCp5_CfxfaIp{A<${x>^a5}s4azQqb52E_46>E8<qWS
z$xmW+7%ds$WXJ6zoYbWhcbZaud{j|9X%2FYPG)3F&C}p6C@x83jdNV58yVdaEUQ5a
zVuX{VFmwj>s(1Ejx<YT_)(vI2FYqv+NxW5WRwQW52*;pnR@`N_J&uM<+LU3*j)8jv
zFJ77A`!F==L&aSVd|<uFOuCll*cChuCSA|y)&&~C5nj_om)Wn4zi^Z8&T!454Z3?3
zmmZHv%N6$oMevb;@{tiG1J|2z+%9KLXEU5E&7xks#BY{n(Lu#s4par+;}-R$IaQiP
zzsu-kX%?Nz=&l-nhh>hJE)=EJLMhiWN56&HhNM$+Q!{u1FMn)=-{#cBlY-&nB5!j6
z(57*~(bT9UGl5}R2P~p(O7a}NfHwBwl^Mey3%!9F(559Ny(lb~?h{k!2(XQcm9|_-
zCM(~26t<Jc7tuYm$6N+X#mxt(pMGdQL;<$N=p=`Ihd&C5+>U;lVC|t8`>p;nYGg@q
zing);>MK}`4d@R7=NRkQKGtSzVC^*C-o}owS6GS-vcqgAyG9@D2VqlTA7SU%E_Rar
zmGzsiv3|8%{UmqlGJ8OepJyN9@;(%D1}TNt*d6RDf^N}=;Wl9E{4=B%^g5l_^7w2j
zF-w8>36C#OT{6B}Z{h)-ZB6A4@8fsy0?@O0j3>o>K8To0U@2!-MJ_e!b(BS4@H)yN
zE3Va15mf=ps6lJPH+c|f16L?|MTVY0ww|D=v{Bou<a?<NHm@pr2=dd~-xRGe8DW4)
z?U2G&F6re86AJe#98kD2igbfotHQks2NVt|BwcEw3OCYbI?g^}*O|>n@y&Q#<)g>3
zaacBb%KRs`YKrv{@TB!A@G<N24DH*w8{-G)Fdd^4RKy!OTKUS^i5N1>&GQ5gVPWN(
z3VOc0@~*UeIac|rXF8I|&!vuM%|I~*-Ak9)68eYor{<Ow_uqeK`}#f>ZfE|Jk?Va=
z=e@<U7JPU0>QyV%7u?@a@R-jEf8_5foY(hJ;cs+*OX=X~*2wIi7XKtX{n_>%wfj07
z-}V=mEv-yy!krk1vamaih1_p}8;6SA#5OHTmS!?O*0kJJ{>8HVko!2-g`0TVh(iC2
zUtC@uf5u6?5O&&`vzE&fRH&$+yDAuV6Z@FEYUDDFxrzNUk-Wew_+@a`g+gxPfSWiZ
zBZS@Yusf2uxQU}~qCd?X4LXSv2s+3glHx{Hz$0mdqh;aUhO|!NIaKN-URU*=aY%O)
zDg1}TO`LHO7fk#W?@n|l;;t9F6LX+{9DTWoi%_d7R~b=;KmzC_KJZ&BA{wURFRYj#
z4C0|svA?xq%mOP)VW)@XkdPO*k&6&MB2Ll>1&BMz><~x@aLG2JoE7JnM{SHc={U)7
z*i9C|v;<|zX$``@guBU@|5?Rk!;}I0nksiN{|{BJd#d%;o?Mc2G!={Rv#ou@RWn#$
TsQPn_Uv21f>i*4A4d(v<D^p2w

diff --git a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
index dba23de..d9ba36b 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
@@ -15,6 +15,7 @@
     <passability>PassThroughOnly</passability>
     <fillPercent>0.3</fillPercent>
     <rotatable>false</rotatable>
+    <tickerType>Normal</tickerType>
     <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
     <statBases>
         <MaxHitPoints>20</MaxHitPoints>
diff --git a/Source/ArachnaeSwarm/CompSpawnPawnFromList.cs b/Source/ArachnaeSwarm/CompSpawnPawnFromList.cs
index ccdeb3c..d12c483 100644
--- a/Source/ArachnaeSwarm/CompSpawnPawnFromList.cs
+++ b/Source/ArachnaeSwarm/CompSpawnPawnFromList.cs
@@ -48,25 +48,65 @@ namespace ArachnaeSwarm
             if (spawnUntilTick > 0 && Find.TickManager.TicksGame >= spawnUntilTick)
             {
                 SpawnPawn(spawningPawnKind);
-                spawnUntilTick = -1;
-                spawningPawnKind = null;
             }
         }
 
         private void SpawnPawn(PawnKindDef pawnKind)
         {
-            Pawn pawn = PawnGenerator.GeneratePawn(new PawnGenerationRequest(pawnKind, parent.Faction));
-            GenSpawn.Spawn(pawn, parent.Position, parent.Map);
-
-            if (Props.lordJob != null)
+            try
             {
-                Lord lord = LordMaker.MakeNewLord(parent.Faction, (LordJob)System.Activator.CreateInstance(Props.lordJob), parent.Map);
-                lord.AddPawn(pawn);
+                if (pawnKind == null)
+                {
+                    Log.Warning("CompSpawnPawnFromList: Tried to spawn pawn but pawnKind is null.");
+                    return;
+                }
+
+                if (!parent.Spawned || parent.Map == null)
+                {
+                    Log.Error($"CompSpawnPawnFromList: Cannot spawn pawn. Parent {parent} is not spawned or map is null.");
+                    return;
+                }
+
+                Pawn pawn = PawnGenerator.GeneratePawn(new PawnGenerationRequest(pawnKind, parent.Faction));
+                if (pawn == null)
+                {
+                    Log.Error($"CompSpawnPawnFromList: Failed to generate pawn of kind {pawnKind.defName} for faction {parent.Faction?.Name ?? "null"}.");
+                    return;
+                }
+
+                if (GenSpawn.Spawn(pawn, parent.Position, parent.Map) == null)
+                {
+                    Log.Error($"CompSpawnPawnFromList: Failed to spawn pawn {pawn} at {parent.Position}.");
+                    if (!pawn.Destroyed)
+                    {
+                        pawn.Destroy();
+                    }
+                    return;
+                }
+
+                if (Props.lordJob != null)
+                {
+                    try
+                    {
+                        LordJob lordJobInstance = (LordJob)System.Activator.CreateInstance(Props.lordJob);
+                        Lord lord = LordMaker.MakeNewLord(parent.Faction, lordJobInstance, parent.Map);
+                        lord.AddPawn(pawn);
+                    }
+                    catch (System.Exception e)
+                    {
+                        Log.Error($"CompSpawnPawnFromList: Error creating LordJob {Props.lordJob?.Name ?? "null"} or assigning pawn {pawn}. Exception: {e}");
+                    }
+                }
+
+                if (Props.destroyOnSpawn)
+                {
+                    parent.Destroy(DestroyMode.Vanish);
+                }
             }
-
-            if (Props.destroyOnSpawn)
+            finally
             {
-                parent.Destroy(DestroyMode.Vanish);
+                spawnUntilTick = -1;
+                spawningPawnKind = null;
             }
         }