2025-7-2

1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -30,7 +30,7 @@
   <!-- 天线 -->
   <ThingDef ParentName="BodyPartProstheticImperialBase">
     <defName>WULA_Addons_Antenna_Base</defName>
-    <label>上行链路天线（基础）</label>
+    <label>上行链路天线</label>
     <description>机械乌拉的核心部件之一，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。</description>
     <!-- <descriptionHyperlinks><RecipeDef>InstallFieldHand</RecipeDef></descriptionHyperlinks> -->
     <!-- <thingSetMakerTags><li>RewardStandardLowFreq</li></thingSetMakerTags> -->
@@ -49,9 +49,6 @@
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
     </recipeMaker>
-    <!-- <techHediffsTags>
-      <li>FieldHand</li>
-    </techHediffsTags> -->
   </ThingDef>
   <HediffDef ParentName="ImplantHediffBase">
     <defName>WULA_Addons_Antenna_Hediff_Base</defName>
@@ -73,91 +70,70 @@
     <defaultInstallPart>WULA_Addons_Antenna_Bodypart</defaultInstallPart>
     <spawnThingOnRemoved>WULA_Addons_Antenna_Base</spawnThingOnRemoved>
   </HediffDef>
-  <ThingDef ParentName="BodyPartProstheticImperialBase">
+  <ThingDef ParentName="ControlSublinkBase">
     <defName>WULA_Addons_Antenna_Expansion</defName>
-    <label>上行链路天线（扩容）</label>
-    <description>上行链路天线的高级版，支持更多的机械体带宽，以指挥更庞大的钢铁洪流。</description>
-    <!-- <descriptionHyperlinks><RecipeDef>InstallFieldHand</RecipeDef></descriptionHyperlinks> -->
-    <!-- <thingSetMakerTags><li>RewardStandardLowFreq</li></thingSetMakerTags> -->
-    <graphicData>
-      <texPath>Things/Item/Health/HealthItem</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <costList>
-      <Steel>50</Steel>
-      <ComponentIndustrial>6</ComponentIndustrial>
-    </costList>
-    <recipeMaker>
-      <researchPrerequisite>WULA_Base_Technology</researchPrerequisite>
-      <recipeUsers>
-        <li>WULA_Cube_Productor_BIO</li>
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-    </recipeMaker>
-    <!-- <techHediffsTags>
-      <li>FieldHand</li>
-    </techHediffsTags> -->
-  </ThingDef>
-  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
-    <defName>WULA_Install_Addons_Antenna_Hediff_Base</defName>
-    <label>替换上线链路天线（扩容）</label>
-    <description>使用一副扩容上线链路天线替换该合成人的现有天线</description>
-    <jobString>正在替换上线链路天线</jobString>
-    <appliedOnFixedBodyParts>
-      <li>WULA_Addons_Antenna_Bodypart</li>
-    </appliedOnFixedBodyParts>
-    <uiIconThing>Steel</uiIconThing>
-    <anesthetize>false</anesthetize>
-    <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
-    <addsHediff>WULA_Addons_Antenna_Hediff_Expansion</addsHediff>
-    
-    <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>WULA_Addons_Antenna_Expansion</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
+    <label>上行链路天线-扩容插件</label>
+    <description>用于为上行链路天线进行带宽扩容的组件，支持更多的机械体带宽和机械组，以指挥更庞大的钢铁洪流。</description>
+    <!-- <costList>
+      <SignalChip>1</SignalChip>
+      <ComponentIndustrial>4</ComponentIndustrial>
+    </costList> -->
+    <!-- <recipeMaker>
+      <researchPrerequisite>StandardMechtech</researchPrerequisite>
+    </recipeMaker> -->
+    <comps>
+      <li Class="CompProperties_Usable">
+        <compClass>CompUsableImplant</compClass>
+        <useJob>UseItem</useJob>
+        <useLabel>安装上行链路天线扩容插件</useLabel>
+        <userMustHaveHediff>WULA_Addons_Antenna_Hediff_Base</userMustHaveHediff>
       </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>WULA_Addons_Antenna_Expansion</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-  </RecipeDef>
