From adba9cd90485f5d6fffc92551f721846ea246b2c Mon Sep 17 00:00:00 2001
From: Tourswen <82707327+Tourswen@users.noreply.github.com>
Date: Sun, 27 Jul 2025 05:16:31 +0800
Subject: [PATCH] 2025-7-27

---
 .../BackstoryDefs/Solid/Solid_Child_WULA.xml  |  24 ++--
 1.6/Defs/FactionDefs/Factions_Player_WULA.xml |  35 ++++--
 .../HediffDefs/Hediffs_BodyParts_WULA.xml     | 103 +++++++++++++++++-
 1.6/Defs/NeedDefs/WULA_Needs.xml              |   1 +
 1.6/Defs/PawnKinds/PawnKinds_Wula.xml         |  15 ++-
 1.6/Defs/RecipeDefs/Recipes_WULA.xml          |   2 +-
 .../ResearchProjects_WULA.xml                 |  67 +++++++++---
 .../RulePacks_Namers_Factions_Wula.xml        |  30 +++++
 1.6/Defs/Scenarios/Scenarios_WULA.xml         |   4 +
 1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml      |  18 ++-
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    |  22 +++-
 1.6/Defs/TraitDefs/Traits_WULA.xml            |   4 +-
 12 files changed, 264 insertions(+), 61 deletions(-)

diff --git a/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml b/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
index 3f1c461f..b9c58bf5 100644
--- a/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
+++ b/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
@@ -8,18 +8,18 @@
     <titleShort>旧日遗物</titleShort>
     <description>[PAWN_nameDef] 是诞生于乌拉帝国的合成人。</description>
     <skillGains>
-      <Shooting>5</Shooting>
-      <Melee>5</Melee>
-      <Construction>5</Construction>
-      <Mining>5</Mining>
-      <Cooking>5</Cooking>
-      <Plants>5</Plants>
-      <Animals>5</Animals>
-      <Crafting>5</Crafting>
-      <Artistic>5</Artistic>
-      <Medicine>5</Medicine>
-      <Social>5</Social>
-      <Intellectual>5</Intellectual>
+      <Shooting>3</Shooting>
+      <Melee>3</Melee>
+      <Construction>3</Construction>
+      <Mining>3</Mining>
+      <Cooking>3</Cooking>
+      <Plants>3</Plants>
+      <Animals>3</Animals>
+      <Crafting>3</Crafting>
+      <Artistic>3</Artistic>
+      <Medicine>3</Medicine>
+      <Social>3</Social>
+      <Intellectual>3</Intellectual>
     </skillGains>
     <spawnCategories>
       <li>Wula_Old_Synth_Backstory_Categories</li>
diff --git a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
index c831e7da..2def942d 100644
--- a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
+++ b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
@@ -14,7 +14,7 @@
       <li>Wula_Backstory_Categories</li>
     </backstoryCategories>
     <!-- 命名规则 -->
-    <factionNameMaker>NamerFactionOutlander</factionNameMaker>
+    <factionNameMaker>NamerFactionWula</factionNameMaker>
     <settlementNameMaker>NamerSettlementOutlander</settlementNameMaker>
     <allowedCultures><li>Astropolitan</li></allowedCultures>
     <factionIconPath>World/WorldObjects/Expanding/Town</factionIconPath>
@@ -89,25 +89,41 @@
       </points>
     </maxPawnCostPerTotalPointsCurve>
     <pawnGroupMakers>
+      <!-- 机械部队，大量的猫猫混杂一台战车 -->
       <li>
         <kindDef>Combat</kindDef>
         <commonality>50</commonality>
         <options>
-          <Wula_Broken_Personality_Pawn_2>10</Wula_Broken_Personality_Pawn_2>
-          <Wula_Broken_Personality_Pawn_7>3</Wula_Broken_Personality_Pawn_7>
+          <Wula_AI_Heavy_Panzer_Gunnery_PawnKind>100</Wula_AI_Heavy_Panzer_Gunnery_PawnKind>
+          <Mech_WULA_Cat_Assault>60</Mech_WULA_Cat_Assault>
+          <Mech_WULA_Cat_Constructor>30</Mech_WULA_Cat_Constructor>
+          <Mech_WULA_Cat_Fire>10</Mech_WULA_Cat_Fire>
+          <Mech_WULA_Cat_EMP>10</Mech_WULA_Cat_EMP>
+        </options>
+      </li>
+      <!-- 重甲部队，大量的猫猫混杂少量的重甲兵 -->
+      <li>
+        <kindDef>Combat</kindDef>
+        <commonality>50</commonality>
+        <options>
+          <Mech_WULA_Cat_Constructor>20</Mech_WULA_Cat_Constructor>
+          <Mech_WULA_Cat_Assault>20</Mech_WULA_Cat_Assault>
+          <Wula_Broken_Personality_Pawn_7>2</Wula_Broken_Personality_Pawn_7>
           <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
         </options>
       </li>
