11

2025-12-15 17:29:07 +08:00
parent 675ac8b298
commit 15404222fd
13 changed files with 678 additions and 392 deletions
--- a/1.6/1.6/Assemblies/ArachnaeSwarm.dll
+++ b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
--- a/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
+++ b/1.6/1.6/Defs/AbilityDefs/Abilities_EggSpew.xml
@@ -88,136 +88,6 @@
    </projectile>
  </ThingDef>

-  <!-- T0 -->
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew</defName>
-    <label>生育虫卵</label>
-    <description>从卵巢中排出一颗休眠的虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化小型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac</spawnBuildingDef>
-        <customLabel>0级阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_Huge</defName>
-    <label>生育大型虫卵</label>
-    <description>从卵巢中排出一颗休眠的大型虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化大型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew_Huge</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_Huge</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac_Huge</spawnBuildingDef>
-        <customLabel>0级大型阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac_Huge</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-  <!-- T1 -->
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_1Stage</defName>
-    <label>生育虫卵——等级1</label>
-    <description>从卵巢中排出一颗休眠的虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化小型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew_1Stage</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_1Stage</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac_1Stage</spawnBuildingDef>
-        <customLabel>1级阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac_1Stage</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_Huge_1Stage</defName>
-    <label>生育大型虫卵——等级1</label>
-    <description>从卵巢中排出一颗休眠的大型虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化大型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew_Huge_1Stage</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_Huge_1Stage</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac_Huge_1Stage</spawnBuildingDef>
-        <customLabel>1级大型阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac_Huge_1Stage</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-  <!-- T2 -->
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_2Stage</defName>
-    <label>生育虫卵——等级2</label>
-    <description>从卵巢中排出一颗休眠的虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化小型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew_2Stage</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_2Stage</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac_2Stage</spawnBuildingDef>
-        <customLabel>2级阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac_2Stage</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-  <AbilityDef ParentName="ARA_EggSpew_Base">
-    <defName>ARA_EggSpew_Huge_2Stage</defName>
-    <label>生育大型虫卵——等级2</label>
-    <description>从卵巢中排出一颗休眠的大型虫卵，阿拉克涅女皇种可以通过与其交互将其激活，并选择孵化的督虫虫族类型——参阅虫卵的具体信息，了解各个督虫的特点。\n\n该虫卵只能孵化大型虫族。</description>
-    <iconPath>ArachnaeSwarm/UI/Abilities/ARA_EggSpew_Huge_2Stage</iconPath>
-    <comps>
-      <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ARA_Proj_EggSac_Huge_2Stage</projectileDef>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowSpawnablePawns">
-        <spawnBuildingDef>ARA_InteractiveEggSac_Huge_2Stage</spawnBuildingDef>
-        <customLabel>2级大型阿拉克涅卵 可孵化的单位</customLabel>
-        <showResearchRequirements>true</showResearchRequirements>
-      </li>
-      <li Class="ArachnaeSwarm.CompProperties_AbilityShowTemperatureRange">
-        <temperatureCheckBuilding>ARA_InteractiveEggSac_Huge_2Stage</temperatureCheckBuilding>
-        <customLabel>温度要求</customLabel>
-        <showCurrentTemperature>true</showCurrentTemperature>
-      </li>
-    </comps>
-  </AbilityDef>
-
  <AbilityDef ParentName="ARA_EggSpew_Base">
    <defName>ARA_EggSpew_Techprint</defName>
    <label>生育基因试验卵</label>
--- a/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
+++ b/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
@@ -23,8 +23,6 @@
    <comps>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
-          <li>ARA_EggSpew</li>
-          <li>ARA_EggSpew_Huge</li>
          <li>ARA_Queen_Upgrade_1_Stage</li>
        </abilityDefs>
      </li>
@@ -87,8 +85,6 @@
    <comps>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
-          <li>ARA_EggSpew_1Stage</li>
-          <li>ARA_EggSpew_Huge_1Stage</li>
          <li>ARA_Queen_Upgrade_2_Stage</li>
        </abilityDefs>
      </li>
@@ -151,8 +147,6 @@
    <comps>
      <li Class="HediffCompProperties_GiveAbility">
        <abilityDefs>
