From 1b11362c96d99bad05bac995677a4b2df36dba66 Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Thu, 24 Jul 2025 17:59:10 +0800
Subject: [PATCH] 2025-7-24

---
 1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml |  40 +-
 .../HediffDefs/Hediffs_BodyParts_WULA.xml     | 363 +++++-------------
 .../ResearchProjects_WULA.xml                 |  72 ++--
 1.6/Defs/ThingDefs/WULA_Item.xml              | 123 ++++--
 1.6/Defs/ThingDefs/WULA_Items_Exotic.xml      |  71 ----
 5 files changed, 247 insertions(+), 422 deletions(-)
 delete mode 100644 1.6/Defs/ThingDefs/WULA_Items_Exotic.xml

diff --git a/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml b/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml
index c33ad819..3db68b9e 100644
--- a/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml
+++ b/1.6/Defs/FaceTypeDefs/WulaSpecies/EyeType.xml
@@ -8,8 +8,44 @@
     <texPath>Wula/Things/WulaSpecies/Eyes/Normal</texPath>
 	  <altMaskPath>Wula/Things/WulaSpecies/Eyes/Common</altMaskPath>
     <shader>Map/CutoutSkinOverlay</shader>
-    <minColor>RGB(0.25,0.25,0.25)</minColor>
-    <maxColor>RGB(0.85,0.85,0.85)</maxColor>
+    <minColor>RGB(72,222,213)</minColor>
+    <maxColor>RGB(72,222,213)</maxColor>
+    <enableUnisexTexPath>True</enableUnisexTexPath>
+  </FacialAnimation.EyeballTypeDef>
+
+  <FacialAnimation.EyeballTypeDef MayRequire="Nals.FacialAnimation">
+    <defName>Wula_EyeNormal2</defName>
+	  <!-- <texPath>Things/Pawn/Humanlike/Eyes/Normal</texPath> -->
+    <raceName>WulaSpecies</raceName>
+    <texPath>Wula/Things/WulaSpecies/Eyes/Normal</texPath>
+	  <altMaskPath>Wula/Things/WulaSpecies/Eyes/Common</altMaskPath>
+    <shader>Map/CutoutSkinOverlay</shader>
+    <minColor>RGB(227,30,76)</minColor>
+    <maxColor>RGB(227,30,76)</maxColor>
+    <enableUnisexTexPath>True</enableUnisexTexPath>
+  </FacialAnimation.EyeballTypeDef>
+
+  <FacialAnimation.EyeballTypeDef MayRequire="Nals.FacialAnimation">
+    <defName>Wula_EyeNormal3</defName>
+	  <!-- <texPath>Things/Pawn/Humanlike/Eyes/Normal</texPath> -->
+    <raceName>WulaSpecies</raceName>
+    <texPath>Wula/Things/WulaSpecies/Eyes/Normal</texPath>
+	  <altMaskPath>Wula/Things/WulaSpecies/Eyes/Common</altMaskPath>
+    <shader>Map/CutoutSkinOverlay</shader>
+    <minColor>RGB(30,227,76)</minColor>
+    <maxColor>RGB(30,227,76)</maxColor>
+    <enableUnisexTexPath>True</enableUnisexTexPath>
+  </FacialAnimation.EyeballTypeDef>
+
+  <FacialAnimation.EyeballTypeDef MayRequire="Nals.FacialAnimation">
+    <defName>Wula_EyeNormal4</defName>
+	  <!-- <texPath>Things/Pawn/Humanlike/Eyes/Normal</texPath> -->
+    <raceName>WulaSpecies</raceName>
+    <texPath>Wula/Things/WulaSpecies/Eyes/Normal</texPath>
+	  <altMaskPath>Wula/Things/WulaSpecies/Eyes/Common</altMaskPath>
+    <shader>Map/CutoutSkinOverlay</shader>
+    <minColor>RGB(225,232,64)</minColor>
+    <maxColor>RGB(225,232,64)</maxColor>
     <enableUnisexTexPath>True</enableUnisexTexPath>
   </FacialAnimation.EyeballTypeDef>
 </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 cfdfbadd..b9c57574 100644
--- a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
@@ -805,280 +805,6 @@
     </stages>
   </HediffDef>
 
