From 8d30daebe1e93a25bd20d2360099131b5d71836e Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Wed, 27 Aug 2025 13:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E5=99=A8=E5=8C=85=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResearchProjects_WULA.xml                 |  74 +++--
 .../Weapons/WULA_FE_Balistic_Weapon.xml       | 217 +++++++++++++
 .../Weapons/WULA_FE_Laser_Weapon.xml          | 176 +++++++----
 .../Weapons/WULA_FE_Plasma_Weapon.xml         |  51 ++--
 .../ThingDefs_Misc/Weapons/WULA_Weapon.xml    | 286 +-----------------
 5 files changed, 393 insertions(+), 411 deletions(-)
 create mode 100644 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml

diff --git a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
index 2165e04a..4b63dd51 100644
--- a/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
+++ b/1.6/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml
@@ -136,29 +136,6 @@
       <li>WULA_Base_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Synth_Weapon_2_Plasma_Technology</defName>
-    <researchViewX>3.00</researchViewX>
-    <researchViewY>0.20</researchViewY>
-    <label>等离子武装套件</label>
-    <description>开发能够供乌拉帝国合成人的使用的等离子武器，以便进一步对抗强大的外部威胁。</description>
-    <baseCost>600</baseCost>
-    <prerequisites>
-      <li>WULA_Synth_Weapon_Technology</li>
-    </prerequisites>
-  </ResearchProjectDef>
-  <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Synth_Weapon_Shield_Technology</defName>
-    <researchViewX>2.00</researchViewX>
-    <researchViewY>1.20</researchViewY>
-    <label>护盾武装套件</label>
-    <description>开发能够保护乌拉帝国合成人的手持护盾，以抵抗来自敌方的猛烈攻击。</description>
-    <baseCost>800</baseCost>
-    <prerequisites>
-      <li>WULA_Synth_Weapon_Technology</li>
-      <li>WULA_Synth_Clothes_Technology</li>
-    </prerequisites>
-  </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Weapon_2_Melee_Technology</defName>
     <label>短兵武装套件</label>
@@ -169,7 +146,7 @@
     <prerequisites>
       <li>Fabrication</li>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>WULA_Synth_Weapon_2_Plasma_Technology</li>
+      <li>WULA_Synth_Weapon_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -186,28 +163,66 @@
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
-    <defName>WULA_Synth_Weapon_2_Ranged_Technology</defName>
-    <researchViewX>4.50</researchViewX>
+    <defName>WULA_Synth_Weapon_2_Plasma_Technology</defName>
+    <researchViewX>2.00</researchViewX>
     <researchViewY>0.20</researchViewY>
+    <label>等离子武装套件</label>
+    <description>开发能够供乌拉帝国合成人的使用的等离子武器，以便进一步对抗强大的外部威胁。</description>
+    <baseCost>600</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Weapon_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Weapon_2_Laser_Technology</defName>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>1.00</researchViewY>
+    <label>镭射武装套件</label>
+    <description>开发能够供乌拉帝国合成人的使用的镭射武器，以便进一步对抗强大的外部威胁。</description>
+    <baseCost>600</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Weapon_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Weapon_Shield_Technology</defName>
+    <researchViewX>2.00</researchViewX>
+    <researchViewY>2.50</researchViewY>
+    <label>护盾武装套件</label>
+    <description>开发能够保护乌拉帝国合成人的手持护盾，以抵抗来自敌方的猛烈攻击。</description>
+    <baseCost>800</baseCost>
+    <prerequisites>
+      <li>WULA_Synth_Weapon_Technology</li>
+      <li>WULA_Synth_Clothes_Technology</li>
+    </prerequisites>
+  </ResearchProjectDef>
+  
+  <ResearchProjectDef ParentName="WULAtechBase">
+    <defName>WULA_Synth_Weapon_2_Ranged_Technology</defName>
+    <researchViewX>3.00</researchViewX>
+    <researchViewY>1.00</researchViewY>
     <label>远射武装套件</label>
     <description>开发能够武装乌拉帝国合成人的远距离武器，旨在构建密集火力网消灭敌人。</description>
     <baseCost>2400</baseCost>
     <prerequisites>
       <li>ChargedShot</li>
       <li>WULA_Adv_WorkTable_Technology</li>
-      <li>WULA_Synth_Weapon_2_Plasma_Technology</li>
+      <li>WULA_Synth_Weapon_2_Laser_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
     <defName>WULA_Synth_Weapon_3_Bomb_Technology</defName>