-          <li>ARA_EggSpew_2Stage</li>
-          <li>ARA_EggSpew_Huge_2Stage</li>
        </abilityDefs>
      </li>
    </comps>
--- a/1.6/1.6/Defs/NeedDefs/ARA_Needs.xml
+++ b/1.6/1.6/Defs/NeedDefs/ARA_Needs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <NeedDef>
+    <defName>ARA_HoneyProduction</defName>
+    <needClass>ArachnaeSwarm.Need_HoneyProduction</needClass>
+    <label>蜜罐</label>
+    <description>代表这个生物储存阿拉克涅虫蜜原浆的多少。当其他虫族饥饿时，会尝试直接从有蜜罐腔的生物身上获取虫蜜，如果蜜罐满溢，则生物会尝试将其提取出来。</description>
+    <listPriority>800</listPriority>
+    <major>true</major>
+    <onlyIfCausedByHediff>true</onlyIfCausedByHediff>
+    <hediffRequiredAny>
+      <li>Wula_Synth</li>
+    </hediffRequiredAny>
+    <showForCaravanMembers>true</showForCaravanMembers>
+    <developmentalStageFilter>Baby, Child, Adult</developmentalStageFilter>
+    <showUnitTicks>true</showUnitTicks>
+    <freezeWhileSleeping>false</freezeWhileSleeping>
+  </NeedDef>
+</Defs>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBaseSwarm.xml
@@ -95,33 +95,12 @@
  <ThingDef ParentName="ArachnaeBase_Race">
    <defName>ArachnaeBase_Race_Scavenger</defName>
    <label>阿拉克涅食腐种</label>
-    <description>阿拉克涅辅虫之一，智力低下，可以执行种植和收割工作，注定在度过短暂的时光后死亡。</description>
+    <description>阿拉克涅辅虫之一，智力低下，可以执行种植、收割、搬运和挖掘工作，注定在度过短暂的时光后死亡。</description>
    <race>
      <specialTrainables>
        <li>ARA_Sowing</li>
-      </specialTrainables>
-    </race>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
-        <trainables>
-          <li>
-            <trainable>ARA_Sowing</trainable>
-            <trainInstantly>true</trainInstantly>
-            <setWanted>true</setWanted>
-          </li>
-        </trainables>
-        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
-      </li>
-    </comps>
-  </ThingDef>
-  <ThingDef ParentName="ArachnaeBase_Race">
-    <defName>ArachnaeBase_Race_HardJaw</defName>
-    <label>阿拉克涅坚颚种</label>
-    <description>阿拉克涅辅虫之一，智力低下，可以承担挖矿任务，注定在度过短暂的时光后死亡。</description>
-    <race>
-      <specialTrainables>
        <li>Dig</li>
-        <li MayRequire="Ludeon.RimWorld.Odyssey">AttackTarget</li>
+        <li>ARA_Cleaning</li>
      </specialTrainables>
    </race>
    <comps>
@@ -133,27 +112,10 @@
            <setWanted>true</setWanted>
          </li>
          <li>
-            <trainable>AttackTarget</trainable>
+            <trainable>ARA_Sowing</trainable>
            <trainInstantly>true</trainInstantly>
            <setWanted>true</setWanted>
          </li>
-        </trainables>
-        <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
-      </li>
-    </comps>
-  </ThingDef>
-  <ThingDef ParentName="ArachnaeBase_Race">
-    <defName>ArachnaeBase_Race_Maid</defName>
-    <label>阿拉克涅家政种</label>
-    <description>阿拉克涅辅虫之一，智力低下，可以执行清洁和搬运工作，注定在度过短暂的时光后死亡。</description>
-    <race>
-      <specialTrainables>
-        <li>ARA_Cleaning</li>
-      </specialTrainables>
-    </race>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
-        <trainables>
          <li>
            <trainable>ARA_Cleaning</trainable>
            <trainInstantly>true</trainInstantly>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -699,7 +699,7 @@
  <AlienRace.ThingDef_AlienRace ParentName="ARA_NodeBase_Huge">
    <defName>ArachnaeNode_Race_Myrmecocystus</defName>
    <label>阿拉克涅蜜罐种</label>
