2025-8-29

1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml

@@ -842,6 +842,7 @@
           <height>Top</height>
           <groups>
             <li>Torso</li>
+            <li>HeadAttackTool</li>
           </groups>
           <parts>
             <li>

1.6/1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -166,10 +166,10 @@
     <plantDamageFactor>8</plantDamageFactor>
     <explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
     <!-- <explosionSnowMeltAmount>0</explosionSnowMeltAmount> -->
-    <explosionCellFleck>Blast_WULA_Plasma_Explosive</explosionCellFleck>
+    <explosionCellFleck>Blast_WULA_Plasma</explosionCellFleck>
     <explosionColorCenter>(0.95, 0.6, 0.3)</explosionColorCenter>
     <explosionColorEdge>(1, 0.5, 0.15)</explosionColorEdge>
-    <explosionInteriorFleck>ElectricalSpark_WULA_Plasma_Explosive</explosionInteriorFleck>
+    <!-- <explosionInteriorFleck>ElectricalSpark_WULA_Plasma_Explosive</explosionInteriorFleck> -->
     <soundExplosion>Explosion_EMP</soundExplosion>
     <combatLogRules>Damage_Bomb</combatLogRules>
   </DamageDef>

1.6/1.6/Defs/Effects/WulaFleckDefs.xml

@@ -31,6 +31,18 @@
     </graphicData>
   </FleckDef>
 
+  <FleckDef ParentName="FleckBase">
+    <defName>Blast_WULA_Plasma</defName>
+    <graphicData>
+      <texPath>Things/Mote/BlastEMP</texPath>
+      <shaderType>TransparentPostLight</shaderType>
+      <renderInstanced>true</renderInstanced>
+      <color>(0.2, 0.8, 0.3, 0.5)</color>
+    </graphicData>
+    <altitudeLayer>MoteOverhead</altitudeLayer>
+    <solidTime>0</solidTime>
+    <fadeOutTime>0.2</fadeOutTime>
+  </FleckDef>
   <FleckDef ParentName="FleckBase">
     <defName>Blast_WULA_Plasma_Explosive</defName>
     <graphicData>

1.6/1.6/Defs/EventDefs/EventDef_Wula.xml

@@ -75,7 +75,7 @@
         </optionEffects>
       </li>
       <!-- 教堂 -->
-      <li>
+      <!-- <li>
         <label>乌拉帝国 大教堂</label>
         <hideWhenDisabled>true</hideWhenDisabled>
         <conditions>
@@ -182,7 +182,7 @@
             </effects>
           </li>
         </optionEffects>
-      </li>
+      </li> -->
 
       <li>
         <label>退出</label>

1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml

@@ -1229,6 +1229,153 @@
       <li>WulaSpecies</li>
     </recipeUsers>
   </RecipeDef>