+      <!-- 骑士军团部队 -->
       <li>
         <kindDef>Combat</kindDef>
         <commonality>40</commonality>
         <options>
-          <Wula_Broken_Personality_Pawn_2>10</Wula_Broken_Personality_Pawn_2>
-          <Wula_Broken_Personality_Pawn_6>2</Wula_Broken_Personality_Pawn_6>
+          <Mech_WULA_Cat_Constructor>20</Mech_WULA_Cat_Constructor>
+          <Mech_WULA_Cat_Assault>20</Mech_WULA_Cat_Assault>
+          <Wula_Broken_Personality_Pawn_6>3</Wula_Broken_Personality_Pawn_6>
         </options>
       </li>
+      <!-- 破袭部队，可能会有破墙重甲 -->
       <li>
-        <!-- breach raids -->
         <kindDef>Combat</kindDef>
         <commonality>30</commonality>
         <options>
@@ -116,16 +132,19 @@
           <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
         </options>
       </li>
+      <!-- 常规部队 -->
       <li>
-        <!-- Centipede only -->
         <kindDef>Combat</kindDef>
         <commonality>20</commonality>
         <options>
+          <Mech_WULA_Cat_Fire>2</Mech_WULA_Cat_Fire>
+          <Mech_WULA_Cat_EMP>2</Mech_WULA_Cat_EMP>
           <Wula_Broken_Personality_Pawn_2>10</Wula_Broken_Personality_Pawn_2>
           <Wula_Broken_Personality_Pawn_3>3</Wula_Broken_Personality_Pawn_3>
           <Wula_Broken_Personality_Pawn_4>3</Wula_Broken_Personality_Pawn_4>
         </options>
       </li>
+      <!-- 服务安保部队 -->
       <li>
         <!-- militor only -->
         <kindDef>Combat</kindDef>
@@ -143,4 +162,4 @@
     <dropPodActive>ActiveDropPodMechanoid</dropPodActive>
     <dropPodIncoming>DropPodIncomingMechanoidRapid</dropPodIncoming>
   </FactionDef>
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
index 1cdd0ff4..8218fb09 100644
--- a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
@@ -631,6 +631,9 @@
     <defName>WULA_Addons_Antenna_Expansion</defName>
     <label>上行链路天线-扩容插件</label>
     <description>用于为上行链路天线进行带宽扩容的组件，支持更多的机械体带宽和机械组，以指挥更庞大的钢铁洪流。</description>
+    <descriptionHyperlinks>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Expansion</HediffDef>
+    </descriptionHyperlinks>
     <costList>
       <Plasteel>10</Plasteel>
       <ComponentIndustrial>4</ComponentIndustrial>
@@ -663,6 +666,9 @@
     <description>用于为上行链路天线进行带宽扩容的组件，支持更多的机械体带宽和机械组，以指挥更庞大的钢铁洪流。</description>
     <descriptionShort>用于为上行链路天线进行带宽扩容的组件。</descriptionShort>
     <defaultLabelColor>(0.5, 0.8, 1.0)</defaultLabelColor>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Expansion</ThingDef>
+    </descriptionHyperlinks>
     <isBad>false</isBad>
     <priceImpact>true</priceImpact>
     <initialSeverity>1</initialSeverity>    <!-- Severity is bound to level of implant -->
@@ -717,6 +723,9 @@
     <defName>WULA_Addons_Antenna_Repairer</defName>
     <label>上行链路天线-维修插件</label>
     <description>用于为上行链路天线添加额外维修能力的组件，可以向乌拉帝国的机械体发送特殊的信号，使其能够利用上行链路自行诊断和修复伤势，并提高维修速度。</description>