-    <description>阿拉克涅大型督虫之一，拥有广泛食谱的大型虫族，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。\n\n她可以进行搬运、烹饪和种植工作，战斗技能非常差。\n\n作为督虫，她可以繁育并监管若干阿拉克涅食腐种辅虫，以协助巢穴进行收割和播种工作。</description>
+    <description>阿拉克涅大型督虫之一，拥有广泛食谱的大型虫族，可以吞下许多未经处理的生物并将其分解为阿拉克涅虫蜜，以滋养虫群。\n\n她可以进行搬运、烹饪和种植工作，战斗技能非常差。</description>
    <alienRace>
      <generalSettings>
        <!-- 各种零件定义 -->
@@ -780,23 +780,6 @@
        <milkIntervalDays>1</milkIntervalDays>
        <milkAmount>10</milkAmount>
      </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_Scavenger</pawnKind>
-            <count>2</count>
-            <cooldownTicks>1000</cooldownTicks>
-          </li>
-        </productionQueue>
-        <spawnEffecter>CocoonDestroyed</spawnEffecter>
-      </li>
      <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
        <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
        <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
@@ -807,7 +790,6 @@
      </li>
      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
        <hediffs>
-          <li>ARA_RaceBaseSwarmProduceSwitchHediff</li>
          <li>ARA_Myrmecocystus_Production_InsectJelly</li>
        </hediffs>
        <addChance>1.0</addChance>
@@ -955,17 +937,17 @@
        <allowDuplicates>false</allowDuplicates>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
-        <freeProduction>true</freeProduction>
+        <freeProduction>false</freeProduction>
        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
        <fixedIngredient>ARA_InsectJelly</fixedIngredient>
        <maxIngredientCount>1</maxIngredientCount>
        <startingIngredientCount>1</startingIngredientCount>
-        <costPerPawn>999</costPerPawn>
+        <costPerPawn>1</costPerPawn>
        <cooldownTicks>9999</cooldownTicks>
        <productionQueue>
          <li>
-            <pawnKind>ArachnaeBase_Race_HardJaw</pawnKind>
-            <count>2</count>
+            <pawnKind>ArachnaeBase_Race_Scavenger</pawnKind>
+            <count>4</count>
            <cooldownTicks>1000</cooldownTicks>
          </li>
        </productionQueue>
--- a/1.6/1.6/Defs/Thing_building/ARA_Incubator.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Incubator.xml
@@ -89,7 +89,7 @@
    <hasInteractionCell>true</hasInteractionCell>
    <statBases>
      <Mass>10</Mass>
-      <MaxHitPoints>20</MaxHitPoints>
+      <MaxHitPoints>150</MaxHitPoints>
      <Flammability>1</Flammability>
      <Beauty>-6</Beauty>
    </statBases>
@@ -98,8 +98,8 @@
      <!-- <claimable>false</claimable> -->
      <deconstructible>false</deconstructible>
      <repairable>false</repairable>
-      <isTargetable>true</isTargetable>
-      <expandHomeArea>false</expandHomeArea>
+      <isTargetable>false</isTargetable>
+      <!-- <expandHomeArea>false</expandHomeArea> -->
      <workTableRoomRole>ARA_Incubator_Room</workTableRoomRole>
    </building>

@@ -108,7 +108,19 @@
      <li>ArachnaeSwarm.ITab_Ootheca_Incubation</li>
    </inspectorTabs>

+    <placeWorkers>
+      <li>ArachnaeSwarm.PlaceWorker_CustomRadius</li>
+    </placeWorkers>
    <comps>
+      <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>
      <li Class="ArachnaeSwarm.CompProperties_IncubatorData">
        <!-- 按钮和菜单配置 -->
        <defaultIndex>0</defaultIndex>
@@ -184,6 +196,11 @@
        <glowRadius>6</glowRadius>
        <glowColor>(113,141,117,0)</glowColor>
      </li>
+      <li Class="ArachnaeSwarm.CompProperties_TemperatureRuinableDamage">
+        <minSafeTemperature>-10</minSafeTemperature>
+        <maxSafeTemperature>20</maxSafeTemperature>
+        <damagePerTick>0.015</damagePerTick>
+      </li>
    </comps>
  </ThingDef>
 </Defs>