骨鞭

1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml

@@ -828,7 +828,7 @@
       <verbClass>Verb_CastAbilityTouch</verbClass>
       <drawAimPie>false</drawAimPie>
       <range>-1</range>
-      <warmupTime>1</warmupTime>
+      <warmupTime>2</warmupTime>
       <targetParams>
         <canTargetSelf>false</canTargetSelf>
         <canTargetMechs>false</canTargetMechs>

1.6/1.6/Defs/DamageDefs/ARA_Damages.xml

@@ -53,6 +53,31 @@
       </li>
     </additionalHediffsThisPart>
   </DamageDef>
+  <DamageDef ParentName="CutBase">
+    <defName>ARA_AcidCut_Damage</defName>
+    <label>酸性撕咬</label>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <deathMessage>{0} 被携带酸液的巨颚咬死了。</deathMessage>
+    <additionalHediffs>
+      <li>
+        <hediff>ARA_AcidCoverd</hediff>
+        <severityPerDamageDealt>0.01</severityPerDamageDealt>
+      </li>
+    </additionalHediffs>
+  </DamageDef>
+  <DamageDef ParentName="BluntBase">
+    <defName>ARA_Whip_Damage</defName>
+    <label>鞭打</label>
+    <workerClass>DamageWorker_Stab</workerClass>
+    <deathMessage>{0} 被抽死了。</deathMessage>
+    <stabChanceOfForcedInternal>0.4</stabChanceOfForcedInternal>
+    <additionalHediffs>
+      <li>
+        <hediff>ARA_Whip_Hediff</hediff>
+        <severityPerDamageDealt>0.1</severityPerDamageDealt>
+      </li>
+    </additionalHediffs>
+  </DamageDef>
 
   <DamageDef ParentName="Bite">
     <defName>ARA_MimicNematodeBite</defName>

1.6/1.6/Defs/EvolutionDefs/ARA_Evolution.xml

@@ -876,4 +876,79 @@
       </li>
     </comps>
   </HediffDef>
+
+  <!-- 迷雾种 -->
+  <HediffDef>
+    <defName>ARA_ShieldHead_Base</defName>
+    <label>坚硬甲壳</label>
+    <description>盾头种虽然身材较小而没有大型阿拉克涅虫族那样的压迫感，但是得益于其覆盖全身的甲壳，防御力可一点不比那些大型虫族弱。它的甲壳被特意设置为会过度生长并脱落，虫族则可以利用其脱落的甲壳作为建设巢穴的工具。一只盾头种每天产出15份甲壳素。</description>
+    <descriptionHyperlinks>
+    </descriptionHyperlinks>
+    <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>
+      </li>
+    </stages>
+    <comps>
+      <li Class="ArachnaeSwarm.MoharHediffs.HediffCompProperties_Spawner">
+        <!--
+          ==================================================
+          基础设置 (Basic Settings)
+          ==================================================
+        -->
+        <!-- [DEBUG] 如果为true，则为此组件启用详细的调试日志记录。 -->
+        <debug>true</debug>
+        <!-- 要生成的物品的ThingDef。 -->
+        <thingToSpawn>ARA_Carapace</thingToSpawn>
+        <!-- 每次生成的基础物品数量。 -->
+        <spawnCount>15</spawnCount>
+        <!-- 
+          ==================================================
+          生成周期 (Spawning Interval)
+          ==================================================
+        -->
+        <!-- 下一次生成事件发生前的最少天数。 -->
+        <minDaysB4Next>1</minDaysB4Next>
+        <!-- 下一次生成事件发生前的最大天数。 -->
+        <maxDaysB4Next>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>true</hungerRelative>
+        <!-- 如果为true，当宿主Pawn受伤时，生成将暂停。 -->
+        <healthRelative>false</healthRelative>
+      </li>
+      <li Class="HediffCompProperties_GiveAbility">
+        <abilityDefs>
+        </abilityDefs>
+      </li>
+      <li Class="HediffCompProperties_RemoveIfOtherHediff">
+        <hediffs>
+          <li>ARA_Smokepop_Production_Bacterium</li>
+        </hediffs>
+      </li>
+    </comps>
+  </HediffDef>
 </Defs>

