From c4bd50ef8e2e0e2a0da7a85df8ff6a1e4b050c09 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Thu, 30 May 2024 09:24:13 -0500
Subject: [PATCH 01/25] AlteredControls and TrajectoryEstimation bug hunting

---
 .../EntityComp/Parts/Weapon/WeaponTracking.cs |  19 +-
 .../CoreSystems/Session/SessionControls.cs    | 215 ++++++++++--------
 2 files changed, 131 insertions(+), 103 deletions(-)

diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponTracking.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponTracking.cs
index 60796b29..1ff46d64 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponTracking.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponTracking.cs
@@ -122,7 +122,7 @@ internal static void LeadTarget(Weapon weapon, MyEntity target, out Vector3D tar
             var validEstimate = true;
 
             if (!weapon.ActiveAmmoDef.AmmoDef.Const.IsBeamWeapon && weapon.ActiveAmmoDef.AmmoDef.Const.DesiredProjectileSpeed > 0)
-                targetPos = TrajectoryEstimation(weapon, obb.Center, vel, accel, weapon.MyPivotPos,  out validEstimate, false, weapon.Comp.Data.Repo.Values.Set.Overrides.AngularTracking);
+                targetPos = TrajectoryEstimation(weapon, obb.Center, vel, accel, weapon.MyPivotPos, out validEstimate, false, weapon.Comp.Data.Repo.Values.Set.Overrides.AngularTracking);
             else
                 targetPos = obb.Center;
 
@@ -919,20 +919,19 @@ internal static Vector3D TrajectoryEstimation(Weapon weapon, Vector3D targetPos,
             var comp = weapon.Comp;
             var ai = comp.Ai;
             var session = Session.I;
-            var ammoDef = weapon.ActiveAmmoDef.AmmoDef;
-            var shooterVel = (Vector3D)weapon.Comp.Ai.TopEntityVel;
-            var projectileMaxSpeed = ammoDef.Const.DesiredProjectileSpeed;
-            var updateGravity = ammoDef.Const.FeelsGravity && ai.InPlanetGravity;
-            var useSimple = basicPrediction || ammoDef.Const.AmmoSkipAccel || targetAcc.LengthSquared() < 2.5; //equal to approx 1.58 m/s
-
             #region Must Have Updates
             if (ai.VelocityUpdateTick != session.Tick)
             {
                 ai.TopEntityVolume.Center = comp.TopEntity.PositionComp.WorldVolume.Center;
-                ai.TopEntityVel = comp.TopEntity.Physics?.LinearVelocity ?? Vector3D.Zero;
+                ai.TopEntityVel = comp.TopEntity.Physics?.LinearVelocity ?? Vector3.Zero;
                 ai.IsStatic = comp.TopEntity.Physics?.IsStatic ?? false;
                 ai.VelocityUpdateTick = session.Tick;
             }
+            var shooterVel = (Vector3D)weapon.Comp.Ai.TopEntityVel;
+            var ammoDef = weapon.ActiveAmmoDef.AmmoDef;
+            var projectileMaxSpeed = ammoDef.Const.DesiredProjectileSpeed;
+            var updateGravity = ammoDef.Const.FeelsGravity && ai.InPlanetGravity;
+            var useSimple = basicPrediction || ammoDef.Const.AmmoSkipAccel || targetAcc.LengthSquared() < 2.5; //equal to approx 1.58 m/s
 
             if (updateGravity && session.Tick - weapon.GravityTick > 119)
             {
@@ -957,8 +956,8 @@ internal static Vector3D TrajectoryEstimation(Weapon weapon, Vector3D targetPos,
             
             Vector3D deltaPosNorm;
 
-            var targCube = weapon.Target.TargetObject as MyCubeBlock;
-            if (!basicPrediction && trackAngular && targCube?.CubeGrid.Physics != null && targCube.CubeGrid.Physics.AngularVelocity.LengthSquared() > 0.0014)
+            var targCube = weapon.Target?.TargetObject as MyCubeBlock;
+            if (!basicPrediction && trackAngular && targCube != null && targCube.CubeGrid.Physics != null && targCube.CubeGrid.Physics.AngularVelocity.LengthSquared() > 0.0014)
             {
                 if (!ComputeAngular(targCube.CubeGrid, ai, ammoDef, ref targetPos, ref shooterPos, ref targetAcc, ref deltaVel, projectileMaxSpeed, out deltaLength, out initialTti, out deltaPos, out deltaPosNorm))
                     return targetPos;
diff --git a/Data/Scripts/CoreSystems/Session/SessionControls.cs b/Data/Scripts/CoreSystems/Session/SessionControls.cs
index f13be283..feb4b084 100644
--- a/Data/Scripts/CoreSystems/Session/SessionControls.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionControls.cs
@@ -8,7 +8,6 @@
 using Sandbox.ModAPI;
 using Sandbox.ModAPI.Interfaces.Terminal;
 using SpaceEngineers.Game.ModAPI;
-using VRage.ModAPI;
 using VRage.Utils;
 using static CoreSystems.Support.CoreComponent.Trigger;
 using static CoreSystems.Support.WeaponDefinition.AnimationDef.PartAnimationSetDef;
@@ -355,113 +354,143 @@ private void CustomControlHandler(IMyTerminalBlock block, List<IMyTerminalContro
 
         internal static void AlterActions<T>(Session session)
         {
+            try
+            { 
             List<IMyTerminalAction> actions;
             MyAPIGateway.TerminalControls.GetActions<T>(out actions);
-            for (int i = 0; i < actions.Count; i++) {
-
-                var a = actions[i];
-
-                if (a.Id.Equals(ShootOnceModeStr) || !a.Id.Contains(ShootModeStr) && !a.Id.Contains("OnOff") && !a.Id.Contains("WC_") && !a.Id.Contains("Control"))
-                {
-                    a.Enabled = TerminalHelpers.NotWcBlock; // dont think this is needed and its really expensive
-                    session.AlteredActions.Add(a);
-                }
-                else if (a.Id.Equals("Control")) {
-
-                    a.Enabled = TerminalHelpers.NotWcOrIsTurret;
-                    session.AlteredActions.Add(a);
-                }
-                else if (a.Id.Equals("Shoot")) {
-
-                    var oldAction = a.Action;
-                    a.Action = blk => {
+            for (int i = 0; i < actions.Count; i++)
+                {                    
+                    var a = actions[i];
+                    try
+                    {
 
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready) {
-                            if (comp?.Data?.Repo == null)
-                                oldAction(blk);
-                            return;
+                        if (a.Id.Equals(ShootOnceModeStr) || !a.Id.Contains(ShootModeStr) && !a.Id.Contains("OnOff") && !a.Id.Contains("WC_") && !a.Id.Contains("Control"))
+                        {
+                            a.Enabled = TerminalHelpers.NotWcBlock; // dont think this is needed and its really expensive
+                            session.AlteredActions.Add(a);
                         }
+                        else if (a.Id.Equals("Control"))
+                        {
 
-                        var on = comp.Data.Repo.Values.State.Trigger == On;
-                        comp.ShootManager.RequestShootSync(I.PlayerId, on ? Weapon.ShootManager.RequestType.Off : Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
-                    };
-
-                    var oldWriter = a.Writer;
-                    a.Writer = (blk, sb) => {
-
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready) {
-                            oldWriter(blk, sb);
-                            return;
+                            a.Enabled = TerminalHelpers.NotWcOrIsTurret;
+                            session.AlteredActions.Add(a);
                         }
-                        if (comp.Data.Repo.Values.State.Trigger == On)
-                            sb.Append("On");
-                        else
-                            sb.Append("Off");
-                    };
-                    session.AlteredActions.Add(a);
-                }
-                else if (a.Id.Equals("Shoot_On")) {
-
-                    var oldAction = a.Action;
-                    a.Action = blk => {
+                        else if (a.Id.Equals("Shoot"))
+                        {
 
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready) {
-                            if (comp?.Data?.Repo == null) oldAction(blk);
-                            return;
+                            var oldAction = a.Action;
+                            a.Action = blk =>
+                            {
+
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    if (comp?.Data?.Repo == null)
+                                        oldAction(blk);
+                                    return;
+                                }
+
+                                var on = comp.Data.Repo.Values.State.Trigger == On;
+                                comp.ShootManager.RequestShootSync(I.PlayerId, on ? Weapon.ShootManager.RequestType.Off : Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
+                            };
+
+                            var oldWriter = a.Writer;
+                            a.Writer = (blk, sb) =>
+                            {
+
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    oldWriter(blk, sb);
+                                    return;
+                                }
+                                if (comp.Data.Repo.Values.State.Trigger == On)
+                                    sb.Append("On");
+                                else
+                                    sb.Append("Off");
+                            };
+                            session.AlteredActions.Add(a);
                         }
-                        if (comp.Data.Repo.Values.State.Trigger != On)
-                            comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
-                    };
-
-                    var oldWriter = a.Writer;
-                    a.Writer = (blk, sb) =>
-                    {
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                        else if (a.Id.Equals("Shoot_On"))
                         {
-                            oldWriter(blk, sb);
-                            return;
-                        }
-                        if (comp.Data.Repo.Values.State.Trigger == On)
-                            sb.Append("On");
-                        else
-                            sb.Append("Off");
-                    };
-                    session.AlteredActions.Add(a);
-                }
-                else if (a.Id.Equals("Shoot_Off")) {
-
-                    var oldAction = a.Action;
-                    a.Action = blk => {
 
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready) {
-                            if (comp?.Data?.Repo == null)  oldAction(blk);
-                            return;
+                            var oldAction = a.Action;
+                            a.Action = blk =>
+                            {
+
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    if (comp?.Data?.Repo == null) oldAction(blk);
+                                    return;
+                                }
+                                if (comp.Data.Repo.Values.State.Trigger != On)
+                                    comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
+                            };
+
+                            var oldWriter = a.Writer;
+                            a.Writer = (blk, sb) =>
+                            {
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    oldWriter(blk, sb);
+                                    return;
+                                }
+                                if (comp.Data.Repo.Values.State.Trigger == On)
+                                    sb.Append("On");
+                                else
+                                    sb.Append("Off");
+                            };
+                            session.AlteredActions.Add(a);
                         }
-                        if (comp.Data.Repo.Values.State.Trigger != Off)
-                            comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.Off);
-                    };
-
-                    var oldWriter = a.Writer;
-                    a.Writer = (blk, sb) => {
+                        else if (a.Id.Equals("Shoot_Off"))
+                        {
 
-                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready) {
-                            oldWriter(blk, sb);
-                            return;
+                            var oldAction = a.Action;
+                            a.Action = blk =>
+                            {
+
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    if (comp?.Data?.Repo == null) oldAction(blk);
+                                    return;
+                                }
+                                if (comp.Data.Repo.Values.State.Trigger != Off)
+                                    comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.Off);
+                            };
+
+                            var oldWriter = a.Writer;
+                            a.Writer = (blk, sb) =>
+                            {
+
+                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                                {
+                                    oldWriter(blk, sb);
+                                    return;
+                                }
+                                if (comp.Data.Repo.Values.State.Trigger == On)
+                                    sb.Append("On");
+                                else
+                                    sb.Append("Off");
+                            };
+                            session.AlteredActions.Add(a);
                         }
-                        if (comp.Data.Repo.Values.State.Trigger == On)
-                            sb.Append("On");
-                        else
-                            sb.Append("Off");
-                    };
-                    session.AlteredActions.Add(a);
+                    }
+                    catch (Exception ex)
+                    {
+                        MyLog.Default.WriteLine($"WC:  Alter actions crashed inside For loop on {a.Id}");
+                        throw ex;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                MyLog.Default.WriteLine($"WC:  Alter actions crashed outside For loop checking {typeof(T).Name}");
+                throw ex;
+            }
         }
 
         private static HashSet<string> _visibleControls = new HashSet<string> 

From af7c0ecbf79b14471e2679dc91ad4539cd317c6c Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sat, 1 Jun 2024 20:25:48 -0500
Subject: [PATCH 02/25] Crash message clarification and focus clarification

---
 Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs | 5 ++++-
 Data/Scripts/CoreSystems/Support/Localization.cs    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs b/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
index a8dca7ae..791c35a9 100644
--- a/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
@@ -773,7 +773,10 @@ internal PlatformState PlatformCrash(CoreComponent comp, bool markInvalid, bool
             
             if (Session.I.HandlesInput) {
                 if (suppress)
-                    MyAPIGateway.Utilities.ShowNotification($"CoreSystems hard crashed during block init, shutting down\n Send log files to server admin or submit a bug report to mod author:\n {comp.Platform?.Structure?.ModPath} - {comp.SubtypeName}", 10000);
+                    MyAPIGateway.Utilities.ShowNotification($"CoreSystems hard crashed during block init, shutting down\n" +
+                        $"Ensure you don't have duplicate weapons from different mods.\n" +
+                        $"Send log files to server admin or submit a bug report to mod author.\n" +
+                        $"Crashed mod ID and block name: {comp.Platform?.Structure?.ModId} - {comp.SubtypeName}", 10000);
             }
             Log.Line($"PlatformCrash: {Comp.SubtypeName} - {message}");
 
diff --git a/Data/Scripts/CoreSystems/Support/Localization.cs b/Data/Scripts/CoreSystems/Support/Localization.cs
index 31d5c05c..c90a3be2 100644
--- a/Data/Scripts/CoreSystems/Support/Localization.cs
+++ b/Data/Scripts/CoreSystems/Support/Localization.cs
@@ -61,7 +61,7 @@ public static class Localization
                         { "TerminalGridsTitle", "Target Grids" },
                         { "TerminalGridsTooltip", "Target Grids" },
                         { "TerminalFocusFireTitle", "Target FocusFire" },
-                        { "TerminalFocusFireTooltip", "Focus all fire on the specified target" },
+                        { "TerminalFocusFireTooltip", "Only fire on the hud-selected target" },
                         { "TerminalSubSystemsTitle", "Target SubSystems" },
                         { "TerminalSubSystemsTooltip", "Target specific SubSystems of a target" },
                         { "TerminalRepelTitle", "Repel Mode" },

From 6e3b18da37176e29e960d8dcda50c6976cff5d86 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 2 Jun 2024 09:58:01 -0500
Subject: [PATCH 03/25] Grav align particle option

---
 Data/Scripts/CoreSystems/AudioVisual/AvShot.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
index 2e4ab009..09360561 100644
--- a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
+++ b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
@@ -1309,7 +1309,19 @@ internal void AvClose()
                         
                         var particle = AmmoDef.AmmoGraphics.Particles.Hit;
                         var keenStrikesAgain = particle.Offset == Vector3D.MaxValue;
-                        var matrix = !keenStrikesAgain ? MatrixD.CreateTranslation(pos) : MatrixD.CreateWorld(pos, VisualDir, OriginUp);
+                        MatrixD matrix = MatrixD.CreateTranslation(pos);
+                        if(keenStrikesAgain)
+                        {
+                            matrix = MatrixD.CreateWorld(pos, VisualDir, OriginUp);
+                        }
+                        else if (particle.Offset == Vector3D.MinValue && c.FeelsGravity)
+                        {
+                            float interference;
+                            Vector3D localGrav = Session.I.Physics.CalculateNaturalGravityAt(pos, out interference);
+                            localGrav.Normalize();
+                            if(localGrav != Vector3D.Zero)
+                                matrix = MatrixD.CreateWorld(pos, VisualDir, -localGrav);
+                        }
                         MyParticleEffect detEffect;
                         if (MyParticlesManager.TryCreateParticleEffect(a.Const.DetParticleStr, ref matrix, ref pos, uint.MaxValue, out detEffect))
                         {

From 28ab8c3601f1c9a3c788b07862f17ac6422164eb Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 2 Jun 2024 09:59:32 -0500
Subject: [PATCH 04/25] Update

---
 Data/Scripts/CoreSystems/AudioVisual/AvShot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
index 09360561..0278e837 100644
--- a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
+++ b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
@@ -1314,7 +1314,7 @@ internal void AvClose()
                         {
                             matrix = MatrixD.CreateWorld(pos, VisualDir, OriginUp);
                         }
-                        else if (particle.Offset == Vector3D.MinValue && c.FeelsGravity)
+                        else if (particle.Offset == Vector3D.MinValue)
                         {
                             float interference;
                             Vector3D localGrav = Session.I.Physics.CalculateNaturalGravityAt(pos, out interference);

From de07e1527073a5297b592a6fc14fc903d06e689a Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 2 Jun 2024 10:07:29 -0500
Subject: [PATCH 05/25] sync updates

---
 Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs     | 3 ++-
 Data/Scripts/CoreSystems/Definitions/CoreSystems.cs         | 5 +++--
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs     | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 26043637..1a5a12e4 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -515,7 +515,8 @@ public struct LoadingDef
                 [ProtoMember(23)] internal bool GoHomeToReload;
                 [ProtoMember(24)] internal bool DropTargetUntilLoaded;
                 [ProtoMember(25)] internal bool ProhibitCoolingWhenOff;
-
+                [ProtoMember(26)] internal float InventoryFillAmount;
+                [ProtoMember(27)] internal float InventoryLowAmount;
             }
 
 
diff --git a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
index f1cd9c31..fce9965b 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
@@ -232,6 +232,7 @@ public AmmoType(AmmoDef ammoDef, MyDefinitionId ammoDefinitionId, MyDefinitionId
         public readonly float MaxTargetRadius;
         public readonly float MaxAmmoVolume;
         public readonly float FullAmmoVolume;
+        public readonly float LowAmmoVolume;
         public readonly float FiringSoundDistSqr;
         public readonly float ReloadSoundDistSqr;
         public readonly float BarrelSoundDistSqr;
@@ -278,8 +279,8 @@ public WeaponSystem(WeaponStructure structure, MyStringHash partNameIdHash, MySt
             PartName = partName;
             AmmoTypes = weaponAmmoTypes;
             MaxAmmoVolume = Values.HardPoint.HardWare.InventorySize;
-            FullAmmoVolume = MaxAmmoVolume * 0.75f;
-            CeaseFireDelay = values.HardPoint.DelayCeaseFire;
+            FullAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryFillAmount > 0 ? values.HardPoint.Loading.InventoryFillAmount : 0.75f);
+            LowAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryLowAmount > 0 ? values.HardPoint.Loading.InventoryLowAmount : 0.25f); CeaseFireDelay = values.HardPoint.DelayCeaseFire;
             DelayCeaseFire = CeaseFireDelay > 0;
             DelayToFire = values.HardPoint.Loading.DelayUntilFire;
             StayCharged = values.HardPoint.Loading.StayCharged || WConst.ReloadTime == 0;
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
index e34c671a..836d2d57 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
@@ -184,6 +184,8 @@ internal bool ClientReload(bool networkCaller = false)
             return true;
         }
 
+        //TODO account for float rounding errors to int here and in later inv pulling
+
         internal bool ComputeServerStorage(bool calledFromReload = false)
         {
             var s = Session.I;
@@ -197,11 +199,11 @@ internal bool ComputeServerStorage(bool calledFromReload = false)
                 {
                     Comp.CurrentInventoryVolume = (float)Comp.CoreInventory.CurrentVolume;
                     var freeVolume = System.MaxAmmoVolume - Comp.CurrentInventoryVolume;
-                    var spotsFree = (int)(freeVolume / ActiveAmmoDef.AmmoDef.Const.MagVolume);
+                    var spotsFree = (int)(freeVolume / ActiveAmmoDef.AmmoDef.Const.MagVolume + .0001f);
                     Reload.CurrentMags = Comp.CoreInventory.GetItemAmount(ActiveAmmoDef.AmmoDefinitionId).ToIntSafe();
                     CurrentAmmoVolume = Reload.CurrentMags * ActiveAmmoDef.AmmoDef.Const.MagVolume;
 
-                    var magsRequested = (int)((System.FullAmmoVolume - CurrentAmmoVolume) / ActiveAmmoDef.AmmoDef.Const.MagVolume);
+                    var magsRequested = (int)((System.FullAmmoVolume - CurrentAmmoVolume) / ActiveAmmoDef.AmmoDef.Const.MagVolume + .0001f);
                     var magsGranted = magsRequested > spotsFree ? spotsFree : magsRequested;
                     var requestedVolume = ActiveAmmoDef.AmmoDef.Const.MagVolume * magsGranted;
                     var spaceAvailable = freeVolume > requestedVolume;

From 02fe44cf7dc77bab929248402cd3bc73bbba91c3 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 2 Jun 2024 10:57:44 -0500
Subject: [PATCH 06/25] Add speed variance to ejected components

---
 Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs   | 1 +
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 1a5a12e4..4b44284e 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -1006,6 +1006,7 @@ public enum SpawnType
                 [ProtoMember(2)] internal float SpawnChance;
                 [ProtoMember(3)] internal SpawnType Type;
                 [ProtoMember(4)] internal ComponentDef CompDef;
+                [ProtoMember(5)] internal Randomize SpeedVariance;
 
                 [ProtoContract]
                 public struct ComponentDef
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
index 8140c1a5..a39e63a0 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
@@ -463,7 +463,13 @@ private void SetSpeed(object o)
             if (entity?.Physics != null && ActiveAmmoDef?.AmmoDef != null && !entity.MarkedForClose) {
                 
                 var ejectDef = ActiveAmmoDef.AmmoDef.Ejection;
-                entity.Physics.SetSpeeds(Ejector.CachedDir * (ejectDef.Speed), Vector3.Zero);
+                var min = ejectDef.SpeedVariance.Start;
+                var max = ejectDef.SpeedVariance.End;
+                var speedVariance = 0f;
+                if (min != 0f || max != 0f)
+                    speedVariance = (float)new XorShiftRandomStruct((ulong)entity.EntityId).NextDouble() * (max - min) + min;
+
+                entity.Physics.SetSpeeds(Ejector.CachedDir * (ejectDef.Speed + speedVariance), Vector3.Zero);
             }
         }
 

From fff47a62685bbbbe00d89ff1a81704430e7e24ec Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 2 Jun 2024 11:38:22 -0500
Subject: [PATCH 07/25] Grav align particle fix

---
 Data/Scripts/CoreSystems/AudioVisual/AvShot.cs |  2 +-
 Data/Scripts/CoreSystems/AudioVisual/RunAv.cs  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
index 0278e837..1085c15d 100644
--- a/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
+++ b/Data/Scripts/CoreSystems/AudioVisual/AvShot.cs
@@ -1320,7 +1320,7 @@ internal void AvClose()
                             Vector3D localGrav = Session.I.Physics.CalculateNaturalGravityAt(pos, out interference);
                             localGrav.Normalize();
                             if(localGrav != Vector3D.Zero)
-                                matrix = MatrixD.CreateWorld(pos, VisualDir, -localGrav);
+                                matrix = MatrixD.CreateWorld(pos, Vector3D.CalculatePerpendicularVector(localGrav), -localGrav);
                         }
                         MyParticleEffect detEffect;
                         if (MyParticlesManager.TryCreateParticleEffect(a.Const.DetParticleStr, ref matrix, ref pos, uint.MaxValue, out detEffect))
diff --git a/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs b/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
index 3b35ecf7..d2a0f9f3 100644
--- a/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
+++ b/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
@@ -146,7 +146,19 @@ internal void End()
                             var pos = Session.I.Tick - av.Hit.HitTick <= 1 && !MyUtils.IsZero(av.Hit.SurfaceHit) ? av.Hit.SurfaceHit : av.TracerFront;
                             var particle = av.AmmoDef.AmmoGraphics.Particles.Hit;
                             var keenStrikesAgain = particle.Offset == Vector3D.MaxValue;
-                            var matrix = !keenStrikesAgain ? MatrixD.CreateTranslation(pos) : MatrixD.CreateWorld(pos, av.VisualDir, av.OriginUp);
+                            MatrixD matrix = MatrixD.CreateTranslation(pos);
+                            if (keenStrikesAgain)
+                            {
+                                matrix = MatrixD.CreateWorld(pos, av.VisualDir, av.OriginUp);
+                            }
+                            else if (particle.Offset == Vector3D.MinValue)
+                            {
+                                float interference;
+                                Vector3D localGrav = Session.I.Physics.CalculateNaturalGravityAt(pos, out interference);
+                                localGrav.Normalize();
+                                if (localGrav != Vector3D.Zero)
+                                    matrix = MatrixD.CreateWorld(pos, Vector3D.CalculatePerpendicularVector(localGrav), -localGrav);
+                            }
 
                             MyParticleEffect hitEffect;
                             if (MyParticlesManager.TryCreateParticleEffect(av.AmmoDef.Const.HitParticleStr, ref matrix, ref pos, uint.MaxValue, out hitEffect))

From afdc99beac1a081cbf73ea11c3fa2bfe3e21ef35 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:05:50 -0500
Subject: [PATCH 08/25] Ejector RNG

---
 .../Definitions/CoreDefinitions.cs            |  4 ++
 .../EntityComp/Parts/Weapon/WeaponShoot.cs    | 37 ++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 4b44284e..c5aa293b 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -1007,6 +1007,10 @@ public enum SpawnType
                 [ProtoMember(3)] internal SpawnType Type;
                 [ProtoMember(4)] internal ComponentDef CompDef;
                 [ProtoMember(5)] internal Randomize SpeedVariance;
+                [ProtoMember(6)] internal Randomize DirectionVariance;
+                [ProtoMember(7)] internal Vector3D Rotation;
+                [ProtoMember(8)] internal Randomize RotationVariance;
+
 
                 [ProtoContract]
                 public struct ComponentDef
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
index a39e63a0..6a302b64 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
@@ -461,15 +461,40 @@ private void SetSpeed(object o)
             var entity = (MyEntity)o;
 
             if (entity?.Physics != null && ActiveAmmoDef?.AmmoDef != null && !entity.MarkedForClose) {
-                
+               
                 var ejectDef = ActiveAmmoDef.AmmoDef.Ejection;
-                var min = ejectDef.SpeedVariance.Start;
-                var max = ejectDef.SpeedVariance.End;
+                var speedMin = ejectDef.SpeedVariance.Start;
+                var speedMax = ejectDef.SpeedVariance.End;
+                var randSpeed = speedMin != 0f || speedMax != 0f;
+                var dirMin = ejectDef.DirectionVariance.Start;
+                var dirMax = ejectDef.DirectionVariance.End;
+                var randDir = dirMin != 0f || dirMax != 0f;
+                var rotMin = ejectDef.RotationVariance.Start;
+                var rotMax = ejectDef.RotationVariance.End;
+                var randRot = rotMin != 0f || rotMax != 0f;
+                var needsRand = randSpeed || randDir || randRot;
+                
                 var speedVariance = 0f;
-                if (min != 0f || max != 0f)
-                    speedVariance = (float)new XorShiftRandomStruct((ulong)entity.EntityId).NextDouble() * (max - min) + min;
+                var rotation = ejectDef.Rotation;
+                var direction = Ejector.CachedDir;
+                var speed = ejectDef.Speed;
 
-                entity.Physics.SetSpeeds(Ejector.CachedDir * (ejectDef.Speed + speedVariance), Vector3.Zero);
+                if (needsRand)
+                {
+                    var rand = new XorShiftRandomStruct((ulong)entity.EntityId);
+                    if (randSpeed)
+                        speedVariance = (float)rand.NextDouble() * (speedMax - speedMin) + speedMin;
+                    if (randDir)
+                    {
+                        direction += new Vector3D(rand.NextDouble() * (dirMax - dirMin) + dirMin, rand.NextDouble() * (dirMax - dirMin) + dirMin, rand.NextDouble() * (dirMax - dirMin) + dirMin);
+                        direction.Normalize();
+                    }
+                    if (randRot)
+                    {
+                        rotation += new Vector3D(rand.NextDouble() * (rotMax - rotMin) + rotMin, rand.NextDouble() * (rotMax - rotMin) + rotMin, rand.NextDouble() * (rotMax - rotMin) + rotMin);
+                    }
+                }
+                entity.Physics.SetSpeeds(direction * speed, rotation);
             }
         }
 

From 4602dee8ebe20d6ee097ec9666a5054aded4c6b5 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:45:13 -0500
Subject: [PATCH 09/25] CTC stop beating a dead horse

---
 Data/Scripts/CoreSystems/Session/SessionUpdate.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/Session/SessionUpdate.cs b/Data/Scripts/CoreSystems/Session/SessionUpdate.cs
index e35f20ef..831d0092 100644
--- a/Data/Scripts/CoreSystems/Session/SessionUpdate.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionUpdate.cs
@@ -15,6 +15,7 @@
 using SpaceEngineers.Game.ModAPI;
 using VRage.Game.Entity;
 using VRage.Game;
+using VRage.Game.ModAPI;
 
 namespace CoreSystems
 {
@@ -627,6 +628,7 @@ private void AiLoop()
                         var weaponAcquires = ai.AcquireTargets && (aConst.RequiresTarget || w.RotorTurretTracking || w.ShootRequest.AcquireTarget);
                         var eTarget = w.Target.TargetObject as MyEntity;
                         var pTarget = w.Target.TargetObject as Projectile;
+                        var cTarget = w.Target.TargetObject as IMyCharacter;
                         if (!IsClient)
                         {
                             if (w.Target.HasTarget)
@@ -639,7 +641,7 @@ private void AiLoop()
                                 {
                                     w.Target.Reset(Tick, States.Expired, !wComp.ManualMode);
                                 }
-                                else if (eTarget != null && (eTarget.MarkedForClose || !rootConstruct.HadFocus && weaponAcquires && aConst.SkipAimChecks && !w.RotorTurretTracking || wComp.UserControlled && !w.System.SuppressFire))
+                                else if (eTarget != null && (eTarget.MarkedForClose || (cTarget!= null && (cTarget.IsDead || cTarget.Integrity <= 0)) || !rootConstruct.HadFocus && weaponAcquires && aConst.SkipAimChecks && !w.RotorTurretTracking || wComp.UserControlled && !w.System.SuppressFire))
                                 {
                                     w.Target.Reset(Tick, States.Expired);
                                 }

From 17fcda50a177b5846d89694f1dc09ce8331cf3c9 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:33:43 -0500
Subject: [PATCH 10/25] Muzzle particle override from ammo

---
 Data/Scripts/CoreSystems/AudioVisual/RunAv.cs   | 17 ++++++++---------
 .../CoreSystems/Definitions/CoreDefinitions.cs  |  1 +
 .../SerializedConfigs/AmmoConstants.cs          |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs b/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
index d2a0f9f3..53c7882a 100644
--- a/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
+++ b/Data/Scripts/CoreSystems/AudioVisual/RunAv.cs
@@ -811,7 +811,8 @@ internal void RunAvEffects1()
                 var weapon = avEffect.Weapon;
                 var muzzle = avEffect.Muzzle;
                 var ticksAgo = Session.I.Tick - avEffect.StartTick;
-                var bAv = weapon.System.Values.HardPoint.Graphics.Effect1;
+                var ammoParticleOverride = weapon.ActiveAmmoDef.AmmoDef.Const.OverrideWeaponEffect;
+                var bAv = ammoParticleOverride ? weapon.ActiveAmmoDef.AmmoDef.AmmoGraphics.Particles.WeaponEffect1Override : weapon.System.Values.HardPoint.Graphics.Effect1;
                 var effect = weapon.Effects1[muzzle.MuzzleId];
 
                 var effectExists = effect != null;
@@ -845,18 +846,17 @@ internal void RunAvEffects1()
                 }
 
 
-                var particles = weapon.System.Values.HardPoint.Graphics.Effect1;
                 var renderId = info.Entity.Render.GetRenderObjectID();
                 var matrix = info.DummyMatrix;
                 var pos = info.Position;
-                matrix.Translation = info.LocalPosition + particles.Offset;
+                matrix.Translation = info.LocalPosition + bAv.Offset;
 
                 if (!effectExists && ticksAgo <= 0)
                 {
                     MyParticleEffect newEffect;
-                    if (MyParticlesManager.TryCreateParticleEffect(particles.Name, ref matrix, ref pos, renderId, out newEffect))
+                    if (MyParticlesManager.TryCreateParticleEffect(bAv.Name, ref matrix, ref pos, renderId, out newEffect))
                     {
-                        newEffect.UserScale = particles.Extras.Scale;
+                        newEffect.UserScale = bAv.Extras.Scale;
                         if (newEffect.Loop)
                         {
                             weapon.Effects1[muzzle.MuzzleId] = newEffect;
@@ -920,18 +920,17 @@ internal void RunAvEffects2()
                     weapon.Comp.Ai.VelocityUpdateTick = Session.I.Tick;
                 }
 
-                var particles = weapon.System.Values.HardPoint.Graphics.Effect2;
                 var renderId = info.Entity.Render.GetRenderObjectID();
                 var matrix = info.DummyMatrix;
                 var pos = info.Position;
-                matrix.Translation = info.LocalPosition + particles.Offset;
+                matrix.Translation = info.LocalPosition + bAv.Offset;
 
                 if (!effectExists && ticksAgo <= 0)
                 {
                     MyParticleEffect newEffect;
-                    if (MyParticlesManager.TryCreateParticleEffect(particles.Name, ref matrix, ref pos, renderId, out newEffect))
+                    if (MyParticlesManager.TryCreateParticleEffect(bAv.Name, ref matrix, ref pos, renderId, out newEffect))
                     {
-                        newEffect.UserScale = particles.Extras.Scale;
+                        newEffect.UserScale = bAv.Extras.Scale;
 
                         if (newEffect.Loop)
                         {
diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index c5aa293b..4e460f37 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -815,6 +815,7 @@ public struct AmmoParticleDef
                     [ProtoMember(1)] internal ParticleDef Ammo;
                     [ProtoMember(2)] internal ParticleDef Hit;
                     [ProtoMember(3)] internal ParticleDef Eject;
+                    [ProtoMember(4)] internal ParticleDef WeaponEffect1Override;
                 }
 
                 [ProtoContract]
diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
index b74402a4..f98057fd 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
@@ -243,6 +243,7 @@ public enum Texture
         public readonly bool ZeroEffortNav;
         public readonly bool ProjectilesFirst;
         public readonly bool OnHit;
+        public readonly bool OverrideWeaponEffect;
         public readonly float LargeGridDmgScale;
         public readonly float SmallGridDmgScale;
         public readonly float OffsetRatio;
@@ -410,6 +411,7 @@ internal AmmoConstants(WeaponSystem.AmmoType ammo, WeaponDefinition wDef, Weapon
             HitParticle = !string.IsNullOrEmpty(ammo.AmmoDef.AmmoGraphics.Particles.Hit.Name);
             HitParticleStr = ammo.AmmoDef.AmmoGraphics.Particles.Hit.Name;
             EndOfLifeAv = !ammo.AmmoDef.AreaOfDamage.EndOfLife.NoVisuals && ammo.AmmoDef.AreaOfDamage.EndOfLife.Enable;
+            OverrideWeaponEffect = !string.IsNullOrEmpty(ammo.AmmoDef.AmmoGraphics.Particles.WeaponEffect1Override.Name);
 
             DrawLine = ammo.AmmoDef.AmmoGraphics.Lines.Tracer.Enable;
             

From 8a3626a89eff9d4ad61ec09e73c6e9472cf7b8ac Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:10:18 -0500
Subject: [PATCH 11/25] Ammo terminal name option

---
 Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs      | 2 ++
 .../Definitions/SerializedConfigs/AmmoConstants.cs           | 2 ++
 .../Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs      | 1 +
 .../CoreSystems/EntityComp/Controls/Weapon/WeaponActions.cs  | 2 +-
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs        | 5 +++--
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponFields.cs      | 1 +
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs      | 3 +++
 7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 4e460f37..3324cdaf 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -657,6 +657,8 @@ public class AmmoDef
             [ProtoMember(29)] internal bool NpcSafe;
             [ProtoMember(30)] internal SynchronizeDef Sync;
             [ProtoMember(31)] internal bool NoGridOrArmorScaling;
+            [ProtoMember(32)] internal string TerminalName;
+
 
             [ProtoContract]
             public struct SynchronizeDef
diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
index f98057fd..a02274e7 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
@@ -80,6 +80,7 @@ public enum Texture
         public readonly string DetParticleStr;
         public readonly string DetSoundStr;
         public readonly string ShotSoundStr;
+        public readonly string TerminalName;
         public readonly int ApproachesCount;
         public readonly int MaxObjectsHit;
         public readonly int TargetLossTime;
@@ -393,6 +394,7 @@ internal AmmoConstants(WeaponSystem.AmmoType ammo, WeaponDefinition wDef, Weapon
             IsDrone = ammo.AmmoDef.Trajectory.Guidance == TrajectoryDef.GuidanceType.DroneAdvanced;
             TravelTo = ammo.AmmoDef.Trajectory.Guidance == TrajectoryDef.GuidanceType.TravelTo;
             IsTurretSelectable = !ammo.IsShrapnel && ammo.AmmoDef.HardPointUsable;
+            TerminalName = string.IsNullOrEmpty(ammo.AmmoDef.TerminalName) ? ammo.AmmoDef.TerminalName : ammo.AmmoDef.AmmoRound;
 
             ComputeSmarts(ammo, out IsSmart, out Roam, out NoTargetApproach, out AccelClearance, out OverrideTarget, out TargetOffSet,
                 out FocusOnly, out FocusEviction, out NoSteering, out AdvancedSmartSteering, out KeepAliveAfterTargetLoss, out NoTargetExpire, out ZeroEffortNav, out ScanRange, out OffsetMinRangeSqr,
diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
index 963a2fd5..0740fe4e 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
@@ -284,6 +284,7 @@ public void Sync(Weapon w, ProtoWeaponReload sync, bool force)
                     if (newReload)
                     {
                         w.AmmoName = w.System.AmmoTypes[AmmoTypeId].AmmoDef.AmmoRound;
+                        w.AmmoNameTerminal = w.System.AmmoTypes[AmmoTypeId].AmmoDef.TerminalName;
                         w.DelayedCycleId = -1;
                     }
 
diff --git a/Data/Scripts/CoreSystems/EntityComp/Controls/Weapon/WeaponActions.cs b/Data/Scripts/CoreSystems/EntityComp/Controls/Weapon/WeaponActions.cs
index 9d35f701..6b5bdfd0 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Controls/Weapon/WeaponActions.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Controls/Weapon/WeaponActions.cs
@@ -734,7 +734,7 @@ internal static void AmmoSelectionWriter(IMyTerminalBlock blk, StringBuilder sb)
             var comp = blk.Components.Get<CoreComponent>() as Weapon.WeaponComponent;
             if (comp == null || comp.Platform.State != CorePlatform.PlatformState.Ready || comp.ConsumableSelectionPartIds.Count == 0) return;
             var w = comp.Collection[comp.ConsumableSelectionPartIds[0]];
-            sb.Append(w.AmmoName);
+            sb.Append(w.AmmoNameTerminal);
         }
 
         internal static void RepelWriter(IMyTerminalBlock blk, StringBuilder sb)
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
index 46f17c8a..dcea748e 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
@@ -175,6 +175,7 @@ internal void OnAddedToSceneWeaponTasks(bool firstRun)
                     {
                         w.ChangeActiveAmmoClient();
                         w.AmmoName = w.ActiveAmmoDef.AmmoDef.AmmoRound;
+                        w.AmmoNameTerminal = w.ActiveAmmoDef.AmmoDef.TerminalName;
                     }
 
                     if (w.ActiveAmmoDef.AmmoDef == null || !w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable && w.System.AmmoTypes.Length > 1)
@@ -1209,9 +1210,9 @@ internal void UpdateAmmoList()
                     {
                         var ammo = ammos[j];
                         if (!ammo.AmmoDef.Const.IsTurretSelectable) continue;
-                        var ammoStr = ammo.AmmoDef.AmmoRound;
+                        var ammoStr = ammo.AmmoDef.TerminalName;
                         if (wep.DelayedCycleId != -1 && wep.AmmoName.EndsWith(ammo.AmmoDef.AmmoRound))
-                            ammoStr = wep.AmmoName;
+                            ammoStr = "*" + ammo.AmmoDef.TerminalName;
 
                         BlockUi.AmmoList.Add(new MyTerminalControlComboBoxItem { Key = j, Value = MyStringId.GetOrCompute(ammoStr) });
                     }
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponFields.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponFields.cs
index 00e68946..68c4f9d7 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponFields.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponFields.cs
@@ -125,6 +125,7 @@ public partial class Weapon : Part
         internal string FriendlyNameNoSubsystem = string.Empty;
 
         internal string AmmoName = "";
+        internal string AmmoNameTerminal = "";
         internal ProtoWeaponPartState PartState;
         internal ProtoWeaponReload Reload;
         internal ProtoWeaponTransferTarget TargetData;
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
index 836d2d57..1d517d7e 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
@@ -33,6 +33,7 @@ internal void ChangeActiveAmmoServer()
                 Reload.CurrentMags = Comp.TypeSpecific != CompTypeSpecific.Phantom ? Comp.CoreInventory.GetItemAmount(ActiveAmmoDef.AmmoDefinitionId).ToIntSafe() : int.MaxValue;
 
             AmmoName = ActiveAmmoDef.AmmoDef.AmmoRound;
+            AmmoNameTerminal = ActiveAmmoDef.AmmoDef.TerminalName;
 
             CheckInventorySystem = true;
 
@@ -79,6 +80,7 @@ internal void QueueAmmoChange(int newAmmoId)
             {
                 DelayedCycleId = newAmmoId;
                 AmmoName = System.AmmoTypes[newAmmoId].AmmoNameQueued;
+                AmmoNameTerminal = "*" + System.AmmoTypes[newAmmoId].AmmoDef.TerminalName;
 
                 if (Session.I.IsClient && !System.DesignatorWeapon)
                     ChangeAmmo(newAmmoId);
@@ -386,6 +388,7 @@ internal void Reloaded(object o = null)
                     if (DelayedCycleId == ActiveAmmoDef.AmmoDef.Const.AmmoIdxPos)
                     {
                         AmmoName = ActiveAmmoDef.AmmoDef.AmmoRound;
+                        AmmoNameTerminal = ActiveAmmoDef.AmmoDef.TerminalName;
                         DelayedCycleId = -1;
                     }
 

From e12765ef25367114861794e7298fa02635917824 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:50:03 -0500
Subject: [PATCH 12/25] Terminal name const ref

---
 .../Definitions/SerializedConfigs/AmmoConstants.cs          | 2 +-
 .../Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs     | 2 +-
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs       | 6 +++---
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
index a02274e7..51acb2fd 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
@@ -394,7 +394,7 @@ internal AmmoConstants(WeaponSystem.AmmoType ammo, WeaponDefinition wDef, Weapon
             IsDrone = ammo.AmmoDef.Trajectory.Guidance == TrajectoryDef.GuidanceType.DroneAdvanced;
             TravelTo = ammo.AmmoDef.Trajectory.Guidance == TrajectoryDef.GuidanceType.TravelTo;
             IsTurretSelectable = !ammo.IsShrapnel && ammo.AmmoDef.HardPointUsable;
-            TerminalName = string.IsNullOrEmpty(ammo.AmmoDef.TerminalName) ? ammo.AmmoDef.TerminalName : ammo.AmmoDef.AmmoRound;
+            TerminalName = string.IsNullOrEmpty(ammo.AmmoDef.TerminalName) ? ammo.AmmoDef.AmmoRound : ammo.AmmoDef.TerminalName;
 
             ComputeSmarts(ammo, out IsSmart, out Roam, out NoTargetApproach, out AccelClearance, out OverrideTarget, out TargetOffSet,
                 out FocusOnly, out FocusEviction, out NoSteering, out AdvancedSmartSteering, out KeepAliveAfterTargetLoss, out NoTargetExpire, out ZeroEffortNav, out ScanRange, out OffsetMinRangeSqr,
diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
index 0740fe4e..2147d6f3 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/Weapon/ProtoWeapon.cs
@@ -284,7 +284,7 @@ public void Sync(Weapon w, ProtoWeaponReload sync, bool force)
                     if (newReload)
                     {
                         w.AmmoName = w.System.AmmoTypes[AmmoTypeId].AmmoDef.AmmoRound;
-                        w.AmmoNameTerminal = w.System.AmmoTypes[AmmoTypeId].AmmoDef.TerminalName;
+                        w.AmmoNameTerminal = w.System.AmmoTypes[AmmoTypeId].AmmoDef.Const.TerminalName;
                         w.DelayedCycleId = -1;
                     }
 
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
index dcea748e..e483ffc2 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
@@ -175,7 +175,7 @@ internal void OnAddedToSceneWeaponTasks(bool firstRun)
                     {
                         w.ChangeActiveAmmoClient();
                         w.AmmoName = w.ActiveAmmoDef.AmmoDef.AmmoRound;
-                        w.AmmoNameTerminal = w.ActiveAmmoDef.AmmoDef.TerminalName;
+                        w.AmmoNameTerminal = w.ActiveAmmoDef.AmmoDef.Const.TerminalName;
                     }
 
                     if (w.ActiveAmmoDef.AmmoDef == null || !w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable && w.System.AmmoTypes.Length > 1)
@@ -1210,9 +1210,9 @@ internal void UpdateAmmoList()
                     {
                         var ammo = ammos[j];
                         if (!ammo.AmmoDef.Const.IsTurretSelectable) continue;
-                        var ammoStr = ammo.AmmoDef.TerminalName;
+                        var ammoStr = ammo.AmmoDef.Const.TerminalName;
                         if (wep.DelayedCycleId != -1 && wep.AmmoName.EndsWith(ammo.AmmoDef.AmmoRound))
-                            ammoStr = "*" + ammo.AmmoDef.TerminalName;
+                            ammoStr = "*" + ammo.AmmoDef.Const.TerminalName;
 
                         BlockUi.AmmoList.Add(new MyTerminalControlComboBoxItem { Key = j, Value = MyStringId.GetOrCompute(ammoStr) });
                     }
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
index 1d517d7e..e2d118c0 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
@@ -33,7 +33,7 @@ internal void ChangeActiveAmmoServer()
                 Reload.CurrentMags = Comp.TypeSpecific != CompTypeSpecific.Phantom ? Comp.CoreInventory.GetItemAmount(ActiveAmmoDef.AmmoDefinitionId).ToIntSafe() : int.MaxValue;
 
             AmmoName = ActiveAmmoDef.AmmoDef.AmmoRound;
-            AmmoNameTerminal = ActiveAmmoDef.AmmoDef.TerminalName;
+            AmmoNameTerminal = ActiveAmmoDef.AmmoDef.Const.TerminalName;
 
             CheckInventorySystem = true;
 
@@ -80,7 +80,7 @@ internal void QueueAmmoChange(int newAmmoId)
             {
                 DelayedCycleId = newAmmoId;
                 AmmoName = System.AmmoTypes[newAmmoId].AmmoNameQueued;
-                AmmoNameTerminal = "*" + System.AmmoTypes[newAmmoId].AmmoDef.TerminalName;
+                AmmoNameTerminal = "*" + System.AmmoTypes[newAmmoId].AmmoDef.Const.TerminalName;
 
                 if (Session.I.IsClient && !System.DesignatorWeapon)
                     ChangeAmmo(newAmmoId);
@@ -388,7 +388,7 @@ internal void Reloaded(object o = null)
                     if (DelayedCycleId == ActiveAmmoDef.AmmoDef.Const.AmmoIdxPos)
                     {
                         AmmoName = ActiveAmmoDef.AmmoDef.AmmoRound;
-                        AmmoNameTerminal = ActiveAmmoDef.AmmoDef.TerminalName;
+                        AmmoNameTerminal = ActiveAmmoDef.AmmoDef.Const.TerminalName;
                         DelayedCycleId = -1;
                     }
 

From 4c967ee00ca0975e9a1eb1ad249b3e280dd5fc15 Mon Sep 17 00:00:00 2001
From: Aristeas <94058548+Jnick-24@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:34:22 -0500
Subject: [PATCH 13/25] Add descriptions to CoreSystemsPbApi.cs

---
 .../CoreSystems/Api/CoreSystemsPbApi.cs       | 461 +++++++++++++++++-
 1 file changed, 457 insertions(+), 4 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs b/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
index 4418b477..82a4e473 100644
--- a/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
+++ b/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Sandbox.ModAPI.Ingame;
 using Sandbox.ModAPI.Interfaces;
@@ -9,7 +9,7 @@
 namespace CoreSystems.Api
 {
     /// <summary>
-    /// https://github.com/sstixrud/CoreSystems/blob/master/BaseData/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
+    /// https://github.com/Ash-LikeSnow/WeaponCore/edit/master/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
     /// </summary>
     public class WcPbApi
     {
@@ -56,6 +56,18 @@ public class WcPbApi
         private Func<Sandbox.ModAPI.Ingame.IMyTerminalBlock, MyTuple<bool, bool>> _isInRange;
         private Action<Sandbox.ModAPI.Ingame.IMyTerminalBlock, int, Action<int, bool>> _monitorEvents;
         private Action<Sandbox.ModAPI.Ingame.IMyTerminalBlock, int, Action<int, bool>> _unmonitorEvents;
+
+        // Descriptions made by Aristeas, with Sigmund Froid's https://steamcommunity.com/sharedfiles/filedetails/?id=2178802013 as a reference.
+
+        /// <summary>
+        /// Activates the WcPbAPI using <see cref="IMyTerminalBlock"/> <paramref name="pbBlock"/>.
+        /// </summary>
+        /// <remarks>
+        /// Recommended to use 'Me' in <paramref name="pbBlock"/> for simplicity.
+        /// </remarks>
+        /// <param name="pbBlock"></param>
+        /// <returns><see cref="true"/>  if all methods assigned correctly, <see cref="false"/>  otherwise</returns>
+        /// <exception cref="Exception">Throws exception if WeaponCore is not present</exception>
         public bool Activate(Sandbox.ModAPI.Ingame.IMyTerminalBlock pbBlock)
         {
             var dict = pbBlock.GetProperty("WcPbAPI")?.As<IReadOnlyDictionary<string, Delegate>>().GetValue(pbBlock);
@@ -63,6 +75,14 @@ public bool Activate(Sandbox.ModAPI.Ingame.IMyTerminalBlock pbBlock)
             return ApiAssign(dict);
         }
 
+        /// <summary>
+        /// Bulk calls <see cref="AssignMethod" /> for all WcPbAPI methods.
+        /// </summary>
+        /// <remarks>
+        /// Not useful for most scripts, but is public nonetheless.
+        /// </remarks>
+        /// <param name="delegates"></param>
+        /// <returns><see cref="true"/>  if all methods assigned correctly, <see cref="false"/>  otherwise</returns>
         public bool ApiAssign(IReadOnlyDictionary<string, Delegate> delegates)
         {
             if (delegates == null)
@@ -114,9 +134,21 @@ public bool ApiAssign(IReadOnlyDictionary<string, Delegate> delegates)
             return true;
         }
 
+        /// <summary>
+        /// Links method <paramref name="field"/> to internal API method of name <paramref name="name"/>
+        /// </summary>
+        /// <remarks>
+        /// Not useful for most scripts, but is public nonetheless.
+        /// </remarks>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="delegates"></param>
+        /// <param name="name"></param>
+        /// <param name="field"></param>
+        /// <exception cref="Exception"></exception>
         private void AssignMethod<T>(IReadOnlyDictionary<string, Delegate> delegates, string name, ref T field) where T : class
         {
-            if (delegates == null) {
+            if (delegates == null)
+            {
                 field = null;
                 return;
             }
@@ -131,112 +163,533 @@ private void AssignMethod<T>(IReadOnlyDictionary<string, Delegate> delegates, st
                     $"{GetType().Name} :: Delegate {name} is not type {typeof(T)}, instead it's: {del.GetType()}");
         }
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with <see cref="MyDefinitionId"/> of all loaded WeaponCore weapons.
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <seealso cref="GetAllCoreStaticLaunchers"/>
+        /// <seealso cref="GetAllCoreTurrets"/>
         public void GetAllCoreWeapons(ICollection<MyDefinitionId> collection) => _getCoreWeapons?.Invoke(collection);
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with <see cref="MyDefinitionId"/> of all loaded WeaponCore fixed weapons.
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <seealso cref="GetAllCoreWeapons"/>
+        /// <seealso cref="GetAllCoreTurrets"/>
         public void GetAllCoreStaticLaunchers(ICollection<MyDefinitionId> collection) =>
             _getCoreStaticLaunchers?.Invoke(collection);
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with <see cref="MyDefinitionId"/> of all loaded WeaponCore turret weapons.
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <seealso cref="GetAllCoreWeapons"/>
+        /// <seealso cref="GetAllCoreStaticLaunchers"/>
         public void GetAllCoreTurrets(ICollection<MyDefinitionId> collection) => _getCoreTurrets?.Invoke(collection);
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with <see cref="IDictionary{String, Int32}"/> of contents:
+        /// <list type="bullet">
+        /// <item>Key: Name of weapon.</item>
+        /// <item>Value: ID of weapon within <paramref name="weaponBlock"/>.</item>
+        /// </list>
+        /// </summary>
+        /// <param name="weaponBlock"></param>
+        /// <param name="collection"></param>
+        /// <returns></returns>
         public bool GetBlockWeaponMap(Sandbox.ModAPI.Ingame.IMyTerminalBlock weaponBlock, IDictionary<string, int> collection) =>
             _getBlockWeaponMap?.Invoke(weaponBlock, collection) ?? false;
 
+        /// <summary>
+        /// Returns a <see cref="MyTuple{bool, int, int}"/> containing information about projectiles targeting <paramref name="victim"/>.
+        /// </summary>
+        /// <param name="victim"></param>
+        /// <returns>
+        /// <see cref="MyTuple{bool, int, int}"/> with contents:
+        /// <list type="number">
+        /// <item><see cref="bool"/> Is being locked?</item>
+        /// <item><see cref="int"/> Number of locked projectiles.</item>
+        /// <item><see cref="int"/> Time (in ticks) locked.</item>
+        /// </list>
+        /// </returns>
         public MyTuple<bool, int, int> GetProjectilesLockedOn(long victim) =>
             _getProjectilesLockedOn?.Invoke(victim) ?? new MyTuple<bool, int, int>();
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with contents:
+        /// <list type="bullet">
+        /// <item>Key: Hostile <see cref="MyDetectedEntityInfo"/> within targeting range of <paramref name="pBlock"/>'s grid</item>
+        /// <item>Value: Threat level of Key</item>
+        /// </list>
+        /// </summary>
+        /// <param name="pBlock"></param>
+        /// <param name="collection"></param>
         public void GetSortedThreats(Sandbox.ModAPI.Ingame.IMyTerminalBlock pBlock, IDictionary<MyDetectedEntityInfo, float> collection) =>
             _getSortedThreats?.Invoke(pBlock, collection);
+
+        /// <summary>
+        /// Populates <paramref name="collection"/> with contents:
+        /// <list type="bullet">
+        /// <item>Friendly <see cref="MyDetectedEntityInfo"/> within targeting range of <paramref name="pBlock"/>'s <see cref="IMyCubeGrid"/></item>
+        /// </list>
+        /// </summary>
+        /// <param name="pBlock"></param>
+        /// <param name="collection"></param>
         public void GetObstructions(Sandbox.ModAPI.Ingame.IMyTerminalBlock pBlock, ICollection<Sandbox.ModAPI.Ingame.MyDetectedEntityInfo> collection) =>
             _getObstructions?.Invoke(pBlock, collection);
+
+        /// <summary>
+        /// Returns the GridAi Target with priority <paramref name="priority"/> of <see cref="IMyCubeGrid"/> with EntityID <paramref name="shooter"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the grid is valid but does not have a target, an empty <see cref="MyDetectedEntityInfo"/> is returned.
+        /// <para>
+        /// Default <paramref name="priority"/> = 0 returns the player-selected target.
+        /// </para>
+        /// </remarks>
+        /// <param name="shooter"></param>
+        /// <param name="priority"></param>
+        /// <returns>Nullable <see cref="MyDetectedEntityInfo"/>. Null if <paramref name="shooter"/> does not exist or lacks GridAi.</returns>
         public MyDetectedEntityInfo? GetAiFocus(long shooter, int priority = 0) => _getAiFocus?.Invoke(shooter, priority);
 
+        /// <summary>
+        /// Sets the GridAi Target of <paramref name="pBlock"/>'s <see cref="IMyCubeGrid"/> to EntityID <paramref name="target"/>.
+        /// </summary>
+        /// <remarks>
+        /// Default <paramref name="priority"/> = 0 sets the player-visible target.
+        /// </remarks>
+        /// <param name="pBlock"></param>
+        /// <param name="target"></param>
+        /// <param name="priority"></param>
+        /// <returns><see cref="true"/>  if successful, <see cref="false"/>  otherwise.</returns>
         public bool SetAiFocus(Sandbox.ModAPI.Ingame.IMyTerminalBlock pBlock, long target, int priority = 0) =>
             _setAiFocus?.Invoke(pBlock, target, priority) ?? false;
+
+        /// <summary>
+        /// Unsets the GridAi Target of <paramref name="pBlock"/>'s <see cref="IMyCubeGrid"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="playerId"/> may be set to 0.
+        /// </remarks>
+        /// <param name="pBlock"></param>
+        /// <param name="playerId"></param>
+        /// <returns><see cref="true"/>  if successful, <see cref="false"/>  otherwise.</returns>
         public bool ReleaseAiFocus(Sandbox.ModAPI.Ingame.IMyTerminalBlock pBlock, long playerId) =>
             _releaseAiFocus?.Invoke(pBlock, playerId) ?? false;
+
+        /// <summary>
+        /// Returns the WeaponAi target of <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <remarks>
+        /// Seems to always return null for static weapons.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>Nullable <see cref="MyDetectedEntityInfo"/>.</returns>
         public MyDetectedEntityInfo? GetWeaponTarget(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId = 0) =>
             _getWeaponTarget?.Invoke(weapon, weaponId);
 
+        /// <summary>
+        /// Sets the WeaponAi target of <paramref name="weaponId"/> on <paramref name="weapon"/> to EntityID <paramref name="target"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="target"></param>
+        /// <param name="weaponId"></param>
         public void SetWeaponTarget(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long target, int weaponId = 0) =>
             _setWeaponTarget?.Invoke(weapon, target, weaponId);
 
+        /// <summary>
+        /// Fires <paramref name="weaponId"/> on <paramref name="weapon"/> once.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="allWeapons"/> uses all weapons on <paramref name="weapon"/>.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="allWeapons"></param>
+        /// <param name="weaponId"></param>
         public void FireWeaponOnce(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, bool allWeapons = true, int weaponId = 0) =>
             _fireWeaponOnce?.Invoke(weapon, allWeapons, weaponId);
 
+        /// <summary>
+        /// Sets the Shoot On/Off toggle of <paramref name="weaponId"/> on <paramref name="weapon"/> to <see cref="bool"/> <paramref name="on"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="allWeapons"/> uses all weapons on <paramref name="weapon"/>.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="on"></param>
+        /// <param name="allWeapons"></param>
+        /// <param name="weaponId"></param>
         public void ToggleWeaponFire(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, bool on, bool allWeapons, int weaponId = 0) =>
             _toggleWeaponFire?.Invoke(weapon, on, allWeapons, weaponId);
 
+        /// <summary>
+        /// Returns whether or not <paramref name="weaponId"/> on <paramref name="weapon"/> is ready to fire.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="anyWeaponReady"/> uses all weapons on <paramref name="weapon"/>.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <param name="anyWeaponReady"></param>
+        /// <param name="shootReady"></param>
+        /// <returns><see cref="true"/> if ready to fire, <see cref="false"/> otherwise.</returns>
         public bool IsWeaponReadyToFire(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId = 0, bool anyWeaponReady = true,
             bool shootReady = false) =>
             _isWeaponReadyToFire?.Invoke(weapon, weaponId, anyWeaponReady, shootReady) ?? false;
 
+        /// <summary>
+        /// Returns the current Aiming Radius of <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns><see cref="float"/> range in meters.</returns>
         public float GetMaxWeaponRange(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId) =>
             _getMaxWeaponRange?.Invoke(weapon, weaponId) ?? 0f;
 
+        /// <summary>
+        /// Populates <paramref name="collection"/> with contents:
+        /// <list type="bullet">
+        /// <item><see cref="string"/> Allowed target type name for <paramref name="weaponId"/> on <paramref name="weapon"/>.</item>
+        /// </list>
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="collection"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>true if <paramref name="weaponId"/> and <paramref name="weapon"/> are valid, false otherwise.</returns>
         public bool GetTurretTargetTypes(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, IList<string> collection, int weaponId = 0) =>
             _getTurretTargetTypes?.Invoke(weapon, collection, weaponId) ?? false;
 
+        /// <summary>
+        /// Sets allowed target types for <paramref name="weaponId"/> on <paramref name="weapon"/> to <paramref name="collection"/>.
+        /// </summary>
+        /// <remarks>
+        /// Invalid target types are ignored.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="collection"></param>
+        /// <param name="weaponId"></param>
         public void SetTurretTargetTypes(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, IList<string> collection, int weaponId = 0) =>
             _setTurretTargetTypes?.Invoke(weapon, collection, weaponId);
 
+        /// <summary>
+        /// Sets the current Aiming Range of <paramref name="weapon"/> to <paramref name="range"/>.
+        /// </summary>
+        /// <remarks>
+        /// Values over the maximum possible Aiming Range of <paramref name="weapon"/> will set it to the maximum possible.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="range"></param>
         public void SetBlockTrackingRange(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, float range) =>
             _setBlockTrackingRange?.Invoke(weapon, range);
 
+        /// <summary>
+        /// Returns whether or not <paramref name="weaponId"/> on <paramref name="weapon"/> is aligned with EntityID <paramref name="targetEnt"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="targetEnt"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>true if aligned and valid, false otherwise.</returns>
         public bool IsTargetAligned(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long targetEnt, int weaponId) =>
             _isTargetAligned?.Invoke(weapon, targetEnt, weaponId) ?? false;
 
+        /// <summary>
+        /// Returns whether or not <paramref name="weaponId"/> on <paramref name="weapon"/> is aligned with EntityID <paramref name="targetEnt"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="targetEnt"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>
+        /// <see cref="MyTuple{bool, Vector3D}"/> with contents:
+        /// <list type="number">
+        /// <item><see cref="bool"/> Is aligned? False if invalid.</item>
+        /// <item><see cref="Vector3D"/> Position of target. Null if invalid.</item>
+        /// </list>
+        /// </returns>
         public MyTuple<bool, Vector3D?> IsTargetAlignedExtended(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long targetEnt, int weaponId) =>
             _isTargetAlignedExtended?.Invoke(weapon, targetEnt, weaponId) ?? new MyTuple<bool, Vector3D?>();
 
+        /// <summary>
+        /// Returns whether or not <paramref name="weaponId"/> on <paramref name="weapon"/> is aligned with EntityID <paramref name="targetEnt"/>.
+        /// </summary>
+        /// <remarks>
+        /// Like <see cref="IsTargetAligned"/>, but takes target velocity and acceleration into account.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="targetEnt"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>true if aligned and valid, false otherwise</returns>
         public bool CanShootTarget(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long targetEnt, int weaponId) =>
             _canShootTarget?.Invoke(weapon, targetEnt, weaponId) ?? false;
 
+        /// <summary>
+        /// Returns the lead position of <paramref name="weaponId"/> on <paramref name="weapon"/>, with target EntityId <paramref name="targetEnt"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="targetEnt"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>Nullable <see cref="Vector3D"/> target lead position. Null if target or weapon invalid.</returns>
         public Vector3D? GetPredictedTargetPosition(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long targetEnt, int weaponId) =>
             _getPredictedTargetPos?.Invoke(weapon, targetEnt, weaponId) ?? null;
 
+        /// <summary>
+        /// Returns the heat level of <paramref name="weapon"/>.
+        /// </summary>
+        /// <remarks>
+        /// If <paramref name="weapon"/> is invalid or does not have heat, returns 0f. Heat may exceed 1.0f in case of overheat.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <returns><see cref="float"/> heat as percentage between 0.0f and 1.0f</returns>
         public float GetHeatLevel(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon) => _getHeatLevel?.Invoke(weapon) ?? 0f;
+
+        /// <summary>
+        /// Returns current power consumption of <paramref name="weapon"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <returns><see cref="float"/> Power in MW</returns>
         public float GetCurrentPower(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon) => _currentPowerConsumption?.Invoke(weapon) ?? 0f;
+
+        /// <summary>
+        /// Returns maximum power consumption of <paramref name="weapon"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <returns><see cref="float"/> Power in MW</returns>
         public float GetMaxPower(MyDefinitionId weaponDef) => _getMaxPower?.Invoke(weaponDef) ?? 0f;
+
+        /// <summary>
+        /// Returns whether or not EntityId <paramref name="entity"/> has a GridAi.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns>true if GridAi present, false otherwise.</returns>
         public bool HasGridAi(long entity) => _hasGridAi?.Invoke(entity) ?? false;
+
+        /// <summary>
+        /// Returns whether or not <see cref="IMyTerminalBlock"/> <paramref name="weapon"/> has a WeaponCore weapon.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns>true if weapon present, false otherwise.</returns>
         public bool HasCoreWeapon(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon) => _hasCoreWeapon?.Invoke(weapon) ?? false;
+
+        /// <summary>
+        /// Returns the total optimal DPS of <see cref="IMyCubeGrid"/> with EntityId <paramref name="entity"/>.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns><see cref="float"/> DPS.</returns>
         public float GetOptimalDps(long entity) => _getOptimalDps?.Invoke(entity) ?? 0f;
 
+        /// <summary>
+        /// Returns the active ammo name of <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns><see cref="string"/> AmmoName</returns>
         public string GetActiveAmmo(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId) =>
             _getActiveAmmo?.Invoke(weapon, weaponId) ?? null;
 
+        /// <summary>
+        /// Sets the active ammo name of <paramref name="weaponId"/> on <paramref name="weapon"/> to <see cref="string"/> <paramref name="ammoType"/>.
+        /// </summary>
+        /// <remarks>
+        /// Does nothing if <paramref name="ammoType"/> is invalid.
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
         public void SetActiveAmmo(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId, string ammoType) =>
             _setActiveAmmo?.Invoke(weapon, weaponId, ammoType);
 
+        /// <summary>
+        /// Assigns projectile callback <paramref name="action"/> to <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="action"/> has parameters:
+        /// <list type="number">
+        /// <item><see cref="long"/> Parent weapon EntityId?</item>
+        /// <item><see cref="int"/> Parent weapon partId</item>
+        /// <item><see cref="ulong"/> Projectile EntityId</item>
+        /// <item><see cref="long"/> Target EntityId</item>
+        /// <item><see cref="Vector3D"/> ProjectilePosition if active, LastHit if destroyed</item>
+        /// <item><see cref="bool"/> ProjectileExists?</item>
+        /// </list>
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <param name="action"></param>
         public void MonitorProjectileCallback(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId, Action<long, int, ulong, long, Vector3D, bool> action) =>
             _monitorProjectile?.Invoke(weapon, weaponId, action);
 
+        /// <summary>
+        /// Unassigns projectile callback <paramref name="action"/> to <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="action"/> has parameters:
+        /// <list type="number">
+        /// <item><see cref="long"/> Parent weapon EntityId?</item>
+        /// <item><see cref="int"/> Parent weapon partId</item>
+        /// <item><see cref="ulong"/> Projectile EntityId</item>
+        /// <item><see cref="long"/> Target EntityId</item>
+        /// <item><see cref="Vector3D"/> ProjectilePosition if active, LastHit if destroyed</item>
+        /// <item><see cref="bool"/> ProjectileExists?</item>
+        /// </list>
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <param name="action"></param>
         public void UnMonitorProjectileCallback(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId, Action<long, int, ulong, long, Vector3D, bool> action) =>
             _unMonitorProjectile?.Invoke(weapon, weaponId, action);
 
+        /// <summary>
+        /// Returns ProjectileState of <paramref name="projectileId"/>.
+        /// </summary>
+        /// <param name="projectileId"></param>
+        /// <returns>
+        /// <see cref="MyTuple{Vector3D, Vector3D, float, float, long, string}"/> with contents:
+        /// <list type="number">
+        /// <item><see cref="Vector3D"/> Position</item>
+        /// <item><see cref="Vector3D"/> Velocity</item>
+        /// <item><see cref="float"/> BaseDamagePool</item>
+        /// <item><see cref="float"/> BaseHealthPool</item>
+        /// <item><see cref="long"/> Target EntityId</item>
+        /// <item><see cref="string"/> AmmoRound Name</item>
+        /// </list>
+        /// </returns>
         public MyTuple<Vector3D, Vector3D, float, float, long, string> GetProjectileState(ulong projectileId) =>
             _getProjectileState?.Invoke(projectileId) ?? new MyTuple<Vector3D, Vector3D, float, float, long, string>();
-        
+
+        /// <summary>
+        /// Returns the total effective DPS of <see cref="IMyCubeGrid"/> with EntityId <paramref name="entity"/>.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns><see cref="float"/> DPS.</returns>
         public float GetConstructEffectiveDps(long entity) => _getConstructEffectiveDps?.Invoke(entity) ?? 0f;
 
+        /// <summary>
+        /// Returns the Id of <paramref name="weapon"/>'s controlling player.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <returns><see cref="long"/> PlayerId. -1 if invalid or uncontrolled.</returns>
         public long GetPlayerController(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon) => _getPlayerController?.Invoke(weapon) ?? -1;
 
+        /// <summary>
+        /// Returns the rotation matrix of <paramref name="weaponId"/> on <paramref name="weapon"/>'s azimuth part.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns><see cref="Matrix"/> AzimuthMatrix</returns>
         public Matrix GetWeaponAzimuthMatrix(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId) =>
             _getWeaponAzimuthMatrix?.Invoke(weapon, weaponId) ?? Matrix.Zero;
 
+        /// <summary>
+        /// Returns the rotation matrix of <paramref name="weaponId"/> on <paramref name="weapon"/>'s elevation part.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns><see cref="Matrix"/> ElevationMatrix</returns>
         public Matrix GetWeaponElevationMatrix(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId) =>
             _getWeaponElevationMatrix?.Invoke(weapon, weaponId) ?? Matrix.Zero;
 
+        /// <summary>
+        /// Returns whether or not <paramref name="targetId"/> is a valid target for <paramref name="weapon"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="onlyThreats"/> will return false if <paramref name="targetId"/>'s threat score is zero.
+        /// <para><paramref name="checkRelations"/> will return false if <paramref name="targetId"/> is non-hostile.</para>
+        /// </remarks>
+        /// <param name="weapon"></param>
+        /// <param name="targetId"></param>
+        /// <param name="onlyThreats"></param>
+        /// <param name="checkRelations"></param>
+        /// <returns></returns>
         public bool IsTargetValid(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, long targetId, bool onlyThreats, bool checkRelations) =>
             _isTargetValid?.Invoke(weapon, targetId, onlyThreats, checkRelations) ?? false;
 
+        /// <summary>
+        /// Returns scope information of <paramref name="weaponId"/> on <paramref name="weapon"/>.
+        /// </summary>
+        /// <param name="weapon"></param>
+        /// <param name="weaponId"></param>
+        /// <returns>
+        /// <see cref="MyTuple{Vector3D, Vector3D}"/> with contents:
+        /// <list type="number">
+        /// <item><see cref="Vector3D"/> Position</item>
+        /// <item><see cref="Vector3D"/> Direction</item>
+        /// </list>
+        /// </returns>
         public MyTuple<Vector3D, Vector3D> GetWeaponScope(Sandbox.ModAPI.Ingame.IMyTerminalBlock weapon, int weaponId) =>
             _getWeaponScope?.Invoke(weapon, weaponId) ?? new MyTuple<Vector3D, Vector3D>();
+
         // terminalBlock, Threat, Other, Something 
+        /// <summary>
+        /// Returns whether or not <paramref name="block"/>'s <see cref="IMyCubeGrid"/>'s GridAi's PrimaryTarget is in range.
+        /// </summary>
+        /// <remarks>
+        /// The second value in the returned <see cref="MyTuple"/> might be legacy from when players could select two targets.
+        /// </remarks>
+        /// <param name="block"></param>
+        /// <returns>
+        /// <see cref="MyTuple{bool, bool}"/> with contents:
+        /// <list type="number">
+        /// <item><see cref="bool"/> PrimaryTarget In Range?</item>
+        /// <item><see cref="bool"/> OtherTarget In Range?</item>
+        /// </list>
+        /// </returns>
         public MyTuple<bool, bool> IsInRange(Sandbox.ModAPI.Ingame.IMyTerminalBlock block) =>
             _isInRange?.Invoke(block) ?? new MyTuple<bool, bool>();
+
+        /// <summary>
+        /// Adds event monitor <paramref name="action"/> to weapon <paramref name="partId"/> on <paramref name="entity"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="action"/> has parameters:
+        /// <list type="number">
+        /// <item><see cref="int"/> State</item>
+        /// <item><see cref="bool"/> Active</item>
+        /// </list>
+        /// 
+        /// <para>
+        /// List of event triggers:<br/>
+        /// 0  Reloading<br/>
+        /// 1  Firing<br/>
+        /// 2  Tracking<br/>
+        /// 3  Overheated<br/>
+        /// 4  TurnOn<br/>
+        /// 5  TurnOff<br/>
+        /// 6  BurstReload<br/>
+        /// 7  NoMagsToLoad<br/>
+        /// 8  PreFire<br/>
+        /// 9  EmptyOnGameLoad<br/>
+        /// 10 StopFiring<br/>
+        /// 11 StopTracking<br/>
+        /// 12 LockDelay<br/>
+        /// 13 Init<br/>
+        /// 14 Homing<br/>
+        /// 15 TargetAligned<br/>
+        /// 16 WhileOn<br/>
+        /// 17 TargetRanged100<br/>
+        /// 18 TargetRanged75<br/>
+        /// 19 TargetRanged50<br/>
+        /// 20 TargetRanged25
+        /// </para>
+        /// </remarks>
+        /// <param name="entity"></param>
+        /// <param name="partId"></param>
+        /// <param name="action"></param>
         public void MonitorEvents(Sandbox.ModAPI.Ingame.IMyTerminalBlock entity, int partId, Action<int, bool> action) =>
             _monitorEvents?.Invoke(entity, partId, action);
 
+        /// <summary>
+        /// Removes event monitor <paramref name="action"/> from weapon <paramref name="partId"/> on <paramref name="entity"/>.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="action"/> has parameters:
+        /// <list type="number">
+        /// <item><see cref="int"/> State</item>
+        /// <item><see cref="bool"/> Active</item>
+        /// </list>
+        /// </remarks>
+        /// <param name="entity"></param>
+        /// <param name="partId"></param>
+        /// <param name="action"></param>
         public void UnMonitorEvents(Sandbox.ModAPI.Ingame.IMyTerminalBlock entity, int partId, Action<int, bool> action) =>
             _unmonitorEvents?.Invoke(entity, partId, action);
 

From 37681ed0aeff4cb61d2a77c0c0dbc8f21a9a2a58 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Thu, 6 Jun 2024 19:36:07 -0500
Subject: [PATCH 14/25] Update CoreSystemsPbApi.cs hyperlink

---
 Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs b/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
index 82a4e473..66492598 100644
--- a/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
+++ b/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
@@ -9,7 +9,7 @@
 namespace CoreSystems.Api
 {
     /// <summary>
-    /// https://github.com/Ash-LikeSnow/WeaponCore/edit/master/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
+    /// https://github.com/Ash-LikeSnow/WeaponCore/blob/master/Data/Scripts/CoreSystems/Api/CoreSystemsPbApi.cs
     /// </summary>
     public class WcPbApi
     {
@@ -58,7 +58,8 @@ public class WcPbApi
         private Action<Sandbox.ModAPI.Ingame.IMyTerminalBlock, int, Action<int, bool>> _unmonitorEvents;
 
         // Descriptions made by Aristeas, with Sigmund Froid's https://steamcommunity.com/sharedfiles/filedetails/?id=2178802013 as a reference.
-
+        // PR accepted after prolific begging by Aryx
+        
         /// <summary>
         /// Activates the WcPbAPI using <see cref="IMyTerminalBlock"/> <paramref name="pbBlock"/>.
         /// </summary>

From fc8fa830fb0728a89421757d0330c02ea4d0ed4a Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sat, 8 Jun 2024 19:55:07 -0500
Subject: [PATCH 15/25] Bugfix on invoked actions happening after world unload

---
 .../CoreSystems/Session/SessionControls.cs    | 229 +++++++++---------
 1 file changed, 110 insertions(+), 119 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Session/SessionControls.cs b/Data/Scripts/CoreSystems/Session/SessionControls.cs
index feb4b084..3d674b80 100644
--- a/Data/Scripts/CoreSystems/Session/SessionControls.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionControls.cs
@@ -18,6 +18,8 @@ public partial class Session
         #region UI Config
         public static void CreateDecoyTerminalUi<T>(Session session) where T : IMyTerminalBlock
         {
+            if (session.PurgedAll)
+                return;
             session.MainThreadId = Environment.CurrentManagedThreadId;
             if (ControlsAlreadyExist<T>(session))
                 return;
@@ -27,6 +29,8 @@ public static void CreateDecoyTerminalUi<T>(Session session) where T : IMyTermin
 
         public static void CreateCameraTerminalUi<T>(Session session) where T : IMyTerminalBlock
         {
+            if (session.PurgedAll)
+                return;
             session.MainThreadId = Environment.CurrentManagedThreadId;
             if (ControlsAlreadyExist<T>(session))
                 return;
@@ -123,6 +127,8 @@ public static bool ControlsAlreadyExist<T>(Session session)
 
         public static void CreateTerminalUi<T>(Session session) where T : IMyTerminalBlock
         {
+            if (session.PurgedAll)
+                return;
             session.MainThreadId = Environment.CurrentManagedThreadId;
             if (ControlsAlreadyExist<T>(session))
             {
@@ -163,6 +169,8 @@ public static void CreateTerminalUi<T>(Session session) where T : IMyTerminalBlo
 
         public static void CombatBlockUi<T>(Session session) where T : IMyTerminalBlock
         {
+            if (session.PurgedAll)
+                return;
             session.MainThreadId = Environment.CurrentManagedThreadId;
             if (ControlsAlreadyExist<T>(session))
             {
@@ -354,143 +362,126 @@ private void CustomControlHandler(IMyTerminalBlock block, List<IMyTerminalContro
 
         internal static void AlterActions<T>(Session session)
         {
-            try
-            { 
             List<IMyTerminalAction> actions;
             MyAPIGateway.TerminalControls.GetActions<T>(out actions);
             for (int i = 0; i < actions.Count; i++)
-                {                    
-                    var a = actions[i];
-                    try
+            {                    
+                var a = actions[i];
+                if (a.Id.Equals(ShootOnceModeStr) || !a.Id.Contains(ShootModeStr) && !a.Id.Contains("OnOff") && !a.Id.Contains("WC_") && !a.Id.Contains("Control"))
+                {
+                    a.Enabled = TerminalHelpers.NotWcBlock; // dont think this is needed and its really expensive
+                    session.AlteredActions.Add(a);
+                }
+                else if (a.Id.Equals("Control"))
+                {
+
+                    a.Enabled = TerminalHelpers.NotWcOrIsTurret;
+                    session.AlteredActions.Add(a);
+                }
+                else if (a.Id.Equals("Shoot"))
+                {
+
+                    var oldAction = a.Action;
+                    a.Action = blk =>
                     {
 
-                        if (a.Id.Equals(ShootOnceModeStr) || !a.Id.Contains(ShootModeStr) && !a.Id.Contains("OnOff") && !a.Id.Contains("WC_") && !a.Id.Contains("Control"))
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
                         {
-                            a.Enabled = TerminalHelpers.NotWcBlock; // dont think this is needed and its really expensive
-                            session.AlteredActions.Add(a);
+                            if (comp?.Data?.Repo == null)
+                                oldAction(blk);
+                            return;
                         }
-                        else if (a.Id.Equals("Control"))
-                        {
 
-                            a.Enabled = TerminalHelpers.NotWcOrIsTurret;
-                            session.AlteredActions.Add(a);
-                        }
-                        else if (a.Id.Equals("Shoot"))
-                        {
+                        var on = comp.Data.Repo.Values.State.Trigger == On;
+                        comp.ShootManager.RequestShootSync(I.PlayerId, on ? Weapon.ShootManager.RequestType.Off : Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
+                    };
 
-                            var oldAction = a.Action;
-                            a.Action = blk =>
-                            {
-
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    if (comp?.Data?.Repo == null)
-                                        oldAction(blk);
-                                    return;
-                                }
-
-                                var on = comp.Data.Repo.Values.State.Trigger == On;
-                                comp.ShootManager.RequestShootSync(I.PlayerId, on ? Weapon.ShootManager.RequestType.Off : Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
-                            };
-
-                            var oldWriter = a.Writer;
-                            a.Writer = (blk, sb) =>
-                            {
-
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    oldWriter(blk, sb);
-                                    return;
-                                }
-                                if (comp.Data.Repo.Values.State.Trigger == On)
-                                    sb.Append("On");
-                                else
-                                    sb.Append("Off");
-                            };
-                            session.AlteredActions.Add(a);
-                        }
-                        else if (a.Id.Equals("Shoot_On"))
+                    var oldWriter = a.Writer;
+                    a.Writer = (blk, sb) =>
+                    {
+
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
                         {
+                            oldWriter(blk, sb);
+                            return;
+                        }
+                        if (comp.Data.Repo.Values.State.Trigger == On)
+                            sb.Append("On");
+                        else
+                            sb.Append("Off");
+                    };
+                    session.AlteredActions.Add(a);
+                }
+                else if (a.Id.Equals("Shoot_On"))
+                {
 
-                            var oldAction = a.Action;
-                            a.Action = blk =>
-                            {
-
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    if (comp?.Data?.Repo == null) oldAction(blk);
-                                    return;
-                                }
-                                if (comp.Data.Repo.Values.State.Trigger != On)
-                                    comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
-                            };
-
-                            var oldWriter = a.Writer;
-                            a.Writer = (blk, sb) =>
-                            {
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    oldWriter(blk, sb);
-                                    return;
-                                }
-                                if (comp.Data.Repo.Values.State.Trigger == On)
-                                    sb.Append("On");
-                                else
-                                    sb.Append("Off");
-                            };
-                            session.AlteredActions.Add(a);
+                    var oldAction = a.Action;
+                    a.Action = blk =>
+                    {
+
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                        {
+                            if (comp?.Data?.Repo == null) oldAction(blk);
+                            return;
                         }
-                        else if (a.Id.Equals("Shoot_Off"))
+                        if (comp.Data.Repo.Values.State.Trigger != On)
+                            comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.On, Weapon.ShootManager.Signals.On);
+                    };
+
+                    var oldWriter = a.Writer;
+                    a.Writer = (blk, sb) =>
+                    {
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
                         {
+                            oldWriter(blk, sb);
+                            return;
+                        }
+                        if (comp.Data.Repo.Values.State.Trigger == On)
+                            sb.Append("On");
+                        else
+                            sb.Append("Off");
+                    };
+                    session.AlteredActions.Add(a);
+                }
+                else if (a.Id.Equals("Shoot_Off"))
+                {
+
+                    var oldAction = a.Action;
+                    a.Action = blk =>
+                    {
 
-                            var oldAction = a.Action;
-                            a.Action = blk =>
-                            {
-
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    if (comp?.Data?.Repo == null) oldAction(blk);
-                                    return;
-                                }
-                                if (comp.Data.Repo.Values.State.Trigger != Off)
-                                    comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.Off);
-                            };
-
-                            var oldWriter = a.Writer;
-                            a.Writer = (blk, sb) =>
-                            {
-
-                                var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
-                                if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
-                                {
-                                    oldWriter(blk, sb);
-                                    return;
-                                }
-                                if (comp.Data.Repo.Values.State.Trigger == On)
-                                    sb.Append("On");
-                                else
-                                    sb.Append("Off");
-                            };
-                            session.AlteredActions.Add(a);
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                        {
+                            if (comp?.Data?.Repo == null) oldAction(blk);
+                            return;
                         }
-                    }
-                    catch (Exception ex)
+                        if (comp.Data.Repo.Values.State.Trigger != Off)
+                            comp.ShootManager.RequestShootSync(I.PlayerId, Weapon.ShootManager.RequestType.Off);
+                    };
+
+                    var oldWriter = a.Writer;
+                    a.Writer = (blk, sb) =>
                     {
-                        MyLog.Default.WriteLine($"WC:  Alter actions crashed inside For loop on {a.Id}");
-                        throw ex;
-                    }
+
+                        var comp = blk?.Components?.Get<CoreComponent>() as Weapon.WeaponComponent;
+                        if (comp?.Data?.Repo == null || comp.Platform.State != CorePlatform.PlatformState.Ready)
+                        {
+                            oldWriter(blk, sb);
+                            return;
+                        }
+                        if (comp.Data.Repo.Values.State.Trigger == On)
+                            sb.Append("On");
+                        else
+                            sb.Append("Off");
+                    };
+                    session.AlteredActions.Add(a);
                 }
             }
-            catch (Exception ex)
-            {
-                MyLog.Default.WriteLine($"WC:  Alter actions crashed outside For loop checking {typeof(T).Name}");
-                throw ex;
-            }
         }
 
         private static HashSet<string> _visibleControls = new HashSet<string> 

From fcf42a1d3471f4273f0258d438310c98b7214db7 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sat, 8 Jun 2024 20:31:59 -0500
Subject: [PATCH 16/25] tidy up unused var

---
 Data/Scripts/CoreSystems/Session/SessionCleanUp.cs | 1 -
 Data/Scripts/CoreSystems/Session/SessionFields.cs  | 1 -
 Data/Scripts/CoreSystems/Session/SessionInit.cs    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Session/SessionCleanUp.cs b/Data/Scripts/CoreSystems/Session/SessionCleanUp.cs
index cfc2439f..097120da 100644
--- a/Data/Scripts/CoreSystems/Session/SessionCleanUp.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionCleanUp.cs
@@ -306,7 +306,6 @@ internal void PurgeAll()
             UiInput = null;
             TargetUi = null;
             Placer = null;
-            TargetGps = null;
             SApi.Unload();
             if (WaterApiLoaded)
                 WApi.Unregister();
diff --git a/Data/Scripts/CoreSystems/Session/SessionFields.cs b/Data/Scripts/CoreSystems/Session/SessionFields.cs
index b1cc0649..3b59a7d3 100644
--- a/Data/Scripts/CoreSystems/Session/SessionFields.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionFields.cs
@@ -319,7 +319,6 @@ public partial class Session
         internal ControlQuery ControlRequest;
         internal IMyPhysics Physics;
         internal IMyCamera Camera;
-        internal IMyGps TargetGps;
         internal IMyBlockPlacerBase Placer;
         internal IMyTerminalBlock LastTerminal;
         internal IMyCharacter LocalCharacter;
diff --git a/Data/Scripts/CoreSystems/Session/SessionInit.cs b/Data/Scripts/CoreSystems/Session/SessionInit.cs
index adb6a86d..ed9c9aa1 100644
--- a/Data/Scripts/CoreSystems/Session/SessionInit.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionInit.cs
@@ -67,7 +67,6 @@ private void BeforeStartInit()
 
             Physics = MyAPIGateway.Physics;
             Camera = MyAPIGateway.Session.Camera;
-            TargetGps = MyAPIGateway.Session.GPS.Create("WEAPONCORE", "", Vector3D.MaxValue, true);
             CheckDirtyGridInfos(true);
 
             GenerateButtonMap();

From d5806f61bf4a305d62689a8f362f9f2605c47c5e Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Tue, 11 Jun 2024 18:42:26 -0500
Subject: [PATCH 17/25] Updates

---
 .../Definitions/SerializedConfigs/CoreSettings.cs        | 2 ++
 Data/Scripts/CoreSystems/EntityComp/EntityEvents.cs      | 4 ++--
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs   | 8 +++++++-
 Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs     | 9 +++++++--
 Data/Scripts/CoreSystems/Session/SessionFields.cs        | 2 +-
 Data/Scripts/CoreSystems/Support/VersionControl.cs       | 8 ++++++++
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
index 67d17648..42c98f6c 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
@@ -209,6 +209,8 @@ public class ArmorOverride
             [ProtoMember(20)] public bool UnsupportedMode;
             [ProtoMember(21)] public bool DisableSmallVsLargeBuff = false;
             [ProtoMember(22)] public Overrides DefinitionOverrides;
+            [ProtoMember(23)] public float LargeGridDamageMultiplier;
+            [ProtoMember(24)] public float SmallGridDamageMultiplier;
         }
 
         [ProtoContract]
diff --git a/Data/Scripts/CoreSystems/EntityComp/EntityEvents.cs b/Data/Scripts/CoreSystems/EntityComp/EntityEvents.cs
index 3beccbd2..161f7bc1 100644
--- a/Data/Scripts/CoreSystems/EntityComp/EntityEvents.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/EntityEvents.cs
@@ -223,8 +223,9 @@ private void AppendingCustomInfoWeapon(IMyTerminalBlock block, StringBuilder str
             try
             {
                 var comp = ((Weapon.WeaponComponent)this);
+                var collection = comp.HasAlternateUi ? SortAndGetTargetTypes() : TypeSpecific != CompTypeSpecific.Phantom ? Platform.Weapons : Platform.Phantoms;
 
-                if (comp.Data.Repo.Values.Set.Overrides.LeadGroup == 0 && !comp.IsBomb && (!comp.HasTurret && !comp.OverrideLeads || comp.HasTurret && comp.OverrideLeads))
+                if (comp.Data.Repo.Values.Set.Overrides.LeadGroup == 0 && !comp.IsBomb && (!comp.HasTurret && !comp.OverrideLeads || comp.HasTurret && comp.OverrideLeads) && !collection[0].ActiveAmmoDef.AmmoDef.Const.IsSmart)
                     stringBuilder.Append("\nWARNING: fixed weapon detected\n")
                         .Append("  - without a Target Lead Group set!\n\n");
 
@@ -278,7 +279,6 @@ private void AppendingCustomInfoWeapon(IMyTerminalBlock block, StringBuilder str
                 if (!comp.HasAlternateUi)
                     stringBuilder.Append($"\n\n{Localization.GetText("WeaponInfoDividerLineWeapon")}");
 
-                var collection = comp.HasAlternateUi ? SortAndGetTargetTypes() : TypeSpecific != CompTypeSpecific.Phantom ? Platform.Weapons : Platform.Phantoms;
                 for (int i = 0; i < collection.Count; i++)
                 {
                     var w = collection[i];
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
index 6a302b64..f3acec35 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponShoot.cs
@@ -479,6 +479,12 @@ private void SetSpeed(object o)
                 var direction = Ejector.CachedDir;
                 var speed = ejectDef.Speed;
 
+                var parentSpeed = Vector3.Zero;
+                if(Comp.TypeSpecific == CoreComponent.CompTypeSpecific.Rifle && Comp.GetTopEntity().Physics != null)
+                    parentSpeed = Comp.GetTopEntity().Physics.LinearVelocity;
+                else if (Comp.Cube?.Physics != null)
+                    parentSpeed = Comp.Cube.Physics.LinearVelocity;
+
                 if (needsRand)
                 {
                     var rand = new XorShiftRandomStruct((ulong)entity.EntityId);
@@ -494,7 +500,7 @@ private void SetSpeed(object o)
                         rotation += new Vector3D(rand.NextDouble() * (rotMax - rotMin) + rotMin, rand.NextDouble() * (rotMax - rotMin) + rotMin, rand.NextDouble() * (rotMax - rotMin) + rotMin);
                     }
                 }
-                entity.Physics.SetSpeeds(direction * speed, rotation);
+                entity.Physics.SetSpeeds(parentSpeed + direction * (speed + speedVariance), rotation);
             }
         }
 
diff --git a/Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs b/Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs
index ef8ddfe7..f5385320 100644
--- a/Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs
@@ -435,6 +435,11 @@ private void DamageGrid(HitEntity hitEnt, ProInfo t)
                         smallVsLargeBuff = 0.25f;
                 }
             }
+            var gridSizeBuff = 1f;
+            if (grid.GridSizeEnum == MyCubeSize.Large)
+                gridSizeBuff = Settings.Enforcement.LargeGridDamageMultiplier;
+            else
+                gridSizeBuff = Settings.Enforcement.SmallGridDamageMultiplier;
 
             for (int i = 0; i < blockCount; i++)
             {
@@ -674,9 +679,9 @@ private void DamageGrid(HitEntity hitEnt, ProInfo t)
                         var rootStep = k == 0 && j == 0 && !detActive;
                         var primaryDamage = rootStep && block == rootBlock && !detActive;//limits application to first run w/AOE, suppresses with detonation
 
-                        var baseScale = damageScale * directDamageScale * smallVsLargeBuff;
+                        var baseScale = damageScale * directDamageScale * smallVsLargeBuff * gridSizeBuff;
                         var scaledDamage = (float)(basePool * baseScale);
-                        var aoeScaledDmg = (float)((aoeDamageFall * (detActive ? detDamageScale : areaDamageScale)) * damageScale);
+                        var aoeScaledDmg = (float)((aoeDamageFall * (detActive ? detDamageScale : areaDamageScale)) * damageScale * gridSizeBuff);
                         bool deadBlock = false;
 
                         //Check for end of primary life
diff --git a/Data/Scripts/CoreSystems/Session/SessionFields.cs b/Data/Scripts/CoreSystems/Session/SessionFields.cs
index 3b59a7d3..b79656f3 100644
--- a/Data/Scripts/CoreSystems/Session/SessionFields.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionFields.cs
@@ -46,7 +46,7 @@ public partial class Session
         internal const int VersionControl = 34;
         internal const int AwakeBuckets = 60;
         internal const int AsleepBuckets = 180;
-        internal const int ModVersion = 28;
+        internal const int ModVersion = 29;
         internal const int ClientCfgVersion = 9;
         internal const string ServerCfgName = "CoreSystemsServer.cfg";
         internal const string ClientCfgName = "CoreSystemsClient.cfg";
diff --git a/Data/Scripts/CoreSystems/Support/VersionControl.cs b/Data/Scripts/CoreSystems/Support/VersionControl.cs
index 4061f8bb..cec10a7c 100644
--- a/Data/Scripts/CoreSystems/Support/VersionControl.cs
+++ b/Data/Scripts/CoreSystems/Support/VersionControl.cs
@@ -191,6 +191,8 @@ private void RebuildConfig(CoreSettings.ServerSettings oldSettings)
             Core.Enforcement.AdvancedProjectileSync = oldPointDefenseSyncMonitor;
             Core.Enforcement.UnsupportedMode = oldUnsupportedMode;
             Core.Enforcement.DisableSmallVsLargeBuff = oldDisableSmallVsLargeBuff;
+            Core.Enforcement.LargeGridDamageMultiplier = 1f;
+            Core.Enforcement.SmallGridDamageMultiplier = 1f;
         }
 
         private void CorruptionCheck(bool write = false)
@@ -204,6 +206,12 @@ private void CorruptionCheck(bool write = false)
             if (Core.Enforcement.ShieldDamageModifer < 0)
                 Core.Enforcement.ShieldDamageModifer = 1f;
 
+            if (Core.Enforcement.LargeGridDamageMultiplier < 0)
+                Core.Enforcement.LargeGridDamageMultiplier = 1f;
+
+            if (Core.Enforcement.SmallGridDamageMultiplier < 0)
+                Core.Enforcement.SmallGridDamageMultiplier = 1f;
+
             if (Core.Enforcement.ShipSizes == null)
             {
                 Core.Enforcement.ShipSizes = Array.Empty<CoreSettings.ServerSettings.ShipSize>();

From bb8b5c425a8a3172de8f421e5eaa46b5019a53b4 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:30:05 -0500
Subject: [PATCH 18/25] :)

---
 .../CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
index 42c98f6c..58fa3e15 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/CoreSettings.cs
@@ -209,8 +209,8 @@ public class ArmorOverride
             [ProtoMember(20)] public bool UnsupportedMode;
             [ProtoMember(21)] public bool DisableSmallVsLargeBuff = false;
             [ProtoMember(22)] public Overrides DefinitionOverrides;
-            [ProtoMember(23)] public float LargeGridDamageMultiplier;
-            [ProtoMember(24)] public float SmallGridDamageMultiplier;
+            [ProtoMember(23)] public float LargeGridDamageMultiplier = 1;
+            [ProtoMember(24)] public float SmallGridDamageMultiplier = 1;
         }
 
         [ProtoContract]

From 85fbfdd1913bbe5efd6e2d2c1bfe9f7c972c670f Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Thu, 13 Jun 2024 14:26:26 -0500
Subject: [PATCH 19/25] Inv thresholds

---
 Data/Scripts/CoreSystems/Definitions/CoreSystems.cs           | 3 ++-
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs       | 4 +---
 Data/Scripts/CoreSystems/Session/SessionInventory.cs          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
index fce9965b..c62c46a5 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
@@ -280,7 +280,8 @@ public WeaponSystem(WeaponStructure structure, MyStringHash partNameIdHash, MySt
             AmmoTypes = weaponAmmoTypes;
             MaxAmmoVolume = Values.HardPoint.HardWare.InventorySize;
             FullAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryFillAmount > 0 ? values.HardPoint.Loading.InventoryFillAmount : 0.75f);
-            LowAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryLowAmount > 0 ? values.HardPoint.Loading.InventoryLowAmount : 0.25f); CeaseFireDelay = values.HardPoint.DelayCeaseFire;
+            LowAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryLowAmount > 0 ? values.HardPoint.Loading.InventoryLowAmount : 0.25f); 
+            CeaseFireDelay = values.HardPoint.DelayCeaseFire;
             DelayCeaseFire = CeaseFireDelay > 0;
             DelayToFire = values.HardPoint.Loading.DelayUntilFire;
             StayCharged = values.HardPoint.Loading.StayCharged || WConst.ReloadTime == 0;
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
index e2d118c0..7ea586d3 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
@@ -209,9 +209,7 @@ internal bool ComputeServerStorage(bool calledFromReload = false)
                     var magsGranted = magsRequested > spotsFree ? spotsFree : magsRequested;
                     var requestedVolume = ActiveAmmoDef.AmmoDef.Const.MagVolume * magsGranted;
                     var spaceAvailable = freeVolume > requestedVolume;
-                    var lowThreshold = System.MaxAmmoVolume * 0.25f;
-
-                    var pullAmmo = magsGranted > 0 && CurrentAmmoVolume < lowThreshold && spaceAvailable;
+                    var pullAmmo = magsGranted > 0 && CurrentAmmoVolume < System.LowAmmoVolume && spaceAvailable;
                     
                     var failSafeTimer = s.Tick - LastInventoryTick > 600;
                     
diff --git a/Data/Scripts/CoreSystems/Session/SessionInventory.cs b/Data/Scripts/CoreSystems/Session/SessionInventory.cs
index d360fd7c..394dd73d 100644
--- a/Data/Scripts/CoreSystems/Session/SessionInventory.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionInventory.cs
@@ -106,7 +106,7 @@ internal void ConsumablePull()  // In Thread
                         var defId = part.ActiveAmmoDef.AmmoDefinitionId;
                         var freeSpace = part.System.MaxAmmoVolume - part.BaseComp.CurrentInventoryVolume;
                         var spotsFree = (int)(freeSpace / part.ActiveAmmoDef.AmmoDef.Const.MagVolume);
-                        var magsNeeded = (int)((part.System.FullAmmoVolume - part.CurrentAmmoVolume) / part.ActiveAmmoDef.AmmoDef.Const.MagVolume);
+                        var magsNeeded = (int)((part.System.FullAmmoVolume - part.CurrentAmmoVolume) / part.ActiveAmmoDef.AmmoDef.Const.MagVolume + 0.0001f);
                         magsNeeded = magsNeeded > spotsFree ? spotsFree : magsNeeded;
 
                         var consumablePullRequests = InventoryMoveRequestPool.Get();

From b10b5c63fe011efd475f9c6cbf34fc28920c5886 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:56:03 -0500
Subject: [PATCH 20/25] Voxel Prefetch uses server maximums

---
 Data/Scripts/CoreSystems/Session/SessionFields.cs       | 1 +
 Data/Scripts/CoreSystems/Session/SessionInit.cs         | 2 ++
 Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/Session/SessionFields.cs b/Data/Scripts/CoreSystems/Session/SessionFields.cs
index b79656f3..f0e955c5 100644
--- a/Data/Scripts/CoreSystems/Session/SessionFields.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionFields.cs
@@ -412,6 +412,7 @@ public partial class Session
         internal ulong MuzzleIdCounter;
         internal ulong PhantomIdCounter;
 
+        internal long PreFetchMaxDist;
         internal long PlayerId;
         internal int ClientAvDivisor = 1;
         internal double SyncDistSqr;
diff --git a/Data/Scripts/CoreSystems/Session/SessionInit.cs b/Data/Scripts/CoreSystems/Session/SessionInit.cs
index ed9c9aa1..4f59de66 100644
--- a/Data/Scripts/CoreSystems/Session/SessionInit.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionInit.cs
@@ -65,6 +65,8 @@ private void BeforeStartInit()
                 SyncBufferedDistSqr = (SyncDist + 500) * (SyncDist + 500);
             }
 
+            PreFetchMaxDist = MyAPIGateway.Session.SessionSettings.PrefetchShapeRayLengthLimit - 1;
+
             Physics = MyAPIGateway.Physics;
             Camera = MyAPIGateway.Session.Camera;
             CheckDirtyGridInfos(true);
diff --git a/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs b/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs
index 9eed0e61..b5ea4d07 100644
--- a/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs
+++ b/Data/Scripts/CoreSystems/Ui/Targeting/TargetUiSelect.cs
@@ -147,7 +147,7 @@ internal bool SelectTarget(bool manualSelect = true, bool firstStage = false, bo
             MyEntity rootEntity = null;
             if (ai.MyPlanet != null && Session.I.Tick90 && s.UiInput.AltPressed)
             {
-                var rayLine = new LineD(AimPosition, ai.MaxTargetingRange > 14999 ? AimPosition + AimDirection * 14999 : end); //Prefetch will return nothing if dist >= 15000
+                var rayLine = new LineD(AimPosition, ai.MaxTargetingRange > s.PreFetchMaxDist ? AimPosition + AimDirection * s.PreFetchMaxDist : end);
                 ai.MyPlanet.PrefetchShapeOnRay(ref rayLine);
             }
             Session.I.Physics.CastRay(AimPosition, end, _hitInfo);

From 38d0191b4df612a2bfe2851117fa1f5cdc76ff86 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sun, 16 Jun 2024 13:47:00 -0500
Subject: [PATCH 21/25] World Inv option

---
 Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs        | 1 +
 Data/Scripts/CoreSystems/Definitions/CoreSystems.cs            | 3 ++-
 .../CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 3324cdaf..942a3460 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -517,6 +517,7 @@ public struct LoadingDef
                 [ProtoMember(25)] internal bool ProhibitCoolingWhenOff;
                 [ProtoMember(26)] internal float InventoryFillAmount;
                 [ProtoMember(27)] internal float InventoryLowAmount;
+                [ProtoMember(28)] internal bool UseWorldInventoryVolumeMultiplier;
             }
 
 
diff --git a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
index c62c46a5..923d5574 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreSystems.cs
@@ -1,4 +1,5 @@
 using Sandbox.Game.Entities;
+using Sandbox.ModAPI;
 using System;
 using System.Collections.Generic;
 using VRage.Game;
@@ -278,7 +279,7 @@ public WeaponSystem(WeaponStructure structure, MyStringHash partNameIdHash, MySt
             WeaponId = weaponId;
             PartName = partName;
             AmmoTypes = weaponAmmoTypes;
-            MaxAmmoVolume = Values.HardPoint.HardWare.InventorySize;
+            MaxAmmoVolume = Values.HardPoint.HardWare.InventorySize * (values.HardPoint.Loading.UseWorldInventoryVolumeMultiplier ? MyAPIGateway.Session.BlocksInventorySizeMultiplier : 1);
             FullAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryFillAmount > 0 ? values.HardPoint.Loading.InventoryFillAmount : 0.75f);
             LowAmmoVolume = MaxAmmoVolume * (values.HardPoint.Loading.InventoryLowAmount > 0 ? values.HardPoint.Loading.InventoryLowAmount : 0.25f); 
             CeaseFireDelay = values.HardPoint.DelayCeaseFire;
diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
index 7ea586d3..ce08fa8b 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponReload.cs
@@ -208,7 +208,7 @@ internal bool ComputeServerStorage(bool calledFromReload = false)
                     var magsRequested = (int)((System.FullAmmoVolume - CurrentAmmoVolume) / ActiveAmmoDef.AmmoDef.Const.MagVolume + .0001f);
                     var magsGranted = magsRequested > spotsFree ? spotsFree : magsRequested;
                     var requestedVolume = ActiveAmmoDef.AmmoDef.Const.MagVolume * magsGranted;
-                    var spaceAvailable = freeVolume > requestedVolume;
+                    var spaceAvailable = freeVolume >= requestedVolume;
                     var pullAmmo = magsGranted > 0 && CurrentAmmoVolume < System.LowAmmoVolume && spaceAvailable;
                     
                     var failSafeTimer = s.Tick - LastInventoryTick > 600;

From 459d596fad4b12449b16f306ddc6b446e0b2dd96 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Thu, 20 Jun 2024 17:19:36 -0500
Subject: [PATCH 22/25] Replacer change to .contains, additional log notes on
 subparts

---
 Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs | 6 +++---
 Data/Scripts/CoreSystems/Session/SessionSupport.cs  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs b/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
index 791c35a9..e7f50ece 100644
--- a/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/PlatformInit.cs
@@ -199,7 +199,7 @@ private PlatformState WeaponParts()
 
                 if (!Parts.NameToEntity.TryGetValue(muzzlePartName, out muzzlePartEntity))
                 {
-                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Invalid muzzlePart, I am crashing now Dave.");
+                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Weapon: {system.PartName} Invalid muzzlePart, I am crashing now Dave. {muzzlePartName} was not found.  Ensure you do not include subpart_ in the Id fields in the weapon definition");
                 }
 
                 foreach (var part in Parts.NameToEntity)
@@ -210,11 +210,11 @@ private PlatformState WeaponParts()
 
                 MyEntity azimuthPart;
                 if (!Parts.NameToEntity.TryGetValue(azimuthPartName, out azimuthPart))
-                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Weapon: {system.PartName} Invalid azimuthPart, I am crashing now Dave.");
+                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Weapon: {system.PartName} Invalid azimuthPart, I am crashing now Dave. {azimuthPartName} was not found.  Ensure you do not include subpart_ in the Id fields in the weapon definition");
 
                 MyEntity elevationPart;
                 if (!Parts.NameToEntity.TryGetValue(elevationPartName, out elevationPart))
-                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Invalid elevationPart, I am crashing now Dave.");
+                    return PlatformCrash(Comp, true, true, $"Your block subTypeId ({Comp.SubtypeName}) Weapon: {system.PartName} Invalid elevationPart, I am crashing now Dave. {elevationPartName} was not found.  Ensure you do not include subpart_ in the Id fields in the weapon definition");
                 
                 MyEntity spinPart = null;
                 if (system.HasBarrelRotation)
diff --git a/Data/Scripts/CoreSystems/Session/SessionSupport.cs b/Data/Scripts/CoreSystems/Session/SessionSupport.cs
index 1806c396..f8159ef8 100644
--- a/Data/Scripts/CoreSystems/Session/SessionSupport.cs
+++ b/Data/Scripts/CoreSystems/Session/SessionSupport.cs
@@ -1195,7 +1195,7 @@ private void ModChecker()
                     ShieldMod = true;
                 else if (mod.PublishedFileId == 1931509062 || mod.PublishedFileId == 1995197719 || mod.PublishedFileId == 2006751214 || mod.PublishedFileId == 2015560129)
                     ReplaceVanilla = true;
-                else if (mod.GetPath().Contains("AppData\\Roaming\\SpaceEngineers\\Mods\\VanillaReplacement") || mod.Name.StartsWith("WCVanilla") || mod.FriendlyName.StartsWith("WCVanilla"))
+                else if (mod.GetPath().Contains("AppData\\Roaming\\SpaceEngineers\\Mods\\VanillaReplacement") || mod.Name.Contains("WCVanilla") || mod.FriendlyName.Contains("WCVanilla"))
                     ReplaceVanilla = true;
                 else if (mod.PublishedFileId == 2189703321 || mod.PublishedFileId == 2496225055 || mod.PublishedFileId == 2726343161 || mod.PublishedFileId == 2734980390)
                 {

From 976d8c8d0be6f1aeffd7d7e9c8bcfb1395256bea Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sat, 22 Jun 2024 11:58:16 -0500
Subject: [PATCH 23/25] Invalid active ammo type reset

---
 .../EntityComp/Parts/Weapon/WeaponComp.cs     | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
index e483ffc2..c03bcace 100644
--- a/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
+++ b/Data/Scripts/CoreSystems/EntityComp/Parts/Weapon/WeaponComp.cs
@@ -180,16 +180,30 @@ internal void OnAddedToSceneWeaponTasks(bool firstRun)
 
                     if (w.ActiveAmmoDef.AmmoDef == null || !w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable && w.System.AmmoTypes.Length > 1)
                     {
-                        //additional logging formatting
-                        string errorString;
-                        if (w.ActiveAmmoDef.AmmoDef != null)
+                        w.ProposedAmmoId = 0;
+                        if (Session.I.IsServer)
+                            w.ChangeActiveAmmoServer();
+                        else
                         {
-                            errorString = w.ActiveAmmoDef.AmmoDef.AmmoRound + " TurretSelectable:" + w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable + " IsShrapnel:" + w.ActiveAmmoDef.IsShrapnel + " HardPointUsable:" + w.ActiveAmmoDef.AmmoDef.HardPointUsable;                      
+                            w.ChangeActiveAmmoClient();
+                            w.AmmoName = w.ActiveAmmoDef.AmmoDef.AmmoRound;
+                            w.AmmoNameTerminal = w.ActiveAmmoDef.AmmoDef.Const.TerminalName;
                         }
-                        else errorString = "ActiveAmmoDef was null";
+                        Log.Line($"Ammo type was invalid, forced {w.System.PartName} back to default");
 
-                        Platform.PlatformCrash(this, false, true, $"[{w.System.PartName}] heyyyyyy sweetie this gun is broken.  Your first ammoType is broken ({errorString}), I am crashing now Dave.");
-                        return;
+                        if (w.ActiveAmmoDef.AmmoDef == null || !w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable && w.System.AmmoTypes.Length > 1)
+                        {
+                            //additional logging formatting
+                            string errorString;
+                            if (w.ActiveAmmoDef.AmmoDef != null)
+                            {
+                                errorString = w.ActiveAmmoDef.AmmoDef.AmmoRound + " TurretSelectable:" + w.ActiveAmmoDef.AmmoDef.Const.IsTurretSelectable + " IsShrapnel:" + w.ActiveAmmoDef.IsShrapnel + " HardPointUsable:" + w.ActiveAmmoDef.AmmoDef.HardPointUsable;
+                            }
+                            else errorString = "ActiveAmmoDef was null";
+
+                            Platform.PlatformCrash(this, false, true, $"[{w.System.PartName}] heyyyyyy sweetie this gun is broken.  Your active ammoType is broken ({errorString}), I am crashing now Dave.");
+                            return;
+                        }
                     }
 
                     w.UpdateWeaponRange();

From 8e099964a292daf022957633fcd8ef68446c8e11 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Wed, 26 Jun 2024 14:05:20 -0500
Subject: [PATCH 24/25] Drag

---
 .../CoreSystems/Definitions/CoreDefinitions.cs |  1 +
 .../SerializedConfigs/AmmoConstants.cs         |  5 +++++
 .../CoreSystems/Projectiles/Projectile.cs      |  6 ++++++
 .../CoreSystems/Projectiles/Projectiles.cs     | 18 +++++++++++++++++-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
index 942a3460..0ef684d7 100644
--- a/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
+++ b/Data/Scripts/CoreSystems/Definitions/CoreDefinitions.cs
@@ -1305,6 +1305,7 @@ internal enum GuidanceType
                 [ProtoMember(15)] internal ApproachDef[] Approaches;
                 [ProtoMember(16)] internal double TotalAcceleration;
                 [ProtoMember(17)] internal OnHitDef OnHit;
+                [ProtoMember(18)] internal float DragPerSecond;
 
                 [ProtoContract]
                 public struct SmartsDef
diff --git a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
index 51acb2fd..a80f5067 100644
--- a/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
+++ b/Data/Scripts/CoreSystems/Definitions/SerializedConfigs/AmmoConstants.cs
@@ -139,6 +139,7 @@ public enum Texture
         public readonly bool CustomDetParticle;
         public readonly bool FieldParticle;
         public readonly bool AmmoSkipAccel;
+        public readonly bool AmmoUseDrag;
         public readonly bool LineWidthVariance;
         public readonly bool LineColorVariance;
         public readonly bool SegmentWidthVariance;
@@ -294,6 +295,7 @@ public enum Texture
         public readonly float ByBlockHitDepth;
         public readonly float DetonationSoundDistSqr;
         public readonly float BackKickForce;
+        public readonly float DragPerTick;
         public readonly double MinTurnSpeedSqr;
         public readonly double Aggressiveness;
         public readonly double NavAcceleration;
@@ -448,6 +450,9 @@ internal AmmoConstants(WeaponSystem.AmmoType ammo, WeaponDefinition wDef, Weapon
             ArmorCoreActive = Session.I.ArmorCoreActive;
 
             AmmoSkipAccel = ammo.AmmoDef.Trajectory.AccelPerSec <= 0;
+            AmmoUseDrag = ammo.AmmoDef.Trajectory.DragPerSecond > 0;
+            DragPerTick = AmmoUseDrag ? ammo.AmmoDef.Trajectory.DragPerSecond / 60 : 0;
+
             FeelsGravity = GravityMultiplier > 0;
             StoreGravity = FeelsGravity || fragHasGravity;
             SmartOffsetSqr = ammo.AmmoDef.Trajectory.Smarts.Inaccuracy * ammo.AmmoDef.Trajectory.Smarts.Inaccuracy;
diff --git a/Data/Scripts/CoreSystems/Projectiles/Projectile.cs b/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
index 95df0a8c..85bbbe5d 100644
--- a/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
+++ b/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
@@ -763,6 +763,12 @@ internal void RunSmart() // this is grossly inlined thanks to mod profiler... th
                 MaxSpeed = DesiredSpeed;
 
             var speedCap = speedCapMulti * MaxSpeed;
+            if (aConst.AmmoUseDrag)
+            {
+                speedCap -= Info.Age * aConst.DragPerTick;
+                if (speedCap < 0)
+                    speedCap = 0;
+            }
             if (VelocityLengthSqr > speedCap * speedCap) {
                 VelocityLengthSqr = proposedVel.LengthSquared();
                 proposedVel = Direction * speedCap;
diff --git a/Data/Scripts/CoreSystems/Projectiles/Projectiles.cs b/Data/Scripts/CoreSystems/Projectiles/Projectiles.cs
index ce3f0918..192431ef 100644
--- a/Data/Scripts/CoreSystems/Projectiles/Projectiles.cs
+++ b/Data/Scripts/CoreSystems/Projectiles/Projectiles.cs
@@ -218,6 +218,14 @@ private void UpdateState(int end = 0)
                             var accelThisTick = p.Direction * (aConst.DeltaVelocityPerTick * Session.I.DeltaTimeRatio);
 
                             var maxSpeedSqr = p.MaxSpeed * p.MaxSpeed;
+                            var curMaxSpeed = p.MaxSpeed;
+                            if (aConst.AmmoUseDrag)
+                            {
+                                curMaxSpeed -= p.Info.Age * aConst.DragPerTick;
+                                if (curMaxSpeed < 0)
+                                    curMaxSpeed = 0;
+                                maxSpeedSqr = curMaxSpeed * curMaxSpeed;
+                            }
                             if (p.DeaccelRate > 0) {
 
                                 var distToMax = info.MaxTrajectory - info.DistanceTraveled;
@@ -242,7 +250,7 @@ private void UpdateState(int end = 0)
 
                                 p.VelocityLengthSqr = newVel.LengthSquared();
                                 if (p.VelocityLengthSqr > maxSpeedSqr)
-                                    newVel = p.Direction * p.MaxSpeed;
+                                    newVel = p.Direction * curMaxSpeed;
                                 else
                                     info.TotalAcceleration += (newVel - p.PrevVelocity);
 
@@ -256,6 +264,14 @@ private void UpdateState(int end = 0)
                         if (aConst.AmmoSkipAccel || p.VelocityLengthSqr > 0)
                             p.LastPosition = p.Position;
 
+                        if (aConst.AmmoSkipAccel && aConst.AmmoUseDrag)
+                        {
+                            var dragMaxSpeed = p.MaxSpeed - p.Info.Age * aConst.DragPerTick;
+                            if (dragMaxSpeed < 0)
+                                dragMaxSpeed = 0;
+                            p.Velocity = p.Direction * dragMaxSpeed;
+                        }
+
                         p.TravelMagnitude = info.Age != 0 ? p.Velocity * Session.I.DeltaStepConst : p.TravelMagnitude;
                         p.Position += p.TravelMagnitude;
 

From d4bdff744be8e308d456229c1032f0d5c56f2a94 Mon Sep 17 00:00:00 2001
From: BDCarrillo <90526940+BDCarrillo@users.noreply.github.com>
Date: Sat, 29 Jun 2024 12:58:24 -0500
Subject: [PATCH 25/25] TravelTo estimation bugfix

---
 Data/Scripts/CoreSystems/Projectiles/Projectile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Scripts/CoreSystems/Projectiles/Projectile.cs b/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
index 85bbbe5d..b2c7a507 100644
--- a/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
+++ b/Data/Scripts/CoreSystems/Projectiles/Projectile.cs
@@ -3098,7 +3098,7 @@ internal bool TrajectoryEstimation(WeaponDefinition.AmmoDef ammoDef, ref Vector3
 
             var targetPos = eTarget != null ? eTarget.PositionComp.WorldAABB.Center : pTarget.Position;
 
-            if (aConst.FragPointType == PointTypes.Direct)
+            if (aConst.TimedFragments && aConst.FragPointType == PointTypes.Direct)
             {
                 targetDirection = Vector3D.Normalize(targetPos - Position);
                 estimatedPosition = targetPos;