11

1.6/1.6/Defs/Effects/ARA_Flecks.xml

@@ -200,7 +200,7 @@
             <fleckDef>ARA_Mote_Melee_Attack_Main</fleckDef>
             <burstCount>1</burstCount>
             <color>(170,74,68)</color>
-            <scale>3.5~4.5</scale>
+            <scale>6.5~7.5</scale>
             <speed>0.5</speed>
             <angle>-35~35</angle>
             <spawnLocType>OnSource</spawnLocType>
@@ -211,7 +211,7 @@
             <fleckDef>ARA_Mote_Melee_Attack_Main</fleckDef>
             <burstCount>1</burstCount>
             <color>(147,50,28)</color>
-            <scale>2.5~3.5</scale>
+            <scale>6.5~7.5</scale>
             <speed>0.5</speed>
             <angle>-15~15</angle>
             <spawnLocType>OnSource</spawnLocType>
@@ -227,7 +227,7 @@
             <fleckDef>ARA_Mote_Melee_Attack_Main</fleckDef>
             <burstCount>1</burstCount>
             <color>(170,74,68)</color>
-            <scale>3.5~4.5</scale>
+            <scale>6.5~7.5</scale>
             <speed>0.5</speed>
             <angle>180~196</angle>
             <spawnLocType>OnSource</spawnLocType>
@@ -238,7 +238,7 @@
             <fleckDef>ARA_Mote_Melee_Attack_Main</fleckDef>
             <burstCount>1</burstCount>
             <color>(147,50,28)</color>
-            <scale>2.5~3.5</scale>
+            <scale>6.5~7.5</scale>
             <speed>0.5</speed>
             <angle>195~215</angle>
             <spawnLocType>OnSource</spawnLocType>
@@ -249,6 +249,29 @@
     </children>
     <positionRadius>0.1</positionRadius>
   </EffecterDef>
+  <EffecterDef>
+    <defName>ARA_Area_Crush</defName>
+    <children>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <fleckDef>Fleck_BlastMechBandShockwave</fleckDef>
+        <burstCount>1</burstCount>
+        <spawnLocType>OnSource</spawnLocType>
+        <absoluteAngle>true</absoluteAngle>
+        <rotation>0~0</rotation>
+      </li>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <moteDef>Mote_GiantExplosion</moteDef>
+        <scale>1~1</scale>
+      </li>
+      <li>
+        <subEffecterClass>SubEffecter_SprayerTriggered</subEffecterClass>
+        <moteDef>Mote_GiantExplosionInner</moteDef>
+        <scale>5~5</scale>
+      </li>
+    </children>
+  </EffecterDef>
 
   <FleckDef ParentName="FleckBase">
     <defName>ARA_Fleck_Icez_Cloud</defName>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceBeastSwarm.xml

@@ -13,9 +13,9 @@
     </race>
     <tools Inherit="False">
       <li>
-        <label>挥击</label>
+        <label>镰爪挥击</label>
         <capacities>
-          <li>Cut</li>
+          <li>ARA_PawnBodyWeapon_Cleave</li>
         </capacities>
         <power>65</power>
         <armorPenetration>2</armorPenetration>
@@ -23,14 +23,16 @@
       </li>
     </tools>
     <comps>
-      <li Class="ArachnaeSwarm.CompProperties_Cleave">
-        <cleaveAngle>120</cleaveAngle>
-        <cleaveRange>4</cleaveRange>
-        <cleaveDamageFactor>0.75</cleaveDamageFactor>
+      <li Class="ArachnaeSwarm.CompProperties_PawnBodyWeapon">
+        <cleaveAngle>60</cleaveAngle>
+        <cleaveRange>6</cleaveRange>
+        <cleaveDamageFactor>1</cleaveDamageFactor>
         <damageDowned>false</damageDowned>
-        <explosionDamageDef>Cut</explosionDamageDef>
+        <cleaveDamageDef>Cut</cleaveDamageDef>
         <attackEffecter>ARA_Double_Melee_Attack_Hit</attackEffecter>
         <cleaveEffecter>ARA_Double_Melee_Attack_Hit</cleaveEffecter>
