From c13716400191f362deb62d7fc5560daf91173146 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Mon, 1 Sep 2025 11:23:47 +0800
Subject: [PATCH 1/2] =?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/Defs/BodyDefs/ARA_BodyDef.xml         | 137 ++++++++++++++++++
 .../Defs/ThingDef_Races/ARA_RaceDefBase.xml   |   2 +-
 2 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 1.6/1.6/Defs/BodyDefs/ARA_BodyDef.xml

diff --git a/1.6/1.6/Defs/BodyDefs/ARA_BodyDef.xml b/1.6/1.6/Defs/BodyDefs/ARA_BodyDef.xml
new file mode 100644
index 0000000..f2bd563
--- /dev/null
+++ b/1.6/1.6/Defs/BodyDefs/ARA_BodyDef.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+ <!-- EN: beetle-like with claw -->
+  <BodyDef>
+    <defName>ARA_BeetleLikeWithClaw</defName>
+    <label>带头颚甲虫类</label> <!-- EN: beetle-like with claw -->
+    <corePart>
+      <def>Shell</def>
+      <customLabel>壳</customLabel> <!-- EN: shell -->
+      <height>Middle</height>
+      <depth>Outside</depth>
+      <parts>
+        <li>
+          <def>Elytra</def>
+          <customLabel>左鞘翅</customLabel> <!-- EN: left elytra -->
+          <coverage>0.05</coverage>
+        </li>
+        <li>
+          <def>Elytra</def>
+          <customLabel>右鞘翅</customLabel> <!-- EN: right elytra -->
+          <coverage>0.05</coverage>
+        </li>
+        <li>
+          <def>Stomach</def>
+          <coverage>0.05</coverage>
+          <depth>Inside</depth>
+        </li>
+        <li>
+          <def>InsectHeart</def>
+          <customLabel>心脏</customLabel> <!-- EN: heart -->
+          <coverage>0.03</coverage>
+          <depth>Inside</depth>
+        </li>
+        <li>
+          <def>Pronotum</def>
+          <customLabel>前胸背板</customLabel> <!-- EN: pronotum -->
+          <coverage>0.18</coverage>
+          <height>Top</height>
+          <parts>
+            <li>
+              <def>InsectHead</def>
+              <customLabel>头</customLabel> <!-- EN: head -->
+              <coverage>0.65</coverage>
+              <groups>
+                <li>HeadAttackTool</li>
+              </groups>
+              <parts>
+                <li>
+                  <def>Brain</def>
+                  <coverage>0.2</coverage>
+                  <depth>Inside</depth>
+                </li>
+                <li>
+                  <def>Eye</def>
+                  <customLabel>左眼</customLabel> <!-- EN: left eye -->
+                  <coverage>0.12</coverage>
+                </li>
+                <li>
+                  <def>Eye</def>
+                  <customLabel>右眼</customLabel> <!-- EN: right eye -->
+                  <coverage>0.12</coverage>
+                </li>
+                <li>
+                  <def>Antenna</def>
+                  <customLabel>左触角</customLabel> <!-- EN: left antenna -->
+                  <coverage>0.08</coverage>
+                </li>
+                <li>
+                  <def>Antenna</def>
+                  <customLabel>右触角</customLabel> <!-- EN: right antenna -->
+                  <coverage>0.08</coverage>
+                </li>
+                <li>
+                  <def>InsectNostril</def>
+                  <customLabel>鼻</customLabel> <!-- EN: nostril -->
+                  <coverage>0.06</coverage>
+                </li>
+                <li>
+                  <def>InsectMouth</def>
+                  <customLabel>口器</customLabel> <!-- EN: mouth -->
+                  <coverage>0.08</coverage>
+                  <groups>
+                    <li>Mouth</li>
+                  </groups>
+                </li>
+                <li>
+                  <def>HeadClaw</def>
+                  <customLabel>头颚</customLabel> <!-- EN: head claw -->
+                  <coverage>0.15</coverage>
+                  <groups>
+                    <li>HeadClaw</li>
+                  </groups>
+                </li>
+              </parts>
+            </li>
+          </parts>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>左前肢</customLabel> <!-- EN: front left leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>右前肢</customLabel> <!-- EN: front right leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>左中肢</customLabel> <!-- EN: middle left leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>右中肢</customLabel> <!-- EN: middle right leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>左后肢</customLabel> <!-- EN: rear left leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+        <li>
+          <def>InsectLeg</def>
+          <customLabel>右后肢</customLabel> <!-- EN: rear right leg -->
+          <coverage>0.06</coverage>
+          <height>Bottom</height>
+        </li>
+      </parts>
+    </corePart>
+  </BodyDef>
+</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
index 5e7f9f0..6c1f2e8 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
@@ -624,7 +624,7 @@
             <!-- 血迹定义 -->
             <bloodSmearDef>Filth_BloodSmear</bloodSmearDef>
             <!-- 身体结构 -->