+  <HediffDef ParentName="AddedBodyPartBase">
+    <defName>WULA_Addons_Antenna_Hediff_Shotgun</defName>
+    <label>梭镖发射器天线</label>
+    <description>一种特殊的上行链路天线，通过省去一些结构以在小小的天线中塞下两具微型梭镖发射器，这使得换装此天线的机械乌拉可以将自己的头当霰弹枪用——尽管射程不会太长并且会挤占天线的机械体带宽。</description>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Shotgun</ThingDef>
+      <ThingDef>WULA_Addons_Antenna_Shotgun_Turret</ThingDef>
+      <RecipeDef>Install_WULA_Addons_Antenna_Shotgun</RecipeDef>
+    </descriptionHyperlinks>
+    <spawnThingOnRemoved>WULA_Addons_Antenna_Shield</spawnThingOnRemoved>
+    <addedPartProps>
+      <!-- <partEfficiency>1.5</partEfficiency> -->
+      <betterThanNatural>true</betterThanNatural>
+    </addedPartProps>
+    <stages>
+      <li>
+        <statOffsets>
+          <MechBandwidth>-2</MechBandwidth>
+          <MechControlGroups>-1</MechControlGroups>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>-0.1</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+    <comps>
+      <li Class="WulaFallenEmpire.HediffCompProperties_TopTurret">
+        <turretDef>WULA_Addons_Antenna_Shotgun_Turret</turretDef>
+        <angleOffset>0</angleOffset>
+        <autoAttack>true</autoAttack>
+      </li>
+    </comps>
+  </HediffDef>
+  <ThingDef ParentName="BaseWeaponTurret">
+    <defName>WULA_Addons_Antenna_Shotgun_Turret</defName>
+    <label>梭镖发射器</label>
+    <description>藏在机械乌拉脑袋两侧天线中的微型霰弹枪，射程不远但是对接近的敌人有很大的威慑力。</description>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_Weapon_Empty</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Shotgun</ThingDef>
+      <RecipeDef>Install_WULA_Addons_Antenna_Shotgun</RecipeDef>
+    </descriptionHyperlinks>
+    <statBases>
+      <AccuracyTouch>1</AccuracyTouch>
+      <AccuracyShort>0.6</AccuracyShort>
+      <AccuracyMedium>0.3</AccuracyMedium>
+      <AccuracyLong>0.1</AccuracyLong>
+      <Mass>5</Mass>
+    </statBases>
+    <verbs>
+      <li>
+        <verbClass>Verb_Shoot</verbClass>
+        <defaultProjectile>Bullet_WULA_Addons_Antenna_Shotgun_Turret</defaultProjectile>
+        <range>4</range>
+        <ticksBetweenBurstShots>8</ticksBetweenBurstShots>
+        <burstShotCount>2</burstShotCount>
+        <soundCast>Shot_BeamRepeater</soundCast>
+        <soundCastTail>GunTail_Medium</soundCastTail>
+        <muzzleFlashScale>9</muzzleFlashScale>
+        <defaultCooldownTime>6</defaultCooldownTime>
+      </li>
+    </verbs>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_Addons_Antenna_Shotgun_Turret</defName>
+    <label>梭镖</label>
+    <graphicData>
+      <texPath>Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+    </graphicData>
+    <projectile>
+      <damageDef>Bullet</damageDef>
+      <damageAmountBase>10</damageAmountBase>
+      <stoppingPower>15</stoppingPower>
+      <armorPenetrationBase>0.65</armorPenetrationBase>
+      <speed>55</speed>
+    </projectile>
+  </ThingDef>
+  <ThingDef ParentName="BodyPartBionicBase">
+    <defName>WULA_Addons_Antenna_Shotgun</defName>
+    <label>梭镖发射器天线</label>
+    <description>一种特殊的上行链路天线，通过省去一些结构以在小小的天线中塞下两具微型梭镖发射器，这使得换装此天线的机械乌拉可以将自己的头当霰弹枪用——尽管射程不会太长并且会挤占天线的机械体带宽。</description>
+    <tradeability>None</tradeability>
+    <descriptionHyperlinks>
+      <RecipeDef>Install_WULA_Addons_Antenna_Shotgun</RecipeDef>
+      <ThingDef>WULA_Addons_Antenna_Shotgun_Turret</ThingDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Steel>100</Steel>
+      <ComponentIndustrial>4</ComponentIndustrial>
+    </costList>
+    <thingSetMakerTags>
+      <li>RewardStandardMidFreq</li>
+    </thingSetMakerTags>
+    <recipeMaker>
+      <researchPrerequisite>WULA_Synth_Addons_Technology</researchPrerequisite>
+      <recipeUsers>
+        <li>WULA_Cube_Productor_Energy</li>
+      </recipeUsers>
+    </recipeMaker>
+    <statBases>
+      <Mass>0.3</Mass>
+    </statBases>
+  </ThingDef>
+  <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">
+    <defName>Install_WULA_Addons_Antenna_Shotgun</defName>
+    <label>安装梭镖发射器天线</label>
+    <description>为合成人安装梭镖发射器天线。</description>
+    <descriptionHyperlinks>
+      <ThingDef>WULA_Addons_Antenna_Shotgun</ThingDef>
+      <HediffDef>WULA_Addons_Antenna_Hediff_Shotgun</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>安装梭镖发射器天线中</jobString>
+    <surgeryOutcomeEffect IsNull="True" />
+    <!-- Always succeeds -->
+    <anesthetize>false</anesthetize>
+    <ingredients Inherit="False">
+      <li>
+        <filter>
+          <thingDefs>
+            <li>WULA_Addons_Antenna_Shotgun</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>WULA_Addons_Antenna_Shotgun</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>WULA_Addons_Antenna_Bodypart</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>WULA_Addons_Antenna_Hediff_Shotgun</addsHediff>
+    <effectWorking>Smith</effectWorking>
+    <soundWorking>Recipe_Smith</soundWorking>
+    <recipeUsers Inherit="False">
+      <li>WulaSpecies</li>
+    </recipeUsers>
+  </RecipeDef>
 
   <!-- 抽魂 -->
   <RecipeDef ParentName="SurgeryInstallBodyPartArtificialBase">