+    <descriptionHyperlinks>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Repairer</HediffDef>
+    </descriptionHyperlinks>
     <costList>
       <Plasteel>10</Plasteel>
       <ComponentIndustrial>4</ComponentIndustrial>
@@ -748,6 +757,9 @@
     <label>维修插件</label>
     <description>用于为上行链路天线添加额外维修能力的组件，可以向乌拉帝国的机械体发送特殊的信号，使其能够利用上行链路自行诊断和修复伤势，并提高维修速度。</description>
     <defaultLabelColor>(0.5, 0.8, 1.0)</defaultLabelColor>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Repairer</ThingDef>
+    </descriptionHyperlinks>
     <isBad>false</isBad>
     <priceImpact>true</priceImpact>
     <initialSeverity>1</initialSeverity>    <!-- Severity is bound to level of implant -->
@@ -1049,6 +1061,8 @@
     <targetsBodyPart>false</targetsBodyPart> <!-- 仍然作用于整个小人 -->
     <anesthetize>false</anesthetize> <!-- 不需要麻醉 -->
     <dontShowIfAnyIngredientMissing>true</dontShowIfAnyIngredientMissing>
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
     <!-- 此处无需特定的 surgeryOutcomeEffect，因为物品的 CompUseEffect 处理实际治疗 -->
     <ingredients>
       <li>
@@ -1067,5 +1081,92 @@
     </fixedIngredientFilter>
   </RecipeDef>
 
-  <!-- 能量电池 -->
+  <!-- 关机 -->
+  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
+    <defName>WULA_Shutdown_Synth</defName>
+    <label>紧急关机</label>
+    <description>将这只机械乌拉的所有系统关闭，以规避一段时间内的潜在风险。需要一位殖民者协助关机工作，同时若想开机也需要一位殖民者协助。</description>
+    <jobString>正在紧急关机。</jobString>
+    <workAmount>100</workAmount>
+    <workerClass>Recipe_AddHediff</workerClass>
+    <hideBodyPartNames>true</hideBodyPartNames>
+    <targetsBodyPart>false</targetsBodyPart>
+    <isViolation>true</isViolation>
+    <researchPrerequisites>
+      <li>WULA_Shutdown_Technology</li>
+    </researchPrerequisites>
+    <uiIconThing>WULA_Charge_Cube_No_Power</uiIconThing>
+    <surgeryOutcomeEffect IsNull="True" />
+    <!-- Always succeeds -->
+    <anesthetize>false</anesthetize>
+    <skillRequirements Inherit="False">
+      <Medicine>0</Medicine>
+    </skillRequirements>
+    <recipeUsers Inherit="False">
+      <li>WulaSpecies</li> <!-- 只能在乌拉族上执行 -->
+    </recipeUsers>
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
+
+    <ingredients Inherit="False"/>
+    <addsHediff>WULA_Shutdown_Synth_Hediff</addsHediff>
+  </RecipeDef>
+  <RecipeDef ParentName="FertilitySurgery">
+    <defName>WULA_Synth_Power_On</defName>
+    <label>开机</label>
+    <description>重启该合成人，恢复其系统机能运行。</description>
+    <workerClass>Recipe_RemoveHediff</workerClass>
+    <jobString>正在重启合成人。</jobString>
+    <successfullyRemovedHediffMessage>{0} 成功重启了 {1}。</successfullyRemovedHediffMessage>
+    <uiIconThing>WULA_Charge_Cube</uiIconThing>
+    <removesHediff>WULA_Shutdown_Synth_Hediff</removesHediff>
+    <surgeryOutcomeEffect IsNull="True" />
+    <!-- Always succeeds -->
+    <anesthetize>false</anesthetize>
+    <addsHediffOnFailure Inherit="False" />
+    <ingredients Inherit="False" />
+    <researchPrerequisites Inherit="False">
+      <li>WULA_Shutdown_Technology</li>
+    </researchPrerequisites>
+    <recipeUsers Inherit="False">
+      <li>WulaSpecies</li> <!-- 只能在乌拉族上执行 -->
+    </recipeUsers>
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
+  </RecipeDef>
+  <HediffDef ParentName="ImplantHediffBase">
+    <defName>WULA_Shutdown_Synth_Hediff</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>关机</label>
+    <description>这只机械乌拉的所有系统都已经关闭了。</description>
+    <descriptionShort>这只机械乌拉的所有系统都已经关闭了——如果需要唤醒，则需要另一位殖民者的协助。</descriptionShort>
+    <!-- <initialSeverity>0.5</initialSeverity> -->
+    <minSeverity>0.01</minSeverity>
+    <maxSeverity>1</maxSeverity>
+    <alwaysShowSeverity>true</alwaysShowSeverity>
+    <isBad>true</isBad>
+    <duplicationAllowed>true</duplicationAllowed>
+    <keepOnBodyPartRestoration>true</keepOnBodyPartRestoration>    <!-- true -->
+    <!-- <defaultInstallPart>Brain</defaultInstallPart> -->
+    <stages>
+      <li>
+        <label>停机</label>
+        <minSeverity>0</minSeverity>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.1</setMax>
+          </li>
+          <li>
+            <capacity>Moving</capacity>
+            <setMax>0.1</setMax>
+          </li>
+          <li>
+            <capacity>Manipulation</capacity>
+            <setMax>0.1</setMax>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
 </Defs>
