From 4568282f83116462937b52a8c9b2b38ab7155c9f Mon Sep 17 00:00:00 2001
From: Tourswen <565033799@qq.com>
Date: Fri, 22 Aug 2025 17:30:31 +0800
Subject: [PATCH] 2025-8-22

---
 .../Weapons/WULA_FE_Materialist_Weapon.xml    | 128 ++++------------
 .../Races_Wulaspecies_FE_Materialist.xml      | 142 ++++--------------
 2 files changed, 56 insertions(+), 214 deletions(-)

diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml
index 69b23132..2cc40113 100644
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml
@@ -3,42 +3,48 @@
   <ThingDef ParentName="BaseHumanMakeableGun">
     <defName>WULA_WM_Alpha_Wolf_Plasma_Gun</defName>
     <label>PMe-92"磷灰"</label>
-    <description>搭载于SNm-6"狼王"机甲的高能等离子武器，射程较短，但是所使用的等离子射弹能够在出膛后散射，引起大范围的熔融爆炸并毁灭成群敌军。</description>
+    <description>搭载于SNm-6"狼王"机甲的高能等离子武器，所使用的等离子射弹虽然弹速较慢，但是能引起大范围的熔融爆炸并毁灭成群敌军。</description>
     <techLevel>Archotech</techLevel>
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Alpha_Wolf_Plasma_Gun</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.4</drawSize>
+      <drawSize>2</drawSize>
     </graphicData>
+    <uiIconScale>0.5</uiIconScale>
     <soundInteract>Interact_ChargeRifle</soundInteract> <!-- Placeholder, needs a proper sound -->
     <recipeMaker Inherit="False" />
     <statBases>
-      <WorkToMake>2000</WorkToMake>
-      <Mass>5.0</Mass>
+      <WorkToMake>200000</WorkToMake>
+      <Mass>100</Mass>
       <AccuracyTouch>0.5</AccuracyTouch>
       <AccuracyShort>0.4</AccuracyShort>
       <AccuracyMedium>0.3</AccuracyMedium>
       <AccuracyLong>0.3</AccuracyLong>
-      <RangedWeapon_Cooldown>3.0</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
     </statBases>
     <costList Inherit="False">
-      <Steel>150</Steel>
-      <ComponentIndustrial>8</ComponentIndustrial>
-      <Plasteel>30</Plasteel>
-      <Uranium>10</Uranium>
+      <Steel>1500</Steel>
+      <ComponentIndustrial>600</ComponentIndustrial>
+      <Plasteel>300</Plasteel>
+      <Uranium>100</Uranium>
     </costList>
     <verbs>
       <li>
         <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <defaultProjectile>Bullet_WULA_WM_Alpha_Wolf_Plasma_Gun</defaultProjectile>
-        <warmupTime>1</warmupTime>
-        <range>18</range>
-        <burstShotCount>4</burstShotCount>
-        <ticksBetweenBurstShots>3</ticksBetweenBurstShots>
+        <warmupTime>6</warmupTime>
+        <range>500</range>
+        <minRange>8</minRange>
+        <burstShotCount>48</burstShotCount>
+        <ticksBetweenBurstShots>2</ticksBetweenBurstShots>
         <soundCast>ChargeLance_Fire</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
         <muzzleFlashScale>7</muzzleFlashScale>
+        <requireLineOfSight>false</requireLineOfSight>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+        </targetParams>
       </li>
     </verbs>
     <weaponTags>
@@ -53,20 +59,21 @@
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>MoteGlow</shaderType>
       <color>(61,199,157,202)</color>
-      <drawSize>(1.5,2)</drawSize>
+      <drawSize>(3,4)</drawSize>
     </graphicData>
     <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
     <!-- <thingClass>WulaFallenEmpire.Projectile_ExplosiveTrackingBullet</thingClass> -->
     <projectile>
-      <speed>30</speed>
+      <speed>25</speed>
       <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