-    <researchViewX>5.50</researchViewX>
+    <researchViewX>3.00</researchViewX>
     <researchViewY>0.20</researchViewY>
     <label>轰炸武装套件</label>
     <description>开发能够武装乌拉帝国合成人的大范围杀伤性武器，用于对抗最难应付的敌人。</description>
     <baseCost>3200</baseCost>
     <prerequisites>
-      <li>WULA_Synth_Weapon_2_Ranged_Technology</li>
       <li>BeamWeapons</li>
+      <li>WULA_Adv_WorkTable_Technology</li>
+      <li>WULA_Synth_Weapon_2_Plasma_Technology</li>
     </prerequisites>
   </ResearchProjectDef>
   <ResearchProjectDef ParentName="WULAtechBase">
@@ -218,6 +233,7 @@
     <description>开发供乌拉帝国合成人使用的暗物质驱动远程武器——乌拉帝国科技极致伟力的具象化。</description>
     <baseCost>4000</baseCost>
     <prerequisites>
+      <li>WULA_Synth_Weapon_2_Ranged_Technology</li>
       <li>WULA_Synth_Weapon_3_Bomb_Technology</li>
       <li>WULA_Dark_Matter_Technology</li>
     </prerequisites>
diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml
new file mode 100644
index 00000000..f64a3f0f
--- /dev/null
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Balistic_Weapon.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Base_AR</defName>
+    <label>DLa-1"页岩"</label>
+    <description>乌拉帝国的旧式突击步枪，仍然使用落后的导气式结构驱动自动射击构件，通常被派发给炮灰战斗人员。</description>
+    <tickerType>Normal</tickerType>
+    <techLevel>Spacer</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Base_AR</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <soundInteract>Interact_Rifle</soundInteract>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_BIO</li>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>1300</WorkToMake>
+      <!-- <MarketValue>370</MarketValue> -->
+      <Mass>3.5</Mass>
+      <AccuracyTouch>0.75</AccuracyTouch>
+      <AccuracyShort>0.75</AccuracyShort>
+      <AccuracyMedium>0.65</AccuracyMedium>
+      <AccuracyLong>0.45</AccuracyLong>
+      <RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_AssaultRifle</defaultProjectile>
+        <warmupTime>1</warmupTime>
+        <range>25</range>
+        <burstShotCount>4</burstShotCount>
+        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <soundCast>Shot_AssaultRifle</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>7</muzzleFlashScale>
+      </li>
+    </verbs>
+    <costList Inherit="False">
+      <Steel>60</Steel>
+      <ComponentIndustrial>8</ComponentIndustrial>
+    </costList>
+    <weaponTags>
+      <li>Wula_Weapon_Init</li>
+    </weaponTags>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Fractal_RF</defName>
+    <label>SLr-14"蓝锥"</label>
+    <description>乌拉帝国的旧式猎枪，使用简易的磁轨结构发射钢针，射速较慢，但是强大的动能使其在击中第一个目标后仍能继续飞行，对路径上的多个敌人造成伤害。</description>
+    <techLevel>Spacer</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Fractal_RF</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <!-- <drawSize>1.2</drawSize> -->
+    </graphicData>
+    <!-- <uiIconScale>0.85</uiIconScale> -->
+    <soundInteract>Interact_Rifle</soundInteract>
+    <weaponClasses>
+      <li>LongShots</li>
+      <li>RangedHeavy</li>
+    </weaponClasses>
+    <recipeMaker>
+      <!-- <WorkToMake>60000</WorkToMake> -->
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_BIO</li>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>1300</WorkToMake>
+      <Mass>3.5</Mass>
+      <AccuracyTouch>0.3</AccuracyTouch>
+      <AccuracyShort>0.8</AccuracyShort>
+      <AccuracyMedium>0.9</AccuracyMedium>
+      <AccuracyLong>0.8</AccuracyLong>
+      <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
+    </statBases>
+    <costList Inherit="False">
+      <Steel>120</Steel>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Fractal_RF</defaultProjectile>
+        <warmupTime>2</warmupTime>
+        <range>38</range>
+        <burstShotCount>1</burstShotCount>
+        <soundCast>Shot_ChargeBlaster</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>9</muzzleFlashScale>
+      </li>
+    </verbs>
+    <weaponTags>
+      <li>Wula_Ranged_Weapon_T2</li>
+    </weaponTags>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Fractal_RF</defName>
+    <label>蓝锥钢针弹</label>
+    <thingClass>WulaFallenEmpire.Projectile_WulaLineAttack</thingClass>
+    <modExtensions>
+      <li Class="WulaFallenEmpire.Wula_PathPierce_Extension">
+        <maxHits>-1</maxHits>        <!-- 无限穿透 -->
+        <damageFalloff>0</damageFalloff>        <!-- 无伤害衰减 -->
+        <preventFriendlyFire>false</preventFriendlyFire>        <!-- 是否阻止友方火力 -->
+        <tailFleckDef>WULA_GunTail_Lighting</tailFleckDef>        <!-- 拖尾特效定义 -->
+      </li>
+    </modExtensions>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>1.4</drawSize>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>25</damageAmountBase>
+      <speed>130</speed>
+      <armorPenetrationBase>0.5</armorPenetrationBase>
+      <stoppingPower>5</stoppingPower>
+    </projectile>
+  </ThingDef>
+
+  <!-- 乌拉帝国霰弹枪 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_StarDrift_SG</defName>
+    <label>DCs-7"黑曜石"</label>
+    <description>乌拉帝国配发的近距离霰弹枪，以威力巨大的梭镖破甲弹为核心，专注于在短距离上的快速反应战斗和持续性压制能力</description>
+    <techLevel>Ultra</techLevel>
+    <weaponTags>
+      <li>Wula_Ranged_Weapon_T2</li>
+    </weaponTags>
+    <!-- <techLevel>Spacer</techLevel> -->
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_StarDrift_SG</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <soundInteract>Interact_ChargeRifle</soundInteract>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_BIO</li>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>25000</WorkToMake>
+      <Mass>3.5</Mass>
+      <AccuracyTouch>1</AccuracyTouch>
+      <AccuracyShort>0.9</AccuracyShort>
+      <AccuracyMedium>0.5</AccuracyMedium>
+      <AccuracyLong>0.25</AccuracyLong>
+      <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
+    </statBases>
+    <costList Inherit="False">
+      <Steel>120</Steel>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <verbs>
+      <li>
+        <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>WULA_Bullet_StarDrift_Shotgun_Spear</defaultProjectile>
+        <warmupTime>0.2</warmupTime>
+        <range>18</range>
+        <burstShotCount>3</burstShotCount>
+        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <soundCast>Shot_BeamRepeater</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>7</muzzleFlashScale>
+      </li>
+    </verbs>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>WULA_Bullet_StarDrift_Shotgun_Spear</defName>
+    <label>梭镖</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>8</damageAmountBase>
+      <stoppingPower>2.5</stoppingPower>
+      <armorPenetrationBase>0.65</armorPenetrationBase>
+      <speed>55</speed>
+    </projectile>
+    <modExtensions>
+      <li Class="WulaFallenEmpire.ShotgunExtension">
+        <pelletCount>3</pelletCount>
+      </li>
+    </modExtensions>
+  </ThingDef>
+</Defs>
\ No newline at end of file
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 a1d371c6..2d6d5a34 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
@@ -16,7 +16,7 @@
         <li>WULA_Cube_Productor_BIO</li>
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Laser_Technology</researchPrerequisite>
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
     <statBases>
