2025-7-11

1.6/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml

@@ -26,11 +26,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Knight</defName>
+        <defName Degree="1">WULA_Trait_Knight</defName>
-        <degree>1</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Intellectual>2</Intellectual>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory02</defName>
@@ -57,11 +59,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Knight</defName>
+        <defName Degree="1">WULA_Trait_Knight</defName>
-        <degree>1</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Medicine>2</Medicine>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory03</defName>
@@ -87,11 +91,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Knight</defName>
+        <defName Degree="1">WULA_Trait_Knight</defName>
-        <degree>1</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Construction>2</Construction>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory04</defName>
@@ -116,11 +122,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Knight</defName>
+        <defName Degree="2">WULA_Trait_Knight</defName>
-        <degree>2</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Shooting>2</Shooting>
+      <Melee>2</Melee>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory05</defName>
@@ -148,11 +157,15 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Knight</defName>
+        <defName Degree="1">WULA_Trait_Knight</defName>
-        <degree>1</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Crafting>1</Crafting>
+      <Animals>1</Animals>
+      <Plants>1</Plants>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory10</defName>
@@ -181,6 +194,10 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
+    <passions>
+      <Mining>2</Mining>
+      <Plants>2</Plants>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory11</defName>
@@ -209,6 +226,11 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
+    <passions>
+      <Construction>1</Construction>
+      <Cooking>1</Cooking>
+      <Crafting>1</Crafting>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory12</defName>
@@ -221,7 +243,6 @@
       <Melee>2</Melee>
       <Construction>-5</Construction>
       <Cooking>-10</Cooking>
-      <Plants>-10</Plants>
       <Animals>-10</Animals>
       <Crafting>-10</Crafting>
       <Artistic>-10</Artistic>
@@ -241,11 +262,15 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Legal_Officer</defName>
+        <defName Degree="0">WULA_Trait_Legal_Officer</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Melee>1</Melee>
+      <Social>1</Social>
+      <Medicine>1</Medicine>
+    </passions>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 观测站 -->
@@ -273,11 +298,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Sculptor</defName>
+        <defName Degree="0">WULA_Trait_Sculptor</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Artistic>2</Artistic>
+      <Plants>2</Plants>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory101</defName>
@@ -304,11 +332,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Sculptor</defName>
+        <defName Degree="0">WULA_Trait_Sculptor</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Intellectual>2</Intellectual>
+      <Animals>2</Animals>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory102</defName>
@@ -333,11 +364,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Diplomat</defName>
+        <defName Degree="0">WULA_Trait_Diplomat</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Social>2</Social>
+      <Artistic>2</Artistic>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory103</defName>
@@ -359,6 +393,10 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
+    <passions>
+      <Shooting>2</Shooting>
+      <Medicine>2</Medicine>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory104</defName>
@@ -381,11 +419,15 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>Bloodlust</defName>
+        <defName Degree="0">Bloodlust</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Melee>2</Melee>
+      <Mining>1</Mining>
+      <Construction>1</Construction>
+    </passions>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 大教堂 -->
@@ -415,11 +457,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Nun</defName>
+        <defName Degree="0">WULA_Trait_Nun</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Plants>2</Plants>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory201</defName>
@@ -447,11 +491,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Nun</defName>
+        <defName Degree="0">WULA_Trait_Nun</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Crafting>2</Crafting>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory202</defName>
@@ -480,14 +526,17 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Nun</defName>
+        <defName Degree="0">WULA_Trait_Nun</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Melee>2</Melee>
+      <Shooting>2</Shooting>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
-    <defName>WULA_Adult_Backstory202</defName>
+    <defName>WULA_Adult_Backstory203</defName>
     <slot>Adulthood</slot>
     <title>人格矩阵装载：奥秘学士</title>
     <titleShort>人格-奥秘学士</titleShort>
@@ -513,14 +562,16 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Nun</defName>
+        <defName Degree="0">WULA_Trait_Nun</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Intellectual>2</Intellectual>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
-    <defName>WULA_Adult_Backstory203</defName>
+    <defName>WULA_Adult_Backstory204</defName>
     <slot>Adulthood</slot>
     <title>人格矩阵装载：福音侍者</title>
     <titleShort>人格-福音侍者</titleShort>
@@ -546,11 +597,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Nun</defName>
+        <defName Degree="0">WULA_Trait_Nun</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Social>2</Social>
+    </passions>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 图书馆 -->
@@ -583,11 +636,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Researcher</defName>
+        <defName Degree="0">WULA_Trait_Researcher</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Shooting>2</Shooting>
+      <Construction>1</Construction>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory301</defName>
@@ -617,11 +673,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Researcher</defName>
+        <defName Degree="0">WULA_Trait_Researcher</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Intellectual>2</Intellectual>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory302</defName>
@@ -654,11 +712,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Connector</defName>
+        <defName Degree="0">WULA_Trait_Connector</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Intellectual>2</Intellectual>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory303</defName>
@@ -687,11 +747,13 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Researcher</defName>
+        <defName Degree="0">WULA_Trait_Researcher</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Crafting>2</Crafting>
+    </passions>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory304</defName>
@@ -719,11 +781,14 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_Trait_Broken_Personality</defName>
+        <defName Degree="0">WULA_Trait_Broken_Personality</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>
+    <passions>
+      <Crafting>1</Crafting>
+      <Construction>1</Construction>
+    </passions>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 战争机械 -->
@@ -742,8 +807,7 @@
     <bodyTypeMale>Thin</bodyTypeMale>
     <forcedTraitsChance>
       <li>
