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

1.6/1.6/Defs/FaceTypeDefs/ArachnaeNode_Race/ARA_FaceType.xml

@@ -175,5 +175,42 @@
   <FacialAnimation.SkinTypeDef ParentName="ArachnaeNode_Skin" MayRequire="Nals.FacialAnimation">
 	  <defName>ArachnaeNode_Race_WeaponSmith_SkinNormal</defName>
 		<raceName>ArachnaeNode_Race_WeaponSmith</raceName>
+  </FacialAnimation.SkinTypeDef>
+
+	<FacialAnimation.BrowTypeDef ParentName="ArachnaeNode_Brow" MayRequire="Nals.FacialAnimation">
+		<defName>ArachnaeNode_Race_Facehugger_BrowNormal</defName>
+		<raceName>ArachnaeNode_Race_Facehugger</raceName>
+	</FacialAnimation.BrowTypeDef>
+  <FacialAnimation.EyeballTypeDef ParentName="ArachnaeNode_EyeA" MayRequire="Nals.FacialAnimation">
+    <defName>ArachnaeNode_Race_Facehugger_EyeNormal</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.EyeballTypeDef>
+  <FacialAnimation.EyeballTypeDef ParentName="ArachnaeNode_EyeB" MayRequire="Nals.FacialAnimation">
+    <defName>ArachnaeNode_Race_Facehugger_EyeNormal2</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.EyeballTypeDef>
+  <FacialAnimation.EyeballTypeDef ParentName="ArachnaeNode_EyeC" MayRequire="Nals.FacialAnimation">
+    <defName>ArachnaeNode_Race_Facehugger_EyeNormal3</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.EyeballTypeDef>
+  <FacialAnimation.EyeballTypeDef ParentName="ArachnaeNode_EyeD" MayRequire="Nals.FacialAnimation">
+    <defName>ArachnaeNode_Race_Facehugger_EyeNormal4</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.EyeballTypeDef>
+  <FacialAnimation.HeadTypeDef ParentName="ArachnaeNode_Head" MayRequire="Nals.FacialAnimation">
+	  <defName>ArachnaeNode_Race_Facehugger_HeadNormal</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.HeadTypeDef>
+  <FacialAnimation.LidTypeDef ParentName="ArachnaeNode_Lid" MayRequire="Nals.FacialAnimation">
+	  <defName>ArachnaeNode_Race_Facehugger_LidNormal</defName>
+    <raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.LidTypeDef>
+  <FacialAnimation.MouthTypeDef ParentName="ArachnaeNode_Mouth" MayRequire="Nals.FacialAnimation">
+		<defName>ArachnaeNode_Race_Facehugger_MouthNormal</defName>
+		<raceName>ArachnaeNode_Race_Facehugger</raceName>
+  </FacialAnimation.MouthTypeDef>
+  <FacialAnimation.SkinTypeDef ParentName="ArachnaeNode_Skin" MayRequire="Nals.FacialAnimation">
+	  <defName>ArachnaeNode_Race_Facehugger_SkinNormal</defName>
+		<raceName>ArachnaeNode_Race_Facehugger</raceName>
   </FacialAnimation.SkinTypeDef>
 </Defs>

1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
   <HediffDef>
     <defName>ARA_Possession</defName>
     <label>阿拉克涅原虫</label>
@@ -14,30 +13,28 @@
       <li>
         <nodeClass>PawnRenderNode_AttachmentHead</nodeClass>
         <workerClass>PawnRenderNodeWorker_FlipWhenCrawling</workerClass>
-        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Heads/Average_Normal</texPath>
+        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Facehugger_Upperhead</texPath>
         <colorType>Skin</colorType>
         <parentTagDef>Head</parentTagDef>
-        <useSkinShader>true</useSkinShader>
+        <useSkinShader>false</useSkinShader>
-        <useRottenColor>true</useRottenColor>
+        <useRottenColor>false</useRottenColor>
         <rotDrawMode>Fresh, Rotting</rotDrawMode>