@@ -33,7 +33,7 @@
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Penetrating_Beam_Base</defaultProjectile>
+        <defaultProjectile>Bullet_WULA_RW_Penetrating_Rifle</defaultProjectile>
         <warmupTime>2</warmupTime>
         <range>16</range>
         <burstShotCount>3</burstShotCount>
@@ -47,38 +47,42 @@
     </verbs>
     <costList Inherit="False">
       <Steel>60</Steel>
-      <ComponentIndustrial>8</ComponentIndustrial>
+      <ComponentIndustrial>4</ComponentIndustrial>
+      <Plasteel>20</Plasteel>
     </costList>
     <weaponTags>
-      <li>Wula_Weapon_Init</li>
+      <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
   </ThingDef>
 
-  <!--没霰弹的光束-->
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Penetrating_Beam_Base</defName>
+    <defName>Bullet_WULA_RW_Penetrating_Rifle</defName>
     <label>穿透光束</label>
-    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <thingClass>WulaFallenEmpire.Projectile_WulaLineAttack</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 Class="WulaFallenEmpire.Wula_PathPierce_Extension">
+        <maxHits>-1</maxHits>        <!-- 无限穿透 -->
+        <damageFalloff>0</damageFalloff>        <!-- 无伤害衰减 -->
+        <preventFriendlyFire>true</preventFriendlyFire>        <!-- 是否阻止友方火力 -->
+        <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
       </li>
     </modExtensions>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
     <graphicData>
       <texPath>Things/Projectile/ChargeLanceShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>TransparentPostLight</shaderType>
