From 00dfd8469da9697b25978f2a30eb5e6e4ba70b3c Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Wed, 27 Aug 2025 12:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weapons/WULA_FE_Laser_Weapon.xml          | 30 +++++++++++++++++--
 .../Weapons/WULA_FE_Plasma_Weapon.xml         | 16 +++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
index e39cebb1..a1d371c6 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Laser_Weapon.xml
@@ -33,10 +33,10 @@
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Penetrating_Beam_Ranged</defaultProjectile>
+        <defaultProjectile>Bullet_WULA_RW_Penetrating_Beam_Base</defaultProjectile>
         <warmupTime>2</warmupTime>
         <range>16</range>
-        <burstShotCount>2</burstShotCount>
+        <burstShotCount>3</burstShotCount>
         <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
         <soundCast>Shot_BeamRepeater</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
@@ -57,6 +57,32 @@
     </thingSetMakerTags>
   </ThingDef>
 
+  <!--没霰弹的光束-->
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Penetrating_Beam_Base</defName>
+    <label>穿透光束</label>
+    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <modExtensions>
+      <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
+        <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
+        <damageFalloff>0</damageFalloff>        <!-- 0 for no damage falloff -->
+        <preventFriendlyFire>false</preventFriendlyFire>
+        <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
+        <beamStartOffset>0.5</beamStartOffset>
+      </li>
+    </modExtensions>
+    <graphicData>
+      <texPath>Things/Projectile/ChargeLanceShot</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>BeamBypassShields</damageDef>
+      <damageAmountBase>5</damageAmountBase>
+      <armorPenetrationBase>0.8</armorPenetrationBase>
+      <stoppingPower>1</stoppingPower>
+    </projectile>
+  </ThingDef>
+
   <!-- Penetrating Beam Rifle -->
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_RW_Penetrating_Beam_Rifle</defName>
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
index dad2429d..df4fdd5d 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml
@@ -323,25 +323,17 @@
     <projectile>
       <!-- 基础伤害和穿透。对于这个投射物，实际伤害由爆炸决定 -->
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>16</damageAmountBase>
+      <damageAmountBase>10</damageAmountBase>
       <armorPenetrationBase>0.75</armorPenetrationBase>
       <speed>55</speed>
     </projectile>
-    <!-- 1. 使用正确的thingClass -->
-    <thingClass>WulaFallenEmpire.Projectile_ExplosiveTrackingBullet</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
     <modExtensions>
-      <!-- 2. 保留追踪和霰弹ModExtension -->
       <li Class="WulaFallenEmpire.TrackingBulletDef">
-        <homingSpeed>0.1</homingSpeed>
-        <initRotateAngle>30</initRotateAngle>
-        <destroyTicksAfterLosingTrack>
-          <min>60</min>
-          <max>120</max>
-        </destroyTicksAfterLosingTrack>
         <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
       </li>
       <li Class="WulaFallenEmpire.ShotgunExtension">
-        <pelletCount>3</pelletCount>
+        <pelletCount>2</pelletCount>
       </li>
       <!-- 3. 添加爆炸ModExtension -->
       <li Class="WulaFallenEmpire.ExplosiveTrackingBulletDef">
@@ -363,7 +355,7 @@
     </graphicData>
     <projectile>
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>16</damageAmountBase>
+      <damageAmountBase>20</damageAmountBase>
       <explosionRadius>2.1</explosionRadius>
       <soundExplode>Explosion_EMP</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>