From 648996be3d3ee51cec9c088a164931c0bc52892b Mon Sep 17 00:00:00 2001
From: Tourswen <82707327+Tourswen@users.noreply.github.com>
Date: Thu, 4 Sep 2025 01:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=BE=E5=A4=B4=E7=A7=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=89=E7=A7=8D=E6=96=B0=E8=BE=85=E8=99=AB=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml    |  43 ++++
 .../Defs/BackstoryDefs/ARA_BackstoryDef.xml   |  15 +-
 .../Defs/FactionDefs/ARA_Factions_Player.xml  |   7 +
 1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml    |  92 ++++++-
 .../Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml | 242 ++++++------------
 .../Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml |  14 +-
 1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml |  47 ++--
 1.6/1.6/Defs/Thing_building/ARA_Building.xml  |   4 +-
 1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml |  16 +-
 9 files changed, 260 insertions(+), 220 deletions(-)

diff --git a/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml b/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
index a94d895..6009d80 100644
--- a/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
+++ b/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
@@ -159,4 +159,47 @@
       <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
     </projectile>
   </ThingDef>
+  
+  <AbilityDef>
+    <defName>ARA_AcidSprayBurst_Myrmecocystus</defName>
+    <label>蜜罐种酸液轰炸</label>
+    <description>阿拉克涅蜜罐种向目标地点喷射大量腐蚀性酸液，虽然不如女皇种的强劲但是依然不失为区域轰炸技能。</description>
+    <iconPath>UI/Abilities/AcidSpray</iconPath>
+    <cooldownTicksRange>12000</cooldownTicksRange> <!-- 2 hours -->
+    <aiCanUse>true</aiCanUse>
+    <displayOrder>300</displayOrder>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>15.9</range>
+      <warmupTime>3</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilitySprayLiquidMulti">
+        <!-- CompProperties_AbilitySprayLiquid 的属性 -->
+        <projectileDef>ARA_Proj_StrongSludgeSpray</projectileDef>
+        <numCellsToHit>6</numCellsToHit>
+        <sprayEffecter>AcidSpray_Directional</sprayEffecter>
+
+        <!-- CompProperties_AbilitySprayLiquidMulti 新增的属性 -->
+        <shotCount>16</shotCount> <!-- 总共发射5次 -->
+        <ticksBetweenShots>3</ticksBetweenShots> <!-- 每次发射间隔12 Ticks (0.2秒) -->
+      </li>
+       <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <needDef>Food</needDef>
+        <needCost>0.5</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+      <!-- <li Class="ArachnaeSwarm.CompProperties_AbilityBodyPartCheck">
+        <requiredPart>ARA_Acid_sac</requiredPart>
+        <failMessage>酸囊受损或缺失，无法喷射酸液</failMessage>
+      </li> -->
+    </comps>
+  </AbilityDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml b/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
index e2ec9a5..955edee 100644
--- a/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
+++ b/1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml
@@ -66,12 +66,25 @@
 		<defName>Arachnae_Node_BS_Adult_Myrmecocystus</defName>
 		<title>阿拉克涅蜜罐种</title>
 		<titleShort>蜜罐种</titleShort>
-		<description>[PAWN_nameDef]是一只阿拉克涅蜜罐种督虫。基因的选择性表达使其长出了肿胀的囊袋和复杂的口器，这使得她可以吞噬那些未经过处理的尸体和各种杂食，并通过消化器官将其转变为阿拉克涅虫蜜以供其他虫族食用。\n\n[PAWN_nameDef]在战斗中并不是一个值得正视的对手，没有可以接入武装器官的副肢，脆弱臃肿的特性也决定了她几乎无法躲开任何攻击。</description>
+		<description>[PAWN_nameDef]是一只阿拉克涅蜜罐种督虫。基因的选择性表达使其长出了肿胀的囊袋和复杂的口器，这使得她可以吞噬那些未经过处理的尸体和各种杂食或是将其进一步分解，并通过消化器官将其转变为阿拉克涅虫蜜以供其他虫族食用。\n\n[PAWN_nameDef]在战斗中并不是一个值得正视的对手，她没有可以接入武装器官的副肢，脆弱臃肿的特性也决定了她几乎无法躲开任何攻击。</description>
 		<slot>Adulthood</slot>
 		<workDisables>AllWork</workDisables>