-            <body>BeetleLikeWithClaw</body>            <!-- 身体 -->
+            <body>ARA_BeetleLikeWithClaw</body>            <!-- 身体 -->
             <!-- 基础身体大小 -->
             <baseBodySize>4.5</baseBodySize>
             <!-- 基础健康比例 -->

From fe05bdd8cc8bf63ce956ff67f138050497fa9546 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Mon, 1 Sep 2025 11:48:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=98=AFmerge=E5=A5=BD?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Defs/ThingDef_Races/ARA_RaceDefBase.xml   | 169 +-----------------
 1 file changed, 8 insertions(+), 161 deletions(-)

diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
index 1bc9fba..646a654 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDefBase.xml
@@ -8,7 +8,7 @@
 		<!-- 种族相关设置 -->
 		<race>
 			<!-- 可以成为蹒跚怪 -->
-			<canBecomeShambler>true</canBecomeShambler>
+			<canBecomeShambler>false</canBecomeShambler>
 			<!-- 异常知识类别（需要Anomaly模组） -->
 			<knowledgeCategory MayRequire="Ludeon.RimWorld.Anomaly">Basic</knowledgeCategory>
 			<!-- 异常知识点数 -->
@@ -47,22 +47,6 @@
 		</damageMultipliers>
 		<!-- 组件设置 -->
 		<comps>
-			<!-- 传播污泥组件 -->
-			<li Class="CompProperties_SpreadSludge">
-				<!-- 平均间隔时间（ticks） -->
-				<mtbTicks>15000</mtbTicks>
-				<!-- 使用的能力定义 -->
-				<abilityDef>ARA_EggSpew</abilityDef>
-			</li>
-			<!-- 揭露时发送信件组件 -->
-			<li Class="CompProperties_LetterOnRevealed">
-				<!-- 信件标题 -->
-				<label>Hive queen</label>
-				<!-- 信件内容 -->
-				<text>You've discovered the center of the nest. It's guarded by a massive insect queen!</text>
-				<!-- 信件类型 -->
-				<letterDef>ThreatBig</letterDef>
-			</li>
 		</comps>
 		<!-- 定义名称 -->
 		<defName>ArachnaeQueen_Race</defName>
@@ -257,9 +241,9 @@
 					</bodyTypes>					<!-- 身体 -->
 
 					<!-- 图像放大 -->
-					<customDrawSize>(1.75,1.75)</customDrawSize>
-					<customHeadDrawSize>(1.75,1.75)</customHeadDrawSize>
-					<customPortraitDrawSize>(1.5,1.5)</customPortraitDrawSize>
+					<customDrawSize>(4,4)</customDrawSize>
+					<customHeadDrawSize>(1.0,1.0)</customHeadDrawSize>
+					<customPortraitDrawSize>(2,2)</customPortraitDrawSize>
 					<!-- 头部位置 -->
 					<headOffset>(0,0)</headOffset>
 					<headOffsetDirectional>
@@ -305,143 +289,6 @@
 				</alienPartGenerator>
 			</generalSettings>
 