-        <defName>WULA_AI_War_Machine</defName>
+        <defName Degree="0">WULA_AI_War_Machine</defName>
-        <degree>0</degree>
         <chance>100</chance>
       </li>
     </forcedTraitsChance>

1.6/Defs/Buildings/Buildings_Structure.xml

@@ -48,7 +48,7 @@
     <castEdgeShadows>true</castEdgeShadows>
     <fillPercent>1</fillPercent>
     <coversFloor>true</coversFloor>
-    <placingDraggableDimensions>1</placingDraggableDimensions>
+    <!-- <placingDraggableDimensions>1</placingDraggableDimensions> -->
     <tickerType>Never</tickerType>
     <rotatable>false</rotatable>
     <selectable>true</selectable>

1.6/Defs/HeadTypeDefs/WULA_HeadTypeDefs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <HeadTypeDef ParentName="AverageBase">
+    <defName>AverageNormal</defName>
+    <graphicPath>Wula/Things/Wula_Armour/Average_Normal</graphicPath>
+    <gender>None</gender>
+  </HeadTypeDef>
+</Defs>

1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <HediffDef Name="Wula_ImplantHediffBase">
+  <HediffDef Name="Wula_ImplantHediffBase" Abstract="True">
     <hediffClass>Hediff_Implant</hediffClass>
     <defaultLabelColor>(0.6, 0.6, 1.0)</defaultLabelColor>
     <isBad>false</isBad>
@@ -9,7 +9,7 @@
     <countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
     <allowMothballIfLowPriorityWorldPawn>true</allowMothballIfLowPriorityWorldPawn>
   </HediffDef>
-  <HediffDef Name="Wula_ImplantHediffBase_T1" ParentName="Wula_ImplantHediffBase">
+  <HediffDef Name="Wula_ImplantHediffBase_T1" ParentName="Wula_ImplantHediffBase" Abstract="True">
     <stages>
       <li>
         <capMods>
@@ -21,7 +21,7 @@
       </li>
     </stages>
   </HediffDef>
-  <HediffDef Name="Wula_ImplantHediffBase_T2" ParentName="Wula_ImplantHediffBase">
+  <HediffDef Name="Wula_ImplantHediffBase_T2" ParentName="Wula_ImplantHediffBase" Abstract="True">
     <stages>
       <li>
         <capMods>
@@ -33,7 +33,7 @@
       </li>
     </stages>
   </HediffDef>
-  <HediffDef Name="Wula_ImplantHediffBase_T3" ParentName="Wula_ImplantHediffBase">
+  <HediffDef Name="Wula_ImplantHediffBase_T3" ParentName="Wula_ImplantHediffBase" Abstract="True">
     <stages>
       <li>
         <capMods>
@@ -46,7 +46,7 @@
     </stages>
   </HediffDef>
   <!-- 能源炉 -->
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Energy_Furnace_Base</defName>
     <label>中央能源炉（基础）</label>
     <description>机械乌拉的核心部件之一，负责提供永不衰竭的澎湃机械动力，并代替各种内脏执行内循环的任务。</description>
@@ -71,7 +71,7 @@
       <li>FieldHand</li>
     </techHediffsTags> -->
   </ThingDef>
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Energy_Furnace_Overdrive</defName>
     <label>中央能源炉-超载组件</label>
     <description>安装于能源炉的特殊改件，除了获得常驻的移动速度外，还可以短时间超载机体，获得力量上的爆发性增益。</description>
@@ -112,6 +112,7 @@
     <label>超载组件</label>
     <description>安装于能源炉的特殊改件，除了获得常驻的移动速度外，还可以短时间超载机体，获得力量上的爆发性增益。</description>
     <duplicationAllowed>false</duplicationAllowed>
+    <minSeverity>1</minSeverity>
     <stages>
       <li>
         <statOffsets>
@@ -187,12 +188,12 @@
       <li Class="HediffCompProperties_Disappears">
         <showRemainingTime>true</showRemainingTime>
       </li>
-      <li Class="HediffCompProperties_Effecter">
+      <li Class="HediffCompProperties_Effecter" MayRequire="Ludeon.RimWorld.Anomaly">
         <stateEffecter>GhoulFrenzy</stateEffecter>
       </li>
     </comps>
   </HediffDef>
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Energy_Furnace_Hunger</defName>
     <label>中央能源炉-偷吃组件</label>
     <description>安装于能源炉的特殊改件，通过增加能源需求变相制造满足感，以增加合成人的心情。</description>
@@ -241,7 +242,7 @@
     <defaultInstallPart>WULA_Energy_Furnace_Bodypart</defaultInstallPart>
     <!-- <spawnThingOnRemoved>WULA_Addons_Antenna_Base</spawnThingOnRemoved> -->
   </HediffDef>
