diff --git a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs index b2bdf2893df..d852e20c457 100644 --- a/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs +++ b/Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs @@ -4,10 +4,8 @@ using Content.Shared.Weapons.Ranged.Components; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; -using Robust.Client.Serialization; using Robust.Client.UserInterface; using Robust.Shared.Enums; -using Robust.Shared.Graphics; using Robust.Shared.Utility; namespace Content.Client.CombatMode; diff --git a/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs index 373be94a384..025f09b1a48 100644 --- a/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs +++ b/Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs @@ -11,17 +11,20 @@ public sealed partial class MagazineVisualsComponent : Component /// /// What RsiState we use. /// - [DataField("magState")] public string? MagState; + [DataField] + public string? MagState; /// /// How many steps there are /// - [DataField("steps")] public int MagSteps; + [DataField("steps")] + public int MagSteps; /// /// Should we hide when the count is 0 /// - [DataField("zeroVisible")] public bool ZeroVisible; + [DataField] + public bool ZeroVisible; } public enum GunVisualLayers : byte diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs index 622a168fbf4..03f7532659a 100644 --- a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs +++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs @@ -8,9 +8,10 @@ public sealed partial class SpentAmmoVisualsComponent : Component /// /// Should we do "{_state}-spent" or just "spent" /// - [DataField("suffix")] public bool Suffix = true; + [DataField] + public bool Suffix = true; - [DataField("state")] + [DataField] public string State = "base"; } diff --git a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs index 63d21c84635..c714ca2eb54 100644 --- a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs +++ b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs @@ -48,7 +48,7 @@ public sealed class GunSpreadOverlay : Overlay if (mapPos.MapId == MapId.Nullspace) return; - if (!_guns.TryGetGun(player.Value, out var gunUid, out var gun)) + if (!_guns.TryGetGun(player.Value, out var gun)) return; var mouseScreenPos = _input.MouseScreenPosition; @@ -58,12 +58,12 @@ public sealed class GunSpreadOverlay : Overlay return; // (☞ﾟヮﾟ)☞ - var maxSpread = gun.MaxAngleModified; - var minSpread = gun.MinAngleModified; - var timeSinceLastFire = (_timing.CurTime - gun.NextFire).TotalSeconds; - var currentAngle = new Angle(MathHelper.Clamp(gun.CurrentAngle.Theta - gun.AngleDecayModified.Theta * timeSinceLastFire, - gun.MinAngleModified.Theta, gun.MaxAngleModified.Theta)); - var direction = (mousePos.Position - mapPos.Position); + var maxSpread = gun.Comp.MaxAngleModified; + var minSpread = gun.Comp.MinAngleModified; + var timeSinceLastFire = (_timing.CurTime - gun.Comp.NextFire).TotalSeconds; + var currentAngle = new Angle(MathHelper.Clamp(gun.Comp.CurrentAngle.Theta - gun.Comp.AngleDecayModified.Theta * timeSinceLastFire, + gun.Comp.MinAngleModified.Theta, gun.Comp.MaxAngleModified.Theta)); + var direction = mousePos.Position - mapPos.Position; worldHandle.DrawLine(mapPos.Position, mousePos.Position + direction, Color.Orange); diff --git a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs index e11d5e71580..3c57cf73d07 100644 --- a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs +++ b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs @@ -41,7 +41,7 @@ public abstract class BaseBulletRenderer : Control { var countPerRow = Math.Min(Capacity, CountPerRow(availableSize.X)); - var rows = Math.Min((int) MathF.Ceiling(Capacity / (float) countPerRow), Rows); + var rows = Math.Min((int)MathF.Ceiling(Capacity / (float)countPerRow), Rows); var height = _params.ItemHeight * rows + (_params.VerticalSeparation * rows - 1); var width = RowWidth(countPerRow); @@ -110,7 +110,7 @@ public abstract class BaseBulletRenderer : Control private int CountPerRow(float width) { - return (int) ((width - _params.ItemWidth + _params.ItemSeparation) / _params.ItemSeparation); + return (int)((width - _params.ItemWidth + _params.ItemSeparation) / _params.ItemSeparation); } private int RowWidth(int count) diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs index 401b7cdfafe..3a0aa255012 100644 --- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs @@ -2,10 +2,8 @@ using Content.Shared.Projectiles; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Systems; using Robust.Client.Player; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Physics.Events; -using Robust.Shared.Player; using Robust.Shared.Random; namespace Content.Client.Weapons.Ranged.Systems; @@ -22,26 +20,26 @@ public sealed class FlyBySoundSystem : SharedFlyBySoundSystem SubscribeLocalEvent(OnCollide); } - private void OnCollide(EntityUid uid, FlyBySoundComponent component, ref StartCollideEvent args) + private void OnCollide(Entity ent, ref StartCollideEvent args) { var attachedEnt = _player.LocalEntity; // If it's not our ent or we shot it. if (attachedEnt == null || args.OtherEntity != attachedEnt || - TryComp(uid, out var projectile) && + TryComp(ent, out var projectile) && projectile.Shooter == attachedEnt) { return; } if (args.OurFixtureId != FlyByFixture || - !_random.Prob(component.Prob)) + !_random.Prob(ent.Comp.Prob)) { return; } // Play attached to our entity because the projectile may immediately delete or the likes. - _audio.PlayPredicted(component.Sound, attachedEnt.Value, attachedEnt.Value); + _audio.PlayPredicted(ent.Comp.Sound, attachedEnt.Value, attachedEnt.Value); } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs index dc27a5db871..49b067e3952 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs @@ -14,12 +14,12 @@ namespace Content.Client.Weapons.Ranged.Systems; public sealed partial class GunSystem { - private void OnAmmoCounterCollect(EntityUid uid, AmmoCounterComponent component, ItemStatusCollectMessage args) + private void OnAmmoCounterCollect(Entity ent, ref ItemStatusCollectMessage args) { - RefreshControl(uid, component); + RefreshControl(ent); - if (component.Control != null) - args.Controls.Add(component.Control); + if (ent.Comp.Control != null) + args.Controls.Add(ent.Comp.Control); } /// @@ -27,35 +27,32 @@ public sealed partial class GunSystem /// /// /// - private void RefreshControl(EntityUid uid, AmmoCounterComponent? component = null) + private void RefreshControl(Entity ent) { - if (!Resolve(uid, ref component, false)) - return; - - component.Control?.Dispose(); - component.Control = null; + ent.Comp.Control?.Dispose(); + ent.Comp.Control = null; var ev = new AmmoCounterControlEvent(); - RaiseLocalEvent(uid, ev, false); + RaiseLocalEvent(ent, ev, false); // Fallback to default if none specified ev.Control ??= new DefaultStatusControl(); - component.Control = ev.Control; - UpdateAmmoCount(uid, component); + ent.Comp.Control = ev.Control; + UpdateAmmoCount(ent); } - private void UpdateAmmoCount(EntityUid uid, AmmoCounterComponent component) + private void UpdateAmmoCount(Entity ent) { - if (component.Control == null) + if (ent.Comp.Control == null) return; var ev = new UpdateAmmoCounterEvent() { - Control = component.Control + Control = ent.Comp.Control }; - RaiseLocalEvent(uid, ev, false); + RaiseLocalEvent(ent, ev, false); } protected override void UpdateAmmoCount(EntityUid uid, bool prediction = true) @@ -68,7 +65,7 @@ public sealed partial class GunSystem return; } - UpdateAmmoCount(uid, clientComp); + UpdateAmmoCount((uid, clientComp)); } /// diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs index d09661b770b..44593215aa3 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs @@ -12,41 +12,41 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnBallisticAmmoCount); } - private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, UpdateAmmoCounterEvent args) + private void OnBallisticAmmoCount(Entity ent, ref UpdateAmmoCounterEvent args) { if (args.Control is DefaultStatusControl control) { - control.Update(GetBallisticShots(component), component.Capacity); + control.Update(GetBallisticShots(ent.Comp), ent.Comp.Capacity); } } - protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates) + protected override void Cycle(Entity ent, MapCoordinates coordinates) { if (!Timing.IsFirstTimePredicted) return; - EntityUid? ent = null; + EntityUid? ammoEnt = null; // TODO: Combine with TakeAmmo - if (component.Entities.Count > 0) + if (ent.Comp.Entities.Count > 0) { - var existing = component.Entities[^1]; - component.Entities.RemoveAt(component.Entities.Count - 1); + var existing = ent.Comp.Entities[^1]; + ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1); - Containers.Remove(existing, component.Container); + Containers.Remove(existing, ent.Comp.Container); EnsureShootable(existing); } - else if (component.UnspawnedCount > 0) + else if (ent.Comp.UnspawnedCount > 0) { - component.UnspawnedCount--; - ent = Spawn(component.Proto, coordinates); - EnsureShootable(ent.Value); + ent.Comp.UnspawnedCount--; + ammoEnt = Spawn(ent.Comp.Proto, coordinates); + EnsureShootable(ammoEnt.Value); } - if (ent != null && IsClientSide(ent.Value)) - Del(ent.Value); + if (ammoEnt != null && IsClientSide(ammoEnt.Value)) + Del(ammoEnt.Value); var cycledEvent = new GunCycledEvent(); - RaiseLocalEvent(uid, ref cycledEvent); + RaiseLocalEvent(ent, ref cycledEvent); } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs index 4fa50999bd8..669bc3ec409 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.BasicEntity.cs @@ -10,11 +10,11 @@ public partial class GunSystem SubscribeLocalEvent(OnBasicEntityAmmoCount); } - private void OnBasicEntityAmmoCount(EntityUid uid, BasicEntityAmmoProviderComponent component, UpdateAmmoCounterEvent args) + private void OnBasicEntityAmmoCount(Entity ent, ref UpdateAmmoCounterEvent args) { - if (args.Control is DefaultStatusControl control && component.Count != null && component.Capacity != null) + if (args.Control is DefaultStatusControl control && ent.Comp.Count != null && ent.Comp.Capacity != null) { - control.Update(component.Count.Value, component.Capacity.Value); + control.Update(ent.Comp.Count.Value, ent.Comp.Capacity.Value); } } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs index d40708de998..e47b0c952df 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs @@ -18,11 +18,11 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnChamberMagazineAppearance); } - private void OnChamberMagazineAppearance(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ref AppearanceChangeEvent args) + private void OnChamberMagazineAppearance(Entity ent, ref AppearanceChangeEvent args) { if (args.Sprite == null || - !_sprite.LayerMapTryGet((uid, args.Sprite), GunVisualLayers.Base, out var boltLayer, false) || - !Appearance.TryGetData(uid, AmmoVisuals.BoltClosed, out bool boltClosed)) + !_sprite.LayerMapTryGet((ent, args.Sprite), GunVisualLayers.Base, out var boltLayer, false) || + !Appearance.TryGetData(ent, AmmoVisuals.BoltClosed, out bool boltClosed)) { return; } @@ -30,11 +30,11 @@ public sealed partial class GunSystem // Maybe re-using base layer for this will bite me someday but screw you future sloth. if (boltClosed) { - _sprite.LayerSetRsiState((uid, args.Sprite), boltLayer, "base"); + _sprite.LayerSetRsiState((ent, args.Sprite), boltLayer, "base"); } else { - _sprite.LayerSetRsiState((uid, args.Sprite), boltLayer, "bolt-open"); + _sprite.LayerSetRsiState((ent, args.Sprite), boltLayer, "bolt-open"); } } @@ -55,17 +55,17 @@ public sealed partial class GunSystem // to avoid 6-7 additional entity spawns. } - private void OnChamberMagazineCounter(EntityUid uid, ChamberMagazineAmmoProviderComponent component, AmmoCounterControlEvent args) + private void OnChamberMagazineCounter(Entity ent, ref AmmoCounterControlEvent args) { args.Control = new ChamberMagazineStatusControl(); } - private void OnChamberMagazineAmmoUpdate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args) + private void OnChamberMagazineAmmoUpdate(Entity ent, ref UpdateAmmoCounterEvent args) { if (args.Control is not ChamberMagazineStatusControl control) return; - var chambered = GetChamberEntity(uid); - var magEntity = GetMagazineEntity(uid); + var chambered = GetChamberEntity(ent); + var magEntity = GetMagazineEntity(ent); var ammoCountEv = new GetAmmoCountEvent(); if (magEntity != null) diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs index 0df95e4c02e..e21eef570ed 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs @@ -11,11 +11,11 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnMagazineControl); } - private void OnMagazineAmmoUpdate(EntityUid uid, MagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args) + private void OnMagazineAmmoUpdate(Entity ent, ref UpdateAmmoCounterEvent args) { - var ent = GetMagazineEntity(uid); + var magEnt = GetMagazineEntity(ent); - if (ent == null) + if (magEnt == null) { if (args.Control is DefaultStatusControl control) { @@ -25,14 +25,14 @@ public sealed partial class GunSystem return; } - RaiseLocalEvent(ent.Value, args, false); + RaiseLocalEvent(magEnt.Value, args, false); } - private void OnMagazineControl(EntityUid uid, MagazineAmmoProviderComponent component, AmmoCounterControlEvent args) + private void OnMagazineControl(Entity ent, ref AmmoCounterControlEvent args) { - var ent = GetMagazineEntity(uid); - if (ent == null) + var magEnt = GetMagazineEntity(ent); + if (magEnt == null) return; - RaiseLocalEvent(ent.Value, args, false); + RaiseLocalEvent(magEnt.Value, args, false); } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs index c21b12ceacf..8bf37eaca84 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs @@ -13,24 +13,24 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnMagazineVisualsChange); } - private void OnMagazineVisualsInit(EntityUid uid, MagazineVisualsComponent component, ComponentInit args) + private void OnMagazineVisualsInit(Entity ent, ref ComponentInit args) { - if (!TryComp(uid, out var sprite)) return; + if (!TryComp(ent, out var sprite)) return; - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false)) { - _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.Mag, $"{component.MagState}-{component.MagSteps - 1}"); - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false); + _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.Mag, $"{ent.Comp.MagState}-{ent.Comp.MagSteps - 1}"); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false); } - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false)) { - _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.MagUnshaded, $"{component.MagState}-unshaded-{component.MagSteps - 1}"); - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false); + _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.MagUnshaded, $"{ent.Comp.MagState}-unshaded-{ent.Comp.MagSteps - 1}"); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false); } } - private void OnMagazineVisualsChange(EntityUid uid, MagazineVisualsComponent component, ref AppearanceChangeEvent args) + private void OnMagazineVisualsChange(Entity ent, ref AppearanceChangeEvent args) { // tl;dr // 1.If no mag then hide it OR @@ -45,53 +45,53 @@ public sealed partial class GunSystem { if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoMax, out var capacity)) { - capacity = component.MagSteps; + capacity = ent.Comp.MagSteps; } if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoCount, out var current)) { - current = component.MagSteps; + current = ent.Comp.MagSteps; } - var step = ContentHelpers.RoundToLevels((int)current, (int)capacity, component.MagSteps); + var step = ContentHelpers.RoundToLevels((int)current, (int)capacity, ent.Comp.MagSteps); - if (step == 0 && !component.ZeroVisible) + if (step == 0 && !ent.Comp.ZeroVisible) { - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false); } - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false); } return; } - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, true); - _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.Mag, $"{component.MagState}-{step}"); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, true); + _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.Mag, $"{ent.Comp.MagState}-{step}"); } - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, true); - _sprite.LayerSetRsiState((uid, sprite), GunVisualLayers.MagUnshaded, $"{component.MagState}-unshaded-{step}"); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, true); + _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.MagUnshaded, $"{ent.Comp.MagState}-unshaded-{step}"); } } else { - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.Mag, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.Mag, false); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false); } - if (_sprite.LayerMapTryGet((uid, sprite), GunVisualLayers.MagUnshaded, out _, false)) + if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false)) { - _sprite.LayerSetVisible((uid, sprite), GunVisualLayers.MagUnshaded, false); + _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false); } } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs index 33a4042daff..0a6101b20a9 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs @@ -14,25 +14,25 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnRevolverEntRemove); } - private void OnRevolverEntRemove(EntityUid uid, RevolverAmmoProviderComponent component, EntRemovedFromContainerMessage args) + private void OnRevolverEntRemove(Entity ent, ref EntRemovedFromContainerMessage args) { if (args.Container.ID != RevolverContainer) return; - // See ChamberMagazineAmmoProvider + // if (!IsClientSide(args.Entity)) return; QueueDel(args.Entity); } - private void OnRevolverAmmoUpdate(EntityUid uid, RevolverAmmoProviderComponent component, UpdateAmmoCounterEvent args) + private void OnRevolverAmmoUpdate(Entity ent, ref UpdateAmmoCounterEvent args) { if (args.Control is not RevolverStatusControl control) return; - control.Update(component.CurrentIndex, component.Chambers); + control.Update(ent.Comp.CurrentIndex, ent.Comp.Chambers); } - private void OnRevolverCounter(EntityUid uid, RevolverAmmoProviderComponent component, AmmoCounterControlEvent args) + private void OnRevolverCounter(Entity ent, ref AmmoCounterControlEvent args) { args.Control = new RevolverStatusControl(); } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs index dc5aa4d08c2..a4fb34fcb7b 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs @@ -11,7 +11,7 @@ public sealed partial class GunSystem SubscribeLocalEvent(OnSpentAmmoAppearance); } - private void OnSpentAmmoAppearance(EntityUid uid, SpentAmmoVisualsComponent component, ref AppearanceChangeEvent args) + private void OnSpentAmmoAppearance(Entity ent, ref AppearanceChangeEvent args) { var sprite = args.Sprite; if (sprite == null) return; @@ -21,15 +21,15 @@ public sealed partial class GunSystem return; } - var spent = (bool) varSpent; + var spent = (bool)varSpent; string state; if (spent) - state = component.Suffix ? $"{component.State}-spent" : "spent"; + state = ent.Comp.Suffix ? $"{ent.Comp.State}-spent" : "spent"; else - state = component.State; + state = ent.Comp.State; - _sprite.LayerSetRsiState((uid, sprite), AmmoVisualLayers.Base, state); - _sprite.RemoveLayer((uid, sprite), AmmoVisualLayers.Tip, false); + _sprite.LayerSetRsiState((ent, sprite), AmmoVisualLayers.Base, state); + _sprite.RemoveLayer((ent, sprite), AmmoVisualLayers.Tip, false); } } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs index d3dfd50cbf7..2814cef6506 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -31,13 +31,13 @@ namespace Content.Client.Weapons.Ranged.Systems; public sealed partial class GunSystem : SharedGunSystem { + [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!; [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly InputSystem _inputSystem = default!; [Dependency] private readonly IOverlayManager _overlayManager = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IStateManager _state = default!; - [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; [Dependency] private readonly SharedMapSystem _maps = default!; [Dependency] private readonly SharedTransformSystem _xform = default!; @@ -167,29 +167,29 @@ public sealed partial class GunSystem : SharedGunSystem var entity = entityNull.Value; - if (!TryGetGun(entity, out var gunUid, out var gun)) + if (!TryGetGun(entity, out var gun)) { return; } - var useKey = gun.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary; + var useKey = gun.Comp.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary; - if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.BurstActivated) + if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down && !gun.Comp.BurstActivated) { - if (gun.ShotCounter != 0) - RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) }); + if (gun.Comp.ShotCounter != 0) + RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gun) }); return; } - if (gun.NextFire > Timing.CurTime) + if (gun.Comp.NextFire > Timing.CurTime) return; var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition); if (mousePos.MapId == MapId.Nullspace) { - if (gun.ShotCounter != 0) - RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) }); + if (gun.Comp.ShotCounter != 0) + RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gun) }); return; } @@ -207,11 +207,11 @@ public sealed partial class GunSystem : SharedGunSystem { Target = target, Coordinates = GetNetCoordinates(coordinates), - Gun = GetNetEntity(gunUid), + Gun = GetNetEntity(gun), }); } - public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo, + public override void Shoot(Entity gun, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false) { userImpulse = true; @@ -226,7 +226,7 @@ public sealed partial class GunSystem : SharedGunSystem { if (throwItems) { - Recoil(user, direction, gun.CameraRecoilScalarModified); + Recoil(user, direction, gun.Comp.CameraRecoilScalarModified); if (IsClientSide(ent!.Value)) Del(ent.Value); else @@ -241,9 +241,9 @@ public sealed partial class GunSystem : SharedGunSystem if (!cartridge.Spent) { SetCartridgeSpent(ent!.Value, cartridge, true); - MuzzleFlash(gunUid, cartridge, worldAngle, user); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalarModified); + MuzzleFlash(gun, cartridge, worldAngle, user); + Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user); + Recoil(user, direction, gun.Comp.CameraRecoilScalarModified); // TODO: Can't predict entity deletions. //if (cartridge.DeleteOnSpawn) // Del(cartridge.Owner); @@ -251,7 +251,7 @@ public sealed partial class GunSystem : SharedGunSystem else { userImpulse = false; - Audio.PlayPredicted(gun.SoundEmpty, gunUid, user); + Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user); } if (IsClientSide(ent!.Value)) @@ -259,17 +259,17 @@ public sealed partial class GunSystem : SharedGunSystem break; case AmmoComponent newAmmo: - MuzzleFlash(gunUid, newAmmo, worldAngle, user); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalarModified); + MuzzleFlash(gun, newAmmo, worldAngle, user); + Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user); + Recoil(user, direction, gun.Comp.CameraRecoilScalarModified); if (IsClientSide(ent!.Value)) Del(ent.Value); else RemoveShootable(ent.Value); break; case HitscanAmmoComponent: - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); - Recoil(user, direction, gun.CameraRecoilScalarModified); + Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user); + Recoil(user, direction, gun.Comp.CameraRecoilScalarModified); break; } } @@ -407,5 +407,5 @@ public sealed partial class GunSystem : SharedGunSystem } // TODO: Move RangedDamageSoundComponent to shared so this can be predicted. - public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) {} + public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) { } } diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs index d04ed4cb3c7..6279449ba79 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs @@ -478,11 +478,11 @@ public abstract partial class InteractionTest var wasInCombatMode = IsInCombatMode(); await SetCombatMode(true); - Assert.That(SGun.TryGetGun(SPlayer, out var gunUid, out var gunComp), "Player was not holding a gun!"); + Assert.That(SGun.TryGetGun(SPlayer, out var gun), "Player was not holding a gun!"); await Server.WaitAssertion(() => { - var success = SGun.AttemptShoot(SPlayer, gunUid, gunComp!, actualTarget); + var success = SGun.AttemptShoot(SPlayer, gun, actualTarget); if (assert) Assert.That(success, "Gun failed to shoot."); }); @@ -517,11 +517,11 @@ public abstract partial class InteractionTest var wasInCombatMode = IsInCombatMode(); await SetCombatMode(true); - Assert.That(SGun.TryGetGun(SPlayer, out var gunUid, out var gunComp), "Player was not holding a gun!"); + Assert.That(SGun.TryGetGun(SPlayer, out var gun), "Player was not holding a gun!"); await Server.WaitAssertion(() => { - var success = SGun.AttemptShoot(SPlayer, gunUid, gunComp!, Position(actualTarget!.Value), ToServer(actualTarget)); + var success = SGun.AttemptShoot(SPlayer, gun, Position(actualTarget!.Value), ToServer(actualTarget)); if (assert) Assert.That(success, "Gun failed to shoot."); }); @@ -839,7 +839,7 @@ public abstract partial class InteractionTest /// The entity at which the events were directed /// How many new events are expected /// A predicate that can be used to filter the recorded events - protected void AssertEvent(EntityUid? uid = null, int count = 1, Func? predicate = null) + protected void AssertEvent(EntityUid? uid = null, int count = 1, Func? predicate = null) where TEvent : notnull { Assert.That(GetEvents(uid, predicate).Count, Is.EqualTo(count)); @@ -872,7 +872,7 @@ public abstract partial class InteractionTest where TEvent : notnull { if (_listenerCache.TryGetValue(typeof(TEvent), out var listener)) - return (TestListenerSystem) listener; + return (TestListenerSystem)listener; var type = Server.Resolve().GetAllChildren>().Single(); if (!SEntMan.EntitySysManager.TryGetEntitySystem(type, out var systemObj)) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index f30e0ef7280..6b301acc9ac 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -722,7 +722,7 @@ public sealed partial class AdminVerbSystem return; _gun.SetBallisticUnspawned((args.Target, ballisticAmmo), result); - _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo); + _gun.UpdateBallisticAppearance((args.Target, ballisticAmmo)); }); }, Impact = LogImpact.Medium, diff --git a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs index 1f9d338c58e..cf78f5c1140 100644 --- a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs +++ b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs @@ -27,18 +27,18 @@ public sealed partial class GunSignalControlSystem : EntitySystem return; if (args.Port == gunControl.Comp.TriggerPort) - _gun.AttemptShoot(gunControl, gun); + _gun.AttemptShoot((gunControl, gun)); if (!TryComp(gunControl, out var autoShoot)) return; if (args.Port == gunControl.Comp.TogglePort) - _gun.SetEnabled(gunControl, autoShoot, !autoShoot.Enabled); + _gun.SetEnabled((gunControl, autoShoot), !autoShoot.Enabled); if (args.Port == gunControl.Comp.OnPort) - _gun.SetEnabled(gunControl, autoShoot, true); + _gun.SetEnabled((gunControl, autoShoot), true); if (args.Port == gunControl.Comp.OffPort) - _gun.SetEnabled(gunControl, autoShoot, false); + _gun.SetEnabled((gunControl, autoShoot), false); } } diff --git a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs index 58647d88749..961d3c39ab7 100644 --- a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs @@ -10,10 +10,10 @@ public sealed partial class GunAmmoPrecondition : HTNPrecondition { [Dependency] private readonly IEntityManager _entManager = default!; - [DataField("minPercent")] + [DataField] public float MinPercent = 0f; - [DataField("maxPercent")] + [DataField] public float MaxPercent = 1f; public override bool IsMet(NPCBlackboard blackboard) @@ -21,19 +21,19 @@ public sealed partial class GunAmmoPrecondition : HTNPrecondition var owner = blackboard.GetValue(NPCBlackboard.Owner); var gunSystem = _entManager.System(); - if (!gunSystem.TryGetGun(owner, out var gunUid, out _)) + if (!gunSystem.TryGetGun(owner, out var gun)) { return false; } var ammoEv = new GetAmmoCountEvent(); - _entManager.EventBus.RaiseLocalEvent(gunUid, ref ammoEv); + _entManager.EventBus.RaiseLocalEvent(gun, ref ammoEv); float percent; if (ammoEv.Capacity == 0) percent = 0f; else - percent = ammoEv.Count / (float) ammoEv.Capacity; + percent = ammoEv.Count / (float)ammoEv.Capacity; percent = System.Math.Clamp(percent, 0f, 1f); diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs index d4f97282935..34a1fe533d7 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs @@ -96,7 +96,7 @@ public sealed partial class NPCCombatSystem _combat.SetInCombatMode(uid, true, combatMode); } - if (!_gun.TryGetGun(uid, out var gunUid, out var gun)) + if (!_gun.TryGetGun(uid, out var gun)) { comp.Status = CombatStatus.NoWeapon; comp.ShootAccumulator = 0f; @@ -104,12 +104,12 @@ public sealed partial class NPCCombatSystem } var ammoEv = new GetAmmoCountEvent(); - RaiseLocalEvent(gunUid, ref ammoEv); + RaiseLocalEvent(gun, ref ammoEv); if (ammoEv.Count == 0) { // Recharging then? - if (_rechargeQuery.HasComponent(gunUid)) + if (_rechargeQuery.HasComponent(gun)) { continue; } @@ -200,12 +200,12 @@ public sealed partial class NPCCombatSystem comp.Status = CombatStatus.Normal; - if (gun.NextFire > _timing.CurTime) + if (gun.Comp.NextFire > _timing.CurTime) { return; } - _gun.AttemptShoot(uid, gunUid, gun, targetCordinates, comp.Target); + _gun.AttemptShoot(uid, gun, targetCordinates, comp.Target); } } } diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index 2ccdc109343..f3a9444e80c 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -232,7 +232,7 @@ namespace Content.Server.Singularity.EntitySystems var targetPos = new EntityCoordinates(uid, new Vector2(0, -1)); - _gun.Shoot(uid, gunComponent, ent, xform.Coordinates, targetPos, out _); + _gun.Shoot((uid, gunComponent), ent, xform.Coordinates, targetPos, out _); } private void UpdateAppearance(EntityUid uid, EmitterComponent component) diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs index 2599285bdc4..8247dfc491d 100644 --- a/Content.Server/Turrets/DeployableTurretSystem.cs +++ b/Content.Server/Turrets/DeployableTurretSystem.cs @@ -84,7 +84,7 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste args.Data.TryGetValue(command, out int? armamentState)) { if (TryComp(ent, out var batteryWeaponFireModes)) - _fireModes.TrySetFireMode(ent, batteryWeaponFireModes, armamentState.Value); + _fireModes.TrySetFireMode((ent, batteryWeaponFireModes), armamentState.Value); TrySetState(ent, armamentState.Value >= 0); return; diff --git a/Content.Server/Weapons/DamageMarkerSystem.cs b/Content.Server/Weapons/DamageMarkerSystem.cs index be65bca1686..4e57b98ae06 100644 --- a/Content.Server/Weapons/DamageMarkerSystem.cs +++ b/Content.Server/Weapons/DamageMarkerSystem.cs @@ -2,7 +2,4 @@ using Content.Shared.Weapons.Marker; namespace Content.Server.Weapons; -public sealed class DamageMarkerSystem : SharedDamageMarkerSystem -{ - -} +public sealed class DamageMarkerSystem : SharedDamageMarkerSystem { } diff --git a/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs b/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs index 3815ce15dbf..5e70b840d20 100644 --- a/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs +++ b/Content.Server/Weapons/Ranged/Components/AmmoCounterComponent.cs @@ -3,4 +3,4 @@ using Content.Shared.Weapons.Ranged.Components; namespace Content.Server.Weapons.Ranged.Components; [RegisterComponent] -public sealed partial class AmmoCounterComponent : SharedAmmoCounterComponent {} +public sealed partial class AmmoCounterComponent : SharedAmmoCounterComponent { } diff --git a/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs index b9a5eca09b6..928ec257bbf 100644 --- a/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs +++ b/Content.Server/Weapons/Ranged/Components/ChemicalAmmoComponent.cs @@ -1,11 +1,10 @@ -namespace Content.Server.Weapons.Ranged.Components -{ - [RegisterComponent] - public sealed partial class ChemicalAmmoComponent : Component - { - public const string DefaultSolutionName = "ammo"; +namespace Content.Server.Weapons.Ranged.Components; - [DataField("solution")] - public string SolutionName { get; set; } = DefaultSolutionName; - } +[RegisterComponent] +public sealed partial class ChemicalAmmoComponent : Component +{ + public const string DefaultSolutionName = "ammo"; + + [DataField("solution")] + public string SolutionName { get; set; } = DefaultSolutionName; } diff --git a/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs b/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs index ccb5119af86..d9b96a1adc4 100644 --- a/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs +++ b/Content.Server/Weapons/Ranged/Components/RangedDamageSoundComponent.cs @@ -16,15 +16,13 @@ public sealed partial class RangedDamageSoundComponent : Component /// Specified sounds to apply when the entity takes damage with the specified group. /// Will fallback to defaults if none specified. /// - [DataField("soundGroups", - customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] + [DataField(customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] public Dictionary? SoundGroups; /// /// Specified sounds to apply when the entity takes damage with the specified type. /// Will fallback to defaults if none specified. /// - [DataField("soundTypes", - customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] + [DataField(customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] public Dictionary? SoundTypes; } diff --git a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs index 089ef23a144..4ee1e9fd929 100644 --- a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs @@ -1,49 +1,48 @@ using Content.Server.Weapons.Ranged.Components; using Content.Shared.Chemistry.Components; -using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Weapons.Ranged.Events; using System.Linq; -namespace Content.Server.Weapons.Ranged.Systems +namespace Content.Server.Weapons.Ranged.Systems; + +public sealed class ChemicalAmmoSystem : EntitySystem { - public sealed class ChemicalAmmoSystem : EntitySystem + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + + public override void Initialize() { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + SubscribeLocalEvent(OnFire); + } - public override void Initialize() + private void OnFire(Entity entity, ref AmmoShotEvent args) + { + if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var ammoSoln, out var ammoSolution)) + return; + + var projectiles = args.FiredProjectiles; + + var projectileSolutionContainers = new List<(EntityUid, Entity)>(); + foreach (var projectile in projectiles) { - SubscribeLocalEvent(OnFire); + if (_solutionContainerSystem + .TryGetSolution(projectile, entity.Comp.SolutionName, out var projectileSoln, out _)) + { + projectileSolutionContainers.Add((projectile, projectileSoln.Value)); + } } - private void OnFire(Entity entity, ref AmmoShotEvent args) + if (!projectileSolutionContainers.Any()) + return; + + var solutionPerProjectile = ammoSolution.Volume * (1 / projectileSolutionContainers.Count); + + foreach (var (_, projectileSolution) in projectileSolutionContainers) { - if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var ammoSoln, out var ammoSolution)) - return; - - var projectiles = args.FiredProjectiles; - - var projectileSolutionContainers = new List<(EntityUid, Entity)>(); - foreach (var projectile in projectiles) - { - if (_solutionContainerSystem - .TryGetSolution(projectile, entity.Comp.SolutionName, out var projectileSoln, out _)) - { - projectileSolutionContainers.Add((projectile, projectileSoln.Value)); - } - } - - if (!projectileSolutionContainers.Any()) - return; - - var solutionPerProjectile = ammoSolution.Volume * (1 / projectileSolutionContainers.Count); - - foreach (var (_, projectileSolution) in projectileSolutionContainers) - { - var solutionToTransfer = _solutionContainerSystem.SplitSolution(ammoSoln.Value, solutionPerProjectile); - _solutionContainerSystem.TryAddSolution(projectileSolution, solutionToTransfer); - } - - _solutionContainerSystem.RemoveAllSolution(ammoSoln.Value); + var solutionToTransfer = _solutionContainerSystem.SplitSolution(ammoSoln.Value, solutionPerProjectile); + _solutionContainerSystem.TryAddSolution(projectileSolution, solutionToTransfer); } + + _solutionContainerSystem.RemoveAllSolution(ammoSoln.Value); } } diff --git a/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs index f9986767fe4..03a46de1c24d 100644 --- a/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/FlyBySoundSystem.cs @@ -2,4 +2,4 @@ using Content.Shared.Weapons.Ranged.Systems; namespace Content.Server.Weapons.Ranged.Systems; -public sealed class FlyBySoundSystem : SharedFlyBySoundSystem {} +public sealed class FlyBySoundSystem : SharedFlyBySoundSystem { } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs index 995e29727bb..18a91cd6455 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs @@ -27,15 +27,15 @@ public sealed partial class GunSystem if (!autoShoot.Enabled) continue; - AttemptShoot(uid, gun); + AttemptShoot((uid, gun)); } else if (gun.BurstActivated) { var parent = TransformSystem.GetParentUid(uid); if (HasComp(parent)) - AttemptShoot(parent, uid, gun, gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection)); + AttemptShoot(parent, (uid, gun), gun.ShootCoordinates ?? new EntityCoordinates(uid, gun.DefaultDirection)); else - AttemptShoot(uid, gun); + AttemptShoot((uid, gun)); } } } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs index 60680deaaaa..87d958d9d15 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs @@ -6,32 +6,32 @@ namespace Content.Server.Weapons.Ranged.Systems; public sealed partial class GunSystem { - protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates) + protected override void Cycle(Entity ent, MapCoordinates coordinates) { - EntityUid? ent = null; + EntityUid? ammoEnt = null; // TODO: Combine with TakeAmmo - if (component.Entities.Count > 0) + if (ent.Comp.Entities.Count > 0) { - var existing = component.Entities[^1]; - component.Entities.RemoveAt(component.Entities.Count - 1); - DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities)); + var existing = ent.Comp.Entities[^1]; + ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1); + DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities)); - Containers.Remove(existing, component.Container); + Containers.Remove(existing, ent.Comp.Container); EnsureShootable(existing); } - else if (component.UnspawnedCount > 0) + else if (ent.Comp.UnspawnedCount > 0) { - component.UnspawnedCount--; - DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount)); - ent = Spawn(component.Proto, coordinates); - EnsureShootable(ent.Value); + ent.Comp.UnspawnedCount--; + DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount)); + ammoEnt = Spawn(ent.Comp.Proto, coordinates); + EnsureShootable(ammoEnt.Value); } - if (ent != null) - EjectCartridge(ent.Value); + if (ammoEnt != null) + EjectCartridge(ammoEnt.Value); var cycledEvent = new GunCycledEvent(); - RaiseLocalEvent(uid, ref cycledEvent); + RaiseLocalEvent(ent, ref cycledEvent); } } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs index 59e53f1f72a..7f2fa28b13d 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Revolver.cs @@ -4,15 +4,15 @@ namespace Content.Server.Weapons.Ranged.Systems; public sealed partial class GunSystem { - protected override void SpinRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null) + protected override void SpinRevolver(Entity ent, EntityUid? user = null) { - base.SpinRevolver(revolverUid, component, user); - var index = Random.Next(component.Capacity); + base.SpinRevolver(ent, user); + var index = Random.Next(ent.Comp.Capacity); - if (component.CurrentIndex == index) + if (ent.Comp.CurrentIndex == index) return; - component.CurrentIndex = index; - Dirty(revolverUid, component); + ent.Comp.CurrentIndex = index; + Dirty(ent); } } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs index d0898efaaf8..eddc8739bb3 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs @@ -23,63 +23,63 @@ public sealed partial class GunSystem private void OnSolutionMapInit(Entity entity, ref MapInitEvent args) { - UpdateSolutionShots(entity.Owner, entity.Comp); + UpdateSolutionShots(entity); } private void OnSolutionChanged(Entity entity, ref SolutionContainerChangedEvent args) { if (args.Solution.Name == entity.Comp.SolutionId) - UpdateSolutionShots(entity.Owner, entity.Comp, args.Solution); + UpdateSolutionShots(entity, args.Solution); } - protected override void UpdateSolutionShots(EntityUid uid, SolutionAmmoProviderComponent component, Solution? solution = null) + protected override void UpdateSolutionShots(Entity ent, Solution? solution = null) { var shots = 0; var maxShots = 0; - if (solution == null && !_solutionContainer.TryGetSolution(uid, component.SolutionId, out _, out solution)) + if (solution == null && !_solutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out _, out solution)) { - component.Shots = shots; - DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.Shots)); - component.MaxShots = maxShots; - DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.MaxShots)); + ent.Comp.Shots = shots; + DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.Shots)); + ent.Comp.MaxShots = maxShots; + DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.MaxShots)); return; } - shots = (int) (solution.Volume / component.FireCost); - maxShots = (int) (solution.MaxVolume / component.FireCost); + shots = (int)(solution.Volume / ent.Comp.FireCost); + maxShots = (int)(solution.MaxVolume / ent.Comp.FireCost); - component.Shots = shots; - DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.Shots)); + ent.Comp.Shots = shots; + DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.Shots)); - component.MaxShots = maxShots; - DirtyField(uid, component, nameof(SolutionAmmoProviderComponent.MaxShots)); + ent.Comp.MaxShots = maxShots; + DirtyField(ent.AsNullable(), nameof(SolutionAmmoProviderComponent.MaxShots)); - UpdateSolutionAppearance(uid, component); + UpdateSolutionAppearance(ent); } - protected override (EntityUid Entity, IShootable) GetSolutionShot(EntityUid uid, SolutionAmmoProviderComponent component, EntityCoordinates position) + protected override (EntityUid Entity, IShootable) GetSolutionShot(Entity ent, EntityCoordinates position) { - var (ent, shootable) = base.GetSolutionShot(uid, component, position); + var (shot, shootable) = base.GetSolutionShot(ent, position); - if (!_solutionContainer.TryGetSolution(uid, component.SolutionId, out var solution, out _)) - return (ent, shootable); + if (!_solutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionId, out var solution, out _)) + return (shot, shootable); - var newSolution = _solutionContainer.SplitSolution(solution.Value, component.FireCost); + var newSolution = _solutionContainer.SplitSolution(solution.Value, ent.Comp.FireCost); if (newSolution.Volume <= FixedPoint2.Zero) - return (ent, shootable); + return (shot, shootable); - if (TryComp(ent, out var appearance)) + if (TryComp(shot, out var appearance)) { - Appearance.SetData(ent, VaporVisuals.Color, newSolution.GetColor(ProtoManager).WithAlpha(1f), appearance); - Appearance.SetData(ent, VaporVisuals.State, true, appearance); + Appearance.SetData(shot, VaporVisuals.Color, newSolution.GetColor(ProtoManager).WithAlpha(1f), appearance); + Appearance.SetData(shot, VaporVisuals.State, true, appearance); } // Add the solution to the vapor and actually send the thing - if (_solutionContainer.TryGetSolution(ent, VaporComponent.SolutionName, out var vaporSolution, out _)) + if (_solutionContainer.TryGetSolution(shot, VaporComponent.SolutionName, out var vaporSolution, out _)) { _solutionContainer.TryAddSolution(vaporSolution.Value, newSolution); } - return (ent, shootable); + return (shot, shootable); } } diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index 8bbab9503e7..53db706d6e6 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -33,30 +33,30 @@ public sealed partial class GunSystem : SharedGunSystem SubscribeLocalEvent(OnBallisticPrice); } - private void OnBallisticPrice(EntityUid uid, BallisticAmmoProviderComponent component, ref PriceCalculationEvent args) + private void OnBallisticPrice(Entity ent, ref PriceCalculationEvent args) { - if (string.IsNullOrEmpty(component.Proto) || component.UnspawnedCount == 0) + if (string.IsNullOrEmpty(ent.Comp.Proto) || ent.Comp.UnspawnedCount == 0) return; - if (!ProtoManager.TryIndex(component.Proto, out var proto)) + if (!ProtoManager.TryIndex(ent.Comp.Proto, out var proto)) { - Log.Error($"Unable to find fill prototype for price on {component.Proto} on {ToPrettyString(uid)}"); + Log.Error($"Unable to find fill prototype for price on {ent.Comp.Proto} on {ToPrettyString(ent)}"); return; } // Probably good enough for most. var price = _pricing.GetEstimatedPrice(proto); - args.Price += price * component.UnspawnedCount; + args.Price += price * ent.Comp.UnspawnedCount; } - public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo, + public override void Shoot(Entity gun, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false) { userImpulse = true; if (user != null) { - var selfEvent = new SelfBeforeGunShotEvent(user.Value, (gunUid, gun), ammo); + var selfEvent = new SelfBeforeGunShotEvent(user.Value, gun, ammo); RaiseLocalEvent(user.Value, selfEvent); if (selfEvent.Cancelled) { @@ -90,7 +90,7 @@ public sealed partial class GunSystem : SharedGunSystem // pneumatic cannon doesn't shoot bullets it just throws them, ignore ammo handling if (throwItems && ent != null) { - ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user); + ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, user); continue; } @@ -117,7 +117,7 @@ public sealed partial class GunSystem : SharedGunSystem else { userImpulse = false; - Audio.PlayPredicted(gun.SoundEmpty, gunUid, user); + Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user); } // Something like ballistic might want to leave it in the container still @@ -141,22 +141,22 @@ public sealed partial class GunSystem : SharedGunSystem { FromCoordinates = fromCoordinates, ShotDirection = mapDirection.Normalized(), - Gun = gunUid, + Gun = gun, Shooter = user, - Target = gun.Target, + Target = gun.Comp.Target, }; RaiseLocalEvent(ent.Value, ref hitscanEv); Del(ent); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); + Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user); break; default: throw new ArgumentOutOfRangeException(); } } - RaiseLocalEvent(gunUid, new AmmoShotEvent() + RaiseLocalEvent(gun, new AmmoShotEvent() { FiredProjectiles = shotProjectiles, }); @@ -166,35 +166,35 @@ public sealed partial class GunSystem : SharedGunSystem if (TryComp(ammoEnt, out var ammoSpreadComp)) { var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread); - RaiseLocalEvent(gunUid, ref spreadEvent); + RaiseLocalEvent(gun, ref spreadEvent); var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2, mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count); - ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user); + ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, user); shotProjectiles.Add(ammoEnt); for (var i = 1; i < ammoSpreadComp.Count; i++) { var newuid = Spawn(ammoSpreadComp.Proto, fromEnt); - ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user); + ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, user); shotProjectiles.Add(newuid); } } else { - ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user); + ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, user); shotProjectiles.Add(ammoEnt); } - MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); + MuzzleFlash(gun, ammoComp, mapDirection.ToAngle(), user); + Audio.PlayPredicted(gun.Comp.SoundGunshotModified, gun, user); } } - private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user) + private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, Entity gun, EntityUid? user) { - if (gun.Target is { } target && !TerminatingOrDeleted(target)) + if (gun.Comp.Target is { } target && !TerminatingOrDeleted(target)) { var targeted = EnsureComp(uid); targeted.Target = target; @@ -206,11 +206,11 @@ public sealed partial class GunSystem : SharedGunSystem { RemoveShootable(uid); // TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack. - ThrowingSystem.TryThrow(uid, mapDirection, gun.ProjectileSpeedModified, user); + ThrowingSystem.TryThrow(uid, mapDirection, gun.Comp.ProjectileSpeedModified, user); return; } - ShootProjectile(uid, mapDirection, gunVelocity, gunUid, user, gun.ProjectileSpeedModified); + ShootProjectile(uid, mapDirection, gunVelocity, gun, user, gun.Comp.ProjectileSpeedModified); } /// diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs index 7fb13ff866f..50ef5f413a0 100644 --- a/Content.Shared/Magic/SharedMagicSystem.cs +++ b/Content.Shared/Magic/SharedMagicSystem.cs @@ -461,7 +461,7 @@ public abstract class SharedMagicSystem : EntitySystem return; if (TryComp(wand, out var basicAmmoComp) && basicAmmoComp.Count != null) - _gunSystem.UpdateBasicEntityAmmoCount(wand.Value, basicAmmoComp.Count.Value + ev.Charge, basicAmmoComp); + _gunSystem.UpdateBasicEntityAmmoCount((wand.Value, basicAmmoComp), basicAmmoComp.Count.Value + ev.Charge); else if (TryComp(wand, out var charges)) _charges.AddCharges((wand.Value, charges), ev.Charge); } diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs index cdcf1a7b31b..094d115677d 100644 --- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs @@ -13,27 +13,27 @@ public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoP /// /// If the gun has a bolt and whether that bolt is closed. Firing is impossible /// - [ViewVariables(VVAccess.ReadWrite), DataField("boltClosed"), AutoNetworkedField] + [DataField, AutoNetworkedField] public bool? BoltClosed = false; /// /// Does the gun automatically open and close the bolt upon shooting. /// - [ViewVariables(VVAccess.ReadWrite), DataField("autoCycle"), AutoNetworkedField] + [DataField, AutoNetworkedField] public bool AutoCycle = true; /// /// Can the gun be racked, which opens and then instantly closes the bolt to cycle a round. /// - [ViewVariables(VVAccess.ReadWrite), DataField("canRack"), AutoNetworkedField] + [DataField, AutoNetworkedField] public bool CanRack = true; - [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltClosed"), AutoNetworkedField] + [DataField("soundBoltClosed"), AutoNetworkedField] public SoundSpecifier? BoltClosedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg"); - [ViewVariables(VVAccess.ReadWrite), DataField("soundBoltOpened"), AutoNetworkedField] + [DataField("soundBoltOpened"), AutoNetworkedField] public SoundSpecifier? BoltOpenedSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg"); - [ViewVariables(VVAccess.ReadWrite), DataField("soundRack"), AutoNetworkedField] + [DataField("soundRack"), AutoNetworkedField] public SoundSpecifier? RackSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/ltrifle_cock.ogg"); } diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs index 8dfc3242075..078fb68d92b 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -225,7 +225,7 @@ public sealed partial class GunComponent : Component /// When the gun is next available to be shot. /// Can be set multiple times in a single tick due to guns firing faster than a single tick time. /// - [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] [AutoNetworkedField] [AutoPausedField] public TimeSpan NextFire = TimeSpan.Zero; diff --git a/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs index 7f889f57f67..e18b3f3bb88 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunSpreadModifierComponent.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Weapons.Ranged.Components; /// This component modifies the spread of the gun it is attached to. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] -public sealed partial class GunSpreadModifierComponent: Component +public sealed partial class GunSpreadModifierComponent : Component { /// /// A scalar value multiplied by the spread built into the ammo itself. diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs index 56d09ceaa5d..2bb68ce071a 100644 --- a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs @@ -11,12 +11,12 @@ namespace Content.Shared.Weapons.Ranged; [Access(typeof(SharedGunSystem))] public partial class MagazineAmmoProviderComponent : AmmoProviderComponent { - [ViewVariables(VVAccess.ReadWrite), DataField("soundAutoEject")] + [DataField] public SoundSpecifier? SoundAutoEject = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); /// /// Should the magazine automatically eject when empty. /// - [ViewVariables(VVAccess.ReadWrite), DataField("autoEject")] + [DataField] public bool AutoEject = false; } diff --git a/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs index 8cbe6f6487b..aadaf1a1f4d 100644 --- a/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs +++ b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Weapons.Ranged.Events; /// -/// Raised on the client to request it would like to stop hooting. +/// Raised on the client to request it would like to stop shooting. /// [Serializable, NetSerializable] public sealed class RequestStopShootEvent : EntityEventArgs diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs index f3dfe8a2a03..b68d9d1d5de 100644 --- a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs @@ -28,14 +28,14 @@ public sealed class ActionGunSystem : EntitySystem private void OnShutdown(Entity ent, ref ComponentShutdown args) { - if (ent.Comp.Gun is {} gun) + if (ent.Comp.Gun is { } gun) QueueDel(gun); } private void OnShoot(Entity ent, ref ActionGunShootEvent args) { if (TryComp(ent.Comp.Gun, out var gun)) - _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target); + _gun.AttemptShoot(ent, (ent.Comp.Gun.Value, gun), args.Target); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs index 59b4345f978..29ba5c5ee29 100644 --- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs @@ -1,4 +1,3 @@ -using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Database; using Content.Shared.Examine; @@ -6,18 +5,17 @@ using Content.Shared.Interaction.Events; using Content.Shared.Popups; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Components; -using Content.Shared.Weapons.Ranged.Events; using Robust.Shared.Prototypes; namespace Content.Shared.Weapons.Ranged.Systems; public sealed class BatteryWeaponFireModesSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; public override void Initialize() { @@ -28,12 +26,12 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem SubscribeLocalEvent(OnExamined); } - private void OnExamined(EntityUid uid, BatteryWeaponFireModesComponent component, ExaminedEvent args) + private void OnExamined(Entity ent, ref ExaminedEvent args) { - if (component.FireModes.Count < 2) + if (ent.Comp.FireModes.Count < 2) return; - var fireMode = GetMode(component); + var fireMode = GetMode(ent.Comp); if (!_prototypeManager.TryIndex(fireMode.Prototype, out var proto)) return; @@ -73,7 +71,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem DoContactInteraction = true, Act = () => { - TrySetFireMode(uid, component, index, args.User); + TrySetFireMode((uid, component), index, args.User); } }; @@ -81,60 +79,60 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem } } - private void OnUseInHandEvent(EntityUid uid, BatteryWeaponFireModesComponent component, UseInHandEvent args) + private void OnUseInHandEvent(Entity ent, ref UseInHandEvent args) { - if(args.Handled) + if (args.Handled) return; args.Handled = true; - TryCycleFireMode(uid, component, args.User); + TryCycleFireMode(ent, args.User); } - public void TryCycleFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, EntityUid? user = null) + public void TryCycleFireMode(Entity ent, EntityUid? user = null) { - if (component.FireModes.Count < 2) + if (ent.Comp.FireModes.Count < 2) return; - var index = (component.CurrentFireMode + 1) % component.FireModes.Count; - TrySetFireMode(uid, component, index, user); + var index = (ent.Comp.CurrentFireMode + 1) % ent.Comp.FireModes.Count; + TrySetFireMode(ent, index, user); } - public bool TrySetFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, int index, EntityUid? user = null) + public bool TrySetFireMode(Entity ent, int index, EntityUid? user = null) { - if (index < 0 || index >= component.FireModes.Count) + if (index < 0 || index >= ent.Comp.FireModes.Count) return false; - if (user != null && !_accessReaderSystem.IsAllowed(user.Value, uid)) + if (user != null && !_accessReaderSystem.IsAllowed(user.Value, ent)) return false; - SetFireMode(uid, component, index, user); + SetFireMode(ent, index, user); return true; } - private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, int index, EntityUid? user = null) + private void SetFireMode(Entity ent, int index, EntityUid? user = null) { - var fireMode = component.FireModes[index]; - component.CurrentFireMode = index; - Dirty(uid, component); + var fireMode = ent.Comp.FireModes[index]; + ent.Comp.CurrentFireMode = index; + Dirty(ent); if (_prototypeManager.TryIndex(fireMode.Prototype, out var prototype)) { - if (TryComp(uid, out var appearance)) - _appearanceSystem.SetData(uid, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance); + if (TryComp(ent, out var appearance)) + _appearanceSystem.SetData(ent, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance); if (user != null) - _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), uid, user.Value); + _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), ent, user.Value); } - if (TryComp(uid, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent)) + if (TryComp(ent, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent)) { batteryAmmoProviderComponent.Prototype = fireMode.Prototype; batteryAmmoProviderComponent.FireCost = fireMode.FireCost; - Dirty(uid, batteryAmmoProviderComponent); + Dirty(ent, batteryAmmoProviderComponent); - _gun.UpdateShots((uid, batteryAmmoProviderComponent)); + _gun.UpdateShots((ent, batteryAmmoProviderComponent)); } } } diff --git a/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs b/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs index 84d8dd2cf42..ec90384bf32 100644 --- a/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/GunSpreadModifierSystem.cs @@ -4,8 +4,7 @@ using Content.Shared.Weapons.Ranged.Events; namespace Content.Shared.Weapons.Ranged.Systems; - -public sealed class GunSpreadModifierSystem: EntitySystem +public sealed class GunSpreadModifierSystem : EntitySystem { public override void Initialize() { @@ -14,14 +13,14 @@ public sealed class GunSpreadModifierSystem: EntitySystem SubscribeLocalEvent(OnExamine); } - private void OnGunGetAmmoSpread(EntityUid uid, GunSpreadModifierComponent comp, ref GunGetAmmoSpreadEvent args) + private void OnGunGetAmmoSpread(Entity ent, ref GunGetAmmoSpreadEvent args) { - args.Spread *= comp.Spread; + args.Spread *= ent.Comp.Spread; } - private void OnExamine(EntityUid uid, GunSpreadModifierComponent comp, ExaminedEvent args) + private void OnExamine(Entity ent, ref ExaminedEvent args) { - var percentage = Math.Round(comp.Spread * 100); + var percentage = Math.Round(ent.Comp.Spread * 100); var loc = percentage < 100 ? "examine-gun-spread-modifier-reduction" : "examine-gun-spread-modifier-increase"; percentage = percentage < 100 ? 100 - percentage : percentage - 100; var msg = Loc.GetString(loc, ("percentage", percentage)); diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs index 3316df0b965..5584c84bae5 100644 --- a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs @@ -1,11 +1,8 @@ using Content.Shared.Examine; using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; -using Robust.Shared.Player; using Robust.Shared.Timing; -using Robust.Shared.Utility; namespace Content.Shared.Weapons.Ranged.Systems; @@ -13,9 +10,9 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem { [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; public override void Initialize() { @@ -38,7 +35,7 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem if (recharge.NextCharge > _timing.CurTime) continue; - if (_gun.UpdateBasicEntityAmmoCount(uid, ammo.Count.Value + 1, ammo)) + if (_gun.UpdateBasicEntityAmmoCount((uid, ammo), ammo.Count.Value + 1)) { // We don't predict this because occasionally on client it may not play. // PlayPredicted will still be predicted on the client. @@ -58,38 +55,38 @@ public sealed class RechargeBasicEntityAmmoSystem : EntitySystem } } - private void OnInit(EntityUid uid, RechargeBasicEntityAmmoComponent component, MapInitEvent args) + private void OnInit(Entity ent, ref MapInitEvent args) { - component.NextCharge = _timing.CurTime; - Dirty(uid, component); + ent.Comp.NextCharge = _timing.CurTime; + Dirty(ent); } - private void OnExamined(EntityUid uid, RechargeBasicEntityAmmoComponent component, ExaminedEvent args) + private void OnExamined(Entity ent, ref ExaminedEvent args) { - if (!component.ShowExamineText) + if (!ent.Comp.ShowExamineText) return; - if (!TryComp(uid, out var ammo) + if (!TryComp(ent, out var ammo) || ammo.Count == ammo.Capacity || - component.NextCharge == null) + ent.Comp.NextCharge == null) { args.PushMarkup(Loc.GetString("recharge-basic-entity-ammo-full")); return; } - var timeLeft = component.NextCharge + _metadata.GetPauseTime(uid) - _timing.CurTime; + var timeLeft = ent.Comp.NextCharge + _metadata.GetPauseTime(ent) - _timing.CurTime; args.PushMarkup(Loc.GetString("recharge-basic-entity-ammo-can-recharge", ("seconds", Math.Round(timeLeft.Value.TotalSeconds, 1)))); } - public void Reset(EntityUid uid, RechargeBasicEntityAmmoComponent? recharge = null) + public void Reset(Entity ent) { - if (!Resolve(uid, ref recharge, false)) + if (!Resolve(ent, ref ent.Comp, false)) return; - if (recharge.NextCharge == null || recharge.NextCharge < _timing.CurTime) + if (ent.Comp.NextCharge == null || ent.Comp.NextCharge < _timing.CurTime) { - recharge.NextCharge = _timing.CurTime + TimeSpan.FromSeconds(recharge.RechargeCooldown); - Dirty(uid, recharge); + ent.Comp.NextCharge = _timing.CurTime + TimeSpan.FromSeconds(ent.Comp.RechargeCooldown); + Dirty(ent); } } } diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs index ee5ca2174f3..092d8e8d0fb 100644 --- a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs @@ -16,19 +16,19 @@ public sealed class RechargeCycleAmmoSystem : EntitySystem SubscribeLocalEvent(OnRechargeCycled); } - private void OnRechargeCycled(EntityUid uid, RechargeCycleAmmoComponent component, ActivateInWorldEvent args) + private void OnRechargeCycled(Entity ent, ref ActivateInWorldEvent args) { if (!args.Complex) return; - if (!TryComp(uid, out var basic) || args.Handled) + if (!TryComp(ent, out var basic) || args.Handled) return; if (basic.Count >= basic.Capacity || basic.Count == null) return; - _gun.UpdateBasicEntityAmmoCount(uid, basic.Count.Value + 1, basic); - Dirty(uid, basic); + _gun.UpdateBasicEntityAmmoCount((ent, basic), basic.Count.Value + 1); + Dirty(ent, basic); args.Handled = true; } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs index 6aec5e9db3d..2ca5a7502c3 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs @@ -24,24 +24,24 @@ public abstract class SharedFlyBySoundSystem : EntitySystem SubscribeLocalEvent(OnShutdown); } - private void OnStartup(EntityUid uid, FlyBySoundComponent component, ComponentStartup args) + private void OnStartup(Entity ent, ref ComponentStartup args) { - if (!TryComp(uid, out var body)) + if (!TryComp(ent, out var body)) return; - var shape = new PhysShapeCircle(component.Range); + var shape = new PhysShapeCircle(ent.Comp.Range); - _fixtures.TryCreateFixture(uid, shape, FlyByFixture, collisionLayer: (int) CollisionGroup.MobMask, hard: false, body: body); + _fixtures.TryCreateFixture(ent, shape, FlyByFixture, collisionLayer: (int)CollisionGroup.MobMask, hard: false, body: body); } - private void OnShutdown(EntityUid uid, FlyBySoundComponent component, ComponentShutdown args) + private void OnShutdown(Entity ent, ref ComponentShutdown args) { - if (!TryComp(uid, out var body) || - MetaData(uid).EntityLifeStage >= EntityLifeStage.Terminating) + if (!TryComp(ent, out var body) || + MetaData(ent).EntityLifeStage >= EntityLifeStage.Terminating) { return; } - _fixtures.DestroyFixture(uid, FlyByFixture, body: body); + _fixtures.DestroyFixture(ent, FlyByFixture, body: body); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs index 4c19547a399..86f3e2a49d2 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.AutoFire.cs @@ -4,8 +4,8 @@ namespace Content.Shared.Weapons.Ranged.Systems; public partial class SharedGunSystem { - public void SetEnabled(EntityUid uid, AutoShootGunComponent component, bool status) + public void SetEnabled(Entity ent, bool status) { - component.Enabled = status; + ent.Comp.Enabled = status; } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index c501c0aa792..831db83c3bf 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -36,26 +36,26 @@ public abstract partial class SharedGunSystem SubscribeLocalEvent(OnRefillerEmpPulsed); } - private void OnBallisticRefillerMapInit(Entity entity, ref MapInitEvent args) + private void OnBallisticRefillerMapInit(Entity entity, ref MapInitEvent _) { entity.Comp.NextAutoRefill = Timing.CurTime + entity.Comp.AutoRefillRate; } - private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent component, UseInHandEvent args) + private void OnBallisticUse(Entity ent, ref UseInHandEvent args) { if (args.Handled) return; - ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User); + ManualCycle(ent, TransformSystem.GetMapCoordinates(ent), args.User); args.Handled = true; } - private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderComponent component, InteractUsingEvent args) + private void OnBallisticInteractUsing(Entity ent, ref InteractUsingEvent args) { if (args.Handled) return; - if (TryBallisticInsert((uid, component), args.Used, args.User)) + if (TryBallisticInsert(ent, args.Used, args.User)) args.Handled = true; } @@ -168,65 +168,65 @@ public abstract partial class SharedGunSystem { Text = Loc.GetString("gun-ballistic-cycle"), Disabled = GetBallisticShots(component) == 0, - Act = () => ManualCycle(uid, component, TransformSystem.GetMapCoordinates(uid), args.User), + Act = () => ManualCycle((uid, component), TransformSystem.GetMapCoordinates(uid), args.User), }); } } - private void OnBallisticExamine(EntityUid uid, BallisticAmmoProviderComponent component, ExaminedEvent args) + private void OnBallisticExamine(Entity ent, ref ExaminedEvent args) { if (!args.IsInDetailsRange) return; - args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", GetBallisticShots(component)))); + args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", GetBallisticShots(ent.Comp)))); } - private void ManualCycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates, EntityUid? user = null, GunComponent? gunComp = null) + private void ManualCycle(Entity ent, MapCoordinates coordinates, EntityUid? user = null, GunComponent? gunComp = null) { - if (!component.Cycleable) + if (!ent.Comp.Cycleable) return; // Reset shotting for cycling - if (Resolve(uid, ref gunComp, false) && + if (Resolve(ent, ref gunComp, false) && gunComp is { FireRateModified: > 0f } && - !Paused(uid)) + !Paused(ent)) { gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRateModified); - DirtyField(uid, gunComp, nameof(GunComponent.NextFire)); + DirtyField(ent, gunComp, nameof(GunComponent.NextFire)); } - Audio.PlayPredicted(component.SoundRack, uid, user); + Audio.PlayPredicted(ent.Comp.SoundRack, ent, user); - var shots = GetBallisticShots(component); - Cycle(uid, component, coordinates); + var shots = GetBallisticShots(ent.Comp); + Cycle(ent, coordinates); var text = Loc.GetString(shots == 0 ? "gun-ballistic-cycled-empty" : "gun-ballistic-cycled"); - Popup(text, uid, user); - UpdateBallisticAppearance(uid, component); - UpdateAmmoCount(uid); + Popup(text, ent, user); + UpdateBallisticAppearance(ent); + UpdateAmmoCount(ent); } - protected abstract void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates); + protected abstract void Cycle(Entity ent, MapCoordinates coordinates); - private void OnBallisticInit(EntityUid uid, BallisticAmmoProviderComponent component, ComponentInit args) + private void OnBallisticInit(Entity ent, ref ComponentInit args) { - component.Container = Containers.EnsureContainer(uid, "ballistic-ammo"); + ent.Comp.Container = Containers.EnsureContainer(ent, "ballistic-ammo"); // TODO: This is called twice though we need to support loading appearance data (and we need to call it on MapInit // to ensure it's correct). - UpdateBallisticAppearance(uid, component); + UpdateBallisticAppearance(ent); } - private void OnBallisticMapInit(EntityUid uid, BallisticAmmoProviderComponent component, MapInitEvent args) + private void OnBallisticMapInit(Entity ent, ref MapInitEvent args) { // TODO this should be part of the prototype, not set on map init. // Alternatively, just track spawned count, instead of unspawned count. - if (component.Proto != null) + if (ent.Comp.Proto != null) { - component.UnspawnedCount = Math.Max(0, component.Capacity - component.Container.ContainedEntities.Count); - UpdateBallisticAppearance(uid, component); - DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount)); + ent.Comp.UnspawnedCount = Math.Max(0, ent.Comp.Capacity - ent.Comp.Container.ContainedEntities.Count); + UpdateBallisticAppearance(ent); + DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount)); } } @@ -235,43 +235,43 @@ public abstract partial class SharedGunSystem return component.Entities.Count + component.UnspawnedCount; } - private void OnBallisticTakeAmmo(EntityUid uid, BallisticAmmoProviderComponent component, TakeAmmoEvent args) + private void OnBallisticTakeAmmo(Entity ent, ref TakeAmmoEvent args) { for (var i = 0; i < args.Shots; i++) { EntityUid? ammoEntity = null; - if (component.Entities.Count > 0) + if (ent.Comp.Entities.Count > 0) { - var existingEnt = component.Entities[^1]; - component.Entities.RemoveAt(component.Entities.Count - 1); - DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities)); - Containers.Remove(existingEnt, component.Container); + var existingEnt = ent.Comp.Entities[^1]; + ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1); + DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities)); + Containers.Remove(existingEnt, ent.Comp.Container); ammoEntity = existingEnt; } - else if (component.UnspawnedCount > 0) + else if (ent.Comp.UnspawnedCount > 0) { - component.UnspawnedCount--; - DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.UnspawnedCount)); - ammoEntity = Spawn(component.Proto, args.Coordinates); + ent.Comp.UnspawnedCount--; + DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.UnspawnedCount)); + ammoEntity = Spawn(ent.Comp.Proto, args.Coordinates); } - if (ammoEntity is { } ent) + if (ammoEntity is not { } ammoEnt) + continue; + + args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt))); + if (TryComp(ent, out var refiller)) { - args.Ammo.Add((ent, EnsureShootable(ent))); - if (TryComp(uid, out var refiller)) - { - PauseSelfRefill((uid, refiller)); - } + PauseSelfRefill((ent, refiller)); } } - UpdateBallisticAppearance(uid, component); + UpdateBallisticAppearance(ent); } - private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, ref GetAmmoCountEvent args) + private void OnBallisticAmmoCount(Entity ent, ref GetAmmoCountEvent args) { - args.Count = GetBallisticShots(component); - args.Capacity = component.Capacity; + args.Count = GetBallisticShots(ent.Comp); + args.Capacity = ent.Comp.Capacity; } /// @@ -334,20 +334,20 @@ public abstract partial class SharedGunSystem Audio.PlayPredicted(entity.Comp.SoundInsert, entity, user); } - UpdateBallisticAppearance(entity, entity.Comp); + UpdateBallisticAppearance(entity); UpdateAmmoCount(entity); DirtyField(entity.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities)); return true; } - public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component) + public void UpdateBallisticAppearance(Entity ent) { - if (!Timing.IsFirstTimePredicted || !TryComp(uid, out var appearance)) + if (!Timing.IsFirstTimePredicted || !TryComp(ent, out var appearance)) return; - Appearance.SetData(uid, AmmoVisuals.AmmoCount, GetBallisticShots(component), appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoCount, GetBallisticShots(ent.Comp), appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity, appearance); } public void SetBallisticUnspawned(Entity entity, int count) @@ -356,7 +356,7 @@ public abstract partial class SharedGunSystem return; entity.Comp.UnspawnedCount = count; - UpdateBallisticAppearance(entity.Owner, entity.Comp); + UpdateBallisticAppearance(entity); UpdateAmmoCount(entity.Owner); Dirty(entity); } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs index 04f9b52324c..49630dcd82d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.BasicEntity.cs @@ -1,6 +1,5 @@ using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; -using Robust.Shared.GameStates; namespace Content.Shared.Weapons.Ranged.Systems; @@ -13,75 +12,70 @@ public abstract partial class SharedGunSystem SubscribeLocalEvent(OnBasicEntityAmmoCount); } - private void OnBasicEntityMapInit(EntityUid uid, BasicEntityAmmoProviderComponent component, MapInitEvent args) + private void OnBasicEntityMapInit(Entity ent, ref MapInitEvent args) { - if (component.Count is null) + if (ent.Comp.Count is null) { - component.Count = component.Capacity; - Dirty(uid, component); + ent.Comp.Count = ent.Comp.Capacity; + Dirty(ent); } - UpdateBasicEntityAppearance(uid, component); + UpdateBasicEntityAppearance(ent); } - private void OnBasicEntityTakeAmmo(EntityUid uid, BasicEntityAmmoProviderComponent component, TakeAmmoEvent args) + private void OnBasicEntityTakeAmmo(Entity ent, ref TakeAmmoEvent args) { for (var i = 0; i < args.Shots; i++) { - if (component.Count <= 0) + if (ent.Comp.Count <= 0) return; - if (component.Count != null) - { - component.Count--; - } + if (ent.Comp.Count != null) + ent.Comp.Count--; - var ent = Spawn(component.Proto, args.Coordinates); - args.Ammo.Add((ent, EnsureShootable(ent))); + var ammoEnt = Spawn(ent.Comp.Proto, args.Coordinates); + args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt))); } - _recharge.Reset(uid); - UpdateBasicEntityAppearance(uid, component); - Dirty(uid, component); + _recharge.Reset(ent.Owner); + UpdateBasicEntityAppearance(ent); + Dirty(ent); } - private void OnBasicEntityAmmoCount(EntityUid uid, BasicEntityAmmoProviderComponent component, ref GetAmmoCountEvent args) + private void OnBasicEntityAmmoCount(Entity ent, ref GetAmmoCountEvent args) { - args.Capacity = component.Capacity ?? int.MaxValue; - args.Count = component.Count ?? int.MaxValue; + args.Capacity = ent.Comp.Capacity ?? int.MaxValue; + args.Count = ent.Comp.Count ?? int.MaxValue; } - private void UpdateBasicEntityAppearance(EntityUid uid, BasicEntityAmmoProviderComponent component) + private void UpdateBasicEntityAppearance(Entity ent) { - if (!Timing.IsFirstTimePredicted || !TryComp(uid, out var appearance)) + if (!Timing.IsFirstTimePredicted || !TryComp(ent, out var appearance)) return; - Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Count != 0, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Count ?? int.MaxValue, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity ?? int.MaxValue, appearance); + Appearance.SetData(ent, AmmoVisuals.HasAmmo, ent.Comp.Count != 0, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoCount, ent.Comp.Count ?? int.MaxValue, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity ?? int.MaxValue, appearance); } #region Public API - public bool ChangeBasicEntityAmmoCount(EntityUid uid, int delta, BasicEntityAmmoProviderComponent? component = null) + public bool ChangeBasicEntityAmmoCount(Entity ent, int delta) { - if (!Resolve(uid, ref component, false) || component.Count == null) + if (!Resolve(ent, ref ent.Comp, false) || ent.Comp.Count == null) return false; - return UpdateBasicEntityAmmoCount(uid, component.Count.Value + delta, component); + return UpdateBasicEntityAmmoCount((ent.Owner, ent.Comp), ent.Comp.Count.Value + delta); } - public bool UpdateBasicEntityAmmoCount(EntityUid uid, int count, BasicEntityAmmoProviderComponent? component = null) + public bool UpdateBasicEntityAmmoCount(Entity ent, int count) { - if (!Resolve(uid, ref component, false)) + if (!Resolve(ent, ref ent.Comp, false) || count > ent.Comp.Capacity) return false; - if (count > component.Capacity) - return false; - - component.Count = count; - UpdateBasicEntityAppearance(uid, component); - UpdateAmmoCount(uid); - Dirty(uid, component); + ent.Comp.Count = count; + UpdateBasicEntityAppearance((ent.Owner, ent.Comp)); + UpdateAmmoCount(ent); + Dirty(ent); return true; } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs index dcc9a5689a2..77f1e3c1039 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs @@ -26,9 +26,9 @@ public abstract partial class SharedGunSystem : Loc.GetString("gun-cartridge-unspent")); } - private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent component, ref DamageExamineEvent args) + private void OnCartridgeDamageExamine(Entity ent, ref DamageExamineEvent args) { - var damageSpec = GetProjectileDamage(component.Prototype); + var damageSpec = GetProjectileDamage(ent.Comp.Prototype); if (damageSpec == null) return; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index 4de9196761e..9f4cc9d6aac 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - protected const string ChamberSlot = "gun_chamber"; - protected virtual void InitializeChamberMagazine() { SubscribeLocalEvent(OnChamberStartup); @@ -42,7 +40,7 @@ public abstract partial class SharedGunSystem // Appearance data doesn't get serialized and want to make sure this is correct on spawn (regardless of MapInit) so. if (component.BoltClosed != null) { - Appearance.SetData(uid, AmmoVisuals.BoltClosed, component.BoltClosed.Value); + Appearance.SetData(uid, AmmoVisuals.BoltClosed, component.BoltClosed.Value); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs index 12bbe0c3123..afa905e0783 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs @@ -16,7 +16,7 @@ public partial class SharedGunSystem { var getConnectedContainerEvent = new GetConnectedContainerEvent(); RaiseLocalEvent(uid, ref getConnectedContainerEvent); - if(!getConnectedContainerEvent.ContainerEntity.HasValue) + if (!getConnectedContainerEvent.ContainerEntity.HasValue) return; RaiseLocalEvent(getConnectedContainerEvent.ContainerEntity.Value, args); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs index 27104c9d93f..4947909e703 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Container.cs @@ -14,10 +14,10 @@ public partial class SharedGunSystem SubscribeLocalEvent(OnContainerAmmoCount); } - private void OnContainerTakeAmmo(EntityUid uid, ContainerAmmoProviderComponent component, TakeAmmoEvent args) + private void OnContainerTakeAmmo(Entity ent, ref TakeAmmoEvent args) { - component.ProviderUid ??= uid; - if (!Containers.TryGetContainer(component.ProviderUid.Value, component.Container, out var container)) + ent.Comp.ProviderUid ??= ent; + if (!Containers.TryGetContainer(ent.Comp.ProviderUid.Value, ent.Comp.Container, out var container)) return; for (var i = 0; i < args.Shots; i++) @@ -25,19 +25,19 @@ public partial class SharedGunSystem if (!container.ContainedEntities.Any()) break; - var ent = container.ContainedEntities[0]; + var ammoEnt = container.ContainedEntities[0]; if (_netManager.IsServer) - Containers.Remove(ent, container); + Containers.Remove(ammoEnt, container); - args.Ammo.Add((ent, EnsureShootable(ent))); + args.Ammo.Add((ammoEnt, EnsureShootable(ammoEnt))); } } - private void OnContainerAmmoCount(EntityUid uid, ContainerAmmoProviderComponent component, ref GetAmmoCountEvent args) + private void OnContainerAmmoCount(Entity ent, ref GetAmmoCountEvent args) { - component.ProviderUid ??= uid; - if (!Containers.TryGetContainer(component.ProviderUid.Value, component.Container, out var container)) + ent.Comp.ProviderUid ??= ent; + if (!Containers.TryGetContainer(ent.Comp.ProviderUid.Value, ent.Comp.Container, out var container)) { args.Capacity = 0; args.Count = 0; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs index 2fece720f9c..ff91587775d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs @@ -66,7 +66,7 @@ public abstract partial class SharedGunSystem if (component.SelectedMode == fire) return; - DebugTools.Assert((component.AvailableModes & fire) != 0x0); + DebugTools.Assert((component.AvailableModes & fire) != 0x0); component.SelectedMode = fire; if (!Paused(uid)) @@ -113,7 +113,7 @@ public abstract partial class SharedGunSystem private void OnGunSelected(EntityUid uid, GunComponent component, HandSelectedEvent args) { if (Timing.ApplyingState) - return; + return; if (component.FireRateModified <= 0) return; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs index 2876851d2d8..d384b34c5b3 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - protected const string MagazineSlot = "gun_magazine"; - protected virtual void InitializeMagazine() { SubscribeLocalEvent(OnMagazineMapInit); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs index 29664c6eea4..e684d9aad1c 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs @@ -31,82 +31,82 @@ public partial class SharedGunSystem SubscribeLocalEvent(OnRevolverUse); } - private void OnRevolverUse(EntityUid uid, RevolverAmmoProviderComponent component, UseInHandEvent args) + private void OnRevolverUse(Entity ent, ref UseInHandEvent args) { if (args.Handled) return; - if (!_useDelay.TryResetDelay(uid)) + if (!_useDelay.TryResetDelay(ent)) return; args.Handled = true; - Cycle(component); - UpdateAmmoCount(uid, prediction: false); - Dirty(uid, component); + Cycle(ent.Comp); + UpdateAmmoCount(ent, prediction: false); + Dirty(ent); } - private void OnRevolverGetAmmoCount(EntityUid uid, RevolverAmmoProviderComponent component, ref GetAmmoCountEvent args) + private void OnRevolverGetAmmoCount(Entity ent, ref GetAmmoCountEvent args) { - args.Count += GetRevolverCount(component); - args.Capacity += component.Capacity; + args.Count += GetRevolverCount(ent.Comp); + args.Capacity += ent.Comp.Capacity; } - private void OnRevolverInteractUsing(EntityUid uid, RevolverAmmoProviderComponent component, InteractUsingEvent args) + private void OnRevolverInteractUsing(Entity ent, ref InteractUsingEvent args) { if (args.Handled) return; - if (TryRevolverInsert(uid, component, args.Used, args.User)) + if (TryRevolverInsert(ent, args.Used, args.User)) args.Handled = true; } - private void OnRevolverGetState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentGetState args) + private void OnRevolverGetState(Entity ent, ref ComponentGetState args) { args.State = new RevolverAmmoProviderComponentState { - CurrentIndex = component.CurrentIndex, - AmmoSlots = GetNetEntityList(component.AmmoSlots), - Chambers = component.Chambers, + CurrentIndex = ent.Comp.CurrentIndex, + AmmoSlots = GetNetEntityList(ent.Comp.AmmoSlots), + Chambers = ent.Comp.Chambers, }; } - private void OnRevolverHandleState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentHandleState args) + private void OnRevolverHandleState(Entity ent, ref ComponentHandleState args) { if (args.Current is not RevolverAmmoProviderComponentState state) return; - var oldIndex = component.CurrentIndex; - component.CurrentIndex = state.CurrentIndex; - component.Chambers = new bool?[state.Chambers.Length]; + var oldIndex = ent.Comp.CurrentIndex; + ent.Comp.CurrentIndex = state.CurrentIndex; + ent.Comp.Chambers = new bool?[state.Chambers.Length]; // Need to copy across the state rather than the ref. - for (var i = 0; i < component.AmmoSlots.Count; i++) + for (var i = 0; i < ent.Comp.AmmoSlots.Count; i++) { - component.AmmoSlots[i] = EnsureEntity(state.AmmoSlots[i], uid); - component.Chambers[i] = state.Chambers[i]; + ent.Comp.AmmoSlots[i] = EnsureEntity(state.AmmoSlots[i], ent); + ent.Comp.Chambers[i] = state.Chambers[i]; } // Handle spins if (oldIndex != state.CurrentIndex) { - UpdateAmmoCount(uid, prediction: false); + UpdateAmmoCount(ent, prediction: false); } } - public bool TryRevolverInsert(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid uid, EntityUid? user) + public bool TryRevolverInsert(Entity ent, EntityUid insertEnt, EntityUid? user) { - if (_whitelistSystem.IsWhitelistFail(component.Whitelist, uid)) + if (_whitelistSystem.IsWhitelistFail(ent.Comp.Whitelist, insertEnt)) return false; // If it's a speedloader try to get ammo from it. - if (HasComp(uid)) + if (HasComp(insertEnt)) { var freeSlots = 0; - for (var i = 0; i < component.Capacity; i++) + for (var i = 0; i < ent.Comp.Capacity; i++) { - if (component.AmmoSlots[i] != null || component.Chambers[i] != null) + if (ent.Comp.AmmoSlots[i] != null || ent.Comp.Chambers[i] != null) continue; freeSlots++; @@ -114,94 +114,94 @@ public partial class SharedGunSystem if (freeSlots == 0) { - Popup(Loc.GetString("gun-revolver-full"), revolverUid, user); + Popup(Loc.GetString("gun-revolver-full"), ent, user); return false; } var xformQuery = GetEntityQuery(); - var xform = xformQuery.GetComponent(uid); + var xform = xformQuery.GetComponent(insertEnt); var ammo = new List<(EntityUid? Entity, IShootable Shootable)>(freeSlots); var ev = new TakeAmmoEvent(freeSlots, ammo, xform.Coordinates, user); - RaiseLocalEvent(uid, ev); + RaiseLocalEvent(insertEnt, ev); if (ev.Ammo.Count == 0) { - Popup(Loc.GetString("gun-speedloader-empty"), revolverUid, user); + Popup(Loc.GetString("gun-speedloader-empty"), ent, user); return false; } - for (var i = 0; i < component.Capacity; i++) + for (var i = 0; i < ent.Comp.Capacity; i++) { - var index = (component.CurrentIndex + i) % component.Capacity; + var index = (ent.Comp.CurrentIndex + i) % ent.Comp.Capacity; - if (component.AmmoSlots[index] != null || - component.Chambers[index] != null) + if (ent.Comp.AmmoSlots[index] != null || + ent.Comp.Chambers[index] != null) { continue; } - var ent = ev.Ammo.Last().Entity; + var ammoEnt = ev.Ammo.Last().Entity; ev.Ammo.RemoveAt(ev.Ammo.Count - 1); - if (ent == null) + if (ammoEnt == null) { Log.Error($"Tried to load hitscan into a revolver which is unsupported"); continue; } - component.AmmoSlots[index] = ent.Value; - Containers.Insert(ent.Value, component.AmmoContainer); - SetChamber(index, component, uid); + ent.Comp.AmmoSlots[index] = ammoEnt.Value; + Containers.Insert(ammoEnt.Value, ent.Comp.AmmoContainer); + SetChamber(ent, insertEnt, index); if (ev.Ammo.Count == 0) break; } DebugTools.Assert(ammo.Count == 0); - UpdateRevolverAppearance(revolverUid, component); - UpdateAmmoCount(revolverUid); - Dirty(revolverUid, component); + UpdateRevolverAppearance(ent); + UpdateAmmoCount(ent); + Dirty(ent); - Audio.PlayPredicted(component.SoundInsert, revolverUid, user); - Popup(Loc.GetString("gun-revolver-insert"), revolverUid, user); + Audio.PlayPredicted(ent.Comp.SoundInsert, ent, user); + Popup(Loc.GetString("gun-revolver-insert"), ent, user); return true; } // Try to insert the entity directly. - for (var i = 0; i < component.Capacity; i++) + for (var i = 0; i < ent.Comp.Capacity; i++) { - var index = (component.CurrentIndex + i) % component.Capacity; + var index = (ent.Comp.CurrentIndex + i) % ent.Comp.Capacity; - if (component.AmmoSlots[index] != null || - component.Chambers[index] != null) + if (ent.Comp.AmmoSlots[index] != null || + ent.Comp.Chambers[index] != null) { continue; } - component.AmmoSlots[index] = uid; - Containers.Insert(uid, component.AmmoContainer); - SetChamber(index, component, uid); - Audio.PlayPredicted(component.SoundInsert, revolverUid, user); - Popup(Loc.GetString("gun-revolver-insert"), revolverUid, user); - UpdateRevolverAppearance(revolverUid, component); - UpdateAmmoCount(revolverUid); - Dirty(revolverUid, component); + ent.Comp.AmmoSlots[index] = insertEnt; + Containers.Insert(insertEnt, ent.Comp.AmmoContainer); + SetChamber(ent, insertEnt, index); + Audio.PlayPredicted(ent.Comp.SoundInsert, ent, user); + Popup(Loc.GetString("gun-revolver-insert"), ent, user); + UpdateRevolverAppearance(ent); + UpdateAmmoCount(ent); + Dirty(ent); return true; } - Popup(Loc.GetString("gun-revolver-full"), revolverUid, user); + Popup(Loc.GetString("gun-revolver-full"), ent, user); return false; } - private void SetChamber(int index, RevolverAmmoProviderComponent component, EntityUid uid) + private void SetChamber(Entity ent, Entity ammo, int index) { - if (TryComp(uid, out var cartridge) && cartridge.Spent) + if (!Resolve(ammo, ref ammo.Comp, false) || ammo.Comp.Spent) { - component.Chambers[index] = false; + ent.Comp.Chambers[index] = false; return; } - component.Chambers[index] = true; + ent.Comp.Chambers[index] = true; } private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent args) @@ -213,7 +213,7 @@ public partial class SharedGunSystem { Text = Loc.GetString("gun-revolver-empty"), Disabled = !AnyRevolverCartridges(component), - Act = () => EmptyRevolver(uid, component, args.User), + Act = () => EmptyRevolver((uid, component), args.User), Priority = 1 }); @@ -221,7 +221,7 @@ public partial class SharedGunSystem { Text = Loc.GetString("gun-revolver-spin"), // Category = VerbCategory.G, - Act = () => SpinRevolver(uid, component, args.User) + Act = () => SpinRevolver((uid, component), args.User) }); } @@ -281,15 +281,15 @@ public partial class SharedGunSystem return count; } - public void EmptyRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null) + public void EmptyRevolver(Entity ent, EntityUid? user = null) { - var mapCoordinates = TransformSystem.GetMapCoordinates(revolverUid); + var mapCoordinates = TransformSystem.GetMapCoordinates(ent); var anyEmpty = false; - for (var i = 0; i < component.Capacity; i++) + for (var i = 0; i < ent.Comp.Capacity; i++) { - var chamber = component.Chambers[i]; - var slot = component.AmmoSlots[i]; + var chamber = ent.Comp.Chambers[i]; + var slot = ent.Comp.AmmoSlots[i]; if (slot == null) { @@ -299,22 +299,22 @@ public partial class SharedGunSystem // Too lazy to make a new method don't sue me. if (!_netManager.IsClient) { - var uid = Spawn(component.FillPrototype, mapCoordinates); + var uid = Spawn(ent.Comp.FillPrototype, mapCoordinates); if (TryComp(uid, out var cartridge)) - SetCartridgeSpent(uid, cartridge, !(bool) chamber); + SetCartridgeSpent(uid, cartridge, !(bool)chamber); EjectCartridge(uid); } - component.Chambers[i] = null; + ent.Comp.Chambers[i] = null; anyEmpty = true; } else { - component.AmmoSlots[i] = null; - Containers.Remove(slot.Value, component.AmmoContainer); - component.Chambers[i] = null; + ent.Comp.AmmoSlots[i] = null; + Containers.Remove(slot.Value, ent.Comp.AmmoContainer); + ent.Comp.Chambers[i] = null; if (!_netManager.IsClient) EjectCartridge(slot.Value); @@ -325,47 +325,47 @@ public partial class SharedGunSystem if (anyEmpty) { - Audio.PlayPredicted(component.SoundEject, revolverUid, user); - UpdateAmmoCount(revolverUid, prediction: false); - UpdateRevolverAppearance(revolverUid, component); - Dirty(revolverUid, component); + Audio.PlayPredicted(ent.Comp.SoundEject, ent, user); + UpdateAmmoCount(ent, prediction: false); + UpdateRevolverAppearance(ent); + Dirty(ent); } } - private void UpdateRevolverAppearance(EntityUid uid, RevolverAmmoProviderComponent component) + private void UpdateRevolverAppearance(Entity ent) { - if (!TryComp(uid, out var appearance)) + if (!TryComp(ent, out var appearance)) return; - var count = GetRevolverCount(component); - Appearance.SetData(uid, AmmoVisuals.HasAmmo, count != 0, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoCount, count, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance); + var count = GetRevolverCount(ent.Comp); + Appearance.SetData(ent, AmmoVisuals.HasAmmo, count != 0, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoCount, count, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.Capacity, appearance); } - protected virtual void SpinRevolver(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid? user = null) + protected virtual void SpinRevolver(Entity ent, EntityUid? user = null) { - Audio.PlayPredicted(component.SoundSpin, revolverUid, user); - Popup(Loc.GetString("gun-revolver-spun"), revolverUid, user); + Audio.PlayPredicted(ent.Comp.SoundSpin, ent, user); + Popup(Loc.GetString("gun-revolver-spun"), ent, user); } - private void OnRevolverTakeAmmo(EntityUid uid, RevolverAmmoProviderComponent component, TakeAmmoEvent args) + private void OnRevolverTakeAmmo(Entity ent, ref TakeAmmoEvent args) { - var currentIndex = component.CurrentIndex; - Cycle(component, args.Shots); + var currentIndex = ent.Comp.CurrentIndex; + Cycle(ent.Comp, args.Shots); // Revolvers provide the bullets themselves rather than the cartridges so they stay in the revolver. for (var i = 0; i < args.Shots; i++) { - var index = (currentIndex + i) % component.Capacity; - var chamber = component.Chambers[index]; - EntityUid? ent = null; + var index = (currentIndex + i) % ent.Comp.Capacity; + var chamber = ent.Comp.Chambers[index]; + EntityUid? ammoEnt = null; // Get contained entity if it exists. - if (component.AmmoSlots[index] != null) + if (ent.Comp.AmmoSlots[index] != null) { - ent = component.AmmoSlots[index]!; - component.Chambers[index] = false; + ammoEnt = ent.Comp.AmmoSlots[index]!; + ent.Comp.Chambers[index] = false; } // Try to spawn a round if it's available. else if (chamber != null) @@ -373,55 +373,55 @@ public partial class SharedGunSystem if (chamber == true) { // Pretend it's always been there. - ent = Spawn(component.FillPrototype, args.Coordinates); + ammoEnt = Spawn(ent.Comp.FillPrototype, args.Coordinates); if (!_netManager.IsClient) { - component.AmmoSlots[index] = ent; - Containers.Insert(ent.Value, component.AmmoContainer); + ent.Comp.AmmoSlots[index] = ammoEnt; + Containers.Insert(ammoEnt.Value, ent.Comp.AmmoContainer); } - component.Chambers[index] = false; + ent.Comp.Chambers[index] = false; } } // Chamber empty or spent - if (ent == null) + if (ammoEnt == null) continue; - if (TryComp(ent, out var cartridge)) + if (TryComp(ammoEnt, out var cartridge)) { if (cartridge.Spent) continue; // Mark cartridge as spent and if it's caseless delete from the chamber slot. - SetCartridgeSpent(ent.Value, cartridge, true); + SetCartridgeSpent(ammoEnt.Value, cartridge, true); var spawned = Spawn(cartridge.Prototype, args.Coordinates); args.Ammo.Add((spawned, EnsureComp(spawned))); if (cartridge.DeleteOnSpawn) { - component.AmmoSlots[index] = null; - component.Chambers[index] = null; + ent.Comp.AmmoSlots[index] = null; + ent.Comp.Chambers[index] = null; } } else { - component.AmmoSlots[index] = null; - component.Chambers[index] = null; - args.Ammo.Add((ent.Value, EnsureComp(ent.Value))); + ent.Comp.AmmoSlots[index] = null; + ent.Comp.Chambers[index] = null; + args.Ammo.Add((ammoEnt.Value, EnsureComp(ammoEnt.Value))); } // Delete the cartridge entity on client if (_netManager.IsClient) { - QueueDel(ent); + QueueDel(ammoEnt); } } - UpdateAmmoCount(uid, prediction: false); - UpdateRevolverAppearance(uid, component); - Dirty(uid, component); + UpdateAmmoCount(ent, prediction: false); + UpdateRevolverAppearance(ent); + Dirty(ent); } private void Cycle(RevolverAmmoProviderComponent component, int count = 1) @@ -429,34 +429,34 @@ public partial class SharedGunSystem component.CurrentIndex = (component.CurrentIndex + count) % component.Capacity; } - private void OnRevolverInit(EntityUid uid, RevolverAmmoProviderComponent component, ComponentInit args) + private void OnRevolverInit(Entity ent, ref ComponentInit args) { - component.AmmoContainer = Containers.EnsureContainer(uid, RevolverContainer); - component.AmmoSlots.EnsureCapacity(component.Capacity); - var remainder = component.Capacity - component.AmmoSlots.Count; + ent.Comp.AmmoContainer = Containers.EnsureContainer(ent, RevolverContainer); + ent.Comp.AmmoSlots.EnsureCapacity(ent.Comp.Capacity); + var remainder = ent.Comp.Capacity - ent.Comp.AmmoSlots.Count; for (var i = 0; i < remainder; i++) { - component.AmmoSlots.Add(null); + ent.Comp.AmmoSlots.Add(null); } - component.Chambers = new bool?[component.Capacity]; + ent.Comp.Chambers = new bool?[ent.Comp.Capacity]; - if (component.FillPrototype != null) + if (ent.Comp.FillPrototype != null) { - for (var i = 0; i < component.Capacity; i++) + for (var i = 0; i < ent.Comp.Capacity; i++) { - if (component.AmmoSlots[i] != null) + if (ent.Comp.AmmoSlots[i] != null) { - component.Chambers[i] = null; + ent.Comp.Chambers[i] = null; continue; } - component.Chambers[i] = true; + ent.Comp.Chambers[i] = true; } } - DebugTools.Assert(component.AmmoSlots.Count == component.Capacity); + DebugTools.Assert(ent.Comp.AmmoSlots.Count == ent.Comp.Capacity); } [Serializable, NetSerializable] diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs index 268b2a74734..9ea455a6dcc 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Solution.cs @@ -13,9 +13,9 @@ public partial class SharedGunSystem SubscribeLocalEvent(OnSolutionAmmoCount); } - private void OnSolutionTakeAmmo(EntityUid uid, SolutionAmmoProviderComponent component, TakeAmmoEvent args) + private void OnSolutionTakeAmmo(Entity ent, ref TakeAmmoEvent args) { - var shots = Math.Min(args.Shots, component.Shots); + var shots = Math.Min(args.Shots, ent.Comp.Shots); // Don't dirty if it's an empty fire. if (shots == 0) @@ -23,38 +23,35 @@ public partial class SharedGunSystem for (var i = 0; i < shots; i++) { - args.Ammo.Add(GetSolutionShot(uid, component, args.Coordinates)); - component.Shots--; + args.Ammo.Add(GetSolutionShot(ent, args.Coordinates)); + ent.Comp.Shots--; } - UpdateSolutionShots(uid, component); - UpdateSolutionAppearance(uid, component); + UpdateSolutionShots(ent); + UpdateSolutionAppearance(ent); } - private void OnSolutionAmmoCount(EntityUid uid, SolutionAmmoProviderComponent component, ref GetAmmoCountEvent args) + private void OnSolutionAmmoCount(Entity ent, ref GetAmmoCountEvent args) { - args.Count = component.Shots; - args.Capacity = component.MaxShots; + args.Count = ent.Comp.Shots; + args.Capacity = ent.Comp.MaxShots; } - protected virtual void UpdateSolutionShots(EntityUid uid, SolutionAmmoProviderComponent component, Solution? solution = null) - { + protected virtual void UpdateSolutionShots(Entity ent, Solution? solution = null) { } + protected virtual (EntityUid Entity, IShootable) GetSolutionShot(Entity ent, EntityCoordinates position) + { + var shot = Spawn(ent.Comp.Prototype, position); + return (shot, EnsureShootable(shot)); } - protected virtual (EntityUid Entity, IShootable) GetSolutionShot(EntityUid uid, SolutionAmmoProviderComponent component, EntityCoordinates position) + protected void UpdateSolutionAppearance(Entity ent) { - var ent = Spawn(component.Prototype, position); - return (ent, EnsureShootable(ent)); - } - - protected void UpdateSolutionAppearance(EntityUid uid, SolutionAmmoProviderComponent component) - { - if (!TryComp(uid, out var appearance)) + if (!TryComp(ent, out var appearance)) return; - Appearance.SetData(uid, AmmoVisuals.HasAmmo, component.Shots != 0, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoCount, component.Shots, appearance); - Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.MaxShots, appearance); + Appearance.SetData(ent, AmmoVisuals.HasAmmo, ent.Comp.Shots != 0, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoCount, ent.Comp.Shots, appearance); + Appearance.SetData(ent, AmmoVisuals.AmmoMax, ent.Comp.MaxShots, appearance); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 6a61191bfed..e79b26f89dd 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -40,38 +40,48 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] private readonly RechargeBasicEntityAmmoSystem _recharge = default!; + [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] protected readonly DamageableSystem Damageable = default!; + [Dependency] protected readonly ExamineSystemShared Examine = default!; [Dependency] protected readonly IGameTiming Timing = default!; [Dependency] protected readonly IMapManager MapManager = default!; - [Dependency] private readonly INetManager _netManager = default!; [Dependency] protected readonly IPrototypeManager ProtoManager = default!; [Dependency] protected readonly IRobustRandom Random = default!; [Dependency] protected readonly ISharedAdminLogManager Logs = default!; - [Dependency] protected readonly DamageableSystem Damageable = default!; - [Dependency] protected readonly ExamineSystemShared Examine = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly RechargeBasicEntityAmmoSystem _recharge = default!; [Dependency] protected readonly SharedActionsSystem Actions = default!; [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; [Dependency] protected readonly SharedContainerSystem Containers = default!; + [Dependency] protected readonly SharedPhysicsSystem Physics = default!; [Dependency] protected readonly SharedPointLightSystem Lights = default!; [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; - [Dependency] protected readonly SharedPhysicsSystem Physics = default!; [Dependency] protected readonly SharedProjectileSystem Projectiles = default!; [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; [Dependency] protected readonly TagSystem TagSystem = default!; [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; /// /// Default projectile speed /// public const float ProjectileSpeed = 40f; + /// + /// Name of the container slot used as the gun's chamber + /// + public const string ChamberSlot = "gun_chamber"; + + /// + /// Name of the container slot used as the gun's magazine + /// + public const string MagazineSlot = "gun_magazine"; + private static readonly ProtoId TrashTag = "Trash"; private const float InteractNextFire = 0.3f; @@ -119,15 +129,15 @@ public abstract partial class SharedGunSystem : EntitySystem RefreshModifiers((gun, gun)); } - private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent args) + private void OnGunMelee(Entity ent, ref MeleeHitEvent args) { - if (!TryComp(uid, out var melee)) + if (!TryComp(ent, out var melee)) return; - if (melee.NextAttack > component.NextFire) + if (melee.NextAttack > ent.Comp.NextFire) { - component.NextFire = melee.NextAttack; - DirtyField(uid, component, nameof(GunComponent.NextFire)); + ent.Comp.NextFire = melee.NextAttack; + DirtyField(ent.AsNullable(), nameof(GunComponent.NextFire)); } } @@ -137,17 +147,17 @@ public abstract partial class SharedGunSystem : EntitySystem if (user == null || !_combatMode.IsInCombatMode(user) || - !TryGetGun(user.Value, out var ent, out var gun)) + !TryGetGun(user.Value, out var gun)) { return; } - if (ent != GetEntity(msg.Gun)) + if (gun.Owner != GetEntity(msg.Gun)) return; - gun.ShootCoordinates = GetCoordinates(msg.Coordinates); - gun.Target = GetEntity(msg.Target); - AttemptShoot(user.Value, ent, gun); + gun.Comp.ShootCoordinates = GetCoordinates(msg.Coordinates); + gun.Comp.Target = GetEntity(msg.Target); + AttemptShoot(user.Value, gun); } private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs args) @@ -156,15 +166,15 @@ public abstract partial class SharedGunSystem : EntitySystem if (args.SenderSession.AttachedEntity == null || !TryComp(gunUid, out var gun) || - !TryGetGun(args.SenderSession.AttachedEntity.Value, out _, out var userGun)) + !TryGetGun(args.SenderSession.AttachedEntity.Value, out var userGun)) { return; } - if (userGun != gun) + if (userGun != (gunUid, gun)) return; - StopShooting(gunUid, gun); + StopShooting(userGun); } public bool CanShoot(GunComponent component) @@ -175,75 +185,78 @@ public abstract partial class SharedGunSystem : EntitySystem return true; } - public bool TryGetGun(EntityUid entity, out EntityUid gunEntity, [NotNullWhen(true)] out GunComponent? gunComp) + /// + /// Tries to get an entity with from the specified entity's hands, or from the entity itself. + /// + /// Entity that is holding the gun, or is the gun + /// Gun entity to return + /// True if gun was found + public bool TryGetGun(EntityUid entity, out Entity gun) { - gunEntity = default; - gunComp = null; + gun = default; if (_hands.GetActiveItem(entity) is { } held && - TryComp(held, out GunComponent? gun)) + TryComp(held, out GunComponent? gunComp)) { - gunEntity = held; - gunComp = gun; + gun = (held, gunComp); return true; } // Last resort is check if the entity itself is a gun. - if (TryComp(entity, out gun)) + if (TryComp(entity, out gunComp)) { - gunEntity = entity; - gunComp = gun; + gun = (entity, gunComp); return true; } return false; } - private void StopShooting(EntityUid uid, GunComponent gun) + private void StopShooting(Entity ent) { - if (gun.ShotCounter == 0) + if (ent.Comp.ShotCounter == 0) return; - gun.ShotCounter = 0; - gun.ShootCoordinates = null; - gun.Target = null; - DirtyField(uid, gun, nameof(GunComponent.ShotCounter)); + ent.Comp.ShotCounter = 0; + ent.Comp.ShootCoordinates = null; + ent.Comp.Target = null; + DirtyField(ent.AsNullable(), nameof(GunComponent.ShotCounter)); } /// /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot. /// - public bool AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates, EntityUid? target = null) + public bool AttemptShoot(EntityUid user, Entity gun, EntityCoordinates toCoordinates, EntityUid? target = null) { - gun.ShootCoordinates = toCoordinates; - gun.Target = target; - var result = AttemptShoot(user, gunUid, gun); - gun.ShotCounter = 0; - DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter)); + gun.Comp.ShootCoordinates = toCoordinates; + gun.Comp.Target = target; + var result = AttemptShoot(user, gun); + gun.Comp.ShotCounter = 0; + DirtyField(gun.AsNullable(), nameof(GunComponent.ShotCounter)); return result; } /// /// Shoots by assuming the gun is the user at default coordinates. /// - public bool AttemptShoot(EntityUid gunUid, GunComponent gun) + public bool AttemptShoot(Entity gun) { - var coordinates = new EntityCoordinates(gunUid, gun.DefaultDirection); - gun.ShootCoordinates = coordinates; - var result = AttemptShoot(gunUid, gunUid, gun); - gun.ShotCounter = 0; + var coordinates = new EntityCoordinates(gun, gun.Comp.DefaultDirection); + gun.Comp.ShootCoordinates = coordinates; + var result = AttemptShoot(gun, gun); + gun.Comp.ShotCounter = 0; return result; } - private bool AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun) + private bool AttemptShoot(EntityUid user, Entity gun) { - if (gun.FireRateModified <= 0f || + if (gun.Comp.FireRateModified <= 0f || !_actionBlockerSystem.CanAttack(user)) { return false; } - var toCoordinates = gun.ShootCoordinates; + var toCoordinates = gun.Comp.ShootCoordinates; if (toCoordinates == null) return false; @@ -254,9 +267,9 @@ public abstract partial class SharedGunSystem : EntitySystem var prevention = new ShotAttemptedEvent { User = user, - Used = (gunUid, gun) + Used = gun }; - RaiseLocalEvent(gunUid, ref prevention); + RaiseLocalEvent(gun, ref prevention); if (prevention.Cancelled) return false; @@ -266,95 +279,96 @@ public abstract partial class SharedGunSystem : EntitySystem // Need to do this to play the clicking sound for empty automatic weapons // but not play anything for burst fire. - if (gun.NextFire > curTime) + if (gun.Comp.NextFire > curTime) return false; - var fireRate = TimeSpan.FromSeconds(1f / gun.FireRateModified); + var fireRate = TimeSpan.FromSeconds(1f / gun.Comp.FireRateModified); - if (gun.SelectedMode == SelectiveFire.Burst || gun.BurstActivated) - fireRate = TimeSpan.FromSeconds(1f / gun.BurstFireRate); + if (gun.Comp.SelectedMode == SelectiveFire.Burst || gun.Comp.BurstActivated) + fireRate = TimeSpan.FromSeconds(1f / gun.Comp.BurstFireRate); // First shot // Previously we checked shotcounter but in some cases all the bullets got dumped at once // curTime - fireRate is insufficient because if you time it just right you can get a 3rd shot out slightly quicker. - if (gun.NextFire < curTime - fireRate || gun.ShotCounter == 0 && gun.NextFire < curTime) - gun.NextFire = curTime; + if (gun.Comp.NextFire < curTime - fireRate || gun.Comp.ShotCounter == 0 && gun.Comp.NextFire < curTime) + gun.Comp.NextFire = curTime; var shots = 0; - var lastFire = gun.NextFire; + var lastFire = gun.Comp.NextFire; - while (gun.NextFire <= curTime) + while (gun.Comp.NextFire <= curTime) { - gun.NextFire += fireRate; + gun.Comp.NextFire += fireRate; shots++; } // NextFire has been touched regardless so need to dirty the gun. - DirtyField(gunUid, gun, nameof(GunComponent.NextFire)); + DirtyField(gun.AsNullable(), nameof(GunComponent.NextFire)); // Get how many shots we're actually allowed to make, due to clip size or otherwise. // Don't do this in the loop so we still reset NextFire. - if (!gun.BurstActivated) + if (!gun.Comp.BurstActivated) { - switch (gun.SelectedMode) + switch (gun.Comp.SelectedMode) { case SelectiveFire.SemiAuto: - shots = Math.Min(shots, 1 - gun.ShotCounter); + shots = Math.Min(shots, 1 - gun.Comp.ShotCounter); break; case SelectiveFire.Burst: - shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter); + shots = Math.Min(shots, gun.Comp.ShotsPerBurstModified - gun.Comp.ShotCounter); break; case SelectiveFire.FullAuto: break; default: - throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!"); + throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.Comp.SelectedMode}!"); } - } else + } + else { - shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter); + shots = Math.Min(shots, gun.Comp.ShotsPerBurstModified - gun.Comp.ShotCounter); } var attemptEv = new AttemptShootEvent(user, null); - RaiseLocalEvent(gunUid, ref attemptEv); + RaiseLocalEvent(gun, ref attemptEv); if (attemptEv.Cancelled) { if (attemptEv.Message != null) { - PopupSystem.PopupClient(attemptEv.Message, gunUid, user); + PopupSystem.PopupClient(attemptEv.Message, gun, user); } - gun.BurstActivated = false; - gun.BurstShotsCount = 0; - gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds)); + gun.Comp.BurstActivated = false; + gun.Comp.BurstShotsCount = 0; + gun.Comp.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.Comp.NextFire.TotalSeconds)); return false; } var fromCoordinates = Transform(user).Coordinates; // Remove ammo - var ev = new TakeAmmoEvent(shots, new List<(EntityUid? Entity, IShootable Shootable)>(), fromCoordinates, user); + var ev = new TakeAmmoEvent(shots, [], fromCoordinates, user); // Listen it just makes the other code around it easier if shots == 0 to do this. if (shots > 0) - RaiseLocalEvent(gunUid, ev); + RaiseLocalEvent(gun, ev); DebugTools.Assert(ev.Ammo.Count <= shots); DebugTools.Assert(shots >= 0); - UpdateAmmoCount(gunUid); + UpdateAmmoCount(gun); // Even if we don't actually shoot update the ShotCounter. This is to avoid spamming empty sounds // where the gun may be SemiAuto or Burst. - gun.ShotCounter += shots; - DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter)); + gun.Comp.ShotCounter += shots; + DirtyField(gun.AsNullable(), nameof(GunComponent.ShotCounter)); if (ev.Ammo.Count <= 0) { // triggers effects on the gun if it's empty var emptyGunShotEvent = new OnEmptyGunShotEvent(user); - RaiseLocalEvent(gunUid, ref emptyGunShotEvent); + RaiseLocalEvent(gun, ref emptyGunShotEvent); - gun.BurstActivated = false; - gun.BurstShotsCount = 0; - gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown); + gun.Comp.BurstActivated = false; + gun.Comp.BurstShotsCount = 0; + gun.Comp.NextFire += TimeSpan.FromSeconds(gun.Comp.BurstCooldown); // Play empty gun sounds if relevant // If they're firing an existing clip then don't play anything. @@ -364,8 +378,8 @@ public abstract partial class SharedGunSystem : EntitySystem // Don't spam safety sounds at gun fire rate, play it at a reduced rate. // May cause prediction issues? Needs more tweaking - gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds)); - Audio.PlayPredicted(gun.SoundEmpty, gunUid, user); + gun.Comp.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.Comp.NextFire.TotalSeconds)); + Audio.PlayPredicted(gun.Comp.SoundEmpty, gun, user); return false; } @@ -373,25 +387,25 @@ public abstract partial class SharedGunSystem : EntitySystem } // Handle burstfire - if (gun.SelectedMode == SelectiveFire.Burst) + if (gun.Comp.SelectedMode == SelectiveFire.Burst) { - gun.BurstActivated = true; + gun.Comp.BurstActivated = true; } - if (gun.BurstActivated) + if (gun.Comp.BurstActivated) { - gun.BurstShotsCount += shots; - if (gun.BurstShotsCount >= gun.ShotsPerBurstModified) + gun.Comp.BurstShotsCount += shots; + if (gun.Comp.BurstShotsCount >= gun.Comp.ShotsPerBurstModified) { - gun.NextFire += TimeSpan.FromSeconds(gun.BurstCooldown); - gun.BurstActivated = false; - gun.BurstShotsCount = 0; + gun.Comp.NextFire += TimeSpan.FromSeconds(gun.Comp.BurstCooldown); + gun.Comp.BurstActivated = false; + gun.Comp.BurstShotsCount = 0; } } // Shoot confirmed - sounds also played here in case it's invalid (e.g. cartridge already spent). - Shoot(gunUid, gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems); + Shoot(gun, ev.Ammo, fromCoordinates, toCoordinates.Value, out var userImpulse, user, throwItems: attemptEv.ThrowItems); var shotEv = new GunShotEvent(user, ev.Ammo); - RaiseLocalEvent(gunUid, ref shotEv); + RaiseLocalEvent(gun, ref shotEv); if (!userImpulse || !TryComp(user, out var userPhysics)) return true; @@ -400,13 +414,12 @@ public abstract partial class SharedGunSystem : EntitySystem RaiseLocalEvent(user, ref shooterEv); if (shooterEv.Push) - CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics); + CauseImpulse(fromCoordinates, toCoordinates.Value, (user, userPhysics)); return true; } public void Shoot( - EntityUid gunUid, - GunComponent gun, + Entity gun, EntityUid ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, @@ -415,12 +428,11 @@ public abstract partial class SharedGunSystem : EntitySystem bool throwItems = false) { var shootable = EnsureShootable(ammo); - Shoot(gunUid, gun, new List<(EntityUid? Entity, IShootable Shootable)>(1) { (ammo, shootable) }, fromCoordinates, toCoordinates, out userImpulse, user, throwItems); + Shoot(gun, new List<(EntityUid? Entity, IShootable Shootable)>(1) { (ammo, shootable) }, fromCoordinates, toCoordinates, out userImpulse, user, throwItems); } public abstract void Shoot( - EntityUid gunUid, - GunComponent gun, + Entity gun, List<(EntityUid? Entity, IShootable Shootable)> ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, @@ -452,7 +464,7 @@ public abstract partial class SharedGunSystem : EntitySystem /// /// Call this whenever the ammo count for a gun changes. /// - protected virtual void UpdateAmmoCount(EntityUid uid, bool prediction = true) {} + protected virtual void UpdateAmmoCount(EntityUid uid, bool prediction = true) { } protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge, bool spent) { @@ -492,7 +504,7 @@ public abstract partial class SharedGunSystem : EntitySystem // decides direction the casing ejects and only when not cycling if (angle != null) { - Angle ejectAngle = angle.Value; + var ejectAngle = angle.Value; ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f); } @@ -535,15 +547,15 @@ public abstract partial class SharedGunSystem : EntitySystem CreateEffect(gun, ev, user); } - public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics) + public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, Entity user) { var fromMap = TransformSystem.ToMapCoordinates(fromCoordinates).Position; var toMap = TransformSystem.ToMapCoordinates(toCoordinates).Position; var shotDirection = (toMap - fromMap).Normalized(); const float impulseStrength = 25.0f; - var impulseVector = shotDirection * impulseStrength; - Physics.ApplyLinearImpulse(user, -impulseVector, body: userPhysics); + var impulseVector = shotDirection * impulseStrength; + Physics.ApplyLinearImpulse(user, -impulseVector, body: user.Comp); } public void RefreshModifiers(Entity gun) @@ -632,7 +644,7 @@ public abstract partial class SharedGunSystem : EntitySystem [Serializable, NetSerializable] public sealed class HitscanEvent : EntityEventArgs { - public List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = new(); + public List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = []; } /// diff --git a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs index 260f08c40a5..f5013a3493d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs @@ -13,9 +13,9 @@ public sealed class UseDelayOnShootSystem : EntitySystem SubscribeLocalEvent(OnUseShoot); } - private void OnUseShoot(EntityUid uid, UseDelayOnShootComponent component, ref GunShotEvent args) + private void OnUseShoot(Entity ent, ref GunShotEvent args) { - if (TryComp(uid, out UseDelayComponent? useDelay)) - _delay.TryResetDelay((uid, useDelay)); + if (TryComp(ent, out UseDelayComponent? useDelay)) + _delay.TryResetDelay((ent, useDelay)); } }