[Port] Crossbow / Арбалет

Content.Client/_White/Guns/Stretched/StretchedVisualizerSystem.cs

@@ -0,0 +1,24 @@
+using Content.Shared._White.Guns.Stretched;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Client.GameObjects;
+
+namespace Content.Client._White.Guns.Stretched;
+
+public sealed class StretchedVisualizerSystem : VisualizerSystem<StretchedVisualsComponent>
+{
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+
+    protected override void OnAppearanceChange(EntityUid uid, StretchedVisualsComponent component, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        _appearance.TryGetData<bool>(uid, StretchedVisuals.Stretched, out var stretched, args.Component);
+        _appearance.TryGetData<bool>(uid, AmmoVisuals.HasAmmo, out var hasAmmo, args.Component);
+
+        // StretchedState: Weapon is stretched and ready to fire
+        // LoadedState: Weapon is loaded but not stretched
+        // UnstrungState: Weapon is neither stretched nor loaded
+        args.Sprite.LayerSetState(StretchedVisuals.Layer, stretched ? component.StretchedState : hasAmmo ? component.LoadedState : component.UnstrungState);
+    }
+}

Content.Client/_White/Guns/Stretched/StretchedVisualsComponent.cs

@@ -0,0 +1,14 @@
+namespace Content.Client._White.Guns.Stretched;
+
+[RegisterComponent, Access(typeof(StretchedVisualizerSystem))]
+public sealed partial class StretchedVisualsComponent : Component
+{
+    [DataField(required: true)]
+    public string LoadedState = string.Empty;
+
+    [DataField(required: true)]
+    public string StretchedState = string.Empty;
+
+    [DataField(required: true)]
+    public string UnstrungState = string.Empty;
+}

Content.Server/Power/EntitySystems/BatterySystem.cs

@@ -1,17 +1,21 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Cargo.Systems;
 using Content.Server.Emp;
 using Content.Shared.Emp;
 using Content.Server.Power.Components;
 using Content.Shared.Examine;
 using Content.Shared.Rejuvenate;
 using JetBrains.Annotations;
+using Robust.Shared.Containers;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Power.EntitySystems
 {
     [UsedImplicitly]
     public sealed class BatterySystem : EntitySystem
     {
+        [Dependency] private readonly SharedContainerSystem _containers = default!; // WD EDIT
+
         public override void Initialize()
         {
             base.Initialize();
@@ -113,7 +117,7 @@ private void OnEmpDisabledRemoved(EntityUid uid, BatteryComponent component, ref
             if (!TryComp<ChargingComponent>(uid, out var charging))
                 return;
 
-            var ev = new ChargerUpdateStatusEvent(); 
+            var ev = new ChargerUpdateStatusEvent();
             RaiseLocalEvent<ChargerUpdateStatusEvent>(charging.ChargerUid, ref ev);
         }
 
@@ -197,5 +201,33 @@ public bool IsFull(EntityUid uid, BatteryComponent? battery = null)
 
             return battery.CurrentCharge / battery.MaxCharge >= 0.99f;
         }
+
+        // WD EDIT START
+        public bool TryGetBatteryComponent(EntityUid uid, [NotNullWhen(true)] out BatteryComponent? battery,
+            [NotNullWhen(true)] out EntityUid? batteryUid)
+        {
+            if (TryComp(uid, out battery))
+            {
+                batteryUid = uid;
+                return true;
+            }
+
+            if (!_containers.TryGetContainer(uid, "cell_slot", out var container)
+                || container is not ContainerSlot slot)
+            {
+                battery = null;
+                batteryUid = null;
+                return false;
+            }
+
+            batteryUid = slot.ContainedEntity;
+
+            if (batteryUid != null)
+                return TryComp(batteryUid, out battery);
+
+            battery = null;
+            return false;
+        }
+        // WD EDIT END
     }
 }

Content.Server/Projectiles/ProjectileSystem.cs

@@ -1,10 +1,20 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Effects;
+using Content.Server.Hands.Systems;
+using Content.Server.UserInterface;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared._White.Penetrated;
+using Content.Shared._White.Projectile;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
 using Content.Shared.Projectiles;
+using Content.Shared.Throwing;
+using Robust.Server.GameObjects;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
 
@@ -17,11 +27,24 @@ public sealed class ProjectileSystem : SharedProjectileSystem
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly GunSystem _guns = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
+    // WD EDIT START
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
+    [Dependency] private readonly PhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly PenetratedSystem _penetrated = default!;
+    // WD EDIT END
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<ProjectileComponent, StartCollideEvent>(OnStartCollide);
+        // WD EDIT START
+        SubscribeLocalEvent<EmbeddableProjectileComponent, EmbedEvent>(OnEmbed);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, ActivateInWorldEvent>(OnEmbedActivate, before: new[] {typeof(ActivatableUISystem)});
+        SubscribeLocalEvent<EmbeddableProjectileComponent, RemoveEmbeddedProjectileEvent>(OnEmbedRemove);
+        // WD EDIT END
     }
 
     private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref StartCollideEvent args)
