暂存

1.6/1.6/Defs/DamageDefs/Damages_Wula.xml

@@ -243,4 +243,11 @@
     <defName>Damage_WULA_Melta_Small</defName>
     <defaultDamage>5</defaultDamage>
   </DamageDef>
+
+  <DamageDef ParentName="Bullet">
+    <defName>WULA_Shuttle_Autocannon_Bullet</defName>
+    <label>bullet</label>
+    <buildingDamageFactorPassable>0</buildingDamageFactorPassable>
+  </DamageDef>
+
 </Defs>

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

@@ -1072,7 +1072,7 @@
       </li>
     </comps>
   </ThingDef>
-  <ThingDef ParentName="BaseBullet">
+  <ThingDef Name="Bullet_WULA_WM_Panzer_Autocannon" ParentName="BaseBullet">
     <defName>Bullet_WULA_WM_Panzer_Autocannon</defName>
     <label>辉锑自动炮子弹</label>
     <thingClass>Projectile_Explosive</thingClass>
@@ -1095,6 +1095,7 @@
       <screenShakeFactor>0.1</screenShakeFactor>
     </projectile>
   </ThingDef>
+  
   <AbilityDef>
     <defName>WULA_WM_Panzer_Autocannon_Ability</defName>
     <label>PRr-34"石英"</label>

1.6/Odyssey/Defs/ThingDefs_Buildings/Building_WULA_Shuttle.xml

@@ -91,7 +91,7 @@
         <minFuelCost>50</minFuelCost>
         <skyfallerLeaving>ArmedShuttleLeaving_WULA</skyfallerLeaving>
         <worldObjectDef>PassengerShuttle</worldObjectDef>
-        <cooldownTicks>3750</cooldownTicks> <!-- 1.5 hours -->
+        <cooldownTicks>3750</cooldownTicks>        <!-- 1.5 hours -->
         <fixedLaunchDistanceMax>62</fixedLaunchDistanceMax>
         <cooldownEndedMessage>{0} is ready to launch again.</cooldownEndedMessage>
       </li>
@@ -134,6 +134,7 @@
         <chargeIntervalTicks>-1</chargeIntervalTicks>
         <chargeDurationTicks>0</chargeDurationTicks>
       </li>
+      <li Class="WulaFallenEmpire.CompProperties_ForceTargetable" />
     </comps>
     <placeWorkers>
       <li>PlaceWorker_NotUnderRoof</li>
@@ -233,7 +234,7 @@
         <minFuelCost>50</minFuelCost>
         <skyfallerLeaving>ArmedShuttleLeaving_WULA</skyfallerLeaving>
         <worldObjectDef>PassengerShuttle</worldObjectDef>
-        <cooldownTicks>3750</cooldownTicks> <!-- 1.5 hours -->
+        <cooldownTicks>3750</cooldownTicks>        <!-- 1.5 hours -->
         <fixedLaunchDistanceMax>62</fixedLaunchDistanceMax>
         <cooldownEndedMessage>{0} is ready to launch again.</cooldownEndedMessage>
       </li>
@@ -298,7 +299,7 @@
     <uiOrder>2601</uiOrder>
   </ThingDef>
 
-   <!-- 口袋空间退出点定义 -->
+  <!-- 口袋空间退出点定义 -->
   <ThingDef ParentName="PocketMapExit">
     <defName>WULA_PocketMapExit</defName>
     <label>运输机升降平台</label>
@@ -332,10 +333,9 @@
     </comps>
   </ThingDef>
 
-
   <ThingDef ParentName="BaseGun">
     <defName>WULA_Shuttle_Autocannon</defName>
-    <label>PMr-89"四叶"</label>
+    <label>SRc-22"四叶"</label>
     <description>由乌拉帝国的穿梭机所装备的自动炮，能够组织起高射速的弹幕压制杀伤大规模目标。</description>
     <techLevel>Ultra</techLevel>
     <relicChance>0</relicChance>
@@ -353,10 +353,9 @@
       <AccuracyShort>0.5</AccuracyShort>
       <AccuracyMedium>0.4</AccuracyMedium>
       <AccuracyLong>0.35</AccuracyLong>
-      <RangedWeapon_Cooldown>1.35</RangedWeapon_Cooldown>
+      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
     </statBases>
     <weaponTags>
-      <li>WULA_AI_Heavy_Panzer_Gunner_Weapon</li>
     </weaponTags>
     <costList Inherit="False">
       <Steel>500</Steel>
@@ -365,53 +364,47 @@
     </costList>
     <verbs>
       <li>
-        <verbClass>WulaFallenEmpire.Verb_ShootShotgun</verbClass>
+        <verbClass>Verb_Shoot</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_Shuttle_Homing_Autocannon</defaultProjectile>
+        <defaultProjectile>Bullet_WULA_Shuttle_Autocannon</defaultProjectile>
-        <warmupTime>1.2</warmupTime>
+        <warmupTime>0.25</warmupTime>
         <range>24</range>
-        <burstShotCount>24</burstShotCount>
+        <burstShotCount>10</burstShotCount>
+        <forcedMissRadius>0.35</forcedMissRadius>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-        <soundCast>Shot_BeamRepeater</soundCast>
+        <soundCast>Shot_TurretSniper</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
+        <soundCastTail>GunTail_Heavy</soundCastTail>
-        <muzzleFlashScale>9</muzzleFlashScale>
+        <muzzleFlashScale>12</muzzleFlashScale>
-        <aimingChargeMote>Mote_BeamRepeater_Charge</aimingChargeMote>
+        <targetParams>
-        <aimingChargeMoteOffset>1.07</aimingChargeMoteOffset>
+          <canTargetPawns>true</canTargetPawns>
+          <canTargetLocations>true</canTargetLocations>
+          <canTargetBuildings>true</canTargetBuildings>
+        </targetParams>
       </li>
     </verbs>
   </ThingDef>