-  <!-- <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <!-- <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Energy_Furnace_Jumpdrive</defName>
     <label>中央能源炉-跃迁组件</label>
     <description>将一台精简的跃迁引擎直接安装在合成人的动力炉中，允许它们传送至附近的随机位置。</description>
@@ -327,7 +328,7 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Energy_Furnace_AntigrainShell</defName>
     <label>中央能源炉-自爆组件</label>
     <description>把一枚反粒子弹安装到体内的能源炉附近，允许合成人发起自杀式袭击。</description>
@@ -405,7 +406,7 @@
   </AbilityDef> -->
 
   <!-- 天线 -->
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="BodyPartProstheticMakeableBase">
     <defName>WULA_Addons_Antenna_Base</defName>
     <label>上行链路天线</label>
     <description>机械乌拉的核心部件之一，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。</description>
@@ -640,7 +641,7 @@
     <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>1500</workAmount>
@@ -679,7 +680,7 @@
     <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>3000</workAmount>
@@ -718,7 +719,7 @@
     <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>3000</workAmount>
@@ -757,7 +758,7 @@
     <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>1500</workAmount>
@@ -796,7 +797,7 @@
     <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>1500</workAmount>
@@ -843,7 +844,7 @@
     <surgeryOutcomeEffect IsNull="True"/> <!-- Always succeeds -->
     <addsHediff>WULA_Body_Fixed</addsHediff>
     <recipeUsers Inherit="False">
-      <li>wulaspecies</li>
+      <li>WulaSpecies</li>
     </recipeUsers>
     
     <workAmount>7000</workAmount>

1.6/Defs/HediffDefs/Hediffs_WULA.xml

@@ -9,7 +9,6 @@
     <everCurableByItem>false</everCurableByItem>
     <duplicationAllowed>false</duplicationAllowed>
     <keepOnBodyPartRestoration>True</keepOnBodyPartRestoration>
-    <causesNeed>WULA_Energy</causesNeed>
     <isBad>false</isBad>
     <stages>
       <li>
@@ -56,12 +55,15 @@
             <offset>0.20</offset>
           </li>
         </capMods>
+        <enablesNeeds>
+          <li>WULA_Energy</li>
+        </enablesNeeds>
+        <disablesNeeds>
+          <li>Food</li>
+          <li>Rest</li>
+        </disablesNeeds>
       </li>
     </stages>
-    <disablesNeeds>
-      <li>Food</li>
-      <li>Rest</li>
-    </disablesNeeds>
     <comps>
       <li Class="HediffCompProperties_ReactOnDamage">
         <damageDefIncoming>EMP</damageDefIncoming>
@@ -115,20 +117,20 @@
           <li>SensoryMechanites</li>
           <li>FibrousMechanites</li>
         </makeImmuneTo>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Food</li>
+          <li>Rest</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
       </li>
     </stages>
-    <disablesNeeds>
-      <li>Mood</li>
-      <li>Food</li>
-      <li>Rest</li>
-      <li>Joy</li>
-      <li>Beauty</li>
-      <li>Comfort</li>
-      <li>Outdoors</li>
-      <li>Indoors</li>
-      <li>DrugDesire</li>
-      <li>RoomSize</li>
-    </disablesNeeds>
     <comps>
       <li Class="HediffCompProperties_ReactOnDamage">
         <damageDefIncoming>EMP</damageDefIncoming>
@@ -186,20 +188,20 @@
           <li>SensoryMechanites</li>
           <li>FibrousMechanites</li>
         </makeImmuneTo>
+        <disablesNeeds>
+          <li>Mood</li>
+          <li>Food</li>
+          <li>Rest</li>
+          <li>Joy</li>
+          <li>Beauty</li>
+          <li>Comfort</li>
+          <li>Outdoors</li>
+          <li>Indoors</li>
+          <li>DrugDesire</li>
+          <li>RoomSize</li>
+        </disablesNeeds>
       </li>
     </stages>
-    <disablesNeeds>
-      <li>Mood</li>
-      <li>Food</li>
-      <li>Rest</li>
-      <li>Joy</li>
-      <li>Beauty</li>
-      <li>Comfort</li>
-      <li>Outdoors</li>
-      <li>Indoors</li>
-      <li>DrugDesire</li>
-      <li>RoomSize</li>
-    </disablesNeeds>
     <comps>
       <li Class="HediffCompProperties_ReactOnDamage">
         <damageDefIncoming>EMP</damageDefIncoming>

1.6/Defs/NeedDefs/WULA_Needs.xml

@@ -8,6 +8,9 @@
     <listPriority>800</listPriority>
     <major>true</major>
     <onlyIfCausedByHediff>true</onlyIfCausedByHediff>
+    <hediffRequiredAny>
+      <li>Wula_Synth</li>
+    </hediffRequiredAny>
     <showForCaravanMembers>true</showForCaravanMembers>
     <developmentalStageFilter>Baby, Child, Adult</developmentalStageFilter>
     <showUnitTicks>true</showUnitTicks>