1.6/1.6/Defs/MapGeneration/MapGenerator_WULA_PocketSpace_Small.xml

@@ -25,7 +25,7 @@
     <defName>WULA_PocketSpace_Small_GenStep</defName>
     <order>990</order> <!-- 调整为更高的值，确保在所有基础地形生成之后执行 -->
     <genStep Class="WulaFallenEmpire.GenStep_WulaPocketSpaceSmall">
-      <prefabDefName>WULA_Shuttle_Prefab</prefabDefName> <!-- 指定要生成的预制件的defName -->
+      <!-- <prefabDefName>WULA_Shuttle_Prefab</prefabDefName> -->
     </genStep>
   </GenStepDef>
 </Defs>

1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml

@@ -143,7 +143,7 @@
     <combatPower>1000</combatPower>
     <isBoss>true</isBoss>
     <maxPerGroup>1</maxPerGroup>
-    <isGoodBreacher>true</isGoodBreacher>
+    <!-- <isGoodBreacher>true</isGoodBreacher> -->
     <canMeleeAttack>false</canMeleeAttack>
     <lifeStages>
       <li>

1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml

@@ -1061,6 +1061,7 @@
         <hasStandardCommand>true</hasStandardCommand>
         <targetable>true</targetable>
         <violent>true</violent>
+        <forcedMissRadius>0.01</forcedMissRadius>
         <targetParams>
           <canTargetPawns>true</canTargetPawns>
           <canTargetBuildings>true</canTargetBuildings>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml

@@ -127,7 +127,7 @@
     </verbs>
   </ThingDef>
   <ThingDef ParentName="Wula_CR_Mobile_Factory_Turret">
-    <defName>Wula_CR_Mobile_Factory_Turret_MK2</defName>
+    <defName>Wula_CR_Mobile_Factory_Turret_MKII</defName>
     <label>CRt-92"铱锇MK2"</label>
     <description>由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，此改进版比起其原型可以将热熔束喷到更远的地方，但是无法处理过近的目标。</description>
     <verbs Inherit="False">
@@ -393,89 +393,4 @@
       </li>
     </modExtensions>
   </ThingDef>
