Move CompAmmo back to Verb_LaunchProjectileCE

Some mods such as Bill Doors' Plasma Weapons will need a recompile before being able to use the new property.
CombatExtended-Continued · Dec 3, 2024 · a825857 · a825857
1 parent 6f70974
commit a825857
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs
@@ -33,6 +33,7 @@ public class Verb_LaunchProjectileCE : Verb
         protected float distance = 10f;
 
         public CompCharges compCharges = null;
+        public CompAmmoUser compAmmo = null;
 
         public CompFireModes compFireModes = null;
         public CompChangeableProjectile compChangeable = null;
@@ -139,6 +140,8 @@ public float ShootingAccuracy
         public float SightsEfficiency => EquipmentSource?.GetStatValue(CE_StatDefOf.SightsEfficiency) ?? 1f;
         public virtual float SwayAmplitude => Mathf.Max(0, (4.5f - ShootingAccuracy) * (EquipmentSource?.GetStatValue(CE_StatDefOf.SwayFactor) ?? 1f));
 
+        public virtual CompAmmoUser CompAmmo => compAmmo ??= EquipmentSource?.TryGetComp<CompAmmoUser>();
+
         public virtual ThingDef Projectile
         {
             get

diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs
@@ -31,8 +31,6 @@ public class Verb_ShootCE : Verb_LaunchProjectileCE
 
         public Vector3 drawPos;
 
-        private CompAmmoUser compAmmo;
-
         #endregion
 
         #region Properties
@@ -128,14 +126,7 @@ public float AimAngle
         // Whether our shooter is currently under suppressive fire
         private bool IsSuppressed => ShooterPawn?.TryGetComp<CompSuppressable>()?.isSuppressed ?? false;
 
-        public CompAmmoUser CompAmmo
-        {
-            get
-            {
-                compAmmo ??= EquipmentSource?.TryGetComp<CompAmmoUser>();
-                return compAmmo;
-            }
-        }
+        public override CompAmmoUser CompAmmo => base.CompAmmo;
 
         public override ThingDef Projectile => CompAmmo?.CurrentAmmo != null ? CompAmmo.CurAmmoProjectile : base.Projectile;