2025-8-28

2025-08-28 17:25:14 +08:00
parent fcc30bad3e
commit 411d6f183a
12 changed files with 127 additions and 71 deletions
--- 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
@@ -352,7 +352,7 @@
      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>MoteGlow</shaderType>
-      <color>(61,199,157,202)</color>
+      <!-- <color>(61,199,157,202)</color> -->
      <drawSize>(3,4)</drawSize>
    </graphicData>
    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
--- 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
@@ -118,14 +118,14 @@
    <defName>Bullet_WULA_RW_Plasma_AR</defName>
    <label>磷叶等离子体射弹</label>
    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
+      <texPath>Wula/Projectile/WULA_Bullet_Plasma_Yellow</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>MoteGlow</shaderType>
-      <color>(61,199,157,202)</color>
+      <!-- <color>(61,199,157,202)</color> -->
      <drawSize>(0.75,1)</drawSize>
    </graphicData>
    <projectile>
-      <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
+      <damageDef>Damage_WULA_Plasma</damageDef>
      <damageAmountBase>6</damageAmountBase>
      <explosionRadius>0.9</explosionRadius>
      <soundExplode>Explosion_EMP</soundExplode>
@@ -135,7 +135,7 @@
    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
    <modExtensions>
      <li Class="WulaFallenEmpire.TrackingBulletDef">
-        <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
+        <tailFleckDef>WULA_GunTail_Plasma_Yellow</tailFleckDef>
      </li>
    </modExtensions>
  </ThingDef>
@@ -180,7 +180,7 @@
  <ThingDef ParentName="BaseHumanMakeableGun">
    <defName>WULA_RW_Plasma_Homing_AR</defName>
    <label>PMr-88"三叶"</label>
-    <description>乌拉帝国的旧式多用途突击步枪，搭载了一套用于发射等离子体的谐振器，可以射出高精度的等离子体，这种改型可以发射制导等离子体。</description>
+    <description>乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。</description>
    <techLevel>Spacer</techLevel>
    <graphicData>
      <texPath>Wula/Weapon/WULA_RW_Plasma_AR</texPath>
@@ -200,6 +200,9 @@
      <researchPrerequisite>WULA_Synth_Weapon_2_Plasma_Technology</researchPrerequisite>
      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
    </recipeMaker>
+    <researchPrerequisites>
+      <li>WULA_Adv_WorkTable_Technology</li>
+    </researchPrerequisites>
    <statBases>
      <WorkToMake>1500</WorkToMake>
      <Mass>3.0</Mass>
@@ -247,7 +250,7 @@
  <ThingDef ParentName="BaseHumanMakeableGun">
    <defName>WULA_RW_Plasma_Homing_AR_Ex</defName>
    <label>PMr-88"三叶"(超频)</label>
-    <description>乌拉帝国的旧式多用途突击步枪，搭载了一套用于发射等离子体的谐振器，可以射出高精度的等离子体，这种模式放弃制导功能发射充能等离子体。</description>
+    <description>乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。</description>
    <techLevel>Spacer</techLevel>
    <graphicData>
      <texPath>Wula/Weapon/WULA_RW_Plasma_AR</texPath>
@@ -281,7 +284,7 @@
        <hasStandardCommand>true</hasStandardCommand>
        <defaultProjectile>Bullet_WULA_RW_Plasma_Homing_AR_Ex</defaultProjectile>
        <warmupTime>2.0</warmupTime>
-        <range>28</range>
+        <range>12</range>
        <burstShotCount>3</burstShotCount>
        <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
        <soundCast>ChargeLance_Fire</soundCast>
@@ -300,7 +303,7 @@
    </thingSetMakerTags>
    <comps>
      <li Class="WulaFallenEmpire.CompProperties_Switch">
-        <changeTo>Bullet_WULA_RW_Plasma_Homing_AR</changeTo>
+        <changeTo>WULA_RW_Plasma_Homing_AR</changeTo>
        <abilityDef>WULA_RW_Plasma_Homing_AR_WeaponSwitchAbility</abilityDef>
      </li>
    </comps>