-  <HediffDef ParentName="ImplantHediffBase">
+      <li Class="CompProperties_UseEffectInstallImplant">
+        <hediffDef>WULA_Addons_Antenna_Hediff_Expansion</hediffDef>
+        <bodyPart>WULA_Addons_Antenna_Bodypart</bodyPart>
+        <canUpgrade>true</canUpgrade>
+        <maxSeverity>3</maxSeverity>
+      </li>
+    </comps>
+  </ThingDef>
+  <HediffDef>
     <defName>WULA_Addons_Antenna_Hediff_Expansion</defName>
-    <hediffClass>Hediff_Mechlink</hediffClass>
-    <label>扩容上线链路天线</label>
-    <description>一对安装于乌拉帝国合成人脑袋两侧的天线，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。</description>
-    <descriptionShort>一对安装于乌拉帝国合成人脑袋两侧的天线。</descriptionShort>
+    <hediffClass>Hediff_Level</hediffClass>
+    <label>扩容插件</label>
+    <description>用于为上行链路天线进行带宽扩容的组件，支持更多的机械体带宽和机械组，以指挥更庞大的钢铁洪流。</description>
+    <descriptionShort>用于为上行链路天线进行带宽扩容的组件。</descriptionShort>
+    <defaultLabelColor>(0.6, 0.6, 1.0)</defaultLabelColor>
     <isBad>false</isBad>
+    <priceImpact>true</priceImpact>
+    <initialSeverity>1</initialSeverity> <!-- Severity is bound to level of implant -->
+    <minSeverity>0</minSeverity>
+    <maxSeverity>3</maxSeverity>
+    <keepOnBodyPartRestoration>True</keepOnBodyPartRestoration>
+    <levelIsQuantity>true</levelIsQuantity>
     <duplicationAllowed>false</duplicationAllowed>
-    <keepOnBodyPartRestoration>true</keepOnBodyPartRestoration>
     <stages>
-      <!-- <li>
+      <li>
+        <minSeverity>1</minSeverity>
         <statOffsets>
-          <MechBandwidth>-4</MechBandwidth>
-          <MechControlGroups>-1</MechControlGroups>
+          <MechBandwidth>4</MechBandwidth>
+          <MechControlGroups>1</MechControlGroups>
         </statOffsets>
-      </li> -->
+      </li>
+      <li>
+        <minSeverity>2</minSeverity>
+        <statOffsets>
+          <MechBandwidth>8</MechBandwidth>
+          <MechControlGroups>1</MechControlGroups>
+        </statOffsets>
+      </li>
+      <li>
+        <minSeverity>3</minSeverity>
+        <statOffsets>
+          <MechBandwidth>12</MechBandwidth>
+          <MechControlGroups>2</MechControlGroups>
+        </statOffsets>
+      </li>
     </stages>
-    <defaultInstallPart>WULA_Addons_Antenna_Bodypart</defaultInstallPart>
-    <spawnThingOnRemoved>WULA_Addons_Antenna_Expansion</spawnThingOnRemoved>
   </HediffDef>
 
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
@@ -408,8 +384,8 @@
     <label>魂楔</label>
     <description>一种通过特殊手段将生命体灵魂抽离封装得到的物品，是乌拉帝国灵能理论中“灵魂量化”的集中体现，可为各种乌拉帝国灵能法杖充能。</description>
     <graphicData>
-      <texPath>Things/Item/Resource/Silver</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
+      <texPath>Wula/Item/WULA_Soul_Wedge</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <resourceReadoutPriority>First</resourceReadoutPriority>
     <soundInteract>Silver_Drop</soundInteract>
@@ -429,15 +405,6 @@
     <burnableByRecipe>false</burnableByRecipe>
     <smeltable>true</smeltable>
     <possessionCount>40</possessionCount>
-    <stuffProps>
-      <color>(180,173,150)</color>
-      <commonality>0.05</commonality>
-      <constructEffect>ConstructMetal</constructEffect>
-      <soundImpactBullet>BulletImpact_Metal</soundImpactBullet>
-      <soundMeleeHitSharp>MeleeHit_Metal_Sharp</soundMeleeHitSharp>
-      <soundMeleeHitBlunt>MeleeHit_Metal_Blunt</soundMeleeHitBlunt>
-      <soundImpactMelee>Pawn_Melee_Punch_HitBuilding_Metal</soundImpactMelee>
-    </stuffProps>
   </ThingDef>
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
     <defName>WULA_Extract_Soul_Wedge</defName>
