diff --git a/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml b/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
index 261c5ad0..75176f53 100644
--- a/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
+++ b/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml
@@ -24,9 +24,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Knight>1</WULA_Trait_Knight>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Knight</defName>
+        <degree>1</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory02</defName>
@@ -51,9 +55,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Knight>1</WULA_Trait_Knight>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Knight</defName>
+        <degree>1</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory03</defName>
@@ -77,9 +85,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Knight>1</WULA_Trait_Knight>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Knight</defName>
+        <degree>1</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory04</defName>
@@ -102,9 +114,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Knight>2</WULA_Trait_Knight>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Knight</defName>
+        <degree>2</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory05</defName>
@@ -130,9 +146,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Knight>1</WULA_Trait_Knight>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Knight</defName>
+        <degree>1</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory10</defName>
@@ -219,9 +239,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Legal_Officer>0</WULA_Trait_Legal_Officer>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Legal_Officer</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 观测站 -->
@@ -247,9 +271,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Sculptor>0</WULA_Trait_Sculptor>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Sculptor</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory101</defName>
@@ -274,9 +302,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Sculptor>0</WULA_Trait_Sculptor>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Sculptor</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory102</defName>
@@ -299,9 +331,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Diplomat>0</WULA_Trait_Diplomat>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Diplomat</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory103</defName>
@@ -343,9 +379,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <Bloodlust>0</Bloodlust>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>Bloodlust</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 大教堂 -->
@@ -363,16 +403,23 @@
       <Artistic>-10</Artistic>
       <Intellectual>-10</Intellectual>
     </skillGains>
-    <workDisables>Construction,Mining</workDisables>
+    <workDisables>
+      <li>Constructing</li>
+      <li>Mining</li>
+    </workDisables>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Nun>0</WULA_Trait_Nun>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Nun</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory201</defName>
@@ -388,16 +435,23 @@
       <Artistic>-10</Artistic>
       <Intellectual>-10</Intellectual>
     </skillGains>
-    <workDisables>Plants,Mining</workDisables>
+    <workDisables>
+      <li>PlantWork</li>
+      <li>Mining</li>
+    </workDisables>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Nun>0</WULA_Trait_Nun>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Nun</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory202</defName>
@@ -413,16 +467,24 @@
       <Artistic>-10</Artistic>
       <Intellectual>-10</Intellectual>
     </skillGains>
-    <workDisables>Plants,Mining,Crafting</workDisables>
+    <workDisables>
+      <li>PlantWork</li>
+      <li>Mining</li>
+      <li>Crafting</li>
+    </workDisables>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Nun>0</WULA_Trait_Nun>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Nun</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory202</defName>
@@ -438,16 +500,24 @@
       <Artistic>-10</Artistic>
       <Intellectual>8</Intellectual>
     </skillGains>
-    <workDisables>Plants,Mining,Crafting</workDisables>
+    <workDisables>
+      <li>PlantWork</li>
+      <li>Mining</li>
+      <li>Crafting</li>
+    </workDisables>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Nun>0</WULA_Trait_Nun>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Nun</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
   <AlienRace.AlienBackstoryDef>
     <defName>WULA_Adult_Backstory203</defName>
@@ -464,16 +534,23 @@
       <Artistic>-10</Artistic>
       <Social>8</Social>
     </skillGains>
-    <workDisables>Plants,Mining</workDisables>
+    <workDisables>
+      <li>PlantWork</li>
+      <li>Mining</li>
+    </workDisables>
     <spawnCategories>
       <li>Wula_Backstory_Categories</li>
     </spawnCategories>
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Nun>0</WULA_Trait_Nun>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Nun</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
 
   <AlienRace.AlienBackstoryDef>
@@ -504,9 +581,13 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_Trait_Broken_Personality>1</WULA_Trait_Broken_Personality>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_Trait_Broken_Personality</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
 
   <!-- 战争机械 -->
@@ -523,8 +604,12 @@
     <bodyTypeGlobal>Thin</bodyTypeGlobal>
     <bodyTypeFemale>Thin</bodyTypeFemale>
     <bodyTypeMale>Thin</bodyTypeMale>
-    <forcedTraits>
-      <WULA_AI_War_Machine>1</WULA_AI_War_Machine>
-    </forcedTraits>
+    <forcedTraitsChance>
+      <li>
+        <defName>WULA_AI_War_Machine</defName>
+        <degree>0</degree>
+        <chance>100</chance>
+      </li>
+    </forcedTraitsChance>
   </AlienRace.AlienBackstoryDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml b/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
index 6cad1018..6c1a1851 100644
--- a/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
+++ b/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
@@ -6,7 +6,7 @@
     <slot>Childhood</slot>  
     <title>旧日遗物</title>  
     <titleShort>旧日遗物</titleShort>  
-    <description>[PAWN_nameDef] 是诞生于乌拉帝国大内战前的合成人，高度依赖上行链路系统与网络链接，在人工智能网络“演算圆环”崩溃时受到了大量冲击。</description>  
+    <description>[PAWN_nameDef] 是诞生于乌拉帝国的合成人。</description>  
     <skillGains>
       <Shooting>5</Shooting>
       <Melee>5</Melee>
@@ -31,23 +31,6 @@
       <li>MechlinkImplant</li>
     </forcedHediffs>
   </AlienRace.AlienBackstoryDef>
