From a33d616d2385b220e2c3fc2c78e95b010b4fe7ee Mon Sep 17 00:00:00 2001
From: Tourswen <82707327+Tourswen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 19:10:16 +0800
Subject: [PATCH] 2025-7-25

---
 1.6/Defs/FactionDefs/Factions_Player_WULA.xml | 58 +++++++------------
 1.6/Defs/PawnKinds/PawnKinds_Wula.xml         | 15 ++---
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    | 12 ++--
 3 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
index c7bd8a9f..04aac892 100644
--- a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
+++ b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
@@ -89,45 +89,37 @@
       </points>
     </maxPawnCostPerTotalPointsCurve>
     <pawnGroupMakers>
-      <!-- <li>
+      <li>
         <kindDef>Combat</kindDef>
-        <commonality>100</commonality>
+        <commonality>50</commonality>
         <options>
-          <Mech_Scyther>10</Mech_Scyther>
-          <Mech_Pikeman>10</Mech_Pikeman>
-          <Mech_Lancer>10</Mech_Lancer>
-          <Mech_CentipedeBlaster>10</Mech_CentipedeBlaster>
-          <Mech_Scorcher MayRequire="Ludeon.RimWorld.Biotech">5</Mech_Scorcher>
-          <Mech_Militor MayRequire="Ludeon.RimWorld.Biotech">20</Mech_Militor>
-          <Mech_Centurion MayRequire="Ludeon.RimWorld.Biotech">2</Mech_Centurion>
-          <Mech_Warqueen MayRequire="Ludeon.RimWorld.Biotech">1</Mech_Warqueen>
-          <Mech_Apocriton MayRequire="Ludeon.RimWorld.Biotech">1</Mech_Apocriton>
+          <Wula_Broken_Personality_Pawn_2>10</Wula_Broken_Personality_Pawn_2>
+          <Wula_Broken_Personality_Pawn_7>3</Wula_Broken_Personality_Pawn_7>
+          <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
         </options>
       </li>
       <li>
         <kindDef>Combat</kindDef>
-        <commonality>80</commonality>
-        <options>
-          <Mech_Pikeman>10</Mech_Pikeman>
-          <Mech_Lancer>10</Mech_Lancer>
-          <Mech_Scorcher MayRequire="Ludeon.RimWorld.Biotech">5</Mech_Scorcher>
-          <Mech_Cyclops MayRequire="Ludeon.RimWorld.Odyssey">5</Mech_Cyclops>
-          <Mech_Tesseron MayRequire="Ludeon.RimWorld.Biotech">5</Mech_Tesseron>
-          <Mech_Legionary MayRequire="Ludeon.RimWorld.Biotech">2</Mech_Legionary>
-          <Mech_Diabolus MayRequire="Ludeon.RimWorld.Biotech">1</Mech_Diabolus>
-        </options>
-      </li> -->
-      <!-- <li>
-        <kindDef>Combat</kindDef>
-        <commonality>70</commonality>
+        <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>
         </options>
-      </li> -->
+      </li>
+      <li>
+        <!-- breach raids -->
+        <kindDef>Combat</kindDef>
+        <commonality>30</commonality>
+        <options>
+          <Wula_Broken_Personality_Pawn_2>12</Wula_Broken_Personality_Pawn_2>
+          <Wula_Broken_Personality_Pawn_4>3</Wula_Broken_Personality_Pawn_4>
+          <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
+        </options>
+      </li>
       <li>
         <!-- Centipede only -->
         <kindDef>Combat</kindDef>
-        <commonality>30</commonality>
+        <commonality>20</commonality>
         <options>
           <Wula_Broken_Personality_Pawn_2>10</Wula_Broken_Personality_Pawn_2>
           <Wula_Broken_Personality_Pawn_3>3</Wula_Broken_Personality_Pawn_3>
@@ -137,22 +129,12 @@
       <li>
         <!-- militor only -->
         <kindDef>Combat</kindDef>
-        <commonality>30</commonality>
+        <commonality>10</commonality>
         <options>
           <Wula_Broken_Personality_Pawn_1>10</Wula_Broken_Personality_Pawn_1>
           <Wula_Broken_Personality_Pawn_2>2</Wula_Broken_Personality_Pawn_2>
         </options>
       </li>