@@ -309,14 +312,14 @@
    <defName>Bullet_WULA_RW_Plasma_Homing_AR</defName>
    <label>磷叶等离子体射弹</label>
    <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
+      <texPath>Wula/Projectile/WULA_Bullet_Plasma_Yellow</texPath>
      <graphicClass>Graphic_Single</graphicClass>
-      <color>(61,199,157,202)</color>
+      <!-- <color>(61,199,157,202)</color> -->
      <drawSize>(0.75,1)</drawSize>
    </graphicData>
    <projectile>
      <!-- 基础伤害和穿透。对于这个投射物，实际伤害由爆炸决定 -->
-      <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
+      <damageDef>Damage_WULA_Plasma</damageDef>
      <damageAmountBase>6</damageAmountBase>
      <explosionRadius>0.9</explosionRadius>
      <soundExplode>Explosion_EMP</soundExplode>
@@ -326,7 +329,7 @@
    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
    <modExtensions>
      <li Class="WulaFallenEmpire.TrackingBulletDef">
-        <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
+        <tailFleckDef>WULA_GunTail_Plasma_Yellow</tailFleckDef>
      </li>
      <li Class="WulaFallenEmpire.ShotgunExtension">
        <pelletCount>3</pelletCount>
@@ -340,8 +343,8 @@
      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>MoteGlow</shaderType>
-      <color>(61,199,157,202)</color>
-      <drawSize>(1,1)</drawSize>
+      <!-- <color>(61,199,157,202)</color> -->
+      <drawSize>(2,1.5)</drawSize>
    </graphicData>
    <projectile>
      <damageDef>Damage_WULA_Plasma_Explosive</damageDef>
@@ -489,7 +492,7 @@
      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>MoteGlow</shaderType>
-      <color>(61,199,157,202)</color>
+      <!-- <color>(61,199,157,202)</color> -->
      <drawSize>(3,4)</drawSize>
    </graphicData>
    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>
--- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
+++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml
@@ -940,42 +940,33 @@

  
  <!-- 萨克森装备 -->
-  <ThingDef ParentName="BaseGun">
+  <ThingDef ParentName="BaseWeaponTurret">
    <defName>WULA_WM_Panzer_Turret</defName>
    <label>ATt-6"金红石"</label>
    <description>由乌拉帝国的"萨克森"战车所装备的战车炮塔，可以从极远距离上精准地点杀高价值目标。</description>
+    <tradeability>None</tradeability>
+    <destroyOnDrop>true</destroyOnDrop>
    <techLevel>Ultra</techLevel>
-    <relicChance>0</relicChance>
    <graphicData>
      <texPath>Wula/Weapon/WULA_WM_Panzer_Turret</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <drawSize>2</drawSize>
    </graphicData>
-    <tradeability>None</tradeability>
    <uiIconScale>0.5</uiIconScale>
    <statBases>
-      <WorkToMake>20000</WorkToMake>
      <Mass>150</Mass>
      <AccuracyTouch>1</AccuracyTouch>
      <AccuracyShort>2</AccuracyShort>
      <AccuracyMedium>2</AccuracyMedium>
      <AccuracyLong>2</AccuracyLong>
-      <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
    </statBases>
-    <costList Inherit="False">
-      <Steel>500</Steel>
-      <Plasteel>100</Plasteel>
-      <ComponentIndustrial>6</ComponentIndustrial>
-    </costList>
-    <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_AT_Weapon</li>
-    </weaponTags>
    <verbs>
      <li>
        <verbClass>Verb_Shoot</verbClass>
        <hasStandardCommand>true</hasStandardCommand>
        <defaultProjectile>Bullet_WULA_WM_Panzer_Turret</defaultProjectile>
        <warmupTime>0</warmupTime>
+        <defaultCooldownTime>4</defaultCooldownTime>
        <minRange>5.9</minRange>
        <range>75</range>
        <burstShotCount>1</burstShotCount>
@@ -1009,43 +1000,46 @@
      <armorPenetrationBase>1</armorPenetrationBase>
    </projectile>
  </ThingDef>