+      <drawSize>1.4</drawSize>
     </graphicData>
     <projectile>
       <damageDef>BeamBypassShields</damageDef>
       <damageAmountBase>5</damageAmountBase>
-      <armorPenetrationBase>0.8</armorPenetrationBase>
+      <speed>130</speed>
+      <armorPenetrationBase>0.9</armorPenetrationBase>
       <stoppingPower>1</stoppingPower>
     </projectile>
   </ThingDef>
@@ -110,8 +114,15 @@
     <costList Inherit="False">
       <Steel>120</Steel>
       <ComponentIndustrial>6</ComponentIndustrial>
+      <Plasteel>20</Plasteel>
     </costList>
-    <recipeMaker Inherit="False" IsNull="True" />
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Laser_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
     <verbs>
       <li>
         <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
@@ -129,7 +140,7 @@
       </li>
     </verbs>
     <weaponTags>
-      <li>Wula_Weapon_Init</li>
+      <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
@@ -212,7 +223,7 @@
       <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
         <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
         <damageFalloff>0</damageFalloff>        <!-- 0 for no damage falloff -->
-        <preventFriendlyFire>false</preventFriendlyFire>
+        <preventFriendlyFire>true</preventFriendlyFire>
         <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
         <beamStartOffset>0.5</beamStartOffset>
       </li>
@@ -240,7 +251,7 @@
       <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
         <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
         <damageFalloff>0</damageFalloff>        <!-- 0 for no damage falloff -->
-        <preventFriendlyFire>false</preventFriendlyFire>
+        <preventFriendlyFire>true</preventFriendlyFire>
         <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
         <beamStartOffset>0.5</beamStartOffset>
       </li>
@@ -294,6 +305,86 @@
     </comps>
   </AbilityDef>
 
+  <!-- 机枪 -->
+  <ThingDef ParentName="BaseHumanMakeableGun">
+    <defName>WULA_RW_Sphene_MG</defName>
+    <label>FLm-43"榍石"</label>
+    <description>乌拉帝国的通用机枪，负责在班组中提供如暴雨倾泻的高速连射光束流，产生的高温熔烧效果将融化一切敌人的装甲。</description>
+    <techLevel>Ultra</techLevel>
+    <weaponTags>
+      <li>Wula_Ranged_Weapon_T3</li>
+    </weaponTags>
+    <!-- <techLevel>Spacer</techLevel> -->
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Sphene_MG</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <soundInteract>Interact_ChargeRifle</soundInteract>
+    <recipeMaker>
+      <recipeUsers Inherit="False">
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Ranged_Technology</researchPrerequisite>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <costList Inherit="False">
+      <Steel>350</Steel>
+      <Plasteel>200</Plasteel>
+      <ComponentSpacer>8</ComponentSpacer>
+    </costList>
+    <statBases>
+      <WorkToMake>40000</WorkToMake>
+      <Mass>4.5</Mass>
+      <AccuracyTouch>0.5</AccuracyTouch>
+      <AccuracyShort>0.5</AccuracyShort>
+      <AccuracyMedium>0.5</AccuracyMedium>
+      <AccuracyLong>0.4</AccuracyLong>
+      <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Sphene_MG</defaultProjectile>
+        <warmupTime>0.5</warmupTime>
+        <range>33.9</range>
+        <burstShotCount>32</burstShotCount>
+        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+        <soundCast>Shot_ChargeRifle</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>9</muzzleFlashScale>
+      </li>
+    </verbs>
+    <thingSetMakerTags>
+      <li>RewardStandardQualitySuper</li>
+    </thingSetMakerTags>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Sphene_MG</defName>
+    <label>榍石光束</label>
+    <thingClass>WulaFallenEmpire.Projectile_WulaBeam</thingClass>
+    <graphicData>
+      <texPath>Things/Projectile/ChargeLanceShot</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>BeamBypassShields</damageDef><!-- BeamBypassShields -->
+      <damageAmountBase>5</damageAmountBase>
+      <beamStartOffset>0.5</beamStartOffset>
+      <armorPenetrationBase>1.5</armorPenetrationBase>
+      <stoppingPower>1</stoppingPower>
+    </projectile>
+    <modExtensions>
+      <li Class="WulaFallenEmpire.Wula_BeamPierce_Extension">
+        <maxHits>-1</maxHits>        <!-- -1 for infinite hits -->
+        <damageFalloff>0</damageFalloff>        <!-- 0 for no damage falloff -->
+        <preventFriendlyFire>true</preventFriendlyFire>
+        <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
+        <beamStartOffset>0.5</beamStartOffset>
+      </li>
+    </modExtensions>
+  </ThingDef>
+
   <!-- 暗物质步枪 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_RW_DM_AR</defName>