diff --git a/1.6/Defs/NeedDefs/WULA_Needs.xml b/1.6/Defs/NeedDefs/WULA_Needs.xml
index d083ac9a..88ba42e3 100644
--- a/1.6/Defs/NeedDefs/WULA_Needs.xml
+++ b/1.6/Defs/NeedDefs/WULA_Needs.xml
@@ -14,6 +14,7 @@
     <showForCaravanMembers>true</showForCaravanMembers>
     <developmentalStageFilter>Baby, Child, Adult</developmentalStageFilter>
     <showUnitTicks>true</showUnitTicks>
+    <freezeWhileSleeping>true</freezeWhileSleeping>
     <modExtensions>
       <li Class="WulaFallenEmpire.NeedDefExtension_Energy">
         <fallPerDay>1</fallPerDay>
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index a251173d..4aebf0a2 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -96,7 +96,10 @@
     <race>Wula_AI_Heavy_Panzer</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <allowInMechClusters>false</allowInMechClusters>
-    <combatPower>500</combatPower>
+    <combatPower>1000</combatPower>
+    <isBoss>true</isBoss>
+    <maxPerGroup>1</maxPerGroup>
+    <isGoodBreacher>true</isGoodBreacher>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -122,7 +125,9 @@
     <race>Wula_AI_Heavy_Panzer_Gunnery</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <allowInMechClusters>false</allowInMechClusters>
-    <combatPower>500</combatPower>
+    <combatPower>1000</combatPower>
+    <isBoss>true</isBoss>
+    <maxPerGroup>1</maxPerGroup>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -186,6 +191,7 @@
     <defName>Mech_WULA_Cat_Fire</defName>
     <label>乌拉猫猫掷弹兵（燃烧弹）</label>
     <race>Mech_WULA_Cat_Fire</race>
+    <combatPower>200</combatPower>
     <weaponTags>
       <li>GrenadeFlame</li>
     </weaponTags>
@@ -194,6 +200,7 @@
     <defName>Mech_WULA_Cat_EMP</defName>
     <label>乌拉猫猫掷弹兵（EMP）</label>
     <race>Mech_WULA_Cat_EMP</race>
+    <combatPower>200</combatPower>
     <weaponTags>
       <li>GrenadeEMP</li>
     </weaponTags>
@@ -205,6 +212,7 @@
     <weaponTags>
       <li>Wula_Constructor_Cat_Weapon</li>
     </weaponTags>
+    <combatPower>200</combatPower>
     <lifeStages Inherit="False">
       <li>
         <bodyGraphicData>
@@ -221,6 +229,7 @@
     <defName>Mech_WULA_Cat_Assault</defName>
     <label>突击乌拉猫猫</label>
     <race>Mech_WULA_Cat_Assault</race>
+    <combatPower>500</combatPower>
     <lifeStages Inherit="False">
       <li>
         <bodyGraphicData>
@@ -286,6 +295,7 @@
     <race>Mech_WULA_Cat_DM</race>
     <defaultFactionType>PlayerColony</defaultFactionType>
     <allowInMechClusters>False</allowInMechClusters>
+    <combatPower>1000</combatPower>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -435,6 +445,7 @@
     <apparelMoney>99999~99999</apparelMoney>
     <weaponMoney>99999~99999</weaponMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