-			<!-- 种族设置 -->
-			<race>
-				<!-- 主要思考树 -->
-				<thinkTreeMain>Humanlike</thinkTreeMain>
-				<!-- 常驻思考树 -->
-				<thinkTreeConstant>HumanlikeConstant</thinkTreeConstant>
-				<!-- 智力类型 -->
-				<intelligence>Humanlike</intelligence>
-				<!-- 会留下足迹 -->
-				<makesFootprints>true</makesFootprints>
-				<!-- 预期寿命 -->
-				<lifeExpectancy>850</lifeExpectancy>				<!-- 寿命 -->
-				<!-- 皮革定义 -->
-				<leatherDef>Leather_Light</leatherDef>				<!-- 皮革 -->
-				<!-- 名称类别 -->
-				<nameCategory>HumanStandard</nameCategory>
-				<!-- 血液定义 -->
-				<bloodDef>Filth_Blood</bloodDef>				<!-- 血液 -->
-				<!-- 血迹定义 -->
-				<bloodSmearDef>Filth_BloodSmear</bloodSmearDef>
-				<!-- 身体结构 -->
-				<body>ARA_BeetleLikeWithClaw</body>				<!-- 身体 -->
-				<!-- 基础身体大小 -->
-				<baseBodySize>4.5</baseBodySize>
-				<!-- 基础健康比例 -->
-				<baseHealthScale>9.8</baseHealthScale>
-				<!-- 使用蜘蛛的肉 -->
-				<useMeatFrom>Megaspider</useMeatFrom>				<!-- 健康比例 -->
-				<!-- 食物类型 -->
-				<foodType>OmnivoreHuman, VegetarianRoughAnimal</foodType>				<!-- 食物种类 -->
-				<!-- 妊娠期天数 -->
-				<gestationPeriodDays>60</gestationPeriodDays>				<!-- 生产周期 -->
-				<!-- 肉类市场价格 -->
-				<meatMarketValue>1.85</meatMarketValue>				<!-- 肉类价格比例 -->
-				<!-- 受伤时变为猎人概率 -->
-				<manhunterOnDamageChance>1</manhunterOnDamageChance>
-				<!-- 驯服失败时反击概率 -->
-				<manhunterOnTameFailChance>1</manhunterOnTameFailChance>				<!-- 驯服失败反击概率 -->
-				<!-- 渲染树 -->
-				<renderTree>Humanlike</renderTree>
-				<!-- 肉体类型 -->
-				<fleshType>Normal</fleshType>
-				<!-- 是否有非自然尸体 -->
-				<hasUnnaturalCorpse>false</hasUnnaturalCorpse>
-				<!-- 预期寿命 -->
-				<lifeExpectancy>75</lifeExpectancy>
-				<!-- 训练能力 -->
-				<trainability>Advanced</trainability>
-				<!-- 一胎产仔数曲线 -->
-				<litterSizeCurve>					<!-- 繁殖数量比例 -->
-					<points>
-						<li>(0.5, 0)</li>
-						<li>(1, 1)</li>
-						<li>(1.01, 0.02)</li>
-						<li>(3.5, 0)</li>
-					</points>
-				</litterSizeCurve>
-				<!-- 生命阶段年龄 -->
-				<lifeStageAges>
-					<li>
-						<def>ARA_Queen_Adult</def>
-						<soundWounded>Pawn_HiveQueen_Wounded</soundWounded>
-						<soundDeath>Pawn_HiveQueen_Death</soundDeath>
-						<soundCall>Pawn_HiveQueen_Call</soundCall>
-						<soundAngry>Pawn_HiveQueen_Angry</soundAngry>
-					</li>
-				</lifeStageAges>
-				<!-- 生命阶段工作设置（需要Biotech模组） -->
-				<lifeStageWorkSettings MayRequire="Ludeon.RimWorld.Biotech">
-					<Firefighter>7</Firefighter>
-					<Patient>0</Patient>
-					<Doctor>10</Doctor>
-					<PatientBedRest>0</PatientBedRest>
-					<Childcare MayRequire="Ludeon.RimWorld.Biotech">0</Childcare>
-					<BasicWorker>0</BasicWorker>
-					<Warden>10</Warden>
-					<Handling>7</Handling>
-					<Cooking>7</Cooking>
-					<Hunting>7</Hunting>
-					<Construction>10</Construction>
-					<Growing>7</Growing>
-					<Mining>7</Mining>
-					<PlantCutting>7</PlantCutting>
-					<Smithing>13</Smithing>
-					<Tailoring>7</Tailoring>
-					<Art>10</Art>
-					<Crafting>7</Crafting>
-					<Hauling>0</Hauling>
-					<Cleaning>0</Cleaning>
-					<Research>13</Research>
-					<DarkStudy MayRequire="Ludeon.RimWorld.Anomaly">13</DarkStudy>
-				</lifeStageWorkSettings>
-				<!-- 近战命中Pawn音效 -->
-				<soundMeleeHitPawn>Pawn_Melee_BigBash_HitPawn</soundMeleeHitPawn>
-				<!-- 近战命中建筑音效 -->
-				<soundMeleeHitBuilding>Pawn_Melee_BigBash_HitBuilding</soundMeleeHitBuilding>
-				<!-- 近战未命中音效 -->
-				<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
-				<!-- 近战闪避音效 -->
-				<soundMeleeDodge>Pawn_MeleeDodge</soundMeleeDodge>
-				<!-- 特殊阴影数据 -->
-				<specialShadowData>
-					<volume>(0.3, 0.8, 0.4)</volume>
-					<offset>(0,0,-0.3)</offset>
-				</specialShadowData>
-				<!-- 年龄生成曲线 -->
-				<ageGenerationCurve>					<!-- 生成时年龄比例 -->
-					<points>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(0,0)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(0.001,43)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(1,86)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(8,86)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(12.5,118)</li>						<!-- Exclude 12.5-13 years to avoid spawning pawns who are very close to becoming adults -->
-						<li MayRequire="Ludeon.RimWorld.Biotech">(12.51,0)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(13,0)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(13.001,122)</li>						<!-- End exclude -->
-						<li MayRequire="Ludeon.RimWorld.Biotech">(13.999,130)</li>
-						<li>(14,0)</li>
-						<li MayRequire="Ludeon.RimWorld.Biotech">(14.001,130)</li>
-						<li>(16,55)</li>
-						<li>(18,100)</li>
-						<li>(20,100)</li>
-						<li>(50,20)</li>
-						<li>(60,30)</li>
-						<li>(70,18)</li>
-						<li>(80,10)</li>
-						<li>(90,3)</li>
-						<li>(10,0)</li>
-					</points>
-				</ageGenerationCurve>
-				<!-- 疾病给予集合 -->
-				<hediffGiverSets>					<!-- 不同情况下的健康状态给予 -->
-					<li>OrganicStandard</li>
-					<li>Human</li>
-				</hediffGiverSets>
-			</race>
-
 
 			<!-- 图形路径设置 -->
 			<graphicPaths>				<!-- 纹理 -->