@@ -395,12 +486,6 @@
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
-    <comps>
-      <li Class="WulaFallenEmpire.CompProperties_Switch">
-        <changeTo>WULA_RW_DM_Cannon</changeTo>
-        <abilityDef>WULA_RW_DM_ARSwitchAbility</abilityDef>
-      </li>
-    </comps>
   </ThingDef>
   <!-- 暗物质炮 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
@@ -508,48 +593,5 @@
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
-    <comps>
-      <li Class="WulaFallenEmpire.CompProperties_Switch">
-        <changeTo>WULA_RW_DM_AR</changeTo>
-        <abilityDef>WULA_RW_DM_ARSwitchAbility</abilityDef>
-      </li>
-    </comps>
   </ThingDef>
-  <AbilityDef>
-    <defName>WULA_RW_DM_ARSwitchAbility</defName>
-    <label>武装解放 / 武装闭锁</label>
-    <description>控制聚能透镜档位，以决定DMa-8"陨硫"/DMc-65"铋晶"是否切换到扫射炮击模式。</description>
-    <cooldownTicksRange>601</cooldownTicksRange>
-    <iconPath>Wula/UI/Abilities/WULA_WeaponSwitchAbility</iconPath>
-    <hostile>false</hostile>
-    <showOnCharacterCard>false</showOnCharacterCard>
-    <aiCanUse>false</aiCanUse>
-    <targetRequired>false</targetRequired>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <statBases>
-      <!-- 如果不需要限时，可以把这玩意删了-->
-      <!--<Ability_Duration>10</Ability_Duration>-->
-    </statBases>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <warmupTime>0</warmupTime>
-      <drawAimPie>false</drawAimPie>
-      <requireLineOfSight>false</requireLineOfSight>
-      <targetable>false</targetable>
-      <targetParams>
-        <canTargetSelf>true</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityEffect">
-        <compClass>WulaFallenEmpire.CompAbilityEffect_Switch</compClass>
-      </li>
-      <!-- 如果不需要限时，可以把这玩意删了-->
-      <!--<li Class="CompProperties_AbilityGiveHediff">
-				<compClass>CompAbilityEffect_GiveHediff</compClass>
-				<hediffDef>WULA_HediffSwitchDuration</hediffDef>
-				<onlyApplyToSelf>True</onlyApplyToSelf>
-			</li>-->
-    </comps>
-  </AbilityDef>
 </Defs>
\ No newline at end of file
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 df4fdd5d..218216d5 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
@@ -45,14 +45,16 @@
         <muzzleFlashScale>7</muzzleFlashScale>
         <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
         <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+        <forcedMissRadius>0.1</forcedMissRadius>
       </li>
     </verbs>
     <costList Inherit="False">
-      <Steel>180</Steel>
-      <ComponentIndustrial>10</ComponentIndustrial>
+      <Steel>60</Steel>
+      <ComponentIndustrial>4</ComponentIndustrial>
+      <Plasteel>20</Plasteel>
     </costList>
     <weaponTags>
-      <li>Wula_Weapon_Init</li>
+      <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
@@ -124,7 +126,7 @@
     </graphicData>
     <projectile>
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>16</damageAmountBase>
+      <damageAmountBase>6</damageAmountBase>
       <explosionRadius>0.9</explosionRadius>
       <soundExplode>Explosion_EMP</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>
@@ -193,10 +195,9 @@
     </weaponClasses>
     <recipeMaker>
       <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_BIO</li>
         <li>WULA_Cube_Productor_Energy</li>
       </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
+      <researchPrerequisite>WULA_Synth_Weapon_2_Plasma_Technology</researchPrerequisite>
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
     <statBases>
@@ -209,8 +210,8 @@
       <RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