@@ -448,10 +415,11 @@
     <hideBodyPartNames>true</hideBodyPartNames>
     <targetsBodyPart>false</targetsBodyPart>
     <isViolation>true</isViolation>
+    <surgeryOutcomeEffect IsNull="True" /> <!-- Always succeeds -->
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
-    <uiIconThing>HemogenPack</uiIconThing>
+    <uiIconThing>WULA_Soul_Wedge</uiIconThing>
     <anesthetize>false</anesthetize>
     <workSkillLearnFactor>2</workSkillLearnFactor>
     <products>

1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml

@@ -112,13 +112,12 @@
         <cornerBR>Damage/Corner</cornerBR>
       </damageData>
     </graphicData>
-    <castEdgeShadows>true</castEdgeShadows>
-    <staticSunShadowHeight>0.20</staticSunShadowHeight>
     <constructEffect>ConstructMetal</constructEffect>
     <costList>
       <Steel>50</Steel>
     </costList>
     <altitudeLayer>Building</altitudeLayer>
+    <castEdgeShadows>true</castEdgeShadows>
     <fillPercent>0.5</fillPercent>
     <useHitPoints>True</useHitPoints>
     <statBases>
@@ -190,7 +189,6 @@
       </damageData>
     </graphicData>
     <castEdgeShadows>true</castEdgeShadows>
-    <staticSunShadowHeight>0.20</staticSunShadowHeight>
     <constructEffect>ConstructMetal</constructEffect>
     <costList>
       <Steel>80</Steel>
@@ -234,7 +232,6 @@
     <building>
       <isMealSource>true</isMealSource>
       <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
-      <heatPerTickWhileWorking>0.10</heatPerTickWhileWorking>
     </building>
   </ThingDef>
 
@@ -245,7 +242,7 @@
     <graphicData>
       <texPath>Wula/Building/WULA_Charging_Station_Synth</texPath>
       <graphicClass>Graphic_Multi</graphicClass>
-      <drawSize>(1.2,2)</drawSize>
+      <drawSize>(1,2)</drawSize>
       <damageData>
         <rect>(0,0.05,1,1.95)</rect>
       </damageData>
@@ -265,12 +262,14 @@
     </costList>
     <designationHotKey>Misc2</designationHotKey>
     <uiOrder>2010</uiOrder>
-    <castEdgeShadows>false</castEdgeShadows>
+    <castEdgeShadows>true</castEdgeShadows>
+    <fillPercent>0.5</fillPercent>
+    <staticSunShadowHeight>0</staticSunShadowHeight>
     <researchPrerequisites>
       <li>WULA_Base_Technology</li>
     </researchPrerequisites>
     <building>
-      <paintable>true</paintable>
+      <paintable>false</paintable>
       <bed_showSleeperBody>true</bed_showSleeperBody>
       <bed_healPerDay>0</bed_healPerDay>
     </building>
@@ -423,4 +422,66 @@
       </li>
     </comps>
   </ThingDef>