-  <AlienRace.AlienBackstoryDef>
-    <defName>WULA_Child_Backstory02</defName>  
-    <ignoreIllegalLabelCharacterConfigError>False</ignoreIllegalLabelCharacterConfigError>  
-    <slot>Childhood</slot>  
-    <title>新生代合成人</title>  
-    <titleShort>新生代</titleShort>  
-    <description>[PAWN_nameDef] 诞生于人工智能网络“演算圆环”崩溃后，软硬件未受到崩溃的影响，但是其储存空间内无任何技能数据包。</description>
-    <spawnCategories>
-      <li>Wula_New_Synth_Backstory_Categories</li>
-    </spawnCategories>
-    <requiredWorkTags>None</requiredWorkTags>
-    <forcedHediffs>
-      <li>Wula_Synth</li>
-      <li>WULA_Addons_Antenna_Hediff_Base</li>
-      <li>MechlinkImplant</li>
-    </forcedHediffs>
-  </AlienRace.AlienBackstoryDef>
 
   <!-- 战车 -->
   <AlienRace.AlienBackstoryDef>
diff --git a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml
index 35c0f9e9..298da985 100644
--- a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml
+++ b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml
@@ -536,6 +536,13 @@
 								<li>Torso</li>
 							</groups>
 						</li>
+						<li>
+							<def>SightSensor</def>
+							<coverage>0.13</coverage>
+							<groups>
+								<li>Torso</li>
+							</groups>
+						</li>
 						<li>
 							<def>WULA_Panzer_OutBrust_Bodypart</def>
 							<customLabel>第一反推喷气孔</customLabel>
@@ -616,6 +623,10 @@
 								<li>HeadAttackTool</li>
 							</groups>
 							<parts>
+								<li>
+									<def>SightSensor</def>
+									<coverage>0.13</coverage>
+								</li>
 								<li>
 									<def>WULA_AI_Core_Bodypart</def>
 									<coverage>0.025</coverage>
diff --git a/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml b/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
index 00ed70ce..d6b2fcce 100644
--- a/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
+++ b/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml
@@ -80,7 +80,6 @@
     <destroyableByDamage>false</destroyableByDamage>
     <tags>
       <li>ConsciousnessSource</li>
-      <li>SightSource</li>
       <li>HearingSource</li>
       <li>ManipulationLimbCore</li>
     </tags>
diff --git a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
index 690e1fda..e776e609 100644
--- a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
+++ b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
@@ -53,6 +53,7 @@
         <useLabel>安装中央能源炉超载组件</useLabel>
         <!-- <userMustHaveHediff>WULA_Addons_Antenna_Hediff_Base</userMustHaveHediff> -->
       </li>
+      <li Class="CompProperties_UseEffectDestroySelf" />
       <li Class="CompProperties_UseEffectInstallImplant">
         <hediffDef>WULA_Energy_Furnace_Hediff_Overdrive</hediffDef>
         <bodyPart>WULA_Energy_Furnace_Bodypart</bodyPart>
@@ -176,8 +177,9 @@
         <useLabel>安装中央能源炉偷吃组件</useLabel>
         <!-- <userMustHaveHediff>WULA_Addons_Antenna_Hediff_Base</userMustHaveHediff> -->
       </li>
+      <li Class="CompProperties_UseEffectDestroySelf" />
       <li Class="CompProperties_UseEffectInstallImplant">
-        <hediffDef>WULA_Energy_Furnace_Hediff_Overdrive</hediffDef>
+        <hediffDef>WULA_Energy_Furnace_Hediff_Hunger</hediffDef>
         <bodyPart>WULA_Energy_Furnace_Bodypart</bodyPart>
         <canUpgrade>false</canUpgrade>
         <maxSeverity>1</maxSeverity>
@@ -388,7 +390,6 @@
   </HediffDef>
 
   <!-- 插件 -->
-
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
     <defName>WULA_Fix_Hand_Base</defName>
     <label>修复手部</label>
diff --git a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml
index 9f1b829a..c54555a7 100644
--- a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -84,7 +84,7 @@
       <li>
         <categories>
           <li>Wula_Backstory_Categories</li>
-          <li>Wula_New_Synth_Backstory_Categories</li>
+          <li>Wula_Old_Synth_Backstory_Categories</li>
         </categories>
       </li>
     </backstoryFiltersOverride>
@@ -215,14 +215,14 @@
       <li>GrenadeEMP</li>
     </weaponTags>
   </PawnKindDef>
-  <PawnKindDef ParentName="LightMechanoidKind">
+  <PawnKindDef ParentName="Mech_WULA_Cat_Soldier_PawnKind">
     <defName>Mech_WULA_Cat_Constructor</defName>
     <label>土木乌拉猫猫</label>
     <race>Mech_WULA_Cat_Constructor</race>
     <weaponTags>
       <li>Wula_Constructor_Cat_Weapon</li>
     </weaponTags>
-    <lifeStages>
+    <lifeStages Inherit="False"> 
       <li>
         <bodyGraphicData>
           <texPath>Wula/Things/WULA_Constructor_Cat/WULA_Cat_Thin</texPath>
@@ -233,9 +233,5 @@
         </bodyGraphicData>
       </li>
     </lifeStages>
-    <allowInMechClusters>False</allowInMechClusters>
-    <combatPower>100</combatPower>
-    <weaponMoney>9999~9999</weaponMoney>
-    <defaultFactionType>PlayerColony</defaultFactionType>
   </PawnKindDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Defs/RecipeDefs/Recipes_WULA.xml b/1.5/Defs/RecipeDefs/Recipes_WULA.xml