-      <Steel>100</Steel>
-      <ComponentIndustrial>5</ComponentIndustrial>
+      <Steel>120</Steel>
+      <ComponentIndustrial>6</ComponentIndustrial>
       <Plasteel>20</Plasteel>
     </costList>
     <verbs>
@@ -227,11 +228,11 @@
         <muzzleFlashScale>9</muzzleFlashScale>
         <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
         <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+        <forcedMissRadius>1.1</forcedMissRadius>
       </li>
     </verbs>
     <weaponTags>
-      <li>Wula_Weapon_Init</li>
-      <li>HomingWeapon</li>
+      <li>Wula_Ranged_Weapon_T2</li>
     </weaponTags>
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
@@ -253,20 +254,13 @@
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.4</drawSize>
     </graphicData>
-    <generateCommonality>1</generateCommonality>
     <soundInteract>Interact_Rifle</soundInteract>
     <weaponClasses>
       <li>LongShots</li>
       <li>RangedHeavy</li>
     </weaponClasses>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_BIO</li>
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
+    <recipeMaker Inherit="False" IsNull="True" />
+    <generateCommonality>0</generateCommonality>
     <statBases>
       <WorkToMake>1500</WorkToMake>
       <Mass>3.0</Mass>
@@ -295,11 +289,11 @@
         <muzzleFlashScale>9</muzzleFlashScale>
         <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
         <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+        <forcedMissRadius>1.1</forcedMissRadius>
       </li>
     </verbs>
     <weaponTags>
       <li>Wula_Weapon_Init</li>
-      <li>HomingWeapon</li>
     </weaponTags>
     <thingSetMakerTags>
       <li>RewardStandardQualitySuper</li>
@@ -323,7 +317,9 @@
     <projectile>
       <!-- 基础伤害和穿透。对于这个投射物，实际伤害由爆炸决定 -->
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>10</damageAmountBase>
+      <damageAmountBase>6</damageAmountBase>
+      <explosionRadius>0.9</explosionRadius>
+      <soundExplode>Explosion_EMP</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>
       <speed>55</speed>
     </projectile>
@@ -333,13 +329,7 @@
         <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
       </li>
       <li Class="WulaFallenEmpire.ShotgunExtension">
-        <pelletCount>2</pelletCount>
-      </li>
-      <!-- 3. 添加爆炸ModExtension -->
-      <li Class="WulaFallenEmpire.ExplosiveTrackingBulletDef">
-        <explosionRadius>0.9</explosionRadius>
-        <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-        <soundExplode>Explosion_EMP</soundExplode>
+        <pelletCount>3</pelletCount>
       </li>
     </modExtensions>
   </ThingDef>
@@ -355,8 +345,8 @@
     </graphicData>
     <projectile>
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>20</damageAmountBase>
-      <explosionRadius>2.1</explosionRadius>
+      <damageAmountBase>16</damageAmountBase>
+      <explosionRadius>2</explosionRadius>
       <soundExplode>Explosion_EMP</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>
       <speed>55</speed>
@@ -471,6 +461,7 @@
         <beamTargetsGround>true</beamTargetsGround>
         <soundAiming>HellsphereCannon_Aiming</soundAiming>
         <canGoWild>false</canGoWild>
