2025-6-26

1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml

@@ -4,15 +4,18 @@
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory01</defName>
     <slot>Adulthood</slot>
-    <title>人格矩阵-帝国骑士</title>
+    <title>人格矩阵装载：探险骑士</title>
-    <titleShort>人格-骑士</titleShort>
+    <titleShort>人格-探险骑士</titleShort>
-    <description>[PAWN_possessive] 人格矩阵中装载了一个乌拉帝国骑士的模拟记忆。\n\n帝国骑士团是乌拉帝国的皇帝禁军，但是在皇室驾崩后，骑士团与国教势力纷争四起，为了适应局势他们无所不用其极，昔日的恪守的美德已经化为教条和传说，变成虚无缥缈的身外之物。诚然，骑士团已经堕落至极，但是她们的武艺犹如鞘中利刃，从未被混乱侵蚀，并随时准备斩下帝国之敌的头颅。</description>
+    <description>[PAWN_possessive]人格矩阵中装载了一个乌拉帝国探险骑士的模拟记忆。\n\n帝国骑士团是乌拉帝国的皇帝禁军，但是在皇室驾崩后，骑士团与国教势力纷争四起，为了适应局势他们无所不用其极，昔日的恪守的美德已经化为教条和传说，变成虚无缥缈的身外之物。诚然，骑士团已经堕落，但是她们的武艺仍犹如鞘中利刃，随时准备斩下帝国之敌的头颅。\n\n探险骑士是帝国骑士团的中坚力量，她们人数众多，是见习骑士向上晋升迈过的第一道门槛，并代表着她们杀敌的技艺和信念已经得到认证。</description>
     <skillGains>
-      <Shooting>5</Shooting>
+      <Shooting>8</Shooting>
-      <Melee>5</Melee>
+      <Melee>8</Melee>
-      <Medicine>2</Medicine>
+      <Cooking>-5</Cooking>
+      <Animals>-7</Animals>
+      <Crafting>-5</Crafting>
+      <Intellectual>-5</Intellectual>
     </skillGains>
-    <workDisables>Hauling, Mining</workDisables>
+    <workDisables>ManualDumb,Mining,PlantWork,Constructing</workDisables>
     <requiredWorkTags>None</requiredWorkTags>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
@@ -20,7 +23,6 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <shuffleable>False</shuffleable>
     <possessions>
       <Apparel_PackTurret MayRequire="Ludeon.RimWorld.Anomaly">1</Apparel_PackTurret>
     </possessions>
@@ -28,4 +30,91 @@
       <WULA_Trait_Knight>1</WULA_Trait_Knight>
     </forcedTraits>
   </AlienRace.AlienBackstoryDef>
+
+  <AlienRace.AlienBackstoryDef>
+    <defName>WULA_Adult_Backstory02</defName>
+    <slot>Adulthood</slot>
+    <title>人格矩阵装载：医院骑士</title>
+    <titleShort>人格-医院骑士</titleShort>
+    <description>[PAWN_possessive]人格矩阵中装载了一个乌拉帝国医院骑士的模拟记忆。\n\n帝国骑士团是乌拉帝国的皇帝禁军，但是在皇室驾崩后，骑士团与国教势力纷争四起，为了适应局势他们无所不用其极，昔日的恪守的美德已经化为教条和传说，变成虚无缥缈的身外之物。诚然，骑士团已经堕落，但是她们的武艺仍犹如鞘中利刃，随时准备斩下帝国之敌的头颅。\n\n医院骑士是帝国骑士团的一个较小的旁支，相比于打打杀杀，她们踏上了一条更加高尚的道途——以自己的力量从战场上抢救消逝的生命。</description>
+    <skillGains>
+      <Shooting>5</Shooting>
+      <Melee>5</Melee>
+      <Medicine>8</Medicine>
+      <Animals>-7</Animals>
+      <Crafting>-7</Crafting>
+      <Intellectual>-7</Intellectual>
+    </skillGains>
+    <workDisables>ManualDumb,Mining,PlantWork,Constructing</workDisables>
+    <requiredWorkTags>None</requiredWorkTags>
+    <spawnCategories>
+      <li>Wula_Backstory_Categories</li>
+    </spawnCategories>
+    <bodyTypeGlobal>Thin</bodyTypeGlobal>
+    <bodyTypeFemale>Thin</bodyTypeFemale>
+    <bodyTypeMale>Thin</bodyTypeMale>
+    <possessions>
+      <Apparel_PackTurret MayRequire="Ludeon.RimWorld.Anomaly">1</Apparel_PackTurret>
+    </possessions>
+    <forcedTraits>
+      <WULA_Trait_Knight>1</WULA_Trait_Knight>
+    </forcedTraits>
+  </AlienRace.AlienBackstoryDef>
+  
+  <AlienRace.AlienBackstoryDef>
+    <defName>WULA_Adult_Backstory03</defName>
+    <slot>Adulthood</slot>
+    <title>人格矩阵装载：坚盾骑士</title>
+    <titleShort>人格-坚盾骑士</titleShort>
+    <description>[PAWN_possessive]人格矩阵中装载了一个乌拉帝国坚盾骑士的模拟记忆。\n\n帝国骑士团是乌拉帝国的皇帝禁军，但是在皇室驾崩后，骑士团与国教势力纷争四起，为了适应局势他们无所不用其极，昔日的恪守的美德已经化为教条和传说，变成虚无缥缈的身外之物。诚然，骑士团已经堕落，但是她们的武艺仍犹如鞘中利刃，随时准备斩下帝国之敌的头颅。\n\n坚盾骑士是帝国骑士团中戍守长城防线的将军，她们精于工事防御，并知道如何调度防线以防止敌舰队的定向突破。虽然目前长城防线已经被乌拉帝国的进步派攻陷，但是她们依然用自己的胆识和智谋在其他战场上发光发热。</description>
+    <skillGains>
+      <Shooting>5</Shooting>
+      <Melee>5</Melee>
+      <Construction>8</Constructing>
+      <Medicine>-7</Medicine>
+      <Intellectual>-3</Intellectual>
+    </skillGains>
+    <workDisables>ManualDumb,Mining,PlantWork,Animals</workDisables>
+    <requiredWorkTags>None</requiredWorkTags>
+    <spawnCategories>
+      <li>Wula_Backstory_Categories</li>
+    </spawnCategories>
+    <bodyTypeGlobal>Thin</bodyTypeGlobal>
+    <bodyTypeFemale>Thin</bodyTypeFemale>
+    <bodyTypeMale>Thin</bodyTypeMale>
+    <possessions>
+      <Apparel_PackTurret MayRequire="Ludeon.RimWorld.Anomaly">1</Apparel_PackTurret>
+    </possessions>
+    <forcedTraits>
+      <WULA_Trait_Knight>1</WULA_Trait_Knight>
+    </forcedTraits>
+  </AlienRace.AlienBackstoryDef>
+  
+  <AlienRace.AlienBackstoryDef>
+    <defName>WULA_Adult_Backstory04</defName>
+    <slot>Adulthood</slot>
+    <title>人格矩阵装载：荣耀骑士</title>
+    <titleShort>人格-荣耀骑士</titleShort>
+    <description>[PAWN_possessive]人格矩阵中装载了一个乌拉帝国荣耀骑士的模拟记忆。\n\n帝国骑士团是乌拉帝国的皇帝禁军，但是在皇室驾崩后，骑士团与国教势力纷争四起，为了适应局势他们无所不用其极，昔日的恪守的美德已经化为教条和传说，变成虚无缥缈的身外之物。诚然，骑士团已经堕落，但是她们的武艺仍犹如鞘中利刃，随时准备斩下帝国之敌的头颅。\n\n荣耀骑士是帝国骑士团中最顶层的骑士，她们通过了骑士圣典中规定的四大誓言之一的历练，并由骑士团长亲自授勋。这代表着她们的技艺已经炉火纯青，是无可挑剔的人中龙凤。</description>
+    <skillGains>
+      <Shooting>10</Shooting>
+      <Melee>10</Melee>
+      <Medicine>-7</Medicine>
+      <Intellectual>-3</Intellectual>
+    </skillGains>
+    <workDisables>ManualDumb,Mining,PlantWork,Animals,Crafting,Cooking,Constructing</workDisables>
+    <requiredWorkTags>None</requiredWorkTags>
+    <spawnCategories>
+      <li>Wula_Backstory_Categories</li>
+    </spawnCategories>
+    <bodyTypeGlobal>Thin</bodyTypeGlobal>
+    <bodyTypeFemale>Thin</bodyTypeFemale>
+    <bodyTypeMale>Thin</bodyTypeMale>
+    <possessions>
+      <Apparel_PackTurret MayRequire="Ludeon.RimWorld.Anomaly">1</Apparel_PackTurret>
+    </possessions>
+    <forcedTraits>
+      <WULA_Trait_Knight>2</WULA_Trait_Knight>
+    </forcedTraits>
+  </AlienRace.AlienBackstoryDef>
 </Defs>