1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -22,18 +22,14 @@
     <minGenerationAge MayRequire="Ludeon.RimWorld.Biotech">200</minGenerationAge>
     <forceNormalGearQuality>true</forceNormalGearQuality>
     <combatPower>0</combatPower>
+    <initialWillRange>10~20</initialWillRange>
+    <initialResistanceRange>10~20</initialResistanceRange>
     <itemQuality>Poor</itemQuality>
     <isFighter>false</isFighter>
     <apparelTags>
       <li>Wula_Apparel_Init</li>
     </apparelTags>
 
-    <apparelRequired>
-      <li>WULA_Sailor_Dress</li>
-      <li>WULA_Maid_Uniform</li>
-      <li>WULA_Nurse_Uniform</li>
-    </apparelRequired>
-
     <weaponMoney>0</weaponMoney>
     <apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
     <apparelMoney>1000~2000</apparelMoney>
@@ -68,6 +64,8 @@
     </lifeStages>
     <minGenerationAge MayRequire="Ludeon.RimWorld.Biotech">200</minGenerationAge>
     <combatPower>0</combatPower>
+    <initialWillRange>10~20</initialWillRange>
+    <initialResistanceRange>10~20</initialResistanceRange>
     <itemQuality>Poor</itemQuality>
     <isFighter>false</isFighter>
     <apparelTags>
@@ -96,6 +94,8 @@
     <race>Wula_AI_Heavy_Panzer</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <allowInMechClusters>False</allowInMechClusters>
+    <initialWillRange>9999</initialWillRange>
+    <initialResistanceRange>9999</initialResistanceRange>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -130,6 +130,8 @@
     <label>SMp-11"甲胄"</label>
     <race>Wula_Armour</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
+    <initialWillRange>9999</initialWillRange>
+    <initialResistanceRange>9999</initialResistanceRange>
     <lifeStages>
       <li>
         <bodyGraphicData>

1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml

@@ -106,7 +106,6 @@
     <researchViewX>3.00</researchViewX>
     <researchViewY>3.20</researchViewY>
     <prerequisites>
-      <li>NobleApparel</li>
       <li>WULA_Synth_Clothes_2_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -195,7 +194,7 @@
     </prerequisites>
   </ResearchProjectDef>
   <!-- 法杖 -->
-  <ResearchProjectDef ParentName="WULAtechBase">
+  <ResearchProjectDef ParentName="WULAtechBase" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_Synth_Psi_Technology</defName>
     <label>灵能基础套件</label>
     <description>开发能够供乌拉帝国合成人使用的基础灵能法杖，同时解锁从俘虏身上获取魂锲的能力。</description>
@@ -206,7 +205,7 @@
       <li>WULA_Adv_WorkTable_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
+  <ResearchProjectDef ParentName="WULAtechBase" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_Synth_Psi_2_Technology</defName>
     <label>灵能高级套件</label>
     <description>开发能够供乌拉帝国合成人使用的高级灵能法杖。</description>

1.6/Defs/ThingDefs/WULA_Item.xml

@@ -24,11 +24,6 @@
       <ingestSound>MechResurrectCast</ingestSound>
     </ingestible>
     <allowedArchonexusCount>200</allowedArchonexusCount>
-    <recipeMaker>
-      <!-- <workAmount>1080</workAmount> -->
-      <!-- <researchPrerequisite>DeadlifeDust</researchPrerequisite> -->
-      <displayPriority>0</displayPriority>
-    </recipeMaker>
     <tradeability>None</tradeability>
   </ThingDef>
 

1.6/Defs/ThingDefs_Buildings/Buildings_WULA.xml

@@ -183,6 +183,7 @@
     <!-- 可用配方 -->
     <recipes>
      <li>Make_WULA_Charge_Cube</li>
+     <li>Make_WULA_Charge_Cube_Group</li>
     </recipes>
     <inspectorTabs>
       <li>ITab_Bills</li>
@@ -447,14 +448,12 @@
     <inspectorTabs>
       <li>ITab_Bills</li>
     </inspectorTabs>
-    <comps>
     <comps>
       <li Class="CompProperties_Power">
         <compClass>CompPowerTrader</compClass>
         <basePowerConsumption>200</basePowerConsumption>
       </li>
     </comps>
-    </comps>
     <placeWorkers>
       <li>PlaceWorker_PreventInteractionSpotOverlap</li>
     </placeWorkers>

1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml

@@ -25,7 +25,7 @@
     </thingCategories>
     <statBases>
       <WorkToMake>15000</WorkToMake>
-      <Mass>0.25</Mass>
+      <Mass>1</Mass>
       <StuffEffectMultiplierArmor>0.2</StuffEffectMultiplierArmor>
       <StuffEffectMultiplierInsulation_Cold>0.22</StuffEffectMultiplierInsulation_Cold>
       <StuffEffectMultiplierInsulation_Heat>0.10</StuffEffectMultiplierInsulation_Heat>
@@ -132,6 +132,7 @@
       <useIngredientsForColor>false</useIngredientsForColor>
     </recipeMaker>
     <statBases>
