From f72fb7e62e40007e1043bedf888f6e416c1c594e Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Mon, 8 Sep 2025 17:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=99=AB=E5=8D=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Defs/AbilityDefs/Abilities_EggSpew.xml    | 22 -------
 .../AbilityDefs/Abilities_TrackingCharge.xml  |  5 +-
 .../Defs/RecipeDefs/ARA_Recipes_Upgrade.xml   |  3 -
 .../Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml |  6 +-
 .../Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml | 14 ++---
 .../Thing_building/ARA_InteractiveEggSac.xml  | 59 ++++---------------
 6 files changed, 21 insertions(+), 88 deletions(-)

diff --git a/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml b/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
index 09da7e9..4064af6 100644
--- a/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
   <AbilityDef Name="ARA_EggSpew_Base" Abstract="True">
     <cooldownTicksRange>5000</cooldownTicksRange>
     <aiCanUse>false</aiCanUse>
@@ -31,7 +30,6 @@
       </li>
     </comps>
   </AbilityDef>
-
   <ThingDef Name="ARA_EggSpew_Base_Proj" ParentName="BaseGrenadeProjectile" Abstract="True">
     <thingClass>Projectile_SpawnsThing</thingClass>
     <graphicData>
@@ -45,7 +43,6 @@
       <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
     </projectile>
   </ThingDef>
-
   <AbilityDef Name="ARA_CocoonSpew_Base" Abstract="True">
     <cooldownTicksRange>5000</cooldownTicksRange>
     <aiCanUse>true</aiCanUse>
@@ -72,7 +69,6 @@
       </li>
     </comps>
   </AbilityDef>
-
   <ThingDef Name="ARA_CocoonSpew_Base_Proj" ParentName="BaseGrenadeProjectile" Abstract="True">
     <label>阿拉克涅孵化茧</label>
     <thingClass>Projectile_SpawnsThing</thingClass>
@@ -88,22 +84,6 @@
     </projectile>
   </ThingDef>
 
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_BaseFighter</defName>
-    <label>生育虫卵-战士虫</label>
-    <description>从卵巢中排出一颗休眠的虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。</description>
-    <iconPath>UI/Commands/EggSpew</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_BaseFighter</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
-        <requiredResearch>ARA_Technology_1KYC</requiredResearch>
-        <failMessage>需要科技 基因节点KYC-1"战士虫" 以解锁此孵化路径</failMessage>
-      </li>
-    </comps>
-  </AbilityDef>
-
   <AbilityDef ParentName="ARA_EggSpew_Base">
     <defName>ARA_EggSpew</defName>
     <label>生育虫卵</label>
@@ -115,6 +95,4 @@
       </li>
     </comps>
   </AbilityDef>
-
-
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/AbilityDefs/Abilities_TrackingCharge.xml b/1.6/1.6/Defs/AbilityDefs/Abilities_TrackingCharge.xml
index 9d0b745..065361b 100644
--- a/1.6/1.6/Defs/AbilityDefs/Abilities_TrackingCharge.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Abilities_TrackingCharge.xml
@@ -20,7 +20,7 @@
     <cooldownTicksRange>600</cooldownTicksRange>
     <verbProperties>
       <verbClass>ArachnaeSwarm.Verb_CastAbilityTrackingCharge</verbClass>
-      <label>tracking charge</label>
+      <label>追踪冲撞</label>
       <targetParams>
         <canTargetPawns>true</canTargetPawns>
         <canTargetBuildings>false</canTargetBuildings>
@@ -28,7 +28,7 @@
         <canTargetMechs>true</canTargetMechs>
         <canTargetSelf>false</canTargetSelf>
       </targetParams>
-      <range>60</range>
+      <range>30</range>
       <warmupTime>1.0</warmupTime>
     </verbProperties>
     <comps>
@@ -49,5 +49,4 @@
       </li>
     </comps>
   </AbilityDef>
-
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/RecipeDefs/ARA_Recipes_Upgrade.xml b/1.6/1.6/Defs/RecipeDefs/ARA_Recipes_Upgrade.xml
index 4f915c0..8fdd20c 100644
--- a/1.6/1.6/Defs/RecipeDefs/ARA_Recipes_Upgrade.xml
+++ b/1.6/1.6/Defs/RecipeDefs/ARA_Recipes_Upgrade.xml
@@ -22,7 +22,6 @@
       <li Class="HediffCompProperties_GiveAbility">
         <abilityDefs>
           <li>ARA_EggSpew</li>
-          <li>ARA_EggSpew_BaseFighter</li>
           <li>ARA_BindDrone</li>
           <li>ARA_Queen_Upgrade_1_Stage</li>
           <li>ARA_AcidSprayBurst_Queen</li>
@@ -111,7 +110,6 @@
       <li Class="HediffCompProperties_GiveAbility">
         <abilityDefs>
           <li>ARA_EggSpew</li>
-          <li>ARA_EggSpew_BaseFighter</li>
           <li>ARA_BindDrone</li>
           <li>ARA_AcidSprayBurst_Queen</li>
           <li>ARA_Queen_Upgrade_2_Stage</li>