+        <drawSize>0.85</drawSize>
         <drawData>
+          <dataNorth>
+            <offset>(0, 0, 0.2)</offset>
+          </dataNorth>
+          <dataEast>
+            <offset>(0, 0, 0.2)</offset>
+          </dataEast>
+          <dataSouth>
+            <offset>(0, 0, 0.2)</offset>
+          </dataSouth>
+          <dataWest>
+            <offset>(0, 0, 0.2)</offset>
+          </dataWest>
           <defaultData>
-            <layer>53</layer>
+            <layer>800</layer>
-          </defaultData>
-        </drawData>
-      </li>
-      <li>
-        <nodeClass>PawnRenderNode_AttachmentHead</nodeClass>
-        <workerClass>PawnRenderNodeWorker_FlipWhenCrawling</workerClass>
-        <texPath>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Addons_Base</texPath>
-        <colorType>Skin</colorType>
-        <parentTagDef>Head</parentTagDef>
-        <useSkinShader>true</useSkinShader>
-        <useRottenColor>true</useRottenColor>
-        <rotDrawMode>Fresh, Rotting</rotDrawMode>
-        <drawData>
-          <defaultData>
-            <layer>70</layer>
           </defaultData>
         </drawData>
       </li>

1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml

@@ -941,18 +941,22 @@
         <alienPartGenerator>
           <!-- 额外身体部件 -->
           <bodyAddons>
-            <li>
-              <path>ArachnaeSwarm/Things/ARA_HiveNode/Addons/ArachnaeNode_Race_Myrmecocystus_Addons_Stomach</path>
-              <inFrontOfBody>false</inFrontOfBody>
-              <!-- <conditions>
-                <BodyPart>
-                  <bodyPart>WULA_Addons_Antenna_Bodypart</bodyPart>
-                </BodyPart>
-              </conditions> -->
-            </li>
           </bodyAddons>
         </alienPartGenerator>
       </generalSettings>
+      <!-- 图形，留空 -->
+      <graphicPaths Inherit="False">
+        <!-- 皮肤颜色 -->
+        <skinColor>(1,1,1,1)</skinColor>
+        <!-- 皮肤着色器 -->
+        <skinShader>Cutout</skinShader>
+        <body>ArachnaeSwarm/Things/ARA_Facehugger/Bodies/</body>
+        <head>
+          <path>ArachnaeSwarm/Things/ARA_HiveNode/Heads/</path>
+        </head>
+        <skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton>
+        <stump>ArachnaeSwarm/Things/ARA_Facehugger/Bodies/Naked_Thin</stump>
+      </graphicPaths>
       <!-- 种族的允许和禁止特化设置 -->
       <raceRestriction>
         <!-- 武器列表 -->

1.6/1.6/Defs/ThingDef_Races/ARA_RaceQueen.xml

@@ -394,7 +394,10 @@
         <li>
           <key>HairDef</key>
           <value>
-            <hasStyle>false</hasStyle>
+            <hasStyle>true</hasStyle>
+            <styleTagsOverride>
+              <li>Bald</li>
+            </styleTagsOverride>
           </value>
         </li>
         <!-- 纹身 -->

1.6/1.6/Defs/Thing_Misc/Weapons/WULA_Weapon.xml

@@ -71,10 +71,11 @@
     <tickerType>Normal</tickerType>
     <techLevel>Animal</techLevel>
     <graphicData>
-      <texPath>ArachnaeSwarm/Weapon/ARA_RW_Basic_Acid_Bladder_Gun</texPath>
+      <texPath>ArachnaeSwarm/Weapon/ARA_RW_Basic_Fist_Needle_Gun</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.2</drawSize>
+      <drawSize>0.75</drawSize>
     </graphicData>
+    <uiIconScale>1.3</uiIconScale>
     <soundInteract>SpitterSpawn</soundInteract>
     <recipeMaker>
       <recipeUsers Inherit="False" />