Merge branch 'master' of https://git.ra3battle.cn/Kalospacer/ArachnaeSwarm

1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml

@@ -135,7 +135,7 @@
       <armorPenetrationBase>0.1</armorPenetrationBase>
       <stoppingPower>1</stoppingPower>
       <shadowSize>0</shadowSize>
-      <spawnTerrain>InsectSludge</spawnTerrain>
+      <spawnTerrain>ARA_InsectSludge</spawnTerrain>
       <terrainChance>0.75</terrainChance>
       <filth>Filth_Slime</filth>
       <filthCount>1</filthCount>

1.6/1.6/Defs/BackstoryDefs/ARA_BackstoryDef.xml

@@ -27,8 +27,8 @@
 	</AlienRace.AlienBackstoryDef>
 	<AlienRace.AlienBackstoryDef ParentName="ARA_BaseBackStory">
 		<defName>Arachnae_Queen_BS_Adult_1</defName>
-		<title>王道征途</title>
-		<titleShort>王道征途</titleShort>
+		<title>见习女皇</title>
+		<titleShort>见习女皇</titleShort>
 		<description>[PAWN_nameDef]顺利地在虫巢中长大后，她离开了生养她的巢穴并来到一片陌生的地域，着手准备建立自己的势力。\n\n[PAWN_nameDef]知道自己势单力薄，比起其他娇生惯养的姐妹，她在很多事情上更愿意亲力亲为。</description>
 		<slot>Adulthood</slot>
 		<skillGains>
@@ -47,9 +47,9 @@
 
 	<AlienRace.AlienBackstoryDef ParentName="ARA_BaseBackStory">
 		<defName>Arachnae_Node_BS_Child_1</defName>
-		<title>阿拉克涅虫族</title>
-		<titleShort>阿拉克涅虫族</titleShort>
-		<description>[PAWN_nameDef]是一只阿拉克涅虫族。</description>
+		<title>阿拉克涅督虫</title>
+		<titleShort>督虫</titleShort>
+		<description>[PAWN_nameDef]是一只阿拉克涅督虫——这个种姓的阿拉克涅虫族是虫巢的中坚力量，服从于女皇种的指挥的同时，也指挥着麾下的辅虫。她们从诞生之初便肩负着不同的使命，并且在较短的寿命中尽心尽力地服侍虫群。</description>
 		<slot>Childhood</slot>
 
 		<spawnCategories>
@@ -62,16 +62,15 @@
 
 		<requiresSpawnCategory>true</requiresSpawnCategory>
 	</AlienRace.AlienBackstoryDef>
-
 	<AlienRace.AlienBackstoryDef ParentName="ARA_BaseBackStory">
-		<defName>Arachnae_Node_BS_Adult_1</defName>
-		<title>阿拉克涅督虫种</title>
-		<titleShort>阿拉克涅督虫种</titleShort>
-		<description>[PAWN_nameDef]是一只阿拉克涅督虫种。</description>
+		<defName>Arachnae_Node_BS_Adult_Myrmecocystus</defName>
+		<title>阿拉克涅蜜罐种</title>
+		<titleShort>蜜罐种</titleShort>
+		<description>[PAWN_nameDef]是一只阿拉克涅蜜罐种督虫。基因的选择性表达使其长出了肿胀的囊袋和复杂的口器，这使得她可以吞噬那些未经过处理的尸体和各种杂食，并通过消化器官将其转变为阿拉克涅虫蜜以供其他虫族食用。\n\n[PAWN_nameDef]在战斗中并不是一个值得正视的对手，她虽然可以将胃酸喷出以抵抗近距离的来访者，但是自身没有可以接入武装器官的副肢，脆弱臃肿的特性也决定了她几乎无法躲开任何攻击。</description>
 		<slot>Adulthood</slot>
 
 		<spawnCategories>
-			<li>ArachnaeNode_spawnCategoriesB</li>
+			<li>ArachnaeNode_spawnCategories_Myrmecocystus</li>
 		</spawnCategories>
 	</AlienRace.AlienBackstoryDef>
 </Defs>

1.6/1.6/Defs/HediffDefs/ARA_Hediffs.xml

@@ -2,8 +2,8 @@
 <Defs>
   <HediffDef>
     <defName>ARA_AcidCoverd</defName>
-    <label>阿拉克涅虫液</label>
-    <description>一支拥有酸囊的阿拉克涅虫族向此人喷射了强酸，沾染的强酸将使得此人痛不欲生，盔甲和表皮软化，并持续灼烧它的身体。</description>
+    <label>阿拉克涅酸液</label>
+    <description>一支拥有酸囊的阿拉克涅虫族向此人喷射了强酸，沾染的液体将使得此人痛不欲生，盔甲和表皮软化，并持续灼烧它的身体。</description>
     <defaultLabelColor>(1, 1, 0.8)</defaultLabelColor>
     <hediffClass>ArachnaeSwarm.HediffCurseFlame</hediffClass>
     <comps>
@@ -18,7 +18,7 @@
     <modExtensions>
       <li Class="ArachnaeSwarm.CurseFlameModExt">
         <damageDefName>AcidBurn</damageDefName>