1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml

@@ -8,24 +8,23 @@
     <titleShort>缸中之脑</titleShort>  
     <description>[PAWN_nameDef] 是诞生于培养缸中的大脑，生来便是为了作为乌拉帝国合成人的核心处理器。\n\n纯净、一尘不染的大脑被培养舱人为地植入了大量预设的技能，使得它还未感知这个世界便已经成为了完人。</description>  
     <skillGains>
-      <Shooting>10</Shooting>
+      <Shooting>5</Shooting>
-      <Melee>10</Melee>
+      <Melee>5</Melee>
-      <Construction>10</Construction>
+      <Construction>5</Construction>
-      <Mining>10</Mining>
+      <Mining>5</Mining>
-      <Cooking>10</Cooking>
+      <Cooking>5</Cooking>
-      <Plants>10</Plants>
+      <Plants>5</Plants>
-      <Animals>10</Animals>
+      <Animals>5</Animals>
-      <Crafting>10</Crafting>
+      <Crafting>5</Crafting>
-      <Artistic>10</Artistic>
+      <Artistic>5</Artistic>
-      <Medicine>10</Medicine>
+      <Medicine>5</Medicine>
-      <Social>10</Social>
+      <Social>5</Social>
-      <Intellectual>10</Intellectual>
+      <Intellectual>5</Intellectual>
     </skillGains>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <requiredWorkTags>None</requiredWorkTags>
-    <shuffleable>False</shuffleable>  
     <possessions>
       <MedicineUltratech>2</MedicineUltratech>
     </possessions>

1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>  
   <BodyPartDef>
-    <defName>WULA_Energy_Furnace</defName>
+    <defName>WULA_Energy_Furnace_Bodypart</defName>
     <label>中央能源炉</label>
     <hitPoints>120</hitPoints>
     <skinCovered>false</skinCovered>
@@ -15,7 +15,7 @@
     </tags>
   </BodyPartDef>
   <BodyPartDef>
-    <defName>WULA_Alloy_Framework</defName>
+    <defName>WULA_Alloy_Framework_Bodypart</defName>
     <label>躯体合金框架</label>
     <hitPoints>350</hitPoints>
     <permanentInjuryChanceFactor>0</permanentInjuryChanceFactor>
@@ -31,7 +31,7 @@
     <destroyableByDamage>false</destroyableByDamage>
   </BodyPartDef>
   <BodyPartDef>
-    <defName>WULA_Addons_Antenna</defName>
+    <defName>WULA_Addons_Antenna_Bodypart</defName>
     <label>上行链路天线</label>
     <hitPoints>30</hitPoints>
     <permanentInjuryChanceFactor>0</permanentInjuryChanceFactor>

1.5/Defs/Buildings/Buildings_Structure.xml

@@ -3,7 +3,7 @@
 	<ThingDef ParentName="BuildingBase">
     <defName>WulaWall</defName>
     <label>乌拉帝国堡垒</label>
-    <description>乌拉帝国堡垒。</description>
+    <description>只能由机械体“工蚁”建造的乌拉帝国堡垒外壁，相当厚实，能够抵御大量爆炸和震荡伤害。</description>
     <thingClass>Building</thingClass>
     <category>Building</category>
     <graphicData>

1.5/Defs/FactionDefs/Factions_Player_WULA.xml

@@ -13,13 +13,6 @@
     <factionNameMaker>NamerFactionOutlander</factionNameMaker>
     <settlementNameMaker>NamerSettlementOutlander</settlementNameMaker>
     <allowedCultures><li>Astropolitan</li></allowedCultures>
-    <backstoryFilters>
-      <li>
-        <categories>
-          <li>Wula_Backstory_Categories</li>
-        </categories>
-      </li>
-    </backstoryFilters>
     <factionIconPath>World/WorldObjects/Expanding/Town</factionIconPath>
     <startingResearchTags>
       <li>ClassicStart</li>

1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -1,8 +1,70 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!-- Field hand -->
+  <ThingDef ParentName="BodyPartProstheticImperialBase">
+    <defName>WULA_Energy_Furnace_Base</defName>
+    <label>中央能源炉（基础）</label>
+    <description>机械乌拉的核心部件之一，负责提供永不衰竭的澎湃机械动力，并代替各种内脏执行内循环的任务。</description>
+    <!-- <descriptionHyperlinks><RecipeDef>InstallFieldHand</RecipeDef></descriptionHyperlinks> -->
+    <!-- <thingSetMakerTags><li>RewardStandardLowFreq</li></thingSetMakerTags> -->
+    <graphicData>
+      <texPath>Wula/Item/WULA_Energy_Furnace</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <costList>
+      <Steel>40</Steel>
+      <ComponentIndustrial>8</ComponentIndustrial>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>Machining</researchPrerequisite>
+    </recipeMaker>
+    <!-- <techHediffsTags>
+      <li>FieldHand</li>
+    </techHediffsTags> -->
+  </ThingDef>
+  <ThingDef ParentName="BodyPartProstheticImperialBase">
+    <defName>WULA_Alloy_Framework_Base</defName>
+    <label>躯体合金框架（基础）</label>
+    <description>机械乌拉的核心部件之一，负责替代骨架支撑身体。</description>
+    <!-- <descriptionHyperlinks><RecipeDef>InstallFieldHand</RecipeDef></descriptionHyperlinks> -->
+    <!-- <thingSetMakerTags><li>RewardStandardLowFreq</li></thingSetMakerTags> -->
+    <graphicData>
+      <texPath>Wula/Item/WULA_Energy_Furnace</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <costList>
+      <Steel>100</Steel>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>Machining</researchPrerequisite>
+    </recipeMaker>
+    <!-- <techHediffsTags>
+      <li>FieldHand</li>
+    </techHediffsTags> -->
+  </ThingDef>
+  <ThingDef ParentName="BodyPartProstheticImperialBase">
+    <defName>WULA_Antenna_Base</defName>
+    <label>上行链路天线（基础）</label>
+    <description>机械乌拉的核心部件之一，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。</description>
+    <!-- <descriptionHyperlinks><RecipeDef>InstallFieldHand</RecipeDef></descriptionHyperlinks> -->
+    <!-- <thingSetMakerTags><li>RewardStandardLowFreq</li></thingSetMakerTags> -->
+    <graphicData>
+      <texPath>Wula/Item/WULA_Energy_Furnace</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <costList>
+      <Steel>60</Steel>
+      <ComponentIndustrial>8</ComponentIndustrial>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>Machining</researchPrerequisite>
+    </recipeMaker>
+    <!-- <techHediffsTags>
+      <li>FieldHand</li>
+    </techHediffsTags> -->
+  </ThingDef>
+
   <HediffDef ParentName="ImplantHediffBase">