@@ -77,4 +100,90 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
         }
     }
+
+    // WD EDIT START
+    private void OnEmbed(EntityUid uid, EmbeddableProjectileComponent component, ref EmbedEvent args)
+    {
+        var dmg = _damageable.TryChangeDamage(args.Embedded, component.Damage, origin: args.Shooter);
+        if (dmg is { Empty: false })
+            _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Embedded }, Filter.Pvs(args.Embedded, entityManager: EntityManager));
+    }
+
+    private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent component, ActivateInWorldEvent args)
+    {
+        if (args.Handled
+            || !AttemptEmbedRemove(uid, args.User, component))
+            return;
+
+        args.Handled = true;
+    }
+
+    private void OnEmbedRemove(EntityUid uid, EmbeddableProjectileComponent component, RemoveEmbeddedProjectileEvent args)
+    {
+        // Whacky prediction issues.
+        if (args.Cancelled)
+            return;
+
+        if (component.DeleteOnRemove)
+        {
+            QueueDel(uid);
+            FreePenetrated(uid);
+            return;
+        }
+
+        if (!TryComp<PhysicsComponent>(uid, out var physics))
+        {
+            FreePenetrated(uid);
+            return;
+        }
+
+        var xform = Transform(uid);
+        _physics.SetBodyType(uid, BodyType.Dynamic, body: physics, xform: xform);
+        _transform.AttachToGridOrMap(uid, xform);
+
+        // Reset whether the projectile has damaged anything if it successfully was removed
+        if (TryComp<ProjectileComponent>(uid, out var projectile))
+        {
+            projectile.Shooter = null;
+            projectile.Weapon = null;
+            projectile.DamagedEntity = false;
+        }
+
+        FreePenetrated(uid);
+
+        // Land it just coz uhhh yeah
+        var landEv = new LandEvent(args.User, true);
+        RaiseLocalEvent(uid, ref landEv);
+        _physics.WakeBody(uid, body: physics);
+
+        // try place it in the user's hand
+        _hands.TryPickupAnyHand(args.User, uid);
+    }
+
+    private bool AttemptEmbedRemove(EntityUid uid, EntityUid user, EmbeddableProjectileComponent? component = null)
+    {
+        if (!Resolve(uid, ref component, false)
+            || component.RemovalTime == null
+            || !TryComp<PhysicsComponent>(uid, out var physics)
+            || physics.BodyType != BodyType.Static)
+            return false;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.RemovalTime.Value,
+            new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid)
+        {
+            DistanceThreshold = SharedInteractionSystem.InteractionRange,
+        });
+
+        return true;
+    }
+
+    private void FreePenetrated(EntityUid uid, PenetratedProjectileComponent? penetratedProjectile = null)
+    {
+        if (!Resolve(uid, ref penetratedProjectile)
+            || !penetratedProjectile.PenetratedUid.HasValue)
+            return;
+
+        _penetrated.FreePenetrated(penetratedProjectile.PenetratedUid.Value);
+    }
+    // WD EDIT END
 }

Content.Server/Stunnable/Systems/StunbatonSystem.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Power.Events;
@@ -12,7 +11,6 @@
 using Content.Shared.Popups;
 using Content.Shared.PowerCell.Components;
 using Content.Shared.Stunnable;
