Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW

1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml

@@ -1543,6 +1543,7 @@
         <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
         <ai_TargetHasRangedAttackScoreOffset>50</ai_TargetHasRangedAttackScoreOffset>
         <minRange>6</minRange>
+        <forcedMissRadius>8</forcedMissRadius>
         <targetParams>
           <canTargetLocations>true</canTargetLocations>
           <canTargetPawns>false</canTargetPawns>
@@ -1576,7 +1577,8 @@
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Handle_Cannon</defName>
     <label>熔岩炮弹</label>
-    <thingClass>Projectile_HellsphereCannon</thingClass>
+    <!-- <thingClass>Projectile_HellsphereCannon</thingClass> -->
+    <thingClass>Projectile_Explosive</thingClass>
     <graphicData>
       <texPath>Things/Projectile/HellsphereCannon</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -1587,14 +1589,14 @@
       <damageDef>Vaporize</damageDef>
       <speed>75</speed>
       <damageAmountBase>300</damageAmountBase>
-      <explosionRadius>1.1</explosionRadius>
-      <screenShakeFactor>1.5</screenShakeFactor>
+      <explosionRadius>2.5</explosionRadius>
+      <screenShakeFactor>0.75</screenShakeFactor>
     </projectile>
-    <modExtensions>
+    <!-- <modExtensions>
 			<li Class="WulaFallenEmpire.ShotgunExtension">
 				<pelletCount>6</pelletCount>
 			</li>
-		</modExtensions>
+		</modExtensions> -->
   </ThingDef>
   <!-- 自动炮 -->
   <ThingDef ParentName="BaseHumanMakeableGun">
@@ -1747,6 +1749,7 @@
       <shaderType>TransparentPostLight</shaderType>
     </graphicData>
     <!-- <thingClass>WulaFallenEmpire.Projectile_CruiseMissile</thingClass> -->
+    <thingClass>Projectile_Explosive</thingClass>
     <projectile>
       <damageDef>Bomb</damageDef>
       <damageAmountBase>25</damageAmountBase>
@@ -1778,10 +1781,10 @@
     </weaponTags>
     <uiIconScale>0.75</uiIconScale>
     <recipeMaker>
-      <recipeUsers Inherit="False">
+      <!-- <recipeUsers Inherit="False">
         <li>WULA_Cube_Productor_Energy</li>
-      </recipeUsers>
-      <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite>
+      </recipeUsers> -->
+      <!-- <researchPrerequisite>WULA_Synth_Weapon_3_Bomb_Technology</researchPrerequisite> -->
       <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
     </recipeMaker>
     <costList Inherit="False">
@@ -1820,7 +1823,7 @@
   </ThingDef>
   <ThingDef ParentName="BaseBullet">
     <defName>Bullet_WULA_RW_Test_Missile</defName>
-    <label>角砾岩榴弹</label>
+    <label>测试导弹</label>
     <graphicData>
       <texPath>Wula/Projectile/WULA_Shrapnel</texPath>
       <graphicClass>Graphic_Single</graphicClass>
@@ -1858,6 +1861,107 @@
       <soundAmbient>MortarRound_Ambient</soundAmbient>
     </projectile>
   </ThingDef>
