2025-7-17

1.6/Defs/Buildings/Buildings_Structure.xml

@@ -35,7 +35,7 @@
     <!-- <placeWorkers>
       <li>PlaceWorker_OnSubstructure</li>
     </placeWorkers> -->
-    <damageMultipliers>
+    <damageMultipliers Inherit="False">
       <li>
         <damageDef>Bomb</damageDef>
         <multiplier>0.01</multiplier>

1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -112,9 +112,9 @@
     <label>超载组件</label>
     <description>安装于能源炉的特殊改件，除了获得常驻的移动速度外，还可以短时间超载机体，获得力量上的爆发性增益。</description>
     <duplicationAllowed>false</duplicationAllowed>
-    <minSeverity>1</minSeverity>
     <stages>
       <li>
+        <minSeverity>0.01</minSeverity>
         <statOffsets>
           <MoveSpeed>1</MoveSpeed>
         </statOffsets>
@@ -236,6 +236,7 @@
     <duplicationAllowed>false</duplicationAllowed>
     <stages>
       <li>
+        <minSeverity>0.01</minSeverity>
         <hungerRateFactor>1</hungerRateFactor>
       </li>
     </stages>

1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -160,7 +160,7 @@
       </li>
     </lifeStages>
     <abilities>
-      <li>Wula_AI_Engineer_Mother_Ability1</li>
+      <li>Wula_AI_Engineer_Mother_Ability</li>
     </abilities>
     <weaponMoney>99999~99999</weaponMoney>
     
@@ -189,7 +189,7 @@
       </li>
     </lifeStages>
     <abilities>
-      <li>Wula_AI_Engineer_Mother_Attack_Ability1</li>
+      <li>Wula_AI_Engineer_Mother_Attack_Ability</li>
     </abilities>
     <weaponMoney>99999~99999</weaponMoney>
     
@@ -346,8 +346,8 @@
     <lifeStages Inherit="False">
       <li>
         <bodyGraphicData>
-          <texPath>Wula/Things/WULA_bomb_Cat/WULA_Cat_Thin</texPath>
-          <maskPath>Wula/Things/WULA_bomb_Cat/AllegianceOverlays/None</maskPath>
+          <texPath>Wula/Things/WULA_Commander_Cat/WULA_Cat_Thin</texPath>
+          <maskPath>Wula/Things/WULA_Commander_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
           <drawSize>1.1</drawSize>

1.6/Defs/ThingDefs/WULA_Item.xml

@@ -129,6 +129,8 @@
       <texPath>Wula/Item/WULA_Dark_Matter_Item</texPath>
       <graphicClass>Graphic_Single</graphicClass>
     </graphicData>
+    <tickerType>Normal</tickerType>
+    <smeltable>false</smeltable>
     <genericMarketSellable>false</genericMarketSellable>
     <soundInteract>Metal_Drop</soundInteract>
     <soundDrop>Metal_Drop</soundDrop>
@@ -142,7 +144,6 @@
       <li>ResourcesRaw</li>
     </thingCategories>
     <burnableByRecipe>false</burnableByRecipe>
-    <smeltable>true</smeltable>
     <terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
     <allowedArchonexusCount>80</allowedArchonexusCount>
     <possessionCount>1</possessionCount>

1.6/Defs/ThingDefs_Misc/WULA_Apparel.xml

@@ -738,8 +738,8 @@
       <MaxHitPoints>1000</MaxHitPoints>
       <Mass>20</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Sharp>1.2</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.2</ArmorRating_Blunt>
       <ArmorRating_Heat>2.0</ArmorRating_Heat>
       <EquipDelay>35</EquipDelay>
       <EnergyShieldEnergyMax>0.5</EnergyShieldEnergyMax>
@@ -830,8 +830,8 @@
       <MaxHitPoints>1000</MaxHitPoints>
       <Mass>3</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
-      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Sharp>1</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1</ArmorRating_Blunt>
       <ArmorRating_Heat>2.0</ArmorRating_Heat>
       <EquipDelay>15</EquipDelay>
     </statBases>
@@ -873,8 +873,8 @@
       <MaxHitPoints>1000</MaxHitPoints>
       <Mass>20</Mass>
       <Flammability>0</Flammability>
-      <ArmorRating_Sharp>1.85</ArmorRating_Sharp>
-      <ArmorRating_Blunt>1.85</ArmorRating_Blunt>
+      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
       <ArmorRating_Heat>2.0</ArmorRating_Heat>
       <EquipDelay>40</EquipDelay>
       <!-- <EnergyShieldEnergyMax>0.25</EnergyShieldEnergyMax> -->
@@ -934,6 +934,7 @@
         <forcedMissRadius>2</forcedMissRadius>
         <targetable>true</targetable>
         <violent>true</violent>
+        <requireLineOfSight>false</requireLineOfSight>
         <targetParams>
           <canTargetPawns>true</canTargetPawns>
           <canTargetBuildings>true</canTargetBuildings>
