2025-8-28

1.6/1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -157,7 +157,7 @@
     <armorCategory>Heat</armorCategory>
     <!-- <harmsHealth>false</harmsHealth> -->
     <impactSoundType>Electric</impactSoundType>
-    <defaultDamage>50</defaultDamage>
+    <defaultDamage>20</defaultDamage>
     <minDamageToFragment>5</minDamageToFragment>
     <defaultStoppingPower>3</defaultStoppingPower>
     <defaultArmorPenetration>0.75</defaultArmorPenetration>
@@ -167,8 +167,8 @@
     <explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
     <!-- <explosionSnowMeltAmount>0</explosionSnowMeltAmount> -->
     <explosionCellFleck>Blast_WULA_Plasma_Explosive</explosionCellFleck>
-    <explosionColorCenter>(0.2, 0.8, 0.3)</explosionColorCenter>
-    <explosionColorEdge>(0.1, 0.9, 0.5)</explosionColorEdge>
+    <explosionColorCenter>(0.95, 0.6, 0.3)</explosionColorCenter>
+    <explosionColorEdge>(1, 0.5, 0.15)</explosionColorEdge>
     <explosionInteriorFleck>ElectricalSpark_WULA_Plasma_Explosive</explosionInteriorFleck>
     <soundExplosion>Explosion_EMP</soundExplosion>
     <combatLogRules>Damage_Bomb</combatLogRules>

1.6/1.6/Defs/Effects/WulaFleckDefs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <FleckDef ParentName="FleckBase">
+  <FleckDef Name="WULA_GunTail_Plasma" ParentName="FleckBase">
     <defName>WULA_GunTail_Plasma</defName>
     <altitudeLayer>Projectile</altitudeLayer>
     <solidTime>0.05</solidTime>
@@ -12,6 +12,12 @@
       <color>(3,189,243,155)</color>
     </graphicData>
   </FleckDef>
+  <FleckDef  ParentName="WULA_GunTail_Plasma">
+    <defName>WULA_GunTail_Plasma_Yellow</defName>
+    <graphicData>
+      <color>(242,160,69,155)</color>
+    </graphicData>
+  </FleckDef>
 
   <FleckDef ParentName="FleckBase">
     <defName>WULA_GunTail_Lighting</defName>

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -144,6 +144,7 @@
     <isBoss>true</isBoss>
     <maxPerGroup>1</maxPerGroup>
     <isGoodBreacher>true</isGoodBreacher>
+    <canMeleeAttack>false</canMeleeAttack>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -160,10 +161,6 @@
     </lifeStages>
     <weaponMoney>99999~99999</weaponMoney>
 
-    <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_AT_Weapon</li>
-    </weaponTags>
-
     <controlGroupPortraitZoom>0.45</controlGroupPortraitZoom>
   </PawnKindDef>
   <PawnKindDef ParentName="HeavyMechanoidKind">
@@ -175,6 +172,7 @@
     <combatPower>1000</combatPower>
     <isBoss>true</isBoss>
     <maxPerGroup>1</maxPerGroup>
+    <canMeleeAttack>false</canMeleeAttack>
     <lifeStages>
       <li>
         <bodyGraphicData>
@@ -190,10 +188,9 @@
       </li>
     </lifeStages>
     <weaponMoney>99999~99999</weaponMoney>
-
-    <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
-    </weaponTags>
+    <abilities>
+      <li>WULA_WM_Panzer_Autocannon_Ability</li>
+    </abilities>
 
     <controlGroupPortraitZoom>0.45</controlGroupPortraitZoom>
   </PawnKindDef>

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>

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>

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>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -960,12 +960,81 @@
         <disarmedByEmpForTicks>1500</disarmedByEmpForTicks>
         <gizmoTipKey>ProjectileInterceptorTip</gizmoTipKey>
       </li>