index aa3537f0..834b572d 100644
--- a/1.5/Defs/RecipeDefs/Recipes_WULA.xml
+++ b/1.5/Defs/RecipeDefs/Recipes_WULA.xml
@@ -238,7 +238,7 @@
   <RecipeDef ParentName="LightMechanoidRecipe">
     <defName>WULA_Build_Mech_Cat</defName>
     <label>建造CAt-11"猫猫"</label>
-    <description>建造一台CAt-11"猫猫"辅助机器人，可以执行包括搬运、挖矿、建造、烹饪、种植收割、清理、急救和灭火一类的简单工作。</description>
+    <description>建造一台CAt-11"猫猫"辅助机器人，可以执行包括搬运、烹饪、种植收割、清理、急救和灭火一类的简单工作。</description>
     <ingredients Inherit="False">
       <li>
         <filter>
@@ -265,6 +265,36 @@
     </descriptionHyperlinks>
     <researchPrerequisite>WULA_Machine_Productor_Technology</researchPrerequisite>
   </RecipeDef>
+  <RecipeDef ParentName="LightMechanoidRecipe">
+    <defName>WULA_Build_Mech_Cat_Constructor</defName>
+    <label>建造CAt-86"土木猫猫"</label>
+    <description>建造一台CAt-86"土木猫猫"辅助机器人，允许执行挖矿和建造的工作，并且拥有一把可以砸碎敌人膝盖的锤子。</description>
+    <ingredients Inherit="False">
+      <li>
+        <filter>
+          <thingDefs>
+            <li>Steel</li>
+          </thingDefs>
+        </filter>
+        <count>50</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>ComponentIndustrial</li>
+          </thingDefs>
+        </filter>
+        <count>4</count>
+      </li>
+    </ingredients>
+    <products>
+      <Mech_WULA_Cat_Constructor>1</Mech_WULA_Cat_Constructor>
+    </products>
+    <descriptionHyperlinks>
+      <ThingDef>Mech_WULA_Cat_Constructor</ThingDef>
+    </descriptionHyperlinks>
+    <researchPrerequisite>WULA_Machine_Productor_Technology</researchPrerequisite>
+  </RecipeDef>
   <RecipeDef ParentName="LightMechanoidRecipe">
     <defName>WULA_Build_Mech_Cat_EMP</defName>
     <label>建造CAt-23"闪电猫猫"</label>
diff --git a/1.5/Defs/ThingDefs/WULA_Item.xml b/1.5/Defs/ThingDefs/WULA_Item.xml
index 18690278..679cb8c3 100644
--- a/1.5/Defs/ThingDefs/WULA_Item.xml
+++ b/1.5/Defs/ThingDefs/WULA_Item.xml
@@ -21,7 +21,7 @@
       <optimalityOffsetHumanlikes>-1000</optimalityOffsetHumanlikes>
       <optimalityOffsetFeedingAnimals>-1000</optimalityOffsetFeedingAnimals>
       <ingestEffect>EatVegetarian</ingestEffect>
-      <ingestSound>MechanoidsWakeUp</ingestSound>
+      <ingestSound>MechResurrectCast</ingestSound>
     </ingestible>
     <allowedArchonexusCount>200</allowedArchonexusCount>
     <recipeMaker>
@@ -56,7 +56,7 @@
       <Mass>1</Mass>
       <MarketValue>5</MarketValue>
       <DeteriorationRate>0.1</DeteriorationRate>
-      <WorkToMake>50000</WorkToMake>
+      <WorkToMake>15000</WorkToMake>
     </statBases>
     <graphicData>
       <texPath>Things/Item/Special/MechSerumNeurotrainer</texPath>
diff --git a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml
index 784a73a5..910047ce 100644
--- a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml
+++ b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml
@@ -380,6 +380,7 @@
     <recipes>
       <li>WULA_Build_Wula_Synth</li>
       <li>WULA_Build_Mech_Cat</li>
+      <li>WULA_Build_Mech_Cat_Constructor</li>
       <li>WULA_Build_Mech_Cat_EMP</li>
       <li>WULA_Build_Mech_Cat_Fire</li>
       <li>WULA_Build_AI_Heavy_Panzer</li>
diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml
index 64184f38..06c28c63 100644
--- a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml
+++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml
@@ -893,7 +893,7 @@
     <techLevel>Spacer</techLevel>
     <tickerType>Normal</tickerType>
     <thingCategories>
-      <li>ApparelNoble</li>
+      <li>Apparel</li>
     </thingCategories>
     <recipeMaker>
       <displayPriority>105</displayPriority>
@@ -1179,12 +1179,6 @@
       <speed>55</speed>
     </projectile>
   </ThingDef>
-	<ApparelLayerDef>
-		<defName>Shield</defName>
-		<label>盾牌</label>
-		<drawOrder>275</drawOrder>
-	</ApparelLayerDef>
-
   <!-- 萨克森装备 -->
   <ThingDef ParentName="ArmorMachineableBase">
     <defName>WULA_SMp38_Shield</defName>
@@ -1478,4 +1472,176 @@
       <li>RewardStandardHighFreq</li>
     </thingSetMakerTags>
   </ThingDef>
