Расширение механики луков и добавление луков для сб

Content.Server/ADT/BowsSystem/BowsSystem.cs

@@ -0,0 +1,21 @@
+using Content.Shared.ADT.BowsSystem.Components;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Weapons.Ranged.Systems;
+
+namespace Content.Server.ADT.BowsSystem;
+
+public sealed partial class BowsSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExpendedBowsComponent, ShotAttemptedEvent>(OnShootAttemp);
+    }
+
+    public void OnShootAttemp(Entity<ExpendedBowsComponent> bow,ref ShotAttemptedEvent args)
+    {
+        if(bow.Comp.StepOfTension==0)
+            args.Cancel();
+    }
+}

Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs

@@ -0,0 +1,40 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.ADT.BowsSystem.Components;
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ExpendedBowsComponent : Component
+{
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan coldownStart = TimeSpan.Zero;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan coldown = TimeSpan.FromSeconds(7f);
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int StepOfTension=0;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public string ItemSlot="projectiles";
+
+    [DataField]
+    public Dictionary<int, string> TensionAndLoc = new Dictionary<int, string>
+    {
+        {0, "popup-bow-use-null"},
+        {1, "popup-bow-use-light"},
+        {2, "popup-bow-use-medium"},
+        {3, "popup-bow-use-hard"},
+    };
+
+    [DataField]
+    public Dictionary<int, float> TensionAndModieferSpeed = new Dictionary<int, float>
+    {
+        {0, 0.5f},
+        {1, 1f},
+        {2, 1.4f},
+        {3, 1.7f},
+    };
+
+    public string DamageToModidiering = "Piercing";
+    public int MaxTension = 3;
+    public int MinTension = 0;
+}

Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs

@@ -0,0 +1,84 @@
+using Content.Shared.ADT.BowsSystem.Components;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Projectiles;
+using Content.Shared.Popups;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared.Wieldable.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.ADT.BowsSystem;
+
+public sealed partial class BowsSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ExpendedBowsComponent, GunShotEvent>(OnShoot);
+        SubscribeLocalEvent<ExpendedBowsComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<ExpendedBowsComponent, GunRefreshModifiersEvent>(EditSpeed);
+    }
+
+    public void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args)
+    {
+        if(!TryComp<ContainerAmmoProviderComponent>(bow, out var containerComp))
+            return;
+        if (!_containerSystem.TryGetContainer(containerComp.ProviderUid.Value, containerComp.Container, out var container))
+            return;
+        if (bow.Comp.StepOfTension!=bow.Comp.MinTension)
+        {
+            foreach (var i in container.ContainedEntities)
+            {
+                if (TryComp<ProjectileComponent>(i,out var proj))
+                {
+                    if (!proj.Damage.DamageDict.TryGetValue(bow.Comp.DamageToModidiering, out var ProjectileDamage))
+                        return;
+                    var multipliedDamage = ProjectileDamage * bow.Comp.StepOfTension;
+                    proj.Damage.DamageDict[bow.Comp.DamageToModidiering] = multipliedDamage;
+                }
+            }
+        }
+        bow.Comp.StepOfTension=bow.Comp.MinTension;
+    }
+
+    public void OnUseInHand(Entity<ExpendedBowsComponent> bow, ref UseInHandEvent args)
+    {
+        bow.Comp.coldownStart = _timing.CurTime + bow.Comp.coldown;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ExpendedBowsComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (_timing.CurTime < comp.coldownStart)
+                continue;
+            if(!TryComp<WieldableComponent>(uid,out var wielded) || !wielded.Wielded)
+            {
+                comp.StepOfTension=comp.MinTension;
+                continue;
+            }
+            if (comp.StepOfTension >= comp.MaxTension)
+                continue;
+
+            comp.StepOfTension++;
+            _popup.PopupClient(Loc.GetString(comp.TensionAndLoc[comp.StepOfTension],("user", wielded.User)), uid, wielded.User);
+            comp.coldownStart = _timing.CurTime + comp.coldown;
+        }
+    }
+
+    public void EditSpeed(Entity<ExpendedBowsComponent> bow, ref GunRefreshModifiersEvent args)
+    {
+        args.ProjectileSpeed *= bow.Comp.TensionAndModieferSpeed[bow.Comp.StepOfTension];
+    }
+}

Content.Shared/Weapons/Ranged/Components/GunComponent.cs

@@ -212,7 +212,7 @@ public sealed partial class GunComponent : Component
     /// <summary>
     /// The base value for how fast the projectile moves.
     /// </summary>
-    [DataField]
+    [DataField] 
     public float ProjectileSpeed = 30f; // ADT-Tweak 42f -> 30f
 
     /// <summary>

Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.ftl

@@ -0,0 +1,4 @@
+popup-bow-use-null = {$user} отпускает тетиву!
+popup-bow-use-light = {$user} начинает натягивать тетиву!
+popup-bow-use-medium = {$user} натягивает тетиву сильнее!
+popup-bow-use-hard = {$user} натягивает тетиву максимально!

Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml

@@ -46,6 +46,7 @@
       projectiles: !type:ContainerSlot
   - type: ContainerAmmoProvider
     container: projectiles
+  - type: ExpendedBows # ADT-Tweak
 
 - type: entity
   id: BowImprovised