+    <requiredWorkTags>Cooking</requiredWorkTags>
 
 		<spawnCategories>
 			<li>ArachnaeNode_spawnCategories_Myrmecocystus</li>
 		</spawnCategories>
 	</AlienRace.AlienBackstoryDef>
+	<AlienRace.AlienBackstoryDef ParentName="ARA_BaseBackStory">
+		<defName>Arachnae_Node_BS_Adult_ShieldHead</defName>
+		<title>阿拉克涅盾头种</title>
+		<titleShort>盾头种</titleShort>
+		<description>[PAWN_nameDef]是一只阿拉克涅盾头种督虫。盾头种是一种笨重的阿拉克涅虫族，她们拥有厚厚的经常过度生长的甲壳，除了生产甲壳素外，也拥有接入武装器官的辅肢，可以凭借虫群的武装器官和自己与生俱来的盔甲承担保卫虫巢的任务。</description>
+		<slot>Adulthood</slot>
+		<workDisables>AllWork</workDisables>
+
+		<spawnCategories>
+			<li>ArachnaeNode_spawnCategories_ShieldHead</li>
+		</spawnCategories>
+	</AlienRace.AlienBackstoryDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/FactionDefs/ARA_Factions_Player.xml b/1.6/1.6/Defs/FactionDefs/ARA_Factions_Player.xml
index 86562d3..59588af 100644
--- a/1.6/1.6/Defs/FactionDefs/ARA_Factions_Player.xml
+++ b/1.6/1.6/Defs/FactionDefs/ARA_Factions_Player.xml
@@ -9,6 +9,13 @@
     <pawnSingular>colonist</pawnSingular>
     <pawnsPlural>colonists</pawnsPlural>
     <techLevel>Animal</techLevel>
+    <backstoryFilters>
+      <li>
+        <categories>
+          <li>Offworld</li>
+        </categories>
+      </li>
+    </backstoryFilters>
     <!-- 命名规则 -->
     <factionNameMaker>ARA_New_Hive_NamerFaction</factionNameMaker>
     <settlementNameMaker>NamerSettlementOutlander</settlementNameMaker>
diff --git a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
index c2df9d7..9176ba7 100644
--- a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
+++ b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
@@ -72,8 +72,6 @@
 		<maxGenerationAge>30</maxGenerationAge>
 		<minGenerationAge>10</minGenerationAge>
 		<canBeScattered>false</canBeScattered>
-		<abilities>
-		</abilities>
 		<xenotypeSet>
 			<xenotypeChances>
 
@@ -103,7 +101,7 @@
 		<label>阿拉克涅蜜罐种</label>
 		<race>ArachnaeNode_Race_Myrmecocystus</race>
 		<defaultFactionType>PlayerColony</defaultFactionType>
-		<invNutrition>2.55</invNutrition>
+		<invNutrition>0</invNutrition>
 		<backstoryFiltersOverride>
 			<li>
 				<categories>
@@ -112,6 +110,9 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
+		<abilities>
+      <li>ARA_AcidSprayBurst_Myrmecocystus</li>
+		</abilities>
 		<apparelTags>
 		</apparelTags>
 		<apparelMoney>0</apparelMoney>
@@ -121,12 +122,12 @@
 		<label>阿拉克涅盾头种</label>
 		<race>ArachnaeNode_Race_ShieldHead</race>
 		<defaultFactionType>PlayerColony</defaultFactionType>
-		<invNutrition>2.55</invNutrition>
+		<invNutrition>0</invNutrition>
 		<backstoryFiltersOverride>
 			<li>
 				<categories>
 					<li>ArachnaeNode_spawnCategoriesA</li>
-					<li>ArachnaeNode_spawnCategories_Myrmecocystus</li>
+					<li>ArachnaeNode_spawnCategories_ShieldHead</li>
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
@@ -134,4 +135,83 @@
 		</apparelTags>
 		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