+    <maxPerGroup>1</maxPerGroup>
     <apparelTags>
       <li>Wula_Armor_Super_Heavy</li>
     </apparelTags>
diff --git a/1.6/Defs/RecipeDefs/Recipes_WULA.xml b/1.6/Defs/RecipeDefs/Recipes_WULA.xml
index 35ae2e24..6005629a 100644
--- a/1.6/Defs/RecipeDefs/Recipes_WULA.xml
+++ b/1.6/Defs/RecipeDefs/Recipes_WULA.xml
@@ -526,7 +526,7 @@
     <descriptionHyperlinks>
       <ThingDef>WulaSpecies</ThingDef>
     </descriptionHyperlinks>
-    <researchPrerequisite>WULA_Machine_Productor_Technology</researchPrerequisite>
+    <researchPrerequisite>WULA_Synth_Productor_Technology</researchPrerequisite>
   </RecipeDef>
 
   <RecipeDef ParentName="LightMechanoidRecipe">
diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index 43aeb7dc..c6c88b17 100644
--- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -30,7 +30,7 @@
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Adv_WorkTable_Technology</defName>
-    <researchViewX>3.50</researchViewX>
+    <researchViewX>3.00</researchViewX>
     <researchViewY>3.20</researchViewY>
     <label>高级编织体套件</label>
     <description>开发功能性更强的工作台，以支持后续的高级设备构建。</description>
@@ -49,6 +49,7 @@
     <baseCost>4000</baseCost>
     <prerequisites>
       <li>WULA_Adv_WorkTable_Technology</li>
+      <li>AdvancedFabrication</li>
     </prerequisites>
   </ResearchProjectDef>
   <!-- 衣服 -->
@@ -95,7 +96,7 @@
     <description>开发能够被乌拉帝国合成人穿着的装甲，这类装备可以为乌拉帝国合成人提供保护。</description>
     <baseCost>2400</baseCost>
     <prerequisites>
-      <li>MicroelectronicsBasics</li>
+      <li>ReconArmor</li>
       <li>WULA_Synth_Clothes_2_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -107,7 +108,7 @@
     <description>开发能够被乌拉帝国合成人穿着的重型装甲，这类装备可以提供大量保护的同时兼具其他的功能性。</description>
     <baseCost>3200</baseCost>
     <prerequisites>
-      <li>Fabrication</li>
+      <li>PoweredArmor</li>
       <li>WULA_Synth_Armor_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -132,6 +133,7 @@
     <researchViewX>4.50</researchViewX>
     <researchViewY>1.00</researchViewY>
     <prerequisites>
+      <li>Fabrication</li>
       <li>WULA_Adv_WorkTable_Technology</li>
       <li>WULA_Synth_Weapon_Technology</li>
     </prerequisites>
@@ -144,6 +146,8 @@
     <researchViewX>5.50</researchViewX>
     <researchViewY>1.00</researchViewY>
     <prerequisites>
+      <li>ReconArmor</li>
+      <li>Bionics</li>
       <li>WULA_Synth_Weapon_2_Melee_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -155,8 +159,8 @@
     <description>开发能够武装乌拉帝国合成人的远距离武器，旨在构建密集火力网消灭敌人。</description>
     <baseCost>2400</baseCost>
     <prerequisites>
+      <li>ChargedShot</li>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>MicroelectronicsBasics</li>
       <li>WULA_Synth_Weapon_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -169,6 +173,7 @@
     <baseCost>3200</baseCost>
     <prerequisites>
       <li>WULA_Synth_Weapon_2_Ranged_Technology</li>
+      <li>BeamWeapons</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -219,25 +224,26 @@
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Machine_Productor_1_Technology</defName>
-    <researchViewX>3.00</researchViewX>
-    <researchViewY>5.50</researchViewY>
-    <label>辅兵部署套件</label>
-    <description>获取构建简单乌拉帝国机械体的知识，这些机械体本身战斗力不强但是可以辅助生产和战斗。</description>
+    <defName>WULA_Synth_Productor_Technology</defName>
+    <label>合成人构建套件</label>
+    <description>获取构建乌拉帝国合成人的相关知识，以增加殖民地人口。</description>
     <baseCost>1000</baseCost>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>5.50</researchViewY>
     <prerequisites>
       <li>WULA_Machine_Productor_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_AI_Machine_Panzer_Technology</defName>
