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

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>(OnShootAttempt);
+    }
+
+    public void OnShootAttempt(Entity<ExpendedBowsComponent> bow,ref ShotAttemptedEvent args)
+    {
+        if(bow.Comp.StepOfTension==0)
+            args.Cancel();
+    }
+}

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

@@ -0,0 +1,63 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.ADT.BowsSystem.Components;
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ExpendedBowsComponent : Component
+{
+
+    /// <summary>
+    /// Sound to bow on tension
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public SoundSpecifier bowSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/arrow_nock.ogg");
+
+    /// <summary>
+    /// Zero state timer
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan coldownStart = TimeSpan.Zero;
+
+    /// <summary>
+    /// Time to timer
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float floatToColdown = 7f;
+
+    /// <summary>
+    /// Step of tension in bow 
+    /// </summary>
+    public int StepOfTension=0;
+
+    /// <summary>
+    /// Tension and loc for it
+    /// </summary>
+    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"},
+    };
+
+    /// <summary>
+    /// Tension in bow and speed modiefer for arrow
+    /// </summary>
+    public Dictionary<int, float> TensionAndModieferSpeed = new Dictionary<int, float>
+    {
+        {0, 0.5f},
+        {1, 1f},
+        {2, 1.4f},
+        {3, 3f},
+    };
+
+    /// <summary>
+    /// Max tension in bow
+    /// </summary>
+    public int MaxTension = 3;
+
+    /// <summary>
+    /// Min tension in bow
+    /// </summary>
+    public int MinTension = 0;
+}

Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs

@@ -0,0 +1,75 @@
+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.Audio;
+using Robust.Shared.Audio.Systems;
+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 SharedAudioSystem _audio = 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);
+    }
+
+    private void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args)
+    {
+        bow.Comp.StepOfTension=bow.Comp.MinTension;
+    }
+
+    private void OnUseInHand(Entity<ExpendedBowsComponent> bow, ref UseInHandEvent args)
+    {
+        bow.Comp.coldownStart = _timing.CurTime + TimeSpan.FromSeconds(bow.Comp.floatToColdown);
+    }
+
+    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 wieldedcomp))
+                continue;
+            if (wieldedcomp.Wielded == false)
+            {
+                comp.StepOfTension=comp.MinTension;
+                continue;
+            }
+            if (wieldedcomp.User is not {} owner)
+                continue;
+            if (comp.StepOfTension >= comp.MaxTension)
+                continue;
+
+            comp.StepOfTension++;
+            _popup.PopupClient(Loc.GetString(comp.TensionAndLoc[comp.StepOfTension],("user", owner)), uid, owner);
+            _audio.PlayPvs(comp.bowSound, owner);
+            comp.coldownStart = _timing.CurTime + TimeSpan.FromSeconds(comp.floatToColdown);
+        }
+    }
+
+    private void EditSpeed(Entity<ExpendedBowsComponent> bow, ref GunRefreshModifiersEvent args)
+    {
+        args.ProjectileSpeed =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/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Bows/compound_bows.ftl

@@ -0,0 +1,5 @@
+ent-ADTHandMadeCompoundBow = блочный лук
+    .desc = Ты бы еще еоку скрафтил бы!
+
+ent-ADTSecurityCompoundBow = блочный лук службы безопасности
+    .desc = Ты вспоминаешь, как по новостям везде крутили одну фразу инженеров программы арсенала станций: "Ну в СССП, в древние времена, была же конское СБ, вот и у нас будет!...Лучники СБ..."

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.ftl

@@ -0,0 +1,8 @@
+ent-ADTArrowSecurity = стрела службы безопасности
+    .desc = Металлическая, грациозная и идеальная! Самое то, чтобы применить её на клоуне!
+
+ent-ADTArrowFlashSecurity = светящаяся стрела
+    .desc = Два в одном! Только сейчас! Пометь цель для ловли стрелой, и оставь тем самым на ней как ментальный, так и физический урон!
+
+ent-ADTArrowGranade = взрывная стрела
+    .desc = "Идиальный" снаряд для вашего лука во время стелса! Разорвет всех, кто вас может заметить, услышать или каким либо способом еще обнаружить.

Resources/Locale/ru-RU/ADT/recipes/tag.ftl

@@ -96,6 +96,10 @@ construction-graph-tag-aloe = алоэ
 construction-graph-door-electronics = микросхема шлюза
 construction-graph-intercom-electronics = плата интеркома
 
+# Оружие
+construction-graph-tag-arrow = любая стрела
+construction-graph-tag-c4 = C4
+
 # Другое
 construction-graph-voice-trigger = голосовой триггер
 construction-graph-tag-toy-blaster = игрушечный бластер

Resources/Locale/ru-RU/ADT/research/technologies.ftl

@@ -14,3 +14,7 @@ research-technology-basemegacells = Мегабатареи
 research-technology-advancedmegacells = Сверхэффективные мегабатареи
 
 research-technology-reducer = Беспроводная передача энергии
+
+research-technology-bow-security = Снаряжение лучника СБ
+
+research-technology-arrows-security = Нелетальное, продвинутое снаряжение лучника СБ

Resources/Locale/ru-RU/research/technologies.ftl

@@ -73,4 +73,4 @@ research-technology-advanced-spray = Продвинутые спреи
 research-technology-clowning-utilities = Клоунские принадлежности
 research-technology-quantum-fiber-weaving = Плетение квантового волокна
 research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов
-research-technology-experimental-pka = Экспериментальный протокинетический ускоритель
+research-technology-experimental-pka = Экспериментальный протокинетический ускоритель

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Bows/compound_bows.yml

@@ -0,0 +1,77 @@
+- type: entity
+  id: ADTHandMadeCompoundBow
+  parent: BaseBow
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi
+    layers:
+    - state: unwielded
+      map: [ base ]
+    - state: unwielded-arrow
+      map: [ arrow ]
+      visible: false
+  - type: Appearance
+  - type: ItemMapper
+    spriteLayers:
+    - arrow
+    mapLayers:
+      arrow:
+        whitelist:
+          tags:
+          - Arrow
+  - type: GenericVisualizer
+    visuals:
+      enum.WieldableVisuals.Wielded:
+        arrow:
+          True: { state: wielded-arrow }
+          False: { state: unwielded-arrow }
+        base:
+          True: { state: wielded }
+          False: { state: unwielded }
+  - type: ExpendedBows
+    floatToColdown: 5
+  - type: Construction
+    graph: HandmadeCompoundBow
+    node: HandmadeCompoundBow
+
+- type: entity
+  id: ADTSecurityCompoundBow
+  parent: BaseBow
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi
+    layers:
+    - state: unwielded
+      map: [ base ]
+    - state: unwielded-arrow
+      map: [ arrow ]
+      visible: false
+  - type: Appearance
+  - type: ItemMapper
+    spriteLayers:
+    - arrow
+    mapLayers:
+      arrow:
+        whitelist:
+          tags:
+          - Arrow
+  - type: GenericVisualizer
+    visuals:
+      enum.WieldableVisuals.Wielded:
+        arrow:
+          True: { state: wielded-arrow }
+          False: { state: unwielded-arrow }
+        base:
+          True: { state: wielded }
+          False: { state: unwielded }
+  - type: ExpendedBows
+    floatToColdown: 2
+  - type: AttachableHolder
+    slots:
+      rmc-aslot-rail:
+        whitelist:
+          tags:
+          - ADTAttachmentT2Miniscope
+  - type: AttachableHolderVisuals
+    offsets:
+      rmc-aslot-rail: -0.0325, -0.0625

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml

@@ -0,0 +1,79 @@
+- type: entity
+  parent: BaseArrow
+  id: ADTArrowSecurity
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi
+    layers:
+    - state: tail
+      color: red
+    - state: rod
+      color: white
+    - state: tip
+      color: white
+    - state: solution1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 35
+
+- type: entity
+  parent: BaseArrow
+  id: ADTArrowFlashSecurity
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi
+    layers:
+    - state: tail
+      color: yellow
+    - state: rod
+      color: white
+    - state: tip
+      color: white
+    - state: solution1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 20
+        Heat: 5
+  - type: AmbientSound
+    enabled: true
+    volume: 0
+    range: 7
+    sound:
+      path: /Audio/Machines/sonar-ping.ogg
+      params:
+        loop: true
+  - type: IgniteOnCollide
+    fireStacks: 1
+  - type: PointLight
+    enabled: true
+    color: "#ffee00"
+    radius: 15.0
+    energy: 9.0
+
+- type: entity
+  parent: BaseArrow
+  id: ADTArrowGranade
+  components:
+  - type: TriggerOnCollide
+    fixtureID: fix1
+    maxTriggers: 1
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi
+    layers:
+      - state: grenade
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: DemolitionCharge
+    totalIntensity: 150
+    intensitySlope: 25
+    maxIntensity: 50
+    canCreateVacuum: false
+  - type: Construction
+    graph: ADTArrowGranade
+    node: ADTArrowGranade