@@ -967,6 +968,47 @@
       <soundAmbient>MortarRound_Ambient</soundAmbient>
     </projectile>
   </ThingDef>
+  <ThingDef ParentName="WULA_ApparelHelmetBase">
+    <defName>WULA_Heavy_Infantry_Helmet</defName>
+    <label>乌拉帝国重装头盔</label>
+    <description>与乌拉帝国重装装甲配套的头盔，防御力强大。</description>
+    <thingCategories>
+      <li>HeadgearNoble</li>
+    </thingCategories>
+    <recipeMaker>
+      <skillRequirements>
+        <Crafting>10</Crafting>
+      </skillRequirements>
+      <researchPrerequisite>WULA_Synth_Armor_2_Technology</researchPrerequisite>
+    </recipeMaker>
+    <graphicData>
+      <texPath>Wula/Apparel/WULA_Heavy_Infantry_Helmet</texPath>
+    </graphicData>
+    <statBases>
+      <WorkToMake>20000</WorkToMake>
+      <MaxHitPoints>1000</MaxHitPoints>
+      <Mass>5</Mass>
+      <Flammability>0</Flammability>
+      <ArmorRating_Sharp>1.5</ArmorRating_Sharp>
+      <ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+      <ArmorRating_Heat>2.0</ArmorRating_Heat>
+      <EquipDelay>15</EquipDelay>
+    </statBases>
+    <equippedStatOffsets>
+      <IncomingDamageFactor>-0.5</IncomingDamageFactor>
+    </equippedStatOffsets>
+    <apparel>
+      <tags>
+        <li>RoyalTier5</li>
+        <li>Royal</li>
+      </tags>
+      <wornGraphicPath>Wula/Apparel/WULA_Heavy_Infantry_Helmet</wornGraphicPath>
+    </apparel>
+    <costStuffCount>100</costStuffCount>
+    <costList Inherit="False">
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+  </ThingDef>
 
   <!-- 盾牌 -->
   <ThingDef Name="WULA_ApparelShieldBase" ParentName="ArmorMachineableBase" Abstract="True">

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -554,6 +554,7 @@
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.3</drawSize>
     </graphicData>
+    <relicChance>0</relicChance>
     <uiIconScale>1.1</uiIconScale>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
@@ -649,6 +650,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
@@ -734,6 +736,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
@@ -825,6 +828,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
@@ -914,6 +918,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
@@ -1032,6 +1037,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <weaponTags>
       <li>Spear</li>
     </weaponTags>
@@ -1133,6 +1139,7 @@
       <drawSize>1.3</drawSize>
     </graphicData>
     <uiIconScale>1.1</uiIconScale>
+    <relicChance>0</relicChance>
     <descriptionHyperlinks>
       <ThingDef>WULA_Soul_Wedge</ThingDef>
     </descriptionHyperlinks>
@@ -1706,6 +1713,7 @@
     <label>ATt-6"金红石"</label>
     <description>由乌拉帝国的"萨克森"战车所装备的战车炮塔，可以从极远距离上精准地点杀高价值目标。</description>
     <techLevel>Ultra</techLevel>
+    <relicChance>0</relicChance>
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Turret</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -1780,6 +1788,7 @@
     <label>SRc-15"辉锑"</label>
     <description>由乌拉帝国的"萨克森"战车所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标，并且外挂了两具PRr-34"石英"火箭发射器，用于对抗集群冲击。</description>
     <techLevel>Ultra</techLevel>
+    <relicChance>0</relicChance>
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -1942,6 +1951,7 @@
     <description>PMu-7"西比尔卡"内置的生产单元，可以源源不断地放出绑着炸弹的乌拉猫猫，以自杀式袭击击溃敌人阵线。</description>
     <techLevel>Ultra</techLevel>
     <uiIconPath>Wula/Things/WULA_bomb_Cat/WULA_Cat_Thin_south</uiIconPath>
+    <relicChance>0</relicChance>
     <graphicData>
       <texPath>Wula/Things/WULA_Cat/AllegianceOverlays/None_north</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -2008,6 +2018,7 @@
     <label>步兵猫猫生产</label>
     <description>PMu-7A"斯托洛维耶"内置的生产单元，可以源源不断地放出端着DLa-4"云母"突击步枪的乌拉猫猫，构成一道坚韧的防线。</description>
     <techLevel>Ultra</techLevel>
+    <relicChance>0</relicChance>
     <uiIconPath>Wula/Things/WULA_Attack_Cat/WULA_Cat_Thin_south</uiIconPath>
     <graphicData>
       <texPath>Wula/Things/WULA_Cat/AllegianceOverlays/None_north</texPath>

1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -582,16 +582,16 @@
         </capacities>
         <power>5</power>
         <cooldownTime>3</cooldownTime>