@@ -195,7 +193,6 @@
       <li Class="HediffCompProperties_GiveAbility">
         <abilityDefs>
           <li>ARA_EggSpew</li>
-          <li>ARA_EggSpew_BaseFighter</li>
           <li>ARA_BindDrone</li>
           <li>ARA_AcidSprayBurst_Queen</li>
           <!-- <li>ARA_Queen_Upgrade_2_Stage</li> -->
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 a6e5baa..13279c4 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
@@ -60,9 +60,11 @@
         <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> -->
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
     </race>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
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 36c1dc7..95e503b 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -672,7 +672,7 @@
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_Myrmecocystus</defName>
     <label>阿拉克涅蜜罐种</label>
-    <description>阿拉克涅督虫之一，拥有非常广泛的食谱，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。这种督虫除了生产虫蜜外也能执行烹饪工作。\n\n作为督虫，她可以繁育并监管若干阿拉克涅苦役种辅虫，以协助巢穴进行搬运工作。</description>
+    <description>阿拉克涅督虫之一，拥有非常广泛的食谱，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。这种督虫除了生产虫蜜外也能执行烹饪和种植工作。\n\n作为督虫，她可以繁育并监管若干阿拉克涅食腐种辅虫，以协助巢穴进行收割和播种工作。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -774,7 +774,7 @@
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_ShieldHead</defName>
     <label>阿拉克涅盾头种</label>
-    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，防御力超群的同时还可以定时剥落甲壳素供虫巢使用。坚韧的鳌刺挥舞起来非常缓慢但是可以破开岩壁，以完成虫群的采矿工作。\n\n作为督虫，她可以繁育并监管若干阿拉克涅坚颚种辅虫，以协助巢穴开采矿脉。</description>
+    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，防御力超群的同时还可以定时剥落甲壳素供虫巢使用。坚韧的鳌刺挥舞起来非常缓慢但是可以破开岩壁和固定结构，以完成虫群的采矿和建筑工作。\n\n作为督虫，她可以繁育并监管若干阿拉克涅坚颚种辅虫，以协助巢穴开采矿脉。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -898,7 +898,7 @@
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_WeaponSmith</defName>
     <label>阿拉克涅工艺种</label>
-    <description>阿拉克涅督虫之一，是少数拥有结茧能力的非女皇种阿拉克涅虫族——她们可以排出一枚器官茧，这枚茧将按照其信息素所标定的方向定向演化出一个武装器官，以供虫群使用。除此之外，她们的辅肢比普通的虫族更加复杂灵活，这使得她们不仅可以执行手工、建造、艺术等复杂的工作，也可以操作武装器官——虽然她们本身极度脆弱。\n\n作为督虫，她可以繁育并监管若干阿拉克涅家政种辅虫，以协助巢穴进行清洁工作。</description>
+    <description>阿拉克涅督虫之一，是少数拥有结茧能力的非女皇种阿拉克涅虫族——她们可以排出一枚器官茧，这枚茧将按照其信息素所标定的方向定向演化出一个武装器官，以供虫群使用。除此之外，她们的辅肢比普通的虫族更加复杂灵活，这使得她们不仅可以执行手工、艺术等复杂的工作，也可以操作武装器官——虽然她们本身极度脆弱。\n\n作为督虫，她可以繁育并监管若干阿拉克涅家政种辅虫，以协助巢穴进行清洁和搬运工作。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -984,12 +984,10 @@
       </lifeStageAges>
     </race>
   </AlienRace.ThingDef_AlienRace>
-
-
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_Fighter</defName>
     <label>阿拉克涅战士种</label>
-    <description>阿拉克涅督虫之一，是巢穴中真正的战士，除了战斗外也可以进行狩猎和搬运。其拥有强大的可塑性基因，随着科技的解锁其将获得更多的能力。\n\n作为督虫，她可以向敌人投射寿命有限但是非常恼人的阿拉克涅酸噬种辅虫，以阻止敌人的远程火力开火。</description>
+    <description>阿拉克涅督虫之一，是巢穴中真正的战士，除了战斗外也可以进行狩猎和驯兽工作。其拥有强大的可塑性基因，随着科技的解锁其将获得更多的能力。\n\n作为督虫，她可以向敌人投射寿命有限但是非常恼人的阿拉克涅酸噬种辅虫，以阻止敌人的远程火力开火。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
@@ -1075,12 +1073,10 @@
       </lifeStageAges>
     </race>
   </AlienRace.ThingDef_AlienRace>
-
-
   <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
     <defName>ArachnaeNode_Race_Facehugger</defName>
     <label>阿拉克涅原虫种</label>
