1

2026-03-30 23:38:26 +08:00 · 2026-03-30 17:29:01 +08:00 · 2026-03-30 11:55:54 +08:00 · 2026-03-30 00:02:25 +08:00 · 2026-03-28 19:58:33 +08:00 · 2026-03-27 17:27:59 +08:00
335 changed files with 25559 additions and 15484 deletions
--- a/.snow/handoff_drop_pod_intercept.md
+++ b/.snow/handoff_drop_pod_intercept.md
@@ -0,0 +1,112 @@
+# 落地交付文档：天巫集群掠食 - 空投拦截系统
+
+## 1. 目标与结论
+- 目标：实现“敌方空投袭击可被天巫种拦截”的完整闭环（开关控制、拦截逻辑、视觉反馈、通知、持久化）。
+- 结论：核心功能已完成并通过编译，已具备交由 planer 进行方案审阅与验收测试的条件。
+
+## 2. 实现范围（按 plan.md 对齐）
+
+### 2.1 GameComponent 全局状态与拦截逻辑
+- 新增文件：`Source/ArachnaeSwarm/Flyover/GameComponent_DropPodInterceptor.cs`
+- 已实现：
+  - `bool interceptEnabled` 持久化（`ExposeData` + `Scribe_Values.Look`）。
+  - `ToggleIntercept()` 开关切换与日志。
+  - `HasAirborneTianwu()` 检查 `WorldComponent_AircraftManager.GetAvailableAircraftCount(...) > 0`。
+  - `TryInterceptDropPods(...)`：
+    - 前置检查：开关、敌对派系、可用天巫、至少保留 1 名袭击者。
+    - 随机拦截 1-3 名（上限由 `pawns.Count - 1` 约束）。
+    - 拦截对象执行 `Pawn.Kill(DamageInfo)`，收集 `Corpse`。
+    - 用 `DropPodUtility.DropThingsNear(...)` 以空投仓形式落尸。
+    - 触发 FlyOver（复用 `ARA_HiveCorvette_Fake`）与信件通知。
+
+### 2.2 Harmony 补丁
+- 新增文件：`Source/ArachnaeSwarm/HarmonyPatches/Patch_DropPodIntercept.cs`
+- 已实现：
+  - Prefix 挂钩：
+    - `PawnsArrivalModeWorker_EdgeDrop.Arrive`
+    - `PawnsArrivalModeWorker_CenterDrop.Arrive`
+  - 两个入口共用 `InterceptPrefix(...)`。
+  - **不跳过原方法**（`return true`），原方法继续处理剩余 `pawns`。
+
+### 2.3 引航种能力（开关）
+- 新增文件：`Source/ArachnaeSwarm/Abilities/CompAbilityEffect_ToggleDropPodIntercept.cs`
+- 已实现：
+  - `CompProperties_ToggleDropPodIntercept`
+  - `CompAbilityEffect_ToggleDropPodIntercept`
+    - `Apply`：切换全局开关 + 消息提示。
+    - `Valid`：无可用天巫时拒绝施放并提示。
+    - `ExtraLabelMouseAttachment`：显示“开启/关闭”状态文本。
+
+### 2.4 Ability Def
+- 新增文件：`1.6/1.6/Defs/AbilityDefs/Ability_DropPodIntercept.xml`
+- 已实现：
+  - 新能力 `ARA_ToggleDropPodIntercept`
+  - 自施放、`targetRequired=false`、`targetable=false`、无冷却切换。
+
+### 2.5 挂载到 Skyraider
+- 修改文件：`1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml`
+- 已实现：
+  - 在 `ArachnaeNode_Race_Skyraider` 的 `abilities` 中追加：`ARA_ToggleDropPodIntercept`
+
+### 2.6 本地化
+- 修改文件：`1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/AirStrike_Keys.xml`
+- 已实现 key：
+  - `ARA_ToggleDropPodIntercept_Label`
+  - `ARA_ToggleDropPodIntercept_Desc`
+  - `ARA_InterceptDropPod_Enabled`
+  - `ARA_InterceptDropPod_Disabled`
+  - `ARA_InterceptDropPod_NoAircraft`
+  - `ARA_InterceptDropPod_Status`
+  - `ARA_InterceptDropPod_StatusOn`
+  - `ARA_InterceptDropPod_StatusOff`
+  - `ARA_InterceptDropPod_LetterLabel`
+  - `ARA_InterceptDropPod_LetterText`
+
+### 2.7 工程文件同步
+- 修改文件：`Source/ArachnaeSwarm/ArachnaeSwarm.csproj`
+- 已实现：新增 3 个 C# 文件的 `<Compile Include="..." />`。
+
+## 3. 与 plan.md 的差异说明（供 planer 决策）
+- FlyOver Def：按 plan 的“优先复用”策略，当前复用 `ARA_HiveCorvette_Fake`，**未新增** `ARA_HiveCorvette_Intercept` ThingDef。
+- `CompAbilityEffect_ToggleDropPodIntercept.Valid` 使用单目标签名（与现项目其他 Ability 风格一致），未采用数组签名版本。
+- 能力 label/description 当前写在 AbilityDef 内，key 已补全；若需严格 DefInjected 化，可由 planer 决定是否二次整理。
+
+## 4. 构建与验证
+- 构建命令（已执行）：
+  - `MSBuild ArachnaeSwarm.csproj -p:Configuration=Release -verbosity:minimal`
+- 结果：通过。
+- 输出：
+  - `1.6/1.6/Assemblies/ArachnaeSwarm.dll`
+  - `1.6/1.6/Assemblies/ArachnaeSwarm.pdb`
+
+## 5. 建议的审阅清单（给 planer）
+- 逻辑正确性：
+  - 是否接受“至少保留 1 名袭击者”的平衡策略。
+  - 是否接受“仅敌对派系 + EdgeDrop/CenterDrop 生效”的作用域。
+- 体验反馈：
+  - FlyOver 速度、出现时机、信件文案是否符合预期。
+- 兼容性：
+  - 与其他修改袭击到场逻辑的 Harmony 补丁是否可能冲突。
+- 本地化策略：
+  - 是否要求将 AbilityDef `label/description` 进一步改为 DefInjected。
+
+## 6. 建议测试用例（未在本轮自动化执行）
+- Dev 触发 `Raid (EdgeDrop)`：验证拦截 1-3，尸体空投、FlyOver、信件。
+- Dev 触发 `Raid (CenterDrop)`：同上。
+- 关闭拦截后再触发空投：验证不拦截。
+- 触发 `EdgeWalkIn`：验证不拦截。
+- 触发友军空投：验证不拦截。
+- 存档/读档：验证 `interceptEnabled` 状态持久化。
+
+## 7. 当前改动文件清单
+- `Source/ArachnaeSwarm/Flyover/GameComponent_DropPodInterceptor.cs`（新增）
+- `Source/ArachnaeSwarm/HarmonyPatches/Patch_DropPodIntercept.cs`（新增）
+- `Source/ArachnaeSwarm/Abilities/CompAbilityEffect_ToggleDropPodIntercept.cs`（新增）
+- `1.6/1.6/Defs/AbilityDefs/Ability_DropPodIntercept.xml`（新增）
+- `1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml`（修改）
+- `1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/AirStrike_Keys.xml`（修改）
+- `Source/ArachnaeSwarm/ArachnaeSwarm.csproj`（修改）
+
+---
+
+如需我继续，可下一步直接输出“planer审阅意见处理版”补丁（按审阅结论二改）。
--- a/.snow/plan.md
+++ b/.snow/plan.md
@@ -0,0 +1,134 @@
+# Plan: 天巫集群掠食 — 空投拦截系统
+
+**TL;DR**：通过 Harmony Prefix 补丁拦截原版 `EdgeDrop` 和 `CenterDrop` 的 `Arrive()` 方法，在敌方空投仓落地前由天巫种拦截 1-3 个运输仓。击杀后尸体仍以运输仓形式落地。使用 `GameComponent` 全局管理开关状态，引航种 Pawn 通过自释放 `AbilityDef` 切换开关。拦截时生成天巫种 FlyOver 作为视觉反馈。
+
+## 架构概览
+
+```
+[敌方袭击触发]
+IncidentWorker_RaidEnemy → Arrive(pawns, parms)
+    ↓ Harmony Prefix
+[新增] Patch_DropPodIntercept
+    → GameComponent_DropPodInterceptor.TryIntercept()
+        ├── 检查 interceptEnabled (引航种toggle)
+        ├── 检查 WorldComponent_AircraftManager 有可用天巫
+        ├── 验证 parms.faction.HostileTo(Player)
+        ├── 随机选取 1-3 pawns → Kill → 获取 Corpse
+        ├── 用 DropPodUtility.DropThingsNear 投掷尸体
+        ├── FlyOver.MakeFlyOver() 生成拦截飞越视觉
+        └── ReceiveLetter 通知玩家
+    → 原 Arrive 继续执行（剩余 pawn 正常空投）
+
+[引航种能力]
+ArachnaeNode_Race_Skyraider → AbilityDef: ARA_ToggleDropPodIntercept
+    → CompAbilityEffect_ToggleDropPodIntercept.Apply()
+        → GameComponent_DropPodInterceptor.ToggleIntercept()
+```
+
+---
+
+## Steps
+
+### 1. 创建全局状态管理 `GameComponent_DropPodInterceptor`
+
+新文件：`Source/ArachnaeSwarm/Flyover/GameComponent_DropPodInterceptor.cs`
+
+- 继承 `GameComponent`，序列化字段 `bool interceptEnabled`
+- 属性 `IsInterceptEnabled` — 外部查询开关状态
+- 方法 `ToggleIntercept()` — 翻转开关 + `ArachnaeLog.Debug`
+- 方法 `HasAirborneTianwu()` — 查询 `WorldComponent_AircraftManager`：检查 `GetAvailableAircraftCount(ThingDef ARA_HiveCorvette_Entity, Faction.OfPlayer) > 0`（非全部冷却中即可，不消耗资源）
+- 核心方法 `TryInterceptDropPods(List<Pawn> pawns, IncidentParms parms, out List<Pawn> interceptedPawns)` — 完整拦截逻辑：
+  - 前置条件检查（`interceptEnabled` && `HasAirborneTianwu()` && `parms.faction.HostileTo(Faction.OfPlayer)`）
+  - 从 `pawns` 中随机移除 `Rand.RangeInclusive(1, Mathf.Min(3, pawns.Count - 1))` 个 Pawn（至少保留 1 个 pawn 正常空投，避免完全吞掉袭击）
+  - 对每个被拦截的 Pawn：调用 `pawn.Kill(new DamageInfo(DamageDefOf.Bomb, 9999f))`，收集 `pawn.Corpse` 到尸体列表
+  - 将尸体通过 `DropPodUtility.DropThingsNear(parms.spawnCenter, map, corpses, leaveSlag: true)` 投掷到同一空投区域
+  - 调用 `SpawnInterceptionFlyOver(map, parms.spawnCenter)` 生成天巫飞越视觉
+  - 调用 `SendInterceptionLetter(map, interceptedCount, parms.spawnCenter)` 发送信件
+- 方法 `SpawnInterceptionFlyOver(Map, IntVec3)` — 调用 `FlyOver.MakeFlyOver()` 生成 `ARA_HiveCorvette_Fake`（复用现有视觉 FlyOver ThingDef），起点从地图边缘到空投中心飞越
+- 方法 `SendInterceptionLetter(Map, int count, IntVec3)` — 发送自定义 `LetterDefOf.PositiveEvent` 信件，告知玩家拦截了多少运输仓
+- `ExposeData()` — `Scribe_Values.Look(ref interceptEnabled, "interceptEnabled", false)`
+
+### 2. 创建 Harmony 补丁 `Patch_DropPodIntercept`
+
+新文件：`Source/ArachnaeSwarm/HarmonyPatches/Patch_DropPodIntercept.cs`
+
+- `[HarmonyPatch(typeof(PawnsArrivalModeWorker_EdgeDrop), "Arrive")]` — Prefix
+- `[HarmonyPatch(typeof(PawnsArrivalModeWorker_CenterDrop), "Arrive")]` — Prefix
+- 两个 Prefix 共用同一个静态方法 `InterceptPrefix(List<Pawn> pawns, IncidentParms parms)`
+- Prefix 逻辑：获取 `Current.Game.GetComponent<GameComponent_DropPodInterceptor>()`，调用 `TryInterceptDropPods(pawns, parms)`
+- **不 skip 原方法**（`return true`），原方法继续用被修改过的 `pawns` 列表正常空投剩余敌人
+
+### 3. 创建引航种切换能力 `CompAbilityEffect_ToggleDropPodIntercept`
+
+新文件：`Source/ArachnaeSwarm/Abilities/CompAbilityEffect_ToggleDropPodIntercept.cs`
+
+- `CompProperties_ToggleDropPodIntercept` 继承 `CompProperties_AbilityEffect`，包含字段：
+  - `string enabledMessage` / `disabledMessage` — 开启/关闭时的消息文本 key
+  - `ThingDef requiredAircraftType` — 需要检查的战机类型（`ARA_HiveCorvette_Entity`）
+- `CompAbilityEffect_ToggleDropPodIntercept` 继承 `CompAbilityEffect`：
+  - `Apply(LocalTargetInfo, LocalTargetInfo)` — 获取 `GameComponent_DropPodInterceptor`，调用 `ToggleIntercept()`，发送 `Messages.Message` 通知当前状态
+  - `Valid(LocalTargetInfo[], bool)` — 检查 `WorldComponent_AircraftManager.HasAvailableAircraft` 是否有天巫升空；无天巫时禁用能力并显示 "无可用天巫种" 提示
+  - `ExtraLabelMouseAttachment(LocalTargetInfo)` — 返回当前状态文本（"掠食巡航: 开启/关闭"）
+
+### 4. 创建拦截 FlyOver 视觉 ThingDef
+
+修改现有文件 `1.6/1.6/Defs/Thing_Misc/ARA_Flyover_Item.xml`，新增 `ARA_HiveCorvette_Intercept` ThingDef：
+
+- 以 `ARA_HiveCorvette_Fake` 为模板（纯视觉 FlyOver，无攻击 Comp）
+- `thingClass="ArachnaeSwarm.FlyOver"`
+- 设置较快的 `flightSpeed`（拦截应该是快速掠过）
+- 可选添加 `CompProperties_SendLetterAfterTicks` 以在飞越后发出完成通知
+- 或直接复用 `ARA_HiveCorvette_Fake` defName，不新建 ThingDef
+
+### 5. 创建能力 XML 定义
+
+新文件：`1.6/1.6/Defs/AbilityDefs/Ability_DropPodIntercept.xml`
+
+- `AbilityDef` defName: `ARA_ToggleDropPodIntercept`
+- `label`: 掠食巡航（或类似命名）
+- `targetRequired: false`（自释放，无需目标）
+- `cooldownTicksRange: 0`（无冷却，即时切换）
+- `comps`:
+  - `CompProperties_ToggleDropPodIntercept`（`requiredAircraftType: ARA_HiveCorvette_Entity`）
+
+### 6. 将能力添加到引航种
+
+查找并修改引航种 `ArachnaeNode_Race_Skyraider` 的能力列表定义（可能在 `1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml` 或 Race ThingDef 中），在 `abilities` 列表中添加 `ARA_ToggleDropPodIntercept`
+
+### 7. 添加本地化文本
+
+修改 `1.6/1.6/Languages/ChineseSimplified/Keyed/` 下的翻译文件，添加：
+
+- `ARA_ToggleDropPodIntercept_Label` — "掠食巡航"
+- `ARA_ToggleDropPodIntercept_Desc` — 能力描述
+- `ARA_InterceptDropPod_Enabled` — "掠食巡航已启动"
+- `ARA_InterceptDropPod_Disabled` — "掠食巡航已关闭"
+- `ARA_InterceptDropPod_LetterLabel` — "天巫种拦截空投"
+- `ARA_InterceptDropPod_LetterText` — "天巫种在空中拦截了{0}个敌方运输仓…"
+- `ARA_InterceptDropPod_NoAircraft` — "没有可用的天巫种兽虫"
+
+---
+
+## Verification
+
+1. MSBuild 编译：`cd "ArachnaeSwarm\Source\ArachnaeSwarm" && MSBuild ArachnaeSwarm.csproj -p:Configuration=Release`
+2. 游戏内测试流程：
+   - 建造天巫种机库 → 起飞（注册战机到 WorldComponent_AircraftManager）
+   - 使用引航种能力开启"掠食巡航"
+   - 使用 dev console 触发 `Raid (EdgeDrop)` → 验证 1-3 个运输仓被拦截（尸体掉落 + FlyOver 视觉 + 信件）
+   - 使用 dev console 触发 `Raid (CenterDrop)` → 同上
+   - 关闭"掠食巡航" → 再次触发空投 → 验证不拦截
+   - 触发非空投袭击（EdgeWalkIn） → 验证不触发拦截
+   - 触发友方空投 → 验证不拦截（HostileTo 检查）
+3. 存档/读档测试：验证 `interceptEnabled` 状态持久化
+
+---
+
+## Decisions
+
+- **Harmony 挂钩点**：选 `PawnsArrivalModeWorker_EdgeDrop.Arrive` + `CenterDrop.Arrive` 而非底层 `DropPodUtility`，因为只需响应这两种袭击到场模式，不影响其他空投场景（贸易、任务奖励等）
+- **GameComponent vs MapComponent**：选 `GameComponent`（全局，跨地图），因为用户明确说"全局管理"
+- **不消耗战机资源**：只检查 `HasAvailableAircraft` 判断天巫是否升空，不调用 `TryUseAircraft`
+- **至少保留 1 个 pawn**：`Mathf.Min(3, pawns.Count - 1)` 确保不会完全吞掉袭击，玩家仍需应战
+- **Kill + Corpse 方案**：调用 `Pawn.Kill(DamageInfo)` 后获取 `Corpse`，再通过 `DropPodUtility.DropThingsNear` 以运输仓形式投掷尸体，既有"被击杀"的反馈感，又能剥削敌方装备
+- **复用 `ARA_HiveCorvette_Fake`**：优先复用现有纯视觉 FlyOver，避免新增无意义 ThingDef；若需要不同飞行参数再另建
--- a/1.6/1.6/Assemblies/ArachnaeSwarm.dll
+++ b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
--- a/1.6/1.6/Assemblies/ArachnaeSwarm.pdb
+++ b/1.6/1.6/Assemblies/ArachnaeSwarm.pdb
--- a/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
+++ b/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
@@ -4,7 +4,7 @@
  <AbilityDef ParentName="AbilityTouchBase">
    <defName>ARA_BindDrone</defName>
    <label>信息素标记</label>
-    <description>使用信息素标记一只阿拉克涅督虫（包括野生虫群子个体），受到标记的督虫和其麾下的辅虫将誓死效忠于女皇种，并与其建立心灵链接。\n\n除了手动链接外，女皇种也会每60秒尝试自动链接己方所有未链接的阿拉克涅督虫，此类链接和手动链接不一样，不需要目视。</description>
+    <description>使用信息素标记一只野生阿拉克涅督虫或兽虫个体，其将脱离野兽状态，誓死效忠于女皇种，并与其建立心灵链接。\n\n对于己方的督虫和兽虫，女皇种会自动与其建立链接，不需要技能。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_BindDrone</iconPath>    <!-- Placeholder: You'll need to create this icon -->

    <hotKey>Misc1</hotKey>
@@ -91,6 +91,66 @@
      </li>
    </comps>
  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Suicide_Ability</defName>
+    <label>自杀</label>
+    <description>只要一声令下，阿拉克涅虫族随时可以为了虫巢的大业立刻死去</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Suicide_Ability</iconPath>
+    <cooldownTicksRange>1</cooldownTicksRange>
+    <aiCanUse>false</aiCanUse>
+    <displayOrder>9900</displayOrder>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>24</range>
+      <warmupTime>15</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityDestroyOwnBodyPart">
+        <bodyPartsToDestroy>
+          <li>Brain</li>
+        </bodyPartsToDestroy>
+      </li>
+    </comps>
+  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Suicide_Fast_Ability</defName>
+    <label>自杀</label>
+    <description>只要一声令下，阿拉克涅虫族随时可以为了虫巢的大业立刻死去</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Suicide_Ability</iconPath>
+    <cooldownTicksRange>1</cooldownTicksRange>
+    <aiCanUse>false</aiCanUse>
+    <displayOrder>9900</displayOrder>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>24</range>
+      <warmupTime>2</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityDestroyOwnBodyPart">
+        <bodyPartsToDestroy>
+          <li>Brain</li>
+        </bodyPartsToDestroy>
+      </li>
+    </comps>
+  </AbilityDef>

  <!-- 女皇 -->
  <AbilityDef>
@@ -131,6 +191,19 @@
      </li>
    </comps>
  </AbilityDef>
+  <ThingDef Name="ARA_EggSpew_Base_Proj" ParentName="BaseGrenadeProjectile" Abstract="True">
+    <thingClass>Projectile_SpawnsThing</thingClass>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Building/ARA_EggSac</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <speed>21</speed>
+      <damageAmountBase>0</damageAmountBase>
+      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
+    </projectile>
+  </ThingDef>
  <ThingDef ParentName="ARA_EggSpew_Base_Proj">
    <defName>ARA_Proj_Tumor</defName>
    <label>阿拉克涅菌瘤</label>
@@ -199,8 +272,8 @@
  </ThingDef>
  <AbilityDef>
    <defName>ARA_AcidSprayBurst_Queen</defName>
-    <label>女皇种酸液轰炸</label>
-    <description>阿拉克涅女皇种向目标地点喷射大量腐蚀性酸液，喷射将持续数秒以完全覆盖一片区域。</description>
+    <label>酸液轰炸</label>
+    <description>向目标地点喷射大量腐蚀性酸液，完全覆盖一片区域以杀伤敌军并降低幸存者的护甲。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_AcidSprayBurst</iconPath>
    <cooldownTicksRange>5000</cooldownTicksRange>    <!-- 2 hours -->
    <aiCanUse>false</aiCanUse>
@@ -239,7 +312,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_6VXI</requiredResearch>
-        <failMessage>需要科技 节点VXI-6"酸囊" 以解锁技能</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -282,6 +354,7 @@
    <writeCombatLog>True</writeCombatLog>
    <showPsycastEffects>False</showPsycastEffects>
    <cooldownTicksRange>6000</cooldownTicksRange>
+    <aiCanUse>true</aiCanUse>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Toxic_Needle_Fire</iconPath>
    <verbProperties>
      <verbClass>Verb_CastAbility</verbClass>
@@ -296,8 +369,16 @@
    </verbProperties>
    <comps>
      <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
+        <!-- 默认状态参数 -->
        <projectileDef>Bullet_ARA_RW_Basic_Fist_Needle_Gun</projectileDef>
        <numProjectiles>12</numProjectiles>
+        
+        <!-- 偏移配置 -->
+        <offsetRadius>0</offsetRadius>
+        <useRandomOffset>true</useRandomOffset>
+        <offsetInCircle>true</offsetInCircle>
+        <avoidOverlap>false</avoidOverlap>
+        <shotIntervalTicks>3</shotIntervalTicks>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
        <customLabel>饮食</customLabel>
@@ -312,7 +393,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_5PAV</requiredResearch>
-        <failMessage>需要科技 节点PAV-5"毒刺" 以解锁技能</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -358,48 +438,11 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_6VXI</requiredResearch>
-        <failMessage>需要科技 节点VXI-6"酸囊" 以解锁技能</failMessage>
      </li>
    </comps>
  </AbilityDef>

  <!-- 空天 -->
-  <AbilityDef>
-    <defName>ARA_BaseRace_Skyhive_Launcher</defName>
-    <label>天巢种喷射巢</label>
-    <description>将三只阿拉克涅天巢种辅虫发射到目标身上，天巢种将附着到敌人身上撕咬，脱落后仍然能继续对敌人展开攻击。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_BaseRace_Launcher</iconPath>
-    <cooldownTicksRange>5000</cooldownTicksRange>
-    <aiCanUse>true</aiCanUse>
-    <displayOrder>300</displayOrder>
-    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
-    <charges>3</charges>
-    <cooldownPerCharge>true</cooldownPerCharge>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <range>24</range>
-      <warmupTime>1</warmupTime>
-      <soundCast>AcidSpray_Resolve</soundCast>
-      <violent>false</violent>
-      <targetParams>
-        <canTargetPawns>True</canTargetPawns>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
-        <projectileDef>Bullet_ARA_RW_Basic_SkyHive_Gun</projectileDef>
-        <numProjectiles>3</numProjectiles>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
-        <customLabel>饮食</customLabel>
-        <showProgressBar>true</showProgressBar>
-        <needDef>Food</needDef>
-        <needCost>0.2</needCost>
-        <failMessage>营养值不足，需要进食</failMessage>
-      </li>
-    </comps>
-  </AbilityDef>
  <AbilityDef>
    <defName>ARA_Skyraider_jump</defName>
    <label>高空机动</label>
@@ -407,6 +450,7 @@
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Skyraider_jump</iconPath>    <!-- Placeholder Icon -->
    <cooldownTicksRange>5000</cooldownTicksRange>
    <hostile>false</hostile>
+    <aiCanUse>false</aiCanUse>
    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
    <charges>2</charges>
    <cooldownPerCharge>true</cooldownPerCharge>
@@ -488,6 +532,7 @@
    <cooldownTicksRange>6000</cooldownTicksRange>
    <targetRequired>false</targetRequired>
    <hostile>false</hostile>
+    <aiCanUse>true</aiCanUse>
    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
    <verbProperties>
      <verbClass>Verb_CastAbility</verbClass>
@@ -529,6 +574,45 @@
      </li> -->
    </comps>
  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Baneling_Suicide_Ability</defName>
+    <label>良性自爆</label>
+    <description>阿拉克涅爆裂种在不使强腐蚀酸活化的情况下发生自爆，这种自爆只会造成轻微的伤害，不会产生酸雾，并在大范围内留下菌毯。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Suicide_Ability</iconPath>
+    <cooldownTicksRange>1</cooldownTicksRange>
+    <aiCanUse>false</aiCanUse>
+    <displayOrder>9900</displayOrder>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <statBases>
+      <Ability_EffectRadius>6.9</Ability_EffectRadius>
+    </statBases>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>24</range>
+      <warmupTime>2</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityExplosion">
+        <damageAmount>1</damageAmount>
+        <damageDef>ARA_CreepBomb</damageDef>
+        <explosionRadius>6.9</explosionRadius>
+        <armorPenetration>0</armorPenetration>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityDestroyOwnBodyPart">
+        <bodyPartsToDestroy>
+          <li>Brain</li>
+        </bodyPartsToDestroy>
+      </li>
+    </comps>
+  </AbilityDef>
  <!-- 王虫 -->
  <AbilityDef>
    <defName>ARA_Smokepop_Creeper_Ability_On</defName>
@@ -634,6 +718,7 @@
    <cooldownTicksRange>6000</cooldownTicksRange>
    <charges>2</charges>
    <cooldownPerCharge>true</cooldownPerCharge>
+    <aiCanUse>false</aiCanUse>
    <verbProperties>
      <verbClass>ArachnaeSwarm.Verb_CastAbilityTrackingCharge</verbClass>
      <label>追踪冲撞</label>
@@ -654,7 +739,7 @@
        <initialDamage>15</initialDamage>
        <damagePerTile>1.5</damagePerTile>
        <inertiaDistance>6</inertiaDistance>
-        <collisionDamageDef>Blunt</collisionDamageDef>
+        <collisionDamageDef>Demolish</collisionDamageDef>
        <flyerDef>ARA_Flyer_TrackingCharge</flyerDef>
        <collisionRadius>1.5</collisionRadius>        <!-- Larger collision radius -->
        <impactSound>Pawn_Melee_BigBash_HitPawn</impactSound>
@@ -677,7 +762,7 @@
    <defName>ARA_Flyer_TrackingCharge</defName>
    <thingClass>ArachnaeSwarm.PawnFlyer_TrackingCharge</thingClass>
    <pawnFlyer>
-      <flightSpeed>0.5</flightSpeed>
+      <flightSpeed>1.5</flightSpeed>
      <heightFactor>0</heightFactor>
    </pawnFlyer>
  </ThingDef>
@@ -810,8 +895,43 @@
      </li>
    </comps>
  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Ability_Morph</defName>
+    <label>织域形态</label>
+    <description>生成织座，将自己转换为一个静态建筑。这个形态下，阿拉克涅织域种可以研究虫群更高级的科技。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Ability_Morph</iconPath>
+    <cooldownTicksRange>6000</cooldownTicksRange>
+    <hotKey>Misc12</hotKey>
+    <targetRequired>false</targetRequired>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <drawAimPie>false</drawAimPie>
+      <requireLineOfSight>false</requireLineOfSight>
+      <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
+      <warmupTime>1</warmupTime>
+      <range>19.9</range>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityTerrainRestriction">
+        <terrainDefs>
+          <li>ARA_InsectCreep</li>
+          <li>ARA_InsectCreepTile</li>
+        </terrainDefs>
+        <!-- <casterTerrainFailMessage>在阿拉克涅菌毯上才能使用此技能</casterTerrainFailMessage>
+        <disabledReasonKey>不在阿拉克涅菌毯上</disabledReasonKey> -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityTransform">
+        <buildingDef>ARA_MorphableResearchBench</buildingDef>
+      </li>
+    </comps>
+  </AbilityDef>

-  <!-- 疗愈 -->
+  <!-- 蜜罐 -->
  <AbilityDef>
    <defName>ARA_MimicNematode_Needle_Fire</defName>
    <label>拟线种寄生针</label>
@@ -821,23 +941,32 @@
    <cooldownTicksRange>6000</cooldownTicksRange>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Toxic_Needle_Fire</iconPath>
    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+    <aiCanUse>false</aiCanUse>
    <verbProperties>
-      <verbClass>Verb_AbilityShoot</verbClass>
-      <defaultProjectile>Bullet_ARA_MimicNematode_Needle</defaultProjectile>
+      <verbClass>Verb_CastAbility</verbClass>
      <range>5</range>
+      <warmupTime>0.1</warmupTime>
      <soundCast>Heatspikes_Shot</soundCast>
      <soundCastTail>Heatspikes_Tail</soundCastTail>
-      <muzzleFlashScale>9</muzzleFlashScale>
-      <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-      <warmupTime>0</warmupTime>
-      <burstShotCount>32</burstShotCount>
-      <accuracyTouch>1</accuracyTouch>
-      <accuracyShort>1</accuracyShort>
-      <accuracyMedium>1</accuracyMedium>
-      <accuracyLong>1</accuracyLong>
-      <ai_IsWeapon>false</ai_IsWeapon>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
    </verbProperties>
    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
+        <!-- 默认状态参数 -->
+        <projectileDef>Bullet_ARA_MimicNematode_Needle</projectileDef>
+        <numProjectiles>32</numProjectiles>
+        
+        <!-- 偏移配置 -->
+        <offsetRadius>1</offsetRadius>
+        <useRandomOffset>true</useRandomOffset>
+        <offsetInCircle>true</offsetInCircle>
+        <avoidOverlap>false</avoidOverlap>
+        <shotIntervalTicks>3</shotIntervalTicks>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
        <customLabel>饮食</customLabel>
        <showProgressBar>true</showProgressBar>
@@ -851,7 +980,52 @@
      </li> -->
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_2MED</requiredResearch>
-        <failMessage>需要科技 节点MED-2"拟线寄生" 以解锁技能</failMessage>
+      </li>
+    </comps>
+  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_SymbioticStabilizer</defName>
+    <label>拟线控制</label>
+    <description>向目标注射阿拉克涅拟线种的控制溶液，溶液将保证目标不会因为阿拉克涅拟线种在体内的扩散而死亡。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Dissolver_Touch</iconPath>
+    <cooldownTicksRange>6000</cooldownTicksRange>
+    <charges>5</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <hostile>false</hostile>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <stunTargetWhileCasting>true</stunTargetWhileCasting>
+    <aiCanUse>true</aiCanUse>
+    <!-- <warmupStartSound>AcidSpray_Warmup</warmupStartSound> -->
+    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <verbProperties>
+      <verbClass>Verb_CastAbilityTouch</verbClass>
+      <violent>false</violent>
+      <forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+      <warmupTime>0.5</warmupTime>
+      <range>-1</range>
+      <requireLineOfSight>false</requireLineOfSight>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <targetParams>
+        <canTargetPawns>true</canTargetPawns>
+        <canTargetAnimals>true</canTargetAnimals>
+        <canTargetMechs>false</canTargetMechs>
+        <canTargetSubhumans>true</canTargetSubhumans>
+        <canTargetEntities>false</canTargetEntities>
+        <canTargetBuildings>false</canTargetBuildings>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.2</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>ARA_SymbioticStabilizer</hediffDef>
+        <replaceExisting>true</replaceExisting>
      </li>
    </comps>
  </AbilityDef>
@@ -869,6 +1043,94 @@
      <speed>40</speed>
    </projectile>
  </ThingDef>
+  <AbilityDef>
+    <defName>ARA_FireSpew</defName>
+    <label>爆燃火焰</label>
+    <description>爆燃种经过短暂蓄力后，向前大范围地喷出火焰。这种火焰喷射距离不是太长，但是可以形成一道致密的火墙。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_FireSpew</iconPath>
+    <cooldownTicksRange>5000</cooldownTicksRange>
+    <aiCanUse>true</aiCanUse>
+    <ai_IsIncendiary>true</ai_IsIncendiary>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <warmupStartSound>FireSpew_Warmup</warmupStartSound>
+    <charges>3</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>10</range>
+      <warmupTime>1</warmupTime>
+      <soundCast>FireSpew_Resolve</soundCast>
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.25</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+      <li Class="CompProperties_AbilityFireSpew">
+        <range>10</range>
+        <lineWidthEnd>35</lineWidthEnd>
+        <filthDef>Filth_FlammableBile</filthDef>
+        <effecterDef>Fire_Spew</effecterDef>
+        <canHitFilledCells>true</canHitFilledCells>
+      </li>
+    </comps>
+  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Dissolver_Touch</defName>
+    <label>溶脂强酸</label>
+    <description>在极近的范围内向目标泼洒溶脂强酸，目标的器官会快速分解，变成大量的虫蜜。因为准头很差，无法用于战场上，只能对不反抗的目标使用。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Dissolver_Touch</iconPath>
+    <cooldownTicksRange>1000</cooldownTicksRange>
+    <charges>3</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <hostile>false</hostile>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <stunTargetWhileCasting>true</stunTargetWhileCasting>
+    <aiCanUse>true</aiCanUse>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <verbProperties>
+      <verbClass>Verb_CastAbilityTouch</verbClass>
+      <violent>false</violent>
+      <forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+      <warmupTime>0.5</warmupTime>
+      <range>-1</range>
+      <requireLineOfSight>false</requireLineOfSight>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <targetParams>
+        <canTargetPawns>true</canTargetPawns>
+        <onlyTargetColonistsOrPrisonersOrSlaves>true</onlyTargetColonistsOrPrisonersOrSlaves>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.1</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityHediffBlacklist">
+        <blacklistedHediffs>
+          <li>ARA_HiveMindMaster</li>
+          <li>ARA_HiveMindDrone</li>
+          <li>ARA_HiveMindWorker</li>
+        </blacklistedHediffs>
+        <blockedMessage>ARA_BlacklistedHediff_Blocked</blockedMessage>
+      </li>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>ARA_Dissolver_Touch_Damage</hediffDef>
+        <replaceExisting>true</replaceExisting>
+      </li>
+    </comps>
+  </AbilityDef>

  <!-- 追猎 -->
  <AbilityDef>
@@ -881,6 +1143,7 @@
    <cooldownPerCharge>true</cooldownPerCharge>
    <hostile>false</hostile>
    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <aiCanUse>true</aiCanUse>
    <verbProperties>
      <verbClass>Verb_CastAbilityJump</verbClass>
      <violent>false</violent>
@@ -920,6 +1183,7 @@
    <warmupEffecter>HoraxianAbilityCasting</warmupEffecter>
    <warmupSound>AnomalyAbilityWarmup</warmupSound>
    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <aiCanUse>true</aiCanUse>
    <verbProperties>
      <verbClass>Verb_CastAbilityTouch</verbClass>
      <drawAimPie>false</drawAimPie>
@@ -940,46 +1204,6 @@
    </comps>
  </AbilityDef>

-  <!-- 爆燃 -->
-  <AbilityDef>
-    <defName>ARA_FireSpew</defName>
-    <label>爆燃火焰</label>
-    <description>爆燃种经过短暂蓄力后，向前大范围地喷出火焰。这种火焰喷射距离不是太长，但是可以形成一道致密的火墙。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_FireSpew</iconPath>
-    <cooldownTicksRange>5000</cooldownTicksRange>
-    <aiCanUse>true</aiCanUse>
-    <ai_IsIncendiary>true</ai_IsIncendiary>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <warmupStartSound>FireSpew_Warmup</warmupStartSound>
-    <charges>3</charges>
-    <cooldownPerCharge>true</cooldownPerCharge>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <range>10</range>
-      <warmupTime>1</warmupTime>
-      <soundCast>FireSpew_Resolve</soundCast>
-      <targetParams>
-        <canTargetLocations>true</canTargetLocations>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
-        <customLabel>饮食</customLabel>
-        <showProgressBar>true</showProgressBar>
-        <needDef>Food</needDef>
-        <needCost>0.25</needCost>
-        <failMessage>营养值不足，需要进食</failMessage>
-      </li>
-      <li Class="CompProperties_AbilityFireSpew">
-        <range>10</range>
-        <lineWidthEnd>35</lineWidthEnd>
-        <filthDef>Filth_FlammableBile</filthDef>
-        <effecterDef>Fire_Spew</effecterDef>
-        <canHitFilledCells>true</canHitFilledCells>
-      </li>
-    </comps>
-  </AbilityDef>
-
  <!-- 畸变 -->
  <AbilityDef>
    <defName>ARA_Genestealer_ExtractGene</defName>
@@ -993,6 +1217,7 @@
    <warmupEffecter>HoraxianAbilityCasting</warmupEffecter>
    <warmupSound>AnomalyAbilityWarmup</warmupSound>
    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <aiCanUse>false</aiCanUse>
    <verbProperties>
      <verbClass>Verb_CastAbilityTouch</verbClass>
      <drawAimPie>false</drawAimPie>
@@ -1049,6 +1274,7 @@
    <warmupEffecter>HoraxianAbilityCasting</warmupEffecter>
    <warmupSound>AnomalyAbilityWarmup</warmupSound>
    <jobDef>CastAbilityOnThingMelee</jobDef>
+    <aiCanUse>false</aiCanUse>
    <verbProperties>
      <verbClass>Verb_CastAbilityTouch</verbClass>
      <drawAimPie>false</drawAimPie>
@@ -1407,7 +1633,7 @@

  <!-- 禁卫 -->
  <AbilityDef>
-    <defName>ARA_Praetorian_jump</defName>
+    <defName>ARA_Praetorian_Jump</defName>
    <label>禁卫种跳跃</label>
    <description>以强力的肌腱向目标地点跳跃。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Fighter_Invisibility_jump</iconPath>
@@ -1500,10 +1726,166 @@
      </li>
    </comps>
  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Locust_AcidSprayBurst</defName>
+    <label>酸液喷洒</label>
+    <description>阿拉克涅蝗虫种向目标地点喷射腐蚀性酸液。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_AcidSprayBurst</iconPath>
+    <cooldownTicksRange>180</cooldownTicksRange>
+    <aiCanUse>true</aiCanUse>
+    <displayOrder>300</displayOrder>
+    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>16</range>
+      <warmupTime>0.01</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>4</numCellsToHit>
+        <sprayEffecter>AcidSpray_Directional</sprayEffecter>
+
+        <!-- CompProperties_AbilitySprayLiquidMulti 新增的属性 -->
+        <shotCount>1</shotCount>        <!-- 总共发射5次 -->
+        <ticksBetweenShots>3</ticksBetweenShots>        <!-- 每次发射间隔12 Ticks (0.2秒) -->
+      </li>
+    </comps>
+  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Praetorian_TailSweep</defName>
+    <label>扫尾</label>
+    <description>甩动尾巴猛抽面前的敌人，对扇形范围内所有的敌对目标造成伤害，如果对方在攻击中幸存，就会被击飞并眩晕一段时间。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Praetorian_TailSweep</iconPath>
+    <aiCanUse>true</aiCanUse>
+    <hostile>true</hostile>
+    <casterMustBeCapableOfViolence>true</casterMustBeCapableOfViolence>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>6</range>
+      <warmupTime>0.6</warmupTime>
+      <soundCast>Pawn_Melee_BigBash_HitPawn</soundCast>
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityEffecterOnCaster" MayRequire="Ludeon.Rimworld.Odyssey">
+        <effecterDef>WarTrumpet</effecterDef>
+        <maintainTicks>20</maintainTicks>        <!-- Long enough for the "2nd wave" to spawn -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.3</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityFanShapedStunKnockback">
+        <!-- 扇形参数 -->
+        <range>6</range>
+        <coneSizeDegrees>100</coneSizeDegrees>
+        <lineWidthEnd>12</lineWidthEnd>
+        
+        <!-- 伤害参数 -->
+        <damageDef>Blunt</damageDef>
+        <damageAmount>25</damageAmount>
+        <armorPenetration>1</armorPenetration>
+        
+        <!-- 眩晕参数 -->
+        <stunTicks>120</stunTicks>
+        
+        <!-- 击退参数 -->
+        <maxKnockbackDistance>3</maxKnockbackDistance>
+        <canKnockbackIntoWalls>false</canKnockbackIntoWalls>
+        <requireLineOfSight>false</requireLineOfSight>
+
+        <affectNonPawnThings>true</affectNonPawnThings>
+        <canDamageNonPawnThings>true</canDamageNonPawnThings>
+        <nonPawnDamageMultiplier>5</nonPawnDamageMultiplier>
+        <applySpecialEffectsToNonPawn>false</applySpecialEffectsToNonPawn>
+        
+        <!-- 视觉效果 -->
+        <impactEffecter>ARA_Melee_Attack_Hit</impactEffecter>
+        <impactSound>Pawn_Melee_BigBash_HitPawn</impactSound>
+        
+        <!-- 飞行效果 -->
+        <knockbackFlyerDef>ARA_PawnFlyer</knockbackFlyerDef>
+        <!-- <flightEffecterDef>FlightEffect_Knockback</flightEffecterDef> -->
+        <landingSound>Longjump_Land</landingSound>
+        
+        <!-- 过滤设置 -->
+        <affectCaster>false</affectCaster>
+        <canHitFilledCells>true</canHitFilledCells>
+        <onlyAffectEnemies>false</onlyAffectEnemies>
+        <requireLineOfSightToTarget>true</requireLineOfSightToTarget>
+    
+        <!-- 近战伤害系数加成 -->
+        <multiplyDamageByMeleeFactor>false</multiplyDamageByMeleeFactor>
+        <multiplyStunTimeByMeleeFactor>false</multiplyStunTimeByMeleeFactor>
+      </li>
+    </comps>
+  </AbilityDef>
+  <ThingDef Name="ARA_PawnFlyer" ParentName="PawnFlyerBase">
+    <defName>ARA_PawnFlyer</defName>
+    <thingClass>ArachnaeSwarm.SaferPawnFlyer</thingClass>
+    <pawnFlyer>
+      <flightSpeed>8</flightSpeed>
+    </pawnFlyer>
+  </ThingDef>
+  <ThingDef ParentName="ARA_PawnFlyer">
+    <defName>ARA_PawnFlyer_Stun</defName>
+    <pawnFlyer>
+      <stunDurationTicksRange>180~240</stunDurationTicksRange>
+    </pawnFlyer>
+  </ThingDef>
+  <AbilityDef>
+    <defName>ARA_Praetorian_Long_Jump</defName>
+    <label>禁卫种跳跃</label>
+    <description>以强力的肌腱向目标地点跳跃。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Fighter_Invisibility_jump</iconPath>
+    <cooldownTicksRange>1000</cooldownTicksRange>
+    <charges>3</charges>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <aiCanUse>false</aiCanUse>
+    <hostile>false</hostile>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbilityJump</verbClass>
+      <violent>false</violent>
+      <forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+      <!-- <warmupTime>0.5</warmupTime> -->
+      <range>26</range>
+      <requireLineOfSight>false</requireLineOfSight>
+      <soundCast>Longjump_Jump</soundCast>
+      <soundLanding>Longjump_Land</soundLanding>
+      <targetParams>
+        <canTargetLocations>true</canTargetLocations>
+        <canTargetPawns>false</canTargetPawns>
+        <canTargetBuildings>false</canTargetBuildings>
+      </targetParams>
+    </verbProperties>
+    <jobDef>CastJump</jobDef>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.1</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+    </comps>
+  </AbilityDef>

  <!-- 蜕荚 -->
  <AbilityDef>
-    <defName>ARA_Pouch_Hatching_Acidling</defName>
+    <defName>ARA_Pouch_Hatching_Baneling</defName>
    <label>蜕荚孵化：爆裂种</label>
    <description>立刻在脚下孵化三只阿拉克涅爆裂种辅虫，它们会对敌方发起自杀性攻击。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_BaseRace_Launcher</iconPath>
@@ -1525,8 +1907,16 @@
    </verbProperties>
    <comps>
      <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
-        <projectileDef>ArachnaeBase_Race_Acidling_Proj</projectileDef>
+        <!-- 默认状态参数 -->
+        <projectileDef>ArachnaeBase_Race_Baneling_Proj</projectileDef>
        <numProjectiles>3</numProjectiles>
+        
+        <!-- 偏移配置 -->
+        <offsetRadius>1</offsetRadius>
+        <useRandomOffset>true</useRandomOffset>
+        <offsetInCircle>true</offsetInCircle>
+        <avoidOverlap>false</avoidOverlap>
+        <shotIntervalTicks>3</shotIntervalTicks>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
        <customLabel>饮食</customLabel>
@@ -1582,33 +1972,85 @@
    </comps>
  </AbilityDef>

-  <!-- 杂项 -->
+  <!-- 变异 -->
  <AbilityDef>
-    <defName>ARA_Suicide_Ability</defName>
-    <label>自杀</label>
-    <description>只要一声令下，阿拉克涅虫族随时可以为了虫巢的大业立刻死去</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Suicide_Ability</iconPath>
-    <cooldownTicksRange>1</cooldownTicksRange>
-    <aiCanUse>false</aiCanUse>
-    <displayOrder>9900</displayOrder>
-    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
-    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
+    <defName>ARA_Incubator_5_EliteReward_Jump</defName>
+    <label>力大砖飞</label>
+    <description>该阿拉克涅督虫变异过的恐怖肌肉可以像弹簧一样将其弹射出去。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Fighter_Invisibility_jump</iconPath>
+    <cooldownTicksRange>6000</cooldownTicksRange>
+    <hostile>false</hostile>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <range>24</range>
-      <warmupTime>15</warmupTime>
-      <soundCast>AcidSpray_Resolve</soundCast>
+      <verbClass>Verb_CastAbilityJump</verbClass>
      <violent>false</violent>
-      <targetable>false</targetable>
+      <forceNormalTimeSpeed>false</forceNormalTimeSpeed>
+      <!-- <warmupTime>0.5</warmupTime> -->
+      <range>18</range>
+      <requireLineOfSight>false</requireLineOfSight>
+      <soundCast>Longjump_Jump</soundCast>
+      <soundLanding>Longjump_Land</soundLanding>
      <targetParams>
-        <canTargetSelf>true</canTargetSelf>
+        <canTargetLocations>true</canTargetLocations>
+        <canTargetPawns>false</canTargetPawns>
+        <canTargetBuildings>false</canTargetBuildings>
      </targetParams>
    </verbProperties>
+    <jobDef>CastJump</jobDef>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityDestroyOwnBodyPart">
-        <bodyPartsToDestroy>
-          <li>Brain</li>
-        </bodyPartsToDestroy>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.1</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
+      </li>
+    </comps>
+  </AbilityDef>
+  <AbilityDef>
+    <defName>ARA_Incubator_5_EliteReward_Charge</defName>
+    <label>无畏冲击</label>
+    <description>对目标发起蓄势冲撞，对路径上的一切造成伤害。在冲击中途经的距离越远，伤害越高。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Ability_TrackingCharge</iconPath>    <!-- Placeholder Icon -->
+    <cooldownTicksRange>6000</cooldownTicksRange>
+    <cooldownPerCharge>true</cooldownPerCharge>
+    <aiCanUse>false</aiCanUse>
+    <verbProperties>
+      <verbClass>ArachnaeSwarm.Verb_CastAbilityTrackingCharge</verbClass>
+      <label>追踪冲撞</label>
+      <requireLineOfSight>false</requireLineOfSight>
+      <targetParams>
+        <canTargetPawns>true</canTargetPawns>
+        <canTargetBuildings>true</canTargetBuildings>
+        <canTargetAnimals>true</canTargetAnimals>
+        <canTargetMechs>true</canTargetMechs>
+        <canTargetSelf>false</canTargetSelf>
+      </targetParams>
+      <range>16</range>
+      <warmupTime>1.0</warmupTime>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_TrackingCharge">
+        <homingSpeed>1.5</homingSpeed>
+        <initialDamage>10</initialDamage>
+        <damagePerTile>1.2</damagePerTile>
+        <inertiaDistance>6</inertiaDistance>
+        <collisionDamageDef>Demolish</collisionDamageDef>
+        <flyerDef>ARA_Flyer_TrackingCharge</flyerDef>
+        <collisionRadius>1.5</collisionRadius>        <!-- Larger collision radius -->
+        <impactSound>Pawn_Melee_BigBash_HitPawn</impactSound>
+        <damageHostileOnly>true</damageHostileOnly>        <!-- Set to false to damage everyone in the path -->
+      </li>
+      <li Class="CompProperties_AbilityEffecterOnCaster">
+        <effecterDef>WarTrumpet</effecterDef>
+        <maintainTicks>20</maintainTicks>        <!-- Long enough for the "2nd wave" to spawn -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
+        <customLabel>饮食</customLabel>
+        <showProgressBar>true</showProgressBar>
+        <needDef>Food</needDef>
+        <needCost>0.2</needCost>
+        <failMessage>营养值不足，需要进食</failMessage>
      </li>
    </comps>
  </AbilityDef>
--- a/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <AbilityDef Name="ARA_EggSpew_Base" Abstract="True">
-    <cooldownTicksRange>50000</cooldownTicksRange>
-    <aiCanUse>false</aiCanUse>
-    <displayOrder>300</displayOrder>
-    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
-    <charges>5</charges>
-    <cooldownPerCharge>true</cooldownPerCharge>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <range>1</range>
-      <warmupTime>7</warmupTime>
-      <soundCast>AcidSpray_Resolve</soundCast>
-      <violent>false</violent>
-      <targetable>false</targetable>
-      <targetParams>
-        <canTargetSelf>True</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
-        <needDef>Food</needDef>
-        <needCost>4</needCost>
-        <failMessage>营养值不足，需要进食</failMessage>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityBodyPartCheck">
-        <requiredPart>ARA_Ovary</requiredPart>
-        <failMessage>卵巢受损或缺失，无法生育</failMessage>
-      </li>
-    </comps>
-  </AbilityDef>
-  <ThingDef Name="ARA_EggSpew_Base_Proj" ParentName="BaseGrenadeProjectile" Abstract="True">
-    <thingClass>Projectile_SpawnsThing</thingClass>
-    <graphicData>
-      <texPath>ArachnaeSwarm/Building/ARA_EggSac</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <speed>21</speed>
-      <damageAmountBase>0</damageAmountBase>
-      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
-    </projectile>
-  </ThingDef>
-  <AbilityDef Name="ARA_CocoonSpew_Base" Abstract="True">
-    <cooldownTicksRange>50000</cooldownTicksRange>
-    <aiCanUse>true</aiCanUse>
-    <displayOrder>300</displayOrder>
-    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-    <warmupStartSound>AcidSpray_Warmup</warmupStartSound>
-    <charges>5</charges>
-    <cooldownPerCharge>true</cooldownPerCharge>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <range>1</range>
-      <warmupTime>12</warmupTime>
-      <soundCast>AcidSpray_Resolve</soundCast>
-      <violent>false</violent>
-      <targetable>false</targetable>
-      <targetParams>
-        <canTargetSelf>True</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
-        <needDef>Food</needDef>
-        <needCost>1</needCost>
-        <failMessage>营养值不足，需要进食</failMessage>
-      </li>
-    </comps>
-  </AbilityDef>
-  <ThingDef Name="ARA_CocoonSpew_Base_Proj" ParentName="BaseGrenadeProjectile" Abstract="True">
-    <label>阿拉克涅孵化茧</label>
-    <thingClass>Projectile_SpawnsThing</thingClass>
-    <graphicData>
-      <texPath>ArachnaeSwarm/Building/ARA_Cocoon</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <speed>21</speed>
-      <damageAmountBase>0</damageAmountBase>
-      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
-    </projectile>
-  </ThingDef>
-</Defs>
--- a/1.6/1.6/Defs/AbilityDefs/Ability_DropPodIntercept.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Ability_DropPodIntercept.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+  <AbilityDef>
+    <defName>ARA_ToggleDropPodIntercept</defName>
+    <label>掠食巡航</label>
+    <description>切换天巫种对敌方空投袭击的拦截模式。开启后，敌方空投到达前会被随机拦截一部分运输仓。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Spawn_ARA_HiveCorvette_Strike</iconPath>
+    <cooldownTicksRange>0</cooldownTicksRange>
+    <targetRequired>false</targetRequired>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <drawAimPie>false</drawAimPie>
+      <requireLineOfSight>false</requireLineOfSight>
+      <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
+      <warmupTime>0</warmupTime>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_ToggleDropPodIntercept">
+        <enabledMessage>ARA_InterceptDropPod_Enabled</enabledMessage>
+        <disabledMessage>ARA_InterceptDropPod_Disabled</disabledMessage>
+        <noAircraftMessage>ARA_InterceptDropPod_NoAircraft</noAircraftMessage>
+        <requiredAircraftType>ARA_HiveCorvette_Entity</requiredAircraftType>
+      </li>
+    </comps>
+  </AbilityDef>
+</Defs>
--- a/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Ability_Morph.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-  <!-- 变形技能的定义 -->
-  <AbilityDef>
-    <defName>ARA_Ability_Morph</defName>
-    <label>织域形态</label>
-    <description>生成织座，将自己转换为一个静态建筑。这个形态下，阿拉克涅织域种可以研究虫群更高级的科技。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Ability_Morph</iconPath>
-    <cooldownTicksRange>6000</cooldownTicksRange>
-    <hotKey>Misc12</hotKey>
-    <targetRequired>false</targetRequired>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <drawAimPie>false</drawAimPie>
-      <requireLineOfSight>false</requireLineOfSight>
-      <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
-      <warmupTime>1</warmupTime>
-      <range>19.9</range>
-      <targetable>false</targetable>
-      <targetParams>
-        <canTargetSelf>True</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityTerrainRestriction">
-        <terrainDefs>
-          <li>ARA_InsectCreep</li>
-          <li>ARA_InsectCreepTile</li>
-        </terrainDefs>
-        <!-- <casterTerrainFailMessage>在阿拉克涅菌毯上才能使用此技能</casterTerrainFailMessage>
-        <disabledReasonKey>不在阿拉克涅菌毯上</disabledReasonKey> -->
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityTransform">
-        <buildingDef>ARA_MorphableResearchBench</buildingDef>
-      </li>
-    </comps>
-  </AbilityDef>
-</Defs>
--- a/1.6/1.6/Defs/BodyAndPartDefs/ARA_Bodyparts.xml
+++ b/1.6/1.6/Defs/BodyAndPartDefs/ARA_Bodyparts.xml
@@ -709,7 +709,13 @@
    <skinCovered>true</skinCovered>
    <solid>false</solid>
    <bleedRate>0</bleedRate>
+    <tags>
+      <li>ARA_Psy_Source</li>
+    </tags>
  </BodyPartDef>
+  <BodyPartTagDef>
+    <defName>ARA_Psy_Source</defName>
+  </BodyPartTagDef>
  <BodyPartDef>
    <defName>ARA_Pouch</defName>
    <label>蜕荚</label>
--- a/1.6/1.6/Defs/DamageDefs/ARA_Damages.xml
+++ b/1.6/1.6/Defs/DamageDefs/ARA_Damages.xml
@@ -66,6 +66,34 @@
      </li>
    </additionalHediffs>
  </DamageDef>
+  <DamageDef ParentName="Bomb">
+    <defName>ARA_AcidBomb</defName>
+    <label>酸液爆炸</label>
+    <!-- <workerClass>ArachnaeSwarm.DamageWorker_ExplosionWithTerrain</workerClass> -->
+    <additionalHediffs>
+      <li>
+        <hediff>ARA_AcidCoverd</hediff>
+        <severityPerDamageDealt>0.01</severityPerDamageDealt>
+      </li>
+    </additionalHediffs>
+    <armorCategory>Sharp</armorCategory>
+    <hediff>AcidBurn</hediff>
+    <scaleDamageToBuildingsBasedOnFlammability>false</scaleDamageToBuildingsBasedOnFlammability>
+  </DamageDef>
+  <DamageDef ParentName="Bomb">
+    <defName>ARA_CreepBomb</defName>
+    <label>菌瘤爆炸</label>
+    <workerClass>ArachnaeSwarm.DamageWorker_ExplosionWithTerrain</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <hediff>AcidBurn</hediff>
+    <scaleDamageToBuildingsBasedOnFlammability>false</scaleDamageToBuildingsBasedOnFlammability>
+
+    <modExtensions>
+      <li Class="ArachnaeSwarm.DamageDefExtension_TerrainCover">
+        <terrainToSpawn>ARA_InsectCreep</terrainToSpawn>
+      </li>
+    </modExtensions>
+  </DamageDef>

  <DamageDef ParentName="Bite">
    <defName>ARA_MimicNematodeBite</defName>
@@ -125,7 +153,7 @@
    <isRanged>true</isRanged>
    <makesAnimalsFlee>false</makesAnimalsFlee>
    <defaultDamage>20</defaultDamage>
-    <defaultArmorPenetration>1.5</defaultArmorPenetration>
+    <defaultArmorPenetration>2</defaultArmorPenetration>
    <buildingDamageFactorImpassable>1</buildingDamageFactorImpassable>
    <buildingDamageFactorPassable>1</buildingDamageFactorPassable>
  </DamageDef>
--- a/1.6/1.6/Defs/Effects/ARA_Flecks.xml
+++ b/1.6/1.6/Defs/Effects/ARA_Flecks.xml
@@ -281,4 +281,60 @@
    <solidTime>0.08</solidTime>
    <fadeOutTime>0.13</fadeOutTime>
  </FleckDef>
+
+  <EffecterDef>
+    <defName>ARA_Psy_Shockwave</defName>
+    <children>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <fleckDef>Fleck_BlastMechBandShockwave</fleckDef>
+        <burstCount>3~5</burstCount>
+        <spawnLocType>OnSource</spawnLocType>
+        <absoluteAngle>true</absoluteAngle>
+        <rotation>0~0</rotation>
+      </li>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <moteDef>ARA_PsyWave_Main</moteDef>
+        <burstCount>1</burstCount>
+        <scale>1</scale>
+        <speed>20</speed>
+        <angle>0</angle>
+        <positionRadius>0.01</positionRadius>
+        <spawnLocType>OnSource</spawnLocType>
+      </li>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <fleckDef>FlashMechBand</fleckDef>
+        <burstCount>1</burstCount>
+        <spawnLocType>OnSource</spawnLocType>
+        <absoluteAngle>true</absoluteAngle>
+        <rotation>0~0</rotation>
+      </li>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <moteDef>Mote_RedFlashStrong</moteDef>
+        <burstCount>1</burstCount>
+        <spawnLocType>OnSource</spawnLocType>
+        <scale>24</scale>
+      </li>
+    </children>
+  </EffecterDef>
+  <ThingDef ParentName="MoteBase">
+    <defName>ARA_PsyWave_Main</defName>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Mote/ARA_PsyWave_Main</texPath>
+      <drawSize>(7,7)</drawSize>
+      <shaderType>MoteGlow</shaderType>
+      <color>(0.6,0.1,0.6,0.5)</color>
+    </graphicData>
+    <altitudeLayer>Floor</altitudeLayer>
+    <mote>
+      <fadeInTime>0.2</fadeInTime>
+      <solidTime>0.4</solidTime>
+      <fadeOutTime>0.2</fadeOutTime>
+      <growthRate>0.25</growthRate>
+      <rotateTowardsMoveDirection>true</rotateTowardsMoveDirection>
+    </mote>
+  </ThingDef>
 </Defs>
--- a/1.6/1.6/Defs/EventDefs/ARA_Loop_Attack_EventDef.xml
+++ b/1.6/1.6/Defs/EventDefs/ARA_Loop_Attack_EventDef.xml
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-  <IncidentDef>
-    <defName>ARA_Loop_Raid_Incident</defName>
-    <label>虫群袭击</label>
-    <category>Misc</category>
-    <targetTags>
-      <li>Map_PlayerHome</li>
-    </targetTags>
-    
-    <!-- This uses the vanilla quest giver worker -->
-    <workerClass>IncidentWorker_GiveQuest</workerClass>
-    
-    <!-- This points to our custom QuestScriptDef -->
-    <questScriptDef>ARA_Loop_Raid_Quest</questScriptDef>
-    
-    <!--
-    <baseChance>1.0</baseChance>
-    <earliestDay>0.001</earliestDay>
-    <minRefireDays>99999</minRefireDays>
-    -->
-  </IncidentDef>
-  <QuestScriptDef>
-    <defName>ARA_Loop_Raid_Quest</defName>
-    <label>虫群袭击</label>
-    <description>虫群袭击description</description>
-    <root Class="QuestNode_Sequence">
-      <nodes>
-        <li Class="QuestNode_ResolveQuestName">
-          <rules>
-            <rulesStrings>
-              <li>questName->虫群袭击</li>
-            </rulesStrings>
-          </rules>
-        </li>
-        <li Class="QuestNode_ResolveQuestDescription">
-          <rules>
-            <rulesStrings>
-              <li>questDescription->虫群袭击questDescription</li>
-            </rulesStrings>
-          </rules>
-        </li>
-        <li Class="ArachnaeSwarm.QuestNode_Root_EventLetter">
-          <letterLabel>虫群袭击Label</letterLabel>
-          <letterTitle>虫群袭击Title</letterTitle>
-          <letterText>虫群袭击Text</letterText>
-          <options>
-            <li>
-              <label>袭击开始</label>
-              <optionEffects>
-                <li>
-                  <effects>
-                    <li Class="ArachnaeSwarm.Effect_OpenCustomUI">
-                      <defName>ARA_Loop_Raid_Main_Event_1</defName>
-                    </li>
-                  </effects>
-                </li>
-              </optionEffects>
-            </li>
-          </options>
-        </li>
-      </nodes>
-    </root>
-  </QuestScriptDef>
-  <ArachnaeSwarm.EventDef>
-    <defName>ARA_Loop_Raid_Main_Event_1</defName>
-    <characterName>嘻嘻</characterName>
-    <hiddenWindow>true</hiddenWindow>
-    <immediateEffects>
-      <li>
-        <!-- 系统会从这个列表中根据权重随机选择一个执行 -->
-        <randomlistEffects>
-          <li Class="ArachnaeSwarm.Effect_TriggerRaid">
-            <points>10000</points>
-            <faction>ARA_Hostile_Hive</faction>
-            <raidStrategy>ImmediateAttack</raidStrategy>
-            <raidArrivalMode>EdgeWalkIn</raidArrivalMode>
-            <groupKind>Combat</groupKind>
-            <pawnGroupMakers>
-              <li>
-                <kindDef>Combat</kindDef>
-                <commonality>100</commonality>
-                <options>
-                  <ArachnaeBase_Race_Acidcut_Enermy>7</ArachnaeBase_Race_Acidcut_Enermy>
-                  <ArachnaeNode_Race_ShieldHead_Enermy>3</ArachnaeNode_Race_ShieldHead_Enermy>
-                </options>
-              </li>
-            </pawnGroupMakers>
-          </li>
-        </randomlistEffects>
-        <effects>
-        </effects>
-      </li>
-    </immediateEffects>
-  </ArachnaeSwarm.EventDef>
-</Defs>
--- a/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
+++ b/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
@@ -55,20 +55,31 @@
        <abilityDefs>
          <li>ARA_Myrmecocystus_Production_Medicine</li>
          <li>ARA_Myrmecocystus_Production_Fuel</li>
+          <li>ARA_Myrmecocystus_Production_Dissolver</li>
        </abilityDefs>
      </li>
      <li Class="HediffCompProperties_RemoveIfOtherHediff">
        <hediffs>
          <li>ARA_Myrmecocystus_Production_Medicine</li>
          <li>ARA_Myrmecocystus_Production_Fuel</li>
+          <li>ARA_Myrmecocystus_Production_Dissolver</li>
        </hediffs>
      </li>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
+            <count>2</count>
+            <cooldownTicks>5000</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
    </comps>
  </HediffDef>
  <AbilityDef>
    <defName>ARA_Myrmecocystus_Production_Medicine</defName>
    <label>蜜罐种转换——医药专精</label>
-    <description>使蜜罐种发生内驱性进化，以牺牲生产阿拉克涅虫蜜的代价，使其可以孵化医药茧，并允许使用医疗能力和操纵拟线种。\n\n该进化过程不可逆！</description>
+    <description>使蜜罐种发生内驱性进化，以牺牲生产阿拉克涅虫蜜的代价，使其可以孵化医药茧，并允许使用医疗能力和操纵拟线种。\n\n该进化方向不提供辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Myrmecocystus_Production_Medicine</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -109,7 +120,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_1MED</requiredResearch>
-        <failMessage>需要科技 节点MED-1"疗愈种" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -163,7 +173,7 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
@@ -211,6 +221,7 @@
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_MimicNematode_Needle_Fire</li>
+          <li>ARA_SymbioticStabilizer</li>
        </abilityDefs>
      </li>
    </comps>
@@ -218,7 +229,7 @@
  <AbilityDef>
    <defName>ARA_Myrmecocystus_Production_Fuel</defName>
    <label>蜜罐种转换——易燃腔室</label>
-    <description>使蜜罐种发生内驱性进化，以牺牲生产阿拉克涅虫蜜的代价，使其可以产出化合燃料，增强其护甲并给予其额外的喷射火焰的能力。\n\n该进化过程不可逆！</description>
+    <description>使蜜罐种发生内驱性进化，以牺牲生产阿拉克涅虫蜜的代价，使其可以产出化合燃料，增强其护甲并给予其额外的喷射火焰的能力。\n\n该进化方向不提供辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Myrmecocystus_Production_Fuel</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -250,7 +261,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_8FEL</requiredResearch>
-        <failMessage>需要科技 节点FEL-8"爆燃腔" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -305,7 +315,7 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
@@ -357,6 +367,101 @@
      </li>
    </comps>
  </HediffDef>
+  <AbilityDef>
+    <defName>ARA_Myrmecocystus_Production_Dissolver</defName>
+    <label>蜜罐种转换——强酸分解</label>
+    <description>使蜜罐种发生内驱性进化，使其获得额外的溶解能力，可以向非虫族囚犯、奴隶释放溶脂酸，这会持续使其损失身体部位以产生虫蜜。\n\n该进化方向不提供辅虫。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Myrmecocystus_Production_Dissolver</iconPath>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <hostile>false</hostile>
+    <groupAbility>true</groupAbility>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <aiCanUse>false</aiCanUse>
+    <ai_IsOffensive>true</ai_IsOffensive>
+    <targetRequired>false</targetRequired>
+    <jobDef>CastAbilityOnThing</jobDef>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>1</range>
+      <warmupTime>12</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>ARA_Myrmecocystus_Production_Dissolver</hediffDef>
+        <onlyApplyToSelf>True</onlyApplyToSelf>
+        <replaceExisting>true</replaceExisting>
+        <severity>1</severity>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
+        <requiredResearch>ARA_Technology_7ACD_T</requiredResearch>
+      </li>
+    </comps>
+  </AbilityDef>
+  <HediffDef>
+    <defName>ARA_Myrmecocystus_Production_Dissolver</defName>
+    <label>亚种-溶脂种</label>
+    <description>这只阿拉克涅蜜罐种已经获得拔耀，可以通过在极近距离喷涂溶脂酸将可憎的敌人变成美味的食物。</description>
+    <descriptionHyperlinks>
+      <ThingDef>Chemfuel</ThingDef>
+    </descriptionHyperlinks>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <renderNodeProperties>
+      <li>
+        <nodeClass>PawnRenderNode_AttachmentHead</nodeClass>
+        <workerClass>PawnRenderNodeWorker_FlipWhenCrawling</workerClass>
+        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver</texPath>
+        <parentTagDef>Body</parentTagDef>
+        <useSkinShader>false</useSkinShader>
+        <useRottenColor>false</useRottenColor>
+        <rotDrawMode>Fresh, Rotting</rotDrawMode>
+        <drawData>
+          <dataNorth>
+            <offset>(0, 0, -0.05)</offset>
+            <layer>120</layer>
+          </dataNorth>
+          <dataEast>
+            <offset>(0, 0, -0.05)</offset>
+          </dataEast>
+          <dataSouth>
+            <offset>(0, 0, -0.05)</offset>
+          </dataSouth>
+          <dataWest>
+            <offset>(0, 0, -0.05)</offset>
+          </dataWest>
+          <defaultData>
+            <layer>-40</layer>
+          </defaultData>
+        </drawData>
+      </li>
+    </renderNodeProperties>
+    <stages>
+      <li>
+        <enablesNeeds>
+          <li>ARA_HoneyProduction</li>
+        </enablesNeeds>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_GiveAbility">
+        <abilityDefs>
+          <li>ARA_AcidSprayBurst</li>
+          <li>ARA_Dissolver_Touch</li>
+        </abilityDefs>
+      </li>
+    </comps>
+  </HediffDef>

  <!-- 战士种 -->
  <HediffDef>
@@ -365,6 +470,7 @@
    <description>阿拉克涅的战士虫们可以将身体变成自己的最强大的武装，随着科技的解锁，它们将获得繁多的技能以供使用。</description>
    <descriptionHyperlinks>
      <HediffDef>ARA_Fighter_Invisibility</HediffDef>
+      <HediffDef>ARA_Fighter_Genestealer</HediffDef>
    </descriptionHyperlinks>
    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
@@ -381,10 +487,19 @@
      </li>
    </stages> -->
    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
+      <!-- <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
        <turretDef>ARA_Fighter_Base_Turret</turretDef>
        <angleOffset>0</angleOffset>
        <autoAttack>true</autoAttack>
+      </li> -->
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Acidcut</pawnKind>
+            <count>4</count>
+            <cooldownTicks>250</cooldownTicks>
+          </li>
+        </productionQueue>
      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
@@ -405,7 +520,7 @@
  <AbilityDef>
    <defName>ARA_Fighter_Invisibility</defName>
    <label>战士种转换——隐形杀手</label>
-    <description>使战士种发生内驱性进化，极大地损害其远程武器和特殊技能的使用能力，以换取近乎永久的隐形和强大的近战能力。\n\n该进化过程不可逆！</description>
+    <description>使战士种发生内驱性进化，极大地损害其远程武器和特殊技能的使用能力，以换取近乎永久的隐形和强大的近战能力。\n\n该进化方向不提供辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Fighter_Invisibility</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -451,7 +566,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_4CLO</requiredResearch>
-        <failMessage>需要科技 节点CLO-4"追猎种" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -490,7 +604,7 @@
  <AbilityDef>
    <defName>ARA_Fighter_Genestealer</defName>
    <label>战士种转换——基因窃贼</label>
-    <description>使战士种发生内驱性进化，损害其战斗能力和使用技能的能力，以换取从敌人身上窃取基因和向己方殖民者注入基因的能力。\n\n该进化过程不可逆！</description>
+    <description>使战士种发生内驱性进化，损害其战斗能力和使用技能的能力，以换取从敌人身上窃取基因和向己方殖民者注入基因的能力。\n\n该进化方向不提供辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Fighter_Genestealer</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -536,7 +650,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_5STL</requiredResearch>
-        <failMessage>需要科技 节点STL-5"基因窃取" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -567,6 +680,7 @@
    <description>迷雾种是阿拉克涅虫族中的大家伙，它们不仅拥有厚实的外壳，其灌满信息素浓烟的腹部可以喷出覆盖战场的气体，吸引那些较小的辅虫破土而出对敌方发起疯狂的攻击。</description>
    <descriptionHyperlinks>
      <HediffDef>ARA_Smokepop_Production_Bacterium</HediffDef>
+      <HediffDef>ARA_Smokepop_Creeper</HediffDef>
    </descriptionHyperlinks>
    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
@@ -613,6 +727,15 @@
      </li>
    </stages>
    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Baneling</pawnKind>
+            <count>4</count>
+            <cooldownTicks>200</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_Ability_Smokepop</li>
@@ -631,7 +754,7 @@
  <AbilityDef>
    <defName>ARA_Smokepop_Production_Bacterium</defName>
    <label>迷雾种转换——钜菌专精</label>
-    <description>使迷雾种发生内驱性进化，以牺牲喷射信息素和降低护甲为代价，使其可以定期产出阿拉克涅虫族的高级材料——活化钜菌。\n\n该进化过程不可逆！</description>
+    <description>使迷雾种发生内驱性进化，以牺牲喷射信息素和降低护甲为代价，使其可以定期产出阿拉克涅虫族的高级材料——活化钜菌。\n\n该进化方向不提供辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Smokepop_Production_Bacterium</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -663,7 +786,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_1BAC</requiredResearch>
-        <failMessage>需要科技 节点BAC-1"育菌种" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -685,7 +807,7 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
@@ -735,7 +857,7 @@
  <AbilityDef>
    <defName>ARA_Smokepop_Creeper</defName>
    <label>迷雾种转换——菌毯支援</label>
-    <description>使迷雾种发生内驱性进化，以牺牲喷射信息素为代价，使其获得额外防御力、移动速度和大范围、高速铺设菌毯的能力。\n\n该进化过程不可逆！</description>
+    <description>使迷雾种发生内驱性进化，以牺牲喷射信息素为代价，使其获得额外防御力、移动速度和大范围、高速铺设菌毯的能力。\n\n该进化方向提供6只阿拉克涅爆裂种辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Smokepop_Creeper</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -767,7 +889,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_3CRP</requiredResearch>
-        <failMessage>需要科技 节点CRP-3"菌毯铺设" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -821,6 +942,15 @@
      </li>
    </stages>
    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Baneling</pawnKind>
+            <count>6</count>
+            <cooldownTicks>600</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_Smokepop_Creeper_Ability_On</li>
@@ -879,6 +1009,15 @@
      </li>
    </stages>
    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Longpincer</pawnKind>
+            <count>3</count>
+            <cooldownTicks>5000</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_ShieldHead_Protector</li>
@@ -896,7 +1035,7 @@
  <AbilityDef>
    <defName>ARA_ShieldHead_Protector</defName>
    <label>盾头种转换——虫巢护卫</label>
-    <description>使盾头种发生内驱性进化，以牺牲产出甲壳素和建造建筑的能力为代价，使其获得更强大的战斗能力、移动能力和冲撞攻击的技能。\n\n该进化过程不可逆！</description>
+    <description>使盾头种发生内驱性进化，以牺牲产出甲壳素和建造建筑的能力为代价，使其获得更强大的战斗能力、移动能力和冲撞攻击的技能。\n\n该进化方向提供4只阿拉克涅酸噬种辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_ShieldHead_Protector</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -947,7 +1086,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_1VTE</requiredResearch>
-        <failMessage>需要科技 节点VTE-1"护卫者" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -999,6 +1137,15 @@
      </li>
    </stages>
    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Acidcut</pawnKind>
+            <count>4</count>
+            <cooldownTicks>200</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_Ability_TrackingCharge</li>
@@ -1009,7 +1156,7 @@
  <AbilityDef>
    <defName>ARA_ShieldHead_HiveBuilder</defName>
    <label>盾头种转换——营建大师</label>
-    <description>使盾头种发生内驱性进化，以防御能力为代价，使其获得更强大的甲壳素产出能力和建造技能。\n\n该进化过程不可逆！</description>
+    <description>使盾头种发生内驱性进化，以防御能力为代价，使其获得更强大的甲壳素产出能力和建造技能。\n\n该进化方向提供4只阿拉克涅巨颚种辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_ShieldHead_HiveBuilder</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -1050,7 +1197,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_3CON</requiredResearch>
-        <failMessage>需要科技 节点CON-3"建造者" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -1069,7 +1215,16 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Longpincer</pawnKind>
+            <count>4</count>
+            <cooldownTicks>5000</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
@@ -1168,15 +1323,26 @@
      </li>
    </stages>
    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Skyhive</pawnKind>
+            <count>4</count>
+            <cooldownTicks>200</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_Skyraider_jump</li>
-          <li>ARA_Skyraider_Hivelord</li>
+          <li>ARA_Skyraider_Ferry</li>
          <li>ARA_Skyraider_Empthrower</li>
+          <li>ARA_Skyraider_Hivelord</li>
        </abilityDefs>
      </li>
      <li Class="HediffCompProperties_RemoveIfOtherHediff">
        <hediffs>
+          <li>ARA_Skyraider_Ferry</li>
          <li>ARA_Skyraider_Hivelord</li>
          <li>ARA_Skyraider_Empthrower</li>
        </hediffs>
@@ -1184,10 +1350,10 @@
    </comps>
  </HediffDef>
  <AbilityDef>
-    <defName>ARA_Skyraider_Hivelord</defName>
-    <label>空天种转换——巢虫之主</label>
-    <description>使空天种发生内驱性进化，以降低机动力和失去高空机动能力为代价，使其获得向敌方自动投射天巢种辅虫的能力——这种辅虫体型很小，会以让人烦扰的近战紧紧黏住敌人。\n\n该进化过程不可逆！</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Skyraider_Hivelord</iconPath>
+    <defName>ARA_Skyraider_Ferry</defName>
+    <label>空天种转换——搬运工蜂</label>
+    <description>使空天种发生内驱性进化，以失去高空机动能力为代价，使其获得更高的移动速度，且在远行队时大幅增加远行队移动速度。\n\n该进化方向不提供阿拉克涅辅虫。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Skyraider_Ferry</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
    <groupAbility>true</groupAbility>
@@ -1211,21 +1377,20 @@
    <comps>
      <li Class="CompProperties_AbilityGiveHediff">
        <compClass>CompAbilityEffect_GiveHediff</compClass>
-        <hediffDef>ARA_Skyraider_Hivelord</hediffDef>
+        <hediffDef>ARA_Skyraider_Ferry</hediffDef>
        <onlyApplyToSelf>True</onlyApplyToSelf>
        <replaceExisting>true</replaceExisting>
        <severity>1</severity>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
-        <requiredResearch>ARA_Technology_6LOD</requiredResearch>
-        <failMessage>需要科技 节点LOD-6"巢之主" 以解锁进化</failMessage>
+        <requiredResearch>ARA_Technology_1FRY</requiredResearch>
      </li>
    </comps>
  </AbilityDef>
  <HediffDef>
-    <defName>ARA_Skyraider_Hivelord</defName>
-    <label>亚种-领主种</label>
-    <description>这只阿拉克涅空天种已经获得拔耀，会对敌方投掷天巢种辅虫，这些灵敏的辅虫会在落地后散开四处狩猎目标。</description>
+    <defName>ARA_Skyraider_Ferry</defName>
+    <label>亚种-穿梭种</label>
+    <description>这只阿拉克涅空天种已经获得拔耀，虽然无法再孵化辅虫，但是速度极快，且可以以常态化飞行以增加远行队速度。</description>
    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
@@ -1235,7 +1400,7 @@
      <li>
        <nodeClass>PawnRenderNode_AttachmentHead</nodeClass>
        <workerClass>PawnRenderNodeWorker_FlipWhenCrawling</workerClass>
-        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Hivelord_Tail</texPath>
+        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail</texPath>
        <parentTagDef>Body</parentTagDef>
        <useSkinShader>false</useSkinShader>
        <useRottenColor>false</useRottenColor>
@@ -1263,44 +1428,19 @@
    <stages>
      <li>
        <minSeverity>0.01</minSeverity>
+        <statOffsets>
+          <MoveSpeed>5</MoveSpeed>
+        </statOffsets>
        <statFactors>
-          <CaravanBonusSpeedFactor>2</CaravanBonusSpeedFactor>
+          <CaravanBonusSpeedFactor>10</CaravanBonusSpeedFactor>
        </statFactors>
      </li>
    </stages>
-    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
-        <turretDef>ARA_Skyraider_Hivelord_Turret</turretDef>
-        <angleOffset>0</angleOffset>
-        <autoAttack>true</autoAttack>
-      </li>
-      <li Class="ArachnaeSwarm.HediffCompProperties_DrawMote">
-        <mote>ARA_Mote_Hivelord_Turret_Range</mote> <!-- 大小和range没有严格对应关系，需要自己试出来drawSize -->
-        <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted>
-      </li>
-    </comps>
  </HediffDef>
-  <ThingDef ParentName="MoteBase">
-    <defName>ARA_Mote_Hivelord_Turret_Range</defName>
-    <thingClass>MoteAttached</thingClass>
-    <altitudeLayer>LightingOverlay</altitudeLayer>
-    <drawOffscreen>true</drawOffscreen>
-    <mote>
-      <solidTime>9999999</solidTime>
-      <needsMaintenance>true</needsMaintenance>
-    </mote>
-    <graphicData>
-      <graphicClass>Graphic_Mote</graphicClass>
-      <texPath>Things/Mote/CombatCommandMask</texPath>
-      <shaderType>MoteGlow</shaderType>
-      <color>(32, 17, 0, 255)</color>
-      <drawSize>66</drawSize>
-    </graphicData>
-  </ThingDef>
  <AbilityDef>
    <defName>ARA_Skyraider_Empthrower</defName>
    <label>空天种转换——电磁风暴</label>
-    <description>使空天种发生内驱性进化，以降低机动力和失去高空机动能力为代价，使其获得向敌方自动投射磁暴种辅虫的能力——这种辅虫会以自杀式袭击的方式释放出EMP，以对抗机械族。\n\n该进化过程不可逆！</description>
+    <description>使空天种发生内驱性进化，以降低机动力和失去高空机动能力为代价，使其获得投掷磁暴种辅虫的能力——这种辅虫会以自杀式袭击的方式释放出EMP，以对抗机械族。\n\n该进化方向不提供阿拉克涅辅虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Skyraider_Empthrower</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -1332,14 +1472,13 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_9WID</requiredResearch>
-        <failMessage>需要科技 节点WID-9"磁暴" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
  <HediffDef>
    <defName>ARA_Skyraider_Empthrower</defName>
    <label>亚种-飓风种</label>
-    <description>这只阿拉克涅空天种已经获得拔耀，会对敌方投掷磁暴种辅虫，这些辅虫会在落地后散开，以自杀性袭击释放EMP对抗敌方机械族。</description>
+    <description>这只阿拉克涅空天种已经获得拔耀，会投掷磁暴种辅虫，这些辅虫以自杀性袭击释放EMP对抗敌方机械族。</description>
    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
@@ -1411,6 +1550,128 @@
      <drawSize>51</drawSize>
    </graphicData>
  </ThingDef>
+  <AbilityDef>
+    <defName>ARA_Skyraider_Hivelord</defName>
+    <label>空天种转换——巢虫之主</label>
+    <description>使空天种发生内驱性进化，以降低机动力和失去高空机动能力为代价，使其获得孵化大量天巢种辅虫的能力——这种辅虫体型很小，会以让人烦扰的近战紧紧黏住敌人。\n\n该进化方向提供8只阿拉克涅天巢种辅虫。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Skyraider_Hivelord</iconPath>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <hostile>false</hostile>
+    <groupAbility>true</groupAbility>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <aiCanUse>false</aiCanUse>
+    <ai_IsOffensive>true</ai_IsOffensive>
+    <targetRequired>false</targetRequired>
+    <jobDef>CastAbilityOnThing</jobDef>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>1</range>
+      <warmupTime>12</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>ARA_Skyraider_Hivelord</hediffDef>
+        <onlyApplyToSelf>True</onlyApplyToSelf>
+        <replaceExisting>true</replaceExisting>
+        <severity>1</severity>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
+        <requiredResearch>ARA_Technology_6LOD_T</requiredResearch>
+      </li>
+    </comps>
+  </AbilityDef>
+  <HediffDef>
+    <defName>ARA_Skyraider_Hivelord</defName>
+    <label>亚种-领主种</label>
+    <description>这只阿拉克涅空天种已经获得拔耀，可以投掷天巢种辅虫，这些灵敏的辅虫会后散开四处狩猎目标。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <renderNodeProperties>
+      <li>
+        <nodeClass>PawnRenderNode_AttachmentHead</nodeClass>
+        <workerClass>PawnRenderNodeWorker_FlipWhenCrawling</workerClass>
+        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Hivelord_Tail</texPath>
+        <parentTagDef>Body</parentTagDef>
+        <useSkinShader>false</useSkinShader>
+        <useRottenColor>false</useRottenColor>
+        <rotDrawMode>Fresh, Rotting</rotDrawMode>
+        <drawData>
+          <dataNorth>
+            <offset>(0, 0, -0.05)</offset>
+            <layer>120</layer>
+          </dataNorth>
+          <dataEast>
+            <offset>(0, 0, -0.05)</offset>
+          </dataEast>
+          <dataSouth>
+            <offset>(0, 0, -0.05)</offset>
+          </dataSouth>
+          <dataWest>
+            <offset>(0, 0, -0.05)</offset>
+          </dataWest>
+          <defaultData>
+            <layer>-40</layer>
+          </defaultData>
+        </drawData>
+      </li>
+    </renderNodeProperties>
+    <stages>
+      <li>
+        <minSeverity>0.01</minSeverity>
+        <statFactors>
+          <CaravanBonusSpeedFactor>2</CaravanBonusSpeedFactor>
+        </statFactors>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Skyhive</pawnKind>
+            <count>4</count>
+            <cooldownTicks>200</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
+      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
+        <turretDef>ARA_Skyraider_Hivelord_Turret</turretDef>
+        <angleOffset>0</angleOffset>
+        <autoAttack>true</autoAttack>
+      </li>
+      <li Class="ArachnaeSwarm.HediffCompProperties_DrawMote">
+        <mote>ARA_Mote_Hivelord_Turret_Range</mote>
+        <hideMoteWhenNotDrafted>true</hideMoteWhenNotDrafted>
+      </li>
+    </comps>
+  </HediffDef>
+  <ThingDef ParentName="MoteBase">
+    <defName>ARA_Mote_Hivelord_Turret_Range</defName>
+    <thingClass>MoteAttached</thingClass>
+    <altitudeLayer>LightingOverlay</altitudeLayer>
+    <drawOffscreen>true</drawOffscreen>
+    <mote>
+      <solidTime>9999999</solidTime>
+      <needsMaintenance>true</needsMaintenance>
+    </mote>
+    <graphicData>
+      <graphicClass>Graphic_Mote</graphicClass>
+      <texPath>Things/Mote/CombatCommandMask</texPath>
+      <shaderType>MoteGlow</shaderType>
+      <color>(32, 17, 0, 255)</color>
+      <drawSize>66</drawSize>
+    </graphicData>
+  </ThingDef>

  <!-- 禁卫种 -->
  <HediffDef>
@@ -1434,22 +1695,28 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
-        <turretDef>ARA_Praetorian_Base_Turret</turretDef>
-        <angleOffset>0</angleOffset>
-        <autoAttack>true</autoAttack>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Locust</pawnKind>
+            <count>5</count>
+            <cooldownTicks>300</cooldownTicks>
+          </li>
+        </productionQueue>
      </li>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
-          <li>ARA_Praetorian_jump</li>
+          <li>ARA_Praetorian_Jump</li>
          <li>ARA_Praetorian_Commander_Ability_On</li>
          <li>ARA_Praetorian_Commander_Ability_Off</li>
          <li>ARA_Praetorian_Navigator</li>
+          <li>ARA_Praetorian_Legion</li>
        </abilityDefs>
      </li>
      <li Class="HediffCompProperties_RemoveIfOtherHediff">
        <hediffs>
          <li>ARA_Praetorian_Navigator</li>
+          <li>ARA_Praetorian_Legion</li>
        </hediffs>
      </li>
    </comps>
@@ -1457,7 +1724,7 @@
  <AbilityDef>
    <defName>ARA_Praetorian_Navigator</defName>
    <label>禁卫种转换——引航灯塔</label>
-    <description>使禁卫种发生内驱性进化，以牺牲射击能力、跳跃能力、指挥能力为代价，使其换取指挥空中兽虫的能力。\n\n该进化过程不可逆！另外，空中兽虫必须成功升空才能进行指挥——在你解锁这个进化路径时，应该还不能建造空中兽虫。</description>
+    <description>使禁卫种发生内驱性进化，以牺牲射击能力、跳跃能力、指挥能力为代价，使其换取指挥空中兽虫的能力。\n\n该进化方向不提供阿拉克涅辅虫。另外，空中兽虫必须成功升空才能进行指挥——在你解锁这个进化路径时，应该还不能建造空中兽虫。</description>
    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Praetorian_Navigator</iconPath>
    <cooldownTicksRange>1800</cooldownTicksRange>
    <hostile>false</hostile>
@@ -1489,7 +1756,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
        <requiredResearch>ARA_Technology_9NAV</requiredResearch>
-        <failMessage>需要科技 节点NAV-9"领航使者" 以解锁进化</failMessage>
      </li>
    </comps>
  </AbilityDef>
@@ -1511,6 +1777,7 @@
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
          <li>ARA_SpawnFlyOverTest</li>
+          <li>ARA_ToggleDropPodIntercept</li>
          <li>ARA_Spawn_ARA_HiveCorvette_Rocket</li>
          <li>ARA_Spawn_ARA_HiveCorvette_Bombardment</li>
          <li>ARA_Spawn_ARA_HiveCorvette_Strike</li>
@@ -1519,7 +1786,89 @@
      </li>
    </comps>
  </HediffDef>
+  <AbilityDef>
+    <defName>ARA_Praetorian_Legion</defName>
+    <label>禁卫种转换——军团之威</label>
+    <description>使禁卫种发生内驱性进化，以牺牲指挥能力为代价，使其换取更强大的近战、远程、防御和通过甩尾、冲撞、跳跃等体术对抗敌人的能力。\n\n该进化方向不提供阿拉克涅辅虫。</description>
+    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_Praetorian_Legion</iconPath>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <hostile>false</hostile>
+    <groupAbility>true</groupAbility>
+    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
+    <aiCanUse>false</aiCanUse>
+    <ai_IsOffensive>true</ai_IsOffensive>
+    <targetRequired>false</targetRequired>
+    <jobDef>CastAbilityOnThing</jobDef>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <range>1</range>
+      <warmupTime>12</warmupTime>
+      <soundCast>AcidSpray_Resolve</soundCast>
+      <violent>false</violent>
+      <targetable>false</targetable>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>ARA_Praetorian_Legion</hediffDef>
+        <onlyApplyToSelf>True</onlyApplyToSelf>
+        <replaceExisting>true</replaceExisting>
+        <severity>1</severity>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityAddExtraExp">
+        <skillChanges>
+          <li>
+            <skill>Melee</skill>
+            <passionGained>Major</passionGained>
+            <xpGainAmount>600000</xpGainAmount>
+          </li>
+          <li>
+            <skill>Shooting</skill>
+            <passionGained>Major</passionGained>
+            <xpGainAmount>600000</xpGainAmount>
+          </li>
+        </skillChanges>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AbilityResearchPrereq">
+        <requiredResearch>ARA_Technology_3LGN_T</requiredResearch>
+      </li>
+    </comps>
+  </AbilityDef>
+  <HediffDef>
+    <defName>ARA_Praetorian_Legion</defName>
+    <label>亚种-军团种</label>
+    <description>这只阿拉克涅禁卫种已经获得拔耀，战斗能力在虫群节点个体中已经登峰造极。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <ArmorRating_Blunt>0.75</ArmorRating_Blunt>
+          <ArmorRating_Sharp>0.75</ArmorRating_Sharp>
+          <ArmorRating_Heat>1</ArmorRating_Heat>
+        </statOffsets>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_GiveAbility">
+        <abilityDefs>
+          <li>ARA_Praetorian_Long_Jump</li>
+          <li>ARA_Praetorian_TailSweep</li>
+          <li>ARA_Ability_TrackingCharge</li>
+        </abilityDefs>
+      </li>
+    </comps>
+  </HediffDef>
  
+  <!-- 暴徒种 -->
  <HediffDef>
    <defName>ARA_Slayer_Base</defName>
    <label>暴虐之兽</label>
@@ -1559,4 +1908,70 @@
      </li>
    </stages>
  </HediffDef>
+  
+  <!-- 工艺种 -->
+  <HediffDef>
+    <defName>ARA_WeaponSmith_Base</defName>
+    <label>虫巢维护者</label>
+    <description>阿拉克涅的工艺种们是勤劳的工蜂，她们负责维护整个巢穴的建筑，并使其在最佳状态下运作。</description>
+    <!-- <descriptionHyperlinks>
+      <HediffDef>ARA_Fighter_Invisibility</HediffDef>
+      <HediffDef>ARA_Fighter_Genestealer</HediffDef>
+    </descriptionHyperlinks> -->
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <!-- <stages>
+      <li>
+        <becomeVisible>ture</becomeVisible>
+      </li>
+      <li>
+        <minSeverity>1.01</minSeverity>
+        <becomeVisible>false</becomeVisible>
+      </li>
+    </stages> -->
+    <comps>
+      <!-- <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
+        <turretDef>ARA_Fighter_Base_Turret</turretDef>
+        <angleOffset>0</angleOffset>
+        <autoAttack>true</autoAttack>
+      </li> -->
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Hivekeeping</pawnKind>
+            <count>4</count>
+            <cooldownTicks>5000</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
+    </comps>
+  </HediffDef>
+
+  <HediffDef>
+    <defName>ArachnaeQueen_Titan_Hediff</defName>
+    <label>泰坦种</label>
+    <description>阿拉克涅泰坦种是女皇种亚种之一，归属于阿拉克涅的泰坦触须。她们指挥着阿拉克涅虫群中最坚韧、最具有适应力的主力集团族群，承担在战场上维持战线的任务。\n\n泰坦种女皇除了可以提供泰坦触须的独特科技外，自身也有强大的甲壳作为防御层，还可以通过践踏和高额的近战伤害攻击靠近的敌人。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <maxSeverity>1.0</maxSeverity>
+    <stages>
+      <li>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_ProductionQueue">
+        <productionQueue>
+          <li>
+            <pawnKind>ArachnaeBase_Race_Larva</pawnKind>
+            <count>5</count>
+            <cooldownTicks>1000</cooldownTicks>
+          </li>
+        </productionQueue>
+      </li>
+    </comps>
+  </HediffDef>
 </Defs>
--- a/1.6/1.6/Defs/FactionDefs/ARA_Factions_Hostile_Hive.xml
+++ b/1.6/1.6/Defs/FactionDefs/ARA_Factions_Hostile_Hive.xml
@@ -12,9 +12,10 @@
    <factionNameMaker>ARA_New_Hive_NamerFaction</factionNameMaker>
    <factionIconPath>World/WorldObjects/Expanding/HoraxCult</factionIconPath>
    <displayInFactionSelection>true</displayInFactionSelection>
+    <canGenerateQuestSites>false</canGenerateQuestSites>
    <!-- <settlementGenerationWeight>1</settlementGenerationWeight> -->
-    <canSiege>true</canSiege>
-    <canStageAttacks>true</canStageAttacks>
+    <canSiege>false</canSiege>
+    <canStageAttacks>false</canStageAttacks>
    <backstoryFilters>
      <li>
        <categories>
@@ -25,7 +26,7 @@
    <techLevel>Industrial</techLevel>
    <arrivalLayerWhitelist>
      <li>Surface</li>
-      <!-- <li MayRequire="Ludeon.RimWorld.Odyssey">Orbit</li> -->
+      <li MayRequire="Ludeon.RimWorld.Odyssey">Orbit</li>
    </arrivalLayerWhitelist>
    <colorSpectrum>
      <li>(0.6, 0.5, 0.9)</li>
@@ -38,7 +39,7 @@
    </arrivalModeWhitelist> -->
    <raidCommonalityFromPointsCurve>
      <points>
-        <li>(300,  0)</li>
+        <li>(300,  0.5)</li>
        <li>(700,  1)</li>
        <li>(1400, 1.8)</li>
        <li>(2800, 2.2)</li>
@@ -46,34 +47,75 @@
      </points>
    </raidCommonalityFromPointsCurve>
    <pawnGroupMakers>
-      <li>
-        <commonality>100</commonality>
-        <kindDef>Combat</kindDef>
-        <options>
-          <ArachnaeNode_Race_Praetorian_Enermy>3</ArachnaeNode_Race_Praetorian_Enermy>
-        </options>
-      </li>
-      <li>
-        <commonality>80</commonality>
-        <kindDef>Combat</kindDef>
-        <options>
-          <ArachnaeNode_Race_ShieldHead_Enermy>3</ArachnaeNode_Race_ShieldHead_Enermy>
-        </options>
-      </li>
-      <li>
-        <commonality>80</commonality>
-        <kindDef>Combat</kindDef>
-        <options>
-          <ArachnaeNode_Race_Fighter_Enermy>5</ArachnaeNode_Race_Fighter_Enermy>
-        </options>
-      </li>
+      <!-- 0-2000 -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>100000</commonality>
+				<maxTotalPoints>2000</maxTotalPoints>
+				<options>
+					<ArachnaeNode_Race_WeaponSmith_Enermy>30</ArachnaeNode_Race_WeaponSmith_Enermy>
+					<ArachnaeNode_Race_ShieldHead_Enermy>10</ArachnaeNode_Race_ShieldHead_Enermy>
+				</options>
+			</li>
+      <!-- 2-4000 -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>10000</commonality>
+				<maxTotalPoints>4000</maxTotalPoints>
+				<options>
+					<ArachnaeNode_Race_Fighter_Enermy>5</ArachnaeNode_Race_Fighter_Enermy>
+					<ArachnaeNode_Race_ShieldHead_Enermy>10</ArachnaeNode_Race_ShieldHead_Enermy>
+				</options>
+			</li>
+      <!-- 4-6000 -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>1000</commonality>
+				<maxTotalPoints>6000</maxTotalPoints>
+				<options>
+					<ArachnaeNode_Race_ShieldHead_Adv_Enermy>10</ArachnaeNode_Race_ShieldHead_Adv_Enermy>
+					<ArachnaeNode_Race_Fighter_Enermy>10</ArachnaeNode_Race_Fighter_Enermy>
+					<ArachnaeNode_Race_Fighter_Adv_Enermy>3</ArachnaeNode_Race_Fighter_Adv_Enermy>
+				</options>
+			</li>
+      <!-- 6-8000 -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>100</commonality>
+				<maxTotalPoints>8000</maxTotalPoints>
+				<options>
+					<ArachnaeNode_Race_ShieldHead_Adv_Enermy>10</ArachnaeNode_Race_ShieldHead_Adv_Enermy>
+					<ArachnaeNode_Race_Smokepop_Enermy>5</ArachnaeNode_Race_Smokepop_Enermy>
+					<ArachnaeNode_Race_Fighter_Adv_Enermy>3</ArachnaeNode_Race_Fighter_Adv_Enermy>
+				</options>
+			</li>
+      <!-- 8-10000 -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>10</commonality>
+				<maxTotalPoints>9999</maxTotalPoints>
+				<options>
+					<ArachnaeNode_Race_Praetorian_Enermy>5</ArachnaeNode_Race_Praetorian_Enermy>
+					<ArachnaeNode_Race_Smokepop_Enermy>10</ArachnaeNode_Race_Smokepop_Enermy>
+					<ArachnaeNode_Race_Fighter_Adv_Enermy>3</ArachnaeNode_Race_Fighter_Adv_Enermy>
+				</options>
+			</li>
+      <!-- 10000+ -->
+			<li>
+				<kindDef>Combat</kindDef>
+				<commonality>1</commonality>
+				<options>
+					<ArachnaeNode_Race_Praetorian_Enermy>5</ArachnaeNode_Race_Praetorian_Enermy>
+					<ArachnaeNode_Race_Fighter_Adv_Enermy>2</ArachnaeNode_Race_Fighter_Adv_Enermy>
+					<ArachnaeBeast_Race_Slayer_Enermy>1</ArachnaeBeast_Race_Slayer_Enermy>
+				</options>
+			</li>
      <li>
        <kindDef>Settlement</kindDef>
        <options>
-          <TradersGuild_Citizen>10</TradersGuild_Citizen>
-          <TradersGuild_Slasher>7</TradersGuild_Slasher>
-          <TradersGuild_Gunner>10</TradersGuild_Gunner>
-          <TradersGuild_Elite>10</TradersGuild_Elite>
+          <ArachnaeNode_Race_Fighter_Enermy>10</ArachnaeNode_Race_Fighter_Enermy>
+          <ArachnaeNode_Race_ShieldHead_Enermy>7</ArachnaeNode_Race_ShieldHead_Enermy>
+          <ArachnaeNode_Race_Myrmecocystus_Enermy>10</ArachnaeNode_Race_Myrmecocystus_Enermy>
        </options>
      </li>
    </pawnGroupMakers>
@@ -89,7 +131,7 @@
      </points>
    </raidLootValueFromPointsCurve>
    <humanlikeFaction>true</humanlikeFaction>
-    <hidden>false</hidden>
+    <hidden>true</hidden>
    <autoFlee>false</autoFlee>
    <canUseAvoidGrid>false</canUseAvoidGrid>
    <apparelStuffFilter>
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_BodyPart.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_BodyPart.xml
@@ -89,7 +89,7 @@
      </li>
    </renderNodeProperties>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
@@ -261,7 +261,7 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
        <!--
          ==================================================
          基础设置 (Basic Settings)
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Damage.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Damage.xml
@@ -206,7 +206,7 @@
      <li Class="HediffCompProperties_DisappearsOnDeath"/>
      <li Class="ArachnaeSwarm.HediffCompProperties_SpawnPawnOnRemoved">
        <pawnKindDefs>
-          <li>ArachnaeBase_Race_Skyhive</li>
+          <li>ArachnaeBase_Race_Skyhive_Fastdie</li>
        </pawnKindDefs>
        <spawnCount>1</spawnCount>
        <fixedBiologicalAge>0</fixedBiologicalAge>
@@ -285,7 +285,7 @@
      <li Class="HediffCompProperties_DisappearsOnDeath"/>
      <li Class="ArachnaeSwarm.HediffCompProperties_SpawnPawnOnRemoved">
        <pawnKindDefs>
-          <li>ArachnaeBase_Race_Acidcut</li>
+          <li>ArachnaeBase_Race_Acidcut_Fastdie</li>
        </pawnKindDefs>
        <spawnCount>1</spawnCount>
        <fixedBiologicalAge>0</fixedBiologicalAge>
@@ -633,4 +633,73 @@
      </li>
    </stages>
  </HediffDef>
+  
+  <HediffDef>
+    <defName>ARA_Dissolver_Touch_Damage</defName>
+    <label>溶脂酸</label>
+    <labelNoun>溶脂酸</labelNoun>
+    <description>阿拉克涅溶脂种向这个目标喷洒了大量的溶脂酸，其身躯很快就会变成胶状的虫蜜。\n\n真可怜。</description>
+    <descriptionHyperlinks>
+      <ThingDef>ARA_InsectJelly</ThingDef>
+    </descriptionHyperlinks>
+    <defaultLabelColor>(1, 1, 0.8)</defaultLabelColor>
+    <hediffClass>HediffWithComps</hediffClass>
+    <stages>
+      <li>
+        <statOffsets>
+          <PawnBeauty>-1</PawnBeauty>
+          <MoveSpeed>-3</MoveSpeed>
+        </statOffsets>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_Spawner">
+        <!--
+          ==================================================
+          基础设置 (Basic Settings)
+          ==================================================
+        -->
+        <!-- [DEBUG] 如果为true，则为此组件启用详细的调试日志记录。 -->
+        <debug>false</debug>
+        <!-- 要生成的物品的ThingDef。 -->
+        <thingToSpawn>ARA_InsectJelly</thingToSpawn>
+        <!-- 每次生成的基础物品数量。 -->
+        <spawnCount>30</spawnCount>
+        <!-- 
+          ==================================================
+          生成周期 (Spawning Interval)
+          ==================================================
+        -->
+        <!-- 下一次生成事件发生前的最少天数。 -->
+        <minDaysB4Next>0.1</minDaysB4Next>
+        <!-- 下一次生成事件发生前的最大天数。 -->
+        <maxDaysB4Next>0.1</maxDaysB4Next>
+        <randomGrace>0</randomGrace>
+        <!-- 
+          ==================================================
+          与年龄相关的调整 (Age-Related Adjustments)
+          ==================================================
+        -->
+        <!-- 如果为true，生成数量将根据宿主的年龄进行调整。 -->
+        <ageWeightedQuantity>false</ageWeightedQuantity>
+        <!-- 如果为true且ageWeightedQuantity为true，则随着宿主年龄增长，生成数量变多。 -->
+        <olderBiggerQuantity>true</olderBiggerQuantity>
+        <!-- 如果为true且ageWeightedQuantity为true，则随年龄增长的数量缩放将是指数性的而非线性的。 -->
+        <exponentialQuantity>true</exponentialQuantity>
+        <!-- 指数级数量缩放的最大乘数，以防止出现荒谬的数字。 -->
+        <exponentialRatioLimit>20</exponentialRatioLimit>
+        <!-- 
+          ==================================================
+          生成条件 (Spawning Conditions)
+          ==================================================
+        -->
+        <!-- 如果为true，当宿主Pawn饥饿时，生成将暂停。 -->
+        <hungerRelative>false</hungerRelative>
+        <!-- 如果为true，当宿主Pawn受伤时，生成将暂停。 -->
+        <healthRelative>false</healthRelative>
+
+        <destroyRandomBodyPart>true</destroyRandomBodyPart>
+      </li>
+    </comps>
+  </HediffDef>
 </Defs>
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_HiveMind.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_HiveMind.xml
@@ -3,15 +3,16 @@
  <HediffDef>
    <defName>ARA_HiveMindMaster</defName>
    <label>阿拉克涅女皇种</label>
-    <description>阿拉克涅女皇种是虫群意识的中心节点, 作为主脑统御整个阿拉克涅虫群。其体内拥有大量未分化的修复细胞，可以以常人无法想象的速度自行治愈所有的创伤。</description>
-    <hediffClass>ArachnaeSwarm.Hediff_HiveMindMaster</hediffClass>
+    <description>阿拉克涅女皇种是虫巢的中心节点, 作为族群主脑统御阿拉克涅虫族。</description>
+    <!-- <hediffClass>ArachnaeSwarm.Hediff_HiveMindMaster</hediffClass> -->
+    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.8, 0.3, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
    <scenarioCanAdd>false</scenarioCanAdd>
    <maxSeverity>100</maxSeverity>
    <stages>
      <li>
-        <label>连接至 {0} 个虫群工蜂</label>
+        <!-- <label>连接至 {0} 个虫群工蜂</label> -->
        <minSeverity>0</minSeverity>
        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
        <!-- Stat offsets will be added here later -->
@@ -20,6 +21,7 @@
          <li>Beauty</li>
          <li>Comfort</li>
          <li>Outdoors</li>
+          <li>Rest</li>
        </disablesNeeds>
        <enablesNeeds>
          <li>ARA_ChitinArmor</li>
@@ -28,21 +30,35 @@
      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_HiveMindMaster">
-        <scanIntervalTicks>3200</scanIntervalTicks>
+      <li Class="ArachnaeSwarm.HediffCompProperties_GestaltNode">
+        <nodeType>OverlordNode</nodeType>
      </li>
+      <!-- <li Class="ArachnaeSwarm.HediffCompProperties_HiveMindMaster">
+        <scanIntervalTicks>3200</scanIntervalTicks>
+      </li> -->
    </comps>
  </HediffDef>
  <HediffDef>
    <defName>ARA_HiveMindDrone</defName>
    <label>阿拉克涅督虫</label>
    <description>阿拉克涅督虫通过心灵与阿拉克涅女皇种相链接。如果女皇死亡，督虫也将停止生命活动。</description>
-    <hediffClass>ArachnaeSwarm.Hediff_HiveMindDrone</hediffClass>
+    <!-- <hediffClass>ArachnaeSwarm.Hediff_HiveMindDrone</hediffClass> -->
+    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
    <scenarioCanAdd>false</scenarioCanAdd>
+    <minSeverity>0</minSeverity>
+    <maxSeverity>2</maxSeverity>
+    <initialSeverity>1.5</initialSeverity>
    <stages>
      <li>
+        <label>未连接</label>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.2</setMax>
+          </li>
+        </capMods>
        <minSeverity>0</minSeverity>
        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
        <disablesNeeds>
@@ -59,17 +75,62 @@
          <li>ARA_ChitinArmor</li>
        </enablesNeeds>
      </li>
+      <li>
+        <label>重设中</label>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.5</setMax>
+          </li>
+        </capMods>
+        <minSeverity>0.99</minSeverity>
+        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>ARA_ChitinArmor</li>
+        </enablesNeeds>
+      </li>
+      <li>
+        <label>已连接</label>
+        <minSeverity>1.25</minSeverity>
+        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>ARA_ChitinArmor</li>
+        </enablesNeeds>
+      </li>
    </stages>
    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_HiveMindDrone">
-        <unlinkedDieDelayTicks>6400</unlinkedDieDelayTicks> <!-- Default to 30 seconds -->
+      <li Class="ArachnaeSwarm.HediffCompProperties_GestaltNode">
+        <nodeType>HiveNode</nodeType>
      </li>
-      <li Class="HediffCompProperties_MessageAfterTicks">
+      <!-- <li Class="ArachnaeSwarm.HediffCompProperties_HiveMindDrone">
+        <unlinkedDieDelayTicks>6400</unlinkedDieDelayTicks>
+      </li> -->
+      <!-- <li Class="HediffCompProperties_MessageAfterTicks">
        <ticks>1</ticks>
        <letterLabel>{0_labelShort} 诞生</letterLabel>
        <letterText>一只新的阿拉克涅督虫 {0_labelShort} 已经破茧而出！她正在四处徘徊，等待女皇种的指示——使用阿拉克涅女皇种的信息素标记技能完成链接，或者等待其自行建立链接。</letterText>
        <letterType>HumanPregnancy</letterType>
-      </li>
+      </li> -->
      <li Class="HediffCompProperties_RemoveIfOtherHediff">
        <hediffs>
          <li>ARA_NonPlayer_HiveMindDroneHediff</li>
@@ -77,10 +138,89 @@
      </li>
    </comps>
  </HediffDef>
+  <PawnRelationDef>
+    <defName>ARA_GestaltOverseer</defName>
+    <label>节点监管</label>
+    <workerClass>ArachnaeSwarm.PawnRelationWorker_GestaltOverseer</workerClass>
+    <importance>185</importance>
+    <implied>false</implied>
+    <opinionOffset>100</opinionOffset>
+    <generationChanceFactor>0</generationChanceFactor>
+    <romanceChanceFactor>0</romanceChanceFactor>
+    <incestOpinionOffset>0</incestOpinionOffset>
+    <inbredChanceOnChild>0</inbredChanceOnChild>
+    <familyByBloodRelation>true</familyByBloodRelation>
+    <removeOnDeath>true</removeOnDeath>
+    <removeOnLeftBehind>true</removeOnLeftBehind>
+    <reflexive>true</reflexive>
+  </PawnRelationDef>
+  <HediffDef>
+    <defName>ARA_GestaltNetworkOverload</defName>
+    <label>网络超载</label>
+    <description>格式塔网络超载导致的精神压力，这会削弱阿拉克涅女皇的总体能力，并增加网络崩溃的风险。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <MentalBreakThreshold>0.1</MentalBreakThreshold>
+        </statOffsets>    
+      </li>
+      <li>
+        <minSeverity>0.2</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.05</offset>
+          </li>
+        </capMods>
+        <statOffsets>
+          <MentalBreakThreshold>0.2</MentalBreakThreshold>
+        </statOffsets>    
+      </li>
+      <li>
+        <minSeverity>0.5</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.1</offset>
+          </li>
+        </capMods>
+        <statOffsets>
+          <MentalBreakThreshold>0.35</MentalBreakThreshold>
+        </statOffsets>   
+      </li>
+      <li>
+        <minSeverity>0.8</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.15</offset>
+          </li>
+        </capMods>
+        <statOffsets>
+          <MentalBreakThreshold>0.5</MentalBreakThreshold>
+        </statOffsets>  
+      </li>
+      <li>
+        <minSeverity>0.95</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.1</setMax>
+          </li>
+        </capMods>
+        <statOffsets>
+          <MentalBreakThreshold>0.5</MentalBreakThreshold>
+        </statOffsets>  
+      </li>
+    </stages>
+  </HediffDef>
  <HediffDef>
    <defName>ARA_NonPlayer_HiveMindDroneHediff</defName>
    <label>野性虫群</label>
-    <description>与阿拉克涅虫群蜂巢意志断开链接的督虫只会如野兽般行动——女皇种可以重新接管它们。</description>
+    <description>与阿拉克涅虫群蜂巢意志断开链接的督虫只会如野兽般行动。</description>
    <!-- <hediffClass>ArachnaeSwarm.Hediff_HiveMindDrone</hediffClass> -->
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
@@ -105,15 +245,6 @@
      </li>
    </stages>
  </HediffDef>
-  <HediffGiverSetDef>
-    <defName>ARA_NonPlayerHediffSet</defName>
-    <hediffGivers>
-      <li Class="ArachnaeSwarm.HediffGiver_NonPlayerFaction">
-        <hediff>ARA_NonPlayer_HiveMindDroneHediff</hediff>
-        <mtbDays>0.1</mtbDays> <!-- 很短的检查间隔 -->
-      </li>
-    </hediffGivers>
-  </HediffGiverSetDef>
  <HediffDef>
    <defName>ARA_HiveMindWorker</defName>
    <label>阿拉克涅辅虫</label>
@@ -126,7 +257,6 @@
      <li>
        <minSeverity>0</minSeverity>
        <disablesNeeds>
-          <li>Food</li>
          <li>Rest</li>
        </disablesNeeds>
      </li>
@@ -142,9 +272,91 @@
    <scenarioCanAdd>false</scenarioCanAdd>
    <stages>
      <li>
+        <label>未连接</label>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.2</setMax>
+          </li>
+        </capMods>
        <minSeverity>0</minSeverity>
+        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>ARA_ChitinArmor</li>
+        </enablesNeeds>
+      </li>
+      <li>
+        <label>重设中</label>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.5</setMax>
+          </li>
+        </capMods>
+        <minSeverity>0.99</minSeverity>
+        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>ARA_ChitinArmor</li>
+        </enablesNeeds>
+      </li>
+      <li>
+        <label>已连接</label>
+        <minSeverity>1.25</minSeverity>
+        <foodPoisoningChanceFactor>0</foodPoisoningChanceFactor>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>ARA_ChitinArmor</li>
+        </enablesNeeds>
      </li>
    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_GestaltNode">
+        <nodeType>HiveNode</nodeType>
+      </li>
+      <!-- <li Class="ArachnaeSwarm.HediffCompProperties_HiveMindDrone">
+        <unlinkedDieDelayTicks>6400</unlinkedDieDelayTicks>
+      </li> -->
+      <!-- <li Class="HediffCompProperties_MessageAfterTicks">
+        <ticks>1</ticks>
+        <letterLabel>{0_labelShort} 诞生</letterLabel>
+        <letterText>一只新的阿拉克涅督虫 {0_labelShort} 已经破茧而出！她正在四处徘徊，等待女皇种的指示——使用阿拉克涅女皇种的信息素标记技能完成链接，或者等待其自行建立链接。</letterText>
+        <letterType>HumanPregnancy</letterType>
+      </li> -->
+      <li Class="HediffCompProperties_RemoveIfOtherHediff">
+        <hediffs>
+          <li>ARA_NonPlayer_HiveMindDroneHediff</li>
+        </hediffs>
+      </li>
+    </comps>
  </HediffDef>

  <HediffDef>
@@ -161,6 +373,7 @@
        <regeneration>500</regeneration>
        <damageFactors>
 					<ARA_AcidBurn>0.1</ARA_AcidBurn>
+					<ARA_AcidBomb>0.1</ARA_AcidBomb>
          <AcidBurn>0.1</AcidBurn>
 				</damageFactors>
      </li>
@@ -189,6 +402,7 @@
        <regeneration>100</regeneration>
        <damageFactors>
 					<ARA_AcidBurn>0.1</ARA_AcidBurn>
+					<ARA_AcidBomb>0.1</ARA_AcidBomb>
          <AcidBurn>0.1</AcidBurn>
 				</damageFactors>
      </li>
@@ -217,6 +431,7 @@
        <regeneration>20</regeneration>
        <damageFactors>
 					<ARA_AcidBurn>0.1</ARA_AcidBurn>
+					<ARA_AcidBomb>0.1</ARA_AcidBomb>
          <AcidBurn>0.1</AcidBurn>
 				</damageFactors>
      </li>
@@ -420,4 +635,63 @@
      </li>
    </stages>
  </HediffDef>
+  
+  <HediffDef>
+    <defName>ARA_Scavenger_Production_InsectJelly</defName>
+    <label>虫蜜腔室</label>
+    <description>这只阿拉克涅食腐种正在产出虫蜜，以滋养虫群。</description>
+    <descriptionHyperlinks>
+      <ThingDef>ARA_InsectJelly</ThingDef>
+    </descriptionHyperlinks>
+    <hediffClass>HediffWithComps</hediffClass>
+    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <stages>
+      <li>
+        <enablesNeeds>
+          <li>ARA_HoneyProduction</li>
+        </enablesNeeds>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Baneling_Acidbomb_Resist</defName>
+    <label>碱性表皮</label>
+    <description>阿拉克涅爆裂种的表皮覆盖了碱性物质。以抵抗其他阿拉克涅爆裂种死亡时爆出的酸液，避免发生连环爆炸。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <stages>
+      <li>
+        <damageFactors>
+					<ARA_AcidBomb>0</ARA_AcidBomb>
+				</damageFactors>
+      </li>
+    </stages>
+  </HediffDef>
+
+  
+  <HediffDef>
+    <defName>ARA_Incubator_FasterDie</defName>
+    <label>不知朝暮</label>
+    <description>该阿拉克涅虫族仅仅是为了一个简单的目标而创造，它们死的会比自己的同族更快。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <stages>
+      <li>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_DisappearsAndKills">
+        <disappearsAfterTicks>25200~28800</disappearsAfterTicks>
+        <showRemainingTime>true</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath" />
+    </comps>
+  </HediffDef>
 </Defs>
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Incubator_Reward.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Incubator_Reward.xml
@@ -137,4 +137,285 @@
      </li>
    </stages>
  </HediffDef>
+
+  <!-- ==================== 额外差特质（Bad Pool） ==================== -->
+  <HediffDef>
+    <defName>ARA_Incubator_1_Flaw_Hediffs</defName>
+    <label>内分泌失调</label>
+    <description>急速的孵化使得该阿拉克涅督虫的内分泌系统发育异常，体内各种激素长期维持在低水平。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statOffsets>
+          <MoveSpeed>-1</MoveSpeed>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_2_Flaw_Hediffs</defName>
+    <label>外骨骼缺失</label>
+    <description>急速的孵化使得该阿拉克涅督虫没有发育出完整的外骨骼，这使得它们弱不禁风。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statOffsets>
+          <ArmorRating_Blunt>-0.3</ArmorRating_Blunt>
+          <ArmorRating_Sharp>-0.3</ArmorRating_Sharp>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_3_Flaw_Hediffs</defName>
+    <label>动作失调</label>
+    <description>急速的孵化使得该阿拉克涅督虫的神经系统非常迟钝，不仅记不住什么东西，甚至有些寻常的动作都会受到干扰。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.1</offset>
+          </li>
+        </capMods>
+        <statOffsets>
+          <GlobalLearningFactor>-0.5</GlobalLearningFactor>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_4_Flaw_Hediffs</defName>
+    <label>视觉极差</label>
+    <description>急速的孵化使得该阿拉克涅督虫的外界感受器官发育不良。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>Sight</capacity>
+            <setMax>0.1</setMax>
+          </li>
+          <li>
+            <capacity>Hearing</capacity>
+            <setMax>0.1</setMax>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_5_Flaw_Hediffs</defName>
+    <label>肌肉萎缩</label>
+    <description>急速的孵化使得该阿拉克涅督虫的肌肉组织发育不全，力量远低于正常个体。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <MeleeDamageFactor>0.5</MeleeDamageFactor>
+          <CarryingCapacity>0.6</CarryingCapacity>
+        </statFactors>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_6_Flaw_Hediffs</defName>
+    <label>凝血障碍</label>
+    <description>急速的孵化导致该阿拉克涅督虫的凝血机制异常，一旦受伤就会大量失血。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <totalBleedFactor>3.0</totalBleedFactor>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_7_Flaw_Hediffs</defName>
+    <label>骨质疏松</label>
+    <description>急速的孵化使得该阿拉克涅督虫的内骨骼异常脆弱，更容易受到致命伤害。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <IncomingDamageFactor>1.5</IncomingDamageFactor>
+        </statFactors>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_8_Flaw_Hediffs</defName>
+    <label>免疫缺陷</label>
+    <description>急速的孵化使得该阿拉克涅督虫的免疫系统发育不良，对疾病的抵抗力极差。\n\n由于较差的孵化质量，阿拉克涅督虫获得了这个不利突变。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.9, 0.2 , 0.1)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <ImmunityGainSpeed>0.5</ImmunityGainSpeed>
+        </statFactors>
+      </li>
+    </stages>
+  </HediffDef>
+
+  <!-- ==================== 精英特质（Elite Pool）- 普通特质增强版 ==================== -->
+  <HediffDef>
+    <defName>ARA_Incubator_1_EliteReward_Hediffs</defName>
+    <label>超密度甲壳</label>
+    <description>该阿拉克涅督虫的甲壳密度令人发指——这真的是一个生物可以从身上生长出来的组织吗？不过因为自重太大，这只督虫几乎难以移动。\n\n这个稀有突变是致密甲壳的变种。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statOffsets>
+          <MoveSpeed>-1.5</MoveSpeed>
+        </statOffsets>
+        <statFactors>
+          <ArmorRating_Blunt>1.75</ArmorRating_Blunt>
+          <ArmorRating_Sharp>1.75</ArmorRating_Sharp>
+          <IncomingDamageFactor>0.25</IncomingDamageFactor>
+        </statFactors>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_2_EliteReward_Hediffs</defName>
+    <label>壳下强酸脂</label>
+    <description>该阿拉克涅督虫的皮下层有一层致密的强酸性脂肪，这种流体使得督虫变得更加耐冲击、并且完全阻挡外部灼烧和酸蚀，还赋予督虫以酸液迸溅的方式向对其发起近战攻击的敌人反射伤害。\n\n这个稀有突变是壳下阻燃脂的变种。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <Flammability>0</Flammability>
+        </statFactors>
+        <statOffsets>
+          <ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+          <ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+          <ArmorRating_Heat>2</ArmorRating_Heat>
+        </statOffsets>
+        <damageFactors>
+					<ARA_AcidBurn>0</ARA_AcidBurn>
+					<ARA_AcidBomb>0</ARA_AcidBomb>
+          <AcidBurn>0</AcidBurn>
+				</damageFactors>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarmVerse.HediffCompProperties_ReflectMeleeDamage">
+        <reflectMultiplier>3</reflectMultiplier>
+        <fixedDamageDefName>ARA_AcidBurn</fixedDamageDefName>
+      </li>
+    </comps>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_3_EliteReward_Hediffs</defName>
+    <label>无限制激素</label>
+    <description>该阿拉克涅督虫的激素腺体使得其血管内充斥着大量的激素，简直比磕了群勃龙醋酸群勃龙美替诺龙司腾博龙曲托龙西斯龙氧雄龙康复龙康力龙还要强大，一切敌人在其眼里几乎都是慢动作播放——但是这种透支生命的行为使得这只督虫必然承受短命的代价。\n\n这个稀有突变是行动激素的变种。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statOffsets>
+          <MoveSpeed>2</MoveSpeed>
+        </statOffsets>
+        <statFactors>
+          <MeleeCooldownFactor>0.1</MeleeCooldownFactor>
+          <RangedCooldownFactor>0.2</RangedCooldownFactor>
+        </statFactors>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_DisappearsAndKills">
+        <disappearsAfterTicks>2520000~2880000</disappearsAfterTicks> <!-- 42 ~ 48 days -->
+        <showRemainingTime>true</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath" />
+    </comps>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_4_EliteReward_Hediffs</defName>
+    <label>全域视力</label>
+    <description>该阿拉克涅督虫的眼睛可以近乎无限地聚焦，并且几乎不需要时间进行射击瞄准。\n\n这个稀有突变是高静态视力的变种。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <RangedCooldownFactor>0.5</RangedCooldownFactor>
+          <ShootingAccuracyPawn>10</ShootingAccuracyPawn>
+          <AimingDelayFactor>0.01</AimingDelayFactor>
+        </statFactors>
+        <statOffsets>
+          <ShootingAccuracyOutdoorsDarkOffset>1</ShootingAccuracyOutdoorsDarkOffset>
+          <ShootingAccuracyOutdoorsLitOffset>1</ShootingAccuracyOutdoorsLitOffset>
+          <ShootingAccuracyIndoorsDarkOffset>1</ShootingAccuracyIndoorsDarkOffset>
+          <ShootingAccuracyIndoorsLitOffset>1</ShootingAccuracyIndoorsLitOffset>
+          <MeleeHitChanceOutdoorsDarkOffset>1</MeleeHitChanceOutdoorsDarkOffset>
+          <MeleeHitChanceOutdoorsLitOffset>1</MeleeHitChanceOutdoorsLitOffset>
+          <MeleeHitChanceIndoorsDarkOffset>1</MeleeHitChanceIndoorsDarkOffset>
+          <MeleeHitChanceIndoorsLitOffset>1</MeleeHitChanceIndoorsLitOffset>
+          <MeleeDodgeChanceOutdoorsDarkOffset>1</MeleeDodgeChanceOutdoorsDarkOffset>
+          <MeleeDodgeChanceOutdoorsLitOffset>1</MeleeDodgeChanceOutdoorsLitOffset>
+          <MeleeDodgeChanceIndoorsDarkOffset>1</MeleeDodgeChanceIndoorsDarkOffset>
+          <MeleeDodgeChanceIndoorsLitOffset>1</MeleeDodgeChanceIndoorsLitOffset>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>ARA_Incubator_5_EliteReward_Hediffs</defName>
+    <label>异变肌群</label>
+    <description>该阿拉克涅督虫的肌群强壮得已经无法使用常理解释了，似乎只需要轻轻地挥动鳌爪，最坚固的城墙也会被劈开裂口——督虫还藉由这种强大的生理能力获得了多个体术技能。\n\n这个稀有突变是强壮肌肉的变种。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.8, 0.6, 0.0)</defaultLabelColor>
+    <scenarioCanAdd>true</scenarioCanAdd>
+    <stages>
+      <li>
+        <statFactors>
+          <MeleeDamageFactor>5</MeleeDamageFactor>
+        </statFactors>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_GiveAbility">
+        <abilityDefs>
+          <li>ARA_Incubator_5_EliteReward_Jump</li>
+          <li>ARA_Incubator_5_EliteReward_Charge</li>
+        </abilityDefs>
+      </li>
+    </comps>
+  </HediffDef>
 </Defs>
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml
@@ -4,7 +4,7 @@
    <defName>ARA_Possession</defName>
    <label>阿拉克涅原虫</label>
    <description>这个生物的身体被阿拉克涅原虫所夺取了，这具身体原本的主人已经没有可能再回来了。</description>
-    <hediffClass>ArachnaeSwarm.Hediff_Possession</hediffClass>
+    <hediffClass>ArachnaeSwarm.Hediff_Possession</hediffClass>  
    <defaultLabelColor>(0.6, 0.4, 0.8)</defaultLabelColor>
    <isBad>false</isBad>
    <scenarioCanAdd>false</scenarioCanAdd>
--- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Psy.xml
+++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Psy.xml
@@ -150,8 +150,9 @@
          <li>ArachnaeNode_Race_Skyraider</li>
          <li>ArachnaeNode_Race_Praetorian</li>
          <li>ArachnaeBase_Race_Acidcut</li>
-          <li>ArachnaeBase_Race_Acidling</li>
+          <li>ArachnaeBase_Race_Baneling</li>
          <li>ArachnaeBase_Race_Skyhive</li>
+          <li>ArachnaeBase_Race_Locust</li>
          <li>ArachnaeNode_Race_MimicNematode</li>
        </targetRaces>

@@ -199,4 +200,42 @@
      </li>
    </comps>
  </HediffDef>
+
+  <HediffDef>
+    <defName>ARA_SwarmSpell_Overdrive</defName>
+    <label>灵能神经束过载</label>
+    <description>阿拉克涅灵吸种的神经束在连续施术后会进入超负荷状态——这种状态会持续压迫灵吸种神经系统，直到完全烧毁。\n\n这种状况是无法自行缓解的，灵吸种只能将这种高额负载导流到其他个体的身上。对于那些拥有启灵神经的个体来说，这种导流不会致命，但是那些没有启灵神经的个体可就不一定了。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.6, 0.6, 0.6)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <stages>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_DisappearsAndKills">
+        <compClass>HediffComp_DisappearsAndKills_Shambler</compClass>
+        <disappearsAfterTicks>3600~3600</disappearsAfterTicks> <!-- 4.2 ~ 4.8 days -->
+        <showRemainingTime>true</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+    </comps>
+  </HediffDef>
+
+  <HediffDef>
+    <defName>ARA_PsyHemostasis_Hediff</defName>
+    <label>灵能封堵</label>
+    <description>这个殖民者被使用超自然力量封住了伤口。</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <defaultLabelColor>(0.6, 0.6, 0.6)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <stages>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <showRemainingTime>true</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+    </comps>
+  </HediffDef>
 </Defs>
--- a/1.6/1.6/Defs/JobDefs/ARA_Jobs.xml
+++ b/1.6/1.6/Defs/JobDefs/ARA_Jobs.xml
@@ -95,4 +95,16 @@
    <casualInterruptible>true</casualInterruptible>
    <makeTargetPrisoner>false</makeTargetPrisoner>
  </JobDef>
+  
+  <JobDef>
+    <defName>ARA_Job_Launch_Proj</defName>
+    <driverClass>ArachnaeSwarm.JobDriver_CastAbilityMaintainMultiProjectile</driverClass>
+    <reportString>喷射火焰中。</reportString>
+    <abilityCasting>true</abilityCasting>
+    <alwaysShowWeapon>true</alwaysShowWeapon>
+    <playerInterruptible>true</playerInterruptible>
+    <casualInterruptible>false</casualInterruptible>
+    <!-- <checkOverrideOnDamage>Always</checkOverrideOnDamage> -->
+    <suspendable>false</suspendable>
+  </JobDef>
 </Defs>
--- a/1.6/1.6/Defs/MiscSettingDefs/ARA_TieredHediffRewards.xml
+++ b/1.6/1.6/Defs/MiscSettingDefs/ARA_TieredHediffRewards.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+    <!-- 
+        分层特质奖励配置 Def
+        定义特质池和品质阶段规则，可被多个孵化建筑共享
+        品质范围：0-150%
+    -->
+    <ArachnaeSwarm.TieredHediffRewardDef>
+        <defName>ARA_DefaultIncubatorRewards</defName>
+        <label>默认孵化奖励配置</label>
+        <description>阿拉克涅虫群的默认孵化特质奖励规则。根据孵化品质分为7个阶段，不同阶段从不同特质池中抽取奖励。品质上限150%。</description>
+        
+        <!-- ==================== 特质池定义 ==================== -->
+        <hediffPools>
+            <!-- 差特质池 (阶段1-3使用) -->
+            <li>
+                <poolId>bad</poolId>
+                <label>劣质特质</label>
+                <hediffs>
+                    <li>ARA_Incubator_1_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_2_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_3_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_4_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_5_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_6_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_7_Flaw_Hediffs</li>
+                    <li>ARA_Incubator_8_Flaw_Hediffs</li>
+                </hediffs>
+            </li>
+            
+            <!-- 正常/好特质池 (阶段3-7使用) -->
+            <li>
+                <poolId>normal</poolId>
+                <label>普通特质</label>
+                <hediffs>
+                    <li>ARA_Incubator_1_Reward_Hediffs</li>
+                    <li>ARA_Incubator_2_Reward_Hediffs</li>
+                    <li>ARA_Incubator_3_Reward_Hediffs</li>
+                    <li>ARA_Incubator_4_Reward_Hediffs</li>
+                    <li>ARA_Incubator_5_Reward_Hediffs</li>
+                    <li>ARA_Incubator_6_Reward_Hediffs</li>
+                    <li>ARA_Incubator_7_Reward_Hediffs</li>
+                    <li>ARA_Incubator_8_Reward_Hediffs</li>
+                </hediffs>
+            </li>
+            
+            <!-- 高级/精英特质池 (阶段6-7使用) -->
+            <li>
+                <poolId>elite</poolId>
+                <label>精英特质</label>
+                <hediffs>
+                    <li>ARA_Incubator_1_EliteReward_Hediffs</li>
+                    <li>ARA_Incubator_2_EliteReward_Hediffs</li>
+                    <li>ARA_Incubator_3_EliteReward_Hediffs</li>
+                    <li>ARA_Incubator_4_EliteReward_Hediffs</li>
+                    <li>ARA_Incubator_5_EliteReward_Hediffs</li>
+                </hediffs>
+            </li>
+        </hediffPools>
+        
+        <!-- ==================== 7个品质阶段 (0-150%) ==================== -->
+        <qualityTiers>
+            <!-- 阶段1：0-20% - 2个差特质 -->
+            <li>
+                <tier>1</tier>
+                <minQuality>0.00</minQuality>
+                <maxQuality>0.20</maxQuality>
+                <tierLabel>极差</tierLabel>
+                <messageKey>ARA_Tier_Bad</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>bad</poolId>
+                        <count>3</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段2：20-40% - 1个差特质 -->
+            <li>
+                <tier>2</tier>
+                <minQuality>0.20</minQuality>
+                <maxQuality>0.40</maxQuality>
+                <tierLabel>较差</tierLabel>
+                <messageKey>ARA_Tier_Poor</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>bad</poolId>
+                        <count>2</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段3：40-60% - 1个好特质 + 1个差特质 -->
+            <li>
+                <tier>3</tier>
+                <minQuality>0.40</minQuality>
+                <maxQuality>0.60</maxQuality>
+                <tierLabel>普通</tierLabel>
+                <messageKey>ARA_Tier_Normal</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>normal</poolId>
+                        <count>1</count>
+                    </li>
+                    <li>
+                        <poolId>bad</poolId>
+                        <count>1</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段4：60-80% - 2个好特质 -->
+            <li>
+                <tier>4</tier>
+                <minQuality>0.60</minQuality>
+                <maxQuality>0.80</maxQuality>
+                <tierLabel>良好</tierLabel>
+                <messageKey>ARA_Tier_Good</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>normal</poolId>
+                        <count>2</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段5：80-120% - 3个好特质 -->
+            <li>
+                <tier>5</tier>
+                <minQuality>0.80</minQuality>
+                <maxQuality>1.20</maxQuality>
+                <tierLabel>极佳</tierLabel>
+                <messageKey>ARA_Tier_Excellent</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>normal</poolId>
+                        <count>3</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段6：120-140% - 3个好特质 + 1个高级特质 -->
+            <li>
+                <tier>6</tier>
+                <minQuality>1.20</minQuality>
+                <maxQuality>1.40</maxQuality>
+                <tierLabel>大师</tierLabel>
+                <messageKey>ARA_Tier_Elite</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>normal</poolId>
+                        <count>3</count>
+                    </li>
+                    <li>
+                        <poolId>elite</poolId>
+                        <count>1</count>
+                    </li>
+                </drawRules>
+            </li>
+            
+            <!-- 阶段7：140-150% - 3个好特质 + 2个高级特质 -->
+            <li>
+                <tier>7</tier>
+                <minQuality>1.40</minQuality>
+                <maxQuality>1.51</maxQuality> <!-- 略大于1.5以包含150% -->
+                <tierLabel>传奇</tierLabel>
+                <messageKey>ARA_Tier_Legendary</messageKey>
+                <drawRules>
+                    <li>
+                        <poolId>normal</poolId>
+                        <count>3</count>
+                    </li>
+                    <li>
+                        <poolId>elite</poolId>
+                        <count>2</count>
+                    </li>
+                </drawRules>
+            </li>
+        </qualityTiers>
+    </ArachnaeSwarm.TieredHediffRewardDef>
+</Defs>
--- a/1.6/1.6/Defs/MiscSettingDefs/EventUIConfig.xml
+++ b/1.6/1.6/Defs/MiscSettingDefs/EventUIConfig.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <ArachnaeSwarm.EventUIConfigDef>
-    <defName>ARA_EventUIConfig</defName>
-    
-    <!-- General Style -->
-    <labelFont>Small</labelFont>
-    <drawBorders>false</drawBorders>
-    <showDefName>false</showDefName>
-    <showLabel>true</showLabel>
-    <defaultBackgroundImagePath></defaultBackgroundImagePath>
-    
-    <!-- Virtual Layout Dimensions -->
-    <lihuiSize>(500, 800)</lihuiSize>
-    <nameSize>(650, 130)</nameSize>
-    <textSize>(650, 350)</textSize>
-    <optionsWidth>750</optionsWidth>
-    
-    <!-- Virtual Layout Offsets -->
-    <textNameOffset>0</textNameOffset>
-    <optionsTextOffset>0</optionsTextOffset>
-
-    <defaultWindowSize>(750, 600)</defaultWindowSize>
-
-    <!-- New Layout Dimensions -->
-    <newLayoutNameSize>(200, 50)</newLayoutNameSize>
-    <newLayoutLihuiSize>(600, 200)</newLayoutLihuiSize>
-    <newLayoutTextSize>(600, 200)</newLayoutTextSize>
-    <newLayoutOptionsWidth>600</newLayoutOptionsWidth>
-    <newLayoutPadding>20</newLayoutPadding>
-    <newLayoutTextNameOffset>20</newLayoutTextNameOffset>
-    <newLayoutOptionsTextOffset>20</newLayoutOptionsTextOffset>
-    
-  </ArachnaeSwarm.EventUIConfigDef>
-
-</Defs>
--- a/1.6/1.6/Defs/MiscSettingDefs/LetterDefs/EventLetter.xml
+++ b/1.6/1.6/Defs/MiscSettingDefs/LetterDefs/EventLetter.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <LetterDef>
-    <defName>ARA_EventChoiceLetter</defName>
-    <letterClass>ArachnaeSwarm.Letter_EventChoice</letterClass>
-    <arriveSound>LetterArrive_Good</arriveSound>
-    <color>(120, 150, 255)</color>
-  </LetterDef>
-</Defs>
--- a/1.6/1.6/Defs/NeedDefs/ARA_Needs.xml
+++ b/1.6/1.6/Defs/NeedDefs/ARA_Needs.xml
@@ -8,13 +8,29 @@
    <listPriority>800</listPriority>
    <major>true</major>
    <onlyIfCausedByHediff>true</onlyIfCausedByHediff>
+    <showOnNeedList>true</showOnNeedList>
    <hediffRequiredAny>
      <li>ARA_Myrmecocystus_Production_InsectJelly</li>
    </hediffRequiredAny>
    <showForCaravanMembers>true</showForCaravanMembers>
-    <developmentalStageFilter>Baby, Child, Adult</developmentalStageFilter>
    <showUnitTicks>true</showUnitTicks>
    <freezeWhileSleeping>false</freezeWhileSleeping>
+    <minIntelligence>Animal</minIntelligence>
+  </NeedDef>
+  <NeedDef>
+    <defName>ARA_HoneyProduction_Animal</defName>
+    <needClass>ArachnaeSwarm.Need_HoneyProduction</needClass>
+    <label>蜜罐</label>
+    <description>代表这个生物储存阿拉克涅虫蜜原浆的多少。如果蜜罐满溢，则生物会尝试将其提取出来。</description>
+    <listPriority>800</listPriority>
+    <major>true</major>
+    <showForCaravanMembers>true</showForCaravanMembers>
+    <showUnitTicks>true</showUnitTicks>
+    <minIntelligence>Animal</minIntelligence>
+    <freezeWhileSleeping>false</freezeWhileSleeping>
+    <!-- <requiredComps>
+      <li Class="ArachnaeSwarm.CompProperties_HoneyProduction_Animal"></li>
+    </requiredComps> -->
  </NeedDef>
  <NeedDef>
    <defName>ARA_ChitinArmor</defName>
@@ -24,15 +40,16 @@
    <listPriority>800</listPriority>
    <major>true</major>
    <onlyIfCausedByHediff>true</onlyIfCausedByHediff>
+    <showOnNeedList>true</showOnNeedList>
    <hediffRequiredAny>
      <li>ARA_HiveMindMaster</li>
      <li>ARA_HiveMindDrone</li>
      <li>ARA_NonPlayer_HiveMindDroneHediff</li>
    </hediffRequiredAny>
    <showForCaravanMembers>true</showForCaravanMembers>
-    <developmentalStageFilter>Baby, Child, Adult</developmentalStageFilter>
    <showUnitTicks>true</showUnitTicks>
    <freezeWhileSleeping>false</freezeWhileSleeping>
+    <minIntelligence>Animal</minIntelligence>

    <modExtensions>
      <li Class="ArachnaeSwarm.NeedDefExtension_ChitinLevels">
--- a/1.6/1.6/Defs/PawnCapacityDefs/ARA_PawnCapacity.xml
+++ b/1.6/1.6/Defs/PawnCapacityDefs/ARA_PawnCapacity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <PawnCapacityDef>
+    <defName>ARA_PsychicStange</defName>
+    <label>虫群灵能强度</label>
+    <listOrder>60</listOrder>
+    <workerClass>ArachnaeSwarm.PawnCapacityWorker_PsychicStange</workerClass>
+  </PawnCapacityDef>
+</Defs>
--- a/1.6/1.6/Defs/PawnKindDef/ARA_Hostile_Hive_PawnKinds.xml
+++ b/1.6/1.6/Defs/PawnKindDef/ARA_Hostile_Hive_PawnKinds.xml
@@ -1,27 +1,75 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <PawnKindDef ParentName="ArachnaeNode_Race_Fighter">
-    <defName>ArachnaeNode_Race_Fighter_Enermy</defName>
+	<PawnKindDef ParentName="ArachnaeNode_Race_Myrmecocystus">
+		<defName>ArachnaeNode_Race_Myrmecocystus_Enermy</defName>
    <isFighter>true</isFighter>
    <trader>false</trader>
    <chemicalAddictionChance>0</chemicalAddictionChance>
    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
    <forceNormalGearQuality>true</forceNormalGearQuality>
-    <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
-    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>false</forceDeathOnDowned> -->
    <canBeScattered>false</canBeScattered>
    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
    <weaponTags>
-      <li>ARA_Armed_Organ_T1</li>
+      <li>ARA_Armed_Organ_Base</li>
    </weaponTags>
-    <apparelTags>
+    <apparelTags Inherit="False">
      <li>ARA_Inner</li>
      <li>ARA_Clothes</li>
    </apparelTags>
-    <apparelMoney>1000</apparelMoney>
-    <weaponMoney>5000</weaponMoney>
-    <combatPower>250</combatPower>
-  </PawnKindDef>
+    <apparelMoney>300~500</apparelMoney>
+    <weaponMoney>300~500</weaponMoney>
+    <combatPower>100</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+        <severity>1</severity>
+      </li>
+    </startingHediffs>
+	</PawnKindDef>
+	<PawnKindDef ParentName="ArachnaeNode_Race_WeaponSmith">
+		<defName>ArachnaeNode_Race_WeaponSmith_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>false</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <weaponTags>
+      <li>ARA_Armed_Organ_Base</li>
+    </weaponTags>
+    <apparelTags Inherit="False">
+      <li>ARA_Inner</li>
+      <li>ARA_Clothes</li>
+    </apparelTags>
+    <apparelMoney>300~500</apparelMoney>
+    <weaponMoney>500~1200</weaponMoney>
+    <combatPower>150</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+        <severity>1</severity>
+      </li>
+    </startingHediffs>
+	</PawnKindDef>
  <PawnKindDef ParentName="ArachnaeNode_Race_ShieldHead">
    <defName>ArachnaeNode_Race_ShieldHead_Enermy</defName>
    <isFighter>true</isFighter>
@@ -29,20 +77,171 @@
    <chemicalAddictionChance>0</chemicalAddictionChance>
    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
    <forceNormalGearQuality>true</forceNormalGearQuality>
-    <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
-    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
    <canBeScattered>false</canBeScattered>
    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
    <weaponTags>
-      <li>ARA_Armed_Organ_T1</li>
+      <li>ARA_Armed_Organ_Base</li>
    </weaponTags>
-    <apparelTags>
+    <apparelTags Inherit="False">
      <li>ARA_Inner</li>
      <li>ARA_Clothes</li>
    </apparelTags>
-    <apparelMoney>1000</apparelMoney>
-    <weaponMoney>5000</weaponMoney>
-    <combatPower>330</combatPower>
+    <apparelMoney>400~700</apparelMoney>
+    <weaponMoney>500~1200</weaponMoney>
+    <combatPower>100</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+        <severity>1</severity>
+      </li>
+    </startingHediffs>
+  </PawnKindDef>
+  <PawnKindDef ParentName="ArachnaeNode_Race_Fighter">
+    <defName>ArachnaeNode_Race_Fighter_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <weaponTags>
+      <li>ARA_Armed_Organ_Base</li>
+    </weaponTags>
+    <apparelTags Inherit="False">
+      <li>ARA_Inner</li>
+      <li>ARA_Clothes</li>
+    </apparelTags>
+    <apparelMoney>500~900</apparelMoney>
+    <weaponMoney>800~1800</weaponMoney>
+    <combatPower>250</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+    </startingHediffs>
+  </PawnKindDef>
+  <PawnKindDef ParentName="ArachnaeNode_Race_ShieldHead">
+    <defName>ArachnaeNode_Race_ShieldHead_Adv_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <weaponTags>
+      <li>ARA_Armed_Organ_Base</li>
+    </weaponTags>
+    <apparelTags Inherit="False">
+      <li>ARA_Inner</li>
+      <li>ARA_Clothes</li>
+    </apparelTags>
+    <apparelMoney>600~1200</apparelMoney>
+    <weaponMoney>600~1000</weaponMoney>
+    <combatPower>320</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_ShieldHead_Protector</def>
+        <severity>1</severity>
+      </li>
+      <li>
+        <def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+        <severity>1</severity>
+      </li>
+    </startingHediffs>
+  </PawnKindDef>
+  <PawnKindDef ParentName="ArachnaeNode_Race_Fighter">
+    <defName>ArachnaeNode_Race_Fighter_Adv_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <canOpenAnyDoor>true</canOpenAnyDoor>
+    <collidesWithPawns>false</collidesWithPawns>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <weaponTags>
+      <li>ARA_Armed_Organ_Melee</li>
+    </weaponTags>
+    <apparelTags Inherit="False">
+      <li>ARA_Inner</li>
+      <li>ARA_Clothes</li>
+    </apparelTags>
+    <apparelMoney>500~900</apparelMoney>
+    <weaponMoney>300~1200</weaponMoney>
+    <combatPower>380</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_Fighter_Invisibility</def>
+        <severity>1</severity>
+      </li>
+    </startingHediffs>
+  </PawnKindDef>
+  <PawnKindDef ParentName="ArachnaeNode_Race_Smokepop">
+    <defName>ArachnaeNode_Race_Smokepop_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <weaponTags>
+      <li>ARA_Armed_Organ_Huge</li>
+    </weaponTags>
+    <apparelTags Inherit="False">
+      <li>ARA_Inner</li>
+      <li>ARA_Clothes</li>
+    </apparelTags>
+    <apparelMoney>600~1500</apparelMoney>
+    <weaponMoney>1200~2500</weaponMoney>
+    <combatPower>450</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+    </startingHediffs>
  </PawnKindDef>
  <PawnKindDef ParentName="ArachnaeNode_Race_Praetorian">
    <defName>ArachnaeNode_Race_Praetorian_Enermy</defName>
@@ -51,20 +250,57 @@
    <chemicalAddictionChance>0</chemicalAddictionChance>
    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
    <forceNormalGearQuality>true</forceNormalGearQuality>
-    <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
-    <forceDeathOnDowned>true</forceDeathOnDowned>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
    <canBeScattered>false</canBeScattered>
    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
    <weaponTags>
-      <li>ARA_Armed_Organ_T3</li>
+      <li>ARA_Armed_Organ_Base</li>
    </weaponTags>
-    <apparelTags>
+    <apparelTags Inherit="False">
      <li>ARA_Inner</li>
      <li>ARA_Clothes</li>
    </apparelTags>
-    <apparelMoney>1000</apparelMoney>
-    <weaponMoney>5000</weaponMoney>
-    <combatPower>700</combatPower>
+    <apparelMoney>1000~2500</apparelMoney>
+    <weaponMoney>2000~3000</weaponMoney>
+    <combatPower>600</combatPower>
+    <startingHediffs Inherit="False">
+      <li>
+        <def>ARA_NonPlayer_HiveMindDroneHediff</def>
+      </li>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+      <li>
+        <def>ARA_Praetorian_Commander_Hediff</def>
+        <chance>0.25</chance>
+      </li>
+    </startingHediffs>
+  </PawnKindDef>
+  <PawnKindDef ParentName="ArachnaeBeast_Race_Slayer">
+    <defName>ArachnaeBeast_Race_Slayer_Enermy</defName>
+    <isFighter>true</isFighter>
+    <trader>false</trader>
+    <chemicalAddictionChance>0</chemicalAddictionChance>
+    <apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+    <forceNormalGearQuality>true</forceNormalGearQuality>
+    <!-- <overrideDeathOnDownedChance>1</overrideDeathOnDownedChance>
+    <forceDeathOnDowned>true</forceDeathOnDowned> -->
+    <canBeScattered>false</canBeScattered>
+    <defaultFactionType>ARA_Hostile_Hive</defaultFactionType>
+    <apparelMoney>0</apparelMoney>
+    <weaponMoney>0</weaponMoney>
+    <combatPower>999</combatPower>
+    <startingHediffs>
+      <li>
+        <def>CrumblingMind</def>
+        <severity>0.01</severity>
+      </li>
+			<li>
+				<def>ARA_NonPlayer_HiveMindDroneHediff</def>
+			</li>
+    </startingHediffs>
  </PawnKindDef>

  <!-- 辅虫群单位 -->
@@ -75,8 +311,8 @@
    <weaponMoney>0</weaponMoney>
    <techHediffsMoney>0</techHediffsMoney>
  </PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeBase_Race_Acidling">
-		<defName>ArachnaeBase_Race_Acidling_Enermy</defName>
+	<PawnKindDef ParentName="ArachnaeBase_Race_Baneling">
+		<defName>ArachnaeBase_Race_Baneling_Enermy</defName>
    <combatPower>150</combatPower>
    <apparelMoney>0</apparelMoney>
    <weaponMoney>0</weaponMoney>
--- a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
+++ b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
@@ -42,9 +42,9 @@
 			</li>
 		</moveSpeedFactorByTerrainTag>
 	</PawnKindDef>
-	<PawnKindDef Name="ArachnaeQueen_Colonist" ParentName="ArachnaeQueenBasePawnKind">
+	<PawnKindDef ParentName="ArachnaeQueenBasePawnKind">
 		<defName>ARA_ArachnaeQueen</defName>
-		<label>阿拉克涅女皇种</label>
+		<label>阿拉克涅泰坦种</label>
 		<race>ArachnaeQueen_Race</race>
 		<defaultFactionType>PlayerColony</defaultFactionType>
 		<invNutrition>0</invNutrition>
@@ -65,87 +65,87 @@
 			<li>ARA_TumorSpew</li>
 		</abilities>
 	</PawnKindDef>
-  <AlienRace.RaceSettings>
-    <defName>ArachnaeQueen_RaceSettings</defName>
-    <pawnKindSettings>
-      <startingColonists>
-        <li>
-          <pawnKindEntries>
-            <li>
-              <kindDefs>
-                <li>ARA_ArachnaeQueen</li>
-              </kindDefs>
-              <chance>100.0</chance>
-            </li>
-          </pawnKindEntries>
-          <factionDefs>
-            <li>ARA_New_Hive</li> 
-          </factionDefs>
-        </li>
-      </startingColonists>
-      <alienwandererkinds>
-        <li>
-          <pawnKindEntries>
-            <li>
-              <kindDefs>
-                <li>ARA_ArachnaeQueen</li>
-                <li>ArachnaeNode_Race_ShieldHead</li>
-                <li>ArachnaeNode_Race_WeaponSmith</li>
-                <li>ArachnaeNode_Race_Fighter</li>
-                <li>ArachnaeNode_Race_Facehugger</li>
-                <li>ArachnaeNode_Race_Myrmecocystus</li>
-                <li>ArachnaeNode_Race_Smokepop</li>
-                <li>ArachnaeNode_Race_NeuroSwarm</li>
-                <li>ArachnaeNode_Race_Skyraider</li>
-                <li>ArachnaeNode_Race_Praetorian</li>
-                <li>ARA_MimicNematodeShamblerSwarmer</li>
-              </kindDefs>
-              <chance>0</chance>
-            </li>
-          </pawnKindEntries>
-          <factionDefs>
-            <li>ARA_New_Hive</li> 
-          </factionDefs>
-        </li>
-      </alienwandererkinds>
-      <alienslavekinds>
-        <li>
-          <kindDefs>
-            <li>ARA_ArachnaeQueen</li>
-            <li>ArachnaeNode_Race_ShieldHead</li>
-            <li>ArachnaeNode_Race_WeaponSmith</li>
-            <li>ArachnaeNode_Race_Fighter</li>
-            <li>ArachnaeNode_Race_Facehugger</li>
-            <li>ArachnaeNode_Race_Myrmecocystus</li>
-            <li>ArachnaeNode_Race_Smokepop</li>
-            <li>ArachnaeNode_Race_NeuroSwarm</li>
-            <li>ArachnaeNode_Race_Skyraider</li>
-            <li>ArachnaeNode_Race_Praetorian</li>
-            <li>ARA_MimicNematodeShamblerSwarmer</li>
-          </kindDefs>
-          <chance>0</chance>
-        </li>
-      </alienslavekinds>
-      <alienrefugeekinds>
-        <li>
-          <kindDefs>
-            <li>ARA_ArachnaeQueen</li>
-            <li>ArachnaeNode_Race_ShieldHead</li>
-            <li>ArachnaeNode_Race_WeaponSmith</li>
-            <li>ArachnaeNode_Race_Fighter</li>
-            <li>ArachnaeNode_Race_Facehugger</li>
-            <li>ArachnaeNode_Race_Myrmecocystus</li>
-            <li>ArachnaeNode_Race_Smokepop</li>
-            <li>ArachnaeNode_Race_NeuroSwarm</li>
-            <li>ArachnaeNode_Race_Skyraider</li>
-            <li>ArachnaeNode_Race_Praetorian</li>
-            <li>ARA_MimicNematodeShamblerSwarmer</li>
-          </kindDefs>
-          <chance>0</chance>
-        </li>
-      </alienrefugeekinds>
-    </pawnKindSettings>
-  </AlienRace.RaceSettings>
+	<AlienRace.RaceSettings>
+		<defName>ARA_ArachnaeQueenSettings</defName>
+		<pawnKindSettings>
+			<startingColonists>
+				<li>
+					<pawnKindEntries>
+						<li>
+							<kindDefs>
+								<li>ARA_ArachnaeQueen</li>
+							</kindDefs>
+							<chance>100.0</chance>
+						</li>
+					</pawnKindEntries>
+					<factionDefs>
+						<li>ARA_New_Hive</li>
+					</factionDefs>
+				</li>
+			</startingColonists>
+			<alienwandererkinds>
+				<li>
+					<pawnKindEntries>
+						<li>
+							<kindDefs>
+								<li>ARA_ArachnaeQueen</li>
+								<li>ArachnaeNode_Race_ShieldHead</li>
+								<li>ArachnaeNode_Race_WeaponSmith</li>
+								<li>ArachnaeNode_Race_Fighter</li>
+								<li>ArachnaeNode_Race_Facehugger</li>
+								<li>ArachnaeNode_Race_Myrmecocystus</li>
+								<li>ArachnaeNode_Race_Smokepop</li>
+								<li>ArachnaeNode_Race_NeuroSwarm</li>
+								<li>ArachnaeNode_Race_Skyraider</li>
+								<li>ArachnaeNode_Race_Praetorian</li>
+								<li>ARA_MimicNematodeShamblerSwarmer</li>
+							</kindDefs>
+							<chance>0</chance>
+						</li>
+					</pawnKindEntries>
+					<factionDefs>
+						<li>ARA_New_Hive</li>
+					</factionDefs>
+				</li>
+			</alienwandererkinds>
+			<alienslavekinds>
+				<li>
+					<kindDefs>
+						<li>ARA_ArachnaeQueen</li>
+						<li>ArachnaeNode_Race_ShieldHead</li>
+						<li>ArachnaeNode_Race_WeaponSmith</li>
+						<li>ArachnaeNode_Race_Fighter</li>
+						<li>ArachnaeNode_Race_Facehugger</li>
+						<li>ArachnaeNode_Race_Myrmecocystus</li>
+						<li>ArachnaeNode_Race_Smokepop</li>
+						<li>ArachnaeNode_Race_NeuroSwarm</li>
+						<li>ArachnaeNode_Race_Skyraider</li>
+						<li>ArachnaeNode_Race_Praetorian</li>
+						<li>ARA_MimicNematodeShamblerSwarmer</li>
+					</kindDefs>
+					<chance>0</chance>
+				</li>
+			</alienslavekinds>
+			<alienrefugeekinds>
+				<li>
+					<kindDefs>
+						<li>ARA_ArachnaeQueen</li>
+						<li>ArachnaeNode_Race_ShieldHead</li>
+						<li>ArachnaeNode_Race_WeaponSmith</li>
+						<li>ArachnaeNode_Race_Fighter</li>
+						<li>ArachnaeNode_Race_Facehugger</li>
+						<li>ArachnaeNode_Race_Myrmecocystus</li>
+						<li>ArachnaeNode_Race_Smokepop</li>
+						<li>ArachnaeNode_Race_NeuroSwarm</li>
+						<li>ArachnaeNode_Race_Skyraider</li>
+						<li>ArachnaeNode_Race_Praetorian</li>
+						<li>ARA_MimicNematodeShamblerSwarmer</li>
+					</kindDefs>
+					<chance>0</chance>
+				</li>
+			</alienrefugeekinds>
+		</pawnKindSettings>
+	</AlienRace.RaceSettings>

 	<PawnKindDef Name="ArachnaeNodeABasePawnKind" Abstract="True">
 		<combatPower>50</combatPower>
@@ -159,8 +159,11 @@
 		<maxGenerationAge>2</maxGenerationAge>
 		<minGenerationAge>1</minGenerationAge>
 		<canBeScattered>false</canBeScattered>
+    <nameMaker>ARA_Normal_Node_NameMaker</nameMaker>
 		<abilities>
 			<li>ARA_Suicide_Ability</li>
+			<li>ARA_RaceBaseSwarmProduceOff</li>
+			<li>ARA_RaceBaseSwarmProduceOn</li>
 		</abilities>
 		<xenotypeSet>
 			<xenotypeChances>
@@ -180,11 +183,13 @@
 			</xenotypeChances>
 		</xenotypeSet>
 		<useFactionXenotypes>false</useFactionXenotypes>
+		<apparelTags>
+      <li>ARA_Init_Clothes</li>
+		</apparelTags>
+		<apparelMoney>1000~2000</apparelMoney>
 		<requiredWorkTags>
 			<li>Violent</li>
 		</requiredWorkTags>
-		<startingHediffs>
-		</startingHediffs>
 		<moveSpeedFactorByTerrainTag>
 			<li>
 				<key>ARA_Creep</key>
@@ -192,7 +197,7 @@
 			</li>
 		</moveSpeedFactorByTerrainTag>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_Myrmecocystus" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Myrmecocystus</defName>
 		<label>阿拉克涅蜜罐种</label>
 		<race>ArachnaeNode_Race_Myrmecocystus</race>
@@ -207,13 +212,8 @@
 			</li>
 		</backstoryFiltersOverride>
 		<abilities>
-			<li>ARA_RaceBaseSwarmProduceOff</li>
-			<li>ARA_RaceBaseSwarmProduceOn</li>
 			<li>ARA_AcidSprayBurst</li>
 		</abilities>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
 	<PawnKindDef Name="ArachnaeNode_Race_ShieldHead" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_ShieldHead</defName>
@@ -229,15 +229,8 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
-		<abilities>
-			<li>ARA_RaceBaseSwarmProduceOff</li>
-			<li>ARA_RaceBaseSwarmProduceOn</li>
-		</abilities>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_WeaponSmith" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_WeaponSmith</defName>
 		<label>阿拉克涅工艺种</label>
 		<race>ArachnaeNode_Race_WeaponSmith</race>
@@ -251,15 +244,8 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
-		<abilities>
-			<li>ARA_RaceBaseSwarmProduceOff</li>
-			<li>ARA_RaceBaseSwarmProduceOn</li>
-		</abilities>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_Facehugger" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Facehugger</defName>
 		<label>阿拉克涅原虫种</label>
 		<race>ArachnaeNode_Race_Facehugger</race>
@@ -276,9 +262,6 @@
 		<abilities>
 			<li>ARA_Ability_Possess</li>
 		</abilities>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
 	<PawnKindDef Name="ArachnaeNode_Race_Fighter" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Fighter</defName>
@@ -295,11 +278,13 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
+		<startingHediffs>
+			<li>
+				<def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+			</li>
+		</startingHediffs>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_Smokepop" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Smokepop</defName>
 		<label>阿拉克涅迷雾种</label>
 		<race>ArachnaeNode_Race_Smokepop</race>
@@ -313,15 +298,14 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
-		<abilities>
-			<li>ARA_RaceBaseSwarmProduceOff</li>
-			<li>ARA_RaceBaseSwarmProduceOn</li>
-		</abilities>
-		<apparelTags>
-		</apparelTags>
+		<startingHediffs>
+			<li>
+				<def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+			</li>
+		</startingHediffs>
 		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_Skyraider" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Skyraider</defName>
 		<label>阿拉克涅空天种</label>
 		<race>ArachnaeNode_Race_Skyraider</race>
@@ -341,11 +325,13 @@
 			</li>
 		</backstoryFiltersOverride>
 		<abilities>
-			<li>ARA_BaseRace_Skyhive_Launcher</li>
 			<li>ARA_Skyraider_jump</li>
 		</abilities>
-		<apparelTags>
-		</apparelTags>
+		<startingHediffs>
+			<li>
+				<def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+			</li>
+		</startingHediffs>
 		<apparelMoney>0</apparelMoney>
 		<modExtensions>
 			<li Class="ArachnaeSwarm.SuperCarryExtension">
@@ -355,7 +341,7 @@
 			</li>
 		</modExtensions>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind">
+	<PawnKindDef Name="ArachnaeNode_Race_NeuroSwarm" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_NeuroSwarm</defName>
 		<label>阿拉克涅织域种</label>
 		<race>ArachnaeNode_Race_NeuroSwarm</race>
@@ -381,9 +367,6 @@
 			<li>ARA_GuardianPsyField_Off</li>
 			<li>ARA_Ability_Morph</li>
 		</abilities>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
 	<PawnKindDef Name="ArachnaeNode_Race_Praetorian" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Praetorian</defName>
@@ -400,11 +383,14 @@
 				</categories>
 			</li>
 		</backstoryFiltersOverride>
-		<apparelTags>
-		</apparelTags>
+		<startingHediffs>
+			<li>
+				<def>ARA_RaceBaseSwarmProduceSwitchHediff</def>
+			</li>
+		</startingHediffs>
 		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ArachnaeNodeABasePawnKind" Name="ARA_MimicNematodeShamblerBase" Abstract="True">
+	<PawnKindDef Name="ARA_MimicNematodeShamblerBase" ParentName="ArachnaeNodeABasePawnKind" Abstract="True">
 		<mutant>ARA_MimicNematodeShambler</mutant>
 		<generateInitialNonFamilyRelations>false</generateInitialNonFamilyRelations>
 	</PawnKindDef>
@@ -425,9 +411,6 @@
 		</backstoryFiltersOverride>
 		<abilities>
 		</abilities>
-		<apparelTags>
-		</apparelTags>
-		<apparelMoney>0</apparelMoney>
 	</PawnKindDef>


@@ -439,12 +422,16 @@
 		<combatPower>75</combatPower>
 		<ecoSystemWeight>0</ecoSystemWeight>
 		<maxGenerationAge>1</maxGenerationAge>
+		<collidesWithPawns>false</collidesWithPawns>
 		<moveSpeedFactorByTerrainTag>
 			<li>
 				<key>ARA_Creep</key>
 				<value>3.0</value>
 			</li>
 		</moveSpeedFactorByTerrainTag>
+		<abilities>
+			<li>ARA_Suicide_Fast_Ability</li>
+		</abilities>
 	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
 		<defName>ArachnaeBase_Race_Larva</defName>
@@ -453,9 +440,8 @@
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Scavenger/Maid/Naked_Thin</texPath>
+					<texPath>ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin</texPath>
 					<drawSize>1</drawSize>
-					<color>(156,148,125)</color>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
 						<offset>(0,0,-0.15)</offset>
@@ -475,50 +461,7 @@
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Scavenger/Scavenger/Naked_Thin</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 Name="ArachnaeBase_Race_Acidcut" ParentName="ARA_InsectKindBase">
-		<defName>ArachnaeBase_Race_Acidcut</defName>
-		<label>阿拉克涅酸噬种</label>
-		<race>ArachnaeBase_Race_Acidcut</race>
-		<lifeStages>
-			<li>
-				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Acidcut/Bodies/Naked_Thin</texPath>
-					<drawSize>1</drawSize>
-					<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 Name="ArachnaeBase_Race_Acidling" ParentName="ARA_InsectKindBase">
-		<defName>ArachnaeBase_Race_Acidling</defName>
-		<label>阿拉克涅爆裂种</label>
-		<race>ArachnaeBase_Race_Acidling</race>
-		<lifeStages>
-			<li>
-				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Acidling/Bodies/Naked_Thin</texPath>
+					<texPath>ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin</texPath>
 					<drawSize>1</drawSize>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
@@ -533,13 +476,13 @@
 		</lifeStages>
 	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
-		<defName>ArachnaeBase_Race_Empsuicider</defName>
-		<label>阿拉克涅爆裂种</label>
-		<race>ArachnaeBase_Race_Empsuicider</race>
+		<defName>ArachnaeBase_Race_Longpincer</defName>
+		<label>阿拉克涅坚颚种</label>
+		<race>ArachnaeBase_Race_Longpincer</race>
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Acidling/BodiesEmp/Naked_Thin</texPath>
+					<texPath>ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin</texPath>
 					<drawSize>1</drawSize>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
@@ -554,6 +497,27 @@
 		</lifeStages>
 	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
+		<defName>ArachnaeBase_Race_Hivekeeping</defName>
+		<label>阿拉克涅家政种</label>
+		<race>ArachnaeBase_Race_Hivekeeping</race>
+		<lifeStages>
+			<li>
+				<bodyGraphicData>
+					<texPath>ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin</texPath>
+					<drawSize>1</drawSize>
+					<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 Name="ArachnaeBase_Race_Skyhive" ParentName="ARA_InsectKindBase">
 		<defName>ArachnaeBase_Race_Skyhive</defName>
 		<label>阿拉克涅天巢种</label>
 		<race>ArachnaeBase_Race_Skyhive</race>
@@ -584,16 +548,122 @@
 			</li>
 		</lifeStages>
 	</PawnKindDef>
-
+	<PawnKindDef ParentName="ArachnaeBase_Race_Skyhive">
+		<defName>ArachnaeBase_Race_Skyhive_Fastdie</defName>
+    <startingHediffs>
+      <li>
+        <def>ARA_Incubator_FasterDie</def>
+      </li>
+    </startingHediffs>
+	</PawnKindDef>
+	<PawnKindDef Name="ArachnaeBase_Race_Acidcut" ParentName="ARA_InsectKindBase">
+		<defName>ArachnaeBase_Race_Acidcut</defName>
+		<label>阿拉克涅酸噬种</label>
+		<race>ArachnaeBase_Race_Acidcut</race>
+		<lifeStages>
+			<li>
+				<bodyGraphicData>
+					<texPath>ArachnaeSwarm/Things/ARA_Acidcut/Bodies/Naked_Thin</texPath>
+					<drawSize>1</drawSize>
+					<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="ArachnaeBase_Race_Acidcut">
+		<defName>ArachnaeBase_Race_Acidcut_Fastdie</defName>
+    <startingHediffs>
+      <li>
+        <def>ARA_Incubator_FasterDie</def>
+      </li>
+    </startingHediffs>
+	</PawnKindDef>
+	<PawnKindDef Name="ArachnaeBase_Race_Baneling" ParentName="ARA_InsectKindBase">
+		<defName>ArachnaeBase_Race_Baneling</defName>
+		<label>阿拉克涅爆裂种</label>
+		<race>ArachnaeBase_Race_Baneling</race>
+		<lifeStages>
+			<li>
+				<bodyGraphicData>
+					<texPath>ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin</texPath>
+					<drawSize>1</drawSize>
+					<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>
+		<abilities>
+			<li>ARA_Baneling_Suicide_Ability</li>
+		</abilities>
+	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
+		<defName>ArachnaeBase_Race_Empsuicider</defName>
+		<label>阿拉克涅爆裂种</label>
+		<race>ArachnaeBase_Race_Empsuicider</race>
+		<lifeStages>
+			<li>
+				<bodyGraphicData>
+					<texPath>ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin</texPath>
+					<drawSize>1</drawSize>
+					<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="ARA_InsectKindBase">
+		<defName>ArachnaeBase_Race_Locust</defName>
+		<label>阿拉克涅蝗虫种</label>
+		<race>ArachnaeBase_Race_Locust</race>
+		<lifeStages>
+			<li>
+				<bodyGraphicData>
+					<texPath>ArachnaeSwarm/Things/ARA_Acidcut/Bodies/Naked_Thin</texPath>
+					<drawSize>1.75</drawSize>
+					<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>
+		<abilities>
+			<li>ARA_Locust_AcidSprayBurst</li>
+		</abilities>
+	</PawnKindDef>
+
+	<PawnKindDef Name="ArachnaeBeast_Race_Slayer" ParentName="ARA_InsectKindBase">
 		<defName>ArachnaeBeast_Race_Slayer</defName>
 		<label>阿拉克涅暴屠种</label>
 		<race>ArachnaeBeast_Race_Slayer</race>
 		<defaultFactionType>PlayerColony</defaultFactionType>
 		<forceDeathOnDowned>false</forceDeathOnDowned>
 		<forceNoDeathNotification>false</forceNoDeathNotification>
-    <immuneToGameConditionEffects>true</immuneToGameConditionEffects>
-    <collidesWithPawns>false</collidesWithPawns>
+		<immuneToGameConditionEffects>true</immuneToGameConditionEffects>
+		<collidesWithPawns>false</collidesWithPawns>
 		<combatPower>500</combatPower>
 		<lifeStages>
 			<li>
@@ -611,8 +681,56 @@
 				</dessicatedBodyGraphicData>
 			</li>
 		</lifeStages>
-    <abilities>
-      <li>ARA_Ability_SlayerCharge</li>
-    </abilities>
+		<abilities>
+			<li>ARA_Ability_SlayerCharge</li>
+		</abilities>
 	</PawnKindDef>
+
+	<RulePackDef>
+		<defName>ARA_Normal_Node_NameMaker</defName>
+		<rulePack>
+			<rulesStrings>
+				<li>r_name->[ARA_Normal_Node_FirstName] '[ARA_Normal_Node_nickName]' [ARA_Normal_Node_LastName]</li>
+				<li>ARA_Normal_Node_nickName->[ARA_Normal_Node_nickName_Sub]</li>
+				<li>ARA_Normal_Node_FirstName->Nodeunit</li>
+				<li>ARA_Normal_Node_LastName->Arachnae</li>
+				<li>ARA_Normal_Node_nickName_Sub->[ARA_Normal_Node_nickName_A][ARA_Normal_Node_nickName_B]-[ARA_Normal_Node_nickName_C][ARA_Normal_Node_nickName_D][ARA_Normal_Node_nickName_E]</li>
+				<li>ARA_Normal_Node_nickName_A->P</li>
+				<li>ARA_Normal_Node_nickName_A->R</li>
+				<li>ARA_Normal_Node_nickName_A->X</li>
+				<li>ARA_Normal_Node_nickName_A->H</li>
+				<li>ARA_Normal_Node_nickName_A->D</li>
+				<li>ARA_Normal_Node_nickName_B->A</li>
+				<li>ARA_Normal_Node_nickName_B->C</li>
+				<li>ARA_Normal_Node_nickName_B->I</li>
+				<li>ARA_Normal_Node_nickName_B->Y</li>
+				<li>ARA_Normal_Node_nickName_C->1</li>
+				<li>ARA_Normal_Node_nickName_C->2</li>
+				<li>ARA_Normal_Node_nickName_C->3</li>
+				<li>ARA_Normal_Node_nickName_C->4</li>
+				<li>ARA_Normal_Node_nickName_C->5</li>
+				<li>ARA_Normal_Node_nickName_C->6</li>
+				<li>ARA_Normal_Node_nickName_D->1</li>
+				<li>ARA_Normal_Node_nickName_D->2</li>
+				<li>ARA_Normal_Node_nickName_D->3</li>
+				<li>ARA_Normal_Node_nickName_D->4</li>
+				<li>ARA_Normal_Node_nickName_D->5</li>
+				<li>ARA_Normal_Node_nickName_D->6</li>
+				<li>ARA_Normal_Node_nickName_D->7</li>
+				<li>ARA_Normal_Node_nickName_D->8</li>
+				<li>ARA_Normal_Node_nickName_D->9</li>
+				<li>ARA_Normal_Node_nickName_D->0</li>
+				<li>ARA_Normal_Node_nickName_E->1</li>
+				<li>ARA_Normal_Node_nickName_E->2</li>
+				<li>ARA_Normal_Node_nickName_E->3</li>
+				<li>ARA_Normal_Node_nickName_E->4</li>
+				<li>ARA_Normal_Node_nickName_E->5</li>
+				<li>ARA_Normal_Node_nickName_E->6</li>
+				<li>ARA_Normal_Node_nickName_E->7</li>
+				<li>ARA_Normal_Node_nickName_E->8</li>
+				<li>ARA_Normal_Node_nickName_E->9</li>
+				<li>ARA_Normal_Node_nickName_E->0</li>
+			</rulesStrings>
+		</rulePack>
+	</RulePackDef>
 </Defs>
--- a/1.6/1.6/Defs/RecipeDefs/ARA_Recipes.xml
+++ b/1.6/1.6/Defs/RecipeDefs/ARA_Recipes.xml
@@ -102,88 +102,6 @@
      <ARA_Gene_Essence>30</ARA_Gene_Essence>
    </costList>
  </ThingDef>
-  <RecipeDef ParentName="ARA_SurgeryInstallImplantBase">
-    <defName>ARA_Surgery_Install_Shell_Thorn</defName>
-    <label>甲壳棘刺植入</label>
-    <description>为阿拉克涅虫族的甲壳植入两排棘刺腔管，它们是拥有半自主意识的器官，会对附近的敌军自动发射棘刺。此外，该变异也会加厚甲壳以获得更强的防御力。</description>
-    <descriptionHyperlinks>
-      <HediffDef>ARA_Shell_Thorn_Hediff</HediffDef>
-      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
-    </descriptionHyperlinks>
-    <jobString>正在实施定向变异</jobString>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ARA_Activated_Bacterium</li>
-          </thingDefs>
-        </filter>
-        <count>15</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ARA_Gene_Essence</li>
-          </thingDefs>
-        </filter>
-        <count>20</count>
-      </li>
-    </ingredients>
-    <appliedOnFixedBodyParts>
-      <li>ARA_Chitin_Shell</li>
-    </appliedOnFixedBodyParts>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>ARA_Activated_Bacterium</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <addsHediff>ARA_Shell_Thorn_Hediff</addsHediff>
-    <researchPrerequisite>ARA_Technology_7EVO</researchPrerequisite>
-  </RecipeDef>
-  <HediffDef ParentName="AddedBodyPartBase">
-    <defName>ARA_Shell_Thorn_Hediff</defName>
-    <label>甲壳棘刺</label>
-    <hediffClass>Hediff_Implant</hediffClass>
-    <description>阿拉克涅虫族在甲壳上植入了两排棘刺腔管，只要不处于近战状态下，它们就会对靠近的敌人自动发射棘刺攻击对方。</description>
-    <descriptionHyperlinks>
-      <RecipeDef>ARA_Surgery_Install_Shell_Thorn</RecipeDef>
-      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
-    </descriptionHyperlinks>
-    <addedPartProps>
-      <betterThanNatural>true</betterThanNatural>
-    </addedPartProps>
-    <stages>
-      <li>
-        <statOffsets>
-          <ArmorRating_Sharp>0.2</ArmorRating_Sharp>
-          <ArmorRating_Blunt>0.2</ArmorRating_Blunt>
-        </statOffsets>
-      </li>
-    </stages>
-    <comps>
-      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
-        <turretDef>ARA_Shell_Thorn_Turret</turretDef>
-        <angleOffset>0</angleOffset>
-        <autoAttack>true</autoAttack>
-      </li>
-    </comps>
-  </HediffDef>
-  <ThingDef ParentName="ARA_BodyPartProstheticBase">
-    <defName>ARA_Shell_Thorn</defName>
-    <label>甲壳棘刺</label>
-    <description>在阿拉克涅虫族甲壳上植入两排棘刺腔管，只要不处于近战状态下，它们就会对靠近的敌人自动发射棘刺攻击对方。该手术不需要制作部件，可以直接在阿拉克涅督虫身上实施。</description>
-    <descriptionHyperlinks>
-      <RecipeDef>ARA_Surgery_Install_Shell_Thorn</RecipeDef>
-      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
-    </descriptionHyperlinks>
-    <recipeMaker>
-      <researchPrerequisite>ARA_Technology_7EVO</researchPrerequisite>
-    </recipeMaker>
-    <costList>
-      <ARA_Activated_Bacterium>15</ARA_Activated_Bacterium>
-      <ARA_Gene_Essence>20</ARA_Gene_Essence>
-    </costList>
-  </ThingDef>
  <RecipeDef ParentName="ARA_SurgeryInstallImplantBase">
    <defName>ARA_Surgery_Install_Reactive_Shell</defName>
    <label>反应甲壳植入</label>
@@ -700,11 +618,11 @@

  <!-- 蜕荚 -->
  <RecipeDef ParentName="ARA_SurgeryInstallImplantBase">
-    <defName>ARA_Surgery_Install_Acidling_Pouch</defName>
+    <defName>ARA_Surgery_Install_Baneling_Pouch</defName>
    <label>爆裂种蜕荚</label>
    <description>诱发阿拉克涅虫族的定向变异，使其蜕荚中预先储存三只即将孵化的阿拉克涅爆裂种，它们一旦被释放就会以自杀式袭击攻击敌方。</description>
    <descriptionHyperlinks>
-      <HediffDef>ARA_Acidling_Pouch_Hediff</HediffDef>
+      <HediffDef>ARA_Baneling_Pouch_Hediff</HediffDef>
    </descriptionHyperlinks>
    <jobString>正在实施定向变异</jobString>
    <ingredients>
@@ -725,16 +643,16 @@
        <li>ARA_Activated_Bacterium</li>
      </thingDefs>
    </fixedIngredientFilter>
-    <addsHediff>ARA_Acidling_Pouch_Hediff</addsHediff>
+    <addsHediff>ARA_Baneling_Pouch_Hediff</addsHediff>
    <researchPrerequisite>ARA_Technology_4EVO</researchPrerequisite>
  </RecipeDef>
  <HediffDef ParentName="AddedBodyPartBase">
-    <defName>ARA_Acidling_Pouch_Hediff</defName>
+    <defName>ARA_Baneling_Pouch_Hediff</defName>
    <label>爆裂种蜕荚</label>
    <hediffClass>Hediff_Implant</hediffClass>
    <description>阿拉克涅虫族的蜕荚里装了若干只即将孵化的阿拉克涅爆裂种，只需要获得指令就会立刻破体而出攻击敌方。</description>
    <descriptionHyperlinks>
-      <RecipeDef>ARA_Surgery_Install_Acidling_Pouch</RecipeDef>
+      <RecipeDef>ARA_Surgery_Install_Baneling_Pouch</RecipeDef>
    </descriptionHyperlinks>
    <addedPartProps>
      <betterThanNatural>true</betterThanNatural>
@@ -742,17 +660,17 @@
    <comps>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
-          <li>ARA_Pouch_Hatching_Acidling</li>
+          <li>ARA_Pouch_Hatching_Baneling</li>
        </abilityDefs>
      </li>
    </comps>
  </HediffDef>
  <ThingDef ParentName="ARA_BodyPartProstheticBase">
-    <defName>ARA_Acidling_Pouch</defName>
+    <defName>ARA_Baneling_Pouch</defName>
    <label>爆裂种蜕荚</label>
    <description>阿拉克涅虫族的蜕荚里装了若干只即将孵化的阿拉克涅爆裂种，只需要获得指令就会立刻破体而出攻击敌方。该手术不需要制作部件，可以直接在阿拉克涅督虫身上实施。</description>
    <descriptionHyperlinks>
-      <RecipeDef>ARA_Surgery_Install_Acidling_Pouch</RecipeDef>
+      <RecipeDef>ARA_Surgery_Install_Baneling_Pouch</RecipeDef>
    </descriptionHyperlinks>
    <recipeMaker>
      <researchPrerequisite>ARA_Technology_4EVO</researchPrerequisite>
--- a/1.6/1.6/Defs/RecipeDefs/ARA_Titan_Recipes.xml
+++ b/1.6/1.6/Defs/RecipeDefs/ARA_Titan_Recipes.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <RecipeDef ParentName="ARA_SurgeryInstallImplantBase">
+    <defName>ARA_Surgery_Install_Shell_Thorn</defName>
+    <label>甲壳棘刺植入</label>
+    <description>为阿拉克涅虫族的甲壳植入两排棘刺腔管，它们是拥有半自主意识的器官，会对附近的敌军自动发射棘刺。此外，该变异也会加厚甲壳以获得更强的防御力。</description>
+    <descriptionHyperlinks>
+      <HediffDef>ARA_Shell_Thorn_Hediff</HediffDef>
+      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
+    </descriptionHyperlinks>
+    <jobString>正在实施定向变异</jobString>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>ARA_Activated_Bacterium</li>
+          </thingDefs>
+        </filter>
+        <count>15</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>ARA_Gene_Essence</li>
+          </thingDefs>
+        </filter>
+        <count>20</count>
+      </li>
+    </ingredients>
+    <appliedOnFixedBodyParts>
+      <li>ARA_Chitin_Shell</li>
+    </appliedOnFixedBodyParts>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>ARA_Activated_Bacterium</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <addsHediff>ARA_Shell_Thorn_Hediff</addsHediff>
+    <researchPrerequisite>ARA_Technology_7EVO_T</researchPrerequisite>
+  </RecipeDef>
+  <HediffDef ParentName="AddedBodyPartBase">
+    <defName>ARA_Shell_Thorn_Hediff</defName>
+    <label>甲壳棘刺</label>
+    <hediffClass>Hediff_Implant</hediffClass>
+    <description>阿拉克涅虫族在甲壳上植入了两排棘刺腔管，只要不处于近战状态下，它们就会对靠近的敌人自动发射棘刺攻击对方。</description>
+    <descriptionHyperlinks>
+      <RecipeDef>ARA_Surgery_Install_Shell_Thorn</RecipeDef>
+      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
+    </descriptionHyperlinks>
+    <addedPartProps>
+      <betterThanNatural>true</betterThanNatural>
+    </addedPartProps>
+    <stages>
+      <li>
+        <statOffsets>
+          <ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+          <ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+        </statOffsets>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.HediffCompProperties_TopTurret">
+        <turretDef>ARA_Shell_Thorn_Turret</turretDef>
+        <angleOffset>0</angleOffset>
+        <autoAttack>true</autoAttack>
+      </li>
+    </comps>
+  </HediffDef>
+  <ThingDef ParentName="ARA_BodyPartProstheticBase">
+    <defName>ARA_Shell_Thorn</defName>
+    <label>甲壳棘刺</label>
+    <description>在阿拉克涅虫族甲壳上植入两排棘刺腔管，只要不处于近战状态下，它们就会对靠近的敌人自动发射棘刺攻击对方。该手术不需要制作部件，可以直接在阿拉克涅督虫身上实施。</description>
+    <descriptionHyperlinks>
+      <RecipeDef>ARA_Surgery_Install_Shell_Thorn</RecipeDef>
+      <thingDef>ARA_Shell_Thorn_Turret</thingDef>
+    </descriptionHyperlinks>
+    <recipeMaker>
+      <researchPrerequisite>ARA_Technology_7EVO_T</researchPrerequisite>
+    </recipeMaker>
+    <costList>
+      <ARA_Activated_Bacterium>15</ARA_Activated_Bacterium>
+      <ARA_Gene_Essence>20</ARA_Gene_Essence>
+    </costList>
+  </ThingDef>
+</Defs>
--- a/1.6/1.6/Defs/ResearchProjectDefs/ARA_ResearchProjects.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/ARA_ResearchProjects.xml
@@ -9,7 +9,7 @@
  <ResearchProjectDef Abstract="True" Name="ARA_techBase_Needtechprint" ParentName="ARA_techBase">
    <techLevel>Medieval</techLevel>
    <tab>ARA_ResearchTab</tab>
-    <techprintCount>1</techprintCount>
+    <techprintCount>999</techprintCount>
    <techprintCommonality>0</techprintCommonality>
    <techprintMarketValue>2500</techprintMarketValue>
    <requiredResearchBuilding>ARA_InteractiveEggSac_Techprint</requiredResearchBuilding>
@@ -20,12 +20,18 @@
      <li>ARA_New_Hive</li>
    </heldByFactionCategoryTags>
  </ResearchProjectDef>
+  <ResearchProjectDef Abstract="True" Name="ARA_techBaseCantResearch">
+    <techLevel>Medieval</techLevel>
+    <tab>ARA_ResearchTab</tab>
+    <requiredResearchBuilding>ARA_InteractiveEggSac_Techprint</requiredResearchBuilding>
+    <heldByFactionCategoryTags Inherit="False" />
+  </ResearchProjectDef>

  <!-- 女皇工艺进化 -->
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Base_Technology</defName>
    <label>基础基因序列获取</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n解锁虫群的基础科技，允许孵化基本的辅虫和武装器官。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n解锁虫群的基础科技，允许孵化基本的辅虫和武装器官。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>100</baseCost>
    <researchViewX>0.00</researchViewX>
    <researchViewY>3.20</researchViewY>
@@ -33,7 +39,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_1WMT</defName>
    <label>节点WMT-1"突破"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种和工艺种进化到下一个阶段。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种和工艺种进化到下一个阶段。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>3000</baseCost>
    <researchViewX>4.50</researchViewX>
    <researchViewY>3.20</researchViewY>
@@ -50,7 +56,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_2WMT</defName>
    <label>节点WMT-2"突破2"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种和工艺种进化到下一个阶段。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种和工艺种进化到下一个阶段。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>7000</baseCost>
    <researchViewX>9.00</researchViewX>
    <researchViewY>3.20</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -74,7 +80,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_7VXI</defName>
    <label>节点VXI-7"外置酸袋"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>300</baseCost>
    <researchViewX>2.00</researchViewX>
    <researchViewY>0.90</researchViewY>
@@ -88,7 +94,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_8VXI</defName>
    <label>节点VXI-8"巨型酸腺"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>1250</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>0.90</researchViewY>
@@ -102,7 +108,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_9VXI</defName>
    <label>节点VXI-9"酸雨"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>2000</baseCost>
    <researchViewX>10.00</researchViewX>
    <researchViewY>1.50</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -116,7 +122,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_10VXI</defName>
    <label>节点VXI-10"微型天灾"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>3000</baseCost>
    <researchViewX>11.00</researchViewX>
    <researchViewY>1.50</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -140,7 +146,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_1THD</defName>
    <label>节点THD-1"灵能闪电"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的灵能闪电系武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的灵能闪电系武器。</description>
    <baseCost>2500</baseCost>
    <researchViewX>7.50</researchViewX>
    <researchViewY>2.70</researchViewY>
@@ -163,7 +169,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_1KYC</defName>
    <label>节点KYC-1"战士虫"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——战士种。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——战士种。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>150</baseCost>
    <researchViewX>3.00</researchViewX>
    <researchViewY>4.80</researchViewY>
@@ -174,7 +180,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_4KYC</defName>
    <label>节点KYC-4"原虫"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——原虫种，一种可以寄生在别的种族身上以控制它们的特殊督虫。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——原虫种，一种可以寄生在别的种族身上以控制它们的特殊督虫。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>200</baseCost>
    <researchViewX>3.00</researchViewX>
    <researchViewY>4.30</researchViewY>
@@ -185,7 +191,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_2KYC</defName>
    <label>节点KYC-2"飞行翼膜"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——空天种，敏捷而致命的精锐虫族，拥有以飞行姿态穿梭于战场的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——空天种，敏捷而致命的精锐虫族，拥有以飞行姿态穿梭于战场的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1600</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>4.30</researchViewY>
@@ -199,7 +205,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_5KYC</defName>
    <label>节点KYC-5"巨甲"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——迷雾种，一种拥有厚重甲壳的大型督虫，可以释放烟雾、阻燃剂和召唤虫族增援的信息素以协助虫群进行集群冲击。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——迷雾种，一种拥有厚重甲壳的大型督虫，可以释放烟雾、阻燃剂和召唤虫族增援的信息素以协助虫群进行集群冲击。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>800</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>4.80</researchViewY>
@@ -213,7 +219,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_6KYC</defName>
    <label>节点KYC-6"灵脑"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——织域种，一种寿命长且拥有强大灵能的特殊虫族，不仅能协助虫群的科研工作，也是一个强大的施法者。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——织域种，一种寿命长且拥有强大灵能的特殊虫族，不仅能协助虫群的科研工作，也是一个强大的施法者。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>800</baseCost>
    <researchViewX>6.50</researchViewX>
    <researchViewY>2.70</researchViewY>
@@ -227,7 +233,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_7KYC</defName>
    <label>节点KYC-7"亲卫"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——禁卫种，一种寿命较其他虫族更长的精锐虫族，拥有优秀的远程作战能力和社交能力，同时也可以作为指挥官指挥虫群。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——禁卫种，一种寿命较其他虫族更长的精锐虫族，拥有优秀的远程作战能力和社交能力，同时也可以作为指挥官指挥虫群。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>2800</baseCost>
    <researchViewX>10.00</researchViewX>
    <researchViewY>3.80</researchViewY>
@@ -241,7 +247,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_6MEN</defName>
    <label>节点MEN-6"拟线"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——拟线体，一种出生时躯体便已经被阿拉克涅拟线种寄生的虫族，便宜廉价并且可以快速得到的炮灰，倒是没什么纪律性就是了。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的虫族——拟线体，一种出生时躯体便已经被阿拉克涅拟线种寄生的虫族，便宜廉价并且可以快速得到的炮灰，倒是没什么纪律性就是了。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1800</baseCost>
    <researchViewX>7.50</researchViewX>
    <researchViewY>2.10</researchViewY>
@@ -293,7 +299,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_5PAV</defName>
    <label>节点PAV-5"毒刺"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器，并允许部分带毒针的虫族进行毒针喷射。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器，并允许部分带毒针的虫族进行毒针喷射。</description>
    <baseCost>200</baseCost>
    <researchViewX>1.00</researchViewX>
    <researchViewY>0.30</researchViewY>
@@ -307,7 +313,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_6PAV</defName>
    <label>节点PAV-6"暴雨"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>1000</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>0.30</researchViewY>
@@ -321,7 +327,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_7PAV</defName>
    <label>节点PAV-7"血棘"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>1800</baseCost>
    <researchViewX>10.00</researchViewX>
    <researchViewY>0.30</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -332,17 +338,6 @@
      <li>ARA_Technology_2WMT</li>
    </prerequisites>
  </ResearchProjectDef>
-  <ResearchProjectDef ParentName="ARA_techBase">
-    <defName>ARA_Technology_7XPAV</defName>
-    <label>节点PAV-7X"梭镖"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
-    <baseCost>2000</baseCost>
-    <researchViewX>11.00</researchViewX>
-    <researchViewY>0.30</researchViewY> <!-- ARA_MorphableResearchBench-->
-    <prerequisites>
-      <li>ARA_Technology_7PAV</li>
-    </prerequisites>
-  </ResearchProjectDef>
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_8PAV</defName>
    <label>节点PAV-8"千兆炮"</label>
@@ -352,14 +347,14 @@
    <researchViewY>0.30</researchViewY> <!-- ARA_MorphableResearchBench-->
    <prerequisites>
      <li>ARA_Technology_1NPT</li>
-      <li>ARA_Technology_7XPAV</li>
+      <li>ARA_Technology_7PAV</li>
    </prerequisites>
  </ResearchProjectDef>
  <!-- 近战发展 -->
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_2MEL</defName>
    <label>节点MEL-2"骨鞭"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>600</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>2.70</researchViewY>
@@ -370,7 +365,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_3MEL</defName>
    <label>节点MEL-3"镰爪"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>1200</baseCost>
    <researchViewX>10.00</researchViewX>
    <researchViewY>0.90</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -487,6 +482,18 @@
      <li>ARA_Technology_2NPT</li>
    </prerequisites>
  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase">
+    <defName>ARA_Technology_4NPT</defName>
+    <label>节点NPT-4"孵化池"</label>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许虫族建造孵化池。一种专用于批量生产虫族的孵化场地。孵化池的孵化效率比孵化茧更高。</description>
+    <baseCost>1800</baseCost>
+    <researchViewX>12.00</researchViewX>
+    <researchViewY>2.10</researchViewY>
+    <requiredResearchBuilding>ARA_ResearchBench</requiredResearchBuilding> <!-- ARA_MorphableResearchBench-->
+    <prerequisites>
+      <li>ARA_Technology_1NPT</li>
+    </prerequisites>
+  </ResearchProjectDef>
  <!-- 作物发展 -->
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_8CPE</defName>
@@ -514,7 +521,7 @@
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_6SPV</defName>
    <label>节点SPV-6"辅虫巢"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许工艺种孵化新的武器。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
    <baseCost>800</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>1.50</researchViewY>
@@ -554,7 +561,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_5STL</defName>
    <label>节点STL-5"基因窃取"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许战士种进行定向进化，抛弃其战斗技能以换取其从殖民者、囚犯和奴隶身上抽取和注入基因的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许战士种进行定向进化，抛弃其战斗技能以换取其从殖民者、囚犯和奴隶身上抽取和注入基因的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>500</baseCost>
    <researchViewX>4.00</researchViewX>
    <researchViewY>4.80</researchViewY>
@@ -565,7 +572,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_1VTE</defName>
    <label>节点VTE-1"护卫者"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许盾头种进行定向进化，抛弃其产出甲壳素和建造建筑的能力以换取战斗能力、移动能力和冲撞攻击的技能。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许盾头种进行定向进化，抛弃其产出甲壳素和建造建筑的能力以换取战斗能力、移动能力和冲撞攻击的技能。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1200</baseCost>
    <researchViewX>6.50</researchViewX>
    <researchViewY>4.80</researchViewY>
@@ -579,7 +586,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_1MED</defName>
    <label>节点MED-1"疗愈种"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许蜜罐种进行定向进化，抛弃生产虫蜜的能力，以强化其自身的医疗能力并定期产出药物。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许蜜罐种进行定向进化，抛弃生产虫蜜的能力，以强化其自身的医疗能力并定期产出药物。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1200</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>2.10</researchViewY>
@@ -590,7 +597,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_4CLO</defName>
    <label>节点CLO-4"追猎种"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许战士种进行定向进化，牺牲其使用远程武器的能力以换取强大的近战和永久隐身的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许战士种进行定向进化，牺牲其使用远程武器的能力以换取强大的近战和永久隐身的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1800</baseCost>
    <researchViewX>5.50</researchViewX>
    <researchViewY>5.30</researchViewY>
@@ -604,7 +611,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_1BAC</defName>
    <label>节点BAC-1"育菌种"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许迷雾种进行定向进化，牺牲其护甲和喷射信息素的能力以换成生产虫群所需高级资源"活化钜菌"的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许迷雾种进行定向进化，牺牲其护甲和喷射信息素的能力以换成生产虫群所需高级资源"活化钜菌"的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1000</baseCost>
    <researchViewX>7.50</researchViewX>
    <researchViewY>3.80</researchViewY>
@@ -616,7 +623,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_9WID</defName>
    <label>节点WID-9"磁暴"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许空天种进行定向进化，以牺牲高速和高空机动的能力换取向敌人投射大量磁暴种的能力，这种虫群可以以自杀性攻击的方式释放EMP以对抗机械族。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许空天种进行定向进化，以牺牲高速和高空机动的能力换取向敌人投射大量磁暴种的能力，这种虫群可以以自杀性攻击的方式释放EMP以对抗机械族。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1500</baseCost>
    <researchViewX>7.50</researchViewX>
    <researchViewY>1.50</researchViewY> <!-- ARA_MorphableResearchBench-->
@@ -628,23 +635,20 @@
    </prerequisites>
  </ResearchProjectDef>
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
-    <defName>ARA_Technology_6LOD</defName>
-    <label>节点LOD-6"巢之主"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许空天种进行定向进化，以牺牲高速和高空机动的能力换取向敌人投射大量天巢种的能力，这种飞行辅虫速度很快，并且在近战中很难缠。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
-    <baseCost>3500</baseCost>
-    <researchViewX>10.00</researchViewX>
-    <researchViewY>5.30</researchViewY> <!-- ARA_MorphableResearchBench-->
-    <hiddenPrerequisites>
-      <li>ARA_Technology_2KYC</li>
-    </hiddenPrerequisites>
+    <defName>ARA_Technology_1FRY</defName>
+    <label>节点FRY-1"搬运者"</label>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许空天种进行定向进化，以牺牲高空机动和辅虫孵化的能力换取在远行队中的大量移动速度增幅。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
+    <baseCost>1000</baseCost>
+    <researchViewX>6.50</researchViewX>
+    <researchViewY>3.80</researchViewY>
    <prerequisites>
-      <li>ARA_Technology_2WMT</li>
+      <li>ARA_Technology_2KYC</li>
    </prerequisites>
  </ResearchProjectDef>
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_3CON</defName>
    <label>节点CON-3"建造者"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许盾头种进行定向进化，抛弃其防御能力以换取更强大的甲壳素产出能力和建造建筑的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许盾头种进行定向进化，抛弃其防御能力以换取更强大的甲壳素产出能力和建造建筑的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>300</baseCost>
    <researchViewX>2.00</researchViewX>
    <researchViewY>2.70</researchViewY>
@@ -655,7 +659,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_8FEL</defName>
    <label>节点FEL-8"爆燃腔"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许蜜罐种进行定向进化，抛弃生产虫蜜的能力，以获得防御力增强、生产化合燃料和喷射火焰的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许蜜罐种进行定向进化，抛弃生产虫蜜的能力，以获得防御力增强、生产化合燃料和喷射火焰的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>300</baseCost>
    <researchViewX>2.00</researchViewX>
    <researchViewY>2.10</researchViewY>
@@ -666,7 +670,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_3CRP</defName>
    <label>节点CRP-3"菌毯铺设"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许迷雾种进行定向进化，抛弃喷射信息素的能力，以获得防御力、移动速度的增强和大规模铺设菌毯的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许迷雾种进行定向进化，抛弃喷射信息素的能力，以获得防御力、移动速度的增强和大规模铺设菌毯的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>1300</baseCost>
    <researchViewX>7.50</researchViewX>
    <researchViewY>0.90</researchViewY>
@@ -680,7 +684,7 @@
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_9NAV</defName>
    <label>节点NAV-9"领航使者"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许禁卫种进行定向进化，抛弃直接战斗能力和指挥地面虫群部队的能力，换取指挥空中兽虫群的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许禁卫种进行定向进化，抛弃直接战斗能力和指挥地面虫群部队的能力，换取指挥空中兽虫群的能力。\n\n阿拉克涅虫群所有需要蓝图的科技，都需要使用其触须分支特有的研究方式完成研究。</description>
    <baseCost>3500</baseCost>
    <researchViewX>11.00</researchViewX>
    <researchViewY>3.80</researchViewY>
@@ -756,20 +760,6 @@
      <li>ARA_Technology_4CLO</li>
    </prerequisites>
  </ResearchProjectDef>
-  <ResearchProjectDef ParentName="ARA_techBase">
-    <defName>ARA_Technology_7EVO</defName>
-    <label>节点EVO-7"甲壳棘刺"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许实行新的阿拉克涅进化手术，允许阿拉克涅虫族植入会自动攻击附近敌人的棘刺腔管。</description>
-    <baseCost>1500</baseCost>
-    <researchViewX>7.50</researchViewX>
-    <researchViewY>4.80</researchViewY>
-    <hiddenPrerequisites>
-      <li>ARA_Technology_5ESS</li>
-    </hiddenPrerequisites>
-    <prerequisites>
-      <li>ARA_Technology_1VTE</li>
-    </prerequisites>
-  </ResearchProjectDef>
  <ResearchProjectDef ParentName="ARA_techBase">
    <defName>ARA_Technology_8EVO</defName>
    <label>节点EVO-8"玻璃钢壳"</label>
@@ -828,20 +818,6 @@
    </prerequisites>
  </ResearchProjectDef>
  <!-- 兽虫发展 -->
-  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
-    <defName>ARA_Technology_8SLA</defName>
-    <label>节点SLA-8"暴戮之兽"</label>
-    <description>&lt;color=#887E78>&lt;i>阿拉克涅虫群-主巢触须\n主巢触须的进化路径是包含于每一支虫群中的通用进化路径，它们奠定了虫群在生物学上的优越性。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的兽虫——暴屠种。\n\n阿拉克涅虫群所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
-    <baseCost>3000</baseCost>
-    <researchViewX>10.00</researchViewX>
-    <researchViewY>5.80</researchViewY>
-    <hiddenPrerequisites>
-      <li>ARA_Technology_2HAG</li>
-    </hiddenPrerequisites>
-    <prerequisites>
-      <li>ARA_Technology_2WMT</li>
-    </prerequisites>
-  </ResearchProjectDef>
  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
    <defName>ARA_Technology_4COV</defName>
    <label>节点COV-4"天巫兽群"</label>
--- a/1.6/1.6/Defs/ResearchProjectDefs/ARA_ResearchProjects_Titan.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/ARA_ResearchProjects_Titan.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ResearchProjectDef ParentName="ARA_techBaseCantResearch">
+    <defName>ARA_Titan_Base_Technology</defName>
+    <label>泰坦触须特异化</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n解锁阿拉克涅虫群泰坦触须的研究路径。\n\n该科技无法主动研究，在开局时将由阿拉克涅女皇种的类型解锁。</description>
+    <baseCost>999999</baseCost>
+    <researchViewX>16.00</researchViewX>
+    <researchViewY>3.20</researchViewY>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_8SLA</defName>
+    <label>节点SLA-8"暴戮之兽"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许女皇种孵化新的兽虫——暴屠种。\n\n阿拉克涅虫群泰坦触须所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <baseCost>3000</baseCost>
+    <researchViewX>17.00</researchViewX>  
+    <researchViewY>5.80</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_2HAG</li>
+      <li>ARA_Technology_2WMT</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_7ACD_T</defName>
+    <label>节点ACD-7"溶脂强酸"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许蜜罐种进行定向进化，抛弃孵化辅虫的能力，换取溶解囚犯和俘虏以快速换取虫蜜的溶脂强酸。\n\n阿拉克涅虫群泰坦触须所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <baseCost>500</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>1.50</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_7VXI</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_3LGN_T</defName>
+    <label>节点LGN-3"军团之威"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许禁卫种进行定向进化，抛弃孵化辅虫的能力，换取更强大的近战、远程、防御能力和各种体术。\n\n阿拉克涅虫群泰坦触须所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <baseCost>3000</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>3.90</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_7KYC</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_6LOD_T</defName>
+    <label>节点LOD-6"巢之主"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许空天种进行定向进化，以牺牲高速和高空机动的能力换取向敌人投射大量天巢种的能力，这种飞行辅虫速度很快，并且在近战中很难缠。\n\n阿拉克涅虫群泰坦触须所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <baseCost>3500</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>4.90</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_2KYC</li>
+      <li>ARA_Technology_2WMT</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_7EVO_T</defName>
+    <label>节点EVO-7"甲壳棘刺"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许实行新的阿拉克涅进化手术，允许阿拉克涅虫族植入会自动攻击附近敌人的棘刺腔管。\n\n阿拉克涅虫群泰坦触须所有需要蓝图的科技，其研究只能通过基因试验卵进行。</description>
+    <baseCost>1500</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>4.40</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_5KYC</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_1STG_T</defName>
+    <label>节点STG-1"绽放腔"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
+    <baseCost>500</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>0.90</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_6PAV</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="ARA_techBase_Needtechprint">
+    <defName>ARA_Technology_3XPV_T</defName>
+    <label>节点XPV-3"梭镖"</label>
+    <description>&lt;color=#915A30>&lt;i>阿拉克涅虫群-泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color>\n\n允许阿拉克涅茧孵化新的武器。</description>
+    <baseCost>2000</baseCost>
+    <researchViewX>17.00</researchViewX>
+    <researchViewY>0.30</researchViewY>
+    <hiddenPrerequisites>
+      <li>ARA_Technology_7PAV</li>
+    </hiddenPrerequisites>
+    <prerequisites>
+      <li>ARA_Titan_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+</Defs>
--- a/1.6/1.6/Defs/Scenarios/ARA_Scenarios.xml
+++ b/1.6/1.6/Defs/Scenarios/ARA_Scenarios.xml
@@ -2,10 +2,10 @@
 <Defs>
  <ScenarioDef ParentName="ScenarioBase">
    <defName>ARA_Basic_Start_Scenario</defName>
-    <label>新阿拉克涅虫巢</label>
-    <description>一只阿拉克涅虫族女皇种降落在荒无人烟的边缘世界，准备着手建立属于自己的虫巢。</description>
+    <label>阿拉克涅虫巢-泰坦触须</label>
+    <description>一只阿拉克涅虫族女皇——泰坦种降落在荒无人烟的边缘世界，准备着手建立属于自己的虫巢。\n\n&lt;color=#915A30>&lt;i>泰坦触须\n泰坦触须是阿拉克涅虫群的主力军团，包含阿拉克涅虫群中最坚韧、最具有适应力的族群，承担在战场上维持战线的任务。这个分支下的虫群拥有均衡的攻防能力，擅长以硬碰硬的模式消灭对手。&lt;/i>&lt;/color></description>
    <scenario>
-      <summary>以一只阿拉克涅虫族女皇种为初始殖民者开始游戏，附带4枚初诞阿拉克涅虫卵囊。</summary>
+      <summary>以一只阿拉克涅虫族泰坦种女皇为初始殖民者开始游戏，附带5枚初诞阿拉克涅虫卵囊。</summary>
      <playerFaction>
        <def>PlayerFaction</def>
        <factionDef>ARA_New_Hive</factionDef>
@@ -94,6 +94,10 @@
          <def>StartingResearch</def>
          <project>ARA_Base_Technology</project>
        </li>
+        <li Class="ScenPart_StartingResearch">
+          <def>StartingResearch</def>
+          <project>ARA_Titan_Base_Technology</project>
+        </li>
      </parts>
    </scenario>
  </ScenarioDef>
--- a/1.6/1.6/Defs/SoundDefs/ARA_Sounds.xml
+++ b/1.6/1.6/Defs/SoundDefs/ARA_Sounds.xml
@@ -68,4 +68,21 @@
      </li>
    </subSounds>
  </SoundDef>
+  <SoundDef>
+    <defName>ARA_Psi_Ability_Sound</defName>
+    <context>MapOnly</context>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Folder">
+            <clipFolderPath>Pawn/Revenant/Death</clipFolderPath>
+          </li>
+        </grains>
+        <volumeRange>70~85</volumeRange>
+        <pitchRange>0.9311764~1.068824</pitchRange>
+        <!-- <distRange>0~70</distRange> -->
+        <sustainLoop>False</sustainLoop>
+      </li>
+    </subSounds>
+  </SoundDef>
 </Defs>
--- a/1.6/1.6/Defs/Stats/ARA_Stats.xml
+++ b/1.6/1.6/Defs/Stats/ARA_Stats.xml
@@ -21,7 +21,6 @@
    <displayPriorityInCategory>8000</displayPriorityInCategory>
  </StatDef>

-
  <StatCategoryDef>
    <defName>ARA_Incubation_StatCategory</defName>
    <label>孵化相关数据</label>
@@ -70,4 +69,47 @@
    <displayPriorityInCategory>2200</displayPriorityInCategory>
    <showIfUndefined>false</showIfUndefined>
  </StatDef>
+
+
+  <StatCategoryDef>
+    <defName>ARA_GestaltNetwork</defName>
+    <label>蜂巢网络</label>
+    <displayOrder>110</displayOrder>
+  </StatCategoryDef>
+  <StatDef>
+    <defName>ARA_GestaltBandwidth</defName>
+    <label>蜂巢网络容量</label>
+    <description>阿拉克涅虫群格式塔网络的最大节点限制，每一只阿拉克涅督虫都会影响网络的负荷，一些虫族会分担网络压力，另一些则会增加负载。当负载过大时，阿拉克涅女皇种的思维将遭到压迫，导致其心情和意识降低。</description>
+    <category>Basics</category>
+    <defaultBaseValue>0</defaultBaseValue>
+    <toStringStyle>Integer</toStringStyle>
+    <hideAtValue>0</hideAtValue>
+    <minValue>0</minValue>
+    <displayPriorityInCategory>2200</displayPriorityInCategory>
+    <showIfUndefined>false</showIfUndefined>
+  </StatDef>
+  <StatDef>
+    <defName>ARA_GestaltBandwidthCost</defName>
+    <label>蜂巢网络负载</label>
+    <description>阿拉克涅督虫对格式塔网络产生的负荷，如果为负数，则代表此督虫会为格式塔网络分担压力。</description>
+    <category>Basics</category>
+    <defaultBaseValue>0</defaultBaseValue>
+    <toStringStyle>Integer</toStringStyle>
+    <hideAtValue>0</hideAtValue>
+    <minValue>-999</minValue>
+    <displayPriorityInCategory>2201</displayPriorityInCategory>
+    <showIfUndefined>false</showIfUndefined>
+  </StatDef>
+  <StatDef>
+    <defName>ARA_SwarmSpell_Level</defName>
+    <label>术法等级</label>
+    <description>阿拉克涅灵能单位的术法强度。</description>
+    <category>Basics</category>
+    <defaultBaseValue>0</defaultBaseValue>
+    <toStringStyle>Integer</toStringStyle>
+    <hideAtValue>0</hideAtValue>
+    <minValue>0</minValue>
+    <displayPriorityInCategory>2202</displayPriorityInCategory>
+    <showIfUndefined>false</showIfUndefined>
+  </StatDef>
 </Defs>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
@@ -2,6 +2,7 @@
 <Defs>
  <ThingDef Name="ArachnaeBase_Race" ParentName="BaseInsect" Abstract="True">
    <statBases>
+      <MaxNutrition>3</MaxNutrition>
      <MoveSpeed>8</MoveSpeed>
      <MarketValue>0</MarketValue>
      <LeatherAmount>0</LeatherAmount>
@@ -28,7 +29,7 @@
      <li>ARA_Surgery_Install_Reactive_Shell</li>
      <li>ARA_Surgery_Install_Strengthening_Tendon</li>
      <li>ARA_Surgery_Install_Slide_Patagium</li>
-      <li>ARA_Surgery_Install_Acidling_Pouch</li>
+      <li>ARA_Surgery_Install_Baneling_Pouch</li>
      <li>ARA_Surgery_Install_Tumor_Pouch</li>
      <li>ARA_Surgery_Install_Internal_Circulation_Lung</li>
    </recipes>
@@ -49,6 +50,8 @@
    <race>
      <body>BeetleLikeWithClaw</body>
      <thinkTreeMain>ARA_Insect_WithPlanting</thinkTreeMain>
+      <thinkTreeConstant>ARA_Insect_Thinktree_Constant</thinkTreeConstant>
+      <foodType>CarnivoreAnimal,OvivoreAnimal</foodType>
      <baseHungerRate>0.1</baseHungerRate>
      <baseBodySize>0.5</baseBodySize>
      <baseHealthScale>1</baseHealthScale>
@@ -81,12 +84,6 @@
      </headPosPerRotation>
    </race>
    <comps>
-      <!-- <li Class="CompProperties_MechPowerCell">
-        <totalPowerTicks>240000</totalPowerTicks>
-        <labelOverride>寿命</labelOverride>
-        <tooltipOverride>这种特殊的阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
-        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
-      </li> -->
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
          <li>ARA_TemperatureRegulation</li>
@@ -99,9 +96,9 @@
  <ThingDef ParentName="ArachnaeBase_Race">
    <defName>ArachnaeBase_Race_Larva</defName>
    <label>阿拉克涅幼虫种</label>
-    <description>阿拉克涅辅虫之一，是虫族的根基。</description>
+    <description>阿拉克涅辅虫之一，包含了虫群在地面扩张所需的所有遗传物质信息，是虫族的根基。它们可以进入阿拉克涅卵和阿拉克涅茧，以完全变态发育的形式转化为新的督虫或装备。</description>
    <race>
-      <thinkTreeMain>ARA_Larva_Thinktree</thinkTreeMain>
+      <thinkTreeMain>ARA_Insect_Larva_Thinktree</thinkTreeMain>
      <deathAction Class="DeathActionProperties_Vanish">
        <workerClass>DeathActionWorker_Vanish</workerClass>
        <filth>Filth_Slime</filth>
@@ -109,6 +106,36 @@
      </deathAction>
    </race>
    <comps>
+    <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Haul</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
          <li>ARA_HiveMindWorker</li>
@@ -121,13 +148,16 @@
  <ThingDef ParentName="ArachnaeBase_Race">
    <defName>ArachnaeBase_Race_Scavenger</defName>
    <label>阿拉克涅食腐种</label>
-    <description>阿拉克涅辅虫之一，智力低下，可以执行种植、收割、搬运、清洁和挖掘工作，注定在度过短暂的时光后死亡。</description>
+    <description>阿拉克涅辅虫之一，食谱广泛，可以执行种植、收割和搬运工作，拥有一个较小的蜜罐腔，可以像其监管者一样产出虫蜜。</description>
+    <statBases>
+      <MaxNutrition>6</MaxNutrition>
+    </statBases>
    <race>
+      <thinkTreeMain>ARA_Insect_Scavenger_Thinktree</thinkTreeMain>
+      <foodType>OmnivoreHuman,CarnivoreAnimal,OvivoreAnimal,VegetarianRoughAnimal</foodType>
+      <baseHungerRate>1</baseHungerRate>
      <specialTrainables>
-        <li MayRequire="Ludeon.RimWorld.Odyssey">AttackTarget</li>
        <li>ARA_Sowing</li>
-        <li>Dig</li>
-        <li>ARA_Cleaning</li>
      </specialTrainables>
      <deathAction Class="DeathActionProperties_Vanish">
        <workerClass>DeathActionWorker_Vanish</workerClass>
@@ -136,6 +166,102 @@
      </deathAction>
    </race>
    <comps>
+      <!-- <li Class="ArachnaeSwarm.CompProperties_HoneyProduction_Animal"></li> -->
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>12</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>ARA_Sowing</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Haul</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+          <li>ARA_Scavenger_Production_InsectJelly</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Longpincer</defName>
+    <label>阿拉克涅坚颚种</label>
+    <description>阿拉克涅辅虫之一，拥有一对相较于其体型来说过于巨大的颚部，可以执行搬运、挖掘工作。如果其监管者督虫处于征召状态，则会跟随督虫一起行动。</description>
+    <statBases>
+      <MoveSpeed>5.5</MoveSpeed>
+      <ArmorRating_Blunt>0.45</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+    </statBases>
+    <race>
+      <thinkTreeMain>ARA_Insect_Longpincer_Thinktree</thinkTreeMain>
+      <specialTrainables>
+        <li MayRequire="Ludeon.RimWorld.Odyssey">AttackTarget</li>
+        <li>Dig</li>
+      </specialTrainables>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <tools Inherit="False">
+      <li>
+        <label>巨颚</label>
+        <capacities>
+          <li>Cut</li>
+        </capacities>
+        <power>4</power>
+        <cooldownTime>2.8</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>12</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
        <trainables>
          <li>
@@ -173,6 +299,80 @@
            <trainInstantly>true</trainInstantly>
            <setWanted>true</setWanted>
          </li>
+          <li>
+            <trainable>Haul</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Hivekeeping</defName>
+    <label>阿拉克涅家政种</label>
+    <description>阿拉克涅辅虫之一，智力低下，可以执行搬运、清洁和虫群建筑的维护工作，是虫巢中不可或缺的维护者集群的一员。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Hivekeeping_Thinktree</thinkTreeMain>
+      <specialTrainables>
+        <li>ARA_Cleaning</li>
+      </specialTrainables>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>12</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintainer">
+        <showDebugInfo>false</showDebugInfo>
+        <relevantSkill>Crafting</relevantSkill>
+        <minimumSkillLevel>0</minimumSkillLevel>
+        <requiresHiveMind>true</requiresHiveMind>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
          <li>
            <trainable>ARA_Cleaning</trainable>
            <trainInstantly>true</trainInstantly>
@@ -195,4 +395,446 @@
      </li>
    </comps>
  </ThingDef>
-</Defs>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Acidcut</defName>
+    <label>阿拉克涅酸噬种</label>
+    <description>阿拉克涅辅虫之一，智力低下，依靠带酸液的颚撕咬敌军，因为身体结构简单而易于孕育。如果其监管者督虫处于征召状态，则会跟随督虫一起行动。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Acidcut_Thinktree</thinkTreeMain>
+      <baseBodySize>0.3</baseBodySize>
+      <!-- <hasCorpse>false</hasCorpse> -->
+      <body>BeetleLikeWithClaw</body>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <statBases>
+      <MoveSpeed>6</MoveSpeed>
+      <ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+    </statBases>
+    <tools Inherit="False">
+      <li>
+        <label>酸性巨颚</label>
+        <capacities>
+          <li>ARA_AcidCut</li>
+        </capacities>
+        <power>6</power>
+        <cooldownTime>2.6</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>12</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Baneling</defName>
+    <label>阿拉克涅爆裂种</label>
+    <description>阿拉克涅辅虫之一，一般以自杀式袭击的方式伤害敌军，靠近敌人后就会引爆酸囊产生危险的酸性雾气，也可以选择以低烈度自爆的方式留下菌毯供后续虫族部队前进。如果其监管者督虫处于征召状态，则会跟随督虫一起行动。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Baneling_Thinktree</thinkTreeMain>
+      <baseBodySize>0.35</baseBodySize>
+      <!-- <hasCorpse>false</hasCorpse> -->
+      <body>BeetleLikeWithClaw</body>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <statBases>
+      <MoveSpeed>6.6</MoveSpeed>
+    </statBases>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>30</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HunterExplosion">
+        <explosionRadius>3.9</explosionRadius> <!-- Mapped from smokeRadius -->
+        <explosionDamageType>ARA_AcidBomb</explosionDamageType>
+        <explosionDamageAmount>40</explosionDamageAmount>
+        <armorPenetration>0.5</armorPenetration>
+        <explosionSound>Explosion_Smoke</explosionSound>
+        <postExplosionSpawnThingDef>ARA_AcidGasCloud</postExplosionSpawnThingDef>
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+          <li>ARA_Baneling_Acidbomb_Resist</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Empsuicider</defName>
+    <label>阿拉克涅电磁种</label>
+    <description>阿拉克涅辅虫之一，智力低下，一般以自杀式袭击的方式伤害敌军，靠近敌人后就会释放EMP瘫痪附加的机械族。如果其监管者督虫处于征召状态，则会跟随督虫一起行动。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Baneling_Thinktree</thinkTreeMain>
+      <baseBodySize>0.35</baseBodySize>
+      <!-- <hasCorpse>false</hasCorpse> -->
+      <body>BeetleLikeWithClaw</body>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <statBases>
+      <MoveSpeed>6.6</MoveSpeed>
+    </statBases>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>0.5</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HunterExplosion">
+        <explosionRadius>6</explosionRadius> <!-- Mapped from smokeRadius -->
+        <explosionDamageType>EMP</explosionDamageType>
+        <explosionDamageAmount>65</explosionDamageAmount>
+        <armorPenetration>2</armorPenetration>
+        <explosionSound>Explosion_EMP</explosionSound>
+        <!-- <postExplosionSpawnThingDef>ARA_AcidGasCloud</postExplosionSpawnThingDef>
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount> -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Skyhive</defName>
+    <label>阿拉克涅天巢种</label>
+    <description>阿拉克涅辅虫之一，拥有贴地飞行的能力，无论是攻击还是移动速度非常快。如果其监管者督虫处于征召状态，则会跟随督虫一起行动。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Skyhive_Thinktree</thinkTreeMain>
+      <baseBodySize>0.3</baseBodySize>
+      <!-- <hasCorpse>false</hasCorpse> -->
+      <body>BeetleLikeWithClaw</body>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+      <flightStartChanceOnJobStart>1.0</flightStartChanceOnJobStart>
+    </race>
+    <statBases>
+      <MoveSpeed>6</MoveSpeed>
+
+      <ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+
+      <MaxFlightTime>9999</MaxFlightTime>
+      <FlightCooldown>0</FlightCooldown>
+    </statBases>
+    <tools Inherit="False">
+      <li>
+        <label>复合颚</label>
+        <capacities>
+          <li>Cut</li>
+        </capacities>
+        <power>3</power>
+        <cooldownTime>0.8</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>12</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_PawnFlight">
+        <flightCondition>Always</flightCondition>
+        
+        <flyingAnimationNorth>ARA_Psi_FlyNorth</flyingAnimationNorth>
+        <flyingAnimationEast>ARA_Psi_FlyNorth</flyingAnimationEast>
+        <flyingAnimationSouth>ARA_Psi_FlyNorth</flyingAnimationSouth>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="ArachnaeBase_Race">
+    <defName>ArachnaeBase_Race_Locust</defName>
+    <label>阿拉克涅蝗虫种</label>
+    <description>阿拉克涅辅虫之一，是少数拥有高智能的辅虫单位，可以自行躲避危险，并使用毒针腺体向敌群射击。如果其监管者督虫处于征召状态，则会跟随督虫一起行动，但是会更倾向于保护其督虫而非主动上前迎敌。</description>
+    <race>
+      <thinkTreeMain>ARA_Insect_Locust_Thinktree</thinkTreeMain>
+      <baseBodySize>0.36</baseBodySize>
+      <!-- <hasCorpse>false</hasCorpse> -->
+      <body>BeetleLikeWithClaw</body>
+      <deathAction Class="DeathActionProperties_Vanish">
+        <workerClass>DeathActionWorker_Vanish</workerClass>
+        <filth>Filth_Slime</filth>
+        <filthCountRange>1~3</filthCountRange>
+      </deathAction>
+    </race>
+    <statBases>
+      <MoveSpeed>5.5</MoveSpeed>
+
+      <ArmorRating_Blunt>0.4</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.4</ArmorRating_Sharp>
+      <ArmorRating_Heat>0.25</ArmorRating_Heat>
+    </statBases>
+    <tools Inherit="False">
+      <li>
+        <label>复合颚</label>
+        <capacities>
+          <li>Cut</li>
+        </capacities>
+        <power>3</power>
+        <cooldownTime>0.8</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
+        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
+        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
+        <lifetimeDays>15</lifetimeDays>
+        <labelOverride>寿命</labelOverride>
+        <tooltipOverride>阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
+        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
+        <trainables>
+          <li>
+            <trainable>Obedience</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Release</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Rescue</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>Tameness</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+          <li>
+            <trainable>AttackTarget</trainable>
+            <trainInstantly>true</trainInstantly>
+            <setWanted>true</setWanted>
+          </li>
+        </trainables>
+        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveMindWorker</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+    </comps>
+  </ThingDef>
+
+  <ToolCapacityDef>
+    <defName>ARA_AcidCut</defName>
+    <label>酸性撕咬</label>
+  </ToolCapacityDef>
+  <ManeuverDef>
+    <defName>ARA_AcidCut</defName>
+    <requiredCapacity>ARA_AcidCut</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>ARA_AcidCut_Damage</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+  <ToolCapacityDef>
+    <defName>ARA_Bite</defName>
+    <label>撕咬</label>
+  </ToolCapacityDef>
+  <ManeuverDef>
+    <defName>ARA_Bite</defName>
+    <requiredCapacity>ARA_Bite</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>Bite</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+</Defs>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBeastSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBeastSwarm.xml
@@ -9,6 +9,7 @@
      <MoveSpeed>5</MoveSpeed>
    </statBases>
    <race>
+      <lifeExpectancy>100</lifeExpectancy>
      <body>ArachnaeSlayer_Body</body>
      <thinkTreeMain>ARA_Insect_Beast</thinkTreeMain>
      <!-- 身形大小 -->
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-  <ThingDef ParentName="AnimalThingBase" Name="ARA_BaseDroneSwarm" Abstract="True">
-    <statBases>
-      <MarketValue>0</MarketValue>
-      <PsychicSensitivity>1</PsychicSensitivity>
-      <ToxicResistance>1</ToxicResistance>
-      <Flammability>1</Flammability>
-      <ComfyTemperatureMin>-100</ComfyTemperatureMin>
-      <ComfyTemperatureMax>250</ComfyTemperatureMax>
-      <LeatherAmount>0</LeatherAmount>
-      <MeatAmount>0</MeatAmount>
-      <ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-      <VacuumResistance>0</VacuumResistance>
-    </statBases>
-    <receivesSignals>true</receivesSignals>
-    <tradeability>None</tradeability>
-    <race>
-      <baseHealthScale>0.5</baseHealthScale>
-      <alwaysAwake>true</alwaysAwake>
-      <fleshType>Insectoid</fleshType>
-      <needsRest>false</needsRest>
-      <hasGenders>false</hasGenders>
-      <hasCorpse>false</hasCorpse>
-      <foodType>None</foodType>
-      <bloodDef>Filth_BloodInsect</bloodDef>
-      <lifeExpectancy>1</lifeExpectancy>
-      <disableIgniteVerb>true</disableIgniteVerb>
-      <trainability>None</trainability>
-      <soundCallIntervalRange>1000~2000</soundCallIntervalRange>
-      <soundCallIntervalFriendlyFactor>2</soundCallIntervalFriendlyFactor>
-      <thinkTreeConstant>SentryDroneConstant</thinkTreeConstant>
-      <hideTrainingTab>true</hideTrainingTab>
-      <intelligence>ToolUser</intelligence>
-      <thinkTreeMain>Drone</thinkTreeMain>
-      <canFlyInVacuum>true</canFlyInVacuum>
-      <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>
-      <deathAction Class="DeathActionProperties_Vanish">
-        <workerClass>DeathActionWorker_Vanish</workerClass>
-        <filth>Filth_Slime</filth>
-        <filthCountRange>1~3</filthCountRange>
-      </deathAction>
-    </race>
-    <tools Inherit="False">
-      <li>
-        <label>巨颚</label>
-        <capacities>
-          <li>ARA_Bite</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2.6</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
-    <killedLeavings>
-    </killedLeavings>
-    <comps>
-      <li Class="CompProperties_MechPowerCell">
-        <totalPowerTicks>3400</totalPowerTicks>                <!-- 2 hours -->
-        <labelOverride>寿命</labelOverride>
-        <tooltipOverride>这种特殊的阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
-        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
-      </li>
-    </comps>
-  </ThingDef>
-  <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Acidcut</defName>
-    <label>阿拉克涅酸噬种</label>
-    <description>阿拉克涅辅虫之一，智力低下，一般被作为活体炮弹打出，击中敌人后若是还没散架，就会继续依靠带酸液的颚撕咬敌军。</description>
-    <race>
-      <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant>
-      <baseBodySize>0.3</baseBodySize>
-      <!-- <hasCorpse>false</hasCorpse> -->
-      <body>BeetleLikeWithClaw</body>
-    </race>
-    <statBases>
-      <MoveSpeed>6</MoveSpeed>
-    </statBases>
-    <tools Inherit="False">
-      <li>
-        <label>酸性巨颚</label>
-        <capacities>
-          <li>ARA_AcidCut</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2.6</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
-  </ThingDef>
-  <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Skyhive</defName>
-    <label>阿拉克涅天巢种</label>
-    <description>阿拉克涅辅虫之一，智力低下，通常被督虫们当成导弹打出，拥有在飞行中调整姿态以追踪敌军的能力。命中敌军后，这些虫族会趴在敌军身上进行啃咬，直到鳌刺松动而掉在地上。</description>
-    <race>
-      <flightStartChanceOnJobStart>1.0</flightStartChanceOnJobStart>
-      <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant>
-      <baseBodySize>0.3</baseBodySize>
-      <!-- <hasCorpse>false</hasCorpse> -->
-      <body>BeetleLikeWithClaw</body>
-    </race>
-    <statBases>
-      <MoveSpeed>6</MoveSpeed>
-
-      <MaxFlightTime>9999</MaxFlightTime>
-      <FlightCooldown>0</FlightCooldown>
-    </statBases>
-  </ThingDef>
-  <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Acidling</defName>
-    <label>阿拉克涅爆裂种</label>
-    <description>阿拉克涅辅虫之一，智力低下，一般以自杀式袭击的方式伤害敌军，靠近敌人后就会引爆酸囊产生危险的酸性雾气。</description>
-    <race>
-      <thinkTreeConstant>HunterDroneConstant</thinkTreeConstant>
-      <baseBodySize>0.25</baseBodySize>
-      <!-- <hasCorpse>false</hasCorpse> -->
-      <body>BeetleLikeWithClaw</body>
-      <baseHealthScale>1</baseHealthScale>
-    </race>
-    <statBases>
-      <MoveSpeed>6</MoveSpeed>
-    </statBases>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_HunterExplosion">
-        <explosionRadius>3.9</explosionRadius> <!-- Mapped from smokeRadius -->
-        <explosionDamageType>ARA_AcidBurn</explosionDamageType>
-        <explosionDamageAmount>40</explosionDamageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <explosionSound>Explosion_Smoke</explosionSound>
-        <postExplosionSpawnThingDef>ARA_AcidGasCloud</postExplosionSpawnThingDef>
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-    <tools Inherit="False">
-      <li>
-        <label>酸性巨颚</label>
-        <capacities>
-          <li>ARA_AcidCut</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2.6</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
-  </ThingDef>
-  <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Empsuicider</defName>
-    <label>阿拉克涅爆裂种</label>
-    <description>阿拉克涅辅虫之一，智力低下，一般以自杀式袭击的方式伤害敌军，靠近敌人后就会释放EMP瘫痪附加的机械族。</description>
-    <race>
-      <thinkTreeConstant>HunterDroneConstant</thinkTreeConstant>
-      <baseBodySize>0.25</baseBodySize>
-      <!-- <hasCorpse>false</hasCorpse> -->
-      <body>BeetleLikeWithClaw</body>
-      <baseHealthScale>1</baseHealthScale>
-    </race>
-    <statBases>
-      <MoveSpeed>6</MoveSpeed>
-    </statBases>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_HunterExplosion">
-        <explosionRadius>6</explosionRadius> <!-- Mapped from smokeRadius -->
-        <explosionDamageType>EMP</explosionDamageType>
-        <explosionDamageAmount>65</explosionDamageAmount>
-        <armorPenetration>2</armorPenetration>
-        <explosionSound>Explosion_EMP</explosionSound>
-        <!-- <postExplosionSpawnThingDef>ARA_AcidGasCloud</postExplosionSpawnThingDef>
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount> -->
-      </li>
-    </comps>
-  </ThingDef>
-
-  <ToolCapacityDef>
-    <defName>ARA_AcidCut</defName>
-    <label>酸性撕咬</label>
-  </ToolCapacityDef>
-  <ManeuverDef>
-    <defName>ARA_AcidCut</defName>
-    <requiredCapacity>ARA_AcidCut</requiredCapacity>
-    <verb>
-      <verbClass>Verb_MeleeAttackDamage</verbClass>
-      <meleeDamageDef>ARA_AcidCut_Damage</meleeDamageDef>
-    </verb>
-    <logEntryDef>MeleeAttack</logEntryDef>
-    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
-    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
-    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
-    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
-  </ManeuverDef>
-  <ToolCapacityDef>
-    <defName>ARA_Bite</defName>
-    <label>撕咬</label>
-  </ToolCapacityDef>
-  <ManeuverDef>
-    <defName>ARA_Bite</defName>
-    <requiredCapacity>ARA_Bite</requiredCapacity>
-    <verb>
-      <verbClass>Verb_MeleeAttackDamage</verbClass>
-      <meleeDamageDef>Bite</meleeDamageDef>
-    </verb>
-    <logEntryDef>MeleeAttack</logEntryDef>
-    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
-    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
-    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
-    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
-  </ManeuverDef>
-</Defs>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -124,11 +124,11 @@
                  <layerOffset>-0.275</layerOffset>
                </north>
                <east>
-                  <offset>(-0.1,0.39)</offset>
+                  <offset>(-0.1,0.3)</offset>
                  <layerOffset>-0.273</layerOffset>
                </east>
                <west>
-                  <offset>(-0.1,0.39)</offset>
+                  <offset>(-0.1,0.3)</offset>
                  <layerOffset>-0.273</layerOffset>
                </west>
              </offsets>
@@ -153,15 +153,18 @@
              <!-- same options as above -->
            </south>
            <east>
-              <offset>(0.0, 0.05)</offset>
+              <offset>(0.0, 0)</offset>
            </east>
            <west>
-              <offset>(0.0, 0.05)</offset>
+              <offset>(0.0, 0)</offset>
            </west>
          </headOffsetDirectional>
        </alienPartGenerator>
        <growthAges>
-          <li>0</li>
+          <li>0.25</li>
+          <li>0.5</li>
+          <li>0.75</li>
+          <li>1</li>
        </growthAges>
        <!-- 年龄工作效率等的覆盖 -->
        <ageStatOverrides>
@@ -536,12 +539,14 @@
      <ForagedNutritionPerDay>0</ForagedNutritionPerDay>
      <ComfyTemperatureMin>-3000</ComfyTemperatureMin>
      <ComfyTemperatureMax>3000</ComfyTemperatureMax>
+
+      <ARA_GestaltBandwidthCost>1</ARA_GestaltBandwidthCost>
    </statBases>

    <race>
      <!-- <fleshType>WULA_Fleshtype</fleshType> -->
      <!-- AI行为，勿改 -->
-      <thinkTreeMain>ARA_Humanlike</thinkTreeMain>
+      <thinkTreeMain>Humanlike</thinkTreeMain>
      <!-- 智力水平 -->
      <intelligence>Humanlike</intelligence>
      <bloodDef>Filth_BloodInsect</bloodDef>
@@ -550,6 +555,7 @@
      <baseHealthScale>1.5</baseHealthScale>
      <!-- 解剖产物 -->
      <leatherDef>ARA_Carapace</leatherDef>
+      <lifeExpectancy>80</lifeExpectancy>
      <!-- 身体类型 -->
      <body>Human</body>
      <lifeStageWorkSettings MayRequire="Ludeon.RimWorld.Biotech">
@@ -608,6 +614,14 @@
      <canFlyInVacuum>false</canFlyInVacuum>
      <!-- 身形大小，略大于常规人类 -->
      <baseBodySize>1</baseBodySize>
+      <ageGenerationCurve>
+        <points>
+          <li MayRequire="Ludeon.RimWorld.Biotech">(0,0)</li>
+          <li MayRequire="Ludeon.RimWorld.Biotech">(1,0)</li>
+          <li MayRequire="Ludeon.RimWorld.Biotech">(1.5,1)</li>
+          <li MayRequire="Ludeon.RimWorld.Biotech">(2,0)</li>
+        </points>
+      </ageGenerationCurve>
    </race>

    <recipes Inherit="False">
@@ -623,7 +637,7 @@
      <li>ARA_Surgery_Install_Reactive_Shell</li>
      <li>ARA_Surgery_Install_Strengthening_Tendon</li>
      <li>ARA_Surgery_Install_Slide_Patagium</li>
-      <li>ARA_Surgery_Install_Acidling_Pouch</li>
+      <li>ARA_Surgery_Install_Baneling_Pouch</li>
      <li>ARA_Surgery_Install_Tumor_Pouch</li>
      <li>ARA_Surgery_Install_Internal_Circulation_Lung</li>
    </recipes>
@@ -767,7 +781,6 @@

    <race>
      <baseHungerRate>6</baseHungerRate>
-      <foodType>OmnivoreHuman,CarnivoreAnimal,OvivoreAnimal,VegetarianRoughAnimal</foodType>
      <!-- 身体类型 -->
      <body>ArachnaeMyrmecocystus_Body</body>
      <!-- 血量上限 -->
@@ -778,18 +791,6 @@
      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
        <freeProduction>true</freeProduction>
        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
-        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>1</startingIngredientCount>
-        <costPerPawn>1</costPerPawn>
-        <cooldownTicks>9999</cooldownTicks>
-        <productionQueue>
-          <li>
-            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
-            <count>2</count>
-            <cooldownTicks>5000</cooldownTicks>
-          </li>
-        </productionQueue>
        <spawnEffecter>CocoonDestroyed</spawnEffecter>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
@@ -829,7 +830,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
    <defName>ArachnaeNode_Race_ShieldHead</defName>
    <label>阿拉克涅盾头种</label>
-    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，可以定时剥落甲壳素供虫巢使用。\n\n她可以进行搬运、采矿和建筑工作，战斗技能平平无奇，但是拥有较好的防御。\n\n作为督虫，她可以繁育并监管若干阿拉克涅坚颚种辅虫，以协助巢穴开采矿脉。</description>
+    <description>阿拉克涅督虫之一，拥有过度生长而覆盖头部和腿部的甲壳，可以定时剥落甲壳素供虫巢使用。\n\n她可以进行搬运、采矿和建筑工作，战斗技能平平无奇，但是拥有较好的防御。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -950,18 +951,6 @@
      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
        <freeProduction>true</freeProduction>
        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
-        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>1</startingIngredientCount>
-        <costPerPawn>1</costPerPawn>
-        <cooldownTicks>9999</cooldownTicks>
-        <productionQueue>
-          <li>
-            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
-            <count>2</count>
-            <cooldownTicks>5000</cooldownTicks>
-          </li>
-        </productionQueue>
        <spawnEffecter>CocoonDestroyed</spawnEffecter>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
@@ -994,7 +983,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
    <defName>ArachnaeNode_Race_WeaponSmith</defName>
    <label>阿拉克涅工艺种</label>
-    <description>阿拉克涅督虫之一，是少数拥有结茧能力的非女皇种阿拉克涅虫族——她们可以排出一枚器官茧，这枚茧将按照其信息素所标定的方向定向演化出一个武装器官，以供虫群使用。\n\n她可以进行搬运、手工和艺术工作，战斗技能平平无奇，但本身极度脆弱。\n\n作为督虫，她可以繁育并监管若干阿拉克涅家政种辅虫，以协助巢穴进行清洁和搬运工作。</description>
+    <description>阿拉克涅督虫之一，主要负责巢穴的维护，以及使用灵巧的肢体为虫群处理一些精细工作。\n\n她可以进行搬运、手工和艺术工作，战斗技能平平无奇，但本身极度脆弱。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -1075,26 +1064,15 @@
      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
        <freeProduction>true</freeProduction>
        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
-        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>1</startingIngredientCount>
-        <costPerPawn>1</costPerPawn>
-        <cooldownTicks>9999</cooldownTicks>
-        <productionQueue>
-          <li>
-            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
-            <count>2</count>
-            <cooldownTicks>5000</cooldownTicks>
-          </li>
-        </productionQueue>
        <spawnEffecter>CocoonDestroyed</spawnEffecter>
      </li>
-      <!-- <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
+          <li>ARA_WeaponSmith_Base</li>
        </hediffs>
        <addChance>1.0</addChance>
        <allowDuplicates>false</allowDuplicates>
-      </li> -->
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
@@ -1125,7 +1103,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase">
    <defName>ArachnaeNode_Race_Fighter</defName>
    <label>阿拉克涅战士种</label>
-    <description>阿拉克涅督虫之一，是巢穴中真正的战士，其拥有强大的可塑性基因，随着科技的解锁其将获得更多的能力。\n\n她可以进行搬运、狩猎和驯兽工作，战斗技能非常亮眼，并且移动敏捷。\n\n作为督虫，她可以向敌人投射寿命有限但是非常恼人的阿拉克涅酸噬种辅虫，以阻止敌人的远程火力开火。</description>
+    <description>阿拉克涅督虫之一，是巢穴中真正的战士，其拥有强大的可塑性基因，随着科技的解锁其将获得更多的能力。\n\n她可以进行搬运、狩猎和驯兽工作，战斗技能非常亮眼，并且移动敏捷。\n\n作为督虫，她可以繁育并监管若干阿拉克涅酸噬种辅虫，体型小巧却异常坚韧的战斗型辅虫，除了吸收炮火外也能在近战中使用带酸前颚咬人。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -1223,6 +1201,11 @@
    </race>

    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
@@ -1355,7 +1338,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase_Huge">
    <defName>ArachnaeNode_Race_Smokepop</defName>
    <label>阿拉克涅迷雾种</label>
-    <description>阿拉克涅大型督虫之一，身披厚重甲壳的大型虫族，拥有在大范围内喷射信息素以召唤辅虫虫群能力，虽然移动速度比较慢，但是在战斗中就如同装甲车一样难以撼动。\n\n她可以进行搬运工作，拥有不错的战斗技能，防御力和伤害耐受能力强大。\n\n作为督虫，她可以繁育并监管大量阿拉克涅家政种辅虫，以协助巢穴进行清洁和搬运工作。</description>
+    <description>阿拉克涅大型督虫之一，身披厚重甲壳的大型虫族，拥有在大范围内喷射信息素以召唤辅虫虫群能力，虽然移动速度比较慢，但是在战斗中就如同装甲车一样难以撼动。\n\n她可以进行搬运工作，拥有不错的战斗技能，防御力和伤害耐受能力强大。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -1425,6 +1408,11 @@
    </race>

    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
          <li>ARA_Smokepop_Base</li>
@@ -1473,7 +1461,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase_Huge">
    <defName>ArachnaeNode_Race_Skyraider</defName>
    <label>阿拉克涅空天种</label>
-    <description>阿拉克涅大型督虫之一，众督虫中的精锐，身材巨大并且拥有引以为傲的飞行能力，是巢穴中无可争议的空中霸主。\n\n她可以进行搬运工作，拥有不错的战斗技能，在战场上行动时非常灵活。\n\n作为督虫，她可以向敌人发射天巢种辅虫，这种辅虫会自动修正姿态追踪敌军，并在命中后对敌人进行持续啃咬。</description>
+    <description>阿拉克涅大型督虫之一，众督虫中的精锐，身材巨大并且拥有引以为傲的飞行能力，是巢穴中无可争议的空中霸主。\n\n她可以进行搬运工作，拥有不错的战斗技能，在战场上行动时非常灵活。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -1545,6 +1533,11 @@
    </race>

    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
          <li>ARA_Skyraider_Base</li>
@@ -1742,6 +1735,8 @@
      <ArmorRating_Heat>0</ArmorRating_Heat>

      <!-- <MaxNutrition>1</MaxNutrition> -->
+
+      <ARA_GestaltBandwidthCost>-3</ARA_GestaltBandwidthCost>
    </statBases>

    <race>
@@ -1767,11 +1762,22 @@
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
          <li>ARA_Psi_Master</li>
-          <li>PsychicAmplifier</li>
        </hediffs>
+        
        <addChance>1.0</addChance>
        <allowDuplicates>false</allowDuplicates>
      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>PsychicAmplifier</li>
+        </hediffs>
+        <bodyPart>Brain</bodyPart>
+        
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+        <partSelectionMode>First</partSelectionMode>
+        <skipIfPartMissing>true</skipIfPartMissing>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_SkillExperienceGiver">
        <addChance>1.0</addChance>
        <debug>false</debug>
@@ -1950,6 +1956,11 @@
    </race>

    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
@@ -2077,4 +2088,4 @@
      <li Class="CompProperties_DrugAddict"/> -->
    </comps>
  </AlienRace.ThingDef_AlienRace>
-</Defs>
+</Defs>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml
@@ -119,7 +119,6 @@
      <hediffGiverSets>
        <li>OrganicStandard</li>
        <li>Human</li>
-        <li>ARA_NonPlayerHediffSet</li>
      </hediffGiverSets>
    </race>
    <recipes>
@@ -178,11 +177,7 @@
      </li>
    </comps>
  </ThingDef>
-  <AlienRace.ThingDef_AlienRace Name="ARA_QueenBase" ParentName="ARA_PawnBase">
-    <defName>ArachnaeQueen_Race</defName>
-    <label>阿拉克涅女皇种</label>
-    <description>阿拉克涅女皇种是阿拉克涅虫巢中唯一可以生育督虫的个体，并且是虫巢意识金字塔的核心，肩负着引领阿拉克涅虫群前进的伟大使命。她与麾下的虫族的灵能链接所构成的蜂群意识网络可以使得虫群以极高的效率运转，但是一旦女皇种死亡，其麾下的虫群将全部死亡！</description>
-
+  <AlienRace.ThingDef_AlienRace Abstract="True" Name="ARA_QueenBase" ParentName="ARA_PawnBase">
    <alienRace>
      <!-- 核心设置 -->
      <generalSettings>
@@ -254,12 +249,6 @@
          <!-- 额外身体部件 -->
          <bodyAddons>
          </bodyAddons>
-          <!-- 图像放大 -->
-          <borderScale>4</borderScale>
-          <atlasScale>4</atlasScale>
-          <customDrawSize>(4,4)</customDrawSize>
-          <customHeadDrawSize>(1.0,1.0)</customHeadDrawSize>
-          <customPortraitDrawSize>(2,2)</customPortraitDrawSize>
        </alienPartGenerator>
        <growthAges Inherit="False">
          <li>0</li>
@@ -336,17 +325,6 @@
          </points>
        </growthFactorByAge>
      </generalSettings>
-      <!-- 图形 -->
-      <graphicPaths>
-        <!-- 皮肤颜色 -->
-        <skinColor>(1,1,1,1)</skinColor>
-        <!-- 皮肤着色器 -->
-        <skinShader>Cutout</skinShader>
-        <body>ArachnaeSwarm/Things/ARA_HiveQueen/Bodies/</body>
-        <head>ArachnaeSwarm/Things/ARA_HiveQueen/Heads/</head>
-        <skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton>
-        <stump>ArachnaeSwarm/Things/ARA_HiveQueen/Bodies/</stump>
-      </graphicPaths>
      <!-- 风格设置 -->
      <styleSettings>
        <!-- 头发 -->
@@ -468,6 +446,7 @@
        <cannotReceiveThoughts>
          <li>ColonistLost</li>
          <li>KnowColonistDied</li>
+          <li>PawnWithGoodOpinionDied</li>
          <li>PsychicDrone</li>
          <li>Naked</li>
          <li>AnyBodyPartButGroinCovered_Disapproved_Female</li>
@@ -555,7 +534,7 @@
      <li>ARA_Surgery_Install_Reactive_Shell</li>
      <li>ARA_Surgery_Install_Strengthening_Tendon</li>
      <li>ARA_Surgery_Install_Slide_Patagium</li>
-      <li>ARA_Surgery_Install_Acidling_Pouch</li>
+      <li>ARA_Surgery_Install_Baneling_Pouch</li>
      <li>ARA_Surgery_Install_Tumor_Pouch</li>
      <li>ARA_Surgery_Install_Internal_Circulation_Lung</li>
    </recipes>
@@ -584,7 +563,7 @@
      <!-- 疼痛休克,女皇很难因为疼痛而倒下,虽并不是像机器人一样不会休克 -->
      <PainShockThreshold>1</PainShockThreshold>
      <!-- 女皇非常擅长灵能,以维持蜂群的蜂巢意识链接 -->
-      <PsychicSensitivity>5</PsychicSensitivity>
+      <PsychicSensitivity>2.5</PsychicSensitivity>
      <!-- 女皇的崩溃概率 -->
      <MentalBreakThreshold>0</MentalBreakThreshold>
      <!-- 女皇的高耸身躯和强健循环系统使得很难被毒倒下 -->
@@ -612,6 +591,9 @@

      <!-- 在野外采集的营养 -->
      <ForagedNutritionPerDay>0</ForagedNutritionPerDay>
+
+      <ARA_GestaltBandwidth>15</ARA_GestaltBandwidth>
+      <MechControlGroups>1</MechControlGroups>
    </statBases>

    <race>
@@ -619,7 +601,7 @@
      <body>ArachnaeQueen_Body</body>
      <fleshType>Normal</fleshType>
      <!-- AI行为，勿改 -->
-      <thinkTreeMain>ARA_Humanlike</thinkTreeMain>
+      <thinkTreeMain>Humanlike</thinkTreeMain>
      <!-- 智力水平 -->
      <intelligence>Humanlike</intelligence>
      <!-- 肉和皮革的定义 -->
@@ -692,6 +674,84 @@
      <canFlyInVacuum>false</canFlyInVacuum>
    </race>

+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_UniquePawn">
+        <globalVariable>Unique_Arachnae_Queen</globalVariable>
+        <showDeathMessage>true</showDeathMessage>
+        <deathMessageKey>ARA_QueenAlreadyExists</deathMessageKey>
+        <!-- <killDamageDef>AcidBurn</killDamageDef> -->
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_HiveStrength</li>
+          <li>ARA_HiveMindMaster</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
+      </li>
+      <li Class="ArachnaeSwarm.CompProperties_Gestalt" />
+    </comps>
+  </AlienRace.ThingDef_AlienRace>
+  <AlienRace.ThingDef_AlienRace ParentName="ARA_QueenBase">
+    <defName>ArachnaeQueen_Race</defName>
+    <label>阿拉克涅泰坦种</label>
+    <description>阿拉克涅泰坦种是女皇种亚种之一，归属于阿拉克涅的泰坦触须。她们指挥着阿拉克涅虫群中最坚韧、最具有适应力的主力集团族群，承担在战场上维持战线的任务。\n\n泰坦种女皇除了可以提供泰坦触须的独特科技外，自身也有强大的甲壳作为防御层，还可以通过践踏和高额的近战伤害攻击靠近的敌人。</description>
+    <alienRace>
+      <!-- 核心设置 -->
+      <generalSettings>
+        <!-- 各种零件定义 -->
+        <alienPartGenerator>
+          <borderScale>4</borderScale>
+          <atlasScale>4</atlasScale>
+          <customDrawSize>(4,4)</customDrawSize>
+          <customHeadDrawSize>(1.0,1.0)</customHeadDrawSize>
+          <customPortraitDrawSize>(2,2)</customPortraitDrawSize>
+        </alienPartGenerator>
+      </generalSettings>
+      <!-- 图形 -->
+      <graphicPaths>
+        <!-- 皮肤颜色 -->
+        <skinColor>(1,1,1,1)</skinColor>
+        <!-- 皮肤着色器 -->
+        <skinShader>Cutout</skinShader>
+        <body>ArachnaeSwarm/Things/ARA_HiveQueen/Bodies/</body>
+        <head>ArachnaeSwarm/Things/ARA_HiveQueen/Heads/</head>
+        <skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton>
+        <stump>ArachnaeSwarm/Things/ARA_HiveQueen/Bodies/</stump>
+      </graphicPaths>
+    </alienRace>
+    <statBases>
+      <MarketValue>2000</MarketValue>
+
+      <MoveSpeed>1.75</MoveSpeed>
+      <Mass>250</Mass>
+
+      <CarryingCapacity>200</CarryingCapacity>
+      <MeatAmount>450</MeatAmount>
+      <LeatherAmount>600</LeatherAmount>
+
+      <PainShockThreshold>1</PainShockThreshold>
+      <PsychicSensitivity>2.5</PsychicSensitivity>
+
+      <ToxicResistance>0.95</ToxicResistance>
+      <ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">0.95</ToxicEnvironmentResistance>
+      <Flammability>0.1</Flammability>
+
+      <MeleeDodgeChance>0.25</MeleeDodgeChance>
+
+      <ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+      <ArmorRating_Sharp>0.8</ArmorRating_Sharp>
+      <ArmorRating_Heat>0.5</ArmorRating_Heat>
+
+      <ARA_GestaltBandwidth>12</ARA_GestaltBandwidth>
+      <MechControlGroups>1</MechControlGroups>
+    </statBases>
+
    <!-- 工具设置（攻击方式） -->
    <tools>
      <li>
@@ -736,40 +796,17 @@
    </tools>

    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_UniquePawn">
-        <globalVariable>Unique_Arachnae_Queen</globalVariable>
-        <showDeathMessage>true</showDeathMessage>
-        <deathMessageKey>ARA_QueenAlreadyExists</deathMessageKey>
-        <!-- <killDamageDef>AcidBurn</killDamageDef> -->
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
-          <li>ARA_HiveStrength</li>
-          <li>ARA_HiveMindMaster</li>
+          <li>ArachnaeQueen_Titan_Hediff</li>
        </hediffs>
        <addChance>1.0</addChance>
        <allowDuplicates>false</allowDuplicates>
      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
-        <freeProduction>true</freeProduction>
-        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
-        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
-        <maxIngredientCount>1</maxIngredientCount>
-        <startingIngredientCount>1</startingIngredientCount>
-        <costPerPawn>999</costPerPawn>
-        <cooldownTicks>9999</cooldownTicks>
-        <productionQueue>
-          <li>
-            <pawnKind>ArachnaeBase_Race_Larva</pawnKind>
-            <count>5</count>
-            <cooldownTicks>1000</cooldownTicks>
-          </li>
-        </productionQueue>
-        <spawnEffecter>CocoonDestroyed</spawnEffecter>
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_AreaDamage">
        <radius>3</radius>
        <damageIntervalTicks>180</damageIntervalTicks>
+        <onlyDamageWhenEnemiesPresent>true</onlyDamageWhenEnemiesPresent>
        <damageDef>Crush</damageDef>
        <damageAmount>10</damageAmount>
        <scaleWithPsychicSensitivity>false</scaleWithPsychicSensitivity>
--- a/1.6/1.6/Defs/Thing_Misc/ARA_Flyover_Item.xml
+++ b/1.6/1.6/Defs/Thing_Misc/ARA_Flyover_Item.xml
@@ -81,7 +81,7 @@
  <ThingDef ParentName="SkyfallerBase">
    <defName>ARA_HiveCorvette_Leaving</defName>
    <label>天巫种兽虫 (起飞中)</label>
-    <thingClass>FlyShipLeaving</thingClass>
+    <thingClass>Skyfaller</thingClass>
    <skyfaller>
      <reversed>true</reversed>
      <anticipationSound>Shuttle_Leaving</anticipationSound>
@@ -144,8 +144,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -369,8 +369,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -454,8 +454,50 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
+    </skyfaller>
+    <modExtensions>
+      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
+        <customShadowPath>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</customShadowPath>
+        <useCustomShadow>true</useCustomShadow>
+        <shadowIntensity>0.8</shadowIntensity>
+        <minShadowAlpha>0</minShadowAlpha>
+        <maxShadowAlpha>0</maxShadowAlpha>
+        <minShadowScale>0</minShadowScale>
+        <maxShadowScale>0</maxShadowScale>
+      </li>
+    </modExtensions>
+    <seeThroughFog>true</seeThroughFog>
+    <useHitPoints>false</useHitPoints>
+    <selectable>false</selectable>
+    <alwaysHaulable>false</alwaysHaulable>
+    <altitudeLayer>MetaOverlays</altitudeLayer>
+    <comps>
+    </comps>
+  </ThingDef>
+  <ThingDef Parent="EtherealThingBase">
+    <defName>ARA_HiveCorvetteB_Fake</defName>
+    <label>天巫种兽虫（假的）</label>
+    <thingClass>ArachnaeSwarm.FlyOver</thingClass>
+    <tickerType>Normal</tickerType>
+    <drawerType>RealtimeOnly</drawerType>
+    <graphicData>
+      <!-- <texPath>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</texPath> -->
+      <texPath>ArachnaeSwarm/FlyOverThing/ARA_HiveCorvetteB_Shadow</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>(20,30)</drawSize>
+      <color>(195,195,195,45)</color>
+    </graphicData>
+    <castEdgeShadows>false</castEdgeShadows>
+    <staticSunShadowHeight>0</staticSunShadowHeight>
+    <skyfaller>
+      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
+      <shadowSize>(0, 0)</shadowSize>
+      <motesPerCell>0</motesPerCell>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -496,8 +538,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -584,8 +626,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -647,8 +689,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
@@ -772,8 +814,8 @@
      <shadow>ArachnaeSwarm/Weapon/ARA_Weapon_Empty</shadow>
      <shadowSize>(0, 0)</shadowSize>
      <motesPerCell>0</motesPerCell>
-      <floatingSound>FlyOver/Flying</floatingSound>
-      <impactSound>FlyOver/Landing</impactSound>
+      <!-- <floatingSound>FlyOver/Flying</floatingSound> -->
+      <!-- <impactSound>FlyOver/Landing</impactSound> -->
    </skyfaller>
    <modExtensions>
      <li Class="ArachnaeSwarm.FlyOverShadowExtension">
--- a/1.6/1.6/Defs/Thing_Misc/ARA_Medicine.xml
+++ b/1.6/1.6/Defs/Thing_Misc/ARA_Medicine.xml
@@ -84,15 +84,15 @@
    <defName>ARA_SymbioticStabilizer</defName>
    <label>信息素抑制</label>
    <labelNoun>一种信息素抑制效果</labelNoun>
-    <description>阿拉克涅信息素溶剂的效果正在生效，它模拟了虫群的共生信号，抑制了体内寄生体的活性。在溶剂生效时，不会使得拟线种虫族寄生的进度超过80%。</description>
+    <description>阿拉克涅信息素溶剂的效果正在生效，它模拟了虫群的共生信号，抑制了体内寄生体的活性，不会使得拟线种虫族寄生的进度超过80%。</description>
    <hediffClass>HediffWithComps</hediffClass>
    <defaultLabelColor>(0.7, 1.0, 0.7)</defaultLabelColor>
    <isBad>false</isBad>
    <comps>
-      <li Class="HediffCompProperties_SeverityPerDay">
-        <severityPerDay>-0.34</severityPerDay> <!-- 严重性每天降低0.34，大约3天从1.0掉到0 -->
+      <!-- <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>-0.34</severityPerDay>
        <showHoursToRecover>true</showHoursToRecover>
-      </li>
+      </li> -->
    </comps>
  </HediffDef>
  
--- a/1.6/1.6/Defs/Thing_Misc/ARA_Things_Items.xml
+++ b/1.6/1.6/Defs/Thing_Misc/ARA_Things_Items.xml
@@ -19,13 +19,14 @@
    </statBases>
    <ingestible>
      <foodType>AnimalProduct</foodType>
-      <preferability>MealFine</preferability>
+      <preferability>RawTasty</preferability>
      <joy>0.04</joy>
      <joyKind>Gluttonous</joyKind>
      <ingestEffect>EatVegetarian</ingestEffect>
      <ingestSound>Meal_Eat</ingestSound>
      <lowPriorityCaravanFood>true</lowPriorityCaravanFood>
      <babiesCanIngest>true</babiesCanIngest>
+      <optimalityOffsetFeedingAnimals>-1000</optimalityOffsetFeedingAnimals>
    </ingestible>
    <thingCategories>
      <li>AnimalProductRaw</li>
--- a/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_Apparel.xml
+++ b/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_Apparel.xml
@@ -59,6 +59,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -87,6 +88,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -115,6 +117,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -143,6 +146,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -171,6 +175,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -222,8 +227,8 @@
    </graphicData>
    <apparel>
      <tags>
-        <li>Wula_Apparel</li>
-        <li>Wula_Clothes</li>
+        <li>ARA_Apparel</li>
+        <li>ARA_Clothes</li>
      </tags>
      <renderSkipFlags>
        <li>None</li>
@@ -272,6 +277,9 @@
      <texPath>ArachnaeSwarm/Apparel/ARA_Maid_Uniform</texPath>
    </graphicData>
    <apparel>
+      <tags>
+        <li>ARA_Init_Clothes</li>
+      </tags>
      <bodyPartGroups>
        <li>Torso</li>
        <li>Shoulders</li>
@@ -298,6 +306,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -318,6 +327,9 @@
      <texPath>ArachnaeSwarm/Apparel/ARA_Maid_Dress</texPath>
    </graphicData>
    <apparel>
+      <tags>
+        <li>ARA_Init_Clothes</li>
+      </tags>
      <bodyPartGroups>
        <li>Torso</li>
        <li>Shoulders</li>
@@ -344,6 +356,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -364,6 +377,9 @@
      <texPath>ArachnaeSwarm/Apparel/ARA_Daily_Wear</texPath>
    </graphicData>
    <apparel>
+      <tags>
+        <li>ARA_Init_Clothes</li>
+      </tags>
      <bodyPartGroups>
        <li>Torso</li>
        <li>Shoulders</li>
@@ -390,6 +406,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -437,6 +454,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -486,6 +504,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -535,6 +554,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -582,6 +602,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_ApparelInterceptor">
@@ -659,6 +680,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -708,6 +730,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
--- a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml
+++ b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml
@@ -6,7 +6,7 @@
    <label>武装器官"骨刃"</label>
    <description>阿拉克涅虫群督虫使用基础近战武装器官，通过多根外露神经束与督虫的辅肢相连。尽管它只是一块坚硬的剑形骨片，但是丝毫不影响那些拥有无穷蛮力的阿拉克涅虫群督虫使用它将侵犯虫巢之敌一一斩首。</description>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Melee</li>
      <li>ARA_Armed_Organ_T1</li>
      <li>ARA_MW_Bone_Sword</li>
@@ -71,6 +71,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -80,7 +81,7 @@
    <label>武装器官"软骨鞭"</label>
    <description>阿拉克涅虫群督虫使用的近战武装器官，以节节软骨交错形成强韧的鞭子。这种武器在打击敌人时不仅会发出骇人的声响，还会使得对手疼痛难忍，并且以击打为主的钝器伤害也能很好地规避敌方装甲的防御。</description>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Melee</li>
      <li>ARA_Armed_Organ_T2</li>
    </weaponTags>
@@ -100,7 +101,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <statBases>
-      <MarketValue>250</MarketValue>
+      <MarketValue>700</MarketValue>
      <WorkToMake>1000</WorkToMake>
      <Mass>5</Mass>
      <ARA_IncubationCost>120</ARA_IncubationCost>
@@ -137,6 +138,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
    </comps>
@@ -163,7 +165,7 @@
    <label>武装器官"镰爪"</label>
    <description>阿拉克涅虫群督虫使用的近战武装器官，状似一柄巨型镰刀，可以和辅肢通过神经束进行连接。得益于其巨大的体积，其每次挥击将造成范围性的伤害，一次性可以击倒多个相邻目标。</description>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Melee</li>
      <li>ARA_Armed_Organ_T3</li>
    </weaponTags>
@@ -183,7 +185,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <statBases>
-      <MarketValue>350</MarketValue>
+      <MarketValue>1200</MarketValue>
      <WorkToMake>3000</WorkToMake>
      <Mass>5</Mass>
      <ARA_IncubationCost>350</ARA_IncubationCost>
@@ -212,6 +214,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_Cleave">
@@ -295,6 +298,9 @@
      <ARA_Carapace>25</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
+      <li>ARA_Armed_Organ_Base</li>
+      <li>ARA_Armed_Organ_Ranged</li>
+      <li>ARA_Armed_Organ_T1</li>
      <li>ARA_Armed_Organ_Small_Ranged_Needle</li>
    </weaponTags>
    <generateCommonality>0.01</generateCommonality>
@@ -321,6 +327,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -402,7 +409,7 @@
      <ARA_Carapace>25</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Small_Ranged_Needle</li>
@@ -414,6 +421,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -459,7 +467,7 @@
    <soundInteract>SpitterSpawn</soundInteract>
    <recipeMaker>
      <recipeUsers Inherit="False" />
-      <researchPrerequisite>ARA_Technology_6PAV</researchPrerequisite>
+      <researchPrerequisite>ARA_Technology_1STG_T</researchPrerequisite>
      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
    </recipeMaker>
    <statBases>
@@ -495,7 +503,7 @@
      <ARA_Carapace>25</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Small_Ranged_Needle</li>
@@ -507,6 +515,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -615,7 +624,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Huge</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Huge_Ranged_Needle</li>
@@ -627,6 +636,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_GiveHediffOnShot">
@@ -695,7 +705,7 @@
    <soundInteract>SpitterSpawn</soundInteract>
    <recipeMaker>
      <recipeUsers Inherit="False" />
-      <researchPrerequisite>ARA_Technology_7XPAV</researchPrerequisite>
+      <researchPrerequisite>ARA_Technology_3XPV_T</researchPrerequisite>
      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
    </recipeMaker>
    <statBases>
@@ -729,7 +739,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Small_Ranged_Needle</li>
@@ -741,6 +751,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -827,7 +838,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T1</li>
      <li>ARA_Armed_Organ_Small_Ranged_Acid</li>
@@ -839,6 +850,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -938,8 +950,8 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
      <li>ARA_Armed_Organ_Ranged</li>
+      <li>ARA_Armed_Organ_Huge</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Huge_Ranged_Acid</li>
    </weaponTags>
@@ -950,6 +962,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -1083,8 +1096,8 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
      <li>ARA_Armed_Organ_Ranged</li>
+      <li>ARA_Armed_Organ_Huge</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Huge_Ranged_Acid</li>
    </weaponTags>
@@ -1095,6 +1108,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -1197,7 +1211,7 @@
      <ARA_Carapace>25</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T3</li>
      <li>ARA_Armed_Organ_Small_Ranged_Acid</li>
@@ -1209,6 +1223,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -1326,8 +1341,8 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
      <li>ARA_Armed_Organ_Ranged</li>
+      <li>ARA_Armed_Organ_Huge</li>
      <li>ARA_Armed_Organ_T3</li>
      <li>ARA_Armed_Organ_Huge_Ranged_Acid</li>
    </weaponTags>
@@ -1338,6 +1353,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -1457,9 +1473,9 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Base</li>
      <li>ARA_Armed_Organ_Ranged</li>
-      <li>ARA_Armed_Organ_T1</li>
+      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Small_Ranged_SP</li>
    </weaponTags>
    <generateCommonality>0.01</generateCommonality>
@@ -1469,6 +1485,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -1610,8 +1627,8 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
      <li>ARA_Armed_Organ_Ranged</li>
+      <li>ARA_Armed_Organ_Huge</li>
      <li>ARA_Armed_Organ_T2</li>
      <li>ARA_Armed_Organ_Huge_Ranged_Energy</li>
    </weaponTags>
@@ -1622,6 +1639,7 @@
      <li Class="ArachnaeSwarm.CompProperties_ExtraIncubationInfo">
        <cocoonDefs>
          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </cocoonDefs>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_CustomUniqueWeapon" MayRequire="Ludeon.RimWorld.Odyssey">
@@ -2049,7 +2067,7 @@
    </graphicData>
    <projectile>
      <speed>41</speed>
-      <spawnsPawnKind>ArachnaeBase_Race_Acidcut</spawnsPawnKind>
+      <spawnsPawnKind>ArachnaeBase_Race_Acidcut_Fastdie</spawnsPawnKind>
      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
      <damageDef>ARA_AcidBurn</damageDef>
      <damageAmountBase>10</damageAmountBase>
@@ -2098,7 +2116,7 @@
    </graphicData>
    <projectile>
      <speed>41</speed>
-      <spawnsPawnKind>ArachnaeBase_Race_Skyhive</spawnsPawnKind>
+      <spawnsPawnKind>ArachnaeBase_Race_Skyhive_Fastdie</spawnsPawnKind>
      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
    </projectile>
  </ThingDef>
@@ -2140,7 +2158,7 @@
    <label>阿拉克涅磁暴种</label>
    <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
    <graphicData>
-      <texPath>ArachnaeSwarm/Things/ARA_Acidling/BodiesEmp/Naked_Thin_north</texPath>
+      <texPath>ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_north</texPath>
      <graphicClass>Graphic_Single</graphicClass>
    </graphicData>
    <projectile>
@@ -2206,7 +2224,7 @@
      <ARA_Carapace>50</ARA_Carapace>
    </costList>
    <weaponTags Inherit="False">
-      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_SP</li>
      <li>ARA_Armed_Organ_Ranged</li>
      <li>ARA_Armed_Organ_T2</li>
    </weaponTags>
--- a/1.6/1.6/Defs/Thing_Plant/ARA_Plant.xml
+++ b/1.6/1.6/Defs/Thing_Plant/ARA_Plant.xml
@@ -96,7 +96,7 @@
    </modExtensions>
  </ThingDef>
  <ThingDef ParentName="PlantBase">
-    <defName>ARA_AcidlingTrapPlant</defName>
+    <defName>ARA_BanelingTrapPlant</defName>
    <label>爆裂巢花</label>
    <thingClass>ArachnaeSwarm.Plant_Transforming</thingClass>
    <description>一种由阿拉克涅虫群培育的真菌混合体，它会汲取菌毯的营养，在生长到一定阶段后进行变态发育，最终转换成一枚阿拉克涅爆裂茧——一种会对附近的敌军释放自杀性辅虫的特殊陷阱。</description>
@@ -107,7 +107,7 @@
      <Nutrition>0.2</Nutrition>
    </statBases>
    <graphicData>
-      <texPath>ArachnaeSwarm/Plant/ARA_AcidlingTrapPlant</texPath>
+      <texPath>ArachnaeSwarm/Plant/ARA_BanelingTrapPlant</texPath>
      <graphicClass>Graphic_Single</graphicClass>
    </graphicData>
    <selectable>true</selectable>
@@ -132,7 +132,7 @@
    </plant>
    <modExtensions>
      <li Class="ArachnaeSwarm.PlantTransformExtension">
-        <buildingDef>Arachnae_AcidlingTrap</buildingDef>
+        <buildingDef>Arachnae_BanelingTrap</buildingDef>
        <transformAtGrowth>0.8</transformAtGrowth>
      </li>
    </modExtensions>
--- a/1.6/1.6/Defs/Thing_building/ARA_Building.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Building.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
  <TerrainDef ParentName="FloorBase">
    <defName>ARA_InsectCreep</defName>
@@ -10,7 +10,7 @@
    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughSoftLight</pollutionShaderType>
    <pollutionTintColor>(0.95, 0.95, 0.93, 1)</pollutionTintColor>
    <pollutionColor>(240,240,240)</pollutionColor>
-    <terrainAffordanceNeeded IsNull="True" Inherit="False"/>
+    <terrainAffordanceNeeded IsNull="True" Inherit="False" />
    <color>(209, 207, 184)</color>
    <edgeType>FadeRough</edgeType>
    <resourcesFractionWhenDeconstructed>0</resourcesFractionWhenDeconstructed>
@@ -52,6 +52,54 @@
      <li>Insect</li>
    </tags> -->
  </TerrainDef>
+  <TerrainDef ParentName="FloorBase" MayRequire="Ludeon.RimWorld.Odyssey">
+    <defName>ARA_InsectCreepFloor</defName>
+    <label>阿拉克涅强固菌毯</label>
+    <description>由阿拉克涅虫族所铺设的由真菌、甲壳素分泌物混合得到的地面，性质类似于阿拉克涅菌毯，不过可以在支撑结构上蔓延，以作为虫群的逆重飞船地基。</description>
+    <texturePath>ArachnaeSwarm/Terrain/Surfaces/ARA_InsectCreep</texturePath>
+    <pollutionTintColor>(0.95, 0.95, 0.93, 1)</pollutionTintColor>
+    <color>(209, 207, 184)</color>
+    <fertility>0</fertility>
+    <edgeType>FadeRough</edgeType>
+    <renderPrecedence>399</renderPrecedence>
+    <constructEffect>ConstructMetal</constructEffect>
+    <isPaintable>true</isPaintable>
+    <designationCategory>ARA_Buildings</designationCategory>
+    <isFoundation>true</isFoundation>
+    <preventCraters>true</preventCraters>
+    <designationHotKey>Misc9</designationHotKey>
+    <researchPrerequisites>
+      <li>ARA_Base_Technology</li>
+    </researchPrerequisites>
+    <affordances>
+      <li>ARA_Creep</li>
+      <li>Substructure</li>
+    </affordances>
+    <statBases>
+      <Beauty>0</Beauty>
+      <CleaningTimeFactor>0.25</CleaningTimeFactor>
+      <Cleanliness>0</Cleanliness>
+      <Flammability>0</Flammability>
+      <WorkToBuild>100</WorkToBuild>
+    </statBases>
+    <costList>
+      <GravlitePanel>1</GravlitePanel>
+      <Steel>2</Steel>
+      <ARA_Carapace>2</ARA_Carapace>
+    </costList>
+    <uiOrder>1000</uiOrder>
+    <requireInspectedGravEngine>true</requireInspectedGravEngine>
+    <terrainAffordanceNeeded>Walkable</terrainAffordanceNeeded>
+    <resourcesFractionWhenDeconstructed>1</resourcesFractionWhenDeconstructed>
+    <tags>
+      <li>ARA_Creep</li>
+      <li>Substructure</li>
+    </tags>
+    <placeWorkers>
+      <li>PlaceWorker_InSubstructureFootprint</li>
+      <li>PlaceWorker_BuildingsValidOverSubstructure</li>
+    </placeWorkers>
+  </TerrainDef>
  <TerrainDef ParentName="FloorBase">
    <defName>ARA_InsectCreepTile</defName>
    <label>阿拉克涅菌毯砖</label>
@@ -60,7 +108,7 @@
    <texturePath>ArachnaeSwarm/Terrain/Surfaces/ARA_InsectCreepTile</texturePath>
    <pollutionOverlayTexturePath>Terrain/Surfaces/AncientMegastructure</pollutionOverlayTexturePath>
    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughSoftLight</pollutionShaderType>
-    <terrainAffordanceNeeded IsNull="True" Inherit="False"/>
+    <terrainAffordanceNeeded IsNull="True" Inherit="False" />
    <pollutionTintColor>(0.95, 0.95, 0.93, 1)</pollutionTintColor>
    <pollutionColor>(240,240,240)</pollutionColor>
    <color>(209, 207, 184)</color>
@@ -94,7 +142,6 @@
      <li>ARA_Creep</li>
    </tags>
  </TerrainDef>
-
  <ThingDef ParentName="Wall">
    <defName>ARA_InsectWall</defName>
    <label>阿拉克涅甲壳墙</label>
@@ -170,7 +217,7 @@
    <label>光滑的阿拉克涅甲壳墙</label>
    <description>阿拉克涅工蜂将硬质材料和甲壳素混合堆起来形成的墙壁，虫族对这片墙壁进行了精心打磨，质地坚硬的同时看起来美观多了。</description>
    <uiIconPath>Things/Building/Linked/WallSmooth_MenuIcon</uiIconPath>
-    <designationCategory IsNull="True" Inherit="False"/>
+    <designationCategory IsNull="True" Inherit="False" />
    <graphicData>
      <texPath>Things/Building/Linked/RockSmooth_Atlas</texPath>
      <graphicClass>Graphic_Single</graphicClass>
@@ -303,9 +350,7 @@
      <soundDoorCloseManual>Door_CloseManual</soundDoorCloseManual>
      <blueprintClass>Blueprint_Build</blueprintClass>
      <ai_chillDestination>false</ai_chillDestination>
-
      <smoothedThing>ARA_SmoothedInsectDoor</smoothedThing>
-
      <isSupportDoor>true</isSupportDoor>
      <blueprintGraphicData>
        <texPath>ArachnaeSwarm/Building/Door/ARA_InsectDoor_BluePrint</texPath>
@@ -348,7 +393,7 @@
    <altitudeLayer>DoorMoveable</altitudeLayer>
    <fillPercent>1</fillPercent>
    <useHitPoints>true</useHitPoints>
-    <designationCategory IsNull="True" Inherit="False"/>
+    <designationCategory IsNull="True" Inherit="False" />
    <graphicData>
      <texPath>ArachnaeSwarm/Building/Door/ARA_InsectDoor</texPath>
      <graphicClass>Graphic_Multi</graphicClass>
@@ -418,7 +463,6 @@
      <soundDoorCloseManual>Door_CloseManual</soundDoorCloseManual>
      <blueprintClass>Blueprint_Build</blueprintClass>
      <ai_chillDestination>false</ai_chillDestination>
-
      <isSupportDoor>true</isSupportDoor>
      <blueprintGraphicData>
        <texPath>ArachnaeSwarm/Building/Door/ARA_InsectDoor_BluePrint</texPath>
@@ -452,7 +496,6 @@
      </li>
    </comps>
  </ThingDef>
-
  <ThingDef ParentName="BuildingNaturalBase">
    <defName>ARA_Tumor</defName>
    <label>阿拉克涅菌瘤</label>
@@ -573,7 +616,6 @@
    but it matches in this case-->
    <specialDisplayRadius>5.8</specialDisplayRadius>
  </ThingDef>
-
  <ThingDef ParentName="BasicBedBase">
    <defName>ARA_NodeNest</defName>
    <thingClass>Building_Bed</thingClass>
@@ -627,27 +669,17 @@
        <li>ARA_InsectCreep</li>
      </relatedTerrain>
    </building>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
-    </comps>
  </ThingDef>
-
  <ThingDef ParentName="BenchBase">
    <defName>ARA_ResearchBench</defName>
    <label>阿拉克涅研究台</label>
    <description>一个供阿拉克涅虫族进行研究的活体结构，可以让虫群尽情地探索变异和进化方向。</description>
    <thingClass>Building_ResearchBench</thingClass>
    <size>(3,3)</size>
-    <stuffCategories Inherit="False"/>
+    <stuffCategories Inherit="False" />
    <costStuffCount>0</costStuffCount>
-    <minifiedDef Inherit="False"/>
-    <thingCategories Inherit="False"/>
+    <minifiedDef Inherit="False" />
+    <thingCategories Inherit="False" />
    <defaultPlacingRot>South</defaultPlacingRot>
    <costList>
      <ARA_Carapace>50</ARA_Carapace>
@@ -706,11 +738,10 @@
      </li>
    </comps>
  </ThingDef>
-  
  <ThingDef ParentName="BuildingBase">
    <defName>ARA_SmartThermostat</defName>
    <label>阿拉克涅纤管种</label>
-    <description>一只只有基础反射反应的阿拉克涅辅虫，它会尝试将通过气体交换，维持尾部所向的房间的温度。必须像制冷器一样安装在墙上。</description>
+    <description>一只只有基础反射反应的阿拉克涅辅虫，它会尝试将通过气体交换，维持尾部所向的房间的温度。必须像制冷器一样安装在墙上。（尖头朝外，圆头朝内）</description>
    <thingClass>ArachnaeSwarm.Building_SmartThermostat</thingClass>
    <uiIconPath>ArachnaeSwarm/Building/ARA_SmartThermostat_south</uiIconPath>
    <tickerType>Rare</tickerType>
@@ -777,9 +808,15 @@
        <!-- 这是设备的热交换功率。数值越大，制冷/制热速度越快。-->
        <energyPerSecond>25</energyPerSecond>
      </li>
+      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
+        <maxMaintenance>100</maxMaintenance>
+        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
+        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
+        <warningThreshold>0.2</warningThreshold>
+        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
+      </li>
    </comps>
  </ThingDef>
-
  <ThingDef ParentName="TableGatherSpotBase">
    <defName>ARA_Table1x2c</defName>
    <label>阿拉克涅桌 (1x2)</label>
@@ -826,13 +863,6 @@
      </relatedTerrain>
    </building>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Glower">
        <glowRadius>3</glowRadius>
        <glowColor>(220,210,171,0)</glowColor>
@@ -897,13 +927,6 @@
      </relatedTerrain>
    </building>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Glower">
        <glowRadius>3</glowRadius>
        <glowColor>(220,210,171,0)</glowColor>
@@ -947,7 +970,7 @@
    <researchPrerequisites>
      <li>ARA_Base_Technology</li>
    </researchPrerequisites>
-    <stuffCategories Inherit="False"/>
+    <stuffCategories Inherit="False" />
    <costStuffCount>10</costStuffCount>
    <stuffCategories Inherit="False">
      <li>Woody</li>
@@ -961,7 +984,8 @@
    <canOverlapZones>false</canOverlapZones>
    <rotatable>false</rotatable>
    <fertility>0</fertility>
-    <specialDisplayRadius>6.9</specialDisplayRadius> <!-- must be kept in sync with roof hold-up radius -->
+    <specialDisplayRadius>6.9</specialDisplayRadius>
+    <!-- must be kept in sync with roof hold-up radius -->
    <building>
      <isInert>true</isInert>
      <ai_chillDestination>false</ai_chillDestination>
@@ -974,20 +998,12 @@
      <li>PlaceWorker_GlowRadius</li>
    </placeWorkers>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Glower">
        <glowRadius>7</glowRadius>
        <glowColor>(220,210,171,0)</glowColor>
      </li>
    </comps>
  </ThingDef>
-
  <ThingDef ParentName="StorageShelfBase">
    <defName>ARA_Shelf</defName>
    <label>虫群储物点</label>
@@ -1002,7 +1018,7 @@
    </graphicData>
    <staticSunShadowHeight>0</staticSunShadowHeight>
    <useHitPoints>false</useHitPoints>
-    <stuffCategories Inherit="False"/>
+    <stuffCategories Inherit="False" />
    <costStuffCount>30</costStuffCount>
    <stuffCategories Inherit="False">
      <li>Woody</li>
@@ -1032,7 +1048,7 @@
    </inspectorTabs> -->
    <surfaceType>Item</surfaceType>
    <canOverlapZones>false</canOverlapZones>
-    <defaultPlacingRot Inherit="False"/>
+    <defaultPlacingRot Inherit="False" />
    <designationCategory>ARA_Buildings</designationCategory>
    <building>
      <storageGroupTag>Shelf</storageGroupTag>
@@ -1074,7 +1090,6 @@
      </relatedTerrain>
    </building>
  </ThingDef>
-
  <ThingDef ParentName="BenchBase">
    <defName>ARA_SkillTraining_Building</defName>
    <label>虫爬架</label>
@@ -1136,20 +1151,12 @@
      </relatedTerrain>
    </building>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Glower">
        <glowRadius>4</glowRadius>
        <glowColor>(220,210,171,0)</glowColor>
      </li>
    </comps>
  </ThingDef>
-
  <ThingDef ParentName="BuildingBase">
    <defName>ARA_Hibernate_Sac</defName>
    <!-- <hasInteractionCell>true</hasInteractionCell>
@@ -1158,7 +1165,8 @@
    <description>阿拉克涅虫族进入休眠状态形成的活体组织。</description>
    <!-- <thingClass>ArachnaeSwarm.Building_Morphable</thingClass> -->
    <tickerType>Normal</tickerType>
-    <drawerType>RealtimeOnly</drawerType> <!-- ADDED: Force realtime rendering -->
+    <drawerType>RealtimeOnly</drawerType>
+    <!-- ADDED: Force realtime rendering -->
    <size>(1,1)</size>
    <graphicData>
      <texPath>ArachnaeSwarm/Building/ARA_Hibernate_Sac</texPath>
@@ -1188,23 +1196,13 @@
    </building>
    <!-- 不可建造，只能通过变形生成 -->
    <comps Inherit="False">
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_Morphable">
        <!-- 休息速度增益，例如1.0代表200%的速度 -->
        <restGainMultiplier>1.0</restGainMultiplier>
-
        <!-- 操作按钮的自定义标签 -->
        <gizmoLabel>解除休眠</gizmoLabel>
-
        <!-- 操作按钮的自定义描述 -->
        <gizmoDesc>离开休眠状态，饥饿条和睡眠条将清空。</gizmoDesc>
-
        <gizmoIconPath>ArachnaeSwarm/UI/Abilities/ARA_Hibernate_Ability</gizmoIconPath>
      </li>
    </comps>
--- a/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml
@@ -94,6 +94,7 @@
    <defName>ARA_InteractiveEggSac_Queen</defName>
    <label>阿拉克涅女皇种卵囊</label>
    <description>用于孵化阿拉克涅女皇种的超巨型卵囊，表皮坚硬地堪比堡垒，内部蕴含的遗传物质和营养足以孵化出这个星球闻所未闻的庞然大物。</description>
+    <minifiedDef>ARA_Minified_InteractiveEggSac_Queen</minifiedDef>
    <descriptionHyperlinks>
      <ThingDef>ArachnaeQueen_Race</ThingDef>
    </descriptionHyperlinks>
@@ -126,13 +127,18 @@
          <li>
            <pawnKind>ARA_ArachnaeQueen</pawnKind>
            <delayTicks>180000</delayTicks>
+            <completeResearchOnFinish>ARA_Titan_Base_Technology</completeResearchOnFinish>
          </li>
        </spawnablePawns>
        <!-- <whitelist>
-          <li>ARA_ArachnaeQueen</li>
+          <li>ArachnaeQueen_Race</li>
        </whitelist> -->
        <destroyOnSpawn>true</destroyOnSpawn>
      </li>
    </comps>
  </ThingDef>
+  <ThingDef ParentName="MinifiedThing">
+    <defName>ARA_Minified_InteractiveEggSac_Queen</defName>
+    <thingClass>ArachnaeSwarm.Event.MinifiedThing_QueenEggSac</thingClass>
+  </ThingDef>
 </Defs>
--- a/1.6/1.6/Defs/Thing_building/ARA_NutrientNetworkBuilding.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_NutrientNetworkBuilding.xml
@@ -57,9 +57,13 @@
          <li>ARA_MorphableResearchBench</li>
          <li>ARANutrientDispenser</li>
          <li>ARA_WormholePortal_A</li>
-          <li>ARA_Acidling_AutoMortar</li>
+          <li>ARA_Baneling_AutoMortar</li>
          <li>CatastropheMissileSilo</li>
          <li>ARA_AutoSniperCannon</li>
+          <li>ARA_Pawn_Ootheca</li>
+          <li>ARA_Equipment_Ootheca</li>
+          <li>ARA_BioforgeIncubator</li>
+          <li>ARA_BioforgeIncubator_Thing</li>
        </linkableBuildings>
        <maxDistance>80</maxDistance>        <!-- 供能范围 -->
        <maxSimultaneous>10</maxSimultaneous>
@@ -136,6 +140,13 @@
    <tickerType>Normal</tickerType>
    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
+        <maxMaintenance>100</maxMaintenance>
+        <maintenanceDecayPerDay>15</maintenanceDecayPerDay>
+        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
+        <warningThreshold>0.2</warningThreshold>
+        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
+      </li>
      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
        <fuelCapacity>10.0</fuelCapacity>
        <fuelFilter>
@@ -269,7 +280,7 @@
  <ThingDef ParentName="BuildingBase">
    <defName>ARA_JellyVat</defName>    <!-- defName is changed to reflect its purpose -->
    <label>生物质酿造池</label>
-    <description>一个阿拉克涅虫族活体组织，可以充分利用活体钜菌的溶解能力，通过消化生物质，来分泌出营养丰富的阿拉克涅虫蜜。阿拉克涅虫蜜会在房间内蔓延，形成蜜池，而生物质酿造池会定期标记这些流淌的蜜浆，命令其他虫族来收集它们。</description>
+    <description>一个阿拉克涅虫族活体组织，可以充分利用活体钜菌的溶解能力，通过消化生物质，来分泌出营养丰富的阿拉克涅虫蜜。</description>
    <thingClass>Building</thingClass>
    <graphicData>
      <texPath>ArachnaeSwarm/Building/ARA_JellyVat</texPath>
@@ -323,7 +334,7 @@
    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
    <comps>
      <li Class="CompProperties_Flickable"/>
-      
+
      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
        <maxMaintenance>100</maxMaintenance>
        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
@@ -331,41 +342,20 @@
        <warningThreshold>0.2</warningThreshold>
        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
      </li>
-      
-      <!-- 地形改变组件 -->
-      <li Class="ArachnaeSwarm.CompProperties_TerrainChanger">
-        <targetTerrain>ARA_InsectJelly_Terrain</targetTerrain>
-        <baseChangeInterval>600</baseChangeInterval> <!-- 2天 -->
-        <requiresFuel>true</requiresFuel>
-        <fuelConsumptionPerChange>1</fuelConsumptionPerChange>
-        <minFuelToOperate>1</minFuelToOperate>
-        <changeRadius>10</changeRadius>
-        <onlyInSameRoom>true</onlyInSameRoom>
-        <prioritizeClosest>true</prioritizeClosest>
-        <requiresPower>false</requiresPower>
-        <poweredWorkSpeedMultiplier>1</poweredWorkSpeedMultiplier>
-        
-        <!-- 自动标记拆除功能 -->
-        <enableAutoMarkForRemoval>true</enableAutoMarkForRemoval>
-        <markRemovalInterval>600</markRemovalInterval> <!-- 4天 -->
-        <markRemovalRadius>10</markRemovalRadius>
-        <fuelConsumptionPerMark>0</fuelConsumptionPerMark>
+      <!--<li Class="ArachnaeSwarm.CompProperties_MultiFuelSpawner">
+        <spawnIntervalRange>
+          <min>120000</min>
+          <max>120000</max>
+        </spawnIntervalRange>
+        <products>
+          <li>
+            <thingDef>ARA_InsectJelly</thingDef>
+            <count>60</count>
+          </li>
+        </products>
+        <showMessageIfOwned>true</showMessageIfOwned>
+      </li>-->

-        <!-- 只将这些地形转换为营养液 -->
-        <!-- <acceptedTerrains>
-          <li>TileSandstone</li>
-          <li>TileGranite</li>
-          <li>TileLimestone</li>
-          <li>TileMarble</li>
-          <li>TileSlate</li>
-        </acceptedTerrains> -->
-        
-        <!-- 视觉效果 -->
-        <showVisualEffects>true</showVisualEffects>
-        <!-- <workingEffecter>Spraying_Nutrient</workingEffecter> -->
-        <!-- <workingSound>AcidSpray_Resolve</workingSound> -->
-        <completionSound>AcidSpray_Resolve</completionSound>
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition_WithKey">
        <saveKeysPrefix>Biomass</saveKeysPrefix>
        <fuelLabel>生物质</fuelLabel>
@@ -387,6 +377,43 @@
        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
        <showAllowAutoRefuelToggle>false</showAllowAutoRefuelToggle>
      </li>
+      <li Class="ArachnaeSwarm.CompProperties_NutritionToFuelConverter">
+        <checkInterval>200</checkInterval>
+        <nutritionCost>0.25</nutritionCost>
+        <workAmount>500</workAmount>
+        <fuelAmount>1</fuelAmount>
+      </li>
+
+      <li Class="ArachnaeSwarm.CompProperties_ProductStorage">
+        <fuelLabel>虫蜜</fuelLabel>
+        <fuelGizmoLabel>虫蜜</fuelGizmoLabel>
+
+        <fuelCapacity>25</fuelCapacity>
+        <fuelConsumptionRate>0</fuelConsumptionRate>
+        <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
+
+        <fuelFilter>
+          <thingDefs>
+            <li>ARA_InsectJelly</li>
+          </thingDefs>
+        </fuelFilter>
+
+        <allowRefuelIfNotEmpty>false</allowRefuelIfNotEmpty>
+        <drawFuelGaugeInMap>false</drawFuelGaugeInMap>
+        <drawOutOfFuelOverlay>false</drawOutOfFuelOverlay>
+        <targetFuelLevelConfigurable>false</targetFuelLevelConfigurable>
+        <showAllowAutoRefuelToggle>false</showAllowAutoRefuelToggle>
+        <canEjectFuel>true</canEjectFuel>
+      </li>
+
+      <!-- 燃料满了自动弹出 -->
+      <li Class="ArachnaeSwarm.CompProperties_AutoEjector">
+        <checkInterval>60</checkInterval>
+        <ejectAtPercent>0.99</ejectAtPercent>
+        <allowEjectedFuel>true</allowEjectedFuel>
+        <monitorProductStorage>true</monitorProductStorage>
+        <monitorRefuelable>false</monitorRefuelable>
+      </li>
    </comps>
  </ThingDef>
  <TerrainDef ParentName="FloorBase">
@@ -574,6 +601,7 @@
      <ARA_Carapace>20</ARA_Carapace>
    </costList>
    <holdsRoof>true</holdsRoof>
+    <canOverlapZones>true</canOverlapZones>
    <rotatable>false</rotatable>
    <fertility>0</fertility>
    <building>
--- a/1.6/1.6/Defs/Thing_building/ARA_Ootheca.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Ootheca.xml
@@ -1,41 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <TerrainDef>
+  <TerrainDef ParentName="FloorBase">
    <defName>ARA_Incubator_Nutrient_Solution</defName>
    <label>阿拉克涅营养液</label>
-    <description>阿拉克涅虫族孵化池的营养液，卵和茧都需要这种富含多种营养成分的液体以维系孵化进度。茧在孵化过程中会消耗营养液，必须有虫族定时重新填充营养液。</description>
-    <renderPrecedence>395</renderPrecedence>
+    <description>阿拉克涅虫族孵化池的营养液，卵和茧都需要这种富含多种营养成分的液体以维系孵化进度。</description>
+    <renderPrecedence>250</renderPrecedence>
    <texturePath>Terrain/Surfaces/WaterShallowRamp</texturePath>
    <pollutedTexturePath>Terrain/Surfaces/WaterShallowRampPolluted</pollutedTexturePath>
    <pollutionTintColor>(0.95, 0.95, 0.93, 1)</pollutionTintColor>
    <pollutionColor>(240,240,240)</pollutionColor>
    <color>(221, 224, 201)</color>
-    <forcePassableByFlyingPawns>true</forcePassableByFlyingPawns>
-    <gravshipReplacementTerrain>WaterShallow</gravshipReplacementTerrain>
-    <waterDepthShader>Map/WaterDepth</waterDepthShader>
-    <passability>Standable</passability>
-    <pathCost>5</pathCost>
-    <changeable>false</changeable>
-    <canFreeze>false</canFreeze>
-    <waterBodyType>Freshwater</waterBodyType>
-    <edgeType>Water</edgeType>
-    <fertility>0</fertility>
-    <natural>true</natural>
+    <burnedDef>ARA_InsectCreep</burnedDef>
+    <designationCategory IsNull="True" Inherit="False"/>
+    <pollutionOverlayTexturePath>Terrain/Surfaces/AncientMegastructure</pollutionOverlayTexturePath>
+    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughSoftLight</pollutionShaderType>
+    <statBases>
+      <WorkToBuild>85</WorkToBuild>
+      <Flammability>0.22</Flammability>
+    </statBases>
+    <costList>
+      <ARA_InsectJelly>2</ARA_InsectJelly>
+    </costList>
    <avoidWander>true</avoidWander>
+    <waterBodyType>Freshwater</waterBodyType>
+    <waterDepthShader>Map/WaterDepth</waterDepthShader>
+    <pathCost>5</pathCost>
+    <edgeType>Water</edgeType>
+    <categoryType>Misc</categoryType>
+    <renderPrecedence>390</renderPrecedence>
+    <takeFootprints>false</takeFootprints>
+    <fertility>1</fertility>
    <holdSnowOrSand>false</holdSnowOrSand>
-    <takeSplashes>true</takeSplashes>
-    <extinguishesFire>true</extinguishesFire>
-    <extraDeteriorationFactor>3</extraDeteriorationFactor>
-    <traversedThought>SoakingWet</traversedThought>
-    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainWaterPolluted</pollutionShaderType>
-    <pollutionOverlayTexturePath>Terrain/Surfaces/MarshPollutionOverlay</pollutionOverlayTexturePath>
+    <supportsRock>false</supportsRock>
+    <filthAcceptanceMask Inherit="False">
+      <li>None</li>
+    </filthAcceptanceMask>
    <designationCategory>ARA_Buildings</designationCategory>
    <researchPrerequisites>
      <li>ARA_Technology_2HAG</li>
    </researchPrerequisites>
-    <filthAcceptanceMask>
-      <li>None</li>
-    </filthAcceptanceMask>
    <affordances>
      <li>ShallowWater</li>
      <li>WaterproofConduitable</li>
@@ -58,7 +61,7 @@
    </tools>
    <costList>
      <ARA_InsectJelly>10</ARA_InsectJelly>
-      <ARA_Gene_Essence>3</ARA_Gene_Essence>
+      <ARA_Gene_Essence>1</ARA_Gene_Essence>
    </costList>
  </TerrainDef>

@@ -111,52 +114,12 @@
      <workTableRoomRole>ARA_Incubator_Room</workTableRoomRole>
    </building>

-    <!-- 添加 ModExtension 配置 -->
-    <modExtensions>
-      <li Class="ArachnaeSwarm.OothecaIncubatorExtension">
-        <!-- 营养液检测半径 -->
-        <nutrientSolutionRadius>5</nutrientSolutionRadius>
-        <!-- 其他卵距离检测半径 -->
-        <nearbyOothecaRadius>5</nearbyOothecaRadius>
-        <!-- 是否检查同房间内的其他卵 -->
-        <checkSameRoomForOotheca>false</checkSameRoomForOotheca>
-        <!-- 营养液加成比例 -->
-        <!-- <nutrientSolutionBonusPerTile>0.015</nutrientSolutionBonusPerTile> -->
-        <!-- 附近其他卵的惩罚比例 -->
-        <!-- <nearbyOothecaPenaltyPerUnit>0.08</nearbyOothecaPenaltyPerUnit> -->
-        <!-- 幼虫搜索半径 -->
-        <!-- <larvaSearchRadius>30</larvaSearchRadius> -->
-        <!-- 是否需要在孵化间内才能正常工作 -->
-        <!-- <requiresIncubatorRoom>true</requiresIncubatorRoom> -->
-        <!-- 不在孵化间内的速度惩罚 -->
-        <!-- <speedPenaltyOutsideIncubator>0.7</speedPenaltyOutsideIncubator> -->
-        <!-- 质量因子房间检查 -->
-        <!-- <useRoomQualityFactor>true</useRoomQualityFactor> -->
-        <!-- 建筑血量影响质量 -->
-        <!-- <healthAffectsQuality>true</healthAffectsQuality> -->
-
-        <!-- 新增营养液不足伤害设置 -->
-        <nutrientDeficiencyDamageEnabled>true</nutrientDeficiencyDamageEnabled>
-        <nutrientDeficiencyDamageAmount>2</nutrientDeficiencyDamageAmount>
-        <nutrientDamageType>Burn</nutrientDamageType>
-        <stopIncubationWhenNutrientDeficient>true</stopIncubationWhenNutrientDeficient>
-        <!-- <showDamageMessages>true</showDamageMessages>
-        <damageMessageChance>0.1</damageMessageChance> -->
-      </li>
-    </modExtensions>
-
-    <!-- ITab配置 -->
-    <inspectorTabs>
-      <li>ArachnaeSwarm.ITab_Ootheca_Incubation</li>
-    </inspectorTabs>
-
    <costList>
-      <ARA_InsectJelly>25</ARA_InsectJelly>
+      <ARA_InsectJelly>50</ARA_InsectJelly>
+      <ARA_Gene_Essence>1</ARA_Gene_Essence>
    </costList>

-    <placeWorkers>
-      <li>ArachnaeSwarm.PlaceWorker_CustomRadius</li>
-    </placeWorkers>
+
    <comps>
      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
        <maxMaintenance>100</maxMaintenance>
@@ -165,224 +128,91 @@
        <warningThreshold>0.2</warningThreshold>
        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
      </li>
-      <li Class="ArachnaeSwarm.CompProperties_CustomRadius">
-        <radius>5</radius> <!-- 半径大小 -->
-        <color>(0.5, 1, 1)</color> <!-- 绿色圆圈 -->
-        <radiusOffset>0</radiusOffset> <!-- 半径偏移 -->
-        <showInGUI>true</showInGUI>
-        <label>吸收半径</label>
-        <description>这个卵在孵化过程中的吸收半径，确保这些地格中铺满阿拉克涅营养液，并且没有其他的卵，以获得最佳的孵化速度和孵化质量。</description>
-        <defaultVisible>false</defaultVisible>
+      
+      <!-- 虫蜜燃料系统 -->
+      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
+        <fuelCapacity>25.0</fuelCapacity>
+        <initialFuelPercent>1</initialFuelPercent>
+        <fuelFilter>
+          <thingDefs>
+            <li>ARA_InsectJelly</li>
+          </thingDefs>
+        </fuelFilter>
+        <fuelGizmoLabel>虫蜜</fuelGizmoLabel>
+        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
+        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+        <initialConfigurableTargetFuelLevel>25</initialConfigurableTargetFuelLevel>
+        <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
      </li>
+      <li Class="CompProperties_AffectedByFacilities">
+        <linkableFacilities>
+          <li>ARA_NutrientNetworkTower</li>
+        </linkableFacilities>
+      </li>
+
      <li Class="ArachnaeSwarm.CompProperties_IncubatorData">
-        <!-- 按钮和菜单配置 -->
-        <defaultIndex>0</defaultIndex>
+        <!-- 引用分层奖励配置 Def -->
+        <rewardDef>ARA_DefaultIncubatorRewards</rewardDef>
+        
+        <!-- UI 配置 -->
        <buttonLabel>孵化···</buttonLabel>
        <buttonDesc>选择孵化的阿拉克涅督虫···</buttonDesc>
        <menuTitle>孵化菜单</menuTitle>
        <defaultIconPath>ArachnaeSwarm/UI/Commands/ARA_NodeSwarmIcon</defaultIconPath>
-        
-        <!-- 全局Hediff奖励（所有配置共享） -->
-        <globalExtraHediffs>
-          <li>ARA_Incubator_1_Reward_Hediffs</li> 
-          <li>ARA_Incubator_2_Reward_Hediffs</li> 
-          <li>ARA_Incubator_3_Reward_Hediffs</li> 
-          <li>ARA_Incubator_4_Reward_Hediffs</li> 
-          <li>ARA_Incubator_5_Reward_Hediffs</li> 
-          <li>ARA_Incubator_6_Reward_Hediffs</li> 
-          <li>ARA_Incubator_7_Reward_Hediffs</li> 
-          <li>ARA_Incubator_8_Reward_Hediffs</li> 
-        </globalExtraHediffs>
-
-        <globalHediffRewards>
-          <li Class="ArachnaeSwarm.QualityHediffReward">
-            <qualityThreshold>0.30</qualityThreshold>
-            <hediffCount>1</hediffCount>
-            <giveAllHediffs>false</giveAllHediffs>
-            <messageKey>ARA_QualityReward_1Hediff</messageKey>
-          </li>
-          <li Class="ArachnaeSwarm.QualityHediffReward">
-            <qualityThreshold>0.50</qualityThreshold>
-            <hediffCount>2</hediffCount>
-            <giveAllHediffs>false</giveAllHediffs>
-            <messageKey>ARA_QualityReward_2Hediff</messageKey>
-          </li>
-          <li Class="ArachnaeSwarm.QualityHediffReward">
-            <qualityThreshold>0.85</qualityThreshold>
-            <hediffCount>3</hediffCount>
-            <giveAllHediffs>false</giveAllHediffs>
-            <messageKey>ARA_QualityReward_3Hediff</messageKey>
-          </li>
-          <li Class="ArachnaeSwarm.QualityHediffReward">
-            <qualityThreshold>0.99</qualityThreshold>
-            <hediffCount>4</hediffCount>
-            <giveAllHediffs>false</giveAllHediffs>
-            <messageKey>ARA_QualityReward_4Hediff</messageKey>
-          </li>
-        </globalHediffRewards>

+        <!-- 孵化配置列表 -->
        <incubationConfigs>
          <li>
            <pawnKind>ArachnaeNode_Race_ShieldHead</pawnKind>
            <daysRequired>2</daysRequired>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_WeaponSmith</pawnKind>
            <daysRequired>2</daysRequired>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Fighter</pawnKind>
            <daysRequired>2</daysRequired>
            <requiredResearch>ARA_Technology_1KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Myrmecocystus</pawnKind>
            <daysRequired>3</daysRequired>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Facehugger</pawnKind>
            <daysRequired>2</daysRequired>
            <requiredResearch>ARA_Technology_4KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ARA_MimicNematodeShamblerSwarmer</pawnKind>
            <daysRequired>1</daysRequired>
            <requiredResearch>ARA_Technology_6MEN</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Smokepop</pawnKind>
            <daysRequired>6</daysRequired>
            <requiredResearch>ARA_Technology_5KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_NeuroSwarm</pawnKind>
            <daysRequired>10</daysRequired>
            <requiredResearch>ARA_Technology_6KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Skyraider</pawnKind>
            <daysRequired>6</daysRequired>
            <requiredResearch>ARA_Technology_2KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeNode_Race_Praetorian</pawnKind>
            <daysRequired>12</daysRequired>
            <requiredResearch>ARA_Technology_7KYC</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
          <li>
            <pawnKind>ArachnaeBeast_Race_Slayer</pawnKind>
            <daysRequired>16</daysRequired>
            <requiredResearch>ARA_Technology_8SLA</requiredResearch>
-            <extraHediffs>
-              <li>ARA_Incubator_1_Reward_Hediffs</li> 
-              <li>ARA_Incubator_2_Reward_Hediffs</li> 
-              <li>ARA_Incubator_3_Reward_Hediffs</li> 
-              <li>ARA_Incubator_4_Reward_Hediffs</li> 
-              <li>ARA_Incubator_5_Reward_Hediffs</li> 
-              <li>ARA_Incubator_6_Reward_Hediffs</li> 
-              <li>ARA_Incubator_7_Reward_Hediffs</li> 
-              <li>ARA_Incubator_8_Reward_Hediffs</li> 
-            </extraHediffs>
          </li>
        </incubationConfigs>
      </li>
@@ -447,44 +277,10 @@
      <workTableRoomRole>ARA_Incubator_Room</workTableRoomRole>
    </building>

-    <!-- 添加 ModExtension 配置 -->
-    <modExtensions>
-      <li Class="ArachnaeSwarm.OothecaIncubatorExtension">
-        <!-- 营养液检测半径 -->
-        <nutrientSolutionRadius>3</nutrientSolutionRadius>
-        <!-- 其他卵距离检测半径 -->
-        <nearbyOothecaRadius>3</nearbyOothecaRadius>
-        <!-- 是否检查同房间内的其他卵 -->
-        <checkSameRoomForOotheca>false</checkSameRoomForOotheca>
-        <!-- 营养液加成比例 -->
-        <nutrientSolutionBonusPerTile>0.03</nutrientSolutionBonusPerTile>
-        <!-- 附近其他卵的惩罚比例 -->
-        <!-- <nearbyOothecaPenaltyPerUnit>0.08</nearbyOothecaPenaltyPerUnit> -->
-        <!-- 幼虫搜索半径 -->
-        <!-- <larvaSearchRadius>30</larvaSearchRadius> -->
-        <!-- 是否需要在孵化间内才能正常工作 -->
-        <!-- <requiresIncubatorRoom>true</requiresIncubatorRoom> -->
-        <!-- 不在孵化间内的速度惩罚 -->
-        <!-- <speedPenaltyOutsideIncubator>0.7</speedPenaltyOutsideIncubator> -->
-        <!-- 质量因子房间检查 -->
-        <!-- <useRoomQualityFactor>true</useRoomQualityFactor> -->
-        <!-- 建筑血量影响质量 -->
-        <!-- <healthAffectsQuality>true</healthAffectsQuality> -->
-      </li>
-    </modExtensions>
-
    <costList>
-      <ARA_InsectJelly>25</ARA_InsectJelly>
+      <ARA_InsectJelly>50</ARA_InsectJelly>
    </costList>

-    <!-- ITab配置 -->
-    <inspectorTabs>
-      <li>ArachnaeSwarm.ITab_EquipmentOotheca_Incubation</li>
-    </inspectorTabs>
-
-    <placeWorkers>
-      <li>ArachnaeSwarm.PlaceWorker_CustomRadius</li>
-    </placeWorkers>
    <comps>
      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
        <maxMaintenance>100</maxMaintenance>
@@ -493,14 +289,25 @@
        <warningThreshold>0.2</warningThreshold>
        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
      </li>
-      <li Class="ArachnaeSwarm.CompProperties_CustomRadius">
-        <radius>3</radius> <!-- 半径大小 -->
-        <color>(0.5, 1, 1)</color> <!-- 绿色圆圈 -->
-        <radiusOffset>0</radiusOffset> <!-- 半径偏移 -->
-        <showInGUI>true</showInGUI>
-        <label>吸收半径</label>
-        <description>这个卵在孵化过程中的吸收半径，确保这些地格中铺满阿拉克涅营养液，并且没有其他的卵，以获得最佳的孵化速度和孵化质量。</description>
-        <defaultVisible>false</defaultVisible>
+      <!-- 虫蜜燃料系统 -->
+      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
+        <fuelCapacity>25.0</fuelCapacity>
+        <initialFuelPercent>1</initialFuelPercent>
+        <fuelFilter>
+          <thingDefs>
+            <li>ARA_InsectJelly</li>
+          </thingDefs>
+        </fuelFilter>
+        <fuelGizmoLabel>虫蜜</fuelGizmoLabel>
+        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
+        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+        <initialConfigurableTargetFuelLevel>5</initialConfigurableTargetFuelLevel>
+        <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
+      </li>
+      <li Class="CompProperties_AffectedByFacilities">
+        <linkableFacilities>
+          <li>ARA_NutrientNetworkTower</li>
+        </linkableFacilities>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_EquipmentIncubatorData">
        <!-- autoScanThingDefs默认为true，会自动扫描所有ThingDef -->
@@ -518,7 +325,7 @@
  <ThingDef ParentName="BuildingNaturalBase">
    <defName>ARA_InteractiveEggSac_Techprint</defName>
    <label>阿拉克涅基因试验卵</label>
-    <description>一个内部近乎无序发育的卵，无法孵化任何虫族，主要用于实验变异方向。\n\n需要蓝图的阿拉克涅科技只能由基因试验卵完成，完成时科技的基因信息会被储存在卵中，一旦所有储存同一科技的基因试验卵损坏，则该科技将丢失！</description>
+    <description>一个内部近乎无序发育的卵，无法孵化任何虫族，主要用于实验变异方向。\n\n需要蓝图的阿拉克涅科技只能由基因试验卵完成，多个卵可以共同研究同一个科技，完成时科技的基因信息会被储存在卵中，一旦所有储存同一科技的基因试验卵损坏，则该科技将丢失！</description>
    <thingClass>ArachnaeSwarm.Building_ResearchBlueprintReader</thingClass>
    <graphicData>
      <texPath>ArachnaeSwarm/Building/ARA_InteractiveEggSac_Techprint</texPath>
@@ -538,6 +345,7 @@
    <tickerType>Normal</tickerType>
    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
    <researchPrerequisites>
+      <li>ARA_Titan_Base_Technology</li>
      <li>ARA_Technology_5ESS</li>
    </researchPrerequisites>
    <statBases>
@@ -548,7 +356,6 @@
    <building>
      <workTableRoomRole>Laboratory</workTableRoomRole>
      <deconstructible>false</deconstructible>
-      <repairable>false</repairable>
    </building>
    <descriptionHyperlinks>
      <ThingDef>ARA_Gene_Essence</ThingDef>
@@ -578,4 +385,268 @@
      </li>
    </comps>
  </ThingDef>
+
+  <!-- 3. 主建筑 "生物孵化池" -->
+  <ThingDef ParentName="BuildingBase">
+    <defName>ARA_BioforgeIncubator_Thing</defName>
+    <label>物品孵化池</label>
+    <description>一个大型的、需要消耗大量营养物质的孵化设施，可以同时孵化多个物品，并能通过链接外部设备来提高效率。</description>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Building/ARA_BioforgeIncubator_Thing</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawRotated>false</drawRotated>
+      <drawSize>(5.5,6.5)</drawSize>
+      <drawOffset>(0, 2, 0.5)</drawOffset>
+      <shadowData>
+        <volume>(2.75, 1.2, 2)</volume>
+        <offset>(0.2,0,-1.15)</offset>
+      </shadowData>
+    </graphicData>
+    <size>(5,5)</size>
+    <rotatable>false</rotatable>
+    <tickerType>Normal</tickerType>
+    <stuffCategories Inherit="False" />
+    <costStuffCount>0</costStuffCount>
+    <costList>
+      <ARA_Carapace>200</ARA_Carapace>
+      <ARA_InsectJelly>40</ARA_InsectJelly>
+      <ARA_Activated_Bacterium>10</ARA_Activated_Bacterium>
+    </costList>
+    <castEdgeShadows>false</castEdgeShadows>
+    <staticSunShadowHeight>0</staticSunShadowHeight>
+    <altitudeLayer>Building</altitudeLayer>
+    <passability>PassThroughOnly</passability>
+    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
+    <pathCost>50</pathCost>
+    <statBases>
+      <MarketValue>20000</MarketValue>
+      <MaxHitPoints>250</MaxHitPoints>
+      <WorkToBuild>2800</WorkToBuild>
+      <Flammability>1.0</Flammability>
+    </statBases>
+    <placeWorkers>
+      <li>PlaceWorker_PreventInteractionSpotOverlap</li>
+    </placeWorkers>
+    <fillPercent>0.8</fillPercent>
+    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+    <hasInteractionCell>true</hasInteractionCell>
+    <designationCategory>ARA_Buildings</designationCategory>
+    <uiOrder>2600</uiOrder>
+    <surfaceType>Item</surfaceType>
+    <building>
+      <workTableRoomRole>Laboratory</workTableRoomRole>
+      <workTableNotInRoomRoleFactor>0.8</workTableNotInRoomRoleFactor>
+      <relatedTerrain>
+        <li>ARA_InsectCreep</li>
+      </relatedTerrain>
+    </building>
+    <researchPrerequisites>
+      <li>ARA_Technology_4NPT</li>
+    </researchPrerequisites>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
+        <maxMaintenance>100</maxMaintenance>
+        <maintenanceDecayPerDay>20</maintenanceDecayPerDay>
+        <damagePerSecondWhenEmpty>5</damagePerSecondWhenEmpty>
+        <warningThreshold>0.2</warningThreshold>
+        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
+      </li>
+      <!-- a. 我们新的队列物品生产组件 (带通量控制) -->
+      <li Class="ArachnaeSwarm.CompProperties_QueuedInteractiveProducerWithFlux">
+        <!-- 队列和交互设置 -->
+        <productionQueueLimit>5</productionQueueLimit>
+        <minNutritionToStart>1.0</minNutritionToStart>
+        <whitelist>
+          <li>ArachnaeBase_Race_Larva</li>
+        </whitelist>
+
+        <!-- 质量系统设置 -->
+        <qualityThresholds>
+          <li>
+            <quality>Legendary</quality>
+            <threshold>0.99</threshold>
+          </li>
+          <li>
+            <quality>Masterwork</quality>
+            <threshold>0.90</threshold>
+          </li>
+          <li>
+            <quality>Excellent</quality>
+            <threshold>0.70</threshold>
+          </li>
+          <li>
+            <quality>Good</quality>
+            <threshold>0.50</threshold>
+          </li>
+          <li>
+            <quality>Normal</quality>
+            <threshold>0.20</threshold>
+          </li>
+          <li>
+            <quality>Poor</quality>
+            <threshold>0.10</threshold>
+          </li>
+        </qualityThresholds>
+      </li>
+
+      <!-- b. 我们的营养燃料组件 -->
+      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
+        <fuelCapacity>300.0</fuelCapacity>
+        <fuelFilter>
+          <thingDefs>
+            <li>ARA_InsectJelly</li>
+          </thingDefs>
+        </fuelFilter>
+        <fuelGizmoLabel>虫蜜</fuelGizmoLabel>
+        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
+        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+      </li>
+
+      <!-- c. 原版的设施链接接收组件 -->
+      <li Class="CompProperties_AffectedByFacilities">
+        <linkableFacilities>
+          <li>ARA_NutrientNetworkTower</li>
+        </linkableFacilities>
+      </li>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="BuildingBase">
+    <defName>ARA_BioforgeIncubator</defName>
+    <label>督虫孵化池</label>
+    <description>一个大型的、需要消耗大量营养物质的孵化设施，可以同时孵化多个单位，并能通过链接外部设备来提高效率。</description>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Building/ARA_BioforgeIncubator</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>(5.5,6.5)</drawSize>
+      <drawRotated>false</drawRotated>
+      <drawOffset>(0, 2, 0.5)</drawOffset>
+      <shadowData>
+        <volume>(2.75, 1.4, 2)</volume>
+        <offset>(0,0,-1.25)</offset>
+      </shadowData>
+    </graphicData>
+    <size>(5,5)</size>
+    <tickerType>Normal</tickerType>
+    <rotatable>false</rotatable>
+    <stuffCategories Inherit="False" />
+    <costStuffCount>0</costStuffCount>
+    <costList>
+      <ARA_Carapace>200</ARA_Carapace>
+      <ARA_InsectJelly>40</ARA_InsectJelly>
+      <ARA_Activated_Bacterium>10</ARA_Activated_Bacterium>
+    </costList>
+    <castEdgeShadows>false</castEdgeShadows>
+    <staticSunShadowHeight>0</staticSunShadowHeight>
+    <altitudeLayer>Building</altitudeLayer>
+    <passability>PassThroughOnly</passability>
+    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
+    <designationCategory>ARA_Buildings</designationCategory>
+    <pathCost>50</pathCost>
+    <researchPrerequisites>
+      <li>ARA_Technology_4NPT</li>
+    </researchPrerequisites>
+    <statBases>
+      <MarketValue>20000</MarketValue>
+      <MaxHitPoints>250</MaxHitPoints>
+      <WorkToBuild>2800</WorkToBuild>
+      <Flammability>1.0</Flammability>
+    </statBases>
+    <placeWorkers>
+      <li>PlaceWorker_PreventInteractionSpotOverlap</li>
+    </placeWorkers>
+    <fillPercent>0.8</fillPercent>
+    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+    <hasInteractionCell>true</hasInteractionCell>
+    <!-- <designationCategory>ARA_Buildings</designationCategory> -->
+    <uiOrder>2600</uiOrder>
+    <surfaceType>Item</surfaceType>
+    <building>
+      <workTableRoomRole>Laboratory</workTableRoomRole>
+      <workTableNotInRoomRoleFactor>0.8</workTableNotInRoomRoleFactor>
+      <relatedTerrain>
+        <li>ARA_InsectCreep</li>
+      </relatedTerrain>
+    </building>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
+        <maxMaintenance>100</maxMaintenance>
+        <maintenanceDecayPerDay>20</maintenanceDecayPerDay>
+        <damagePerSecondWhenEmpty>5</damagePerSecondWhenEmpty>
+        <warningThreshold>0.2</warningThreshold>
+        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
+      </li>
+      <!-- a. 队列生产组件 -->
+      <li Class="ArachnaeSwarm.CompProperties_QueuedPawnSpawnerWithFlux">
+        <productionQueueLimit>5</productionQueueLimit>
+        <minNutritionToStart>0.5</minNutritionToStart>
+        <whitelist>
+          <li>ArachnaeBase_Race_Larva</li>
+        </whitelist>
+      </li>
+
+      <!-- b. 孵化配置数据组件（提供可孵化单位列表） -->
+      <li Class="ArachnaeSwarm.CompProperties_IncubatorData">
+        <!-- 引用分层奖励配置 Def -->
+        <rewardDef>ARA_DefaultIncubatorRewards</rewardDef>
+
+        <!-- 孵化配置列表 -->
+        <incubationConfigs>
+          <li>
+            <pawnKind>ArachnaeNode_Race_ShieldHead</pawnKind>
+            <daysRequired>3</daysRequired>
+          </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_WeaponSmith</pawnKind>
+            <daysRequired>3</daysRequired>
+          </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_Fighter</pawnKind>
+            <daysRequired>1.5</daysRequired>
+            <requiredResearch>ARA_Technology_1KYC</requiredResearch>
+          </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_Myrmecocystus</pawnKind>
+            <daysRequired>4</daysRequired>
+          </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_Smokepop</pawnKind>
+            <daysRequired>3</daysRequired>
+            <requiredResearch>ARA_Technology_5KYC</requiredResearch>
+          </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_Skyraider</pawnKind>
+            <daysRequired>2</daysRequired>
+            <requiredResearch>ARA_Technology_2KYC</requiredResearch>
+          </li>
+          <li>
+            <pawnKind>ARA_MimicNematodeShamblerSwarmer</pawnKind>
+            <daysRequired>0.01</daysRequired>
+            <requiredResearch>ARA_Technology_6MEN</requiredResearch>
+          </li>
+        </incubationConfigs>
+      </li>
+
+      <!-- c. 营养燃料组件 -->
+      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition">
+        <fuelCapacity>300.0</fuelCapacity>
+        <fuelFilter>
+          <thingDefs>
+            <li>ARA_InsectJelly</li>
+          </thingDefs>
+        </fuelFilter>
+        <fuelGizmoLabel>虫蜜</fuelGizmoLabel>
+        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
+        <targetFuelLevelConfigurable>true</targetFuelLevelConfigurable>
+      </li>
+
+      <!-- d. 设施链接组件 -->
+      <li Class="CompProperties_AffectedByFacilities">
+        <linkableFacilities>
+          <li>ARA_NutrientNetworkTower</li>
+        </linkableFacilities>
+      </li>
+    </comps>
+  </ThingDef>
 </Defs>
--- a/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml
@@ -198,7 +198,7 @@
  </ThingDef>

  <ThingDef>
-    <defName>Arachnae_AcidlingTrap</defName>
+    <defName>Arachnae_BanelingTrap</defName>
    <label>阿拉克涅爆裂茧</label>
    <description>一种阿拉克涅休眠茧，内藏有休眠中的阿拉克涅虫族。如果靠太近则会唤醒其中的虫族。</description>
    <thingClass>ArachnaeSwarm.Building_TrapReleaseRandom</thingClass>
@@ -228,7 +228,7 @@
      <MarketValue>50</MarketValue>
    </statBases>
    <graphicData>
-      <texPath>ArachnaeSwarm/Plant/ARA_AcidlingTrapPlant</texPath>
+      <texPath>ArachnaeSwarm/Plant/ARA_BanelingTrapPlant</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <drawSize>1.2</drawSize>
      <shadowData>
@@ -242,7 +242,7 @@
        <detectionRadius>5</detectionRadius>
        <countToSpawn>3</countToSpawn>
        <pawnKinds>
-          <li>ArachnaeBase_Race_Acidling</li>
+          <li>ArachnaeBase_Race_Baneling</li>
          <!-- <li>ArachnaeBase_Race_Acid</li> -->
        </pawnKinds>
      </li>
@@ -288,13 +288,6 @@
    <tickerType>Normal</tickerType>
    <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Forbiddable" />
      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition_WithKey">
        <saveKeysPrefix>nutrition</saveKeysPrefix>
@@ -401,14 +394,14 @@
  </ThingDef>
  <!-- Auto mortar -->
  <ThingDef ParentName="BuildingBase">
-    <defName>ARA_Acidling_AutoMortar</defName>
+    <defName>ARA_Baneling_AutoMortar</defName>
    <label>爆裂种投射巢组织</label>
    <description>阿拉克涅虫族用于防御巢穴的组织之一。它由大量没有自主意识的高度特化器官共同构成，能向进犯巢穴的敌军发射多只阿拉克涅爆裂种辅虫，这些辅虫将自行寻找目标以发起自杀性袭击。作为阿拉克涅防御组织，其可以通过获取营养来自行生成补充弹药。</description>
    <thingClass>ArachnaeSwarm.Building_TurretGunHasSpeed</thingClass>
    <drawerType>MapMeshAndRealTime</drawerType>
    <drawHighlight>true</drawHighlight>
    <drawHighlightOnlyForHostile>true</drawHighlightOnlyForHostile>
-    <uiIconPath>ArachnaeSwarm/Building/ARA_Acidling_AutoMortar_Icon</uiIconPath>
+    <uiIconPath>ArachnaeSwarm/Building/ARA_Baneling_AutoMortar_Icon</uiIconPath>
    <graphicData>
      <texPath>ArachnaeSwarm/Building/ARA_AutoSniperCannon_Base</texPath>
      <graphicClass>Graphic_Single</graphicClass>
@@ -433,13 +426,6 @@
    <tickerType>Normal</tickerType>
    <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Forbiddable" />
      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition_WithKey">
        <saveKeysPrefix>nutrition</saveKeysPrefix>
@@ -495,7 +481,7 @@
      <buildingTags>
        <li>Artillery</li>
      </buildingTags>
-      <turretGunDef>ARA_Acidling_Artillery_AutoMortar</turretGunDef>
+      <turretGunDef>ARA_Baneling_Artillery_AutoMortar</turretGunDef>
      <turretBurstWarmupTime>10.0</turretBurstWarmupTime>
      <turretTopDrawSize>3.0</turretTopDrawSize>
      <relatedTerrain>
@@ -510,10 +496,10 @@
    <constructionSkillPrerequisite>8</constructionSkillPrerequisite>
  </ThingDef>
  <ThingDef ParentName="BaseArtilleryWeapon">
-    <defName>ARA_Acidling_Artillery_AutoMortar</defName>
+    <defName>ARA_Baneling_Artillery_AutoMortar</defName>
    <label>爆裂种投射巢</label>
    <graphicData>
-      <texPath>ArachnaeSwarm/Building/ARA_Acidling_Artillery_AutoMortar_Tower</texPath>
+      <texPath>ArachnaeSwarm/Building/ARA_Baneling_Artillery_AutoMortar_Tower</texPath>
      <graphicClass>Graphic_Single</graphicClass>
    </graphicData>
    <uiIconScale>1.25</uiIconScale>
@@ -523,7 +509,7 @@
    <verbs>
      <li>
        <verbClass>ArachnaeSwarm.Verb_ShootWithOffset</verbClass>
-        <defaultProjectile>ArachnaeBase_Race_Acidling_Proj</defaultProjectile>
+        <defaultProjectile>ArachnaeBase_Race_Baneling_Proj</defaultProjectile>
        <ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
        <warmupTime>2</warmupTime>
        <range>500</range>
@@ -548,16 +534,16 @@
    </modExtensions>
  </ThingDef>
  <ThingDef ParentName="BaseGrenadeProjectile">
-    <defName>ArachnaeBase_Race_Acidling_Proj</defName>
+    <defName>ArachnaeBase_Race_Baneling_Proj</defName>
    <label>阿拉克涅爆裂种</label>
    <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
    <graphicData>
-      <texPath>ArachnaeSwarm/Things/ARA_Acidling/Bodies/Naked_Thin</texPath>
+      <texPath>ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin</texPath>
      <graphicClass>Graphic_Multi</graphicClass>
    </graphicData>
    <projectile>
      <speed>41</speed>
-      <spawnsPawnKind>ArachnaeBase_Race_Acidling</spawnsPawnKind>
+      <spawnsPawnKind>ArachnaeBase_Race_Baneling</spawnsPawnKind>
      <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
      <damageDef>ARA_AcidBurn</damageDef>
      <damageAmountBase>10</damageAmountBase>
@@ -601,13 +587,6 @@
    </statBases>
    <tickerType>Normal</tickerType>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_RefuelableNutrition_WithKey">
        <saveKeysPrefix>nutrition</saveKeysPrefix>
        <fuelCapacity>50.0</fuelCapacity>
--- a/1.6/1.6/Defs/Thing_building/ARA_Vat.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Vat.xml
@@ -60,13 +60,6 @@
    <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
    <terrainAffordanceNeeded>ARA_Creep</terrainAffordanceNeeded>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
    </comps>
    <modExtensions>
      <li Class="ArachnaeSwarm.DefModExtension_DormancyVat">
--- a/1.6/1.6/Defs/Thing_building/ARA_WormholeDefs.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_WormholeDefs.xml
@@ -39,13 +39,6 @@
      <ARA_Carapace>200</ARA_Carapace>
    </costList>
    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_SwarmMaintenance">
-        <maxMaintenance>100</maxMaintenance>
-        <maintenanceDecayPerDay>10</maintenanceDecayPerDay>
-        <damagePerSecondWhenEmpty>2</damagePerSecondWhenEmpty>
-        <warningThreshold>0.2</warningThreshold>
-        <maintenanceThresholdForJob>0.5</maintenanceThresholdForJob>
-      </li>
      <li Class="CompProperties_Glower">
        <overlightRadius>7.0</overlightRadius>
        <glowRadius>14</glowRadius>
--- a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
+++ b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
--- a/1.6/1.6/Defs/TrainableDefs/ARA_TrainableDef.xml
+++ b/1.6/1.6/Defs/TrainableDefs/ARA_TrainableDef.xml
@@ -78,7 +78,7 @@
        <initialDamage>50</initialDamage>
        <damagePerTile>3</damagePerTile>
        <inertiaDistance>15</inertiaDistance>
-        <collisionDamageDef>Blunt</collisionDamageDef>
+        <collisionDamageDef>Demolish</collisionDamageDef>
        <flyerDef>ARA_Flyer_TrackingCharge</flyerDef>
        <collisionRadius>3.5</collisionRadius>        <!-- Larger collision radius -->
        <impactSound>Pawn_Melee_BigBash_HitPawn</impactSound>
--- a/(简体中文)/DefInjected/RulePackDefs/ARA_PawnKinds.xml
+++ b/(简体中文)/DefInjected/RulePackDefs/ARA_PawnKinds.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<LanguageData>
+  <ARA_Normal_Node_NameMaker.rulePack.rulesStrings>
+    <li>r_name->[ARA_Normal_Node_FirstName] '[ARA_Normal_Node_nickName]' [ARA_Normal_Node_LastName]</li>
+    <li>ARA_Normal_Node_nickName->[ARA_Normal_Node_nickName_Sub]</li>
+    <li>ARA_Normal_Node_FirstName->节点生物</li>
+    <li>ARA_Normal_Node_LastName->阿拉克涅</li>
+    <li>ARA_Normal_Node_nickName_Sub->[ARA_Normal_Node_nickName_A][ARA_Normal_Node_nickName_B]-[ARA_Normal_Node_nickName_C][ARA_Normal_Node_nickName_D][ARA_Normal_Node_nickName_E]</li>
+    <li>ARA_Normal_Node_nickName_A->P</li>
+    <li>ARA_Normal_Node_nickName_A->R</li>
+    <li>ARA_Normal_Node_nickName_A->X</li>
+    <li>ARA_Normal_Node_nickName_A->H</li>
+    <li>ARA_Normal_Node_nickName_A->D</li>
+    <li>ARA_Normal_Node_nickName_B->A</li>
+    <li>ARA_Normal_Node_nickName_B->C</li>
+    <li>ARA_Normal_Node_nickName_B->I</li>
+    <li>ARA_Normal_Node_nickName_B->Y</li>
+    <li>ARA_Normal_Node_nickName_C->1</li>
+    <li>ARA_Normal_Node_nickName_C->2</li>
+    <li>ARA_Normal_Node_nickName_C->3</li>
+    <li>ARA_Normal_Node_nickName_C->4</li>
+    <li>ARA_Normal_Node_nickName_C->5</li>
+    <li>ARA_Normal_Node_nickName_C->6</li>
+    <li>ARA_Normal_Node_nickName_D->1</li>
+    <li>ARA_Normal_Node_nickName_D->2</li>
+    <li>ARA_Normal_Node_nickName_D->3</li>
+    <li>ARA_Normal_Node_nickName_D->4</li>
+    <li>ARA_Normal_Node_nickName_D->5</li>
+    <li>ARA_Normal_Node_nickName_D->6</li>
+    <li>ARA_Normal_Node_nickName_D->7</li>
+    <li>ARA_Normal_Node_nickName_D->8</li>
+    <li>ARA_Normal_Node_nickName_D->9</li>
+    <li>ARA_Normal_Node_nickName_D->0</li>
+    <li>ARA_Normal_Node_nickName_E->1</li>
+    <li>ARA_Normal_Node_nickName_E->2</li>
+    <li>ARA_Normal_Node_nickName_E->3</li>
+    <li>ARA_Normal_Node_nickName_E->4</li>
+    <li>ARA_Normal_Node_nickName_E->5</li>
+    <li>ARA_Normal_Node_nickName_E->6</li>
+    <li>ARA_Normal_Node_nickName_E->7</li>
+    <li>ARA_Normal_Node_nickName_E->8</li>
+    <li>ARA_Normal_Node_nickName_E->9</li>
+    <li>ARA_Normal_Node_nickName_E->0</li>
+  </ARA_Normal_Node_NameMaker.rulePack.rulesStrings>
+</LanguageData>
--- a/(简体中文)/Keyed/ARA_Alerts_Keys.xml
+++ b/(简体中文)/Keyed/ARA_Alerts_Keys.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LanguageData>
-
-  <ARA_AlertUnlinkedDroneLabel>未连接的虫群工蜂</ARA_AlertUnlinkedDroneLabel>
-  <ARA_AlertUnlinkedDroneExplanation>地图上存在未连接到阿拉克涅女皇种的虫群工蜂。这些工蜂将在一段时间后死亡。请尽快将它们与阿拉克涅女皇种连接。</ARA_AlertUnlinkedDroneExplanation>
-
-</LanguageData>
--- a/(简体中文)/Keyed/ARA_Building_Ootheca.xml
+++ b/(简体中文)/Keyed/ARA_Building_Ootheca.xml
@@ -227,4 +227,43 @@
  <!-- 营养液状态 -->
  <ARA_EquipmentIncubator.WaitingForNutrients>等待营养液...</ARA_EquipmentIncubator.WaitingForNutrients>
  <ARA_Consumed>已消耗</ARA_Consumed>
+
+  <!-- 双向进度条 Gizmo 翻译键 -->
+  <ARA_Gizmo_SelectIncubationTarget>选择孵化目标...</ARA_Gizmo_SelectIncubationTarget>
+  <ARA_Label_Quality>品质:</ARA_Label_Quality>
+  <ARA_Label_Progress>进度:</ARA_Label_Progress>
+  <ARA_Status_SelectTarget>点击上方选择目标</ARA_Status_SelectTarget>
+  <ARA_Status_NeedResearch>需要完成研究</ARA_Status_NeedResearch>
+  <ARA_Status_LarvaActivating>幼虫激活中...</ARA_Status_LarvaActivating>
+  <ARA_Status_LarvaOnTheWay>幼虫赶路中...</ARA_Status_LarvaOnTheWay>
+  <ARA_Days>天</ARA_Days>
+  <ARA_Tooltip_Incubating>【孵化中】</ARA_Tooltip_Incubating>
+  <ARA_Tooltip_Target>目标: {0}</ARA_Tooltip_Target>
+  <ARA_Tooltip_Progress>进度: {0}</ARA_Tooltip_Progress>
+  <ARA_Tooltip_Quality>品质: {0}{1}</ARA_Tooltip_Quality>
+  <ARA_Tooltip_Remaining>剩余: {0}</ARA_Tooltip_Remaining>
+  <ARA_Tooltip_Ready>【就绪】</ARA_Tooltip_Ready>
+  <ARA_Tooltip_Duration>孵化时间: {0}</ARA_Tooltip_Duration>
+  <ARA_Tooltip_NoTarget>【未选择目标】\n点击标题选择孵化目标</ARA_Tooltip_NoTarget>
+    
+  <ARA_Gizmo_AddOrder_Multi>{0}/{1} 选中</ARA_Gizmo_AddOrder_Multi>
+  <ARA_Gizmo_AddOrderDesc_Multi>为 {0} 个选中的卵设置孵化目标</ARA_Gizmo_AddOrderDesc_Multi>
+  <ARA_Menu_SelectIncubationTarget_Multi>为 {0} 个卵选择孵化目标</ARA_Menu_SelectIncubationTarget_Multi>
+  <ARA_Menu_ClearSelection>清除选择</ARA_Menu_ClearSelection>
+  <ARA_Msg_MultiSelectConfigSet>已为 {0} 个卵设置目标: {1}</ARA_Msg_MultiSelectConfigSet>
+  <ARA_Msg_MultiSelectConfigCleared>已清除 {0} 个卵的目标</ARA_Msg_MultiSelectConfigCleared>
+  <ARA_Msg_MultiCallLarva>已为 {0} 个卵呼叫幼虫</ARA_Msg_MultiCallLarva>
+  <ARA_Msg_MultiCancelIncubation>已取消 {0} 个卵的孵化</ARA_Msg_MultiCancelIncubation>
+  <ARA_OothecaIncubator.NoValidTargets>没有可用的目标</ARA_OothecaIncubator.NoValidTargets>
+  
+  <!-- 多选Gizmo -->
+  <ARA_Gizmo_MultiSelectTitle>多选 ({0}个)</ARA_Gizmo_MultiSelectTitle>
+  <ARA_Gizmo_MoreBuildings>还有 {0} 个建筑...</ARA_Gizmo_MoreBuildings>
+  <ARA_Status_Empty>空闲</ARA_Status_Empty>
+
+  <ARA_Gizmo_Manual>手动</ARA_Gizmo_Manual>
+  <ARA_Gizmo_Quality>品质</ARA_Gizmo_Quality>
+  <ARA_Gizmo_Balance>平衡</ARA_Gizmo_Balance>
+  <ARA_Gizmo_Speed>速度</ARA_Gizmo_Speed>
 </LanguageData>
+
--- a/(简体中文)/Keyed/ARA_QueuedIncubator.xml
+++ b/(简体中文)/Keyed/ARA_QueuedIncubator.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+    <!-- 通量模式 -->
+    <ARA_FluxMode_Manual>手动</ARA_FluxMode_Manual>
+    <ARA_FluxMode_Quality>品质</ARA_FluxMode_Quality>
+    <ARA_FluxMode_Balance>平衡</ARA_FluxMode_Balance>
+    <ARA_FluxMode_Speed>速度</ARA_FluxMode_Speed>
+    <ARA_FluxMode_Manual_Desc>手动调节活性值</ARA_FluxMode_Manual_Desc>
+    <ARA_FluxMode_Quality_Desc>低活性，追求高品质产出</ARA_FluxMode_Quality_Desc>
+    <ARA_FluxMode_Balance_Desc>自动调节，在速度和品质间取得平衡</ARA_FluxMode_Balance_Desc>
+    <ARA_FluxMode_Speed_Desc>高活性，以最高速度进行生产</ARA_FluxMode_Speed_Desc>
+    <!-- 消息 -->
+    <ARA_Msg_QueueFull>队列已满！</ARA_Msg_QueueFull>
+    <ARA_Msg_LarvaWorking>已有幼虫正在工作中，请等待完成</ARA_Msg_LarvaWorking>
+    <ARA_Msg_NoOrderToActivate>没有需要激活的订单</ARA_Msg_NoOrderToActivate>
+    <ARA_Msg_NoLarvaFound>未找到可用的幼虫！</ARA_Msg_NoLarvaFound>
+    <ARA_Msg_LarvaCalled>已呼叫幼虫</ARA_Msg_LarvaCalled>
+    <ARA_Msg_LarvaCannotAccept>幼虫无法接受任务</ARA_Msg_LarvaCannotAccept>
+    <ARA_Msg_NoIncubationOptions>没有可用的孵化选项（检查 CompIncubatorData 配置）</ARA_Msg_NoIncubationOptions>
+    <ARA_Msg_NoProducibleItems>没有可生产的物品（检查建筑是否正确配置）</ARA_Msg_NoProducibleItems>
+    <ARA_Msg_IncubatorBrokenQualityZero>制造舱因品质归零而损坏！</ARA_Msg_IncubatorBrokenQualityZero>
+    <ARA_Msg_IncubationCancelled>孵化已取消。</ARA_Msg_IncubationCancelled>
+    <ARA_Msg_IncubationComplete>孵化完成: {0}</ARA_Msg_IncubationComplete>
+    <ARA_Msg_IncubationStarted>孵化开始: {0}</ARA_Msg_IncubationStarted>
+    
+    <!-- 品质等级 -->
+    <ARA_Quality_Legendary>传奇</ARA_Quality_Legendary>
+    <ARA_Quality_Masterwork>杰作</ARA_Quality_Masterwork>
+    <ARA_Quality_Excellent>优秀</ARA_Quality_Excellent>
+    <ARA_Quality_Good>良好</ARA_Quality_Good>
+    <ARA_Quality_Normal>普通</ARA_Quality_Normal>
+    <ARA_Quality_Poor>较差</ARA_Quality_Poor>
+    
+    <!-- 状态文本 -->
+    <ARA_Status_Waiting>等待中</ARA_Status_Waiting>
+    <ARA_Status_WaitingForLarva>等待幼虫</ARA_Status_WaitingForLarva>
+    <ARA_Status_Ready>就绪 - 点击选择目标</ARA_Status_Ready>
+    <ARA_Status_Incubating>正在孵化: {0}</ARA_Status_Incubating>
+    <ARA_Status_LarvaActivating>幼虫激活中...</ARA_Status_LarvaActivating>
+    <ARA_Status_LarvaOnTheWay>幼虫赶路中...</ARA_Status_LarvaOnTheWay>
+    <ARA_Status_Target>目标: {0}</ARA_Status_Target>
+    <ARA_Status_Progress>进度: {0}</ARA_Status_Progress>
+    <ARA_Status_CurrentFlux>当前活性: {0}</ARA_Status_CurrentFlux>
+    <ARA_Status_IncubationSpeed>孵化速度: {0}x</ARA_Status_IncubationSpeed>
+    <ARA_Status_Efficiency>效率</ARA_Status_Efficiency>
+    <ARA_Status_Speed>速度</ARA_Status_Speed>
+    <ARA_Status_Quality>品质</ARA_Status_Quality>
+    <ARA_Status_Mode>模式: {0}</ARA_Status_Mode>
+    <ARA_Status_DormantWarning>⚠ 休眠中，品质下降！</ARA_Status_DormantWarning>
+    <ARA_Status_RemainingTime>剩余时间: {0} 天</ARA_Status_RemainingTime>
+    <ARA_Status_SpeedAndQuality>速度: {0} | 质量: {1}</ARA_Status_SpeedAndQuality>
+    <ARA_Status_Speed>速度: {0}</ARA_Status_Speed>
+    
+    <!-- 检查面板 -->
+    <ARA_Inspect_Orders>订单: {0} / {1}</ARA_Inspect_Orders>
+    <ARA_Inspect_WaitingAndIncubating>等待幼虫: {0}  正在孵化: {1}</ARA_Inspect_WaitingAndIncubating>
+    <ARA_Inspect_WaitingAndProducing>等待幼虫: {0}  正在生产: {1}</ARA_Inspect_WaitingAndProducing>
+    
+    <!-- Gizmo 按钮 -->
+    <ARA_Gizmo_AddOrder>添加订单 ({0}/{1})</ARA_Gizmo_AddOrder>
+    <ARA_Gizmo_AddOrderDesc_Pawn>选择要孵化的单位类型（可多次点击）</ARA_Gizmo_AddOrderDesc_Pawn>
+    <ARA_Gizmo_AddOrderDesc_Item>选择要生产的物品（可多次点击）</ARA_Gizmo_AddOrderDesc_Item>
+    <ARA_Gizmo_NoavliableOrder>无正在进行的订单</ARA_Gizmo_NoavliableOrder>
+    <ARA_Gizmo_CallLarva>呼叫幼虫</ARA_Gizmo_CallLarva>
+    <ARA_Gizmo_CallLarvaDesc>呼叫一只幼虫来激活下一个订单（还有{0}个等待中）</ARA_Gizmo_CallLarvaDesc>
+    <ARA_Gizmo_LarvaWorking>幼虫工作中</ARA_Gizmo_LarvaWorking>
+    <ARA_Gizmo_LarvaWorkingDesc>一只幼虫正在操作孵化器（还有{0}个订单等待）</ARA_Gizmo_LarvaWorkingDesc>
+    <ARA_Gizmo_LarvaActivating>幼虫激活中</ARA_Gizmo_LarvaActivating>
+    <ARA_Gizmo_LarvaOnTheWay>幼虫赶路中</ARA_Gizmo_LarvaOnTheWay>
+    <ARA_Gizmo_SpeedFactors>速度因子</ARA_Gizmo_SpeedFactors>
+    <ARA_Gizmo_QualityFactors>质量因子</ARA_Gizmo_QualityFactors>
+    <ARA_Gizmo_TotalSpeedMultiplier>总速度倍率: {0}</ARA_Gizmo_TotalSpeedMultiplier>
+    <ARA_Gizmo_TotalQualityMultiplier>总质量倍率: {0}</ARA_Gizmo_TotalQualityMultiplier>
+    <ARA_Gizmo_NeutronFlux_Title>活性强度</ARA_Gizmo_NeutronFlux_Title>
+    <ARA_Gizmo_NeutronFlux_TooltipTitle>【孵化活性控制】</ARA_Gizmo_NeutronFlux_TooltipTitle>
+    <ARA_Gizmo_NeutronFlux_CoreMechanic>▸ 活性越高 → 孵化越快\n▸ 活性越低 → 品质越高</ARA_Gizmo_NeutronFlux_CoreMechanic>
+    <ARA_Gizmo_NeutronFlux_Operations>点击拖动调节 | 右上角切换模式</ARA_Gizmo_NeutronFlux_Operations>
+    <ARA_Gizmo_CallLarvaActivationDesc>呼叫幼虫激活制造舱\n\n目标: {0}</ARA_Gizmo_CallLarvaActivationDesc>
+    
+    <!-- 菜单 -->
+    <ARA_Menu_SelectIncubationTarget>选择孵化目标</ARA_Menu_SelectIncubationTarget>
+    <ARA_Menu_SelectProductionTarget>选择生产目标</ARA_Menu_SelectProductionTarget>
+    <ARA_Menu_RequiresResearch>需要研究: {0}</ARA_Menu_RequiresResearch>
+    <ARA_Menu_Days>{0}天</ARA_Menu_Days>
+    
+    <!-- Gizmo 进度条 -->
+    <ARA_Gizmo_SelectIncubationTarget>选择孵化目标...</ARA_Gizmo_SelectIncubationTarget>
+    <ARA_Gizmo_SelectProductionTarget>选择生产目标...</ARA_Gizmo_SelectProductionTarget>
+    <ARA_Gizmo_QueueFull></ARA_Gizmo_QueueFull>
+    <ARA_Gizmo_ReadyClickAbove>就绪 - 点击上方选择目标</ARA_Gizmo_ReadyClickAbove>
+    <ARA_Gizmo_WaitingForLarvaActivation>等待幼虫激活</ARA_Gizmo_WaitingForLarvaActivation>
+    
+    <!-- Tooltip -->
+    <ARA_Tooltip_NotSelected>【未选择目标】</ARA_Tooltip_NotSelected>
+    <ARA_Tooltip_ClickToSelectIncubation>点击上方标题选择孵化目标</ARA_Tooltip_ClickToSelectIncubation>
+    <ARA_Tooltip_ClickToSelectProduction>点击上方标题选择生产目标</ARA_Tooltip_ClickToSelectProduction>
+    <ARA_Tooltip_Ready>【就绪】</ARA_Tooltip_Ready>
+    <ARA_Tooltip_Target>目标: </ARA_Tooltip_Target>
+    <ARA_Tooltip_IncubationTime>孵化时间: {0} 天</ARA_Tooltip_IncubationTime>
+    <ARA_Tooltip_Quality>品质: {0} ({1})</ARA_Tooltip_Quality>
+    <ARA_Tooltip_Progress>进度: {0}</ARA_Tooltip_Progress>
+    <ARA_Tooltip_Remaining>剩余: {0}</ARA_Tooltip_Remaining>
+    
+    <!-- 营养分配器/虫蜜 -->
+    <ARA_NutrientDispenser_MealsAvailable>可制作: {0} 份</ARA_NutrientDispenser_MealsAvailable>
+    <ARA_FuelLabel_Nutrition>虫蜜</ARA_FuelLabel_Nutrition>
+    
+    <!-- 维护度 Gizmo -->
+    <ARA_SwarmMaintenance_Title>维护度</ARA_SwarmMaintenance_Title>
+    <ARA_SwarmMaintenance_DailyDecay_Short>消耗: {0}/天</ARA_SwarmMaintenance_DailyDecay_Short>
+    <ARA_SwarmMaintenance_TooltipTitle>【建筑维护度】</ARA_SwarmMaintenance_TooltipTitle>
+    <ARA_SwarmMaintenance_TooltipCurrent>当前: {0} / {1}</ARA_SwarmMaintenance_TooltipCurrent>
+    <ARA_SwarmMaintenance_TooltipDecay>每日消耗: {0}</ARA_SwarmMaintenance_TooltipDecay>
+    <ARA_SwarmMaintenance_TooltipCritical>⚠ 维护度严重不足！建筑正在受损</ARA_SwarmMaintenance_TooltipCritical>
+    <ARA_SwarmMaintenance_TooltipNeedsMaintenance>需要巢穴维护者进行维护</ARA_SwarmMaintenance_TooltipNeedsMaintenance>
+    <ARA_SwarmMaintenance_TooltipGood>状态良好</ARA_SwarmMaintenance_TooltipGood>
+    <ARA_SwarmMaintenance_TooltipHint>巢穴维护者会自动前来维护低于50%的建筑</ARA_SwarmMaintenance_TooltipHint>
+    
+    <ARA_Gizmo_CallMaintainer>呼叫维护者，阿拉克涅工艺种和其辅虫家政种都可以执行维护工作</ARA_Gizmo_CallMaintainer>
+    <ARA_Msg_MaintainerCalled>已呼叫 {0} 前来维护建筑</ARA_Msg_MaintainerCalled>
+    <ARA_Msg_NoMaintainerAvailable>未找到空闲且可到达的维护者！</ARA_Msg_NoMaintainerAvailable>
+</LanguageData>
--- a/(简体中文)/Keyed/AirStrike_Keys.xml
+++ b/(简体中文)/Keyed/AirStrike_Keys.xml
@@ -50,4 +50,16 @@
  <AircraftCooldownEnded>{0} 准备好再次进行打击</AircraftCooldownEnded>
  <NoAircraftStatus>没有可用的兽虫</NoAircraftStatus>
  <AircraftStatusLine>{0}：{1}/{2}（冷却中：{3}）</AircraftStatusLine>
-</LanguageData>
+
+  <!-- Drop Pod Intercept -->
+  <ARA_ToggleDropPodIntercept_Label>掠食巡航</ARA_ToggleDropPodIntercept_Label>
+  <ARA_ToggleDropPodIntercept_Desc>切换天巫种对敌方空投袭击的拦截模式。</ARA_ToggleDropPodIntercept_Desc>
+  <ARA_InterceptDropPod_Enabled>掠食巡航已启动</ARA_InterceptDropPod_Enabled>
+  <ARA_InterceptDropPod_Disabled>掠食巡航已关闭</ARA_InterceptDropPod_Disabled>
+  <ARA_InterceptDropPod_NoAircraft>没有可用的天巫种兽虫</ARA_InterceptDropPod_NoAircraft>
+  <ARA_InterceptDropPod_Status>掠食巡航：{0}</ARA_InterceptDropPod_Status>
+  <ARA_InterceptDropPod_StatusOn>开启</ARA_InterceptDropPod_StatusOn>
+  <ARA_InterceptDropPod_StatusOff>关闭</ARA_InterceptDropPod_StatusOff>
+  <ARA_InterceptDropPod_LetterLabel>天巫种拦截空投</ARA_InterceptDropPod_LetterLabel>
+  <ARA_InterceptDropPod_LetterText>天巫种在空中拦截了 {0} 个敌方运输仓，目标已坠毁并以空投舱形式落地。</ARA_InterceptDropPod_LetterText>
+</LanguageData>
--- a/(简体中文)/Keyed/ArachnaeSwarm_Keys.xml
+++ b/(简体中文)/Keyed/ArachnaeSwarm_Keys.xml
@@ -130,4 +130,35 @@

  <ARA_EjectedOrgans>成功将 {0} 的内脏全部翻出</ARA_EjectedOrgans>
  <ARA_NoEjectableOrgans>目标没有可以翻出的器官</ARA_NoEjectableOrgans>
+
+  <AreaDamageEnabled>区域伤害启动</AreaDamageEnabled>
+  <AreaDamageDisabled>区域伤害关闭</AreaDamageDisabled>
+  
+  <ARA_ProductionQueue_Description>将{0}只{1}加入辅虫孵化序列</ARA_ProductionQueue_Description>
+
+  <ARA_SwarmSpell_ResearchHarvest>{0} 从 {1} 身上收割了 {2} 虫群进化点</ARA_SwarmSpell_ResearchHarvest>
+  <ARA_SwarmSpell_ResearchHarvest_Message>{0} 吸取了 {1} 的精华，获得了 {2} 进化点</ARA_SwarmSpell_ResearchHarvest_Message>
+
+  <ARA_UsePsychicLoadSkill>释放技能: {0}</ARA_UsePsychicLoadSkill>
+  <ARA_SwarmSpell_LoadCost>累积神经束负荷：</ARA_SwarmSpell_LoadCost>
+  <ARA_SwarmSpell_LoadCost_Fixed>{0}</ARA_SwarmSpell_LoadCost_Fixed>
+  <ARA_SwarmSpell_LoadCost_Range>{0} ~ {1}</ARA_SwarmSpell_LoadCost_Range>
+  <ARA_SwarmSpell_Overload_Penalty_Description>如果神经束已经进入超负荷状态，释放任意的虫群灵能法术将直接导致死亡！</ARA_SwarmSpell_Overload_Penalty_Description>
+
+  <!-- 技能相关 -->
+  <ARA_SwarmSpell_LoadDumped_Entropy>{0} 将 {1} 神经束负荷转化为熵值转储到 {2} 身上</ARA_SwarmSpell_LoadDumped_Entropy>
+  <ARA_SwarmSpell_LoadDumped_Destruction>{0} 将 {1} 神经束负荷以毁灭性能量转储到 {2} 身上</ARA_SwarmSpell_LoadDumped_Destruction>
+  <ARA_SwarmSpell_EntropyTransferred>{0} 向 {1} 转储了 {2} 熵值</ARA_SwarmSpell_EntropyTransferred>
+  <ARA_SwarmSpell_ConsciousnessDestroyed>{0} 的大脑被摧毁了</ARA_SwarmSpell_ConsciousnessDestroyed>
+  <ARA_SwarmSpell_NoConsciousnessFallback>{0} 承受了 {1} 点伤害</ARA_SwarmSpell_NoConsciousnessFallback>
+  <ARA_SwarmSpell_OverloadRelieved>{0} 解除了超载状态</ARA_SwarmSpell_OverloadRelieved>
+  
+  <!-- 错误消息 -->
+  <ARA_SwarmSpell_NoLoadToDump>{0} 没有可转储的神经束负荷</ARA_SwarmSpell_NoLoadToDump>
+  <ARA_SwarmSpell_EntropyTransferFailed>无法向 {0} 转储神经束负荷</ARA_SwarmSpell_EntropyTransferFailed>
+
+  <ARA_BlacklistedHediff_Blocked>{0} 无法被选为目标</ARA_BlacklistedHediff_Blocked>
+  <CannotTargetPawnWithBlacklistedHediff>目标不能被此技能影响</CannotTargetPawnWithBlacklistedHediff>
+
+  <ARA_AbilityRequiresTech>需要科技 {0} 以解锁进化</ARA_AbilityRequiresTech>
 </LanguageData>
--- a/(简体中文)/Keyed/Building_ResearchBlueprintReader.xml
+++ b/(简体中文)/Keyed/Building_ResearchBlueprintReader.xml
@@ -33,7 +33,7 @@
  <ResearchBlueprintReader_MissingPrerequisites>缺失的前置科技</ResearchBlueprintReader_MissingPrerequisites>
  <ResearchBlueprintReader_ProjectCost>成本</ResearchBlueprintReader_ProjectCost>
  <ResearchBlueprintReader_BlueprintCount>所需蓝图数量</ResearchBlueprintReader_BlueprintCount>
-  <ResearchBlueprintReader_CurrentProgress>当前全球进度</ResearchBlueprintReader_CurrentProgress>
+  <ResearchBlueprintReader_CurrentProgress>当前进度</ResearchBlueprintReader_CurrentProgress>
  
  <!-- ResearchBlueprintReaderManager.cs -->
  <ResearchManager_ResearchLost>科技已丢失：{0}</ResearchManager_ResearchLost>
@@ -41,4 +41,19 @@
  <ResearchManager_TotalBuildings>所有建筑：{0}</ResearchManager_TotalBuildings>
  <ResearchManager_ActiveResearch>进行中研究：{0}</ResearchManager_ActiveResearch>
  <ResearchManager_ProjectStatus>{0}：{1}个活跃建筑 / {2}个总建筑</ResearchManager_ProjectStatus>
+  
+  <!-- Gizmo_ResearchProgress.cs -->
+  <ARA_ResearchProgress_NoProject>未选择项目</ARA_ResearchProgress_NoProject>
+  <ARA_ResearchProgress_Completed>✓ 研究完成</ARA_ResearchProgress_Completed>
+  <ARA_ResearchProgress_Researching>⚡ 研究中...</ARA_ResearchProgress_Researching>
+  <ARA_ResearchProgress_Paused>⏸ 已暂停</ARA_ResearchProgress_Paused>
+  <ARA_ResearchProgress_SelectProject>点击选择项目</ARA_ResearchProgress_SelectProject>
+  <ARA_ResearchProgress_TooltipTitle>【研究蓝图解读器】</ARA_ResearchProgress_TooltipTitle>
+  <ARA_ResearchProgress_TooltipProject>当前项目：{0}</ARA_ResearchProgress_TooltipProject>
+  <ARA_ResearchProgress_TooltipProgress>进度：{0} / {1}</ARA_ResearchProgress_TooltipProgress>
+  <ARA_ResearchProgress_TooltipPercentage>完成度：{0}</ARA_ResearchProgress_TooltipPercentage>
+  <ARA_ResearchProgress_TooltipCompleted>研究已完成！</ARA_ResearchProgress_TooltipCompleted>
+  <ARA_ResearchProgress_TooltipTimeRemaining>预计剩余时间：{0}</ARA_ResearchProgress_TooltipTimeRemaining>
+  <ARA_ResearchProgress_TooltipPaused>研究已暂停（无电力或其他原因）</ARA_ResearchProgress_TooltipPaused>
+  <ARA_ResearchProgress_TooltipNoProject>尚未选择研究项目。\n点击"选择研究项目"按钮开始。</ARA_ResearchProgress_TooltipNoProject>
 </LanguageData>
--- a/(简体中文)/Keyed/GizmoLabels.xml
+++ b/(简体中文)/Keyed/GizmoLabels.xml
@@ -4,4 +4,13 @@
  <!-- Guardian Psy-Field Gizmo -->
  <ARA_GuardianFieldGizmoLabel>守护者力场</ARA_GuardianFieldGizmoLabel>

+  <ARA_GestaltGroup>蜂巢网络</ARA_GestaltGroup>
+  <ARA_NoGestaltPawns>无节点生物</ARA_NoGestaltPawns>
+  <ARA_GestaltBandwidth>监管网络负荷</ARA_GestaltBandwidth>
+
+  <ARA_GestaltBandwidthTip>蜂巢网络是阿拉克涅虫群用于建立格式塔思维簇的体系，这使得整个族群可以在女皇种的统一指挥下获得强大的一致性。</ARA_GestaltBandwidthTip>
+  <ARA_AvailableBandwidth>可用节点：{0}</ARA_AvailableBandwidth>
+  <ARA_GestaltBandwidthExceeded>警告：蜂巢网络正在超载，这将会直接影响女皇种的心情，并有可能导致整个网络的传导性崩溃！</ARA_GestaltBandwidthExceeded>
+  <ARA_NetworkOverloadCleared>蜂巢网络超载已结束</ARA_NetworkOverloadCleared>
+  <MessageGestaltLostControl>{1} 已经断开与 {0} 的链接！</MessageGestaltLostControl>
 </LanguageData>
--- a/About/About.xml
+++ b/About/About.xml
@@ -37,12 +37,7 @@
 			<packageId>erdelf.HumanoidAlienRaces</packageId>
 			<displayName>Humanoid Alien Races 2.0</displayName>
 			<steamWorkshopUrl>https://steamcommunity.com/sharedfiles/filedetails/?id=839005762</steamWorkshopUrl>
-		</li>	
-		<li>
-		  <packageId>Nals.FacialAnimation</packageId>
-			<displayName>[NL] Facial Animation - WIP</displayName>
-			<steamWorkshopUrl>https://steamcommunity.com/sharedfiles/filedetails/?id=1635901197</steamWorkshopUrl>
-		</li>	
+		</li>
  </modDependencies>
  
  <loadAfter>
--- a/Content/Textures/ArachnaeSwarm/Building/ARA_Baneling_Artillery_AutoMortar_Tower.png
+++ b/Content/Textures/ArachnaeSwarm/Building/ARA_Baneling_Artillery_AutoMortar_Tower.png
--- a/Content/Textures/ArachnaeSwarm/Building/ARA_Baneling_AutoMortar_Icon.png
+++ b/Content/Textures/ArachnaeSwarm/Building/ARA_Baneling_AutoMortar_Icon.png
--- a/Content/Textures/ArachnaeSwarm/Mote/ARA_PsyWave_Main.png
+++ b/Content/Textures/ArachnaeSwarm/Mote/ARA_PsyWave_Main.png
--- a/Content/Textures/ArachnaeSwarm/Plant/ARA_BanelingTrapPlant.png
+++ b/Content/Textures/ArachnaeSwarm/Plant/ARA_BanelingTrapPlant.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Baneling/BodiesEmp/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_eath.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_eath.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Ferry_Tail_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Dissolver_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_StomachFuel_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_StomachFuel_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_StomachFuel_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_StomachFuel_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Hivekeeping/Bodies/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Larva/Bodies/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Longpincer/Bodies/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Bodies/Naked_Thin_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_south.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_west.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Neurotyrant/Heads/Average_Normal_west.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_east.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_east.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_north.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_north.png
--- a/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_south.png
+++ b/Content/Textures/ArachnaeSwarm/Things/ARA_Scavenger/Bodies/Naked_Thin_south.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tourswen	5815e6926a	1	2026-03-30 23:38:26 +08:00
Tourswen	36e3c940c7	1	2026-03-30 17:29:01 +08:00
Tourswen	001f33e2e7	1	2026-03-30 11:55:54 +08:00
Tourswen	4dd6e71b50	1	2026-03-30 00:02:25 +08:00
Tourswen	f757abad5e	Update Naked_Thin_east.sai2	2026-03-28 19:58:33 +08:00
Tourswen	3e161378c7	1	2026-03-27 17:27:59 +08:00
Tourswen	0603c60bde	1	2026-03-27 12:01:28 +08:00
Tourswen	75717ba814	1	2026-03-27 08:10:23 +08:00
Tourswen	5b4ccf8eb4	1	2026-03-27 00:17:35 +08:00
Tourswen	cc48ee8506	1	2026-03-25 22:54:50 +08:00
Tourswen	aee86c6310	1	2026-03-25 17:28:46 +08:00
Tourswen	3d9f748b7d	1	2026-03-25 04:09:08 +08:00
Tourswen	3a13e15c18	1	2026-03-24 17:33:38 +08:00
Tourswen	6f905aa913	1	2026-03-24 17:32:51 +08:00
Tourswen	3e24e7e987	Update Naked_Thin_east.sai2	2026-03-23 23:50:16 +08:00
Tourswen	d26ace3a7d	1	2026-03-22 23:56:35 +08:00
Tourswen	c9a4ab3e83	1	2026-03-06 11:22:12 +08:00
Tourswen	7c960083a7	1	2026-03-06 09:40:14 +08:00
Tourswen	abd2095976	1	2026-03-06 09:40:07 +08:00
Tourswen	3c3e0589fd	1	2026-03-04 00:40:31 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7a8fc9f487	11	2026-02-27 14:56:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	07f5cfdbc1	feat(flight): add toggle Gizmo, fix missing ForceLand on undraft, update to latest flight logic	2026-02-27 14:21:15 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	d3711e77e2	fix(flight): ForceLand when shouldBeFlying is false, fixes flying when undrafted or standing still	2026-02-27 13:17:09 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a05aaac1b5	fix: 修复飞行时睡觉的bug - 拆分起飞/降落逻辑, 修复Moving->MovingNow和运算符优先级	2026-02-27 12:47:34 +08:00
Tourswen	747a67d09e	1	2026-02-26 12:00:04 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a919519e47	Fix BodyPartRecord scribing in CompHediffGiver	2026-02-22 22:04:41 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	782a7b43b8	`fix(feed-with-honey): avoid modified-collection crash in workgiver scan` - Snapshot `AllPawnsSpawned` with `ToList()` before iteration in `WorkGiver_FeedWithHoney` - Apply the same fix in both `ArachnaeSwarm` and `KalospacerRWLib` - Add `otherPawn.CurJob != null` guard to prevent potential NRE during target checks	2026-02-22 01:47:35 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	be500c5d59	feat: 添加拦截空投舱功能并更新飞行器配置将拦截空投舱能力从单位移至进化树更新飞行器配置并添加新的假飞行器定义修改拦截组件的默认飞行器类型	2026-02-17 16:20:57 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	988967439f	feat(Flyover): 天巫集群掠食 — 空投拦截系统新增天巫种对敌方空投袭击的自动拦截功能： - GameComponent_DropPodInterceptor: 全局拦截状态管理与核心逻辑 - Harmony Prefix 挂钩 EdgeDrop/CenterDrop Arrive()，拦截 1-3 个运输仓 - 被拦截 Pawn 击杀(Bite)后尸体以空投仓形式落地 - 拦截时生成天巫种 FlyOver 视觉飞越 + PositiveEvent 信件通知 - 引航种新增 ARA_ToggleDropPodIntercept 自释放能力切换开关 - 前置检查：开关启用 + 天巫升空 + 敌对派系，至少保留 1 名袭击者新增文件: - Source/.../GameComponent_DropPodInterceptor.cs - Source/.../Patch_DropPodIntercept.cs - Source/.../CompAbilityEffect_ToggleDropPodIntercept.cs - Defs/AbilityDefs/Ability_DropPodIntercept.xml 修改文件: - ARA_PawnKinds.xml (Skyraider abilities) - AirStrike_Keys.xml (10 localization keys) - ArachnaeSwarm.csproj (3 Compile entries)	2026-02-17 15:54:35 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	4c2bf41f19	优化空投仓配置，添加调试日志以处理派系解析和投掷中心边界验证	2026-02-17 13:58:49 +08:00
Tourswen	cda002ea9e	1	2026-02-16 14:04:52 +08:00
Tourswen	721addbfe8	1	2026-02-15 17:29:39 +08:00
Tourswen	2eabf020fd	1	2026-02-15 16:32:55 +08:00
Tourswen	c7a520b2f3	zc	2026-02-15 11:53:08 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	98fb8d89c3	11	2026-02-15 00:32:40 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f9624818f5	fix: 修复多个组件的空引用、调试日志和编码问题 ### HediffComp_GestaltNode - 添加 pawn 空引用检查，防止 NullReferenceException - 将 Log.Message 改为 ArachnaeLog.Debug 统一日志管理 - 新增 Notify_PawnDied 方法处理 Pawn 死亡时的过渡状态清理 - 修复 UpdateTransitionState 中重复声明 pawn 变量的问题 ### CompAbilityEffect_LaunchMultiProjectile - 添加目标有效性检查，处理目标死亡或消失的情况 - 实现动态目标追踪，更新目标位置 - 移除未使用的 parametersInitialized 字段 - 新增 ForceReinitialize 方法支持状态变化时重新初始化 ### CompHediffGiver - 改进异常处理，记录警告日志而非静默吞掉异常 - 重构 IsSymmetricalPart 方法，使用翻译键和 BodyPartTagDef 支持本地化 ### HediffComp_Spawner - 将 DebugSettings.debugLogging 改为 Prefs.DevMode - 修复所有 UTF-8 编码乱码注释（约30处） ### Comp_PawnResearchBlueprintReader - 修复灵能科研点消耗时机，确保先检查→再消耗→最后添加进度 - 提高研究进度添加的原子性	2026-02-15 00:24:08 +08:00
Tourswen	ae7a72fd27	Update ARA_Hediffs_HiveMind.xml	2026-02-14 23:48:52 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7bb29d1dc2	11	2026-02-14 21:41:58 +08:00
Tourswen	da99833af8	1	2026-02-14 15:59:42 +08:00
Tourswen	17f843ad3a	1	2026-02-14 14:49:31 +08:00
Tourswen	8973939f6f	1	2026-02-14 14:33:08 +08:00
Tourswen	75708239b0	1	2026-02-14 12:56:34 +08:00
Tourswen	6e539e0bdf	1	2026-02-14 12:02:09 +08:00
Tourswen	9b737f5285	1	2026-02-14 10:44:32 +08:00
Tourswen	b6f7e0e917	1	2026-02-13 23:57:23 +08:00
Tourswen	8e2eadbb8e	1	2026-02-13 20:48:47 +08:00
Tourswen	0b815cbe70	1	2026-02-13 17:22:53 +08:00
Tourswen	5145fb51f9	11	2026-02-13 11:58:35 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	033a618921	fix(possess): don't destroy caster in Apply; defer possession to OnJumpCompleted to prevent PawnFlyer NRE - CompAbilityEffect_Possess.Apply now only logs; DoPossession runs after landing - Harden HediffComp_GestaltNode against null/destroyed pawn (tick/severity/overlord search/relations) - Fix GestaltOverseer Notify_PostRemovedByDeath message condition (only when overlord died/destroyed and hive node alive)	2026-02-12 17:39:58 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c04d0bdba6	fix: 修复夺舍能力在跳跃前执行导致空指针的问题修复 GestaltNode 相关逻辑的空指针异常修复 Overlord 死亡或销毁时 HiveNode 的状态更新问题增加 Pawn 不在当前地图时的检查	2026-02-12 17:31:10 +08:00
Tourswen	c1639e6f9a	1	2026-02-11 11:19:13 +08:00
Tourswen	cd4be9e67c	Update ARA_Psy_Abilities.xml	2026-02-10 20:29:09 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ea5ce0e478	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2026-02-10 17:53:21 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	34548bba61	fix: 把被两个提交“优化”坏的督虫出生链路修回来 - 恢复 NodeSwarm 基础种族的 ARA_HiveMindDrone 注入（撤销 `d69dc3b` 引入的回归） - Ootheca 与队列孵化统一改为 forceGenerateNewPawn=true，绕开 redress 路径跳过 startingHediffs - 新出生督虫稳定携带 ARA_HiveMindDrone，不再靠运气触发	2026-02-10 17:47:15 +08:00
Tourswen	6944e60568	Update ARA_PawnKinds.xml	2026-02-10 17:27:20 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	3ee4a60c4b	feat(gestalt-ui): 将 Gestalt Gizmo 重构为原版机械师风格 - 重写 GestaltBandwidthGizmo，改为原版带宽卡样式（136x75） - 使用方格带宽可视化：正常占用黄块，超载占用红块 - 统一带宽卡标题/数值布局与 tooltip 信息结构 - 重写 GestaltControlGroupGizmo 为原版控制组卡片风格 - 支持组标题点击全选、头像网格展示、悬停高亮与点击跳转 - 增加禁用态灰显与禁用原因提示，保留现有本地化 key	2026-02-10 16:56:08 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	2434fb17aa	fix(gestalt): 修复节点控制组重连、Overlord判定与过载刷新链路 - 修复控制组缩减时遍历并修改集合导致的潜在异常 - 修复读档重连覆盖已保存控制组分配的问题（仅补齐未分配节点） - 控制组数量变化后立即刷新带宽与过载状态 - 修正 GetOverlord 仅返回 OverlordNode，避免 reflexive 关系方向歧义 - 接入 CompGestalt.CompTick -> GestaltTracker.GameComponentTick 周期更新 - 修复 HediffComp_GestaltNode 兜底 tracker 未绑定 Pawn 的潜在空引用	2026-02-10 16:29:10 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c3952123cb	feat(swarmspell-ui): 将神经束负荷面板改为原版心灵熵风格并接入限制器联动 - 重构 Gizmo_SwarmSpellStatus 为原版样式布局（212x75 双条 + 左侧标签） - 增加悬停技能负荷增量预览（闪烁叠加条）与超载阈值刻度线 - 增加负荷限制器按钮（限幅开关）与对应提示信息 - 在 Comp_SwarmSpellHolder 中新增并序列化 LimitPsychicLoadAmount 状态 - 在 CompAbilityEffect_PsychicLoadCost 中加入队列负荷预测，并在限制器开启时禁用超载施法 - AI 施法判定同步遵守限制器超载检查 - 通过项目编译验证（0 warning / 0 error）	2026-02-10 16:12:19 +08:00
Tourswen	9b349d2a19	1	2026-02-10 08:57:58 +08:00
Tourswen	b26761a848	1	2026-02-07 11:57:23 +08:00
Tourswen	0ce702b9cc	1	2026-02-06 17:32:11 +08:00
Tourswen	d5a0d2d7ad	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2026-02-06 17:32:09 +08:00
Tourswen	d69dc3bd95	11	2026-02-06 17:31:59 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	44d11f9b1c	基因试验卵完成研究后，如果还有其他试验卵存储同一科技，就可以重新选择新的研究项目	2026-02-05 16:58:37 +08:00
Tourswen	b3403096fe	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2026-02-05 16:37:38 +08:00
Tourswen	5045ac6d48	Update ARA_Ootheca.xml	2026-02-05 16:37:28 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	fae09fcd38	只在范围内有敌人时才进行伤害	2026-02-05 16:21:22 +08:00
Tourswen	ec20ce79f1	1	2026-02-05 12:01:03 +08:00
Tourswen	116d54c650	1	2026-02-04 17:18:01 +08:00
Tourswen	7a9c501450	1	2026-02-04 12:02:40 +08:00
Tourswen	daf52ca187	1	2026-02-04 10:43:46 +08:00
Tourswen	7973cf2af4	1	2026-02-03 17:13:09 +08:00
Tourswen	ec37348732	1	2026-02-03 16:49:49 +08:00
Tourswen	61826f4c25	qq	2026-02-03 11:59:01 +08:00
Tourswen	0c4b7ab53f	1	2026-01-30 17:21:49 +08:00
Tourswen	fc79baeaad	1	2026-01-30 17:21:41 +08:00
Tourswen	18b1f59785	1	2026-01-29 23:37:24 +08:00
Tourswen	cf17deb49f	11	2026-01-28 17:29:08 +08:00
Tourswen	525883470a	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2026-01-28 13:48:48 +08:00
Tourswen	3f244fffd0	Update Naked_Thin_east.sai2	2026-01-28 13:48:38 +08:00
Tourswen	7b9164a597	1	2026-01-28 12:01:53 +08:00
Tourswen	e6b9b79ed2	Update ARA_ThinkTrees.xml	2026-01-28 11:38:50 +08:00
Tourswen	ae529319a9	1	2026-01-28 11:17:26 +08:00
Tourswen	c7098a07c0	Update ARA_RaceQueen.xml	2026-01-27 17:27:30 +08:00
Tourswen	cd8398c064	11	2026-01-27 11:59:07 +08:00
Tourswen	adc513c4eb	11	2026-01-26 17:16:30 +08:00
Tourswen	8a35af84f3	1	2026-01-26 02:23:21 +08:00
Tourswen	99ecfe8aca	ee	2026-01-23 17:27:01 +08:00
Tourswen	78493879e2	1	2026-01-23 17:19:38 +08:00
Tourswen	44f8cfb4f9	11	2026-01-23 12:51:04 +08:00
Tourswen	51ba45982f	11	2026-01-23 12:04:23 +08:00
Tourswen	3c9ddc4c60	11	2026-01-23 01:59:09 +08:00
Tourswen	6c08ea4598	11	2026-01-22 17:30:46 +08:00
Tourswen	0dfcb8545d	1	2026-01-22 11:57:44 +08:00
Tourswen	cfd178e0a6	1	2026-01-22 00:29:12 +08:00
Tourswen	5e3b7469e5	22	2026-01-21 11:58:31 +08:00
Tourswen	22ac6fffdb	11	2026-01-21 11:58:10 +08:00
Tourswen	99c1d87210	11	2026-01-21 00:27:36 +08:00
Tourswen	49e5c38818	Update .suo	2026-01-20 17:35:04 +08:00
Tourswen	6c6ed9539d	11	2026-01-20 17:34:50 +08:00
Tourswen	d006386af6	11	2026-01-19 23:14:24 +08:00
Tourswen	299be12bd2	1	2025-12-31 14:33:49 +08:00
Tourswen	bb0f3d281c	11	2025-12-31 12:01:39 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ab68728cab	zc	2025-12-29 13:16:19 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f1108935e9	zc	2025-12-28 22:18:06 +08:00
Tourswen	bcf50c7251	Update mod.vdf	2025-12-28 19:23:25 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c0f370f47f	feat: 新增全局变量管理器以持久化数据并在满足条件时阻止独特角色复活	2025-12-28 18:21:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	aad650af0f	zc	2025-12-26 19:06:11 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	51275a9bdd	zc	2025-12-26 18:45:10 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	592600a6e8	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2025-12-26 17:56:09 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	87bee2cd0a	zc	2025-12-26 17:56:04 +08:00
Tourswen	478506b094	11	2025-12-26 17:05:55 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ef380b8382	zc	2025-12-25 17:54:23 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	efee26e83c	zc	2025-12-25 17:42:02 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	fcd98c9bfc	zc	2025-12-25 17:27:38 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	1ffd8a84e9	zc	2025-12-25 17:22:25 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e3ffa7f920	zc	2025-12-25 16:23:38 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	58233d9909	zc	2025-12-25 16:08:48 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e027f23ef7	zc	2025-12-25 15:47:41 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	2a14049b76	feat: 添加卵囊建筑及其孵化、通量控制和幼虫交互系统。	2025-12-25 15:33:52 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	2cacc468db	feat: 为燃料补充槽添加收容失效自毁系统和Pawn追踪功能	2025-12-25 15:25:03 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	52e29f9c11	fix: 添加植物污染空值检查的 Harmony 补丁。	2025-12-25 15:07:49 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	81f3d2647f	zc	2025-12-25 14:36:30 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	1473651a66	feat: 新增虫群维护系统、营养网络塔及多种阿拉克涅建筑	2025-12-25 13:57:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	1ed168a70c	zc	2025-12-25 12:51:24 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	4cd724e327	Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm	2025-12-25 12:25:05 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	27d6ba6775	feat: 移除ARA_GrowthVat与ARA_NutrientNetworkTower的链接设施	2025-12-25 12:25:01 +08:00
Tourswen	f1060ff5e6	22	2025-12-23 23:47:36 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9406a49d60	feat: 新增装备孵化卵囊建筑，支持中子通量控制、孵化进度与品质管理及幼虫交互。	2025-12-23 18:47:46 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a18e7d3c18	feat: 新增设备孵化器，包含通量控制、幼虫交互和孵化进度管理功能	2025-12-23 18:35:41 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	25b1f563f6	zc	2025-12-23 18:16:43 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	3b3fd767fd	zc	2025-12-23 18:08:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	5de8bad8d1	feat: 添加卵囊建筑，实现基于通量的孵化和幼虫交互功能。	2025-12-23 18:05:11 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	23302daac7	zc	2025-12-23 17:56:14 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	1264f6009e	zc	2025-12-23 17:31:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	eab0afb1a0	feat: 新增带通量控制、队列孵化和品质系统的督虫生成组件及相关UI。	2025-12-23 17:20:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	fd42bb9fe5	zc	2025-12-23 16:58:56 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	fb4903058a	zc	2025-12-23 16:52:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	d11f0eb280	zc	2025-12-23 16:33:57 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	2556c5486e	zc	2025-12-23 15:51:14 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	6012771afa	zfc	2025-12-23 15:44:33 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c130329439	zc	2025-12-23 15:34:44 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	79b09af69f	zc	2025-12-23 14:50:46 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9af5966135	zc	2025-12-23 14:47:31 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	073e0fa1e8	zc	2025-12-23 14:30:48 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c70e4daf38	zc	2025-12-23 14:13:12 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	84f5bf036c	zc	2025-12-23 13:18:08 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a0f90cf71a	feat: 新增阿拉克涅虫卵囊及其孵化系统，包括营养液、维护机制和孵化质量奖励。	2025-12-23 13:16:13 +08:00
Tourswen	def05a2de0	Update ARA_NutrientNetworkBuilding.xml	2025-12-22 11:59:24 +08:00