-      <damageAmountBase>50</damageAmountBase>
+      <damageAmountBase>40</damageAmountBase>
       <armorPenetrationBase>0.7</armorPenetrationBase>
       <stoppingPower>2.0</stoppingPower>
       <explosionRadius>2.5</explosionRadius>
       <soundExplode>Explosion_EMP</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>
       <screenShakeFactor>0.5</screenShakeFactor>
+      <flyOverhead>true</flyOverhead>
     </projectile>
     <modExtensions>
       <!-- <li Class="WulaFallenEmpire.ExplosiveTrackingBulletDef">
@@ -93,91 +100,10 @@
     </modExtensions>
   </ThingDef>
 
-  <ThingDef ParentName="BaseHumanMakeableGun">
-    <defName>WULA_RW_Unlimit_Penetrating_Beam_Cannon</defName>
-    <label>XXx-00 "贯杀炮"</label>
-    <description>
-      乌拉帝国军械部在黄金时期所设计的暗物质武器，时至今日仍未被确认其实际代号。这种武器装填缓慢、体积巨大，只能由最庞大的机械体所配备，所发射的切割束几乎可以贯穿战场，并抹除落点上所有的敌人。</description>
-    <techLevel>Archotech</techLevel>
-    <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Fractal_RF</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <soundInteract>Interact_Rifle</soundInteract>
-    <statBases>
-      <Mass>200</Mass>
-      <AccuracyTouch>1</AccuracyTouch>
-      <AccuracyShort>1</AccuracyShort>
-      <AccuracyMedium>1</AccuracyMedium>
-      <AccuracyLong>1</AccuracyLong>
-      <RangedWeapon_Cooldown>16</RangedWeapon_Cooldown>
-    </statBases>
-    <recipeMaker Inherit="False" IsNull="True" />
-    <verbs>
-      <li Class="WulaFallenEmpire.VerbPropertiesExplosiveBeam">
-        <verbClass>WulaFallenEmpire.Verb_ShootBeamExplosive</verbClass>
-
-        <!-- 基础射线参数 -->
-        <hasStandardCommand>true</hasStandardCommand>
-        <warmupTime>1</warmupTime>
-        <range>500</range>
-        <burstShotCount>3</burstShotCount>
-        <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-        <beamDamageDef>Wula_Dark_Matter_Beam_Huge</beamDamageDef>
-
-        <!-- 消除射线偏移的参数 -->
-        <beamFullWidthRange>1000</beamFullWidthRange>
-        <beamWidth>-1</beamWidth>
-        <beamMaxDeviation>0</beamMaxDeviation>
-        <beamCurvature>0</beamCurvature>
-        <beamStartOffset>0</beamStartOffset>
-
-        <!-- 视觉和音效 -->
-        <muzzleFlashScale>0</muzzleFlashScale>
-        <soundCastBeam>BeamGraser_Shooting</soundCastBeam>
-        <beamGroundFleckDef>Fleck_BeamBurn</beamGroundFleckDef>
-        <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
-        <beamMoteDef>Mote_Wula_Dark_Matter_Beam</beamMoteDef>
-        <beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
-
-        <screenShakeFactor>0.35</screenShakeFactor>
-
-        <!-- 火焰效果 -->
-        <beamChanceToStartFire>0.6</beamChanceToStartFire>
-        <beamChanceToAttachFire>0.6</beamChanceToAttachFire>
-        <beamFireSizeRange>0.25</beamFireSizeRange>
-
-        <!-- 其他射线属性 -->
-        <beamHitsNeighborCells>true</beamHitsNeighborCells>
-        <beamLineFleckChanceCurve>
-          <points>
-            <li>(0, 0)</li>
-            <li>(0.65, 0.4)</li>
-            <li>(1, 0.75)</li>
-          </points>
-        </beamLineFleckChanceCurve>
-
-        <!-- 攻击目标设置 -->
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-
-        <!-- 每发都爆炸 -->
-        <enableExplosion>true</enableExplosion>
-        <explosionShotInterval>3</explosionShotInterval>
-        <explosionRadius>8</explosionRadius>
-        <explosionDamageDef>Wula_Dark_Matter_Flame</explosionDamageDef>
-        <explosionDamage>200</explosionDamage>
-        <explosionSound>Explosion_Bomb</explosionSound>
-        <chanceToStartFire>1</chanceToStartFire>
-      </li>
-    </verbs>
-  </ThingDef>
-
   <ThingDef ParentName="BaseWeaponTurret">
     <defName>WULA_Alpha_Wolf_Turret</defName>
     <label>魔眼</label>