-
   <ThingDef ParentName="BaseBullet">
-    <defName>Bullet_Shuttle_Homing_Autocannon</defName>
+    <defName>Bullet_WULA_Shuttle_Autocannon</defName>
-    <label>磷叶等离子体射弹</label>
+    <label>四叶自动炮子弹</label>
+    <thingClass>Projectile_Explosive</thingClass>
+    <tickerType>Normal</tickerType>
+    <neverMultiSelect>True</neverMultiSelect>
     <graphicData>
-      <texPath>Wula/Projectile/WULA_Bullet_Plasma</texPath>
+      <texPath>Wula/Projectile/WULA_Bullet_ChargeLanceShot_Red_Double</texPath>
       <graphicClass>Graphic_Single</graphicClass>
-      <color>(61,199,157,202)</color>
+      <shaderType>TransparentPostLight</shaderType>
-      <drawSize>(0.75,1)</drawSize>
+      <drawSize>1.4</drawSize>
     </graphicData>
     <projectile>
-      <damageDef>Bullet</damageDef>
+      <damageDef>WULA_Shuttle_Autocannon_Bullet</damageDef>
-      <damageAmountBase>6</damageAmountBase>
+      <damageAmountBase>14</damageAmountBase>
+      <speed>120</speed>
+      <explosionRadius>2.4</explosionRadius>
+      <arcHeightFactor>0.4</arcHeightFactor>
+      <soundExplode>Explosion_Rocket</soundExplode>
       <armorPenetrationBase>0.75</armorPenetrationBase>
-      <speed>60</speed>
+      <screenShakeFactor>0.1</screenShakeFactor>
     </projectile>
-    <thingClass>WulaFallenEmpire.Projectile_WulaLineAttack</thingClass>
-    <modExtensions>
-      <li Class="WulaFallenEmpire.Wula_PathPierce_Extension">
-        <!-- 最多穿透3个目标，设为-1则无限穿透 -->
-        <maxHits>-1</maxHits>
-        <!-- 每次穿透损失25%伤害 -->
-        <damageFalloff>0</damageFalloff>
-        <!-- 防止友军伤害 -->
-        <preventFriendlyFire>true</preventFriendlyFire>
-        <!-- 拖尾特效定义 -->
-        <tailFleckDef>WULA_GunTail_Plasma</tailFleckDef>
-      </li>
-      <li Class="WulaFallenEmpire.ShotgunExtension">
-        <pelletCount>2</pelletCount>
-      </li>
-    </modExtensions>
   </ThingDef>
 
   <ThingDef ParentName="ShuttleSkyfallerBase">

Source/WulaFallenEmpire/Patch_ArmedShuttle_ForceTargetable.cs

@@ -1,28 +0,0 @@
-using HarmonyLib;
-using Verse;
-using RimWorld;
-
-namespace WulaFallenEmpire
-{
-    [HarmonyPatch(typeof(Building_ArmedShuttle), "get_CanSetForcedTarget")]
-    public static class Patch_Building_ArmedShuttle_CanSetForcedTarget
-    {
-        /// <summary>
-        /// Postfix patch to allow armed shuttles with CompForceTargetable to be manually targeted.
-        /// </summary>
-        public static void Postfix(Building_ArmedShuttle __instance, ref bool __result)
-        {
-            // If the result is already true, no need to do anything.
-            if (__result)
-            {
-                return;
-            }
-
-            // Check if the shuttle has our marker component and belongs to the player.
-            if (__instance.GetComp<CompForceTargetable>() != null && __instance.Faction == Faction.OfPlayer)
-            {
-                __result = true;
-            }
-        }
-    }
-}

Source/WulaFallenEmpire/WULA_Shuttle/Building_ArmedShuttle.cs

@@ -142,7 +142,7 @@ namespace WulaFallenEmpire
         public virtual Verb AttackVerb => GunCompEq.PrimaryVerb;
         public bool IsMannable => mannableComp != null;
         private bool PlayerControlled => (base.Faction == Faction.OfPlayer || MannedByColonist) && !MannedByNonColonist && !IsActivable;
-        protected virtual bool CanSetForcedTarget => mannableComp != null && PlayerControlled;
+        protected virtual bool CanSetForcedTarget => (mannableComp != null || GetComp<CompForceTargetable>() != null) && PlayerControlled;
         private bool CanToggleHoldFire => PlayerControlled;
         private bool IsMortar => def.building.IsMortar;
         private bool IsMortarOrProjectileFliesOverhead => AttackVerb.ProjectileFliesOverhead() || IsMortar;

Source/WulaFallenEmpire/WulaFallenEmpire.csproj

@@ -190,7 +190,6 @@
     <Compile Include="HediffComp_GiveHediffsInRangeToRace.cs" />
     <Compile Include="CompForceTargetable.cs" />
     <Compile Include="Patch_ForceTargetable.cs" />
-    <Compile Include="Patch_ArmedShuttle_ForceTargetable.cs" />
     <Compile Include="Verb\VerbProperties_Excalibur.cs" />
     <Compile Include="Verb\Verb_Excalibur.cs" />
   </ItemGroup>