-  <!-- 插件 -->
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Hand_Base</defName>
-    <label>修复手部</label>
-    <description>将这个合成人的手部破损修复，并恢复该部位生命值。</description>
-    <jobString>正在修复手部</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Hand</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" />
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>1500</workAmount>
-    <skillRequirements>
-      <Medicine>3</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-    <researchPrerequisites>
-      <li>WULA_Base_Technology</li>
-    </researchPrerequisites>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Arm_Base</defName>
-    <label>修复臂膀</label>
-    <description>将这个合成人的手部、手臂和肩部的破损修复，并恢复该部位生命值。比起修复单个部位花费，时间、资源需求和技能等级要求更高。</description>
-    <jobString>正在修复手部</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Shoulder</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" />
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>3000</workAmount>
-    <skillRequirements>
-      <Medicine>7</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-    <researchPrerequisites>
-      <li>WULA_Repair_Arm_Technology</li>
-    </researchPrerequisites>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>20</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Leg_Base</defName>
-    <label>修复腿部</label>
-    <description>将这个合成人的腿部和足部破损修复，并恢复这些部位的生命值。比起修复单个部位花费，时间、资源需求和技能等级要求更高。</description>
-    <jobString>正在修复腿部</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Leg</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" />
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>3000</workAmount>
-    <skillRequirements>
-      <Medicine>7</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-    <researchPrerequisites>
-      <li>WULA_Repair_Arm_Technology</li>
-    </researchPrerequisites>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>20</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Foot_Base</defName>
-    <label>修复足部</label>
-    <description>将这个合成人的足部破损修复，并恢复这些部位的生命值。</description>
-    <jobString>正在修复足部</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Foot</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" />
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>1500</workAmount>
-    <skillRequirements>
-      <Medicine>3</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-    <researchPrerequisites>
-      <li>WULA_Base_Technology</li>
-    </researchPrerequisites>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Head_Base</defName>
-    <label>修复头部</label>
-    <description>将这个合成人的头部和颈部的破损修复，并恢复这些部位的生命值。</description>
-    <jobString>正在修复头部</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Neck</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" />
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>1500</workAmount>
-    <skillRequirements>
-      <Medicine>3</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-    <researchPrerequisites>
-      <li>WULA_Repair_Arm_Technology</li>
-    </researchPrerequisites>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>20</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Fix_Torso_Base</defName>
-    <label>修复全身</label>
-    <description>此项修复将修复这个合成人全身损伤，并恢复所有部位生命值。比起修复单个部位花费，时间、资源需求和技能等级要求更高。</description>
-    <jobString>正在修复躯干</jobString>
-    <appliedOnFixedBodyParts>
-      <li>Torso</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True"/>
-    <!-- Always succeeds -->
-    <addsHediff>WULA_Body_Fixed</addsHediff>
-    <recipeUsers Inherit="False">
-      <li>WulaSpecies</li>
-    </recipeUsers>
-
-    <workAmount>7000</workAmount>
-    <researchPrerequisites>
-      <li>WULA_Repair_All_Technology</li>
-    </researchPrerequisites>
-    <skillRequirements>
-      <Medicine>10</Medicine>
-    </skillRequirements>
-    <workSkill>Medicine</workSkill>
-    <effectWorking>Smith</effectWorking>
-    <soundWorking>Recipe_Smith</soundWorking>
-    <workSpeedStat>MedicalOperationSpeed</workSpeedStat>
-
-    <ingredients Inherit="False">
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>50</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>3</count>
-      </li>
-    </ingredients>
-  </RecipeDef>
-  <HediffDef ParentName="ImplantHediffBase">
-    <defName>WULA_Body_Fixed</defName>
-    <hediffClass>Hediff_Implant</hediffClass>
-    <label>已修复</label>
-    <description>这个合成人的破损已被细致地修复。</description>
-    <descriptionShort>这个合成人的破损已被细致地修复。</descriptionShort>
-    <isBad>false</isBad>
-    <duplicationAllowed>true</duplicationAllowed>
-    <keepOnBodyPartRestoration>false</keepOnBodyPartRestoration>    <!-- true -->
-    <comps>
-      <li Class="HediffCompProperties_ChanceToRemove">
-        <intervalTicks>1</intervalTicks>
-        <chance>1</chance>
-      </li>
-    </comps>
-  </HediffDef>
-
   <!-- 抽魂 -->
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
     <defName>WULA_Extract_Soul_Wedge</defName>