+  <!-- 武装生产器 -->
+  <ThingDef ParentName="BenchBase">
+    <defName>WULA_War_Machine_Weapon_Productor</defName>
+    <label>乌拉帝国智械武装组装台</label>
+    <description>一台专门用于构建乌拉帝国各种高阶机械体所用武器和装甲的特殊工作台。</description>
+    <thingClass>Building_WorkTable</thingClass>
+    <drawerType>MapMeshAndRealTime</drawerType>
+    <graphicData>
+      <texPath>Wula/Building/WULA_War_Machine_Weapon_Productor</texPath>
+      <graphicClass>Graphic_Multi</graphicClass>
+      <drawSize>(2,2)</drawSize>
+      <damageData>
+        <cornerTL>Damage/Corner</cornerTL>
+        <cornerTR>Damage/Corner</cornerTR>
+        <cornerBL>Damage/Corner</cornerBL>
+        <cornerBR>Damage/Corner</cornerBR>
+      </damageData>
+    </graphicData>
+    <castEdgeShadows>true</castEdgeShadows>
+    <fillPercent>0.5</fillPercent>
+    <constructEffect>ConstructMetal</constructEffect>
+    <costList>
+      <Steel>120</Steel>
+    </costList>
+    <altitudeLayer>Building</altitudeLayer>
+    <useHitPoints>True</useHitPoints>
+    <statBases>
+      <Mass>50</Mass>
+      <WorkToBuild>6000</WorkToBuild>
+      <MaxHitPoints>250</MaxHitPoints>
+      <Flammability>1.0</Flammability>
+      <WorkTableWorkSpeedFactor>0.5</WorkTableWorkSpeedFactor>
+    </statBases>
+    <size>(2,2)</size>
+    <designationCategory>Production</designationCategory>
+    <uiOrder>2120</uiOrder>
+    <passability>PassThroughOnly</passability>
+    <pathCost>50</pathCost>
+    <hasInteractionCell>True</hasInteractionCell>
+    <interactionCellOffset>(0,0,-1)</interactionCellOffset>
+    <surfaceType>Item</surfaceType>
+    <researchPrerequisites>
+      <li>WULA_Machine_Equipment_Technology</li>
+    </researchPrerequisites>
+    <inspectorTabs>
+      <li>ITab_Bills</li>
+    </inspectorTabs>
+    <comps>
+    <comps>
+      <li Class="CompProperties_Power">
+        <compClass>CompPowerTrader</compClass>
+        <basePowerConsumption>200</basePowerConsumption>
+      </li>
+    </comps>
+    </comps>
+    <placeWorkers>
+      <li>PlaceWorker_PreventInteractionSpotOverlap</li>
+    </placeWorkers>
+    <building>
+      <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
+    </building>
+  </ThingDef>
 </Defs>

1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <!-- 贵族服装 -->
-  <ThingDef Name="NSFV_ApparelRoyalBase" ParentName="ApparelMakeableBase" Abstract="True">
+  <ThingDef Name="WULA_ApparelRoyalBase" ParentName="ApparelMakeableBase" Abstract="True">
     <recipeMaker>
       <researchPrerequisite>WULA_Synth_Clothes_3_Technology</researchPrerequisite>
       <recipeUsers Inherit="False">
@@ -38,9 +38,16 @@
       <!-- 会考虑毒性环境，待查？ -->
       <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
     </apparel>
-    <colorGenerator Class="ColorGenerator_StandardApparel" />
+    <colorGenerator Class="ColorGenerator_Options">
+      <options>
+        <li>
+          <weight>10</weight>
+          <only>(1,1,1,1)</only>
+        </li>
+      </options>
+    </colorGenerator>
   </ThingDef>
-  <ThingDef ParentName="NSFV_ApparelRoyalBase">
+  <ThingDef ParentName="WULA_ApparelRoyalBase">
 		<defName>WULA_Official_Uniform</defName>
 		<label>乌拉帝国双幡礼服</label>
 		<description>这是乌拉帝国宫廷专门配发给高级官员的制服，以一对形似幡的附件而得名。裁制得体大方，设计经久耐用，并且为合成人的躯体做了特殊改造。</description>
@@ -91,7 +98,45 @@
   </ThingDef>
 
   <!-- 平民服装 -->
-  <ThingDef ParentName="ApparelMakeableBase">
+  <ThingDef Name="WULA_ApparelCivilBase" ParentName="ApparelMakeableBase" Abstract="True">
+    <apparel>
+      <tags>
+        <li>Wula_Apparel</li>
+      </tags>
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
+      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
+      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
+    </apparel>
+    <colorGenerator Class="ColorGenerator_Options">
+      <options>
+        <li>
+          <weight>10</weight>
+          <only>(1,1,1,1)</only>
+        </li>
+      </options>
+    </colorGenerator>
+    <possessionCount>1</possessionCount>
+  </ThingDef>
+  <ThingDef Name="WULA_ApparelCivilHatBase" ParentName="HatMakeableBase" Abstract="True">
+    <apparel>
+      <tags>
+        <li>Wula_Apparel</li>
+      </tags>
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
+      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
+      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
+    </apparel>
+    <colorGenerator Class="ColorGenerator_Options">
+      <options>
+        <li>
+          <weight>10</weight>
+          <only>(1,1,1,1)</only>
+        </li>
+      </options>
+    </colorGenerator>
+    <possessionCount>1</possessionCount>
+  </ThingDef>
+  <ThingDef ParentName="WULA_ApparelCivilBase">
 		<defName>WULA_Sailor_Dress</defName>
 		<label>乌拉帝国水手连衣裙</label>
 		<description>这是乌拉帝国的一款连衣裙，上到贵族下到平民都可以穿，在肃穆的帝国中传递出了一丝俏皮和活泼。</description>