-</Defs>
+  
+  <PawnKindDef ParentName="InsectKindBase">
+    <defName>ArachnaeBase_Race_Slavey</defName>
+    <label>阿拉克涅苦役种</label>
+    <race>ArachnaeBase_Race_Slavey</race>
+    <combatPower>75</combatPower>
+    <ecoSystemWeight>0.35</ecoSystemWeight>
+    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <forceNoDeathNotification>true</forceNoDeathNotification>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+          <drawSize>1</drawSize>
+          <color>(156,148,125)</color>
+          <shadowData>
+            <volume>(0.4, 0.5, 0.37)</volume>
+            <offset>(0,0,-0.15)</offset>
+          </shadowData>
+        </bodyGraphicData>
+        <dessicatedBodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Dessicated_Spelopede</texPath>
+          <drawSize>1</drawSize>
+        </dessicatedBodyGraphicData>
+      </li>
+    </lifeStages>
+  </PawnKindDef>
+  <PawnKindDef ParentName="InsectKindBase">
+    <defName>ArachnaeBase_Race_Scavenger</defName>
+    <label>阿拉克涅食腐种</label>
+    <race>ArachnaeBase_Race_Scavenger</race>
+    <combatPower>75</combatPower>
+    <ecoSystemWeight>0.35</ecoSystemWeight>
+    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <forceNoDeathNotification>true</forceNoDeathNotification>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+          <drawSize>1</drawSize>
+          <color>(156,148,125)</color>
+          <shadowData>
+            <volume>(0.4, 0.5, 0.37)</volume>
+            <offset>(0,0,-0.15)</offset>
+          </shadowData>
+        </bodyGraphicData>
+        <dessicatedBodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Dessicated_Spelopede</texPath>
+          <drawSize>1</drawSize>
+        </dessicatedBodyGraphicData>
+      </li>
+    </lifeStages>
+  </PawnKindDef>
+  <PawnKindDef ParentName="InsectKindBase">
+    <defName>ArachnaeBase_Race_HardJaw</defName>
+    <label>阿拉克涅坚颚种</label>
+    <race>ArachnaeBase_Race_HardJaw</race>
+    <combatPower>75</combatPower>
+    <ecoSystemWeight>0.35</ecoSystemWeight>
+    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <forceNoDeathNotification>true</forceNoDeathNotification>
+    <lifeStages>
+      <li>
+        <bodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+          <drawSize>1</drawSize>
+          <color>(156,148,125)</color>
+          <shadowData>
+            <volume>(0.4, 0.5, 0.37)</volume>
+            <offset>(0,0,-0.15)</offset>
+          </shadowData>
+        </bodyGraphicData>
+        <dessicatedBodyGraphicData>
+          <texPath>Things/Pawn/Animal/Spelopede/Dessicated_Spelopede</texPath>
+          <drawSize>1</drawSize>
+        </dessicatedBodyGraphicData>
+      </li>
+    </lifeStages>
+  </PawnKindDef>
+</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
index b84e27c..462d5c4 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
@@ -1,117 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <ThingDef Name="ARA_SupporterBase" Abstract="True" ParentName="BaseInsect">
+  <ThingDef Name="ArachnaeBase_Race" ParentName="BaseInsect" Abstract="True">
     <statBases>
-      <MoveSpeed>5</MoveSpeed>
-      <ComfyTemperatureMin>-80</ComfyTemperatureMin>
-      <ComfyTemperatureMax>32</ComfyTemperatureMax>
+      <MoveSpeed>8</MoveSpeed>
       <MarketValue>0</MarketValue>