+      <Mass>1</Mass>
       <WorkToMake>7000</WorkToMake>
     </statBases>
   </ThingDef>
@@ -166,6 +167,7 @@
       <useIngredientsForColor>false</useIngredientsForColor>
     </recipeMaker>
     <statBases>
+      <Mass>0.2</Mass>
       <WorkToMake>3000</WorkToMake>
     </statBases>
   </ThingDef>
@@ -261,9 +263,6 @@
     <defName>WULA_Maid_Uniform_Headband</defName>
     <label>乌拉帝国女仆发饰</label>
     <description>乌拉帝国女仆装的配套发饰。</description>
-    <thingCategories>
-      <li>Headgear</li>
-    </thingCategories>
     <recipeMaker>
       <researchPrerequisite>WULA_Synth_Clothes_Technology</researchPrerequisite>
       <recipeUsers Inherit="False">
@@ -344,9 +343,6 @@
     <defName>WULA_Nurse_Uniform_Headband</defName>
     <label>乌拉帝国护士帽</label>
     <description>乌拉帝国护士装的配套发饰。</description>
-    <thingCategories>
-      <li>Headgear</li>
-    </thingCategories>
     <recipeMaker>
       <researchPrerequisite>WULA_Synth_Clothes_Technology</researchPrerequisite>
       <recipeUsers Inherit="False">
@@ -405,7 +401,7 @@
     </apparel>
     <equippedStatOffsets>
 			<ResearchSpeedFactor>0.1</ResearchSpeedFactor>
-      <EntityStudyRate>0.1</EntityStudyRate>
+      <EntityStudyRate MayRequire="Ludeon.RimWorld.Anomaly">0.1</EntityStudyRate>
       <SocialImpact>0.1</SocialImpact>
     </equippedStatOffsets>
     <costStuffCount>100</costStuffCount>
@@ -458,6 +454,9 @@
       <useIngredientsForColor>false</useIngredientsForColor>
     </recipeMaker>
     <possessionCount>1</possessionCount>
+    <statBases>
+      <Mass>0.2</Mass>
+    </statBases>
   </ThingDef>
   <ThingDef ParentName="WULA_ApparelOnSkinBase">
 		<defName>WULA_Bodystocking</defName>
@@ -606,9 +605,6 @@
   </ThingDef>
   <ThingDef Name="WULA_ApparelHelmetBase" ParentName="HatMakeableBase" Abstract="True">
     <techLevel>Spacer</techLevel>
-    <thingCategories>
-      <li>Headgear</li>
-    </thingCategories>
     <recipeMaker>
       <displayPriority>105</displayPriority>
       <unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
@@ -935,6 +931,7 @@
         <minRange>8</minRange>
         <onlyManualCast>true</onlyManualCast>
         <hasStandardCommand>true</hasStandardCommand>
+        <forcedMissRadius>2</forcedMissRadius>
         <targetable>true</targetable>
         <violent>true</violent>
         <targetParams>

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -118,11 +118,15 @@
     </graphicData>
     <equippedAngleOffset>-65</equippedAngleOffset>
     <techLevel>Spacer</techLevel>
+    <smeltable>false</smeltable>
     <statBases>
       <MarketValue>100</MarketValue>
       <WorkToMake>1000</WorkToMake>
       <Mass>1</Mass>
     </statBases>
+    <costList Inherit="False">
+      <Steel>20</Steel>
+    </costList>
     <tools>
       <li>
         <label>槌头</label>
@@ -471,7 +475,7 @@
         <compClass>CompAbilityEffect_Teleport</compClass>
         <destination>Selected</destination>
         <requiresLineOfSight>false</requiresLineOfSight>
-        <psychic>True</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
         <range>80</range>
         <clamorType>Ability</clamorType>
         <clamorRadius>10</clamorRadius>
@@ -481,7 +485,7 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_Perception</defName>
     <label>APs-97"智之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，为其他殖民者提供随机灵感。</description>
@@ -565,7 +569,7 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_Flash</defName>
     <label>APs-7"闪之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，使得一片范围内的生物感到恶心眩晕。</description>
@@ -646,7 +650,7 @@
         <compClass>CompAbilityEffect_GiveHediff</compClass>
         <hediffDef>PsychicVertigo</hediffDef>
         <durationMultiplier>PsychicSensitivity</durationMultiplier>
-        <psychic>True</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
         <goodwillImpact>-15</goodwillImpact>
         <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
       </li>
@@ -655,7 +659,7 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_CLoak</defName>
     <label>APs-50"隐之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，使得一个目标在其他生物的眼皮底下被遮蔽而获得隐身。</description>
@@ -735,7 +739,7 @@
       <li Class = "CompProperties_AbilityGiveHediff">
         <compClass>CompAbilityEffect_GiveHediff</compClass>
         <hediffDef>PsychicInvisibility</hediffDef>
-        <psychic>True</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
       </li>
       <li Class="CompProperties_AbilityFleckOnTarget">
         <fleckDef>PsycastPsychicEffect</fleckDef>