@@ -1184,9 +910,8 @@
     </statBases>
     <recipeMaker>
       <researchPrerequisites Inherit="False">
-        <li>WULA_New_Synth_Skill_Technology</li>
+        <li>WULA_New_Synth_Skill_2_Technology</li>
       </researchPrerequisites>
-      <researchPrerequisite>WULA_Synth_Addons_2_Technology</researchPrerequisite>
       <skillRequirements>
         <Crafting>8</Crafting>
       </skillRequirements>
@@ -1227,7 +952,7 @@
       </li>
     </comps>
   </HediffDef>
-  <RecipeDef ParentName="SurgeryInstallImplantBase">
+  <!-- <RecipeDef ParentName="SurgeryInstallImplantBase">
     <defName>InstallWulaBackstoryRegenerator</defName>
     <label>install backstory regenerator</label>
     <description>Installs a backstory regenerator.</description>
@@ -1251,6 +976,90 @@
       <li>Brain</li>
     </appliedOnFixedBodyParts>
     <addsHediff>Wula_RegenerateBackstory</addsHediff>
+  </RecipeDef> -->
+
+  <!-- 修复器 -->
+  <ThingDef ParentName="MechSerumBase">
+    <defName>WULA_MechRepairKit</defName>
+    <label>机械乌拉修理套件</label>
+    <description>一种一次性使用的堕落乌拉帝国修理套件，专门用来完全修复机械乌拉。</description>
+    <graphicData>
+      <texPath>Things/Item/Special/MechSerumHealer</texPath> <!-- Using original texture for now -->
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <stackLimit>10</stackLimit>
+    <statBases>
+      <MarketValue>1500</MarketValue> <!-- Slightly higher value -->
+    </statBases>
+    <thingCategories>
+      <li>Drugs</li>
+    </thingCategories>
+    <tradeability>Sellable</tradeability>
+    <comps>
+      <li Class="CompProperties_UseEffect">
+        <compClass>WulaFallenEmpire.CompUseEffect_FixAllHealthConditions</compClass>
+      </li>
+      <li Class="CompProperties_UseEffectPlaySound">
+        <soundOnUsed>MechSerumUsed</soundOnUsed>
+      </li>
+      <li Class="CompProperties_UseEffectDestroySelf" />
+    </comps>
+    <thingSetMakerTags>
+      <li>RewardStandardCore</li>
+    </thingSetMakerTags>
+    <recipeMaker>
+      <unfinishedThingDef>UnfinishedHealthItemProsthetic</unfinishedThingDef>
+      <recipeUsers>
+        <li>WULA_Cube_Productor_BIO</li>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <useIngredientsForColor>false</useIngredientsForColor>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+      <workSkill>Crafting</workSkill>
+      <effectWorking>Smith</effectWorking>
+      <soundWorking>Recipe_Machining</soundWorking>
+      <displayPriority>650</displayPriority>
+    </recipeMaker>
+    <researchPrerequisites>
+      <li>WULA_Repair_All_Technology</li>
+    </researchPrerequisites>
+  </ThingDef>
+  <RecipeDef>
+    <defName>AdministerWULA_MechRepairKit</defName>
+    <label>修理机械乌拉</label>
+    <description>施用一个机械乌拉修理套件，修复乌拉族目标的所有健康状况。</description>
+    <workerClass>WulaFallenEmpire.Recipe_AdministerWulaMechRepairKit</workerClass> <!-- 更改为自定义的 RecipeWorker -->
+    <jobString>正在修理机械乌拉。</jobString>
+    <workAmount>5000</workAmount> <!-- 增加工作量以适应手术 -->
+    <workSkill>Medicine</workSkill> <!-- 需要医疗技能 -->
+    <skillRequirements>
+      <Medicine>6</Medicine> <!-- 示例：需要医疗技能等级 6 -->
+    </skillRequirements>
+    <recipeUsers>
+      <li>WulaSpecies</li> <!-- 只能在乌拉族上执行 -->
+    </recipeUsers>
+    <targetsBodyPart>false</targetsBodyPart> <!-- 仍然作用于整个小人 -->
+    <anesthetize>false</anesthetize> <!-- 不需要麻醉 -->
+    <dontShowIfAnyIngredientMissing>true</dontShowIfAnyIngredientMissing>
+    <!-- 此处无需特定的 surgeryOutcomeEffect，因为物品的 CompUseEffect 处理实际治疗 -->
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_MechRepairKit</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>WULA_MechRepairKit</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <researchPrerequisites>
+      <li>WULA_Repair_All_Technology</li>
+    </researchPrerequisites>
   </RecipeDef>
 
   <!-- 能量电池 -->
diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index fc7bd6b7..8a4bd8aa 100644
--- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -28,28 +28,6 @@
       <li>WULA_Base_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Repair_Arm_Technology</defName>
-    <researchViewX>1.00</researchViewX>
-    <researchViewY>4.70</researchViewY>
-    <label>高级维修套件</label>
-    <description>获取修复乌拉帝国合成人四肢和头部的必须知识。</description>
-    <baseCost>400</baseCost>
-    <prerequisites>
-      <li>WULA_Base_Technology</li>
-    </prerequisites>
-  </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Repair_All_Technology</defName>
-    <researchViewX>2.00</researchViewX>
-    <researchViewY>4.70</researchViewY>
-    <label>完全维修套件</label>
-    <description>获取修复完全修复乌拉帝国合成人的必须知识。</description>
-    <baseCost>600</baseCost>
-    <prerequisites>
-      <li>WULA_Repair_Arm_Technology</li>
-    </prerequisites>
-  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Adv_WorkTable_Technology</defName>
     <researchViewX>3.50</researchViewX>
@@ -62,17 +40,6 @@
       <li>MicroelectronicsBasics</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_New_Synth_Skill_Technology</defName>
-    <label>数据下载套件</label>
-    <description>开发用于从上行链路下载各种预设技能包的套件，以增加殖民地的技能等级。</description>
-    <baseCost>400</baseCost>
-    <researchViewX>1.00</researchViewX>
-    <researchViewY>5.50</researchViewY>
-    <prerequisites>
-      <li>WULA_Base_Technology</li>
-    </prerequisites>
-  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Dark_Matter_Technology</defName>
     <researchViewX>8.00</researchViewX>
@@ -245,10 +212,10 @@
     <label>机械体构建套件</label>
     <description>获取构建乌拉帝国机械体的设施，以支持后续的机械体开发。</description>
     <baseCost>800</baseCost>
-    <researchViewX>2.00</researchViewX>
+    <researchViewX>1.00</researchViewX>
     <researchViewY>5.50</researchViewY>
     <prerequisites>
-      <li>WULA_New_Synth_Skill_Technology</li>
+      <li>WULA_Base_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -297,6 +264,39 @@
     </prerequisites>
   </ResearchProjectDef>
   <!-- 植入物 -->
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Repair_All_Technology</defName>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>3.90</researchViewY>
+    <label>维修套件</label>
+    <description>获取构建修理包并使用其修复乌拉帝国合成人的必须知识。</description>
+    <baseCost>600</baseCost>
+    <prerequisites>
+      <li>WULA_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_New_Synth_Skill_Technology</defName>
+    <label>数据下载套件</label>
+    <description>开发用于从上行链路下载各种预设技能包的套件，以增加殖民地的技能等级。</description>
+    <baseCost>400</baseCost>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>4.70</researchViewY>
+    <prerequisites>
+      <li>WULA_Base_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_New_Synth_Skill_2_Technology</defName>
+    <label>人格微调套件</label>
+    <description>开发用于从上行链路下载新人格和兴趣调整数据包的套件，以进一步调整合成人的发展定位。</description>
+    <baseCost>400</baseCost>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>5.70</researchViewY>
+    <prerequisites>
+      <li>WULA_New_Synth_Skill_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Addons_Technology</defName>
     <researchViewX>4.50</researchViewX>
@@ -321,4 +321,4 @@
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml
index c79434b5..1a02b229 100644
--- a/1.6/Defs/ThingDefs/WULA_Item.xml
+++ b/1.6/Defs/ThingDefs/WULA_Item.xml
@@ -516,8 +516,71 @@
 
   <!-- ==================== 热情训练器 ==================== -->
 