-        <damageRange>1~5</damageRange>
+        <damageRange>1~2</damageRange>
         <damageIntervalTicks>40</damageIntervalTicks>
       </li>
     </modExtensions>

1.6/1.6/Defs/HediffDefs/ARA_Hediffs_HiveMind.xml

@@ -14,6 +14,16 @@
         <label>连接至 {0} 个虫群工蜂</label>
         <minSeverity>0</minSeverity>
         <!-- Stat offsets will be added here later -->
+        <disablesNeeds>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Chemical_Alcohol</li>
+        </disablesNeeds>
+        <enablesNeeds>
+          <li>Indoors</li>
+        </enablesNeeds>
       </li>
     </stages>
   </HediffDef>

1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml

@@ -100,7 +100,7 @@
 	</PawnKindDef>
 	<PawnKindDef Name="ArachnaeNodeA_Colonist" ParentName="ArachnaeNodeABasePawnKind">
 		<defName>ArachnaeNode_Race_Myrmecocystus</defName>
-		<label>阿拉克涅督虫种</label>
+		<label>阿拉克涅蜜罐种</label>
 		<race>ArachnaeNode_Race_Myrmecocystus</race>
 		<defaultFactionType>PlayerColony</defaultFactionType>
 		<invNutrition>2.55</invNutrition>
@@ -108,7 +108,7 @@
 			<li>
 				<categories>
 					<li>ArachnaeNode_spawnCategoriesA</li>
-					<li>ArachnaeNode_spawnCategoriesB</li>
+					<li>ArachnaeNode_spawnCategories_Myrmecocystus</li>
 				</categories>
 			</li>
 		</backstoryFiltersOverride>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml

@@ -242,7 +242,7 @@
         <!-- 手术继承自人类 -->
         <humanRecipeImport>false</humanRecipeImport>
         <!-- 睡觉定义 -->
-        <canLayDown>true</canLayDown>
+        <canLayDown>false</canLayDown>
         <!-- 各种零件定义 -->
         <alienPartGenerator Inherit="False">
           <!-- 允许的头部 -->

1.6/1.6/Defs/Thing_Misc/ARA_Things_Items.xml

@@ -3,18 +3,18 @@
   <ThingDef ParentName="OrganicProductBase">
     <defName>ARA_InsectJelly</defName>
     <label>阿拉克涅虫蜜</label>
-    <description>由虫族储存和用作食物的果冻。它顺滑、浓郁，能满足食用者的娱乐需求。由于其独特的生物特性，它几乎可以滋养任何生物，永不腐烂。</description>
-    <possessionCount>10</possessionCount>
+    <description>由阿拉克涅虫族储存和用作食物的果冻。它顺滑、浓郁、永不腐烂，能满足食用者的娱乐需求。由于其独特的生物特性，非阿拉克涅虫族也可以食用这种食物，并且不会引起食物中毒。</description>
+    <possessionCount>20</possessionCount>
     <graphicData>
       <texPath>Things/Item/Resource/AnimalProductRaw/InsectJelly</texPath>
       <graphicClass>Graphic_StackCount</graphicClass>
     </graphicData>
     <socialPropernessMatters>true</socialPropernessMatters>
     <statBases>
-      <MarketValue>8.0</MarketValue>
+      <MarketValue>5.0</MarketValue>
       <Mass>0.025</Mass>
       <Nutrition>0.1</Nutrition>
-      <FoodPoisonChanceFixedHuman>0.02</FoodPoisonChanceFixedHuman>
+      <FoodPoisonChanceFixedHuman>0</FoodPoisonChanceFixedHuman>
     </statBases>
     <ingestible>
       <foodType>AnimalProduct</foodType>