@@ -743,7 +747,7 @@
     </comps>
     
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_Explosive</defName>
     <label>APs-66"燃之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，投射一发魂烬裂矢轰炸目标区域——这种以纯粹灵能作为驱动的射弹将无视所有的非护盾阻碍，发射时也不需要目标视线。</description>
@@ -833,7 +837,7 @@
     <comps>
       <li Class="CompProperties_AbilityLaunchProjectile">
         <projectileDef>Bullet_WULA_MW_Scepter_Of_Explosive</projectileDef>
-        <psychic>true</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
         <screenShakeIntensity>0.5</screenShakeIntensity>
       </li>
     </comps>
@@ -860,7 +864,7 @@
       <!-- <flyOverhead>true</flyOverhead> -->
     </projectile>
   </ThingDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_Lost</defName>
     <label>APs-00"惘之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，使小范围内的敌人陷入心灵冲击状态，从而失去战斗力。由于释放距离相当近，这种法杖被特地设计为短矛的样式，以在不使用法术的情况下对抗眼前的敌人。</description>
@@ -951,7 +955,7 @@
         <compClass>CompAbilityEffect_GiveHediff</compClass>
         <hediffDef>PsychicShock</hediffDef>
         <durationMultiplier>PsychicSensitivity</durationMultiplier>
-        <psychic>True</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
         <goodwillImpact>-15</goodwillImpact>
         <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
       </li>
@@ -960,7 +964,7 @@
       </li>
     </comps>
   </AbilityDef>
-  <ThingDef ParentName="BaseMeleeWeapon_Blunt">
+  <ThingDef ParentName="BaseMeleeWeapon_Blunt" MayRequire="Ludeon.RimWorld.Royalty">
     <defName>WULA_MW_Scepter_Of_Feather</defName>
     <label>APs-72"羽之杖"</label>
     <description>乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，为大范围内的所有殖民者和机械体提供持续数天的额外移动速度和工作速度。</description>
@@ -1044,7 +1048,7 @@
         <compClass>CompAbilityEffect_GiveHediff</compClass>
         <hediffDef>WULA_MW_Scepter_Of_Feather_Hediff</hediffDef>
         <durationMultiplier>PsychicSensitivity</durationMultiplier>
-        <psychic>True</psychic>
+        <psychic MayRequire="Ludeon.RimWorld.Royalty">True</psychic>
       </li>
       <li Class="CompProperties_AbilityFleckOnTarget">
         <fleckDef>PsycastPsychicEffect</fleckDef>
@@ -1263,11 +1267,11 @@
     <statBases>
       <WorkToMake>40000</WorkToMake>
       <Mass>4.5</Mass>
-      <AccuracyTouch>0.8</AccuracyTouch>
+      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.8</AccuracyShort>
+      <AccuracyShort>0.5</AccuracyShort>
-      <AccuracyMedium>0.8</AccuracyMedium>
+      <AccuracyMedium>0.5</AccuracyMedium>
-      <AccuracyLong>0.65</AccuracyLong>
+      <AccuracyLong>0.4</AccuracyLong>
-      <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li>
@@ -1501,6 +1505,7 @@
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_WM_Panzer_Turret</defaultProjectile>
         <warmupTime>0</warmupTime>
+        <forcedMissRadius>0.1</forcedMissRadius>
         <minRange>5.9</minRange>
         <range>75</range>
         <burstShotCount>1</burstShotCount>
@@ -1546,11 +1551,11 @@
     <statBases>
       <WorkToMake>40000</WorkToMake>
       <Mass>150</Mass>
-      <AccuracyTouch>0.9</AccuracyTouch>
+      <AccuracyTouch>0.8</AccuracyTouch>
-      <AccuracyShort>0.9</AccuracyShort>
+      <AccuracyShort>0.8</AccuracyShort>
-      <AccuracyMedium>0.8</AccuracyMedium>
+      <AccuracyMedium>0.7</AccuracyMedium>
-      <AccuracyLong>0.75</AccuracyLong>
+      <AccuracyLong>0.65</AccuracyLong>
-      <RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
       <Steel>500</Steel>
@@ -1572,6 +1577,7 @@
         <warmupTime>0.25</warmupTime>
         <range>36</range>
         <burstShotCount>10</burstShotCount>
+        <forcedMissRadius>0.1</forcedMissRadius>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <soundCast>Shot_TurretSniper</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
@@ -1784,6 +1790,7 @@
         <defaultProjectile>Bullet_WULA_RW_Armour_AR</defaultProjectile>
         <warmupTime>0.5</warmupTime>
         <range>32</range>
+        <forcedMissRadius>0.1</forcedMissRadius>
         <burstShotCount>12</burstShotCount>
         <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
         <soundCast>Shot_ChargeRifle</soundCast>
@@ -1969,6 +1976,7 @@
         <defaultProjectile>Bullet_WULA_MW_Armour_Lance</defaultProjectile>
         <warmupTime>2.25</warmupTime>
         <minRange>3</minRange>
+        <forcedMissRadius>0.1</forcedMissRadius>
         <range>68</range>
         <burstShotCount>1</burstShotCount>
         <soundCast>Shot_TurretSniper</soundCast>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -266,6 +266,18 @@
           <li>WULA_Sailor_Dress</li>
           <li>WULA_Body_Suit</li>
           <li>WULA_Knight_PowerArmor</li>