-    <defName>WULA_Addons_Antenna_Hediff</defName>
+    <defName>WULA_Addons_Antenna_Hediff_Base</defName>
     <hediffClass>Hediff_Mechlink</hediffClass>
     <label>基础上线链路天线</label>
     <description>一对安装于乌拉帝国合成人脑袋两侧的天线，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。</description>
@@ -19,8 +81,44 @@
           <MechBandwidth>-4</MechBandwidth>
           <MechControlGroups>-1</MechControlGroups>
         </statOffsets>
+        <!-- 能力修改 -->
+        <capMods>
+          <!-- 初始意识+20% -->
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>0.20</offset>
+          </li>
+        </capMods>
       </li>
     </stages>
-    <defaultInstallPart>WULA_Addons_Antenna</defaultInstallPart>
+    <defaultInstallPart>WULA_Addons_Antenna_Bodypart</defaultInstallPart>
+  </HediffDef>
+  <HediffDef ParentName="ImplantHediffBase">
+    <defName>WULA_Alloy_Framework_Hediff_Base</defName>
+    <hediffClass>Hediff_Mechlink</hediffClass>
+    <label>躯体合金框架</label>
+    <description>机械乌拉体内负责替代骨架支撑身体的框架，能够提供强大的防御力。</description>
+    <descriptionShort>一副替代骨架支撑身体的框架。</descriptionShort>
+    <isBad>false</isBad>
+    <duplicationAllowed>false</duplicationAllowed>
+    <keepOnBodyPartRestoration>true</keepOnBodyPartRestoration>
+    <removeOnRedressIfNotOfKind>
+      <li>Wula_PawnKind</li>
+    </removeOnRedressIfNotOfKind>
+    <stages>
+      <li>
+        <statOffsets>
+          <!-- 易燃性，作为半机械生物很难起火 -->
+          <Flammability>0</Flammability>
+          <!-- 有自带护甲，对热量伤害有高抵抗 -->
+          <ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+          <ArmorRating_Blunt>0.2</ArmorRating_Blunt>
+          <ArmorRating_Heat>2.00</ArmorRating_Heat>
+          <!-- 近战闪避 -->
+          <MeleeDodgeChance>1.25</MeleeDodgeChance>
+        </statOffsets>
+      </li>
+    </stages>
+    <defaultInstallPart>WULA_Alloy_Framework_Bodypart</defaultInstallPart>
   </HediffDef>
 </Defs>

1.5/Defs/HediffDefs/Hediffs_WULA.xml

@@ -16,28 +16,13 @@
         <naturalHealingFactor>0.2</naturalHealingFactor>
         <!-- 不会感到痛苦 -->
         <painFactor>0</painFactor>
-        <statFactors>
-          <!-- 拥有更高的能量储量 -->
-          <MaxNutrition>2</MaxNutrition>
-        </statFactors>
         <!-- 抗毒抗火抗寒热 -->
         <statOffsets>
           <ComfyTemperatureMin>-100</ComfyTemperatureMin>
           <ComfyTemperatureMax>120</ComfyTemperatureMax>
           <ToxicResistance>1</ToxicResistance>
           <ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">1</ToxicEnvironmentResistance>
-          <Flammability>0</Flammability>
         </statOffsets>
-        <!-- 饿得快 -->
-        <hungerRateFactorOffset>0.5</hungerRateFactorOffset>
-        <!-- 能力修改 -->
-        <capMods>
-          <!-- 初始意识+20% -->
-          <li>
-            <capacity>Consciousness</capacity>
-            <offset>0.20</offset>
-          </li>
-        </capMods>
         <!-- 免疫非纳米机械疾病 -->
         <makeImmuneTo>
           <li>Flu</li>
@@ -53,7 +38,7 @@
       </li>
     </stages>
     <disablesNeeds>
-      <li>Rest</li>
+      <li>Food</li>
     </disablesNeeds>
   </HediffDef>
 </Defs>

1.5/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -10,15 +10,18 @@
       <initialResistanceRange>13~21</initialResistanceRange>
       <minGenerationAge>20</minGenerationAge>
 
+      <!-- 免疫痛苦 -->
       <ignoresPainShock>true</ignoresPainShock>
-      <minGenerationAge>1000</minGenerationAge>
 
       <startingHediffs>
         <li>
           <def>Wula_Synth</def>
         </li>
         <li>
-          <def>WULA_Addons_Antenna_Hediff</def>
+          <def>WULA_Addons_Antenna_Hediff_Base</def>
+        </li>
+        <li>
+          <def>WULA_Alloy_Framework_Hediff_Base</def>
         </li>
         <li>
           <def>MechlinkImplant</def>

1.5/Defs/RecipeDefs/Recipes_WULA.xml

@@ -1,28 +1,99 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <RecipeDef ParentName="ResourceBase">
+  <RecipeDef ParentName="MediumMechanoidRecipe">
-    <defName>Make_WULA_Charge_Cube</defName>
+    <defName>WULA_make_new_synth</defName>
-    <label>制造乌拉帝国能源核心</label>
+    <label>制造乌拉帝国合成人</label>
-    <description>制造一块乌拉帝国能源核心，这是机械乌拉的能源系统唯一可接受的外部输入性能量来源。</description>
+    <description>制造一个新的机械乌拉，这是乌拉帝国合成人派系增加人口的唯一方式。</description>
-    <jobString>正在制造乌拉帝国能源核心</jobString>
+    <ingredients Inherit="False">
-    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-    <!-- <requiredGiverWorkType>Crafting</requiredGiverWorkType> -->
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <ingredients>
       <li>
         <filter>
           <thingDefs>
-            <li>Steel</li>
+            <li>WULA_Alloy_Framework_Base</li>
           </thingDefs>
         </filter>
-        <count>2</count>
+        <count>1</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Energy_Furnace_Base</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Alloy_Framework_Base</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>ComponentIndustrial</li>
+          </thingDefs>
+        </filter>
+        <count>4</count>
+      </li>
+      <li>
+        <filter>
+          <customSummary>feedstock</customSummary>
+          <categories>
+            <li>Foods</li>
+            <li>PlantMatter</li>
+          </categories>
+          <disallowedThingDefs>
+            <li>Hay</li>
+            <li>Dye</li>
+          </disallowedThingDefs>
+          <disallowedCategories>
+            <li>FoodMeals</li>
+          </disallowedCategories>
+        </filter>
+        <count>50</count>
       </li>
     </ingredients>
     <products>
-      <WULA_Charge_Cube>1</WULA_Charge_Cube>
+      <WulaSpecies>1</WulaSpecies>
     </products>