+  <!-- 风暴装备 -->
+  <ThingDef ParentName="ArmorMachineableBase">
+    <defName>WULA_SMp11_Armor</defName>
+    <label>SMp-11"风暴"外装甲</label>
+    <description>由乌拉帝国的"风暴"战甲所装备的额外装甲，提供大量护甲和高额的伤害减免，但是会拖慢机体的移动速度。</description>
+    <techLevel>Spacer</techLevel>
+    <tickerType>Normal</tickerType>
+    <thingCategories>
+      <li>ApparelNoble</li>
+    </thingCategories>
+    <recipeMaker>
+      <unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <skillRequirements>
+        <Crafting>7</Crafting>
+      </skillRequirements>
+      <useIngredientsForColor>false</useIngredientsForColor>
+    </recipeMaker>
+    <graphicData>
+      <texPath>Things/Item/Health/HealthItem</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <statBases>
+      <WorkToMake>25000</WorkToMake>
+      <MaxHitPoints>5000</MaxHitPoints>
+      <Mass>100</Mass>
+      <Flammability>0</Flammability>
+      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Heat>2.0</ArmorRating_Heat>
+      <EquipDelay>15</EquipDelay>
+      <!-- <EnergyShieldEnergyMax>4.0</EnergyShieldEnergyMax> -->
+    </statBases>
+    <equippedStatOffsets>
+      <IncomingDamageFactor>-0.5</IncomingDamageFactor>
+			<MoveSpeed>-1.5</MoveSpeed>
+    </equippedStatOffsets>
+    <costStuffCount>200</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <ComponentIndustrial>4</ComponentIndustrial>
+    </costList>
+    <apparel>
+      <tags>
+        <li>Wula_Storm_Skitter_Armor</li>
+      </tags>
+      <bodyPartGroups>
+        <li>Torso</li>
+        <li>Neck</li>
+        <li>Shoulders</li>
+        <li>Arms</li>
+        <li>Legs</li>
+      </bodyPartGroups>
+      <!-- <wornGraphicPath>Wula/Apparel/WULA_SMp11_Shield</wornGraphicPath> -->
+      <layers>
+        <li>OnSkin</li>
+        <li>Middle</li>
+        <li>Shell</li>
+      </layers>
+      <useDeflectMetalEffect>true</useDeflectMetalEffect>
+      <!-- <soundWear>Wear_PowerArmor</soundWear>
+      <soundRemove>Remove_PowerArmor</soundRemove> -->
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
+      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
+      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
+    </apparel>
+    <thingClass>Apparel</thingClass>
+    <comps>
+      <li Class="CompProperties_Biocodable"/>
+    </comps>
+    <thingSetMakerTags>
+      <li>RewardStandardHighFreq</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ThingDef ParentName="ArmorMachineableBase">
+    <defName>WULA_SMp11_Shield</defName>
+    <label>SMp-11"风暴"附加护盾</label>
+    <description>由乌拉帝国的"风暴"战甲所装备的中型护盾立场，在大型立场盾内部再附加一个小型立场盾，以实现对远程火力的绝对防御。</description>
+    <techLevel>Spacer</techLevel>
+    <tickerType>Normal</tickerType>
+    <thingCategories>
+      <li>Apparel</li>
+    </thingCategories>
+    <recipeMaker>
+      <displayPriority>105</displayPriority>
+      <unfinishedThingDef>UnfinishedTechArmor</unfinishedThingDef>
+      <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <skillRequirements>
+        <Crafting>10</Crafting>
+      </skillRequirements>
+    </recipeMaker>
+    <graphicData>
+      <texPath>Things/Item/Health/HealthItem</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <statBases>
+      <WorkToMake>60000</WorkToMake>
+      <MaxHitPoints>200</MaxHitPoints>
+      <Mass>100</Mass>
+      <Flammability>0</Flammability>
+      <!-- <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Heat>2.0</ArmorRating_Heat> -->
+      <EnergyShieldEnergyMax>1.2</EnergyShieldEnergyMax>
+    </statBases>
+    <equippedStatOffsets>
+      <!-- <WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
+      <IncomingDamageFactor>-0.5</IncomingDamageFactor> -->
+      <!-- <StaggerDurationFactor>-2</StaggerDurationFactor> -->
+			<!-- <CarryingCapacity>60</CarryingCapacity> -->
+    </equippedStatOffsets>
+    <costStuffCount>150</costStuffCount>
+    <stuffCategories>
+      <li>Metallic</li>
+    </stuffCategories>
+    <costList Inherit="False">
+      <ComponentSpacer>4</ComponentSpacer>
+    </costList>
+    <apparel>
+      <tags>
+        <li>Wula_Storm_Skitter_Armor</li>
+      </tags>
+      <bodyPartGroups>
+        <li>Torso</li>
+      </bodyPartGroups>
+      <!-- <wornGraphicPath>Wula/Apparel/WULA_Knight_PowerArmor</wornGraphicPath> -->
+      <layers>
+        <li>OnSkin</li>
+        <li>Middle</li>
+        <li>Shell</li>
+      </layers>
+      <useDeflectMetalEffect>true</useDeflectMetalEffect>
+      <soundWear>Wear_PowerArmor</soundWear>
+      <soundRemove>Remove_PowerArmor</soundRemove>
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
+      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
+      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
+    </apparel>
+    <thingClass>Apparel</thingClass>
+    <comps>
+      <li Class="CompProperties_Biocodable"/>
+      <li Class="CompProperties_Shield">
+        <startingTicksToReset>3600</startingTicksToReset>
+        <minDrawSize>3.5</minDrawSize>
+        <maxDrawSize>3.8</maxDrawSize>
+        <energyLossPerDamage>0.01</energyLossPerDamage>
+        <energyOnReset>4.0</energyOnReset>
+        <blocksRangedWeapons>false</blocksRangedWeapons>
+      </li>
+    </comps>
+    <thingSetMakerTags>
+      <li>RewardStandardHighFreq</li>
+    </thingSetMakerTags>
+  </ThingDef>
+
+
+
+
+
+	<ApparelLayerDef>
+		<defName>Shield</defName>
+		<label>盾牌</label>
+		<drawOrder>275</drawOrder>
+	</ApparelLayerDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index b5078130..2c686970 100644
--- a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -34,6 +34,7 @@
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
       <displayPriority>300</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <tools>
       <li>