+          <li>WULA_Maid_Uniform</li>
+          <li>WULA_Maid_Uniform_Headband</li>
+          <li>WULA_Nurse_Uniform</li>
+          <li>WULA_Nurse_Uniform_Headband</li>
+          <li>WULA_Qipao</li>
+          <li>WULA_Bodystocking</li>
+          <li>WULA_Bodystocking_White</li>
+          <li>WULA_Body_Suit</li>
+          <li>WULA_Assault_Troop_PowerArmor</li>
+          <li>WULA_Assault_Troop_Helmet</li>
+          <li>WULA_Knight_Helmet</li>
+          <li>WULA_Heavy_Infantry_PowerArmor</li>
         </apparelList>
         <blackApparelList>
             <li>Apparel_AdvancedHelmet</li>
@@ -388,8 +400,8 @@
       <!-- 基础血量，很高 -->
 			<baseHealthScale>2.5</baseHealthScale>
 			<!-- 解剖产物 -->
-			<leatherDef>Leather_Light</leatherDef>
+			<leatherDef>Steel</leatherDef>
-      <specificMeatDef>Meat_Twisted</specificMeatDef>
+      <specificMeatDef>Steel</specificMeatDef>
 			<!-- 身体类型 -->
 			<body>WULA_Machine_Body</body>
       <!-- 年龄阶段 -->
@@ -424,13 +436,15 @@
           <minAge>0</minAge>
         </li>
       </lifeStageAges>
-      <butcherProducts>
+      <canFlyInVacuum>true</canFlyInVacuum>
-        <Steel>30</Steel>
-      </butcherProducts>
     </race>
 
-    <Recipes>
+    <butcherProducts>
-    </Recipes> 
+      <Steel>30</Steel>
+    </butcherProducts>
+
+    <recipes>
+    </recipes> 
 
     <comps>
       <li Class="CompProperties_Stunnable">
@@ -474,7 +488,7 @@
         <alienPartGenerator Inherit="False">
           <!-- 允许的头部 -->
           <headTypes Inherit="False">
-            <li>Female_AverageNormal</li>
+            <li>AverageNormal</li>
             <!-- <li>Female_AverageWide</li>
             <li>Female_AveragePointy</li> -->
           </headTypes>
@@ -708,9 +722,6 @@
 			<bloodDef>Filth_MachineBits</bloodDef>
       <!-- 基础血量，很高 -->
 			<baseHealthScale>5</baseHealthScale>
-			<!-- 解剖产物 -->
-			<leatherDef>Leather_Light</leatherDef>
-      <specificMeatDef>Meat_Twisted</specificMeatDef>
 			<!-- 身体类型 -->
 			<body>WULA_AI_Heavy_Panzer_Body</body>
       <!-- 大小 -->
@@ -747,17 +758,21 @@
           <minAge>0</minAge>
         </li>
       </lifeStageAges>
-      <butcherProducts>
-        <Steel>50</Steel>
-        <Plasteel>20</Plasteel>
-      </butcherProducts>
       <nameGenerator MayRequire="Ludeon.RimWorld.Biotech">NamerMech</nameGenerator>
       <mechWeightClass>Heavy</mechWeightClass>
+      <canFlyInVacuum>true</canFlyInVacuum>
       <!-- <mechFixedSkillLevel>20</mechFixedSkillLevel> -->
     </race>
 
-    <recipe Inherit="False">
+    <butcherProducts>
-    </recipe>
+      <Steel>50</Steel>
+      <Plasteel>20</Plasteel>
+    </butcherProducts>
+    
+    <recipes>
+    </recipes>
+
+    <receivesSignals>true</receivesSignals>
 
     <comps>
       <li Class="CompProperties_CanBeDormant" />
@@ -775,7 +790,7 @@
       <li MayRequire="Ludeon.RimWorld.Biotech" Class="CompProperties_MechRepairable" />
     </comps>
 
-    <tools>
+    <tools Inherit="False">
       <li>
         <label>碾压</label>
         <labelNoLocation>碾压</labelNoLocation>
@@ -784,7 +799,7 @@
         </capacities>
         <power>14</power>
         <cooldownTime>2.9</cooldownTime>
-        <linkedBodyPartsGroup>WULA_Panzer_Core_Bodypart</linkedBodyPartsGroup>
+        <linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
     </tools>
@@ -818,7 +833,7 @@
         <alienPartGenerator Inherit="False">
           <!-- 允许的头部 -->
           <headTypes Inherit="False">
-            <li>Female_AverageNormal</li>
+            <li>AverageNormal</li>
             <!-- <li>Female_AverageWide</li>
             <li>Female_AveragePointy</li> -->
           </headTypes>
@@ -1054,9 +1069,6 @@
 			<bloodDef>Filth_MachineBits</bloodDef>
       <!-- 基础血量，很高 -->
 			<baseHealthScale>4</baseHealthScale>
