From 8cbd09e036ac6a3f4ce5982abd964f3ebf19551e Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Thu, 11 Sep 2025 21:12:51 +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 197632 -> 197632 bytes
 1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml    |   5 ++-
 .../Morphable/Building_Morphable.cs           |  42 ++++++++++--------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
index 47834fc5a2270431eabef2df093e88aebb92165f..27c8dc87222ae7510b3e010b82d76aa246c4d549 100644
GIT binary patch
delta 1274
zcmZ`(Uu;uV7(c&rZ*Tvu<F=&?nRZ+E=Von3TSvww3z~qVPL?fh{BeX#Utmt{xPu2M
zt^*>OaTu1WCx%BO$zGJXjYD`aKFk;8VW^v$5CX_1(SVq!F`~uqmI0d7`*6;e@6Yf2
zzTf%I9U1kEjCxLvsvDY9^W$UXxHdkq9Vc@@oo)Xbg_Y+jc{H~Zb^OMi+))f;HV5vv
z8K=PT&ZN?Gtdq-5j=_r3m7K8)jOlFXippFraVCU7Q1LjLKLulqXMO}z)76}5B~I~4
z7;CaB&)gzkY?ZDKFHlK?n~Zrf@`zwn1VO(|xA~pAvw55VnDGsT0_ksQ^}BReAg}n{
zx;vU;=E7PwXbdpsGS7L*dJ|;bxbHKrQh~|hY*2TlbCfi8lQ9_EnAlN`lB~ue(c%bR
zDk-2A5R8|o)UUDsO)o2&uIXC(8WCX5%pRgu6H{vg5!dh~av4d^TnWEjw_B}vbWgN}
zX=Xja6v7X=>h|;jN*(*1c<Xl27e+Aa%=|)p?!nnIvz8_f-C+Th=q1q_rs<CKb*php
z5uUk8IvZnDVa(HVj}hI8u}CRyyTOTCFb}_1_eNbzvo9x@{dP8}8A}#=X@u#e^>hvX
zxWb;5i`6ItIz+w()4oyS>@bs-;$KiMH!q0US`6T_jMw2QmH!bJLlI<Ym%m2v1K^XF
zV$gu+<@XKP&T&ZGPM}KMZHC+ZcH)8TVkm*bI3y{U<~S|-8WF&PnCwQaJk^NzIJ|OQ
z6D|Tt(cXy)QP+$a0?W1(16$dGegdQ5M;6%HR>X8`HVQZUTF6Fnn#<t1R$SJwTbi3t
z1%5Xv-`$MA5K1POsr_rtS|5K%cd`w0XctYXV#lA~LcO$03cgCm%hT;R4h+cHR<r}J
z%Yz*c`j{t-$}YtIBgM`xVqfrA$;B?5uv!@EF4lr1eG1U)w?VN%iVeMZr2ISL8LCbn
zr$HK-;!K@;(s~79ng(-Gn7v3MBtPgy50H>|cHsa#ZH;VjS(Yw&csG6m_Q<_`Z~zl>
z-wOy~_3cK+!adKiT|2;5&}@X;dQzKce_2kvh}GH0`t2vS#G+C4<I<S=hVu3Py^e#t
zzQd!Wl=V#>MP9jz55E$h&+u;X)(o!}XQp|j+<2BBQCDmYtea}M_4G5-?}s+`EuD?a
zx%1o?_4`u3qx-nmcjPnQu}8V@70$W*ZHZ3>edp+3b^rU)vMa_bgP0W;|K_c^jVP1e
SJpWVS*PoC&SANEL-2M-)i#{U&

delta 1293
zcmZ{kZERCz6vxm1xwkKCyO-NLI)UNdy6t9dVI3o5lO>p7ST|j|xDA&XKuMH|+HnUa
zq_A$xkQqzDD0*WEiC-|17;wUTkPjv%@JWp$3i@H1fovwIDADj?Zq?JWNr<x_dd_{$
z|M@-VfBM`Gje3SgJ;z4X(`BivW65I7jh)$s_ftT%ExB5u;#8Rkrg~5<Xg+lqgP2M|
z=(f!#L3nFiX&8wL85QU+4L%}>z97<QU|J=YOBgpexE+Q7xqNAOoIw}a9kH9dO4hj&
ztk|LC<}_Xb5sCP1kQ(y~vg@j*#$V(ul_9mNFyI=TV!cr($fesfTVYz!U79P{M0WG~
zI_l3>V<{q6@>e2gw%C4FChui)E9!@@g>iSeejjIxUuK+c*X$XRTXP4im^8;E%^thO
zB@SP5Ncz~Gv7Ptb@0T>yN|$0)LU)Mx9qu($q&Wt!vvRGQlWUx$5kOG@KHaG~b&uw0
z9Ajf-e9NW6*mwM`=W4l`Q}eXEV1!I>E%h6F_yqG}9%pZ|Wz)a3X3X#ga}z&mxex3a
z-3iubrN&E~={Xb#E>CKGh_s~sUwP-Ua=VtZXy5E}P`}-nb!B|y2T04Wk<)&x0ba1u
zmAK%2mjO<*jt6Oc&KhCfvMyI)5AMm@YCNurg0M9ZK!T(EGk~9f8aWk$9WdpOYq3q>
zxb=G&<<{SgaJxSUFOJ5Tu?E68h~turF@aC5o%JZh9c#Q3Rq|v#-Vq!(G~g=GYPCgC
zYE?I4f?<iK<zOqC(8n+?p3A`2H6x^DCY_znp%NQk6LS%sYQ_(Cye7>pD2FIoFW-Iw
z^C)Sp`|q#Twf;f7<6AL_T~<S6x#KUju$Ntui?8zW^1U`30Y+r#DYOBn<bn2oeOzNk
zSqDN7jiRT6yU(td%b5-w%~%-dT+V{z`DD=>yP??dm9?oCtBUV(pC$g-5q?94&I?i}
zH}h*^RAjE;f@Sui4h`~jFS>w;{Oeilhi6AU^)HU4PafQkpMiwjy%SF0Gr9LUlwhTE
z15riS)3omyPyt`~imhFdEgWB$XP(E(#G?^qV}nNtsvqTt)HjrG_U(2a5H;-{rO$D+
zB@~p?H*ofA>*j>;`-<XJONXe5N-0iZj?v7sm7EaW)`u5FnXLX;466md{BdIV<tJy`
z&n_J6DV?vJkQXlrZ%`NBh<EskcVvzC@LrK8gz&y1zn>N7eYunTFShi#ZJk;Wt1)GL
XvLKpeURum4V*W9y3FSA8)jIwGjweIq

diff --git a/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml b/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml
index 97fe93d..a9dff1a 100644
--- a/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml
@@ -6,7 +6,7 @@
     <defName>ARA_Ability_Morph</defName>
     <label>织域形态</label>
     <description>将自己转换为一个坚固的静态建筑形态，或从建筑形态恢复。</description>
-    <iconPath>UI/Commands/Attack</iconPath>    <!-- TODO: 替换为你的图标路径 -->
+    <iconPath>UI/Commands/EggSpew</iconPath>    <!-- TODO: 替换为你的图标路径 -->
     <cooldownTicksRange>600</cooldownTicksRange>
      <hotKey>Misc12</hotKey>
     <targetRequired>false</targetRequired>
@@ -52,7 +52,7 @@
     <staticSunShadowHeight>0</staticSunShadowHeight>
     <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
     <statBases>
-      <MaxHitPoints>250</MaxHitPoints>
+      <MaxHitPoints>1000</MaxHitPoints>
       <WorkToBuild>2800</WorkToBuild>
       <Flammability>1.0</Flammability>
       <ResearchSpeedFactor>1.0</ResearchSpeedFactor>
@@ -62,6 +62,7 @@
     <building>
       <workTableRoomRole>Laboratory</workTableRoomRole>
       <workTableNotInRoomRoleFactor>0.8</workTableNotInRoomRoleFactor>
+      <deconstructible>false</deconstructible>
     </building>
     <!-- 不可建造，只能通过变形生成 -->
     <comps Inherit="False">
diff --git a/Source/ArachnaeSwarm/Morphable/Building_Morphable.cs b/Source/ArachnaeSwarm/Morphable/Building_Morphable.cs
index 88924e6..fad6363 100644
--- a/Source/ArachnaeSwarm/Morphable/Building_Morphable.cs
+++ b/Source/ArachnaeSwarm/Morphable/Building_Morphable.cs
@@ -142,31 +142,14 @@ namespace ArachnaeSwarm
         public override string GetInspectString()
         {
             List<string> inspectStrings = new List<string>();
-            string baseString = base.GetInspectString();
-            if (!baseString.NullOrEmpty())
-            {
-                inspectStrings.Add(baseString);
-            }
-
+            
             if (compMorphable?.StoredPawn != null)
             {
                 Pawn pawn = compMorphable.StoredPawn;
                 
-                SkillRecord intellectualSkill = pawn.skills?.GetSkill(SkillDefOf.Intellectual);
-                if (intellectualSkill != null)
-                {
-                    inspectStrings.Add($"{SkillDefOf.Intellectual.LabelCap}: {intellectualSkill.Level} ({intellectualSkill.XpProgressPercent:P0})");
-                }
-
-                Need_Rest restNeed = pawn.needs?.rest;
-                if (restNeed != null)
-                {
-                    inspectStrings.Add($"{restNeed.LabelCap}: {restNeed.CurLevelPercentage:P0}");
-                }
-
+                // 1. 活动状态 (置于首位)
                 TimeAssignmentDef assignment = pawn.timetable?.CurrentAssignment ?? TimeAssignmentDefOf.Anything;
                 bool isWorkingTime = !forceSleep && (assignment == TimeAssignmentDefOf.Work || assignment == TimeAssignmentDefOf.Anything);
-                
                 string activity;
                 if (isWorkingTime)
                 {
@@ -185,6 +168,27 @@ namespace ArachnaeSwarm
                     activity = "Activity".Translate() + ": " + "Sleeping".Translate();
                 }
                 inspectStrings.Add(activity);
+
+                // 2. 智识技能
+                SkillRecord intellectualSkill = pawn.skills?.GetSkill(SkillDefOf.Intellectual);
+                if (intellectualSkill != null)
+                {
+                    inspectStrings.Add($"{SkillDefOf.Intellectual.LabelCap}: {intellectualSkill.Level} ({intellectualSkill.XpProgressPercent:P0})");
+                }
+
+                // 3. 休息需求
+                Need_Rest restNeed = pawn.needs?.rest;
+                if (restNeed != null)
+                {
+                    inspectStrings.Add($"{restNeed.LabelCap}: {virtualRest.ToStringPercent()}");
+                }
+            }
+            
+            // 基础信息（如HP）最后添加
+            string baseString = base.GetInspectString();
+            if (!baseString.NullOrEmpty())
+            {
+                inspectStrings.Add(baseString);
             }
 
             return string.Join("\n", inspectStrings);