+  <!-- 测试高级火炮 -->
+  <ThingDef ParentName="BaseGun">
+    <defName>WULA_RW_Test_Cannon</defName>
+    <label>测试高级火炮</label>
+    <description>测试高级火炮</description>
+    <techLevel>Ultra</techLevel>
+    <graphicData>
+      <texPath>Wula/Weapon/WULA_RW_Handle_Cannon</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1.35</drawSize>
+    </graphicData>
+    <tradeability>None</tradeability>
+    <recipeMaker>
+      <recipeUsers Inherit="False"/>
+      <unfinishedThingDef>UnfinishedWeapon</unfinishedThingDef>
+    </recipeMaker>
+    <statBases>
+      <WorkToMake>50000</WorkToMake>
+      <Mass>20</Mass>
+      <AccuracyTouch>0.03</AccuracyTouch>
+      <AccuracyShort>0.03</AccuracyShort>
+      <AccuracyMedium>0.03</AccuracyMedium>
+      <AccuracyLong>0.02</AccuracyLong>
+      <RangedWeapon_Cooldown>4.0</RangedWeapon_Cooldown>
+    </statBases>
+    <costList Inherit="False">
+      <Steel>500</Steel>
+      <Plasteel>300</Plasteel>
+      <ComponentSpacer>12</ComponentSpacer>
+    </costList>
+    <verbs>
+      <li>
+        <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
+        <hasStandardCommand>true</hasStandardCommand>
+        <defaultProjectile>Bullet_WULA_RW_Test_Cannon</defaultProjectile>
+        <warmupTime>1.5</warmupTime>
+        <range>22</range>
+        <soundCast>Shot_HellsphereCannonGun</soundCast>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
+        <muzzleFlashScale>9</muzzleFlashScale>
+        <ai_AvoidFriendlyFireRadius>6</ai_AvoidFriendlyFireRadius>
+        <ai_RangedAlawaysShootGroundBelowTarget>true</ai_RangedAlawaysShootGroundBelowTarget>
+        <ai_ProjectileLaunchingIgnoresMeleeThreats>true</ai_ProjectileLaunchingIgnoresMeleeThreats>
+        <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+        <ai_TargetHasRangedAttackScoreOffset>50</ai_TargetHasRangedAttackScoreOffset>
+        <minRange>6</minRange>
+        <forcedMissRadius>4</forcedMissRadius>
+        <targetParams>
+          <canTargetLocations>true</canTargetLocations>
+          <canTargetPawns>false</canTargetPawns>
+        </targetParams>
+        <aimingLineMote>Mote_HellsphereCannon_Aim</aimingLineMote>
+        <aimingChargeMote>Mote_HellsphereCannon_Charge</aimingChargeMote>
+        <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+        <aimingLineMoteFixedLength>3.9</aimingLineMoteFixedLength>
+        <aimingTargetMote>Mote_HellsphereCannon_Target</aimingTargetMote>
+        <burstShotCount>3</burstShotCount>
+        <beamTargetsGround>true</beamTargetsGround>
+        <soundAiming>HellsphereCannon_Aiming</soundAiming>
+        <canGoWild>false</canGoWild>
+      </li>
+    </verbs>
+    <tools>
+      <li>
+        <label>barrel</label>
+        <capacities>
+          <li>Blunt</li>
+          <li>Poke</li>
+        </capacities>
+        <power>9</power>
+        <cooldownTime>2.6</cooldownTime>
+      </li>
+    </tools>
+    <comps>
+      <li Class="CompProperties_Biocodable"/>
+    </comps>
+  </ThingDef>
+  <ThingDef ParentName="BaseBullet">
+    <defName>Bullet_WULA_RW_Test_Cannon</defName>
+    <label>熔岩炮弹</label>
+    <!-- <thingClass>Projectile_HellsphereCannon</thingClass> -->
+    <thingClass>Projectile_Explosive</thingClass>
+    <graphicData>
+      <texPath>Things/Projectile/HellsphereCannon</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <shaderType>MoteGlow</shaderType>
+      <drawSize>(1.5, 3)</drawSize>
+    </graphicData>
+    <projectile>
+      <damageDef>Vaporize</damageDef>
+      <speed>75</speed>
+      <damageAmountBase>300</damageAmountBase>
+      <explosionRadius>1.1</explosionRadius>
+      <screenShakeFactor>0.75</screenShakeFactor>
+    </projectile>
+    <modExtensions>
+			<li Class="WulaFallenEmpire.ShotgunExtension">
+				<pelletCount>6</pelletCount>
+			</li>
+		</modExtensions>
+  </ThingDef>
 
   <!-- 暗物质步枪 -->
   <ThingDef ParentName="BaseHumanMakeableGun">