@@ -74,6 +75,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <statBases>
       <WorkToMake>700</WorkToMake>
@@ -115,6 +117,8 @@
     <equippedAngleOffset>-65</equippedAngleOffset>
     <techLevel>Spacer</techLevel>
     <statBases>
+      <MarketValue>100</MarketValue>
+      <WorkToMake>1000</WorkToMake>
       <Mass>1</Mass>
     </statBases>
     <tools>
@@ -141,10 +145,12 @@
     <graphicData>
       <texPath>Wula/Weapon/WULA_MW_Breaker_Bar</texPath>
       <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.35</drawSize>
     </graphicData>
-    <weaponTags>
+    <equippedAngleOffset>-65</equippedAngleOffset>
+    <!-- <weaponTags>
       <li>Spear</li>
-    </weaponTags>
+    </weaponTags> -->
     <techLevel>Spacer</techLevel>
     <costStuffCount>50</costStuffCount>
     <statBases>
@@ -185,6 +191,7 @@
         <Crafting>7</Crafting>
       </skillRequirements>
       <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
   <!-- 长枪 -->
@@ -252,6 +259,7 @@
         <Crafting>7</Crafting>
       </skillRequirements>
       <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
   <!-- 链锯剑 -->
@@ -314,6 +322,7 @@
         <Crafting>7</Crafting>
       </skillRequirements>
       <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
   <!-- 动力钉头锤 -->
@@ -365,6 +374,7 @@
         <Crafting>7</Crafting>
       </skillRequirements>
       <displayPriority>450</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
 
@@ -397,6 +407,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Psi_2_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <tools>
       <li>
@@ -489,6 +500,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Psi_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <tools>
       <li>
@@ -571,6 +583,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Psi_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <tools>
       <li>
@@ -660,6 +673,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Psi_2_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <tools>
       <li>
@@ -746,6 +760,7 @@
         <Crafting>5</Crafting>
       </skillRequirements>
       <displayPriority>440</displayPriority>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <thingSetMakerTags><li>RewardStandardQualitySuper</li></thingSetMakerTags>
     <statBases>
@@ -836,6 +851,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_2_Ranged_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <statBases>
       <WorkToMake>25000</WorkToMake>
@@ -899,6 +915,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_2_Ranged_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <costList Inherit="False">
       <Steel>350</Steel>
@@ -947,6 +964,7 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <statBases>
       <WorkToMake>50000</WorkToMake>
@@ -1055,6 +1073,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <weaponTags>
       <li>Wula_AI_Heavy_Panzer_Turret</li>
@@ -1135,6 +1154,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <weaponTags>
       <li>Wula_AI_Heavy_Panzer_Turret</li>
@@ -1209,6 +1229,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <verbs>
       <li>
@@ -1283,6 +1304,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_AI_Machine_Panzer_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <weaponTags>
       <li>Wula_AI_Heavy_Panzer_Turret</li>
@@ -1384,6 +1406,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
   </ThingDef>
   <ThingDef ParentName="BaseHumanMakeableGun">
@@ -1404,6 +1427,7 @@
         <li>WULA_War_Machine_Weapon_Productor</li>
       </recipeUsers>
       <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
     </recipeMaker>
     <costList Inherit="False">
       <Steel>350</Steel>