-      <li>
-        <!-- breach raids -->
-        <kindDef>Combat</kindDef>
-        <commonality>10</commonality>
-        <options>
-          <Wula_Broken_Personality_Pawn_2>12</Wula_Broken_Personality_Pawn_2>
-          <Wula_Broken_Personality_Pawn_4>3</Wula_Broken_Personality_Pawn_4>
-          <Wula_Broken_Personality_Pawn_5>1</Wula_Broken_Personality_Pawn_5>
-        </options>
-      </li>
     </pawnGroupMakers>
     <settlementTexturePath>World/WorldObjects/DefaultSettlement</settlementTexturePath>
     <allowedArrivalTemperatureRange>-100~200</allowedArrivalTemperatureRange>
diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
index 2425c24c..a251173d 100644
--- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
+++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml
@@ -341,7 +341,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_1</defName>
     <label>服务子个体</label>
-    <combatPower>160</combatPower>
+    <combatPower>350</combatPower>
     <apparelTags>
       <li>Wula_Clothes</li>
     </apparelTags>
@@ -362,7 +362,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_2</defName>
     <label>安保子个体</label>
-    <combatPower>240</combatPower>
+    <combatPower>450</combatPower>
     <apparelMoney>99999~99999</apparelMoney>
     <apparelTags>
       <li>Wula_Armor_Medium</li>
@@ -384,7 +384,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_3</defName>
     <label>战士子个体</label>
-    <combatPower>350</combatPower>
+    <combatPower>750</combatPower>
     <weaponMoney>99999~99999</weaponMoney>
     <apparelMoney>99999~99999</apparelMoney>
     <biocodeWeaponChance>0.75</biocodeWeaponChance>
@@ -407,7 +407,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_4</defName>
     <label>射手子个体</label>
-    <combatPower>350</combatPower>
+    <combatPower>750</combatPower>
     <apparelMoney>99999~99999</apparelMoney>
     <weaponMoney>99999~99999</weaponMoney>
     <biocodeWeaponChance>0.75</biocodeWeaponChance>
@@ -431,7 +431,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_5</defName>
     <label>破袭子个体</label>
-    <combatPower>500</combatPower>
+    <combatPower>1000</combatPower>
     <apparelMoney>99999~99999</apparelMoney>
     <weaponMoney>99999~99999</weaponMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
@@ -456,7 +456,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_6</defName>
     <label>军团子个体</label>
-    <combatPower>450</combatPower>
+    <combatPower>1000</combatPower>
     <weaponMoney>99999~99999</weaponMoney>
     <apparelMoney>99999~99999</apparelMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
@@ -481,7 +481,7 @@
   <PawnKindDef ParentName="Wula_Broken_Personality_Pawn_Base">
     <defName>Wula_Broken_Personality_Pawn_7</defName>
     <label>重装子个体</label>
-    <combatPower>750</combatPower>
+    <combatPower>1000</combatPower>
     <weaponMoney>99999~99999</weaponMoney>
     <apparelMoney>99999~99999</apparelMoney>
     <biocodeWeaponChance>1</biocodeWeaponChance>
@@ -493,6 +493,7 @@
       <li>Wula_Ranged_Weapon_T3</li>
     </weaponTags>
     <initialResistanceRange>15~24</initialResistanceRange>
+    <isGoodBreacher>true</isGoodBreacher>
     <backstoryFiltersOverride>
       <li>
         <categories>
diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index 9d22fd89..3a39d86e 100644
--- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -513,9 +513,9 @@
       <texPath>Wula/Weapon/WULA_MW_Glaive</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>CutoutComplex</shaderType>
-      <drawSize>1.2</drawSize>
+      <drawSize>1.5</drawSize>
     </graphicData>
-    <!-- <uiIconScale>0.4</uiIconScale> -->
+    <uiIconScale>0.75</uiIconScale>
     <!-- <equippedAngleOffset>-65</equippedAngleOffset> -->
     <techLevel>Spacer</techLevel>
     <!-- <equippedAngleOffset>-25</equippedAngleOffset> -->
@@ -537,8 +537,8 @@
         <capacities>
           <li>Cut</li>
         </capacities>
-        <power>32</power>
-        <cooldownTime>1.7</cooldownTime>
+        <power>18</power>
+        <cooldownTime>1.9</cooldownTime>
         <armorPenetration>0.50</armorPenetration>
       </li>
       <li>
@@ -546,9 +546,9 @@
         <capacities>
           <li>Stab</li>
         </capacities>
-        <power>40</power>
+        <power>20</power>
         <armorPenetration>0.90</armorPenetration>
-        <cooldownTime>2.1</cooldownTime>
+        <cooldownTime>2.5</cooldownTime>
       </li>
     </tools>
     <recipeMaker>