11

2025-12-19 23:55:13 +08:00
parent 2825ef4e97
commit 60408e3224
49 changed files with 993 additions and 118 deletions
--- a/1.6/1.6/Assemblies/ArachnaeSwarm.dll
+++ b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
--- a/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
+++ b/1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml
@@ -1547,7 +1547,7 @@
        </makeImmuneTo>
        <statFactors>
          <StaggerDurationFactor>0</StaggerDurationFactor>
-          <!-- <Flammability>0</Flammability> -->
+          <Flammability>0</Flammability>
          <MeleeHitChance>25</MeleeHitChance>
          <IncomingDamageFactor>0.25</IncomingDamageFactor>
        </statFactors>
--- a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
+++ b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
@@ -585,10 +585,11 @@
 		</lifeStages>
 	</PawnKindDef>

-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef 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>
@@ -598,7 +599,7 @@
 			<li>
 				<bodyGraphicData>
 					<texPath>ArachnaeSwarm/Things/ARA_Slayer/Bodies/Naked_Thin</texPath>
-					<drawSize>6.5</drawSize>
+					<drawSize>5.5</drawSize>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
 						<offset>(0,0,-0.15)</offset>
--- a/1.6/1.6/Defs/Scenarios/ARA_Scenarios.xml
+++ b/1.6/1.6/Defs/Scenarios/ARA_Scenarios.xml
@@ -49,7 +49,7 @@
        <li Class="ScenPart_StartingThing_Defined">
          <def>StartingThing_Defined</def>
          <thingDef>ARA_InteractiveEggSac_Start</thingDef>
-          <count>6</count>
+          <count>5</count>
        </li>
        <li Class="ScenPart_StartingThing_Defined">
          <def>StartingThing_Defined</def>
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBeastSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceBeastSwarm.xml
@@ -11,7 +11,6 @@
    <race>
      <body>ArachnaeSlayer_Body</body>
      <thinkTreeMain>ARA_Insect_Beast</thinkTreeMain>
-      <thinkTreeConstant>ARA_Insect_Beast_Constant</thinkTreeConstant>
      <!-- 身形大小 -->
 			<baseBodySize>10</baseBodySize>
      <!-- 基础血量，很高 -->
@@ -46,8 +45,8 @@
        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
      </li>
      <li Class="ArachnaeSwarm.CompProperties_PawnBodyWeapon">
-        <cleaveAngle>120</cleaveAngle>
-        <cleaveRange>3</cleaveRange>
+        <cleaveAngle>60</cleaveAngle>
+        <cleaveRange>2</cleaveRange>
        <cleaveDamageFactor>1</cleaveDamageFactor>
        <damageDowned>false</damageDowned>
        <cleaveDamageDef>Cut</cleaveDamageDef>
--- a/1.6/1.6/Defs/Thing_Plant/ARA_Plant.xml
+++ b/1.6/1.6/Defs/Thing_Plant/ARA_Plant.xml
@@ -150,7 +150,7 @@
      <Nutrition>0.2</Nutrition>
    </statBases>
    <graphicData>
-      <texPath>ArachnaeSwarm/Plant/ARA_CreepPlant</texPath>
+      <texPath>ArachnaeSwarm/Plant/ARA_Bacterium_Plant</texPath>
      <graphicClass>Graphic_Single</graphicClass>
    </graphicData>
    <selectable>true</selectable>
--- a/1.6/1.6/Defs/Thing_building/ARA_Ootheca.xml
+++ b/1.6/1.6/Defs/Thing_building/ARA_Ootheca.xml
@@ -399,7 +399,7 @@
  <ThingDef ParentName="BuildingNaturalBase">
    <defName>ARA_Equipment_Ootheca</defName>
    <label>阿拉克涅茧</label>
-    <description>如宝塔般的阿拉克涅活体结构，可以孵化出变态发育后的不完全个体——武装器官和织物，也就是虫群的武器和衣服，它需要由阿拉克涅幼虫种进入以启动孵化进程。一个宽敞、铺满阿拉克涅营养液的孵化间将是它最佳的放置场所。\n\n在孵化过程中，阿拉克涅茧会不断吞噬附近的营养液，需要指派有建造能力的虫族不断修复。</description>
+    <description>如宝塔般的阿拉克涅活体结构，可以孵化出变态发育后的不完全个体——武装器官和织物，也就是虫群的武器和衣服，它需要由阿拉克涅幼虫种进入以启动孵化进程。一个宽敞、铺满阿拉克涅营养液的孵化间将是它最佳的放置场所。</description>
    <statBases>
      <MarketValue>1000</MarketValue>
    </statBases>