-    <description>乌拉帝国图书馆大型机械体的眼部，除了提供视觉传感外还搭载了强大的暗物质射流炮，可以在近距离上释放恐怖的力量融化敌人</description>
+    <description>乌拉帝国图书馆大型机械体的眼部，除了提供视觉传感外还搭载了强大的暗物质射流炮，可以通过扫射战场释放恐怖的力量融化敌人</description>
     <tradeability>None</tradeability>
     <destroyOnDrop>true</destroyOnDrop>
     <graphicData>
@@ -197,7 +123,7 @@
 
         <!-- 基础射线参数 -->
         <hasStandardCommand>true</hasStandardCommand>
-        <range>8</range>
+        <range>30</range>
         <burstShotCount>12</burstShotCount>
         <defaultCooldownTime>6</defaultCooldownTime>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
@@ -259,7 +185,7 @@
   <ThingDef ParentName="BaseWeaponTurret">
     <defName>WULA_MechFlyerTurretGun</defName>
     <label>磁力光束</label>
-    <description>乌拉小镰的内置炮塔。</description>
+    <description>一种可以窃取他人武器的内置炮塔。</description>
     <tradeability>None</tradeability>
     <destroyOnDrop>true</destroyOnDrop>
     <graphicData>
@@ -301,7 +227,7 @@
         <soundCastBeam>BeamGraser_Shooting</soundCastBeam>
         <beamGroundFleckDef>Fleck_BeamBurn</beamGroundFleckDef>
         <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
-        <beamMoteDef>Mote_Wula_Dark_Magnetic_Beam</beamMoteDef>
+        <beamMoteDef>Mote_Wula_Magnetic_Beam</beamMoteDef>
         <beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
 
         <screenShakeFactor>0.35</screenShakeFactor>
diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml
index bd4300e2..4613d90d 100644
--- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml
+++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <ThingDef ParentName="SuperHeavyMechanoid">
-    <defName>WULA_Superme_Commander</defName>
-    <label>HNm-99"至高"</label>
-    <description>乌拉帝国图书馆所制造的超重型指挥官机械体，除了装备一门射程无限的贯杀炮外，还拥有在战场上作为工厂生产次级机械体部队的能力，这些生产出来的分队长机械体还能继续生产更小型的机械体，从而以单机之力创造一支机械部队。</description>
+  <ThingDef ParentName="HeavyMechanoid">
+    <defName>WULA_Alpha_Wolf</defName> <!-- 修改了defName以避免冲突 -->
+    <label>SNm-6"狼蛛"</label>
+    <description>乌拉帝国图书馆所使用的一种炮兵机械体，会在前线上制造小型机械体以辅助战斗。它装备着一门重型等离子炮，可以在极远距离上喷射覆盖性的等离子射弹以摧毁成片敌军。</description>
     <statBases>
+      <BandwidthCost>8</BandwidthCost>
       <MoveSpeed>3</MoveSpeed>
       <MeleeDoorDamageFactor>1.5</MeleeDoorDamageFactor>
+      <EnergyShieldEnergyMax>5</EnergyShieldEnergyMax>
     </statBases>
     <race>
       <body>Mech_Warqueen</body>
@@ -20,7 +22,8 @@
           <soundCall>Pawn_Mech_Warqueen_Call</soundCall>
         </li>
       </lifeStageAges>