-  <ThingDef Name="WULA_WM_Panzer_Autocannon" ParentName="BaseGun">
+  <ThingDef Name="WULA_WM_Panzer_Autocannon" ParentName="BaseWeaponTurret">
    <defName>WULA_WM_Panzer_Autocannon</defName>
    <label>SRc-15"辉锑"</label>
    <description>由乌拉帝国的"萨克森"战车所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标，并且外挂了两具PRr-34"石英"火箭发射器，用于对抗集群冲击。</description>
+    <tradeability>None</tradeability>
+    <destroyOnDrop>true</destroyOnDrop>
    <techLevel>Ultra</techLevel>
-    <relicChance>0</relicChance>
    <graphicData>
      <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <drawSize>2</drawSize>
    </graphicData>
    <uiIconScale>0.5</uiIconScale>
-    <tradeability>None</tradeability>
    <statBases>
-      <WorkToMake>40000</WorkToMake>
      <Mass>150</Mass>
      <AccuracyTouch>0.5</AccuracyTouch>
      <AccuracyShort>0.5</AccuracyShort>
      <AccuracyMedium>0.4</AccuracyMedium>
      <AccuracyLong>0.35</AccuracyLong>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
    </statBases>
-    <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
-    </weaponTags>
-    <costList Inherit="False">
-      <Steel>500</Steel>
-      <Plasteel>150</Plasteel>
-      <ComponentSpacer>8</ComponentSpacer>
-    </costList>
    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_WM_Panzer_Turret</defaultProjectile>
+        <defaultCooldownTime>4</defaultCooldownTime>
+        <minRange>5.9</minRange>
+        <range>75</range>
+        <burstShotCount>1</burstShotCount>
+        <forcedMissRadius>0.1</forcedMissRadius>
+        <soundCast>Shot_TurretSniper</soundCast>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <muzzleFlashScale>18</muzzleFlashScale>
+      </li>
      <li>
        <verbClass>Verb_Shoot</verbClass>
        <hasStandardCommand>true</hasStandardCommand>
        <defaultProjectile>Bullet_WULA_WM_Panzer_Autocannon</defaultProjectile>
-        <warmupTime>0.25</warmupTime>
        <range>36</range>
+        <defaultCooldownTime>1.5</defaultCooldownTime>
        <burstShotCount>10</burstShotCount>
        <forcedMissRadius>0.35</forcedMissRadius>
        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
@@ -1059,18 +1053,6 @@
        </targetParams>
      </li>
    </verbs>
-
-    <comps Inherit="False">
-      <li Class="CompProperties_EquippableAbilityReloadable">
-        <abilityDef>WULA_WM_Panzer_Autocannon_Ability</abilityDef>
-        <!-- <maxCharges>2</maxCharges> -->
-        <soundReload>AnomalyAbilityWarmup</soundReload>
-        <chargeNoun>火箭弹</chargeNoun>
-        <!-- <ammoDef>WULA_Soul_Wedge</ammoDef> -->
-        <!-- <ammoCountPerCharge>20</ammoCountPerCharge> -->
-        <baseReloadTicks>60</baseReloadTicks>
-      </li>
-    </comps>
  </ThingDef>
  <ThingDef Name="Bullet_WULA_WM_Panzer_Autocannon" ParentName="BaseBullet">
    <defName>Bullet_WULA_WM_Panzer_Autocannon</defName>
@@ -1095,7 +1077,6 @@
      <screenShakeFactor>0.1</screenShakeFactor>
    </projectile>
  </ThingDef>
-  
  <AbilityDef>
    <defName>WULA_WM_Panzer_Autocannon_Ability</defName>
    <label>PRr-34"石英"</label>
@@ -1224,7 +1205,7 @@
      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <shaderType>MoteGlow</shaderType>
-      <color>(61,199,157,202)</color>
+      <!-- <color>(61,199,157,202)</color> -->
      <drawSize>(3,4)</drawSize>
    </graphicData>
    <thingClass>WulaFallenEmpire.Projectile_ExplosiveWithTrail</thingClass>