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

1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml

@@ -408,7 +408,7 @@
     </verbProperties>
     <comps>
       <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>ArachnaeBase_Race_Acid_Proj</projectileDef>
+        <projectileDef>ArachnaeBase_Race_Acidcut_Proj</projectileDef>
       </li>
       <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">
         <needDef>Food</needDef>
@@ -418,17 +418,16 @@
     </comps>
   </AbilityDef>
   <ThingDef ParentName="BaseGrenadeProjectile">
-    <defName>ArachnaeBase_Race_Acid_Proj</defName>
+    <defName>ArachnaeBase_Race_Acidcut_Proj</defName>
     <label>阿拉克涅酸噬种</label>
     <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
-    <uiIconPath>Wula/Things/WULA_Attack_Cat/WULA_Cat_Thin_south</uiIconPath>
     <graphicData>
-      <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+      <texPath>ArachnaeSwarm/Things/ARA_Acidcut/Bodies/Naked_Thin</texPath>
       <graphicClass>Graphic_Multi</graphicClass>
     </graphicData>
     <projectile>
       <speed>41</speed>
-      <spawnsPawnKind>ArachnaeBase_Race_Acid</spawnsPawnKind>
+      <spawnsPawnKind>ArachnaeBase_Race_Acidcut</spawnsPawnKind>
       <tryAdjacentFreeSpaces>true</tryAdjacentFreeSpaces>
       <damageDef>ARA_AcidBurn</damageDef>
       <damageAmountBase>10</damageAmountBase>
@@ -1053,7 +1052,7 @@
 
   <AbilityDef>
     <defName>ARA_Pouch_Hatching_Acidling</defName>
-    <label>蜕荚孵化：酸爆种投射</label>
+    <label>蜕荚孵化：酸爆种</label>
     <description>立刻在脚下孵化三只阿拉克涅酸爆种辅虫，它们会对敌方发起自杀性攻击。</description>
     <iconPath>ArachnaeSwarm/UI/Abilities/ARA_BaseRace_Launcher</iconPath>
     <cooldownTicksRange>5000</cooldownTicksRange>
@@ -1075,7 +1074,7 @@
     </verbProperties>
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
-        <projectileDef>ArachnaeBase_Race_Acidling_Proj</projectileDef>
+        <projectileDef>ling_Proj</projectileDef>
         <numProjectiles>3</numProjectiles>
       </li>
       <li Class="ArachnaeSwarm.CompProperties_AbilityNeedCost">

1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Damage.xml

@@ -275,7 +275,7 @@
       <li Class="HediffCompProperties_DisappearsOnDeath"/>
       <li Class="ArachnaeSwarm.HediffCompProperties_SpawnPawnOnRemoved">
         <pawnKindDefs>
-          <li>ArachnaeBase_Race_Acid</li>
+          <li>ArachnaeBase_Race_Acidcut</li>
         </pawnKindDefs>
         <spawnCount>1</spawnCount>
         <fixedBiologicalAge>0</fixedBiologicalAge>

1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml

@@ -361,15 +361,14 @@
 		</lifeStages>
 	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
-		<defName>ArachnaeBase_Race_Acid</defName>
+		<defName>ArachnaeBase_Race_Acidcut</defName>
 		<label>阿拉克涅酸噬种</label>
-		<race>ArachnaeBase_Race_Acid</race>
+		<race>ArachnaeBase_Race_Acidcut</race>
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
-					<texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+					<texPath>ArachnaeSwarm/Things/ARA_Acidcut/Bodies/Naked_Thin</texPath>
 					<drawSize>1</drawSize>
-					<color>(156,148,125)</color>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
 						<offset>(0,0,-0.15)</offset>
@@ -389,9 +388,8 @@
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
-					<texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+					<texPath>ArachnaeSwarm/Things/ARA_Acidling/Bodies/Naked_Thin</texPath>
 					<drawSize>1</drawSize>
-					<color>(156,148,125)</color>
 					<shadowData>
 						<volume>(0.4, 0.5, 0.37)</volume>
 						<offset>(0,0,-0.15)</offset>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml

@@ -57,7 +57,7 @@
     </comps>
   </ThingDef>
   <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Acid</defName>
+    <defName>ArachnaeBase_Race_Acidcut</defName>
     <label>阿拉克涅酸噬种</label>
     <description>阿拉克涅辅虫之一，智力低下，一般被作为活体炮弹打出，击中敌人后若是还没散架，就会继续依靠带酸液的颚撕咬敌军。</description>
     <race>

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

@@ -1763,7 +1763,7 @@
   </ThingDef>
   <ThingDef ParentName="BaseGrenadeProjectile">
     <defName>ArachnaeBase_Race_Skyhive_Proj</defName>
-    <label>阿拉克涅酸噬种</label>
+    <label>阿拉克涅天巢种</label>
     <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
     <graphicData>
       <texPath>ArachnaeSwarm/Things/ARA_Skyhive/Bodies/Naked_Thin_north</texPath>

1.6/1.6/Defs/Thing_building/ARA_SwarmTurret.xml

@@ -577,7 +577,7 @@
     <label>阿拉克涅酸爆种</label>
     <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
     <graphicData>
-      <texPath>Things/Pawn/Animal/Spelopede/Spelopede</texPath>
+      <texPath>ArachnaeSwarm/Things/ARA_Acidling/Bodies/Naked_Thin</texPath>
       <graphicClass>Graphic_Multi</graphicClass>
     </graphicData>
     <projectile>