@@ -422,7 +422,7 @@
    <rotatable>false</rotatable>
    <tickerType>Normal</tickerType>
    <generateCommonality>0</generateCommonality>
-    <tradeability>None</tradeability>
+      <tradeability>None</tradeability>
    <thingSetMakerTags Inherit="False" />
    <terrainAffordanceNeeded>ARA_Incubator_Nutrient_Solution</terrainAffordanceNeeded>
    <!-- 交互设置 -->
--- a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
+++ b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
@@ -158,12 +158,12 @@
        <li Class="ThinkNode_Subtree">
          <treeDef>Downed</treeDef>
        </li>
-        <!-- <li Class="ThinkNode_Subtree">
+        <li Class="ThinkNode_Subtree">
          <treeDef>BurningResponse</treeDef>
-        </li> -->
-        <!-- <li Class="ThinkNode_Subtree">
+        </li>
+        <li Class="ThinkNode_Subtree">
          <treeDef>MentalStateCritical</treeDef>
-        </li> -->
+        </li>

        <!-- React to close melee threat -->
        <li Class="JobGiver_ReactToCloseMeleeThreat"/>
@@ -492,38 +492,6 @@
      </subNodes>
    </thinkRoot>
  </ThinkTreeDef>
-  <ThinkTreeDef>
-    <defName>ARA_Insect_Beast_Constant</defName>
-    <thinkRoot Class="ThinkNode_Priority">
-      <subNodes>
-        <!-- Despawned -->
-        <li Class="ThinkNode_Subtree">
-          <treeDef>Despawned</treeDef>
-        </li>
-
-        <li Class="ThinkNode_ConditionalCanDoConstantThinkTreeJobNow">
-          <subNodes>
-            <!-- Join auto joinable caravan -->
-            <li Class="ThinkNode_Subtree">
-              <treeDef>JoinAutoJoinableCaravan</treeDef>
-            </li>
-          </subNodes>
-        </li>
-
-        <!-- Board/leave gravship -->
-        <li Class="JobGiver_BoardOrLeaveGravship" />
-
-        <li Class="ThinkNode_ConditionalCanDoLordJobNow">
-          <subNodes>
-            <!-- Lord directives -->
-            <li Class="ThinkNode_Subtree">
-              <treeDef>LordDutyConstant</treeDef>
-            </li>
-          </subNodes>
-        </li>
-      </subNodes>
-    </thinkRoot>
-  </ThinkTreeDef>

  <ThinkTreeDef>
    <defName>ARA_Insect_WithPlanting</defName>
--- a/1.6/1.6/Defs/TrainableDefs/ARA_TrainableDef.xml
+++ b/1.6/1.6/Defs/TrainableDefs/ARA_TrainableDef.xml
@@ -65,7 +65,7 @@
        <canTargetMechs>true</canTargetMechs>
        <canTargetSelf>false</canTargetSelf>
      </targetParams>
-      <range>18</range>
+      <range>36</range>
      <warmupTime>1.5</warmupTime>
    </verbProperties>
    <comps>
--- a/Content/Textures/ArachnaeSwarm/Plant/ARA_AcidlingTrapPlant.png
+++ b/Content/Textures/ArachnaeSwarm/Plant/ARA_AcidlingTrapPlant.png
--- a/Content/Textures/ArachnaeSwarm/Plant/ARA_Bacterium_Plant.png
+++ b/Content/Textures/ArachnaeSwarm/Plant/ARA_Bacterium_Plant.png
--- a/Content/Textures/ArachnaeSwarm/Plant/ARA_BeeSpikePlant.png
+++ b/Content/Textures/ArachnaeSwarm/Plant/ARA_BeeSpikePlant.png
--- a/Content/Textures/ArachnaeSwarm/Plant/ARA_CreepPlant.png
+++ b/Content/Textures/ArachnaeSwarm/Plant/ARA_CreepPlant.png
--- a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/.suo
--- a/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
+++ b/Source/ArachnaeSwarm/.vs/ArachnaeSwarm/v17/DocumentLayout.json
--- a/Source/ArachnaeSwarm/Buildings/Building_EquipmentOotheca/Building_EquipmentOotheca.cs
+++ b/Source/ArachnaeSwarm/Buildings/Building_EquipmentOotheca/Building_EquipmentOotheca.cs
@@ -524,14 +524,6 @@ namespace ArachnaeSwarm
                builder.Append(timeText);
                builder.AppendLine();
                builder.Append("ARA_EquipmentIncubator.Speed".Translate() + ": " + SpeedMultiplier.ToStringPercent());