+
+  <ThingDef Abstract="True" Name="WULA_Syhth_Passion_Trainer">
+    <!-- <defName>WULA_Syhth_Trainer</defName>
+    <label>乌拉帝国技能预设</label> -->
+    <description>一个可以人为调整人格倾向的数据包，使得乌拉帝国合成人在特定领域激发热情，需要通过乌拉帝国合成人特有的神经接口接入，其他种族无法使用。\n\n机械乌拉的存储空间有限，每一次使用数据包都会使得任意其他技能失去热情。</description>
+    <thingClass>ThingWithComps</thingClass>
+    <category>Item</category>
+    <drawerType>MapMeshOnly</drawerType>
+    <techLevel>Archotech</techLevel>
+    <useHitPoints>true</useHitPoints>
+    <pathCost>14</pathCost>
+    <selectable>true</selectable>
+    <altitudeLayer>Item</altitudeLayer>
+    <tickerType>Never</tickerType>
+    <alwaysHaulable>true</alwaysHaulable>
+    <resourceReadoutPriority>Middle</resourceReadoutPriority>
+    <thingCategories>
+      <li>NeurotrainersPsycast</li>
+    </thingCategories>
+    <statBases>
+      <MaxHitPoints>100</MaxHitPoints>
+      <Beauty>-4</Beauty>
+      <Mass>1</Mass>
+      <MarketValue>5</MarketValue>
+      <DeteriorationRate>0.1</DeteriorationRate>
+      <WorkToMake>30000</WorkToMake>
+    </statBases>
+    <graphicData>
+      <texPath>Wula/Item/WULA_Syhth_Trainer</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <researchPrerequisites>
+      <li>WULA_New_Synth_Skill_2_Technology</li>
+    </researchPrerequisites>
+    <costList>
+      <WULA_Charge_Cube>1</WULA_Charge_Cube>
+    </costList>
+    <recipeMaker>
+      <unfinishedThingDef>UnfinishedHealthItemProsthetic</unfinishedThingDef>
+      <recipeUsers>
+        <li>WULA_Synth_Server</li>
+      </recipeUsers>
+      <useIngredientsForColor>false</useIngredientsForColor>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+      <workSkill>Crafting</workSkill>
+      <effectWorking>Smith</effectWorking>
+      <soundWorking>Recipe_Machining</soundWorking>
+      <displayPriority>650</displayPriority>
+    </recipeMaker>
+    <tradeability>None</tradeability>
+    <comps>
+      <li Class="CompProperties_Forbiddable"/>
+      <li Class="CompProperties_UseEffectDestroySelf" />
+      <!-- <li Class="CompProperties_Usable">
+        <useJob>UseNeurotrainer</useJob>
+        <useLabel>123</useLabel>
+        <showUseGizmo>true</showUseGizmo>
+      </li>
+      <li Class="CompProperties_UseEffect_LearnSkill">
+        <skill>Shooting</skill>
+      </li> -->
+    </comps>
+  </ThingDef>
   <!-- Melee -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Melee</defName>
     <label>乌拉帝国兴趣度训练包（格斗）</label>
     <comps>
@@ -533,13 +596,12 @@
         <!-- 指定获得的兴趣度等级。可以是 Minor (小火，官方翻译好奇) 或 Major (大火，官方翻译狂热) -->
         <passionGained>Major</passionGained>
         <!-- 指定随机失去兴趣度的技能数量范围。格式为 min~max -->
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Shooting -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Shooting</defName>
     <label>乌拉帝国兴趣度训练包（射击）</label>
     <comps>
@@ -552,13 +614,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Shooting</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Construction -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Construction</defName>
     <label>乌拉帝国兴趣度训练包（建造）</label>
     <comps>
@@ -571,13 +632,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Construction</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Mining -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Mining</defName>
     <label>乌拉帝国兴趣度训练包（采矿）</label>
     <comps>
@@ -590,13 +650,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Mining</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Cooking -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Cooking</defName>
     <label>乌拉帝国兴趣度训练包（烹饪）</label>
     <comps>
@@ -609,13 +668,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Cooking</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Plants -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Plants</defName>
     <label>乌拉帝国兴趣度训练包（种植）</label>
     <comps>
@@ -628,13 +686,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Plants</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Animals -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Animals</defName>
     <label>乌拉帝国兴趣度训练包（驯兽）</label>
     <comps>
@@ -647,13 +704,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Animals</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Crafting -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Crafting</defName>
     <label>乌拉帝国兴趣度训练包（手工）</label>
     <comps>
@@ -666,13 +722,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Crafting</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Artistic -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Artistic</defName>
     <label>乌拉帝国兴趣度训练包（艺术）</label>
     <comps>