@@ -1462,4 +1486,181 @@
       <screenShakeFactor>0.1</screenShakeFactor>
     </projectile>
   </ThingDef>
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Storm_Skitter_GL</defName>
+    <label>SEl-78"角砾岩"</label>
+    <description>由SMp-11"风暴"所持的自动榴弹炮，得益于风暴战甲庞大的身躯，这种重型武器可以跟随小队移动并向敌人释放铺天盖地的榴弹雨。</description>
+    <techLevel>Ultra</techLevel>
+    <!-- <techLevel>Spacer</techLevel> -->
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Storm_Skitter_GL</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>2.75</drawSize>
+    </graphicData>
+    <uiIconScale>0.4</uiIconScale>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
+    </recipeMaker>
+    <costList Inherit="False">
+      <Steel>350</Steel>
+      <Plasteel>200</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <statBases>
+      <WorkToMake>40000</WorkToMake>
+      <Mass>150</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Storm_Skitter_GL</defaultProjectile>
+        <warmupTime>0.2</warmupTime>
+        <forcedMissRadius>1</forcedMissRadius>
+        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
+        <isMortar>true</isMortar>
+        <requireLineOfSight>false</requireLineOfSight>
+        <minRange>4</minRange>
+        <range>54</range>
+        <burstShotCount>1</burstShotCount>
+        <soundCast>Mortar_LaunchA</soundCast>
+        <muzzleFlashScale>12</muzzleFlashScale>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Storm_Skitter_GL</defName>
+    <label>角砾岩榴弹</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Mortar_Shell</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+    </graphicData>
+    <thingClass>Projectile_Explosive</thingClass>
+    <projectile>
+      <damageDef>Bomb</damageDef>
+      <damageAmountBase>35</damageAmountBase>
+      <speed>35</speed>
+      <explosionRadius>3.5</explosionRadius>
+      <flyOverhead>true</flyOverhead>
+      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+      <soundAmbient>MortarRound_Ambient</soundAmbient>
+    </projectile>
+  </ThingDef>
+  <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+    <defName>WULA_MW_Storm_Skitter_Lance</defName>
+    <label>CMl-67"铳枪"</label>
+    <description>SMp-11"风暴"所持的枪炮合一的武器，既可以在近战中刺穿对手，也可以从远距离上发射高精度炮弹打击敌军。</description>
+    <weaponTags>
+      <li>Spear</li>
+    </weaponTags>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_MW_Storm_Skitter_Lance</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>3.5</drawSize>
+    </graphicData>
+    <uiIconScale>0.4</uiIconScale>
+    <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
+    <techLevel>Spacer</techLevel>
+    <!-- <equippedAngleOffset>-25</equippedAngleOffset> -->
+    <costList Inherit="False">
+      <Steel>500</Steel>
+      <Plasteel>120</Plasteel>
+      <ComponentIndustrial>12</ComponentIndustrial>
+    </costList>
+    <statBases>
+      <WorkToMake>50000</WorkToMake>
+      <Mass>150</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.4</AccuracyMedium>
+      <AccuracyLong>0.3</AccuracyLong>
+      <RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
+    </statBases>
+    <tools>
+      <li>
+        <label>横扫</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>36</power>
+        <cooldownTime>2.2</cooldownTime>
+        <surpriseAttack>
+          <extraMeleeDamages>
+            <li>
+              <def>Stun</def>
+              <amount>18</amount>
+            </li>
+          </extraMeleeDamages>
+        </surpriseAttack>
+      </li>
+      <li>
+        <label>穿刺</label>
+        <capacities>
+          <li>Stab</li>
+        </capacities>
+        <power>45</power>
+        <armorPenetration>0.80</armorPenetration>
+        <cooldownTime>2</cooldownTime>
+      </li>
+    </tools>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Storm_Skitter_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
+    </recipeMaker>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_MW_Storm_Skitter_Lance</defaultProjectile>
+        <warmupTime>2.25</warmupTime>
+        <minRange>3</minRange>
+        <range>68</range>
+        <burstShotCount>1</burstShotCount>
+        <soundCast>Shot_TurretSniper</soundCast>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <muzzleFlashScale>18</muzzleFlashScale>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_MW_Storm_Skitter_Lance</defName>
+    <label>铳枪穿甲弹</label>
+    <thingClass>Projectile_Explosive</thingClass>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>3.4</drawSize>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>300</damageAmountBase>
+      <speed>180</speed>
+      <explosionRadius>2.6</explosionRadius>
+      <arcHeightFactor>0.4</arcHeightFactor>
+      <soundExplode>Explosion_Rocket</soundExplode>
+      <armorPenetrationBase>1</armorPenetrationBase>
+    </projectile>
+  </ThingDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml
index 4a550416..87b2c39f 100644
--- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml
+++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml
@@ -116,6 +116,57 @@
         <growthAges>
           <li>0</li>
         </growthAges>
+        <!-- 年龄工作效率等的覆盖 -->
+        <ageStatOverrides>
+          <WorkSpeedGlobal>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </WorkSpeedGlobal>
+          <ShootingAccuracyChildFactor MayRequire="Ludeon.RimWorld.Biotech">
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </ShootingAccuracyChildFactor>
+          <MarketValue>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MarketValue>
+          <MeleeHitChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MeleeHitChance>
+          <AimingDelayFactor>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </AimingDelayFactor>
+          <ArrestSuccessChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0, 1)</li>
+              </points>
+            </curve>
+          </ArrestSuccessChance>
+        </ageStatOverrides>
       </generalSettings>
       <!-- 图形 -->
 			<graphicPaths>
@@ -448,6 +499,57 @@
         <growthAges>
           <li>0</li>
         </growthAges>
+        <!-- 年龄工作效率等的覆盖 -->
+        <ageStatOverrides>
+          <WorkSpeedGlobal>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </WorkSpeedGlobal>
+          <ShootingAccuracyChildFactor MayRequire="Ludeon.RimWorld.Biotech">
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </ShootingAccuracyChildFactor>
+          <MarketValue>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MarketValue>
+          <MeleeHitChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MeleeHitChance>
+          <AimingDelayFactor>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </AimingDelayFactor>
+          <ArrestSuccessChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0, 1)</li>
+              </points>
+            </curve>
+          </ArrestSuccessChance>
+        </ageStatOverrides>
       </generalSettings>
       <!-- 图形 -->
 			<graphicPaths>
@@ -661,7 +763,7 @@
         <capacities>
           <li>Blunt</li>
         </capacities>
-        <power>22</power>
+        <power>14</power>
         <cooldownTime>2.9</cooldownTime>
         <linkedBodyPartsGroup>WULA_Panzer_Core_Bodypart</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
@@ -736,6 +838,57 @@
         <growthAges>
           <li>0</li>
         </growthAges>