-    <description>阿拉克涅督虫之一，呈现高度未分化状态的特殊督虫，可以通过独特的神经链接管控制受害者的身体，并释放灵能信号以使得周围的人忽略其存在。\n\n不同于普通阿拉克涅虫族，高度未分化的身体决定了其无法孕育任何辅虫，在完成寄生前也无法进行任何工作。</description>
+    <description>阿拉克涅督虫之一，呈现高度未分化状态的特殊督虫，可以通过独特的神经链接管控制受害者的身体，并释放灵能信号以使得周围的人忽略其存在。\n\n不同于普通阿拉克涅虫族，高度未分化的身体决定了其无法孕育任何辅虫，在完成寄生前也难以胜任任何工作。</description>
     <alienRace>
       <generalSettings>
         <!-- 各种零件定义 -->
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 ed4dd92..d596e86 100644
--- a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
@@ -52,49 +52,7 @@
     </comps>
   </ThingDef>
 
-  <ThingDef ParentName="ARA_EggSpew_Base_Proj">
-    <defName>ARA_Proj_EggSac_BaseFighter</defName>
-    <label>阿拉克涅虫卵</label>
-    <projectile>
-      <spawnsThingDef>ARA_InteractiveEggSac_Basic_Fighter</spawnsThingDef>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="ARA_InteractiveEggSac_Base">
-    <defName>ARA_InteractiveEggSac_Basic_Fighter</defName>
-    <label>阿拉克涅虫卵囊 战士虫</label>
-    <description>一个脆弱、易燃、黏滑的囊状物，是阿拉克涅女皇种所诞之卵，内含哺育一只新督虫所需的营养和遗传物质，可以通过阿拉克涅女皇种的交互完成激活进程——参阅虫卵的超链接，了解各个督虫的特点。\n\n卵囊对温度极度敏感（该类型的卵适温为-10~22°C），需要小心保护！</description>
-    <descriptionHyperlinks>
-      <ThingDef>ArachnaeNode_Race_Fighter</ThingDef>
-    </descriptionHyperlinks>
-    <researchPrerequisites>
-      <li>ARA_Technology_1KYC</li>
-    </researchPrerequisites>
-
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SpawnPawnFromList">
-        <spawnablePawns>
-          <li>
-            <pawnKind>ArachnaeNode_Race_Fighter</pawnKind>
-            <delayTicks>12</delayTicks>
-            <requiredResearch>ARA_Technology_1KYC</requiredResearch>
-          </li>
-        </spawnablePawns>
-        <whitelist>
-          <li>ARA_ArachnaeQueen</li>
-        </whitelist>
-        <destroyOnSpawn>true</destroyOnSpawn>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_TemperatureRuinableDamage">
-        <minSafeTemperature>-10</minSafeTemperature>
-        <maxSafeTemperature>22</maxSafeTemperature>
-        <progressPerDegreePerTick>0.00005</progressPerDegreePerTick>
-        <damagePerTick>0.005</damagePerTick>
-        <recoveryRate>0.001</recoveryRate>
-      </li>
-    </comps>
-  </ThingDef>
-
+  <!-- T1 -->
   <ThingDef ParentName="ARA_EggSpew_Base_Proj">
     <defName>ARA_Proj_EggSac</defName>
     <label>阿拉克涅虫卵</label>
@@ -102,7 +60,6 @@
       <spawnsThingDef>ARA_InteractiveEggSac</spawnsThingDef>
     </projectile>
   </ThingDef>
-  
   <ThingDef ParentName="ARA_InteractiveEggSac_Base">
     <defName>ARA_InteractiveEggSac</defName>
     <label>阿拉克涅虫卵囊</label>
@@ -111,6 +68,7 @@
       <ThingDef>ArachnaeNode_Race_Myrmecocystus</ThingDef>
       <ThingDef>ArachnaeNode_Race_ShieldHead</ThingDef>
       <ThingDef>ArachnaeNode_Race_WeaponSmith</ThingDef>
+      <ThingDef>ArachnaeNode_Race_Fighter</ThingDef>
     </descriptionHyperlinks>
     <researchPrerequisites>
       <li>ARA_Base_Technology</li>
@@ -121,16 +79,21 @@
         <spawnablePawns>
           <li>
             <pawnKind>ArachnaeNode_Race_Myrmecocystus</pawnKind>
-            <delayTicks>180000</delayTicks>
+            <delayTicks>10000</delayTicks>
           </li>
           <li>
             <pawnKind>ArachnaeNode_Race_ShieldHead</pawnKind>
-            <delayTicks>180000</delayTicks>
+            <delayTicks>120000</delayTicks>
           </li>
           <li>
             <pawnKind>ArachnaeNode_Race_WeaponSmith</pawnKind>
             <delayTicks>180000</delayTicks>
           </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_Fighter</pawnKind>
+            <delayTicks>120000</delayTicks>
+            <requiredResearch>ARA_Technology_1KYC</requiredResearch>
+          </li>
         </spawnablePawns>
         <whitelist>
           <li>ARA_ArachnaeQueen</li>
@@ -146,7 +109,6 @@
       </li>
     </comps>
   </ThingDef>
-
   <ThingDef ParentName="ARA_InteractiveEggSac_Base">
     <defName>ARA_InteractiveEggSac_Start</defName>
     <label>初诞阿拉克涅虫卵囊</label>
@@ -189,5 +151,4 @@
       </li>
     </comps>
   </ThingDef>
-
-</Defs>
+</Defs>
\ No newline at end of file