-  <ThingDef ParentName="BaseWeaponTurret">
-    <defName>Wula_MIS_Mobile_Factory_Turret</defName>
-    <label>CRt-60"陨磷"</label>
-    <description>由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，可以射出两道交叉扫射的暗物质射流以引发爆炸毁灭中等范围内的敌军。</description>
-    <tradeability>None</tradeability>
-    <destroyOnDrop>true</destroyOnDrop>
-    <graphicData>
-      <texPath>Wula/Weapon/Wula_Mobile_Factory_Turret</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>0.5</drawSize>
-    </graphicData>
-    <uiIconScale>2</uiIconScale>
-    <statBases>
-      <Mass>2.6</Mass>
-      <AccuracyTouch>1</AccuracyTouch>
-      <AccuracyShort>1</AccuracyShort>
-      <AccuracyMedium>1</AccuracyMedium>
-      <AccuracyLong>1</AccuracyLong>
-    </statBases>
-    <verbs>
-      <li>
-        <verbClass>Verb_Shoot</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_Wula_MIS_Mobile_Factory_Turret</defaultProjectile>
-        <forcedMissRadius>0.1</forcedMissRadius>
-        <burstShotCount>2</burstShotCount>
-        <defaultCooldownTime>4</defaultCooldownTime>
-        <ticksBetweenBurstShots>4</ticksBetweenBurstShots>
-        <isMortar>true</isMortar>
-        <requireLineOfSight>false</requireLineOfSight>
-        <minRange>16</minRange>
-        <range>500</range>
-        <soundCast>RocketswarmLauncher_Fire</soundCast>
-        <muzzleFlashScale>4</muzzleFlashScale>
-      
-        <!-- <aimingLineMote>Mote_FleshmelterBolt_Aim</aimingLineMote>
-        <aimingChargeMote>Mote_FleshmelterBolt_Charge</aimingChargeMote> 
-        <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
-        <aimingLineMoteFixedLength>15.9</aimingLineMoteFixedLength>
-        <aimingTargetMote>Mote_FleshmelterBolt_Target</aimingTargetMote>  -->
-        <!-- <soundAiming>FleshmelterBolt_Charging</soundAiming> -->
-
-        <targetParams>
-          <canTargetLocations>true</canTargetLocations>
-        </targetParams>
-      </li>
-    </verbs>
-  </ThingDef>
-  <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_Wula_MIS_Mobile_Factory_Turret</defName>
-    <label>灵能星光</label>
-    <graphicData>
-      <texPath>Things/Projectile/Rocket_Swarm</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1.2</drawSize>
-    </graphicData>
-    <thingClass>WulaFallenEmpire.Projectile_CruiseMissile</thingClass>
-		<modExtensions>
-      <li Class="WulaFallenEmpire.ExplosiveTrackingBulletDef">
-        <explosionRadius>3.5</explosionRadius>
-        <damageDef>Bomb</damageDef>
-      </li>
-      <li Class="WulaFallenEmpire.TrackingBulletDef">
-        <homingSpeed>0.1</homingSpeed>
-        <initRotateAngle>60</initRotateAngle>
-        <destroyTicksAfterLosingTrack>
-          <min>60</min>
-          <max>120</max>
-        </destroyTicksAfterLosingTrack>
-        <tailFleckDef>WULA_GunTail_Blue</tailFleckDef>
-        <impactThreshold>1</impactThreshold>
-      </li>
-		</modExtensions>
-    <projectile>
-      <damageDef>Bomb</damageDef>
-      <damageAmountBase>50</damageAmountBase>
-      <speed>15</speed>
-      <explosionRadius>3.5</explosionRadius>
-      <armorPenetrationBase>1</armorPenetrationBase>
-      <flyOverhead>true</flyOverhead>
-      <arcHeightFactor>0.4</arcHeightFactor>
-      <soundExplode>Explosion_Rocket</soundExplode>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-    </projectile>
-  </ThingDef>
 </Defs>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml

@@ -183,7 +183,7 @@
     <description>乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。</description>
     <techLevel>Spacer</techLevel>
     <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Plasma_AR</texPath>
+      <texPath>Wula/Weapon/WULA_RW_Plasma_Homing_AR</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.4</drawSize>
     </graphicData>
@@ -253,7 +253,7 @@
     <description>乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。</description>
     <techLevel>Spacer</techLevel>
     <graphicData>
-      <texPath>Wula/Weapon/WULA_RW_Plasma_AR</texPath>
+      <texPath>Wula/Weapon/WULA_RW_Plasma_Homing_AR_Ex</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <drawSize>1.4</drawSize>
     </graphicData>

