New component NoShowFov для маски Хроноса

AdventureTimeSS14 · Sep 5, 2024 · d71df94 · d71df94
1 parent ea62d5c
commit d71df94
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 21 deletions.
diff --git a/Content.Shared/ADT/NoShowFov/NoShowFovComponent.cs b/Content.Shared/ADT/NoShowFov/NoShowFovComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.ADT.NoShowFov;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoShowFovComponent : Component { }
diff --git a/Content.Shared/ADT/NoShowFov/NoShowFovSystem.cs b/Content.Shared/ADT/NoShowFov/NoShowFovSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Inventory.Events;
+using Content.Shared.ADT.NoShowFov;
+
+namespace Content.Client.ADT.NoShowFov;
+
+public sealed class NoShowFovSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEyeSystem _eye = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NoShowFovComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<NoShowFovComponent, GotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnEquipped(EntityUid uid, NoShowFovComponent component, ref GotEquippedEvent args)
+    {
+        ToggleFov(args.Equipee, false);
+    }
+
+    private void OnUnequipped(EntityUid uid, NoShowFovComponent component, ref GotUnequippedEvent args)
+    {
+        ToggleFov(args.Equipee, true);
+    }
+
+    private void ToggleFov(EntityUid entity, bool drawFov)
+    {
+        if (TryComp<EyeComponent>(entity, out var _))
+        {
+            _eye.SetDrawFov(entity, drawFov);
+        }
+    }
+}
+
+
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml
@@ -209,12 +209,10 @@
   - type: Clothing
     sprite: ADT/Clothing/Mask/chronosvisor.rsi
   - type: BreathMask
-  - type: ShowSecurityIcons
+  - type: NoShowFov # Отключает Fov при надевании
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
-  - type: Eye
-    drawFov: false
 
 # #противогаз СССП
 

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
@@ -246,6 +246,7 @@
   id: ADTClothingUniformNewMekka
   name: New Mekka jumpsuit
   description: New Mekka jumpsuit
+  suffix: New Mekka
   components:
   - type: Sprite
     sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
@@ -596,21 +597,3 @@
     sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformNewMekka
-  name: New Mekka jumpsuit
-  description: New Mekka jumpsuit
-  suffix: New Mekka
-  components:
-  - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
-  - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Piercing: 0.8
-        Heat: 0.9