@@ -102,7 +147,6 @@
     <apparel>
       <tags>
         <li>Wula_Apparel_Init</li>
-        <li>Wula_Apparel</li>
       </tags>
       <bodyPartGroups>
 				<li>Torso</li>
@@ -115,9 +159,6 @@
         <li>Middle</li>
       </layers>
       <wornGraphicPath>Wula/Apparel/WULA_Sailor_Dress</wornGraphicPath>
-      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
-      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
-      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
     </apparel>
     <costStuffCount>100</costStuffCount>
     <stuffCategories>
@@ -141,9 +182,8 @@
         <Crafting>3</Crafting>
       </skillRequirements>
     </recipeMaker>
-    <possessionCount>1</possessionCount>
   </ThingDef>
-  <ThingDef ParentName="ApparelMakeableBase">
+  <ThingDef ParentName="WULA_ApparelCivilBase">
 		<defName>WULA_Maid_Uniform</defName>
 		<label>乌拉帝国女仆装</label>
 		<description>乌拉帝国平民所穿的女仆装。虽然她们更习惯让异族的奴隶服侍自己，不过还是有一些乌拉星人选择从事服务业。</description>
@@ -154,7 +194,6 @@
     <apparel>
       <tags>
         <li>Wula_Apparel_Init</li>
-        <li>Wula_Apparel</li>
       </tags>
       <bodyPartGroups>
 				<li>Torso</li>
@@ -167,9 +206,6 @@
         <li>Middle</li>
       </layers>
       <wornGraphicPath>Wula/Apparel/WULA_Maid_Uniform</wornGraphicPath>
-      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
-      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
-      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
     </apparel>
     <equippedStatOffsets>
 			<PlantWorkSpeed>0.15</PlantWorkSpeed>
@@ -195,9 +231,8 @@
         <Crafting>3</Crafting>
       </skillRequirements>
     </recipeMaker>
-    <possessionCount>1</possessionCount>
   </ThingDef>
-  <ThingDef ParentName="HatMakeableBase">
+  <ThingDef ParentName="WULA_ApparelCivilHatBase">
     <defName>WULA_Maid_Uniform_Headband</defName>
     <label>乌拉帝国女仆发饰</label>
     <description>乌拉帝国女仆装的配套发饰。</description>
@@ -228,9 +263,6 @@
     </stuffCategories>
     <apparel>
       <countsAsClothingForNudity>false</countsAsClothingForNudity>
-      <tags>
-        <li>Wula_Apparel</li>
-      </tags>
       <bodyPartGroups>
         <li>FullHead</li>
       </bodyPartGroups>
@@ -244,18 +276,17 @@
       <li>RewardStandardHighFreq</li>
     </thingSetMakerTags>
   </ThingDef>
-  <ThingDef ParentName="ApparelMakeableBase">
+  <ThingDef ParentName="WULA_ApparelCivilBase">
 		<defName>WULA_Nurse_Uniform</defName>
 		<label>乌拉帝国护士装</label>
 		<description>乌拉帝国平民所穿的护士装。一反常态的深色护士服反倒让病人感到不安——不过比起救人，她们更多的是在执行一些在其他种族看来“非道德”的医学操作。</description>
     <graphicData>
-      <texPath>Wula/Apparel/WULA_Maid_Uniform</texPath>
+      <texPath>Wula/Apparel/WULA_Nurse_Uniform</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <apparel>
       <tags>
         <li>Wula_Apparel_Init</li>
-        <li>Wula_Apparel</li>
       </tags>
       <bodyPartGroups>
 				<li>Torso</li>
@@ -267,10 +298,7 @@
         <!-- <li>OnSkin</li> -->
         <li>Middle</li>
       </layers>