-      <LeatherAmount>10</LeatherAmount>
-      <ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-      <ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-      <Wildness>0.3</Wildness>
-    </statBases>
-    <uiIconScale>1.1</uiIconScale>
-
-    <tools>
-      <li>
-        <label>head</label>
-        <capacities>
-          <li>Blunt</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-        <chanceFactor>0.2</chanceFactor>
-      </li>
-    </tools>
-    <race>
-      <body>Human</body>
-      <thinkTreeMain>ARA_Insect_WithPlanting</thinkTreeMain>
-      <baseHungerRate>0.25</baseHungerRate>
-      <baseBodySize>0.8</baseBodySize>
-      <baseHealthScale>1.7</baseHealthScale>
-      <useMeatFrom>Megaspider</useMeatFrom>
-      <lifeExpectancy>6</lifeExpectancy>
-      <trainability>Advanced</trainability>
-      <specialTrainables>
-        <li MayRequire="Ludeon.RimWorld.Odyssey">Dig</li>
-        <li>ARA_Sowing</li>
-      </specialTrainables>
-      <lifeStageAges>
-        <li>
-          <def>EusocialInsectAdult</def>
-          <minAge>0</minAge>
-          <soundWounded>Pawn_Spelopede_Pain</soundWounded>
-          <soundDeath>Pawn_Spelopede_Death</soundDeath>
-          <soundCall>Pawn_Spelopede_Call</soundCall>
-          <soundAngry>Pawn_Spelopede_Angry</soundAngry>
-        </li>
-      </lifeStageAges>
-      <soundMeleeHitPawn>Pawn_Melee_SmallScratch_HitPawn</soundMeleeHitPawn>
-      <soundMeleeHitBuilding>Pawn_Melee_SmallScratch_HitBuilding</soundMeleeHitBuilding>
-      <soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
-      <headPosPerRotation>
-        <li>(0.0, 0, 0.14)</li>
-        <li>(0.07, 0, 0.08)</li>
-        <li>(0.0, 0, -0.12)</li>
-        <li>(-0.07, 0, 0.08)</li>
-      </headPosPerRotation>
-      <deathAction Class="DeathActionProperties_Vanish">
-        <workerClass>DeathActionWorker_Vanish</workerClass>
-      </deathAction>
-    </race>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
-        <skillLevels>
-          <li>
-            <skill>Plants</skill>
-            <level>8</level> <!-- 动物生成时，种植技能固定为8级 -->
-          </li>
-          <li>
-            <skill>Mining</skill>
-            <level>8</level> <!-- 动物生成时，采矿技能固定为8级 -->
-          </li>
-        </skillLevels>
-        <instantTrainables>
-          <li>ARA_Sowing</li> <!-- 动物生成时，立即完成播种训练 -->
-          <li>Dig</li>
-          <li>Haul</li>
-          <li>Rescue</li>
-          <li>Forage</li>
-        </instantTrainables>
-        <disableAllSkillDecay>true</disableAllSkillDecay> <!-- 阻止这个动物的所有技能衰减 -->
-      </li>
-    </comps>
-    <tradeTags>
-      <li>AnimalInsect</li>
-    </tradeTags>
-  </ThingDef>
-  <ThingDef ParentName="ARA_SupporterBase">
-    <defName>ArachnaeBase_Race_Scavenger</defName>
-    <label>阿拉克涅食腐虫</label>
-    <description>是阿拉克涅食腐虫的描述。</description>
-    <statBases>
-      <MoveSpeed>3.65</MoveSpeed>
-      <MarketValue>200</MarketValue>
       <LeatherAmount>0</LeatherAmount>
-      <ArmorRating_Blunt>0.18</ArmorRating_Blunt>
-      <ArmorRating_Sharp>0.18</ArmorRating_Sharp>
-      <Wildness>0.3</Wildness>
+      <ArmorRating_Blunt>0.1</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.1</ArmorRating_Sharp>
+      <Wildness>0</Wildness>
     </statBases>
     <uiIconScale>1.1</uiIconScale>
 
     <tools>
-      <li>
-        <label>head claw</label>
-        <capacities>
-          <li>Cut</li>
-        </capacities>
-        <power>7</power>
-        <cooldownTime>2</cooldownTime>
-        <linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-      </li>
       <li>
         <label>head</label>
         <capacities>
@@ -127,16 +27,16 @@
     <race>
       <body>BeetleLikeWithClaw</body>
       <thinkTreeMain>ARA_Insect_WithPlanting</thinkTreeMain>