+        <!-- 年龄工作效率等的覆盖 -->
+        <ageStatOverrides>
+          <WorkSpeedGlobal>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </WorkSpeedGlobal>
+          <ShootingAccuracyChildFactor MayRequire="Ludeon.RimWorld.Biotech">
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </ShootingAccuracyChildFactor>
+          <MarketValue>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MarketValue>
+          <MeleeHitChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </MeleeHitChance>
+          <AimingDelayFactor>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0,1)</li>
+              </points>
+            </curve>
+          </AimingDelayFactor>
+          <ArrestSuccessChance>
+            <useBiologicalYears>true</useBiologicalYears>
+            <curve>
+              <points>
+                <li>(0, 1)</li>
+              </points>
+            </curve>
+          </ArrestSuccessChance>
+        </ageStatOverrides>
       </generalSettings>
       <!-- 图形 -->
 			<graphicPaths>
@@ -778,12 +931,13 @@
         <weaponList>
           <li>WULA_RW_Storm_Skitter_AR</li>
           <li>WULA_MW_Storm_Skitter_Glaive</li>
+          <li>WULA_RW_Storm_Skitter_GL</li>
+          <li>WULA_MW_Storm_Skitter_Lance</li>
         </weaponList>
         <!-- 可以穿戴的衣服 -->
         <apparelList>
-          <!-- <li>WULA_SMp38_Shield</li>
-          <li>WULA_SMp38_Armor</li>
-          <li>WULA_SMp38_Engine</li> -->
+          <li>WULA_SMp11_Shield</li>
+          <li>WULA_SMp11_Armor</li>
         </apparelList>
         <onlyUseRaceRestrictedApparel>true</onlyUseRaceRestrictedApparel>
         <onlyUseRaceRestrictedWeapons>true</onlyUseRaceRestrictedWeapons>
@@ -960,14 +1114,25 @@
 
     <tools>
       <li>
-        <label>碾压</label>
-        <labelNoLocation>碾压</labelNoLocation>
+        <label>肘击</label>
+        <labelNoLocation>肘击</labelNoLocation>
         <capacities>
           <li>Blunt</li>
         </capacities>
-        <power>22</power>
-        <cooldownTime>2.9</cooldownTime>
-        <linkedBodyPartsGroup>WULA_Panzer_Core_Bodypart</linkedBodyPartsGroup>
+        <power>15</power>
+        <cooldownTime>1.75</cooldownTime>
+        <linkedBodyPartsGroup>Arm</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+      <li>
+        <label>拍击</label>
+        <labelNoLocation>拍击</labelNoLocation>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>12</power>
+        <cooldownTime>1.5</cooldownTime>
+        <linkedBodyPartsGroup>Hand</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
     </tools>
@@ -1073,10 +1238,10 @@
     <label>CAt-42"烈焰猫猫"</label>
     <description>乌拉帝国的一种小型机械体，只能执行救火、搬运和清扫任务，但是相比起基础型号多配备了一个燃烧瓶投掷物，可以点燃靠近阵线的敌军。</description>
   </ThingDef>
-  <AlienRace.ThingDef_AlienRace ParentName="Mech_WULA_Cat_Soldier">
+  <ThingDef ParentName="Mech_WULA_Cat_Soldier">
     <defName>Mech_WULA_Cat_Constructor</defName>
     <label>CAt-86"土木猫猫"</label>
-    <description>乌拉帝国的一种小型机械体，只能执行建造和开采任务，不仅可以建造特殊的乌拉帝国堡垒结构，也可以跳起来用手上的HAm-1"装修锤"锤烂敌人的膝盖。</description>
+    <description>乌拉帝国的一种小型机械体，只能执行建造和开采任务，可以跳起来用手上的HAm-1"装修锤"锤烂敌人的膝盖。</description>
     <uiIconPath>Wula/Things/WULA_Constructor_Cat/WULA_Cat_Thin_south</uiIconPath>
     <race>
       <mechEnabledWorkTypes Inherit="False">
@@ -1084,12 +1249,5 @@
         <li>Construction</li>
       </mechEnabledWorkTypes>
     </race>
-    <alienRace>
-      <raceRestriction>
-        <buildingList>
-          <li>WulaWall</li>
-        </buildingList>
-      </raceRestriction>
-    </alienRace>
-  </AlienRace.ThingDef_AlienRace>
+  </ThingDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Defs/TraitDefs/Traits_WULA.xml b/1.5/Defs/TraitDefs/Traits_WULA.xml
index 05e6302e..0bb43b23 100644
--- a/1.5/Defs/TraitDefs/Traits_WULA.xml
+++ b/1.5/Defs/TraitDefs/Traits_WULA.xml
@@ -119,7 +119,6 @@
       <li>
         <label>破碎人格</label>
         <description>这个乌拉帝国合成人没有完整的人格，这使得她更像是一台真正的机械——除了饮食外，所有的需求都已经被禁用。</description>
-        <degree>1</degree>
         <disablesNeeds>
           <li>Mood</li>
           <li>Joy</li>
diff --git a/1.5/Defs/WorkGivers/Wula_WorkGivers.xml b/1.5/Defs/WorkGivers/Wula_WorkGivers.xml
index 02c5a0d3..ec9a7c33 100644
--- a/1.5/Defs/WorkGivers/Wula_WorkGivers.xml
+++ b/1.5/Defs/WorkGivers/Wula_WorkGivers.xml
@@ -52,4 +52,21 @@
     </requiredCapacities>
     <prioritizeSustains>true</prioritizeSustains>
   </WorkGiverDef>