-    <researchViewX>5.50</researchViewX>
-    <researchViewY>4.70</researchViewY>
-    <label>基础战车部署套件</label>
-    <description>获取乌拉帝国机械体SMp-38"萨克森"和其变种SMp-38A"斯佩萨特"的生产权限，一种携带突击区域护盾和强大火力武备的战车型机械体。</description>
-    <baseCost>2400</baseCost>
+    <defName>WULA_Machine_Productor_1_Technology</defName>
+    <researchViewX>3.00</researchViewX>
+    <researchViewY>5.50</researchViewY>
+    <label>辅兵部署套件</label>
+    <description>获取构建简单乌拉帝国机械体的知识，这些机械体本身战斗力不强但是可以辅助生产和战斗。</description>
+    <baseCost>1200</baseCost>
     <prerequisites>
-      <li>WULA_Machine_Productor_1_Technology</li>
+      <li>StandardMechtech</li>
+      <li>WULA_Synth_Productor_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -248,6 +254,7 @@
     <researchViewX>4.50</researchViewX>
     <researchViewY>4.70</researchViewY>
     <prerequisites>
+      <li>HighMechtech</li>
       <li>WULA_Machine_Productor_1_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -259,10 +266,23 @@
     <researchViewX>9.00</researchViewX>
     <researchViewY>5.50</researchViewY>
     <prerequisites>
+      <li>HighMechtech</li>
       <li>WULA_Machine_Productor_1_Technology</li>
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_AI_Machine_Panzer_Technology</defName>
+    <researchViewX>10.00</researchViewX>
+    <researchViewY>4.80</researchViewY>
+    <label>基础战车部署套件</label>
+    <description>获取乌拉帝国机械体SMp-38"萨克森"和其变种SMp-38A"斯佩萨特"的生产权限，一种携带突击区域护盾和强大火力武备的战车型机械体。</description>
+    <baseCost>2400</baseCost>
+    <prerequisites>
+      <li>HighMechtech</li>
+      <li>WULA_Mech_WULA_Cat_DM_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <!-- 植入物 -->
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Repair_All_Technology</defName>
@@ -275,6 +295,17 @@
       <li>WULA_Base_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Shutdown_Technology</defName>
+    <researchViewX>3.00</researchViewX>
+    <researchViewY>3.90</researchViewY>
+    <label>系统休眠套件</label>
+    <description>获取关闭乌拉帝国合成人各系统的必须知识。</description>
+    <baseCost>800</baseCost>
+    <prerequisites>
+      <li>WULA_Repair_All_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_New_Synth_Skill_Technology</defName>
     <label>数据下载套件</label>
@@ -306,7 +337,7 @@
     <baseCost>800</baseCost>
     <prerequisites>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>WULA_Repair_All_Technology</li>
+      <li>WULA_Shutdown_Technology</li>
       <li>WULA_New_Synth_Skill_2_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
@@ -322,4 +353,4 @@
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Defs/RulePackDefs/RulePacks_Namers_Factions_Wula.xml b/1.6/Defs/RulePackDefs/RulePacks_Namers_Factions_Wula.xml
index 152c8192..053045b4 100644
--- a/1.6/Defs/RulePackDefs/RulePacks_Namers_Factions_Wula.xml
+++ b/1.6/Defs/RulePackDefs/RulePacks_Namers_Factions_Wula.xml
@@ -30,4 +30,34 @@
       </rulesStrings>
     </rulePack>
   </RulePackDef>
+  <RulePackDef>
+    <defName>NamerFactionWula</defName>
+    <rulePack>
+      <rulesStrings>
+        <li>r_name->[msyl][msyl] [mechhive]</li>
+
+        <li>mechhive->网络</li>
+        <li>msyl->尼尔</li>
+        <li>msyl->奥格</li>
+        <li>msyl->弎</li>
+        <li>msyl->笮</li>
+        <li>msyl->瞿</li>
+        <li>msyl->棱</li>
+        <li>msyl->拉</li>
+        <li>msyl->阿尔</li>
+        <li>msyl->奥米</li>
+        <li>msyl->艾里</li>
+        <li>msyl->司棱</li>
+        <li>msyl->陀</li>
+        <li>msyl->锕丝</li>
+        <li>msyl->钨斯</li>
+        <li>msyl->骜</li>
+        <li>msyl->珥</li>
+        <li>msyl->莫德</li>
+        <li>msyl->禅</li>
+        <li>msyl->幽</li>
+        <li>msyl->铼</li>
+      </rulesStrings>
+    </rulePack>
+  </RulePackDef>
 </Defs>