1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Damage.xml

@@ -280,4 +280,26 @@
       </li>
     </stages>
   </HediffDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>ARA_Whip_Hediff</defName>
+    <label>被鞭打</label>
+    <description>阿拉克涅虫族的软体武器抽中了这个殖民者——那可是很痛的。</description>
+    <labelNoun>被鞭打</labelNoun>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>-4</severityPerDay>
+      </li>
+      <li Class="HediffCompProperties_Disappears">
+        <disappearsAfterTicks>1800</disappearsAfterTicks>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>1</painPerSeverity>
+      <bleedRate>0</bleedRate>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Destroyed</destroyedLabel>
+    </injuryProps>
+  </HediffDef>
 </Defs>

1.6/1.6/Defs/ResearchProjectDefs/ARA_ResearchProjects.xml

@@ -122,7 +122,7 @@
     <description>允许女皇种孵化新的虫族——原虫种，一种可以寄生在别的种族身上以控制它们的特殊督虫。</description>
     <baseCost>150</baseCost>
     <researchViewX>5.50</researchViewX>
-    <researchViewY>2.10</researchViewY>
+    <researchViewY>2.80</researchViewY>
     <requiredResearchBuilding>ARA_ResearchBench</requiredResearchBuilding>
     <prerequisites>
       <li>ARA_Technology_1WMT</li>
@@ -205,6 +205,19 @@
       <li>ARA_Technology_2WMT</li>
     </prerequisites>
   </ResearchProjectDef>
+  <!-- 近战发展 -->
+  <ResearchProjectDef ParentName="ARA_techBase">
+    <defName>ARA_Technology_2MEL</defName>
+    <label>节点MEL-2"骨鞭"</label>
+    <description>允许工艺种孵化新的武器。</description>
+    <baseCost>150</baseCost>
+    <researchViewX>6.50</researchViewX>
+    <researchViewY>2.80</researchViewY>
+    <requiredResearchBuilding>ARA_ResearchBench</requiredResearchBuilding>
+    <prerequisites>
+      <li>ARA_Technology_1WMT</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <!-- 建筑发展 -->
   <ResearchProjectDef ParentName="ARA_techBase">
     <defName>ARA_Technology_5SHL</defName>
@@ -263,8 +276,8 @@
     <label>节点MED-2"拟线寄生"</label>
     <description>允许蜜罐种使用拟线种寄生的能力，并在医药茧中解锁拟线种抑制剂的制作。</description>
     <baseCost>150</baseCost>
-    <researchViewX>7.00</researchViewX>
-    <researchViewY>2.70</researchViewY>
+    <researchViewX>6.50</researchViewX>
+    <researchViewY>2.20</researchViewY>
     <requiredResearchBuilding>ARA_ResearchBench</requiredResearchBuilding>
     <prerequisites>
       <li>ARA_Technology_1MED</li>
@@ -291,7 +304,7 @@
     <description>允许蜜罐种进行定向进化，以强化其自身的医疗能力并解锁孵化医药茧的技能。</description>
     <baseCost>150</baseCost>
     <researchViewX>5.50</researchViewX>
-    <researchViewY>2.70</researchViewY>
+    <researchViewY>2.20</researchViewY>
     <requiredResearchBuilding>ARA_ResearchBench</requiredResearchBuilding>
     <prerequisites>
       <li>ARA_Technology_1WMT</li>
@@ -322,5 +335,4 @@
       <li>ARA_Technology_5KYC</li>
     </prerequisites>
   </ResearchProjectDef>
-</Defs>
-
+</Defs>