1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -950,9 +950,9 @@
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Turret</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>2</drawSize>
+      <drawSize>3</drawSize>
     </graphicData>
-    <uiIconScale>0.5</uiIconScale>
+    <uiIconScale>0.33</uiIconScale>
     <statBases>
       <Mass>150</Mass>
       <AccuracyTouch>1</AccuracyTouch>
@@ -1010,9 +1010,9 @@
     <graphicData>
       <texPath>Wula/Weapon/WULA_WM_Panzer_Autocannon</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>2</drawSize>
+      <drawSize>3</drawSize>
     </graphicData>
-    <uiIconScale>0.5</uiIconScale>
+    <uiIconScale>0.33</uiIconScale>
     <statBases>
       <Mass>150</Mass>
       <AccuracyTouch>0.5</AccuracyTouch>
@@ -1021,19 +1021,6 @@
       <AccuracyLong>0.35</AccuracyLong>
     </statBases>
     <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>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml

@@ -972,8 +972,21 @@
             <baseLayer>20</baseLayer>
             <pawnType>Any</pawnType>
             <drawData>
+              <dataNorth>
+                <rotationOffset>180</rotationOffset>
+                <offset>(0.04, 0, 0)</offset>
+                <flip>true</flip>
+              </dataNorth>
+              <dataEast>
+                <!-- <offset>(0.6, 0, 0.15)</offset> -->
+              </dataEast>
+              <dataSouth>
+                <!-- <rotationOffset>-90</rotationOffset> -->
+                <offset>(0.04, 0, 0)</offset>
+              </dataSouth>
               <dataWest>
                 <rotationOffset>180</rotationOffset>
+                <!-- <offset>(-0.6, 0, 0.15)</offset> -->
               </dataWest>
             </drawData>
           </li>
@@ -1023,12 +1036,25 @@
             <nodeClass>PawnRenderNode_TurretGun</nodeClass>
             <workerClass>PawnRenderNodeWorker_TurretGun</workerClass>
             <parentTagDef>Body</parentTagDef>
-            <overrideMeshSize>(1, 1)</overrideMeshSize>
+            <overrideMeshSize>(1.5, 1.5)</overrideMeshSize>
             <baseLayer>20</baseLayer>
             <pawnType>Any</pawnType>
             <drawData>
+              <dataNorth>
+                <rotationOffset>180</rotationOffset>
+                <offset>(0.04, 0, 0)</offset>
+                <flip>true</flip>
+              </dataNorth>
+              <dataEast>
+                <!-- <offset>(0.6, 0, 0.15)</offset> -->
+              </dataEast>
+              <dataSouth>
+                <!-- <rotationOffset>-90</rotationOffset> -->
+                <offset>(0.04, 0, 0)</offset>
+              </dataSouth>
               <dataWest>
                 <rotationOffset>180</rotationOffset>
+                <!-- <offset>(-0.6, 0, 0.15)</offset> -->
               </dataWest>
             </drawData>
           </li>

1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml

@@ -659,7 +659,7 @@
         </renderNodeProperties>
       </li>
       <li Class="CompProperties_TurretGun">
-        <turretDef>Wula_CR_Mobile_Factory_Turret_MK2</turretDef>
+        <turretDef>Wula_CR_Mobile_Factory_Turret_MKII</turretDef>
         <!-- <angleOffset>-90</angleOffset> -->
         <renderNodeProperties>
           <li>
@@ -694,7 +694,7 @@
         </renderNodeProperties>
       </li>
       <li Class="CompProperties_TurretGun">
-        <turretDef>Wula_CR_Mobile_Factory_Turret_MK2</turretDef>
+        <turretDef>Wula_CR_Mobile_Factory_Turret_MKII</turretDef>
         <!-- <angleOffset>-90</angleOffset> -->
         <renderNodeProperties>
           <li>