diff --git a/1.6/Defs/Scenarios/Scenarios_WULA.xml b/1.6/Defs/Scenarios/Scenarios_WULA.xml
index 602d0afb..d7b14a2e 100644
--- a/1.6/Defs/Scenarios/Scenarios_WULA.xml
+++ b/1.6/Defs/Scenarios/Scenarios_WULA.xml
@@ -124,6 +124,10 @@
           <def>StartingResearch</def>
           <project>BasicGravtech</project>
         </li>
+        <li Class="ScenPart_StartingResearch">
+          <def>StartingResearch</def>
+          <project>BasicMechtech</project>
+        </li>
         
         <!-- Game start dialog -->
         <li Class="ScenPart_GameStartDialog">
diff --git a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
index e1586c68..36b4f9f9 100644
--- a/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml
@@ -1288,15 +1288,14 @@
       <MaxHitPoints>1000</MaxHitPoints>
       <Mass>10</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>1.8</ArmorRating_Sharp>
-      <ArmorRating_Blunt>1.8</ArmorRating_Blunt>
-      <ArmorRating_Heat>2.0</ArmorRating_Heat>
+      <ArmorRating_Sharp>0.6</ArmorRating_Sharp>
+      <ArmorRating_Blunt>0.6</ArmorRating_Blunt>
+      <ArmorRating_Heat>0.2</ArmorRating_Heat>
       <EquipDelay>3</EquipDelay>
       <!-- <EnergyShieldEnergyMax>4.0</EnergyShieldEnergyMax> -->
     </statBases>
     <equippedStatOffsets>
 			<MoveSpeed>-0.5</MoveSpeed>
-      <AimingDelayFactor>-0.25</AimingDelayFactor>
       <ShootingAccuracyPawn>5</ShootingAccuracyPawn>
     </equippedStatOffsets>
     <costStuffCount>100</costStuffCount>
@@ -1335,17 +1334,14 @@
       <MaxHitPoints>500</MaxHitPoints>
       <Mass>5</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>1</ArmorRating_Sharp>
-      <ArmorRating_Blunt>1</ArmorRating_Blunt>
-      <ArmorRating_Heat>1</ArmorRating_Heat>
+      <ArmorRating_Sharp>0.3</ArmorRating_Sharp>
+      <ArmorRating_Blunt>0.3</ArmorRating_Blunt>
+      <ArmorRating_Heat>0.3</ArmorRating_Heat>
       <EquipDelay>2</EquipDelay>
-      <EnergyShieldEnergyMax>0.5</EnergyShieldEnergyMax>
     </statBases>
     <equippedStatOffsets>
 			<MoveSpeed>-0.2</MoveSpeed>
-			<MeleeDodgeChance>20</MeleeDodgeChance>	
-      <AimingDelayFactor>0.5</AimingDelayFactor>
-      <ShootingAccuracyPawn>-10</ShootingAccuracyPawn>
+			<MeleeDodgeChance>5</MeleeDodgeChance>	
 			<!-- <MoveSpeed>-0.5</MoveSpeed> -->
       <!-- <IncomingDamageFactor>-0.2</IncomingDamageFactor> -->
       <!-- <StaggerDurationFactor>-2</StaggerDurationFactor> -->
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index 3a39d86e..aed9fed9 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -65,9 +65,8 @@
     <defName>WULA_RW_Base_AR</defName>
     <label>DLa-1"页岩"</label>
     <description>乌拉帝国的旧式突击步枪，仍然使用落后的导气式结构驱动自动射击构件，通常被派发给炮灰战斗人员。</description>
-    <techLevel>Industrial</techLevel>
     <tickerType>Normal</tickerType>
-    <!-- <techLevel>Spacer</techLevel> -->
+    <techLevel>Spacer</techLevel>
     <graphicData>
       <texPath>Wula/Weapon/WULA_RW_Base_AR</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -125,6 +124,7 @@
     <equippedAngleOffset>-65</equippedAngleOffset>
     <techLevel>Spacer</techLevel>
     <smeltable>false</smeltable>
+    <relicChance>0</relicChance>
     <statBases>
       <MarketValue>100</MarketValue>
       <WorkToMake>1000</WorkToMake>