-    <workSkill>Crafting</workSkill>
+    <descriptionHyperlinks>
-    <displayPriority>100</displayPriority>
+      <ThingDef>WulaSpecies</ThingDef>
+    </descriptionHyperlinks>
+    <gestationCycles>3</gestationCycles>
+    <researchPrerequisite>BasicMechtech</researchPrerequisite>
+  </RecipeDef>
+
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>WULA_Install_Energy_Furnace_Base</defName>
+    <label>install ghoul barbs</label>
+    <description>Install ghoul barbs.</description>
+    <jobString>Installing ghoul barbs.</jobString>
+    <skillRequirements Inherit="false" />
+    <anesthetize>false</anesthetize>
+    <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
+    <mutantPrerequisite>
+      <li>Ghoul</li>
+    </mutantPrerequisite>
+    <ingredients Inherit="false">
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Energy_Furnace_Base</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>WULA_Energy_Furnace_Base</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>WULA_Energy_Furnace_Bodypart</li>
+    </appliedOnFixedBodyParts>
+    <!-- <addsHediff>GhoulBarbs_Base</addsHediff> -->
   </RecipeDef>
 </Defs>

1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml

@@ -1,78 +1,152 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
+  <ThingDef ParentName="MechGestatorBase">
-  <!-- 能源核心制造机 -->
+    <defName>WULA_Mech_Constructor_Small</defName>
-
+    <label>乌拉帝国构造体</label>
-  <ThingDef ParentName="BenchBase">
+    <description>一台用于构造乌拉帝国的合成人和机械体的小型设备，功能类似于机械培育器，但是不能生产常规的机械体。</description>
-    <defName>WULA_Cube_Productor_BIO</defName>
-    <label>能源核心冲压机（生物能）</label>
-    <description>一台仿制乌拉帝国科技而建造的能源核心制造机，用于在没有电力的情况下，通过燃烧木材输入生物能以制造可维持机械乌拉正常运转的能源核心。</description>
-    <thingClass>Building_WorkTable_HeatPush</thingClass>
-    <drawerType>MapMeshAndRealTime</drawerType>
     <graphicData>
-      <texPath>Things/Building/Production/TableStoveFueled</texPath>
+      <texPath>Things/Building/Production/MechGestatorLarge</texPath>
       <graphicClass>Graphic_Multi</graphicClass>
-      <drawSize>(3.5,1.5)</drawSize>
+      <drawSize>(6, 5)</drawSize>
-      <damageData>
+      <shadowData>
-        <cornerTL>Damage/Corner</cornerTL>
+        <volume>(3.8, 3, 2.7)</volume>
-        <cornerTR>Damage/Corner</cornerTR>
+      </shadowData>
-        <cornerBL>Damage/Corner</cornerBL>
-        <cornerBR>Damage/Corner</cornerBR>
-      </damageData>
     </graphicData>
-    <castEdgeShadows>true</castEdgeShadows>
+    <uiIconPath>Things/Building/Production/MechGestatorLarge_MenuIcon</uiIconPath>
-    <staticSunShadowHeight>0.20</staticSunShadowHeight>
+    <uiIconScale>1.5</uiIconScale>
-    <constructEffect>ConstructMetal</constructEffect>
+    <interactionCellOffset>(2,0,2)</interactionCellOffset>
-    <costList>
-      <Steel>80</Steel>
-    </costList>
-    <altitudeLayer>Building</altitudeLayer>
-    <fillPercent>0.5</fillPercent>
-    <useHitPoints>True</useHitPoints>
     <statBases>
-      <WorkToBuild>2000</WorkToBuild>
+      <MaxHitPoints>350</MaxHitPoints>
-      <MaxHitPoints>180</MaxHitPoints>
+      <WorkToBuild>16000</WorkToBuild>
-      <Flammability>1.0</Flammability>
+      <Mass>35</Mass>
+      <Flammability>0.5</Flammability>
     </statBases>
-    <size>(3,1)</size>
+    <size>(4,3)</size>
-    <designationCategory>Production</designationCategory>
+    <costList>
-    <uiOrder>2120</uiOrder>
+      <Steel>300</Steel>
-    <passability>PassThroughOnly</passability>
+      <ComponentIndustrial>6</ComponentIndustrial>
-    <pathCost>50</pathCost>
+    </costList>
-    <hasInteractionCell>True</hasInteractionCell>
+    <researchPrerequisites>
-    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+      <li>BasicMechtech</li>
-    <surfaceType>Item</surfaceType>
+    </researchPrerequisites>
-    <!-- 可用配方 -->
+    <building>
+      <!-- <barDrawData>
+        <north>
+          <preRotationOffset>(-1.59, 1.4)</preRotationOffset>
+          <size>(0.72, 0.12)</size>
+        </north>
+        <south>
+          <preRotationOffset>(-1.59, 1.33)</preRotationOffset>
+          <size>(0.72, 0.12)</size>
+        </south>
+        <east>
+          <preRotationOffset>(1.59, -1.4)</preRotationOffset>
+          <size>(0.72, 0.12)</size>
+        </east>
+        <west>
+          <preRotationOffset>(-1.59, -1.4)</preRotationOffset>
+          <size>(0.72, 0.12)</size>
+        </west>
+      </barDrawData>
+      <formingGraphicData>
+        <texPath>Things/Pawn/Mechanoid/HalfGestatedMechLarge</texPath>
+        <graphicClass>Graphic_Single</graphicClass>
+        <drawSize>(1.65,1.65)</drawSize>
+      </formingGraphicData>
+      <formingMechBobSpeed>0.0005</formingMechBobSpeed>
+      <formingMechYBobDistance>0.08</formingMechYBobDistance>
+      <formingMechPerRotationOffset>
+        <li>(0, 0, 0.225)</li>
+        <li>(-0.15, 0, 0.225)</li>
+        <li>(0, 0, 0.225)</li>
+        <li>(0.15, 0, 0.225)</li>
+      </formingMechPerRotationOffset>
+      <mechGestatorCylinderGraphic>
+        <texPath>Things/Building/Production/MechGestatorLargeGlass</texPath>
+        <graphicClass>Graphic_Multi</graphicClass>
+        <drawSize>(6, 5)</drawSize>
+        <shaderType>Transparent</shaderType>
+      </mechGestatorCylinderGraphic>
+      <mechGestatorTopGraphic>
+        <texPath>Things/Building/Production/MechGestatorLargeTop</texPath>
+        <graphicClass>Graphic_Multi</graphicClass>
+        <drawSize>(6, 5)</drawSize>
+      </mechGestatorTopGraphic>
+      <gestatorFormingMote>
+        <north>MechGestatorFormingLarge_North</north>
+        <east>MechGestatorFormingLarge_East</east>
+        <west>MechGestatorFormingLarge_West</west>
+        <south>MechGestatorFormingLarge_South</south>
+      </gestatorFormingMote>
+      <gestatorCycleCompleteMote>
+        <north>MechGestatorCycleCompleteLarge_North</north>
+        <east>MechGestatorCycleCompleteLarge_East</east>
+        <west>MechGestatorCycleCompleteLarge_West</west>
+        <south>MechGestatorCycleCompleteLarge_South</south>
+      </gestatorCycleCompleteMote>
+      <gestatorFormedMote>
+        <north>MechGestatorFormedLarge_North</north>
+        <east>MechGestatorFormedLarge_East</east>
+        <west>MechGestatorFormedLarge_West</west>
+        <south>MechGestatorFormedLarge_South</south>
+      </gestatorFormedMote> -->
+    </building>
+    <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
     <recipes>