-      <wornGraphicPath>Wula/Apparel/WULA_Maid_Uniform</wornGraphicPath>
-      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
-      <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
-      <canBeGeneratedToSatisfyToxicEnvironmentResistance>false</canBeGeneratedToSatisfyToxicEnvironmentResistance>
+      <wornGraphicPath>Wula/Apparel/WULA_Nurse_Uniform</wornGraphicPath>
     </apparel>
     <equippedStatOffsets>
 			<MedicalTendQualityOffset>1</MedicalTendQualityOffset>
@@ -291,9 +319,8 @@
         <Crafting>3</Crafting>
       </skillRequirements>
     </recipeMaker>
-    <possessionCount>1</possessionCount>
   </ThingDef>
-  <ThingDef ParentName="HatMakeableBase">
+  <ThingDef ParentName="WULA_ApparelCivilHatBase">
     <defName>WULA_Nurse_Uniform_Headband</defName>
     <label>乌拉帝国护士帽</label>
     <description>乌拉帝国护士装的配套发饰。</description>
@@ -309,7 +336,7 @@
       <displayPriority>105</displayPriority>
     </recipeMaker>
     <graphicData>
-      <texPath>Wula/Apparel/WULA_Maid_Uniform_Headband</texPath>
+      <texPath>Wula/Apparel/WULA_Nurse_Uniform_Headband</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
     <statBases>
@@ -324,9 +351,6 @@
     </stuffCategories>
     <apparel>
       <countsAsClothingForNudity>false</countsAsClothingForNudity>
-      <tags>
-        <li>Wula_Apparel</li>
-      </tags>
       <bodyPartGroups>
         <li>FullHead</li>
       </bodyPartGroups>
@@ -334,7 +358,7 @@
         <li>Overhead</li>
       </layers>
       <parentTagDef>ApparelHead</parentTagDef>
-      <wornGraphicPath>Wula/Apparel/WULA_Maid_Uniform_Headband</wornGraphicPath>
+      <wornGraphicPath>Wula/Apparel/WULA_Nurse_Uniform_Headband</wornGraphicPath>
     </apparel>
     <thingSetMakerTags>
       <li>RewardStandardHighFreq</li>

1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -105,14 +105,13 @@
     <comps>
       <li Class="CompProperties_EquippableAbilityReloadable">
         <abilityDef>WULA_RW_Base_AR_Ability</abilityDef>
-        <maxCharges>1</maxCharges>
+        <maxCharges>2</maxCharges>
         <soundReload>Standard_Reload</soundReload>
         <chargeNoun>充能</chargeNoun>
         <ammoDef>Steel</ammoDef>
         <ammoCountPerCharge>5</ammoCountPerCharge>
         <baseReloadTicks>120</baseReloadTicks>
       </li>
-      <li Class="CompProperties_Forbiddable"/>
     </comps>
   </ThingDef>
   <AbilityDef ParentName="PsycastBase">
@@ -986,8 +985,14 @@
       <AccuracyLong>0.4</AccuracyLong>
       <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
     </statBases>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Machine_Equipment_Technology</researchPrerequisite>
+    </recipeMaker>
     <weaponTags>
-      <li>Wula_AI_Heavy_Panzer_Rocket</li>
+      <li>Wula_AI_Heavy_Panzer_Turret</li>
     </weaponTags>
     <verbs>
       <li>
@@ -996,15 +1001,15 @@
         <warmupTime>2.2</warmupTime>
         <minRange>4</minRange>
         <defaultProjectile>Bullet_WULA_WM_Rocket_Pod</defaultProjectile>
-        <range>54</range>
+        <range>38</range>
         <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
         <burstShotCount>32</burstShotCount>
         <forcedMissRadius>6.25</forcedMissRadius>
         <forcedMissEvenDispersal>true</forcedMissEvenDispersal>
         <targetParams>
-          <canTargetPawns>false</canTargetPawns>
+          <canTargetPawns>true</canTargetPawns>
           <canTargetLocations>true</canTargetLocations>
-          <canTargetBuildings>false</canTargetBuildings>
+          <canTargetBuildings>true</canTargetBuildings>
         </targetParams>
         <soundCast>RocketswarmLauncher_Fire</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