@@ -460,8 +307,8 @@
 
 				<!-- 服装设置 -->
 				<apparel>
-					<bodyTypeFallback>Thin</bodyTypeFallback>
-					<femaleBodyTypeFallback>Thin</femaleBodyTypeFallback>
+					<bodyTypeFallback>ARA_QUEEN_Thin</bodyTypeFallback>
+					<femaleBodyTypeFallback>ARA_QUEEN_Thin</femaleBodyTypeFallback>
 				</apparel>
 			</graphicPaths>			<!-- 纹理 -->
 
@@ -733,7 +580,7 @@
 			<lifeExpectancy>850</lifeExpectancy>
 			<!-- 肉和皮革的定义 -->
 			<leatherDef>Leather_Light</leatherDef>
-			<specificMeatDef>InsectMeat</specificMeatDef>
+			<specificMeatDef>Meat_Megaspider</specificMeatDef>
 			<nameCategory>HumanStandard</nameCategory>
 			<bloodDef>Filth_BloodInsect</bloodDef>			<!-- 피 -->
 			<bloodSmearDef>Filth_BloodSmear</bloodSmearDef>
@@ -751,7 +598,7 @@
 			<hasUnnaturalCorpse>false</hasUnnaturalCorpse>
 			<lifeStageAges>
 				<li>
-					<def>EusocialInsectAdult</def>
+					<def>ARA_Queen_Adult</def>
 					<soundWounded>Pawn_HiveQueen_Wounded</soundWounded>
 					<soundDeath>Pawn_HiveQueen_Death</soundDeath>
 					<soundCall>Pawn_HiveQueen_Call</soundCall>