+
+  <WorkGiverDef>
+    <defName>WULA_Synth_ServerBills</defName>
+    <label>在服务器系统下载数据</label>
+    <giverClass>WorkGiver_DoBill</giverClass>
+    <workType>Smithing</workType>
+    <priorityInType>75</priorityInType>
+    <fixedBillGiverDefs>
+      <li>WULA_Synth_Server</li>
+    </fixedBillGiverDefs>
+    <verb>工作于</verb>
+    <gerund>工作于</gerund>
+    <requiredCapacities>
+      <li>Manipulation</li>
+    </requiredCapacities>
+    <prioritizeSustains>true</prioritizeSustains>
+  </WorkGiverDef>
 </Defs>
\ No newline at end of file
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base.png b/Textures/Wula/Apparel/WULA_Shield_Base.png
index 43f81ea9..b6350768 100644
Binary files a/Textures/Wula/Apparel/WULA_Shield_Base.png and b/Textures/Wula/Apparel/WULA_Shield_Base.png differ
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png
index 0bc9329f..62fe0dad 100644
Binary files a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png and b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png differ
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png
index d422a876..b75475ed 100644
Binary files a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png and b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png differ
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.sai2 b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.sai2
deleted file mode 100644
index e670af5d..00000000
Binary files a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.sai2 and /dev/null differ
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png
index 33f6ad47..6bea88e0 100644
Binary files a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png and b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png differ
diff --git a/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2
new file mode 100644
index 00000000..84b252ad
Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 differ
diff --git a/Textures/Wula/Building/WULA_Synth_Server_east.png b/Textures/Wula/Building/WULA_Synth_Server_east.png
index 08bad73b..e1e92897 100644
Binary files a/Textures/Wula/Building/WULA_Synth_Server_east.png and b/Textures/Wula/Building/WULA_Synth_Server_east.png differ
diff --git a/Textures/Wula/Building/WULA_Synth_Server_south.png b/Textures/Wula/Building/WULA_Synth_Server_south.png
index 08bad73b..e8257b37 100644
Binary files a/Textures/Wula/Building/WULA_Synth_Server_south.png and b/Textures/Wula/Building/WULA_Synth_Server_south.png differ
diff --git a/Textures/Wula/Building/WULA_Synth_Server_south.sai2 b/Textures/Wula/Building/WULA_Synth_Server_south.sai2
index 095f100c..24767bf8 100644
Binary files a/Textures/Wula/Building/WULA_Synth_Server_south.sai2 and b/Textures/Wula/Building/WULA_Synth_Server_south.sai2 differ
diff --git a/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor.sai2 b/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor.sai2
index c9444582..efebb8b1 100644
Binary files a/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor.sai2 and b/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor.sai2 differ
diff --git a/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor_east.png b/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor_east.png
index d3c5fac2..99a82d21 100644
Binary files a/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor_east.png and b/Textures/Wula/Building/WULA_War_Machine_Weapon_Productor_east.png differ
diff --git a/Textures/Wula/Item/WULA_Charge_Cube.png b/Textures/Wula/Item/WULA_Charge_Cube.png
index d0263620..e9226f7e 100644
Binary files a/Textures/Wula/Item/WULA_Charge_Cube.png and b/Textures/Wula/Item/WULA_Charge_Cube.png differ
diff --git a/Textures/Wula/Item/WULA_Default_Item.png b/Textures/Wula/Item/WULA_Default_Item.png
new file mode 100644
index 00000000..d0263620
Binary files /dev/null and b/Textures/Wula/Item/WULA_Default_Item.png differ
diff --git a/Textures/Wula/Item/WULA_Default_Item.sai2 b/Textures/Wula/Item/WULA_Default_Item.sai2
new file mode 100644
index 00000000..d286995b
Binary files /dev/null and b/Textures/Wula/Item/WULA_Default_Item.sai2 differ
diff --git a/Textures/Wula/Item/WULA_charge_cube.sai2 b/Textures/Wula/Item/WULA_charge_cube.sai2
index a2f86308..12b606f8 100644
Binary files a/Textures/Wula/Item/WULA_charge_cube.sai2 and b/Textures/Wula/Item/WULA_charge_cube.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png
index 92d56e55..040c261f 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png and b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.sai2 b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.sai2
new file mode 100644
index 00000000..2c66e873
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_MW_ChainSword.png b/Textures/Wula/Weapon/WULA_MW_ChainSword.png
index a899aaa2..c54e3974 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_ChainSword.png and b/Textures/Wula/Weapon/WULA_MW_ChainSword.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 b/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2
index db4f74f2..42b1696e 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 and b/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.png b/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.png
index 48a52673..489b38e6 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.png and b/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.sai2 b/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.sai2
index 71225180..9ece732f 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.sai2 and b/Textures/Wula/Weapon/WULA_MW_Constructor_Hammer.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Lance.png b/Textures/Wula/Weapon/WULA_MW_Lance.png
index 7e1eaafc..544721bc 100644
Binary files a/Textures/Wula/Weapon/WULA_MW_Lance.png and b/Textures/Wula/Weapon/WULA_MW_Lance.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Lance.sai2 b/Textures/Wula/Weapon/WULA_MW_Lance.sai2
new file mode 100644
index 00000000..75cd1a44
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Lance.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.png b/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.png
new file mode 100644
index 00000000..89c8a17b
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.png differ
diff --git a/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.sai2 b/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.sai2
new file mode 100644
index 00000000..d43206dd
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Storm_Skitter_Lance.sai2 differ
diff --git a/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.png b/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.png
new file mode 100644
index 00000000..e12e185e
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.png differ
diff --git a/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.sai2 b/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.sai2
new file mode 100644
index 00000000..833115be
Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Storm_Skitter_GL.sai2 differ