-     <li>Make_WULA_Charge_Cube</li>
+      <li>WULA_make_new_synth</li>
     </recipes>
-    <inspectorTabs>
-      <li>ITab_Bills</li>
-    </inspectorTabs>
     <comps>
-      <li Class="CompProperties_Refuelable">
+      <li Class="CompProperties_Power">
-        <fuelConsumptionRate>500.0</fuelConsumptionRate>
+        <compClass>CompPowerTrader</compClass>
-        <fuelCapacity>150.0</fuelCapacity>
+        <basePowerConsumption>500</basePowerConsumption>
-        <fuelFilter>
+        <idlePowerDraw>50</idlePowerDraw>
-          <thingDefs>
-            <li>WoodLog</li>
-          </thingDefs>
-        </fuelFilter>
-        <consumeFuelOnlyWhenUsed>true</consumeFuelOnlyWhenUsed>
-        <showAllowAutoRefuelToggle>true</showAllowAutoRefuelToggle>
-      </li>
-      <li Class="CompProperties_HeatPusher">
-        <compClass>CompHeatPusherPowered</compClass>
-        <heatPerSecond>4</heatPerSecond>
       </li>
     </comps>
-    <placeWorkers>
+  </ThingDef>
-      <li>PlaceWorker_PreventInteractionSpotOverlap</li>
+
-    </placeWorkers>
+  <ThingDef ParentName="BasicBedBase">
+    <defName>WULA_Charging_Station_Synth</defName>
+    <label>合成人充电站</label>
+    <description>一台用于给乌拉帝国合成人进行充电的充电站，效率比自机充电高很多。</description>
+    <graphicData>
+      <texPath>Things/Building/Furniture/Bed/Bed</texPath>
+      <graphicClass>Graphic_Multi</graphicClass>
+      <shaderType>CutoutComplex</shaderType>
+      <drawSize>(2,2)</drawSize>
+      <damageData>
+        <rect>(0,0.05,1,1.95)</rect>
+      </damageData>
+    </graphicData>
+    <statBases>
+      <MaxHitPoints>140</MaxHitPoints>
+      <Beauty>1</Beauty>
+      <WorkToBuild>800</WorkToBuild>
+      <Mass>30</Mass>
+      <BedRestEffectiveness>5</BedRestEffectiveness>
+    </statBases>
+    <size>(1,2)</size>
+    <costStuffCount>45</costStuffCount>
+    <designationHotKey>Misc2</designationHotKey>
+    <uiOrder>2010</uiOrder>
     <building>
-      <!-- <isMealSource>true</isMealSource> -->
+      <paintable>true</paintable>
-      <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
-      <heatPerTickWhileWorking>0.10</heatPerTickWhileWorking>
     </building>
+    <comps>
+      <li Class="CompProperties_Flickable"/>
+      <li Class="CompProperties_Forbiddable"/>
+      <li Class="CompProperties_WasteProducer">
+      <li Class="CompProperties_ThingContainer">
+        <compClass>CompThingContainer</compClass>
+        <stackLimit>5</stackLimit>
+        <drawContainedThing>false</drawContainedThing>
+        <dropEffecterDef>MechChargerWasteRemoved</dropEffecterDef>
+      </li>
+        <showContentsInInspectPane>false</showContentsInInspectPane>
+      </li>
+      <li Class="CompProperties_Power">
+        <compClass>CompPowerTrader</compClass>
+        <basePowerConsumption>300</basePowerConsumption>
+      </li>
+    </comps>
   </ThingDef>
 </Defs>

1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -30,6 +30,9 @@
         <humanRecipeImport>true</humanRecipeImport>
         <!-- 能否躺下睡觉 -->
         <canLayDown>true</canLayDown>
+        <validBeds>
+          <li>WULA_Charging_Station_Synth</li>
+        </validBeds>
         <!-- 各种零件定义 -->
         <alienPartGenerator Inherit="False">
           <!-- 允许的头部 -->
@@ -62,6 +65,21 @@
 										<min>(0.4,0.3,0.5)</min>
 										<max>(0.6,0.1,0.7)</max>
 									</li>
+									<li>
+										<weight>12</weight>
+										<min>(1,0.8,0.8)</min>
+										<max>(1,0.9,0.9)</max>
+									</li>
+									<li>
+										<weight>12</weight>
+										<min>(0,0.1,0.1)</min>
+										<max>(0,0.15,0.2)</max>
+									</li>
+									<li>
+										<weight>12</weight>
+										<min>(1,0.95,0.95)</min>
+										<max>(1,1,1)</max>
+									</li>
 								</options>
 							</first>
 						</li>
@@ -173,13 +191,13 @@
 				<onlyUseRaceRestrictedXenotypes>true</onlyUseRaceRestrictedXenotypes>
         <!-- 食物列表 -->
         <foodList>
-          <li>WULA_Charge_Cube</li>
+          <!-- 留空 -->
         </foodList>
+        <onlyEatRaceRestrictedFood>true</onlyEatRaceRestrictedFood>
         <!-- 可以穿戴的衣服 -->
         <apparelList>
           <li>WULA_Official_Uniform</li>
         </apparelList>
-        <onlyEatRaceRestrictedFood>true</onlyEatRaceRestrictedFood>
         <!-- 生育能力 -->
         <canReproduce>false</canReproduce>
       </raceRestriction>
@@ -199,31 +217,17 @@
       <MarketValue>3000</MarketValue>
       <Mass>50</Mass>
       <MoveSpeed>4.5</MoveSpeed>
-      <!-- 易燃性，作为半机械生物很难起火 -->
-      <Flammability>0</Flammability>
       <!-- 温度适应性，在hediff修改 -->
       <ComfyTemperatureMin>0</ComfyTemperatureMin>
       <ComfyTemperatureMax>0</ComfyTemperatureMax>
-      <!-- 有自带护甲，对热量伤害有高抵抗 -->
-      <ArmorRating_Sharp>0.1</ArmorRating_Sharp>
-      <ArmorRating_Blunt>0.1</ArmorRating_Blunt>
-      <ArmorRating_Heat>1.00</ArmorRating_Heat>
       <!-- 心灵敏感，很低 -->
       <PsychicSensitivity>0.25</PsychicSensitivity>
-      <!-- 免疫速度，以后可能会再次修改 -->
+      <!-- 充电（休息）时间 -->
-      <ImmunityGainSpeed>30</ImmunityGainSpeed>
+      <RestFallRateFactor>0.25</RestFallRateFactor>
-      <!-- 携带重量 -->
-      <CarryingCapacity>50</CarryingCapacity>
-      <!-- 疼痛阈值，机械体不会因为疼痛倒下，设定在PawnKinds_Wula -->
-      <PainShockThreshold>100</PainShockThreshold>
-      <EatingSpeed>1000</EatingSpeed>
       <!-- 肉量 -->
       <MeatAmount>0</MeatAmount>
       <!-- 皮革量 -->
       <LeatherAmount>0</LeatherAmount>
-      <!-- 近战闪避 -->
-      <MeleeDodgeChance>1.25</MeleeDodgeChance>
-      <AimingDelayFactor>1.25</AimingDelayFactor>
       <!-- 谈判能力 -->
       <NegotiationAbility>1</NegotiationAbility>
       <!-- 社交效果，机械乌拉社交的影响很小 -->

1.5/Defs/TraitDefs/Traits_WULA.xml