-      <baseHealthScale>5.2</baseHealthScale>
+      <baseHealthScale>10</baseHealthScale>
+      <!-- <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant> -->
     </race>
     <tools>
       <li>
@@ -36,101 +39,8 @@
       </li>
     </tools>
     <comps>
-      <!-- 这里是我们修改的核心部分 -->
-      <li Class="WulaFallenEmpire.CompProperties_AutoMechCarrier">
-        <freeProduction>false</freeProduction> <!-- 改为消耗资源以测试独立成本 -->
-        <disableHediff>WULA_MechCarrierSwitchHediff</disableHediff>
-        <fixedIngredient>Steel</fixedIngredient>
-        <maxIngredientCount>500</maxIngredientCount> <!-- 定义最大资源容量 -->
-        <startingIngredientCount>500</startingIngredientCount> <!-- 定义初始资源数量 -->
-        <costPerPawn>999</costPerPawn> <!-- 设置一个很高的全局默认成本，以确保独立成本生效 -->
-        <cooldownTicks>9999</cooldownTicks> <!-- 设置一个很高的全局默认冷却，以确保独立冷却生效 -->
-        <productionQueue>
-          <li>
-            <pawnKind>WULA_Alpha_Wolf</pawnKind>
-            <count>3</count>
-            <cooldownTicks>600</cooldownTicks> <!-- 独立冷却: 10秒 -->
-            <cost>10</cost> <!-- 独立成本: 10 钢铁 -->
-          </li>
-          <!-- <li>
-            <pawnKind>Mech_Lancer</pawnKind>
-            <count>1</count>
-            <cooldownTicks>1200</cooldownTicks>
-            <cost>25</cost>
-          </li> -->
-        </productionQueue>
-        <spawnEffecter>WarqueenWarUrchinsSpawned</spawnEffecter>
-        <spawnedMechEffecter>WarUrchinSpawned</spawnedMechEffecter>
-      </li>
-    </comps>
-  </ThingDef>
-  <PawnKindDef ParentName="HeavyMechanoidKind">
-    <defName>WULA_Superme_Commander</defName> <!-- 修改了defName以避免冲突 -->
-    <label>HNm-99"至高"</label>
-    <race>WULA_Superme_Commander</race>
-    <combatPower>600</combatPower>
-    <allowInMechClusters>false</allowInMechClusters>
-    <defaultFactionType>PlayerColony</defaultFactionType>
-    <abilities>
-      <li>WULA_GiveSwitchHediff</li>   <!-- 添加“停止生产”技能 -->
-      <li>WULA_RemoveSwitchHediff</li> <!-- 保留“恢复生产”技能 -->
-    </abilities>
-    <lifeStages>
-      <li>
-        <bodyGraphicData>
-          <texPath>Things/Pawn/Mechanoid/Warqueen</texPath>
-          <maskPath>Things/Pawn/Mechanoid/AllegianceOverlays/MechWarqueen</maskPath>
-          <shaderType>CutoutWithOverlay</shaderType>
-          <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>3</drawSize>
-          <shadowData>
-            <volume>(0.7, 0.8, 0.7)</volume>
-          </shadowData>
-        </bodyGraphicData>
-      </li>
-    </lifeStages>
-    <controlGroupPortraitZoom>0.7</controlGroupPortraitZoom>  
-  </PawnKindDef>
-
-  <ThingDef ParentName="HeavyMechanoid">
-    <defName>WULA_Alpha_Wolf</defName> <!-- 修改了defName以避免冲突 -->
-    <label>SNm-6"狼王"</label>
-    <description>乌拉帝国图书馆所使用的一种机械体，它通常会由更高一级的指挥官机械体制造，并在前线上制造小型机械体。它装备着一门等离子炮，可以在较近的距离上喷射覆盖性的等离子射弹，以摧毁成片敌军。</description>
-    <statBases>
-      <BandwidthCost>0</BandwidthCost>
-      <MoveSpeed>4.2</MoveSpeed>
-      <MeleeDoorDamageFactor>1.5</MeleeDoorDamageFactor>
-    </statBases>
-    <race>
-      <body>Mech_Warqueen</body>
-      <baseBodySize>5</baseBodySize>
-      <lifeStageAges>
-        <li>
-          <def>MechanoidFullyFormed</def>
-          <minAge>0</minAge>
-          <soundWounded>Pawn_Mech_Warqueen_Wounded</soundWounded>
-          <soundDeath>Pawn_Mech_Warqueen_Death</soundDeath>
-          <soundCall>Pawn_Mech_Warqueen_Call</soundCall>
-        </li>
-      </lifeStageAges>
-      <baseHealthScale>3.5</baseHealthScale>
-      <thinkTreeConstant>WarUrchinConstant</thinkTreeConstant>
-    </race>
-    <tools>
-      <li>
-        <label>head</label>
-        <capacities>
-          <li>Blunt</li>
-        </capacities>
-        <power>4</power>
-        <cooldownTime>2</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-        <chanceFactor>0.2</chanceFactor>
-      </li>
-    </tools>
-    <comps Inherit="False">
-      <!-- 这里是我们修改的核心部分 -->
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
       <li Class="WulaFallenEmpire.CompProperties_AutoMechCarrier">
         <freeProduction>true</freeProduction> <!-- 改为消耗资源以测试独立成本 -->
         <disableHediff>WULA_MechCarrierSwitchHediff</disableHediff>