-      <baseHungerRate>0.25</baseHungerRate>
-      <baseBodySize>0.8</baseBodySize>
-      <baseHealthScale>1.7</baseHealthScale>
+      <baseHungerRate>0.1</baseHungerRate>
+      <baseBodySize>0.5</baseBodySize>
+      <baseHealthScale>1</baseHealthScale>
       <useMeatFrom>Megaspider</useMeatFrom>
-      <lifeExpectancy>6</lifeExpectancy>
+      <lifeExpectancy>0.1</lifeExpectancy>
       <trainability>Advanced</trainability>
-      <specialTrainables>
+      <!-- <specialTrainables>
         <li MayRequire="Ludeon.RimWorld.Odyssey">Dig</li>
         <li>ARA_Sowing</li>
-      </specialTrainables>
+      </specialTrainables> -->
       <lifeStageAges>
         <li>
           <def>EusocialInsectAdult</def>
@@ -156,60 +56,76 @@
         <li>(0.0, 0, -0.12)</li>
         <li>(-0.07, 0, 0.08)</li>
       </headPosPerRotation>
-      <deathAction Class="DeathActionProperties_Vanish">
+      <!-- <deathAction Class="DeathActionProperties_Vanish">
         <workerClass>DeathActionWorker_Vanish</workerClass>
-      </deathAction>
+      </deathAction> -->
+    </race>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Slavey</defName>
+    <label>阿拉克涅苦役种</label>
+    <description>阿拉克涅辅虫之一，智力和效率都相当低下，能执行搬运工作，注定在度过短暂的时光后死亡。</description>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <!-- <skillLevels>
+          <li>
+            <skill>Plants</skill>
+            <level>8</level>
+          </li>
+          <li>
+            <skill>Mining</skill>
+            <level>8</level>
+          </li>
+        </skillLevels> -->
+        <instantTrainables>
+          <!-- <li>ARA_Sowing</li>
+          <li>Dig</li> -->
+          <li>Haul</li>
+          <!-- 救援 -->
+          <!-- <li>Rescue</li> -->
+          <!-- 觅食 -->
+          <!-- <li>Forage</li> -->
+        </instantTrainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay> <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Scavenger</defName>
+    <label>阿拉克涅食腐种</label>
+    <description>阿拉克涅辅虫之一，智力低下，可以执行种植和收割工作，注定在度过短暂的时光后死亡。</description>
+    <race>
+      <specialTrainables>
+        <li>ARA_Sowing</li>
+      </specialTrainables>
     </race>
     <comps>
-    <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
-      <skillLevels>
-        <li>
-          <skill>Plants</skill>
-          <level>8</level> <!-- 动物生成时，种植技能固定为8级 -->
-        </li>
-        <li>
-          <skill>Mining</skill>
-          <level>8</level> <!-- 动物生成时，采矿技能固定为8级 -->
-        </li>
-      </skillLevels>
-      <instantTrainables>
-        <li>ARA_Sowing</li> <!-- 动物生成时，立即完成播种训练 -->
-        <li>Dig</li>
-        <li>Haul</li>
-        <li>Rescue</li>
-        <li>Forage</li>
-      </instantTrainables>
-      <disableAllSkillDecay>true</disableAllSkillDecay> <!-- 阻止这个动物的所有技能衰减 -->
-    </li>
-    </comps>
-    <tradeTags>
-      <li>AnimalInsect</li>
-    </tradeTags>
-  </ThingDef>
-  <PawnKindDef ParentName="InsectKindBase">
-    <defName>ArachnaeBase_Race_Scavenger</defName>
-    <label>阿拉克涅食腐虫</label>
-    <race>ArachnaeBase_Race_Scavenger</race>
-    <combatPower>75</combatPower>
-    <ecoSystemWeight>0.35</ecoSystemWeight>
-    <forceDeathOnDowned>true</forceDeathOnDowned>
-    <forceNoDeathNotification>true</forceNoDeathNotification>
-    <lifeStages>
-      <li>
-        <bodyGraphicData>
-          <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
-          <drawSize>1</drawSize>
-          <color>(156,148,125)</color>
-          <shadowData>
-            <volume>(0.4, 0.5, 0.37)</volume>
-            <offset>(0,0,-0.15)</offset>
-          </shadowData>
-        </bodyGraphicData>
-        <dessicatedBodyGraphicData>
-          <texPath>Things/Pawn/Animal/Spelopede/Dessicated_Spelopede</texPath>
-          <drawSize>1</drawSize>
-        </dessicatedBodyGraphicData>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <instantTrainables>
+          <li>ARA_Sowing</li>
+        </instantTrainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay> <!-- 阻止这个动物的所有技能衰减 -->
       </li>