@@ -3,612 +3,43 @@
   <TraitDef>
     <defName>WULA_Trait_Knight</defName>
     <forcedPassions>
-      <li>Shooting</li>
       <li>Melee</li>
     </forcedPassions>
     <degreeDatas>
       <li>
         <label>帝国骑士</label>
-        <description>{PAWN_possessive} 人格矩阵中装载了一个乌拉帝国骑士的模拟记忆，她骁勇善战，但是暴躁易怒，而且不屑于做一些低贱的侍仆工作。</description>
+        <description>于无垠星海中穿梭，\n谨以吾魂向帝皇起誓：\n\n吾即是帝皇之盾，吾即是帝皇之剑。\n以乌拉帝皇之名，吾即是帝国骑士！</description>
-        <socialFightChanceFactor>3</socialFightChanceFactor>
         <allowedMeditationFocusTypes><li>Dignified</li></allowedMeditationFocusTypes>
-        <disabledWorkTags>
+        <degree>1</degree>
-          <li>Animals</li>
-          <li>Cooking</li>
-          <li>Cleaning</li>
-          <li>Hauling</li>
-        </disabledWorkTags>
-        <possessions>
-          <Gold>10~20</Gold>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Bloodlust</defName>
-    <commonality>0.8</commonality>
-    <degreeDatas>
-      <li>
-        <label>bloodlust</label>
-        <description>{PAWN_nameDef} gets a rush from hurting people, and never minds the sight of blood or death. {PAWN_pronoun} is four times as likely to start a social fight as others.</description>
-        <socialFightChanceFactor>4</socialFightChanceFactor>
-        <allowedMeditationFocusTypes><li>Dignified</li></allowedMeditationFocusTypes>
-        <possessions>
-          <MeleeWeapon_Axe  MayRequire="Ludeon.RimWorld.Royalty"/>
-          <MeleeWeapon_LongSword />
-        </possessions>
-      </li>
-    </degreeDatas>
-    <requiredWorkTags>
-      <li>Violent</li>
-    </requiredWorkTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Kind</defName>
-    <commonality>2</commonality>
-    <degreeDatas>
-      <li>
-        <label>kind</label>
-        <description>{PAWN_nameDef} is an exceptionally agreeable and giving person. {PAWN_pronoun} rarely insults others or starts fights, and will sometimes offer kind words to brighten the moods of those around {PAWN_objective}. {PAWN_pronoun} also never judges people by their appearance.</description>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">2</CertaintyLossFactor>
-        </statFactors>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Abrasive</li>
-      <li>Psychopath</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Psychopath</defName>
-    <degreeDatas>
-      <li>
-        <label>psychopath</label>
-        <description>{PAWN_nameDef} has no empathy. The suffering of others doesn't bother {PAWN_objective} at all. {PAWN_pronoun} doesn't mind if others are butchered, left unburied, imprisoned, or sold to slavery - unless it affects {PAWN_objective}. {PAWN_pronoun} also feels no mood boost from socializing.</description>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">0.5</CertaintyLossFactor>
-        </statFactors>
-        <possessions>
-          <Skull />
-          <Heart />
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Cannibal</defName>
-    <commonality>0.6</commonality>
-    <degreeDatas>
-      <li>
-        <label>cannibal</label>
-        <description>{PAWN_nameDef} was taught that eating human meat is wrong and horrible. But one time, long ago, {PAWN_pronoun} tried it... and {PAWN_pronoun} liked it.</description>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-        <disallowedThoughtsFromIngestion>
-          <li>
-            <meatSource>Humanlike</meatSource>
-            <thoughts>
-              <li>AteRawFood</li>
-              <li>AteHumanlikeMeatDirect</li>
-              <li>AteHumanlikeMeatAsIngredient</li>
-            </thoughts>
-          </li>
-        </disallowedThoughtsFromIngestion>
-        <extraThoughtsFromIngestion>
-          <li>
-            <meatSource>Humanlike</meatSource>
-            <thoughtsDirect>
-              <li>AteHumanlikeMeatDirectCannibal</li>
-            </thoughtsDirect>
-            <thoughtsAsIngredient>
-              <li>AteHumanlikeMeatAsIngredientCannibal</li>
-            </thoughtsAsIngredient>
-          </li>
-        </extraThoughtsFromIngestion>
-        <possessions>
-          <Meat_Human>30~60</Meat_Human>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Abrasive</defName>
-    <degreeDatas>
-      <li>
-        <label>abrasive</label>
-        <description>{PAWN_nameDef} always says exactly what's on {PAWN_possessive} mind, especially if it's bugging {PAWN_objective}. That tends to rub people the wrong way.</description>
-        <marketValueFactorOffset>-0.15</marketValueFactorOffset>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">0.5</CertaintyLossFactor>
-        </statFactors>
-      </li>
-    </degreeDatas>
-    <requiredWorkTags>
-      <li>Social</li>
-    </requiredWorkTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>TooSmart</defName>
-    <degreeDatas>
-      <li>
-        <label>too smart</label>
-        <description>{PAWN_nameDef} is too smart for {PAWN_possessive} own good. {PAWN_pronoun} learns everything much faster than everyone, but can be quite eccentric.</description>
         <statOffsets>
-          <GlobalLearningFactor>0.75</GlobalLearningFactor>
+          <MentalBreakThreshold>-0.2</MentalBreakThreshold>
-          <MentalBreakThreshold>0.12</MentalBreakThreshold>
         </statOffsets>
         <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">0.5</CertaintyLossFactor>