+        <forcedMissRadius>1.1</forcedMissRadius>
       </li>
     </verbs>
     <tools>
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 b0dc083e..f2aab01b 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
@@ -64,142 +64,7 @@
       <li>RewardStandardQualitySuper</li>
     </thingSetMakerTags>
   </ThingDef>
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Base_AR</defName>
-    <label>DLa-1"页岩"</label>
-    <description>乌拉帝国的旧式突击步枪，仍然使用落后的导气式结构驱动自动射击构件，通常被派发给炮灰战斗人员。</description>
-    <tickerType>Normal</tickerType>
-    <techLevel>Spacer</techLevel>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Base_AR</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <soundInteract>Interact_Rifle</soundInteract>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_BIO</li>
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <statBases>
-      <WorkToMake>1300</WorkToMake>
-      <!-- <MarketValue>370</MarketValue> -->
-      <Mass>3.5</Mass>
-      <AccuracyTouch>0.75</AccuracyTouch>
-      <AccuracyShort>0.75</AccuracyShort>
-      <AccuracyMedium>0.65</AccuracyMedium>
-      <AccuracyLong>0.45</AccuracyLong>
-      <RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_AssaultRifle</defaultProjectile>
-        <warmupTime>1</warmupTime>
-        <range>25</range>
-        <burstShotCount>4</burstShotCount>
-        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-        <soundCast>Shot_AssaultRifle</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>7</muzzleFlashScale>
-      </li>
-    </verbs>
-    <costList Inherit="False">
-      <Steel>60</Steel>
-      <ComponentIndustrial>8</ComponentIndustrial>
-    </costList>
-    <weaponTags>
-      <li>Wula_Weapon_Init</li>
-    </weaponTags>
-    <thingSetMakerTags>
-      <li>RewardStandardQualitySuper</li>
-    </thingSetMakerTags>
-  </ThingDef>
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Fractal_RF</defName>
-    <label>SLr-14"蓝锥"</label>
-    <description>乌拉帝国的旧式猎枪，使用简易的磁轨结构发射钢针，射速较慢，但是强大的动能使其在击中第一个目标后仍能继续飞行，对路径上的多个敌人造成伤害。</description>
-    <techLevel>Spacer</techLevel>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Fractal_RF</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <!-- <drawSize>1.2</drawSize> -->
-    </graphicData>
-    <!-- <uiIconScale>0.85</uiIconScale> -->
-    <soundInteract>Interact_Rifle</soundInteract>
-    <weaponClasses>
-      <li>LongShots</li>
-      <li>RangedHeavy</li>
-    </weaponClasses>
-    <recipeMaker>
-      <!-- <WorkToMake>60000</WorkToMake> -->
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_BIO</li>
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <statBases>
-      <WorkToMake>1300</WorkToMake>
-      <Mass>3.5</Mass>
-      <AccuracyTouch>0.3</AccuracyTouch>
-      <AccuracyShort>0.8</AccuracyShort>
-      <AccuracyMedium>0.9</AccuracyMedium>
-      <AccuracyLong>0.8</AccuracyLong>
-      <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
-    </statBases>
-    <costList Inherit="False">
-      <Steel>120</Steel>
-      <ComponentIndustrial>6</ComponentIndustrial>
-    </costList>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Fractal_RF</defaultProjectile>
-        <warmupTime>2</warmupTime>
-        <range>38</range>
-        <burstShotCount>1</burstShotCount>
-        <soundCast>Shot_ChargeBlaster</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>9</muzzleFlashScale>
-      </li>
-    </verbs>
-    <weaponTags>
-      <li>Wula_Weapon_Init</li>
-    </weaponTags>
-    <thingSetMakerTags><li>RewardStandardQualitySuper</li></thingSetMakerTags>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Fractal_RF</defName>
-    <label>蓝锥钢针弹</label>
-    <thingClass>WulaFallenEmpire.Projectile_WulaLineAttack</thingClass>
-    <modExtensions>
-      <li Class="WulaFallenEmpire.Wula_PathPierce_Extension">
-        <maxHits>-1</maxHits>        <!-- 无限穿透 -->
-        <damageFalloff>0</damageFalloff>        <!-- 无伤害衰减 -->
-        <preventFriendlyFire>false</preventFriendlyFire>        <!-- 是否阻止友方火力 -->
-        <tailFleckDef>WULA_GunTail_Lighting</tailFleckDef> <!-- 拖尾特效定义 -->
-      </li>
-    </modExtensions>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-      <drawSize>1.4</drawSize>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <damageAmountBase>25</damageAmountBase>
-      <speed>130</speed>
-      <armorPenetrationBase>0.5</armorPenetrationBase>
-      <stoppingPower>5</stoppingPower>
-    </projectile>
-  </ThingDef>
+  
   <ThingDef ParentName="BaseMeleeWeapon_Blunt_Quality">
     <defName>WULA_MW_Constructor_Hammer</defName>
     <label>HAm-1"装修锤"</label>
@@ -617,154 +482,6 @@
     </thingSetMakerTags>
   </ThingDef>
 
