Дворфы больше не бесполезны. (space-syndicate#144)

* innate mineral scanner * Update Resources/Prototypes/Entities/Mobs/Species/dwarf.yml Co-authored-by: lzk <[email protected]> * Update Dwarf.xml --------- Co-authored-by: lzk <[email protected]>
FireNameFN · Dec 9, 2024 · 5e06bc0 · 5e06bc0
1 parent 796e482
commit 5e06bc0
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 4 deletions.
diff --git a/Content.Shared/Mining/MiningScannerSystem.cs b/Content.Shared/Mining/MiningScannerSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared._CorvaxNext.Mining.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Mining.Components;
@@ -8,7 +9,7 @@
 
 namespace Content.Shared.Mining;
 
-public sealed class MiningScannerSystem : EntitySystem
+public sealed partial class MiningScannerSystem : EntitySystem // Corvax-Next-Dwarf
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly INetManager _net = default!;
@@ -22,6 +23,8 @@ public override void Initialize()
         SubscribeLocalEvent<MiningScannerComponent, EntGotInsertedIntoContainerMessage>(OnInserted);
         SubscribeLocalEvent<MiningScannerComponent, EntGotRemovedFromContainerMessage>(OnRemoved);
         SubscribeLocalEvent<MiningScannerComponent, ItemToggledEvent>(OnToggled);
+
+		CNInitialize(); // Corvax-Next-Dwarf
     }
 
     private void OnInserted(Entity<MiningScannerComponent> ent, ref EntGotInsertedIntoContainerMessage args)
@@ -85,8 +88,17 @@ public override void Update(float frameTime)
         {
             if (viewer.QueueRemoval)
             {
-                RemCompDeferred(uid, viewer);
-                continue;
+                // Corvax-Next-Dwarf-Start: innate mining scanner
+                if (TryComp<InnateMiningScannerViewerComponent>(uid, out var innateViewer))
+                {
+                    SetupInnateMiningViewerComponent((uid, innateViewer));
+                }
+                else
+                {
+                    RemCompDeferred(uid, viewer);
+                    continue;
+                } 
+				// Corvax-Next-Dwarf-End: innate mining scanner
             }
 
             if (_timing.CurTime < viewer.NextPingTime)

diff --git a/Content.Shared/_CorvaxNext/Mining/Components/InnateMiningScannerViewerComponent.cs b/Content.Shared/_CorvaxNext/Mining/Components/InnateMiningScannerViewerComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Content.Shared.Mining;
+
+namespace Content.Shared._CorvaxNext.Mining.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(MiningScannerSystem))]
+public sealed partial class InnateMiningScannerViewerComponent : Component
+{
+    [DataField, ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
+    public float ViewRange;
+
+    [DataField, AutoNetworkedField]
+    public float AnimationDuration = 1.5f;
+
+    [DataField, AutoNetworkedField]
+    public TimeSpan PingDelay = TimeSpan.FromSeconds(5);
+
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? PingSound = null;
+
+}
diff --git a/Content.Shared/_CorvaxNext/Mining/MiningScannerSystem.Innate.cs b/Content.Shared/_CorvaxNext/Mining/MiningScannerSystem.Innate.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Mining.Components;
+using Content.Shared._CorvaxNext.Mining.Components;
+
+namespace Content.Shared.Mining;
+
+public sealed partial class MiningScannerSystem : EntitySystem
+{
+
+    /// <inheritdoc/>
+    public void CNInitialize()
+    {
+        SubscribeLocalEvent<InnateMiningScannerViewerComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(Entity<InnateMiningScannerViewerComponent> ent, ref ComponentStartup args)
+    {
+        if (!HasComp<MiningScannerViewerComponent>(ent))
+        {
+            SetupInnateMiningViewerComponent(ent);
+        }
+    }
+
+    private void SetupInnateMiningViewerComponent(Entity<InnateMiningScannerViewerComponent> ent)
+    {
+        var comp = EnsureComp<MiningScannerViewerComponent>(ent);
+        comp.ViewRange = ent.Comp.ViewRange;
+        comp.PingDelay = ent.Comp.PingDelay;
+        comp.PingSound = ent.Comp.PingSound;
+        comp.QueueRemoval = false;
+        comp.NextPingTime = _timing.CurTime + ent.Comp.PingDelay;
+        Dirty(ent.Owner, comp);
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -66,6 +66,9 @@
   - type: FootprintVisualizer # Corvax-Next-Footprints
     leftBarePrint: "footprint-left-bare-dwarf"
     rightBarePrint: "footprint-right-bare-dwarf"
+  - type: InnateMiningScannerViewer # Corvax-Next-Dwarfs
+    pingSound: null
+    viewRange: 3
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml b/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
@@ -19,5 +19,6 @@
   - Не может быть вызвана рвота от алкоголя.
   - Дышат чаще в 2 раза, следовательно без воздуха получают по [color=red]2[/color] урона удушьем.
   - Этанол лечит дворфов на [color=green]0.66[/color] уколов и ушибов и на [color=green]0.68[/color] порезов при наличии менее 5 единиц в организме.
+  - Обладают врождённой чувствительностью к наличию рудоносных жил в радиусе [color=yellow]3[/color] метров.
 
-</Document>
+</Document>