-using Robust.Shared.Containers;
 
 namespace Content.Server.Stunnable.Systems
 {
@@ -23,8 +21,6 @@ public sealed class StunbatonSystem : SharedStunbatonSystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly BatterySystem _battery = default!;
         [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
-        [Dependency] private readonly SharedContainerSystem _containers = default!; // WD EDIT
-
         public override void Initialize()
         {
             base.Initialize();
@@ -42,7 +38,7 @@ private void OnStaminaHitAttempt(Entity<StunbatonComponent> entity, ref StaminaD
         {
             // WD EDIT START
             if (!_itemToggle.IsActivated(entity.Owner)
-                || !TryGetBatteryComponent(entity, out var battery, out var batteryUid)
+                || !_battery.TryGetBatteryComponent(entity, out var battery, out var batteryUid)
                 || !_battery.TryUseCharge(batteryUid.Value, entity.Comp.EnergyPerUse, battery))
                 args.Cancelled = true;
             // WD EDIT END
@@ -55,7 +51,7 @@ private void OnExamined(Entity<StunbatonComponent> entity, ref ExaminedEvent arg
             : Loc.GetString("comp-stunbaton-examined-off");
             args.PushMarkup(onMsg);
 
-            if (TryGetBatteryComponent(entity, out var battery, out _)) // WD EDIT
+            if (_battery.TryGetBatteryComponent(entity, out var battery, out _)) // WD EDIT
             {
                 var count = (int) (battery.CurrentCharge / entity.Comp.EnergyPerUse);
                 args.PushMarkup(Loc.GetString("melee-battery-examine", ("color", "yellow"), ("count", count)));
@@ -70,7 +66,7 @@ private void ToggleDone(Entity<StunbatonComponent> entity, ref ItemToggledEvent
         private void TryTurnOn(Entity<StunbatonComponent> entity, ref ItemToggleActivateAttemptEvent args)
         {
             // WD EDIT START
-            if (!TryGetBatteryComponent(entity, out var battery, out _)
+            if (!_battery.TryGetBatteryComponent(entity, out var battery, out _)
                 || battery.CurrentCharge < entity.Comp.EnergyPerUse)
             {
 
@@ -81,7 +77,7 @@ private void TryTurnOn(Entity<StunbatonComponent> entity, ref ItemToggleActivate
                     _popup.PopupEntity(Loc.GetString("stunbaton-component-low-charge"), (EntityUid) args.User,
                         (EntityUid) args.User);
                 }
-                
+
                 return;
             }
             // WD EDIT END
@@ -126,36 +122,10 @@ private void OnPowerCellChanged(Entity<StunbatonComponent> entity, ref PowerCell
 
         private void CheckCharge(Entity<StunbatonComponent> entity)
         {
-            if (!TryGetBatteryComponent(entity, out var battery, out _)
+            if (!_battery.TryGetBatteryComponent(entity, out var battery, out _)
                 || battery.CurrentCharge < entity.Comp.EnergyPerUse)
                 _itemToggle.TryDeactivate(entity.Owner, predicted: false);
         }
-
-        private bool TryGetBatteryComponent(EntityUid uid, [NotNullWhen(true)] out BatteryComponent? battery,
-            [NotNullWhen(true)] out EntityUid? batteryUid)
-        {
-            if (TryComp(uid, out battery))
-            {
-                batteryUid = uid;
-                return true;
-            }
-
-            if (!_containers.TryGetContainer(uid, "cell_slot", out var container)
-                || container is not ContainerSlot slot)
-            {
-                battery = null;
-                batteryUid = null;
-                return false;
-            }
-
-            batteryUid = slot.ContainedEntity;
-
-            if (batteryUid != null)
-                return TryComp(batteryUid, out battery);
-
-            battery = null;
-            return false;
-        }
         // WD EDIT END
     }
 }

Content.Server/Weapons/Ranged/Systems/GunSystem.Ballistic.cs

@@ -1,3 +1,5 @@
+using Content.Server.Stack;
+using Content.Shared.Stacks;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Map;
@@ -6,6 +8,8 @@ namespace Content.Server.Weapons.Ranged.Systems;
 
 public sealed partial class GunSystem
 {
+    [Dependency] private readonly StackSystem _stack = default!; // WD EDIT
+
     protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent component, MapCoordinates coordinates)
     {
         EntityUid? ent = null;
@@ -32,4 +36,11 @@ protected override void Cycle(EntityUid uid, BallisticAmmoProviderComponent comp
         var cycledEvent = new GunCycledEvent();
         RaiseLocalEvent(uid, ref cycledEvent);
     }
+
+    // WD EDIT START
+    protected override EntityUid GetStackEntity(EntityUid uid, StackComponent stack)
+    {
+        return _stack.Split(uid, 1, Transform(uid).Coordinates, stack) ?? uid;
+    }
+    // WD EDIT END
 }

Content.Server/Weapons/Ranged/Systems/GunSystem.cs

@@ -12,6 +12,7 @@
 using Content.Shared.Effects;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Projectiles;
+using Content.Shared.Throwing;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
@@ -293,7 +294,12 @@ private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVeloci
         {
             RemoveShootable(uid);
             // TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack.
+            // WD EDIT START
+            if (gun.ThrowAngle.HasValue)
+                EnsureComp<ThrowingAngleComponent>(uid).Angle = gun.ThrowAngle.Value;
+            // WD EDIT END
             ThrowingSystem.TryThrow(uid, mapDirection, gun.ProjectileSpeedModified, user);
+            RemComp<ThrowingAngleComponent>(uid); // WD EDIT
             return;
         }