1.6/1.6/Defs/Thing_building/ARA_Building.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <TerrainDef ParentName="FloorBase">
+    <defName>ARA_InsectSludge</defName>
+    <label>阿拉克涅菌毯</label>
+    <description>由阿拉克涅虫族所铺设的由真菌和分泌物混合得到的地面，清洁速度很快，但是对其他种族来说不太好看。</description>
+    <designationCategory>Floors</designationCategory>
+    <texturePath>Terrain/Surfaces/InsectSludge</texturePath>
+    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughLinearBurn</pollutionShaderType>
+    <pollutionOverlayTexturePath>Terrain/Surfaces/PollutionMud</pollutionOverlayTexturePath>
+    <pollutionColor>(1, 1, 1, 1)</pollutionColor>
+    <edgeType>FadeRough</edgeType>
+    <resourcesFractionWhenDeconstructed>0</resourcesFractionWhenDeconstructed>
+    <renderPrecedence>330</renderPrecedence>
+    <pathCost>0</pathCost>
+    <generatedFilth>Filth_Slime</generatedFilth>
+    <filthAcceptanceMask>
+      <li>Unnatural</li>
+    </filthAcceptanceMask>
+    <natural>true</natural>
+    <fertility>0</fertility>
+    <takeFootprints>True</takeFootprints>
+    <avoidWander>false</avoidWander>
+    <statBases>
+      <Beauty>-6</Beauty>
+      <CleaningTimeFactor>0.25</CleaningTimeFactor>
+      <Cleanliness>0</Cleanliness>
+      <Flammability>0.2</Flammability>
+    </statBases>
+    <!-- <tags>
+      <li>Insect</li>
+    </tags> -->
+  </TerrainDef>
+  <ThingDef ParentName="Wall">
+    <defName>ARA_InsectWall</defName>
+    <label>堆积山岩</label>
+    <description>阿拉克涅工蜂将硬质岩石堆起来形成的墙壁，非常坚硬并且不会花费材料，就是看起来不太美观。</description>
+    <uiOrder>1800</uiOrder>
+    <uiIconPath>Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon</uiIconPath>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Building/ARA_InsectWall</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+    </graphicData>
+    <designationCategory>Structure</designationCategory>
+    <mineable>true</mineable>
+    <blockLight>true</blockLight>
+    <statBases>
+      <MarketValue>0</MarketValue>
+      <Beauty>-6</Beauty>
+      <MaxHitPoints>1000</MaxHitPoints>
+      <WorkToBuild>1500</WorkToBuild>
+      <Flammability>0</Flammability>
+      <Cleanliness>0</Cleanliness>
+    </statBases>
+    <building>
+      <isAirtight>true</isAirtight>
+      <isNaturalRock>true</isNaturalRock>
+    </building>
+    <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+    <costStuffCount>0</costStuffCount>
+    <stuffCategories Inherit="False"/>
+    <!-- <placeWorkers>
+      <li>PlaceWorker_OnSubstructure</li>
+    </placeWorkers> -->
+    <damageMultipliers Inherit="False">
+      <li>
+        <damageDef>Bomb</damageDef>
+        <multiplier>0.1</multiplier>
+      </li>
+      <li>
+        <damageDef>Thump</damageDef>
+        <multiplier>0.1</multiplier>
+      </li>
+    </damageMultipliers>
+    <comps>
+      <li Class="ArachnaeSwarm.CompProperties_DelayedTerrainSpawn">
+        <delayTicks>60</delayTicks>        <!-- 60 ticks = 1 second -->
+        <terrainToSpawn>ARA_InsectSludge</terrainToSpawn>
+        <spawnRadius>1.35</spawnRadius>
+      </li>
+    </comps>
+  </ThingDef>
+</Defs>

1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml

@@ -3,7 +3,7 @@
   <ThingDef ParentName="BuildingNaturalBase">
     <defName>ARA_InteractiveEggSac</defName>
     <label>阿拉克涅虫卵囊-休眠中</label>
-    <description>一个脆弱、易燃、黏滑的囊状物，是阿拉克涅女皇种所诞之卵，内含哺育一只新督虫所需的营养和遗传物质——可以通过阿拉克涅女皇种的交互完成激活进程。</description>
+    <description>一个脆弱、易燃、黏滑的囊状物，是阿拉克涅女皇种所诞之卵，内含哺育一只新督虫所需的营养和遗传物质，可以通过阿拉克涅女皇种的交互完成激活进程——参阅虫卵的具体信息，了解各个督虫的特点。</description>
     <thingClass>Building</thingClass>
     <descriptionHyperlinks>
       <ThingDef>ArachnaeNode_Race_Myrmecocystus</ThingDef>
@@ -96,38 +96,5 @@
         <spawnRadius>4.6</spawnRadius>
       </li>
     </comps>
-
   </ThingDef>
-
-  <TerrainDef ParentName="FloorBase">
-    <defName>ARA_InsectSludge</defName>
-    <label>阿拉克涅菌毯</label>
-    <description>由阿拉克涅虫族所铺设的由真菌和分泌物混合得到的地面，清洁速度很快，但是对其他种族来说不太好看。</description>
-    <designationCategory>Floors</designationCategory>
-    <texturePath>Terrain/Surfaces/InsectSludge</texturePath>
-    <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughLinearBurn</pollutionShaderType>
-    <pollutionOverlayTexturePath>Terrain/Surfaces/PollutionMud</pollutionOverlayTexturePath>
-    <pollutionColor>(1, 1, 1, 1)</pollutionColor>
-    <edgeType>FadeRough</edgeType>
-    <resourcesFractionWhenDeconstructed>0</resourcesFractionWhenDeconstructed>
-    <renderPrecedence>330</renderPrecedence>
-    <pathCost>0</pathCost>
-    <generatedFilth>Filth_Slime</generatedFilth>
-    <filthAcceptanceMask>
-      <li>Unnatural</li>
-    </filthAcceptanceMask>
-    <natural>true</natural>
-    <fertility>0</fertility>
-    <takeFootprints>True</takeFootprints>
-    <avoidWander>false</avoidWander>
-    <statBases>
-      <Beauty>-6</Beauty>
-      <CleaningTimeFactor>0.25</CleaningTimeFactor>
-      <Cleanliness>0</Cleanliness>
-      <Flammability>0.2</Flammability>
-    </statBases>
-    <!-- <tags>
-      <li>Insect</li>
-    </tags> -->
-  </TerrainDef>
 </Defs>