-  <!-- 乌拉帝国霰弹枪 -->
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_StarDrift_SG</defName>
-    <label>DCs-7"黑曜石"</label>
-    <description>乌拉帝国配发的近距离霰弹枪，以威力巨大的梭镖破甲弹为核心，专注于在短距离上的快速反应战斗和持续性压制能力</description>
-    <techLevel>Ultra</techLevel>
-    <weaponTags>
-      <li>Wula_Ranged_Weapon_T2</li>
-    </weaponTags>
-    <!-- <techLevel>Spacer</techLevel> -->
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_StarDrift_SG</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <soundInteract>Interact_ChargeRifle</soundInteract>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_2_Ranged_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <statBases>
-      <WorkToMake>25000</WorkToMake>
-      <Mass>3.5</Mass>
-      <AccuracyTouch>1</AccuracyTouch>
-      <AccuracyShort>0.9</AccuracyShort>
-      <AccuracyMedium>0.5</AccuracyMedium>
-      <AccuracyLong>0.25</AccuracyLong>
-      <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
-    </statBases>
-    <costList Inherit="False">
-      <Steel>120</Steel>
-      <Plasteel>50</Plasteel>
-      <ComponentSpacer>4</ComponentSpacer>
-    </costList>
-    <verbs>
-      <li>
-        <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>WULA_Bullet_StarDrift_Shotgun_Spear</defaultProjectile>
-        <warmupTime>0.2</warmupTime>
-        <range>18</range>
-        <burstShotCount>3</burstShotCount>
-        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
-        <soundCast>Shot_BeamRepeater</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>7</muzzleFlashScale>
-      </li>
-    </verbs>
-    <thingSetMakerTags>
-      <li>RewardStandardQualitySuper</li>
-    </thingSetMakerTags>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>WULA_Bullet_StarDrift_Shotgun_Spear</defName>
-    <label>梭镖</label>
-    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile>
-      <damageDef>Bullet</damageDef>
-      <damageAmountBase>8</damageAmountBase>
-      <stoppingPower>2.5</stoppingPower>
-      <armorPenetrationBase>0.65</armorPenetrationBase>
-      <speed>55</speed>
-    </projectile>
-    <modExtensions>
-			<li Class="WulaFallenEmpire.ShotgunExtension">
-				<pelletCount>3</pelletCount>
-			</li>
-		</modExtensions>
-  </ThingDef>
-
-  <!-- 机枪 -->
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Sphene_MG</defName>
-    <label>FLm-43"榍石"</label>
-    <description>乌拉帝国的通用机枪，负责在班组中提供如暴雨倾泻的高速连射光束流，产生的高温熔烧效果将融化一切敌人的装甲。</description>
-    <techLevel>Ultra</techLevel>
-    <weaponTags>
-      <li>Wula_Ranged_Weapon_T2</li>
-    </weaponTags>
-    <!-- <techLevel>Spacer</techLevel> -->
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Sphene_MG</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <soundInteract>Interact_ChargeRifle</soundInteract>
-    <recipeMaker>
-      <recipeUsers Inherit="False">
-        <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_2_Ranged_Technology</researchPrerequisite>
-      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
-    </recipeMaker>
-    <costList Inherit="False">
-      <Steel>350</Steel>
-      <Plasteel>200</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
-    <statBases>
-      <WorkToMake>40000</WorkToMake>
-      <Mass>4.5</Mass>
-      <AccuracyTouch>0.5</AccuracyTouch>
-      <AccuracyShort>0.5</AccuracyShort>
-      <AccuracyMedium>0.5</AccuracyMedium>
-      <AccuracyLong>0.4</AccuracyLong>
-      <RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_WULA_RW_Sphene_MG</defaultProjectile>
-        <warmupTime>0.5</warmupTime>
-        <range>33.9</range>
-        <burstShotCount>32</burstShotCount>
-        <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-        <soundCast>Shot_ChargeRifle</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>9</muzzleFlashScale>
-      </li>
-    </verbs>
-    <thingSetMakerTags>
-      <li>RewardStandardQualitySuper</li>
-    </thingSetMakerTags>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_WULA_RW_Sphene_MG</defName>
-    <label>榍石光束</label>
-    <thingClass>Beam</thingClass>
-    <graphicData>
-      <texPath>Things/Projectile/ChargeLanceShot</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile>
-      <damageDef>Beam</damageDef><!-- BeamBypassShields -->
-      <damageAmountBase>5</damageAmountBase>
-      <beamStartOffset>0.5</beamStartOffset>
-      <armorPenetrationBase>1.5</armorPenetrationBase>
-      <stoppingPower>1</stoppingPower>
-      <beamMoteDef>Mote_WULA_RW_Penetrating_Beam</beamMoteDef>
-    </projectile>
-  </ThingDef>
-
-
   <!-- 自动炮 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_RW_AutoCannon</defName>
@@ -937,7 +654,6 @@
     </projectile>
   </ThingDef>
 
-  
   <!-- 铳枪 -->
   <ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
     <defName>WULA_MW_Lance</defName>