-			<!-- 解剖产物 -->
-			<leatherDef>Leather_Light</leatherDef>
-      <specificMeatDef>Meat_Twisted</specificMeatDef>
 			<!-- 身体类型 -->
 			<body>Wula_Armour_Body</body>
       <!-- 大小 -->
@@ -1093,16 +1105,21 @@
           <minAge>0</minAge>
         </li>
       </lifeStageAges>
-      <butcherProducts>
-        <Steel>50</Steel>
-        <Plasteel>20</Plasteel>
-      </butcherProducts>
       <nameGenerator MayRequire="Ludeon.RimWorld.Biotech">NamerMech</nameGenerator>
       <mechWeightClass>Heavy</mechWeightClass>
+      <canFlyInVacuum>true</canFlyInVacuum>
       <!-- <mechFixedSkillLevel>20</mechFixedSkillLevel> -->
     </race>
-    <recipe Inherit="False">
+
-    </recipe>
+    <receivesSignals>true</receivesSignals>
+    
+    <recipes>
+    </recipes>
+  
+    <butcherProducts>
+      <Steel>50</Steel>
+      <Plasteel>20</Plasteel>
+    </butcherProducts>
 
     <comps>
       <li Class="CompProperties_CanBeDormant" />
@@ -1135,7 +1152,7 @@
       </li>
     </comps>
 
-    <tools>
+    <tools Inherit="False">
       <li>
         <label>肘击</label>
         <labelNoLocation>肘击</labelNoLocation>
@@ -1144,7 +1161,7 @@
         </capacities>
         <power>15</power>
         <cooldownTime>1.75</cooldownTime>
-        <linkedBodyPartsGroup>Arm</linkedBodyPartsGroup>
+        <linkedBodyPartsGroup>Arms</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
       <li>
@@ -1155,7 +1172,7 @@
         </capacities>
         <power>12</power>
         <cooldownTime>1.5</cooldownTime>
-        <linkedBodyPartsGroup>Hand</linkedBodyPartsGroup>
+        <linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
     </tools>
@@ -1193,6 +1210,7 @@
       </lifeStageAges>
       <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
       <!-- <baseHealthScale>4</baseHealthScale> -->
+       <canFlyInVacuum>true</canFlyInVacuum>
     </race>
     <!-- <comps Inherit="False">
       <li Class="CompProperties_CanBeDormant" />
@@ -1238,6 +1256,7 @@
       </lifeStageAges>
       <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
       <!-- <baseHealthScale>4</baseHealthScale> -->
+       <canFlyInVacuum>true</canFlyInVacuum>
     </race>
     <!-- <comps Inherit="False">
       <li Class="CompProperties_CanBeDormant" />

1.6/Defs/TraitDefs/Traits_WULA.xml

@@ -57,9 +57,9 @@
           <AimingDelayFactor>0.5</AimingDelayFactor>
           <ShootingAccuracyPawn>5</ShootingAccuracyPawn>
         </statFactors>
-        <StatOffsets>
+        <statOffsets>
           <SocialImpact>0.2</SocialImpact>
-        </StatOffsets>
+        </statOffsets>
       </li>
     </degreeDatas>
   </TraitDef>
@@ -82,10 +82,6 @@
   </TraitDef>
   <TraitDef>
     <defName>WULA_Trait_Diplomat</defName>
-    <forcedPassions>
-      <li>Artistic</li>
-      <li>Social</li>
-    </forcedPassions>
     <degreeDatas>
       <li>
         <label>外交官</label>
@@ -147,25 +143,6 @@
       </li>
     </degreeDatas>
   </TraitDef>
-  <TraitDef>
-    <defName>WULA_Trait_Connector</defName>
-    <forcedPassions>
-      <li>Intellectual</li>
-    </forcedPassions>
-    <degreeDatas>
-      <li>
-        <label>高维链接者</label>
-        <description>这些乌拉星人长时间与一个非本位面的设施进行跨维链接，已经慢慢地变得非人化。</description>
-        <disablesNeeds>
-          <li>Joy</li>
-          <li>DrugDesire</li>
-        </disablesNeeds>
-        <statOffsets>
-          <GlobalLearningFactor>0.5</GlobalLearningFactor>
-        </statOffsets>
-      </li>
-    </degreeDatas>
-  </TraitDef>
   
   <TraitDef>
     <defName>WULA_Trait_Broken_Personality</defName>
@@ -193,7 +170,6 @@
       <li>
         <label>战争机器</label>
         <description>这是乌拉帝国创造的高智能战争机械，拥有思考的能力。</description>
-        <degree>1</degree>
         <disablesNeeds>
         </disablesNeeds>
       </li>

About/About.xml

@@ -4,7 +4,6 @@
   <author>Tourswen</author>
   <description></description>
   <supportedVersions>
-    <li>1.5</li>
     <li>1.6</li>
   </supportedVersions>
   <packageId>Tourswen.WulaFallenEmpire</packageId>
@@ -31,6 +30,7 @@
   <loadAfter>
     <li>brrainz.harmony</li>
     <li>Ludeon.RimWorld</li>
+    <li>Ludeon.RimWorld.Biotech</li>
     <li>erdelf.HumanoidAlienRaces</li>
   </loadAfter>