+      <li Class="CompProperties_TurretGun">
+        <turretDef>WULA_WM_Panzer_Turret</turretDef>
+        <angleOffset>-90</angleOffset>
+        <renderNodeProperties>
+          <li>
+            <nodeClass>PawnRenderNode_TurretGun</nodeClass>
+            <workerClass>PawnRenderNodeWorker_TurretGun</workerClass>
+            <parentTagDef>Body</parentTagDef>
+            <overrideMeshSize>(1, 1)</overrideMeshSize>
+            <baseLayer>20</baseLayer>
+            <pawnType>Any</pawnType>
+            <drawData>
+              <dataWest>
+                <rotationOffset>180</rotationOffset>
+              </dataWest>
+            </drawData>
+          </li>
+        </renderNodeProperties>
+      </li>
     </comps>
   </ThingDef>
   <ThingDef Name="Wula_AI_Heavy_Panzer_Gunnery" ParentName="Wula_AI_Heavy_Panzer">
 		<defName>Wula_AI_Heavy_Panzer_Gunnery</defName>
 		<label>SMp-38A"斯佩萨特"</label>
 		<description>乌拉帝国所使用的中型突击战车，以逆重的方式悬浮于战场上，搭载了联装机炮和用于杀伤软目标的"石英"火箭弹，并且拥有足以保护一支突击小队的护盾。</description>
+    <comps Inherit="False">
+      <!--加上这个组件的机械体会直接跳过原版指挥范围判定-->
+      <li Class="WulaFallenEmpire.CompProperties_GlobalMechCommand" />
+      <li Class="CompProperties_CanBeDormant" />
+      <li Class="CompProperties_WakeUpDormant">
+        <wakeUpOnDamage>true</wakeUpOnDamage>
+        <wakeUpCheckRadius>30</wakeUpCheckRadius>
+        <wakeUpSound>MechanoidsWakeUp</wakeUpSound>
+      </li>
+      <li MayRequire="Ludeon.RimWorld.Biotech" Class="CompProperties_OverseerSubject">
+        <needsOverseerEffect>MechUncontrolled</needsOverseerEffect>
+        <delayUntilFeralCheck>60000</delayUntilFeralCheck>
+        <feralMtbDays>10</feralMtbDays>
+        <feralCascadeRadialDistance>25</feralCascadeRadialDistance>
+      </li>
+      <li Class="CompProperties_ProjectileInterceptor">
+        <radius>3</radius>
+        <interceptGroundProjectiles>true</interceptGroundProjectiles>
+        <color>(0.9, 0.2, 0.2)</color>
+        <reactivateEffect>BulletShieldGenerator_Reactivate</reactivateEffect>
+        <activeSound>BulletShield_Ambience</activeSound>
+        <hitPoints>500</hitPoints>
+        <hitPointsRestoreInstantlyAfterCharge>true</hitPointsRestoreInstantlyAfterCharge>
+        <chargeDurationTicks>1800</chargeDurationTicks>
+        <rechargeHitPointsIntervalTicks>120</rechargeHitPointsIntervalTicks>
+        <minIdleAlpha>0.2</minIdleAlpha>
+        <drawWithNoSelection>True</drawWithNoSelection>
+        <disarmedByEmpForTicks>1500</disarmedByEmpForTicks>
+        <gizmoTipKey>ProjectileInterceptorTip</gizmoTipKey>
+      </li>
+      <li Class="CompProperties_TurretGun">
+        <turretDef>WULA_WM_Panzer_Autocannon</turretDef>
+        <angleOffset>-90</angleOffset>
+        <renderNodeProperties>
+          <li>
+            <nodeClass>PawnRenderNode_TurretGun</nodeClass>
+            <workerClass>PawnRenderNodeWorker_TurretGun</workerClass>
+            <parentTagDef>Body</parentTagDef>
+            <overrideMeshSize>(1, 1)</overrideMeshSize>
+            <baseLayer>20</baseLayer>
+            <pawnType>Any</pawnType>
+            <drawData>
+              <dataWest>
+                <rotationOffset>180</rotationOffset>
+              </dataWest>
+            </drawData>
+          </li>
+        </renderNodeProperties>
+      </li>
+    </comps>
   </ThingDef>
 
   <ThingDef Name="WULA_Alpha_Wolf" ParentName="HeavyMechanoid">

1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml

@@ -390,8 +390,8 @@
     <graphicData>
       <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red_Double</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <shaderType>TransparentPostLight</shaderType>
-      <drawSize>1.4</drawSize>
+      <!-- <color>(61,199,157,202)</color> -->
+      <drawSize>(0.75,1)</drawSize>
     </graphicData>
     <projectile>
       <damageDef>WULA_Shuttle_Autocannon_Bullet</damageDef>