+          <AimingDelayFactor>-0.2</AimingDelayFactor>
-        </statFactors>
+          <ShootingAccuracyPawn>2</ShootingAccuracyPawn>
-        <possessions>
+          <MeleeDamageFactor>1.2</MeleeDamageFactor>
-          <Schematic />
+          <MeleeCooldownFactor>0.75</MeleeCooldownFactor>
-        </possessions>
+          <MoveSpeed>1.25</MoveSpeed>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Nerves</li>
-      <li>SlowLearner</li>
-    </conflictingTraits>
-    <requiredWorkTags>
-      <li>Intellectual</li>
-    </requiredWorkTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Brawler</defName>
-    <degreeDatas>
-      <li>
-        <label>brawler</label>
-        <description>{PAWN_nameDef} likes to fight up close and personal. {PAWN_possessive} accuracy is greatly increased in melee combat, but {PAWN_pronoun}'ll be very unhappy if asked to carry a ranged weapon.</description>
-        <statOffsets>
-          <MeleeHitChance>4</MeleeHitChance>
-        </statOffsets>
-        <skillGains>
-          <Melee>4</Melee>
-          <Shooting>-10</Shooting>
-        </skillGains>
-        <disallowedInspirations>
-          <li>Frenzy_Shoot</li>
-        </disallowedInspirations>
-        <possessions>
-          <MeleeWeapon_Knife />
-        </possessions>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>ShootingAccuracy</li>
-      <li>Wimp</li>
-    </conflictingTraits>
-    <requiredWorkTags>
-      <li>Violent</li>
-    </requiredWorkTags>
-    <conflictingPassions>
-      <li>Shooting</li>
-    </conflictingPassions>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Masochist</defName>
-    <commonality>0.5</commonality>
-    <degreeDatas>
-      <li>
-        <label>masochist</label>
-        <description>For {PAWN_nameDef}, there's something exciting about getting hurt. {PAWN_pronoun} doesn't know why, {PAWN_pronoun}'s just wired differently.</description>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Wimp</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>NightOwl</defName>
-    <commonality>1.3</commonality>
-    <degreeDatas>
-      <li>
-        <label>night owl</label>
-        <description>{PAWN_nameDef} likes to be up during the night, and sleep during the day.\n\n{PAWN_pronoun} gets a mood bonus if awake at night (23h-6h) and mood loss if awake during the day (11h-18h).\n\n{PAWN_pronoun} doesn't get a mood penalty for being in the dark.</description>
-        <possessions>
-          <WakeUp>5~10</WakeUp>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-  
-  <TraitDef>
-    <defName>Greedy</defName>
-    <degreeDatas>
-      <li>
-        <label>greedy</label>
-        <description>{PAWN_nameDef} needs a really impressive bedroom. {PAWN_pronoun} gets a mood loss if {PAWN_pronoun} doesn't get what {PAWN_pronoun} wants.</description>
-        <possessions>
-          <Gold>10~20</Gold>
-        </possessions>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Ascetic</li>
-      <li>Jealous</li>
-    </conflictingTraits>
-  </TraitDef>
-  
-  <TraitDef>
-    <defName>Jealous</defName>
-    <degreeDatas>
-      <li>
-        <label>jealous</label>
-        <description>For {PAWN_nameDef}, it's degrading to have a less impressive bedroom than someone else. {PAWN_pronoun} gets a mood loss if any colonist has a more impressive bedroom.</description>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Ascetic</li>
-      <li>Greedy</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Ascetic</defName>
-    <commonality>0.7</commonality>
-    <degreeDatas>
-      <li>
-        <label>ascetic</label>
-        <description>{PAWN_nameDef} has forsaken physical comforts and enjoyments in favor of a simple, pure lifestyle. {PAWN_pronoun} will become unhappy if {PAWN_pronoun} has a bedroom that's too impressive. {PAWN_pronoun} also dislikes fancy food and prefers to eat raw. {PAWN_pronoun} never judges others by their appearance.</description>
-        <allowedMeditationFocusTypes><li>Minimal</li></allowedMeditationFocusTypes>
-        <disallowedMeditationFocusTypes><li>Artistic</li></disallowedMeditationFocusTypes>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">0.5</CertaintyLossFactor>
-        </statFactors>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Greedy</li>
-      <li>Jealous</li>
-      <li>Gourmand</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Gay</defName>
-    <commonality>0.3</commonality>
-    <degreeDatas>
-      <li>
-        <label>gay</label>
-        <description>{PAWN_nameDef} is romantically attracted to people of {PAWN_possessive} own gender.</description>
-      </li>
-    </degreeDatas>
-    <exclusionTags>
-      <li>SexualOrientation</li>
-    </exclusionTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Bisexual</defName>
-    <commonality>0.2</commonality>
-    <degreeDatas>
-      <li>
-        <label>bisexual</label>
-        <description>{PAWN_nameDef} is romantically attracted to both men and women.</description>
-      </li>
-    </degreeDatas>
-    <exclusionTags>
-      <li>SexualOrientation</li>
-    </exclusionTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Asexual</defName>
-    <commonality>0.2</commonality>
-    <degreeDatas>
-      <li>
-        <label>asexual</label>
-        <description>{PAWN_nameDef} has no sexual attraction to anyone at all.</description>
-      </li>
-    </degreeDatas>
-    <exclusionTags>
-      <li>SexualOrientation</li>
-    </exclusionTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>AnnoyingVoice</defName>
-    <commonality>0.5</commonality>
-    <degreeDatas>
-      <li>
-        <label>annoying voice</label>
-        <description>{PAWN_nameDef}'s voice has a particularly grating, nasal quality to it, and {PAWN_pronoun} tends to talk in barked, garbled phrases. This predisposes others to dislike {PAWN_objective}.</description>
-        <marketValueFactorOffset>-0.2</marketValueFactorOffset>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>CreepyBreathing</defName>
-    <commonality>0.5</commonality>
-    <degreeDatas>
-      <li>
-        <label>creepy breathing</label>
-        <description>{PAWN_nameDef} breathes heavily all the time, and sweats constantly. People find it creepy.</description>
-        <marketValueFactorOffset>-0.1</marketValueFactorOffset>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-  
-  <TraitDef>
-    <defName>Pyromaniac</defName>
-    <commonality>0.8</commonality>
-    <disabledWorkTags>Firefighting</disabledWorkTags>
-    <degreeDatas>
-      <li>
-        <label>pyromaniac</label>
-        <description>{PAWN_nameDef} loves fire. {PAWN_pronoun} will never extinguish fires, and will occasionally go on random fire starting sprees. {PAWN_pronoun} will be happy around flames, and happier when wielding an incendiary weapon.</description>
-        <theOnlyAllowedMentalBreaks>
-          <li>FireStartingSpree</li>
-        </theOnlyAllowedMentalBreaks>
-        <randomMentalState>FireStartingSpree</randomMentalState>
-        <randomMentalStateMtbDaysMoodCurve>
-          <points>
-            <li>(0, 50)</li>
-          </points>
-        </randomMentalStateMtbDaysMoodCurve>
-        <marketValueFactorOffset>-0.2</marketValueFactorOffset>
-        <allowedMeditationFocusTypes><li>Flame</li></allowedMeditationFocusTypes>
-        <possessions>
-          <Weapon_GrenadeMolotov />
-          <Chemfuel>10~20</Chemfuel>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-    
-  <TraitDef>
-    <defName>Wimp</defName>
-    <allowOnHostileSpawn>false</allowOnHostileSpawn>
-    <degreeDatas>
-      <li>
-        <label>wimp</label>
-        <description>{PAWN_nameDef} is weak and cowardly. Even a little pain will immobilize {PAWN_objective}.</description>
-        <statOffsets>
-          <PainShockThreshold>-0.50</PainShockThreshold>
-        </statOffsets>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">2</CertaintyLossFactor>
-        </statFactors>
-        <marketValueFactorOffset>-0.15</marketValueFactorOffset>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Brawler</li>
-      <li>Masochist</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Nimble</defName>
-    <degreeDatas>
-      <li>
-        <label>nimble</label>
-        <description>{PAWN_nameDef} has remarkable kinesthetic intelligence. {PAWN_pronoun} seems to dance around danger with preternatural grace.</description>
-        <statOffsets>
-          <MeleeDodgeChance>15</MeleeDodgeChance>
-        </statOffsets>
-        <statFactors>
-          <PawnTrapSpringChance>0.1</PawnTrapSpringChance>
-        </statFactors>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>FastLearner</defName>
-    <exclusionTags>
-      <li>SlowFastLearner</li>
-    </exclusionTags>
-    <degreeDatas>
-      <li>
-        <label>fast learner</label>
-        <description>{PAWN_nameDef} has a knack for learning. {PAWN_pronoun} picks things up much faster than others.</description>
-        <statOffsets>
-          <GlobalLearningFactor>0.75</GlobalLearningFactor>
-        </statOffsets>
-        <possessions>
-          <TextBook />
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>SlowLearner</defName>
-    <exclusionTags>
-      <li>SlowFastLearner</li>
-    </exclusionTags>
-    <degreeDatas>
-      <li>
-        <label>slow learner</label>
-        <description>{PAWN_nameDef} is slow on the uptake. {PAWN_pronoun} learns much slower than others.</description>
-        <statOffsets>
-          <GlobalLearningFactor>-0.75</GlobalLearningFactor>
-        </statOffsets>
-        <statFactors>
-          <CertaintyLossFactor MayRequire="Ludeon.RimWorld.Ideology">0.5</CertaintyLossFactor>
-        </statFactors>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>TooSmart</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Undergrounder</defName>
-    <commonality>0.2</commonality> <!-- Note: There are several backstories that force this trait-->
-    <degreeDatas>
-      <li>
-        <label>undergrounder</label>
-        <description>{PAWN_nameDef} has no need to experience the outdoors or light. {PAWN_pronoun} will never feel cooped up or get cabin fever and is not bothered by darkness. However, {PAWN_nameDef} will be unhappy while outdoors.</description>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-        <possessions>
-          <RawFungus>30~60</RawFungus>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <!-- The below really probably should've been spectrum traits -->
-  
-  <TraitDef>
-    <defName>Transhumanist</defName>
-    <commonality>0.9</commonality>
-    <degreeDatas>
-      <li>
-        <label>body modder</label>
-        <description>{PAWN_nameDef} feels limited in {PAWN_possessive} feeble human body. {PAWN_pronoun} often dreams of being enhanced with artificial body parts or xenogenetics.</description>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>BodyPurist</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>BodyPurist</defName>
-    <commonality>0.7</commonality>
-    <degreeDatas>
-      <li>
-        <label>body purist</label>
-        <description>{PAWN_nameDef} believes the human body is limited for a reason. To {PAWN_objective}, artificial body parts and xenogenes are unethical and disgusting.</description>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Transhumanist</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>DislikesMen</defName>
-    <commonality>0.3</commonality>
-    <commonalityFemale>1.7</commonalityFemale>
-    <degreeDatas>
-      <li>
-        <label>misandrist</label>
-        <description>{PAWN_nameDef} really dislikes and distrusts men.</description>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>DislikesWomen</defName>
-    <commonality>1.7</commonality>
-    <commonalityFemale>0.3</commonalityFemale>
-    <degreeDatas>
-      <li>
-        <label>misogynist</label>
-        <description>{PAWN_nameDef} really dislikes and distrusts women.</description>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>GreatMemory</defName>
-    <commonality>1.1</commonality>
-    <degreeDatas>
-      <li>
-        <label>great memory</label>
-        <description>{PAWN_nameDef} has a fantastic memory for detail. {PAWN_pronoun} will lose unused skills at half the rate of other people.</description>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Tough</defName>
-    <commonality>1.1</commonality>
-    <degreeDatas>
-      <li>
-        <label>tough</label>
-        <description>{PAWN_nameDef} has thick skin, dense flesh, and durable bones. {PAWN_pronoun} takes much less damage than other people from the same blows. {PAWN_pronoun} is extremely hard to kill.</description>
-        <statFactors>
           <IncomingDamageFactor>0.5</IncomingDamageFactor>
         </statFactors>
       </li>