1.6/1.6/Defs/SoundDefs/ARA_Sounds.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><Defs>
+  <SoundDef>
+    <defName>ARA_MW_Cartilage_Whip_Hit</defName>  
+    <context>MapOnly</context>   
+    <maxSimultaneous>2</maxSimultaneous>
+    <subSounds>
+      <li>
+        <grains>
+          <li Class="AudioGrain_Clip">
+            <clipPath>ArachnaeSwarm/ARA_MW_Cartilage_Whip_Hit</clipPath>
+          </li>
+        </grains>      
+        <volumeRange>65</volumeRange>
+        <pitchRange>0.9~1.1</pitchRange>
+      </li>
+    </subSounds>
+  </SoundDef>
+</Defs>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml

@@ -331,6 +331,7 @@
           <li>ARA_MW_Bone_Sword</li>
           <li>ARA_RW_Basic_SkyHive_Gun</li>
           <li>ARA_RW_Toxic_Needle_MG</li>
+          <li>ARA_MW_Cartilage_Whip</li>
         </weaponList>
         <onlyUseRaceRestrictedWeapons>true</onlyUseRaceRestrictedWeapons>
         <!-- 可以穿戴的衣服 -->
@@ -889,10 +890,12 @@
     </race>
 
     <comps>
-      <li Class="ArachnaeSwarm.CompProperties_MilkableArachnae">
-        <milkDef>ARA_Carapace</milkDef>
-        <milkIntervalDays>1</milkIntervalDays>
-        <milkAmount>15</milkAmount>
+      <li Class="ArachnaeSwarm.CompProperties_HediffGiver">
+        <hediffs>
+          <li>ARA_ShieldHead_Base</li>
+        </hediffs>
+        <addChance>1.0</addChance>
+        <allowDuplicates>false</allowDuplicates>
       </li>
       <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
         <freeProduction>true</freeProduction>
@@ -955,7 +958,7 @@
       <!-- <RestRateMultiplier>1</RestRateMultiplier> -->
       <!-- <HungerRateMultiplier>1</HungerRateMultiplier> -->
       <!-- <EatingSpeed>5</EatingSpeed> -->
-      <MaxNutrition>2</MaxNutrition>
+      <MaxNutrition>2.25</MaxNutrition>
 
       <CarryingCapacity>100</CarryingCapacity>
       <MeatAmount>40</MeatAmount>

1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon.xml

@@ -67,6 +67,82 @@
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
   </ThingDef>
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>ARA_MW_Cartilage_Whip</defName>
+    <label>武装器官"软骨鞭"</label>
+    <description>阿拉克涅虫群督虫使用的近战武装器官，以节节软骨交错形成强韧的鞭子。这种武器在打击敌人时不仅会发出骇人的声响，还会使得对手疼痛难忍，并且以击打为主的钝器伤害也能很好地规避敌方装甲的防御。</description>
+    <descriptionHyperlinks>
+      <ThingDef>ARA_Cocoon_Weapon_1Stage</ThingDef>
+    </descriptionHyperlinks>
+    <weaponTags>
+      <li>ARA_Armed_Organ</li>
+      <li>ARA_Armed_Organ_Melee</li>
+      <li>ARA_Armed_Organ_T2</li>
+    </weaponTags>
+    <graphicData>
+      <texPath>ArachnaeSwarm/Weapon/ARA_MW_Cartilage_Whip</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>1</drawSize>
+    </graphicData>
+    <uiIconScale>1</uiIconScale>
+    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
+    <techLevel>Animal</techLevel>
+    <!-- <equippedAngleOffset>-25</equippedAngleOffset> -->
+    <costStuffCount>0</costStuffCount>
+    <stuffCategories Inherit="False"/>
+    <costList Inherit="False">
+      <ARA_Carapace>50</ARA_Carapace>
+    </costList>
+    <statBases>
+      <WorkToMake>1000</WorkToMake>
+      <Mass>5</Mass>
+    </statBases>
+    <tools Inherit="False">
+      <li>
+        <label>鞭打</label>
+        <capacities>
+          <li>ARA_Whip</li>
+        </capacities>
+        <power>14</power>
+        <armorPenetration>1.25</armorPenetration>
+        <cooldownTime>1.75</cooldownTime>
+        <extraMeleeDamages>
+          <li>
+            <def>Stun</def>
+            <amount>8</amount>
+          </li>
+        </extraMeleeDamages>
+        <soundMeleeHit>ARA_MW_Cartilage_Whip_Hit</soundMeleeHit>
+        <soundMeleeMiss>ARA_MW_Cartilage_Whip_Hit</soundMeleeMiss>
+      </li>
+    </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False" />
+      <researchPrerequisite>ARA_Technology_2MEL</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ToolCapacityDef>
+    <defName>ARA_Whip</defName>
+    <label>鞭打</label>
+  </ToolCapacityDef>
+  <ManeuverDef>
+    <defName>ARA_Whip</defName>
+    <requiredCapacity>ARA_Whip</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>ARA_Whip_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>
 
   <!-- 针 -->
   <ThingDef ParentName="BaseHumanMakeableGun">