-    </lifeStages>
-  </PawnKindDef>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_HardJaw</defName>
+    <label>阿拉克涅坚颚种</label>
+    <description>阿拉克涅辅虫之一，智力低下，可以承担挖矿任务，注定在度过短暂的时光后死亡。</description>
+    <race>
+      <specialTrainables>
+        <li>Dig</li>
+        <li MayRequire="Ludeon.RimWorld.Odyssey">AttackTarget</li>
+      </specialTrainables>
+    </race>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <instantTrainables>
+          <li>Dig</li>
+          <li>AttackTarget</li>
+        </instantTrainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay> <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+    </comps>
+  </ThingDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
index 80a304c..ad48bc5 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -574,7 +574,7 @@
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_Myrmecocystus</defName>
     <label>阿拉克涅蜜罐种</label>
-    <description>阿拉克涅督虫之一，拥有非常广泛的食谱，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。这种督虫非常脆弱，并且没有可以接入武装器官的副肢。</description>
+    <description>阿拉克涅督虫之一，拥有非常广泛的食谱，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。这种督虫非常脆弱，并且没有可以接入武装器官的副肢。\n\n作为督虫，她可以繁育并监管若干阿拉克涅食腐种辅虫，以协助巢穴播种和收割作物。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -611,8 +611,8 @@
         <productionQueue>
           <li>
             <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
-            <count>3</count>
-            <cooldownTicks>60000</cooldownTicks>
+            <count>2</count>
+            <cooldownTicks>1000</cooldownTicks>
           </li>
         </productionQueue>
         <spawnEffecter>CocoonDestroyed</spawnEffecter>
@@ -668,7 +668,7 @@
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_ShieldHead</defName>
     <label>阿拉克涅盾头种</label>
-    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，防御力超群的同时还可以定时剥落甲壳素供虫巢使用。尽管她笨重缓慢且没有可以接入武装器官的副肢，但是在近战中仍不失为一个坚韧的战士。</description>
+    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，防御力超群的同时还可以定时剥落甲壳素供虫巢使用。尽管她笨重缓慢，但是仍不失为一个坚韧的战士。\n\n作为督虫，她可以繁育并监管若干阿拉克涅坚颚种辅虫，以协助巢穴开采矿脉。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -738,9 +738,9 @@
         <cooldownTicks>9999</cooldownTicks>
         <productionQueue>
           <li>
-            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
-            <count>3</count>
-            <cooldownTicks>60000</cooldownTicks>
+            <pawnKind>ArachnaeBase_Race_HardJaw</pawnKind>
+            <count>5</count>
+            <cooldownTicks>1000</cooldownTicks>
           </li>
         </productionQueue>
         <spawnEffecter>CocoonDestroyed</spawnEffecter>
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml
index 6ea8e7e..5f5d0e0 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml
@@ -522,6 +522,9 @@
           <li>GroinUncovered_Disapproved_Male</li>
           <li>GroinUncovered_Disapproved_Social_Female</li>
           <li>GroinUncovered_Disapproved_Social_Male</li>
+          <li>WitnessedDeathAlly</li>
+          <li>ObservedLayingCorpse</li>
+          <li>ObservedLayingRottingCorpse</li>
           <li>ApparelDamaged</li>
           <li>ProsthophileHappy</li>
           <li>ProsthophobeUnhappy</li>