@@ -1028,7 +1033,7 @@
     </graphicData>
     <projectile>
       <damageDef>Bomb</damageDef>
-      <explosionRadius>3.5</explosionRadius>
+      <explosionRadius>2.5</explosionRadius>
       <speed>38</speed>
       <damageAmountBase>50</damageAmountBase>
       <arcHeightFactor>0.4</arcHeightFactor>
@@ -1060,6 +1065,12 @@
       <Plasteel>150</Plasteel>
       <ComponentSpacer>8</ComponentSpacer>
     </costList>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Machine_Equipment_Technology</researchPrerequisite>
+    </recipeMaker>
     <weaponTags>
       <li>Wula_AI_Heavy_Panzer_Turret</li>
     </weaponTags>
@@ -1070,7 +1081,7 @@
         <defaultProjectile>Bullet_WULA_WM_Panzer_Turret</defaultProjectile>
         <warmupTime>0</warmupTime>
         <minRange>5.9</minRange>
-        <range>65</range>
+        <range>75</range>
         <burstShotCount>1</burstShotCount>
         <soundCast>Shot_TurretSniper</soundCast>
         <soundCastTail>GunTail_Heavy</soundCastTail>
@@ -1085,14 +1096,14 @@
     <tickerType>Normal</tickerType>
     <neverMultiSelect>True</neverMultiSelect>
     <graphicData>
-      <texPath>Things/Projectile/ChargeLanceShot</texPath>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>TransparentPostLight</shaderType>
-      <drawSize>2.4</drawSize>
+      <drawSize>3.4</drawSize>
     </graphicData>
     <projectile>
       <damageDef>Bullet</damageDef>
-      <damageAmountBase>285</damageAmountBase>
+      <damageAmountBase>385</damageAmountBase>
       <speed>220</speed>
       <explosionRadius>3.5</explosionRadius>
       <arcHeightFactor>0.4</arcHeightFactor>
@@ -1100,4 +1111,158 @@
       <armorPenetrationBase>1</armorPenetrationBase>
     </projectile>
   </ThingDef>