@@ -142,16 +52,14 @@
         <productionQueue>
           <li>
             <pawnKind>WULA_Mech_Flyer</pawnKind>
-            <count>5</count>
-            <cooldownTicks>600</cooldownTicks> <!-- 独立冷却: 10秒 -->
-            <cost>10</cost> <!-- 独立成本: 10 钢铁 -->
+            <count>4</count>
+            <cooldownTicks>100</cooldownTicks> <!-- 独立冷却: 10秒 -->
+          </li>
+          <li>
+            <pawnKind>WULA_Mech_Flyer</pawnKind>
+            <count>4</count>
+            <cooldownTicks>600</cooldownTicks> <!-- 独立冷却: 10秒 -->
           </li>
-          <!-- <li>
-            <pawnKind>Mech_Lancer</pawnKind>
-            <count>1</count>
-            <cooldownTicks>1200</cooldownTicks>
-            <cost>25</cost>
-          </li> -->
         </productionQueue>
         <spawnEffecter>WarqueenWarUrchinsSpawned</spawnEffecter>
         <spawnedMechEffecter>WarUrchinSpawned</spawnedMechEffecter>
@@ -181,9 +89,14 @@
           </li>
         </renderNodeProperties>
       </li>
-      <!-- <li Class="CompProperties_MechPowerCell">
-        <totalPowerTicks>15000</totalPowerTicks>
-      </li> -->
+      <li Class="CompProperties_Shield">
+        <startingTicksToReset>36000</startingTicksToReset><!-- 10 mins -->
+        <minDrawSize>3.5</minDrawSize>
+        <maxDrawSize>3.8</maxDrawSize>
+        <energyLossPerDamage>0.01</energyLossPerDamage>
+        <energyOnReset>4.0</energyOnReset>
+        <blocksRangedWeapons>false</blocksRangedWeapons>
+      </li>
     </comps>
   </ThingDef>
   <PawnKindDef ParentName="HeavyMechanoidKind">
@@ -206,7 +119,10 @@
           <maskPath>Wula/Things/WULA_Cat/AllegianceOverlays/None</maskPath>
           <shaderType>CutoutWithOverlay</shaderType>
           <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>2.5</drawSize>
+          <drawSize>3.5</drawSize>
+          <shadowData>
+            <volume>(0.4, 0.8, 0.4)</volume>
+          </shadowData>
         </bodyGraphicData>
       </li>
     </lifeStages>