@@ -680,7 +683,6 @@
         </li>
       </lifeStageAges>
       <canFlyInVacuum>false</canFlyInVacuum>
-      
     </race>
 
     <!-- 工具设置（攻击方式） -->
@@ -730,34 +732,23 @@
     </recipes>
 
     <comps>
-      <!-- <li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.DrawFaceGraphicsComp</compClass>
-			</li>
-			<li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.HeadControllerComp</compClass>
-			</li>
-			<li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.EyeballControllerComp</compClass>
-			</li>
-      <li MayRequire="Nals.FacialAnimation">
-        <compClass>FacialAnimation.LidControllerComp</compClass>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>WULA_MechCarrierSwitchHediff</disableHediff>
+        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
+        <maxIngredientCount>500</maxIngredientCount>
+        <startingIngredientCount>500</startingIngredientCount>
+        <costPerPawn>999</costPerPawn>
+        <cooldownTicks>9999</cooldownTicks>
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Slavey</pawnKind>
+            <count>5</count>
+            <cooldownTicks>1000</cooldownTicks>
+          </li>
+        </productionQueue>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
       </li>
-      <li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.BrowControllerComp</compClass>
-			</li>
-			<li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.MouthControllerComp</compClass>
-			</li>
-      <li MayRequire="Nals.FacialAnimation">
-        <compClass>FacialAnimation.SkinControllerComp</compClass>
-      </li>
-      <li MayRequire="Nals.FacialAnimation">
-				<compClass>FacialAnimation.FacialAnimationControllerComp</compClass>
-			</li> -->
-      <!--<li>
-        <compClass>FacialAnimation.EmotionControllerComp</compClass>
-      </li>-->
-      <!-- <li Class="CompProperties_DrugAddict"/> -->
     </comps>
   </AlienRace.ThingDef_AlienRace>
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/Thing_building/ARA_Building.xml b/1.6/1.6/Defs/Thing_building/ARA_Building.xml
index 0fdd9cf..fc31318 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_Building.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Building.xml
@@ -185,9 +185,9 @@
     <rotatable>false</rotatable>
     <tickerType>Normal</tickerType>
     <designationCategory>ARA_Buildings</designationCategory>
-    <thingCategories>
+    <!-- <thingCategories>
       <li>BuildingsSpecial</li>
-    </thingCategories>
+    </thingCategories> -->
     <statBases>
       <MaxHitPoints>50</MaxHitPoints>
       <Mass>4</Mass>
diff --git a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
index fc0a90e..3218afc 100644
--- a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
+++ b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
@@ -191,7 +191,7 @@
                   <trainable>Rescue</trainable>
                   <subNodes>
                     <li Class="JobGiver_RescueNearby">
-                      <radius>75</radius>
+                      <radius>500</radius>
                     </li>
                   </subNodes>
                 </li>
@@ -273,7 +273,7 @@
 
             <!-- Trained behavior: Haul-->
             <li Class="ThinkNode_ChancePerHour_Constant">
-              <mtbHours>1.5</mtbHours>
+              <mtbHours>0.5</mtbHours>
               <subNodes>
                 <li Class="ThinkNode_ConditionalRequireCapacities">
                   <requiredCapacities>
@@ -325,23 +325,13 @@
               </subNodes>
             </li>-->
 
-
-            <!-- 统一的农业工作节点 -->
+            <!-- OUR CUSTOM LOGIC INJECTION FOR PLANT HARVESTING -->
             <li Class="ArachnaeSwarm.ThinkNode_ConditionalAnimalShouldDoGrowingWork">
               <subNodes>
                 <!-- 统一的、智能的农业 JobGiver -->
                 <li Class="ArachnaeSwarm.JobGiver_Grower" />
               </subNodes>
             </li>
-
-
-            <!-- OUR CUSTOM LOGIC INJECTION FOR PLANT HARVESTING 
-            <li Class="ThinkNode_ConditionalTrainableCompleted">
-              <trainable>ARA_Sowing</trainable>
-              <subNodes>
-              </subNodes>
-            </li> -->
-
           </subNodes>
         </li>