+  <ThingDef ParentName="BaseGun">
+    <defName>WULA_WM_Panzer_Autocannon</defName>
+    <label>SRc-15"辉锑"</label>
+    <description>由乌拉帝国的"萨克森"战车所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标。</description>
+    <techLevel>Ultra</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.35</drawSize>
+    </graphicData>
+    <tradeability>None</tradeability>
+    <statBases>
+      <MarketValue>1400</MarketValue>
+      <Mass>150</Mass>
+      <AccuracyTouch>0.9</AccuracyTouch>
+      <AccuracyShort>0.9</AccuracyShort>
+      <AccuracyMedium>0.8</AccuracyMedium>
+      <AccuracyLong>0.75</AccuracyLong>
+      <RangedWeapon_Cooldown>1.1</RangedWeapon_Cooldown>
+    </statBases>
+    <costList Inherit="False">
+      <Steel>500</Steel>
+      <Plasteel>150</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <weaponTags>
+      <li>Wula_AI_Heavy_Panzer_Turret</li>
+    </weaponTags>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Machine_Equipment_Technology</researchPrerequisite>
+    </recipeMaker>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_WM_Panzer_Autocannon</defaultProjectile>
+        <warmupTime>0.25</warmupTime>
+        <range>36</range>
+        <burstShotCount>10</burstShotCount>
+        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+        <soundCast>Shot_TurretSniper</soundCast>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <muzzleFlashScale>18</muzzleFlashScale>
+        <targetParams>
+          <canTargetPawns>true</canTargetPawns>
+          <canTargetLocations>true</canTargetLocations>
+          <canTargetBuildings>true</canTargetBuildings>
+        </targetParams>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_WM_Panzer_Autocannon</defName>
+    <label>辉锑自动炮子弹</label>
+    <thingClass>Projectile_Explosive</thingClass>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red_Double</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>1.4</drawSize>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>30</damageAmountBase>
+      <speed>120</speed>
+      <explosionRadius>1.2</explosionRadius>
+      <arcHeightFactor>0.4</arcHeightFactor>
+      <soundExplode>Explosion_Rocket</soundExplode>
+      <armorPenetrationBase>0.75</armorPenetrationBase>
+      <screenShakeFactor>0.1</screenShakeFactor>
+    </projectile>
+  </ThingDef>
+  <ThingDef ParentName="BaseGun">
+    <defName>WULA_WM_Panzer_Mortar</defName>
+    <label>PLm-15"镍铁"</label>
+    <description>由乌拉帝国的"萨克森"战车所装备的迫击炮，虽然型号老旧但是射速相当快，提供的弹药投射量也是不容置疑的。</description>
+    <techLevel>Ultra</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_WM_Panzer_Mortar</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.35</drawSize>
+    </graphicData>
+    <tradeability>None</tradeability>
+    <statBases>
+      <MarketValue>1400</MarketValue>
+      <Mass>150</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.9</AccuracyShort>
+      <AccuracyMedium>0.9</AccuracyMedium>
+      <AccuracyLong>0.9</AccuracyLong>
+      <RangedWeapon_Cooldown>2.1</RangedWeapon_Cooldown>
+    </statBases>
+    <costList Inherit="False">
+      <Steel>500</Steel>
+      <Plasteel>150</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_War_Machine_Weapon_Productor</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Machine_Equipment_Technology</researchPrerequisite>
+    </recipeMaker>
+    <weaponTags>
+      <li>Wula_AI_Heavy_Panzer_Turret</li>
+    </weaponTags>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_WM_Panzer_Mortar</defaultProjectile>
+        <warmupTime>0.2</warmupTime>
+        <forcedMissRadius>1</forcedMissRadius>
+        <forcedMissRadiusClassicMortars>1</forcedMissRadiusClassicMortars>
+        <isMortar>true</isMortar>
+        <requireLineOfSight>false</requireLineOfSight>
+        <minRange>8</minRange>
+        <range>500</range>
+        <burstShotCount>3</burstShotCount>
+        <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+        <soundCast>Mortar_LaunchA</soundCast>
+        <muzzleFlashScale>12</muzzleFlashScale>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_WM_Panzer_Mortar</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>30</damageAmountBase>
+      <speed>25</speed>
+      <explosionRadius>4.9</explosionRadius>
+      <flyOverhead>true</flyOverhead>
+      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+      <soundExplode>MortarBomb_Explode</soundExplode>
+      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+      <soundAmbient>MortarRound_Ambient</soundAmbient>
+    </projectile>
+  </ThingDef>
 </Defs>

1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -480,6 +480,8 @@
         <weaponList>
           <li>WULA_WM_Rocket_Pod</li>
           <li>WULA_WM_Panzer_Turret</li>
+          <li>WULA_WM_Panzer_Autocannon</li>
+          <li>WULA_WM_Panzer_Mortar</li>
         </weaponList>
         <onlyUseRaceRestrictedApparel>true</onlyUseRaceRestrictedApparel>
         <onlyUseRaceRestrictedWeapons>true</onlyUseRaceRestrictedWeapons>

1.5/Defs/WorkGivers/Wula_WorkGivers.xml

@@ -35,4 +35,21 @@
     </requiredCapacities>
     <prioritizeSustains>true</prioritizeSustains>
   </WorkGiverDef>
+
+  <WorkGiverDef>
+    <defName>WULA_War_Machine_Weapon_ProductorBills</defName>
+    <label>在武装组装台制造物品</label>
+    <giverClass>WorkGiver_DoBill</giverClass>
+    <workType>Smithing</workType>
+    <priorityInType>75</priorityInType>
+    <fixedBillGiverDefs>
+      <li>WULA_War_Machine_Weapon_Productor</li>
+    </fixedBillGiverDefs>
+    <verb>工作于</verb>
+    <gerund>工作于</gerund>
+    <requiredCapacities>
+      <li>Manipulation</li>
+    </requiredCapacities>
+    <prioritizeSustains>true</prioritizeSustains>
+  </WorkGiverDef>
 </Defs>

About/About.xml

@@ -5,6 +5,7 @@
   <description></description>
   <supportedVersions>
     <li>1.5</li>
+    <li>1.6</li>
   </supportedVersions>
   <packageId>Tourswen.WulaFallenEmpire</packageId>