@@ -685,13 +740,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Artistic</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Medicine -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Medicine</defName>
     <label>乌拉帝国兴趣度训练包（医疗）</label>
     <comps>
@@ -704,13 +758,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Medicine</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Social -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Social</defName>
     <label>乌拉帝国兴趣度训练包（社交）</label>
     <comps>
@@ -723,13 +776,12 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Social</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
   <!-- Intellectual -->
-  <ThingDef ParentName="WULA_Syhth_Trainer">
+  <ThingDef ParentName="WULA_Syhth_Passion_Trainer">
     <defName>WULA_Syhth_Passion_Trainer_Intellectual</defName>
     <label>乌拉帝国兴趣度训练包（智识）</label>
     <comps>
@@ -742,9 +794,8 @@
       <li Class="WulaFallenEmpire.CompProperties_UseEffect_PassionTrainer">
         <skill>Intellectual</skill>
         <passionGained>Major</passionGained>
-        <passionsLostRange>0~1</passionsLostRange>
+        <passionsLostRange>1~1</passionsLostRange>
       </li>
     </comps>
   </ThingDef>
-
 </Defs>
diff --git a/1.6/Defs/ThingDefs/WULA_Items_Exotic.xml b/1.6/Defs/ThingDefs/WULA_Items_Exotic.xml
deleted file mode 100644
index 35cdd871..00000000
--- a/1.6/Defs/ThingDefs/WULA_Items_Exotic.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <ThingDef ParentName="MechSerumBase">
-    <defName>WULA_MechRepairKit</defName>
-    <label>机械乌拉修理套件</label>
-    <description>一种一次性使用的堕落乌拉帝国修理套件，专门用来完全修复机械乌拉。</description>
-    <graphicData>
-      <texPath>Things/Item/Special/MechSerumHealer</texPath> <!-- Using original texture for now -->
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <stackLimit>10</stackLimit>
-    <statBases>
-      <MarketValue>1500</MarketValue> <!-- Slightly higher value -->
-    </statBases>
-    <thingCategories>
-      <li>Drugs</li>
-    </thingCategories>
-    <tradeability>Sellable</tradeability>
-    <comps>
-      <li Class="CompProperties_UseEffect">
-        <compClass>WulaFallenEmpire.CompUseEffect_FixAllHealthConditions</compClass>
-      </li>
-      <li Class="CompProperties_UseEffectPlaySound">
-        <soundOnUsed>MechSerumUsed</soundOnUsed>
-      </li>
-      <li Class="CompProperties_UseEffectDestroySelf" />
-    </comps>
-    <thingSetMakerTags>
-      <li>RewardStandardCore</li>
-    </thingSetMakerTags>
-  </ThingDef>
-
-  <RecipeDef>
-    <defName>AdministerWULA_MechRepairKit</defName>
-    <label>施用机械乌拉修理套件</label>
-    <description>施用一个机械乌拉修理套件，修复乌拉族目标的所有健康状况。</description>
-    <workerClass>WulaFallenEmpire.Recipe_AdministerWulaMechRepairKit</workerClass> <!-- 更改为自定义的 RecipeWorker -->
-    <jobString>正在施用机械乌拉修理套件。</jobString>
-    <workAmount>2500</workAmount> <!-- 增加工作量以适应手术 -->
-    <workSkill>Medicine</workSkill> <!-- 需要医疗技能 -->
-    <skillRequirements>
-      <Medicine>6</Medicine> <!-- 示例：需要医疗技能等级 6 -->
-    </skillRequirements>
-    <recipeUsers>
-      <li>WulaSpecies</li> <!-- 只能在乌拉族上执行 -->
-    </recipeUsers>
-    <targetsBodyPart>false</targetsBodyPart> <!-- 仍然作用于整个小人 -->
-    <anesthetize>false</anesthetize> <!-- 不需要麻醉 -->
-    <dontShowIfAnyIngredientMissing>true</dontShowIfAnyIngredientMissing>
-    <!-- 此处无需特定的 surgeryOutcomeEffect，因为物品的 CompUseEffect 处理实际治疗 -->
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>WULA_MechRepairKit</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>WULA_MechRepairKit</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <!-- 可选：添加研究前置 -->
-    <!-- <researchPrerequisite>ComplexMedicines</researchPrerequisite> -->
-  </RecipeDef>
-
-</Defs>