@@ -147,14 +147,17 @@
     <recipeMaker>
       <recipeUsers Inherit="False" />
     </recipeMaker>
+    <weaponTags>
+      <li>Wula_Constructor_Cat_Weapon</li>
+    </weaponTags>
   </ThingDef>
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_RW_Base_AR_Cat</defName>
     <label>DLa-4"云母"</label>
     <description>乌拉帝国的旧式突击步枪，比起DLa-1"页岩"来说更小一些，射程和精度有所下降，但是下挂了一把刺刀用于近身战斗，专为乌拉猫猫机械体设计。</description>
-    <techLevel>Industrial</techLevel>
+    <!-- <techLevel>Industrial</techLevel> -->
     <tickerType>Normal</tickerType>
-    <!-- <techLevel>Spacer</techLevel> -->
+    <techLevel>Spacer</techLevel>
     <weaponTags>
       <li>Wula_Assault_Cat_Weapon</li>
     </weaponTags>
@@ -1566,6 +1569,9 @@
         <cooldownTime>2.6</cooldownTime>
       </li>
     </tools>
+    <comps>
+      <li Class="CompProperties_Biocodable"/>
+    </comps>
   </ThingDef>
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Handle_Cannon</defName>
@@ -1600,6 +1606,7 @@
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.65</drawSize>
     </graphicData>
+    <tradeability>None</tradeability>
     <uiIconScale>0.75</uiIconScale>
     <soundInteract>Interact_ChargeRifle</soundInteract>
     <recipeMaker>
@@ -1673,6 +1680,7 @@
     <label>SEl-78"角砾岩"</label>
     <description>乌拉帝国所装备的自动榴弹炮，所发射高抛的高爆榴弹或许杀伤力没有想象的这么强，但是射速极快，几乎可以依靠单兵创造一片轰炸区。</description>
     <techLevel>Ultra</techLevel>
+    <tradeability>None</tradeability>
     <!-- <techLevel>Spacer</techLevel> -->
     <graphicData>
       <texPath>Wula/Weapon/WULA_RW_Auto_GL</texPath>
@@ -1784,7 +1792,7 @@
       <AccuracyShort>1</AccuracyShort>
       <AccuracyMedium>1</AccuracyMedium>
       <AccuracyLong>1</AccuracyLong>
-      <RangedWeapon_Cooldown>0.5</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
@@ -1845,6 +1853,7 @@
         <chanceToStartFire>0.6</chanceToStartFire>
       </li>
     </verbs>
+    <tradeability>None</tradeability>
   </ThingDef>
   <!-- 暗物质炮 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
@@ -1882,7 +1891,7 @@
       <AccuracyShort>0.6</AccuracyShort>
       <AccuracyMedium>0.6</AccuracyMedium>
       <AccuracyLong>0.6</AccuracyLong>
-      <RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
@@ -1948,6 +1957,7 @@
         <chanceToStartFire>0.6</chanceToStartFire>
       </li>
     </verbs>
+    <tradeability>None</tradeability>
   </ThingDef>
   
 
diff --git a/1.6/Defs/TraitDefs/Traits_WULA.xml b/1.6/Defs/TraitDefs/Traits_WULA.xml
index fd72ee95..4ac751b4 100644
--- a/1.6/Defs/TraitDefs/Traits_WULA.xml
+++ b/1.6/Defs/TraitDefs/Traits_WULA.xml
@@ -13,7 +13,7 @@
         <allowedMeditationFocusTypes><li>Dignified</li></allowedMeditationFocusTypes>
         <degree>1</degree>
         <statOffsets>
-          <MentalBreakThreshold>-0.2</MentalBreakThreshold>
+          <MentalBreakThreshold>-0.1</MentalBreakThreshold>
         </statOffsets>
         <statFactors>
           <AimingDelayFactor>0.75</AimingDelayFactor>
@@ -30,7 +30,7 @@
         <degree>2</degree>
         <allowedMeditationFocusTypes><li>Dignified</li></allowedMeditationFocusTypes>
         <statOffsets>
-          <MentalBreakThreshold>-0.5</MentalBreakThreshold>
+          <MentalBreakThreshold>-0.2</MentalBreakThreshold>
         </statOffsets>
         <statFactors>
           <AimingDelayFactor>0.5</AimingDelayFactor>