-        <linkedBodyPartsGroup>Leg</linkedBodyPartsGroup>
+        <linkedBodyPartsGroup>Legs</linkedBodyPartsGroup>
         <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
       </li>
     </tools>
   </ThingDef>
   <AbilityDef>
-    <defName>Wula_AI_Engineer_Mother_Ability1</defName>
+    <defName>Wula_AI_Engineer_Mother_Ability</defName>
     <label>部署CAt-44"指挥官猫猫"</label>
     <description>向所在单元格部署一只CAt-44"指挥官猫猫"，这种机械体比起同类来说拥有很高的防御，在配备了远程武器的同时还配备了一个不会过载的护盾发生器，可以掩护敢死猫猫的前进。</description>
-    <iconPath>Things/Building/Security/BroadshieldProjector</iconPath>
+    <iconPath>Wula/Things/WULA_Commander_Cat/WULA_Cat_Thin_south</iconPath>
     <writeCombatLog>True</writeCombatLog>
     <showPsycastEffects>False</showPsycastEffects>
     <cooldownTicksRange>8000</cooldownTicksRange>
@@ -607,12 +607,12 @@
     </verbProperties>
     <comps>
       <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>Bullet_Wula_AI_Engineer_Mother_Ability1</projectileDef>
+        <projectileDef>Bullet_Wula_AI_Engineer_Mother_Ability</projectileDef>
       </li>
     </comps>
   </AbilityDef>
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_Wula_AI_Engineer_Mother_Ability1</defName>
+    <defName>Bullet_Wula_AI_Engineer_Mother_Ability</defName>
     <label>CAt-44"指挥官猫猫"</label>
     <thingClass>Projectile_SpawnsPawnZeroAge</thingClass>
     <graphicData>
@@ -632,7 +632,7 @@
     <uiIconPath>Wula/Things/Wula_AI_Bomb_Mother/Wula_AI_Bomb_Mother_Icon</uiIconPath>
   </ThingDef>
   <AbilityDef>
-    <defName>Wula_AI_Engineer_Mother_Attack_Ability1</defName>
+    <defName>Wula_AI_Engineer_Mother_Attack_Ability</defName>
     <label>部署低角护盾</label>
     <description>向所在单元格部署一个低角护盾，该护盾不会由于攻击而过载，但是会在几十秒后烧毁。</description>
     <iconPath>Things/Building/Security/BroadshieldProjector</iconPath>
@@ -651,12 +651,12 @@
     </verbProperties>
     <comps>
       <li Class="CompProperties_AbilityLaunchProjectile">
-        <projectileDef>Bullet_Wula_AI_Engineer_Mother_Attack_Ability1</projectileDef>
+        <projectileDef>Bullet_Wula_AI_Engineer_Mother_Attack_Ability</projectileDef>
       </li>
     </comps>
   </AbilityDef>
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_Wula_AI_Engineer_Mother_Attack_Ability1</defName>
+    <defName>Bullet_Wula_AI_Engineer_Mother_Attack_Ability</defName>
     <label>低角护盾</label>
     <thingClass>Projectile_SpawnsThing</thingClass>
     <graphicData>
@@ -908,12 +908,24 @@
         <explosionDamageAmount>40</explosionDamageAmount>
       </li>
     </comps>
+    <tools Inherit="False">
+      <li>
+        <label>head</label>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>6</power>
+        <cooldownTime>2.6</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
   </ThingDef>
   <ThingDef ParentName="BaseDrone">
     <defName>Mech_WULA_Cat_Commander</defName>
     <label>CAt-44"指挥官猫猫"</label>
     <description>乌拉帝国的一种小型机械体，比起同类来说拥有很高的防御，在配备了远程武器的同时还配备了一个护盾发生器，这种盾会同时阻拦向外发射的射弹和向盾内发射的射弹。</description>
-    <uiIconPath>Wula/Things/WULA_Attack_Cat/WULA_Cat_Thin_south</uiIconPath>
+    <uiIconPath>Wula/Things/WULA_Commander_Cat/WULA_Cat_Thin_south</uiIconPath>
     <race>
 			<baseHealthScale>3</baseHealthScale>
       <thinkTreeConstant>SentryDroneConstant</thinkTreeConstant>
@@ -957,6 +969,18 @@
         <activeSound>Broadshield_Ambience</activeSound>
       </li>
     </comps>
+    <tools Inherit="False">
+      <li>
+        <label>head</label>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>6</power>
+        <cooldownTime>2.6</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
   </ThingDef>
   <ThingDef ParentName="BaseDrone">
     <defName>Mech_WULA_Cat_Inf</defName>
@@ -989,5 +1013,17 @@
         <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
       </li>
     </comps>
+    <tools Inherit="False">
+      <li>
+        <label>head</label>
+        <capacities>
+          <li>Blunt</li>
+        </capacities>
+        <power>6</power>
+        <cooldownTime>2.6</cooldownTime>
+        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+      </li>
+    </tools>
   </ThingDef>
 </Defs>