-    </degreeDatas>
-    <exclusionTags>
-      <li>Toughness</li>
-    </exclusionTags>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>TorturedArtist</defName>
-    <commonality>0.6</commonality>
-    <forcedPassions>
-      <li>Artistic</li>
-    </forcedPassions>
-    <degreeDatas>
       <li>
-        <label>tortured artist</label>
+        <label>荣耀骑士</label>
-        <description>{PAWN_nameDef} feels alienated and misunderstood by other human beings. {PAWN_pronoun} will have a constant mood debuff, but gain a chance (50%) to get a creativity inspiration after a mental break.</description>
+        <description>吾之身归帝皇剑下，\n吾之名得帝皇祝福，\n于无垠星海中穿梭，\n谨以吾魂向帝皇起誓：\n\n恒以仁慈之心对待帝国人民，恒以怜悯之心善待无助弱者，\n恒以慈悲之心对待无辜妇孺，恒以平等之心看待芸芸众生；\n\n恒以勇武之名诛灭帝国叛逆，恒以骑士之名斩杀帝国之敌，\n恒以帝国之名踏平叛逆之城，恒以帝皇之名荡清无尽寰宇；\n\n恒以智慧之魂思索帝国难题，恒以耐心之魂解答无知质疑，\n恒以虔诚之魂辨明人生真理，恒以信仰之魂教化亿万国民；\n\n恒以探知之志探索帝国疆域，恒以求知之志探寻未明知识，\n恒以坚韧之志追寻帝皇足迹，恒以求索之心明察星海真理；\n\n吾即是帝皇之盾，吾即是帝皇之剑。\n以乌拉帝皇之名，吾即是帝国骑士！</description>
-        <mentalBreakInspirationGainSet>
+        <degree>2</degree>
-          <li>Inspired_Creativity</li>
+        <allowedMeditationFocusTypes><li>Dignified</li></allowedMeditationFocusTypes>
-        </mentalBreakInspirationGainSet>
-        <mentalBreakInspirationGainReasonText>As a suffering tortured artist, [PAWN_nameIndef] has experienced an inspiration.</mentalBreakInspirationGainReasonText>
-        <mentalBreakInspirationGainChance>0.5</mentalBreakInspirationGainChance>
-        <allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
-        <possessions>
-          <Dye>10~20</Dye>
-        </possessions>
-      </li>
-    </degreeDatas>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>Gourmand</defName>
-    <commonality>1.0</commonality>
-    <degreeDatas>
-      <li>
-        <label>gourmand</label>
-        <description>{PAWN_nameDef}'s life revolves around food. {PAWN_pronoun} gets hungry quickly, and will occasionally be overcome with the urge to eat ravenously, even when not hungry.</description>
-        <theOnlyAllowedMentalBreaks>
-          <li>Binging_Food</li>
-        </theOnlyAllowedMentalBreaks>
-        <randomMentalState>Binging_Food</randomMentalState>
-        <randomMentalStateMtbDaysMoodCurve>
-          <points>
-            <li>(0, 50)</li>
-          </points>
-        </randomMentalStateMtbDaysMoodCurve>
-        <skillGains>
-          <Cooking>4</Cooking>
-        </skillGains>
-        <hungerRateFactor>1.5</hungerRateFactor>
-        <possessions>
-          <MealFine>1~3</MealFine>
-        </possessions>
-      </li>
-    </degreeDatas>
-    <conflictingTraits>
-      <li>Ascetic</li>
-    </conflictingTraits>
-  </TraitDef>
-
-  <TraitDef>
-    <defName>QuickSleeper</defName>
-    <degreeDatas>
-      <li>
-        <label>quick sleeper</label>
-        <description>{PAWN_nameDef} doesn't need as much sleep as the average person. Whether {PAWN_pronoun}'s sleeping on a bed or on the ground, {PAWN_pronoun} will be fully rested in about two thirds the usual time.</description>
         <statOffsets>
-          <RestRateMultiplier>0.50</RestRateMultiplier>
+          <MentalBreakThreshold>-0.5</MentalBreakThreshold>
         </statOffsets>
+        <statFactors>
+          <AimingDelayFactor>-0.5</AimingDelayFactor>
+          <ShootingAccuracyPawn>5</ShootingAccuracyPawn>
+          <MeleeDamageFactor>1.5</MeleeDamageFactor>
+          <MeleeCooldownFactor>0.5</MeleeCooldownFactor>
+          <MoveSpeed>1.5</MoveSpeed>
+          <IncomingDamageFactor>0.3</IncomingDamageFactor>
+        </statFactors>
       </li>
     </degreeDatas>
   </TraitDef>
-
 </Defs>