From bbabe194c9e94609c9eda634f73a6c588d3aa6d0 Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Wed, 13 Aug 2025 11:45:06 +0800
Subject: [PATCH] 20025-8-13

---
 .../Weapons/WULA_Melee_Cleave.xml             |  2 -
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    | 45 ++++++++++++++++---
 .../WULA_WeaponCategoryDefs.xml               |  5 +++
 .../WeaponTraitDefs/WULA_WeaponTraitDefs.xml  |  8 ++--
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
index 43e9d96b..91d2c4de 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml
@@ -58,12 +58,10 @@
       </recipeUsers>
     </recipeMaker>
   </ThingDef>
-
   <ToolCapacityDef>
     <defName>WULA_CleaveAttack</defName>
     <label>cleave</label>
   </ToolCapacityDef>
-
   <ManeuverDef>
     <defName>WULA_CleaveManeuver</defName>
     <requiredCapacity>WULA_CleaveAttack</requiredCapacity>
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
index e6f0cf93..2c088f07 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -297,7 +297,7 @@
   <ThingDef ParentName="BaseMeleeWeapon_Blunt_Quality">
     <defName>WULA_MW_Breaker_Bar</defName>
     <label>PMb-97"破墙槌"</label>
-    <description>一种沉重的破墙设备，通常由装备外骨骼的乌拉帝国士兵携带，可以通过加压挥出势大力沉的一击，洞穿对手或墙体。</description>
+    <description>一种沉重的破墙设备，通常由装备外骨骼的乌拉帝国士兵携带，可以通过加压挥出势大力沉的一击，连续击倒多名敌人。</description>
     <graphicData>
       <texPath>Wula/Weapon/WULA_MW_Breaker_Bar</texPath>
       <shaderType>CutoutComplex</shaderType>
@@ -324,19 +324,19 @@
     </costList>
     <tools>
       <li>
-        <label>加压槌头</label>
+        <label>横扫</label>
         <capacities>
-          <li>Demolish</li>
+          <li>WULA_MW_Breaker_Bar_Demolish</li>
         </capacities>
         <power>150</power>
         <cooldownTime>5</cooldownTime>
         <armorPenetration>1</armorPenetration>
-        <extraMeleeDamages>
+        <!-- <extraMeleeDamages>
           <li>
             <def>Stun</def>
             <amount>34</amount>
           </li>
-        </extraMeleeDamages>
+        </extraMeleeDamages> -->
       </li>
     </tools>
     <recipeMaker>
@@ -353,7 +353,42 @@
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
+    <comps>
+      <li Class="WulaFallenEmpire.CompProperties_Cleave">
+        <cleaveAngle>90</cleaveAngle>
+        <cleaveRange>2.5</cleaveRange>
+        <cleaveDamageFactor>0.5</cleaveDamageFactor>
+        <damageDowned>false</damageDowned>
+        <explosionDamageDef>Blunt</explosionDamageDef>
+      </li>
+      <li Class="WulaFallenEmpire.CompProperties_CustomUniqueWeapon">
+				<forcedTraits>
+					<li>WULA_Melee_Cleave</li>
+				</forcedTraits>
+				<numTraitsRange>
+					<min>1</min>
+					<max>1</max>
+				</numTraitsRange>
+			</li>
+    </comps>
   </ThingDef>
+  <ToolCapacityDef>
+    <defName>WULA_MW_Breaker_Bar_Demolish</defName>
+    <label>加压锤击</label>
+  </ToolCapacityDef>
+  <ManeuverDef>
+    <defName>WULA_MW_Breaker_Bar_Maneuver</defName>
+    <requiredCapacity>WULA_MW_Breaker_Bar_Demolish</requiredCapacity>
+    <verb>
+      <verbClass>WulaFallenEmpire.Verb_MeleeAttack_Cleave</verbClass>
+      <meleeDamageDef>Demolish</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
   <!-- 动力钉头锤 -->
   <ThingDef ParentName="BaseMeleeWeapon_Blunt_Quality">
     <defName>WULA_MW_Charge_Mace</defName>
diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml b/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
index fda01932..f755b002 100644
--- a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
+++ b/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml
@@ -10,4 +10,9 @@
     <label>导弹</label>
     <description>一种发射拥有跟踪能力的抛射体武器，弹速通常较慢。</description>
   </WeaponCategoryDef>
+  <WeaponCategoryDef>
+    <defName>WULA_SP_Melee_Weaopn</defName>
+    <label>特殊近战武器</label>
+    <description>拥有特殊效果的近战武器</description>
+  </WeaponCategoryDef>
 </Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml b/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml
index 437521ca..efd57811 100644
--- a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml
+++ b/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml
@@ -34,11 +34,11 @@
     </statFactors>
   </WeaponTraitDef>
   <WeaponTraitDef>
-    <defName>WULA_MissileLauncher</defName>
-    <label>乌拉帝国导弹</label>
-    <description>这把武器的抛射体会跟踪敌人，如果没有明确的敌人作为目标，则会在落地前散开以形成轰炸区。</description>
+    <defName>WULA_Melee_Cleave</defName>
+    <label>溅射伤害</label>
+    <description>这把武器的近战攻击不仅会伤害受击者，还会伤害受击者后方扇形范围内的其他个体。</description>
     <commonality>1</commonality>
-    <weaponCategory>WULA_Missile</weaponCategory>
+    <weaponCategory>WULA_SP_Melee_Weaopn</weaponCategory>
     <statOffsets>
     </statOffsets>
     <statFactors>