1.6/1.6/Defs/Thing_building/ARA_InteractiveEggSac.xml

@@ -412,6 +412,7 @@
     <descriptionHyperlinks>
       <ThingDef>ArachnaeNode_Race_Myrmecocystus</ThingDef>
       <ThingDef>ArachnaeNode_Race_Smokepop</ThingDef>
+      <ThingDef>ArachnaeNode_Race_NeuroSwarm</ThingDef>
     </descriptionHyperlinks>
     <graphicData>
       <color>(0.9, 0.9 ,0.5)</color>
@@ -434,6 +435,11 @@
             <delayTicks>360000</delayTicks>
             <requiredResearch>ARA_Technology_5KYC</requiredResearch>
           </li>
+          <li>
+            <pawnKind>ArachnaeNode_Race_NeuroSwarm</pawnKind>
+            <delayTicks>1440000</delayTicks>
+            <requiredResearch>ARA_Technology_6KYC</requiredResearch>
+          </li>
         </spawnablePawns>
         <whitelist>
           <li>ARA_ArachnaeQueen</li>
@@ -787,6 +793,7 @@
     <label>阿拉克涅孵化茧 武装器官 等级1</label>
     <description>一个布满尖刺的囊状物，是阿拉克涅工艺种所诞之卵，内含孵化一个武装器官的营养物质，可以通过阿拉克涅工艺种的交互完成激活进程——参阅茧的超链接，了解其能生产的所有装备的特点。\n\n孵化茧对温度极度敏感（该类型的茧适温为-20~35°C），需要小心保护！</description>
     <descriptionHyperlinks>
+      <ThingDef>ARA_MW_Cartilage_Whip</ThingDef>
       <ThingDef>ARA_RW_Basic_Acid_Spreay_Gun</ThingDef>
       <ThingDef>ARA_RW_Toxic_Needle_MG</ThingDef>
       <ThingDef>ARA_RW_Basic_SkyHive_Gun</ThingDef>
@@ -810,6 +817,12 @@
       <!-- The refactored producer component -->
       <li Class="ArachnaeSwarm.CompProperties_InteractiveProducer">
         <processes>
+          <li>
+            <thingDef>ARA_MW_Cartilage_Whip</thingDef>
+            <productionTicks>240000</productionTicks>
+            <totalNutritionNeeded>30</totalNutritionNeeded>
+            <requiredResearch>ARA_Technology_2MEL</requiredResearch>
+          </li>
           <li>
             <thingDef>ARA_RW_Basic_Acid_Spreay_Gun</thingDef>
             <productionTicks>240000</productionTicks>

1.6/1.6/Defs/Thing_building/ARA_WormholeDefs.xml

@@ -21,6 +21,9 @@
     <passability>Impassable</passability>
     <tickerType>Normal</tickerType>
     <category>Building</category>
+    <researchPrerequisites>
+      <li>ARA_Technology_1TUN</li>
+    </researchPrerequisites>
     <statBases>
       <MaxHitPoints>1000</MaxHitPoints>
       <WorkToBuild>8000</WorkToBuild>