+        <requiresMeleeSkill>true</requiresMeleeSkill>
+        <onlyWhenDrafted>false</onlyWhenDrafted>
       </li>
       <li Class="ArachnaeSwarm.CompProperties_AdvancedTraining">
         <trainables>
@@ -67,6 +69,31 @@
         </trainables>
         <disableAllSkillDecay>true</disableAllSkillDecay>        <!-- 阻止这个动物的所有技能衰减 -->
       </li>
+      <li Class="ArachnaeSwarm.CompProperties_AreaDamage">
+        <radius>4</radius>
+        <damageIntervalTicks>120</damageIntervalTicks>
+        <damageDef>Crush</damageDef>
+        <damageAmount>60</damageAmount>
+        <scaleWithPsychicSensitivity>false</scaleWithPsychicSensitivity>
+        <areaEffecterDef>ARA_Area_Crush</areaEffecterDef>
+      </li>
     </comps>
   </ThingDef>
-</Defs>
+  <ToolCapacityDef>
+    <defName>ARA_PawnBodyWeapon_Cleave</defName>
+    <label>镰爪挥击</label>
+  </ToolCapacityDef>
+  <ManeuverDef>
+    <defName>ARA_PawnBodyWeapon_Cleave</defName>
+    <requiredCapacity>ARA_PawnBodyWeapon_Cleave</requiredCapacity>
+    <verb>
+      <verbClass>ArachnaeSwarm.Verb_MeleeAttack_BodyWeapon</verbClass>
+      <meleeDamageDef>Cut</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>

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

@@ -215,8 +215,8 @@
         </cocoonDefs>
       </li>
       <li Class="ArachnaeSwarm.CompProperties_Cleave">
-        <cleaveAngle>90</cleaveAngle>
-        <cleaveRange>2.5</cleaveRange>
+        <cleaveAngle>30</cleaveAngle>
+        <cleaveRange>3.5</cleaveRange>
         <cleaveDamageFactor>0.5</cleaveDamageFactor>
         <damageDowned>false</damageDowned>
         <explosionDamageDef>Cut</explosionDamageDef>

1.6/1.6/Defs/Thing_building/ARA_Building.xml

@@ -170,6 +170,7 @@
     <label>光滑的阿拉克涅甲壳墙</label>
     <description>阿拉克涅工蜂将硬质材料和甲壳素混合堆起来形成的墙壁，虫族对这片墙壁进行了精心打磨，质地坚硬的同时看起来美观多了。</description>
     <uiIconPath>Things/Building/Linked/WallSmooth_MenuIcon</uiIconPath>
+    <designationCategory IsNull="True" Inherit="False"/>
     <graphicData>
       <texPath>Things/Building/Linked/RockSmooth_Atlas</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -347,6 +348,7 @@
     <altitudeLayer>DoorMoveable</altitudeLayer>
     <fillPercent>1</fillPercent>
     <useHitPoints>true</useHitPoints>
+    <designationCategory IsNull="True" Inherit="False"/>
     <graphicData>
       <texPath>ArachnaeSwarm/Building/Door/ARA_InsectDoor</texPath>
       <graphicClass>Graphic_Multi</graphicClass>

1.6/1.6/Defs/Thing_building/ARA_NutrientNetworkBuilding.xml

@@ -407,6 +407,7 @@
     <renderPrecedence>250</renderPrecedence>
     <texturePath>ArachnaeSwarm/Terrain/Surfaces/ARA_InsectJelly_Terrain</texturePath>
     <burnedDef>ARA_InsectCreep</burnedDef>
+    <designationCategory IsNull="True" Inherit="False"/>
     <color>(231, 224, 188)</color>
     <pollutionOverlayTexturePath>Terrain/Surfaces/AncientMegastructure</pollutionOverlayTexturePath>
     <pollutionShaderType MayRequire="Ludeon.RimWorld.Biotech">TerrainFadeRoughSoftLight</pollutionShaderType>