-                
-                // 显示营养液加成信息
-                if (currentNutrientCount > 0)
-                {
-                    builder.AppendLine();
-                    builder.Append("ARA_EquipmentIncubator.NutrientBonusActive".Translate() + ": " + 
-                                  currentNutrientCount + " tiles (" + NutrientSpeedBonus.ToStringPercent() + ")");
-                }
            }
            else if (assignedLarva != null)
            {
@@ -675,18 +667,6 @@ namespace ArachnaeSwarm
                {
                    builder.AppendLine("ARA_EquipmentIncubator.NoResearchRequired".Translate());
                }
-                
-                // 显示营养液建议
-                var costStat = DefDatabase<StatDef>.GetNamedSilentFail("ARA_IncubationCost");
-                if (costStat != null)
-                {
-                    int recommendedCost = Mathf.RoundToInt(config.thingDef.GetStatValueAbstract(costStat, null));
-                    if (recommendedCost > 0)
-                    {
-                        builder.AppendLine();
-                        builder.AppendLine("ARA_EquipmentIncubator.RecommendedNutrientsForSpeed".Translate(recommendedCost));
-                    }
-                }
            }

            builder.AppendLine();
--- a/(3)/1.png
+++ b/(3)/1.png
--- a/(3)/10.png
+++ b/(3)/10.png
--- a/(3)/11.png
+++ b/(3)/11.png
--- a/(3)/12.png
+++ b/(3)/12.png
--- a/(3)/13.png
+++ b/(3)/13.png
--- a/(3)/14.png
+++ b/(3)/14.png
--- a/(3)/15.png
+++ b/(3)/15.png
--- a/(3)/16.png
+++ b/(3)/16.png
--- a/(3)/17.png
+++ b/(3)/17.png
--- a/(3)/18.png
+++ b/(3)/18.png
--- a/(3)/19.png
+++ b/(3)/19.png
--- a/(3)/2.png
+++ b/(3)/2.png
--- a/(3)/20.png
+++ b/(3)/20.png
--- a/(3)/21.png
+++ b/(3)/21.png
--- a/(3)/22.png
+++ b/(3)/22.png
--- a/(3)/23.png
+++ b/(3)/23.png
--- a/(3)/24.png
+++ b/(3)/24.png
--- a/(3)/25.png
+++ b/(3)/25.png
--- a/(3)/26.png
+++ b/(3)/26.png
--- a/(3)/27.png
+++ b/(3)/27.png
--- a/(3)/28.png
+++ b/(3)/28.png
--- a/(3)/29.png
+++ b/(3)/29.png
--- a/(3)/3.png
+++ b/(3)/3.png
--- a/(3)/30.png
+++ b/(3)/30.png
--- a/(3)/4.png
+++ b/(3)/4.png
--- a/(3)/5.png
+++ b/(3)/5.png
--- a/(3)/6.png
+++ b/(3)/6.png
--- a/(3)/7.png
+++ b/(3)/7.png
--- a/(3)/8.png
+++ b/(3)/8.png
--- a/(3)/9.png
+++ b/(3)/9.png
--- a/非公开资源/Content/Textures/Plant/ARA_AcidlingTrapPlant.sai2
+++ b/非公开资源/Content/Textures/Plant/ARA_AcidlingTrapPlant.sai2
--- a/非公开资源/Content/Textures/Plant/ARA_BeeSpikePlant.sai2
+++ b/非公开资源/Content/Textures/Plant/ARA_BeeSpikePlant.sai2
--- a/非公开资源/Content/Textures/Plant/ARA_CreepPlant.sai2
+++ b/非公开资源/Content/Textures/Plant/ARA_CreepPlant.sai2