upd

space-sunrise · Oct 21, 2024 · 609e9b8 · 609e9b8
1 parent 6624c61
commit 609e9b8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
@@ -4,6 +4,8 @@
 using Content.Shared.Actions;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Toggleable;
+using Content.Shared.PowerCell;
+using Content.Shared.PowerCell.Components;
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
@@ -20,13 +22,17 @@ public sealed class NightVisionDeviceSystem : EntitySystem
     [Dependency] private readonly SharedPointLightSystem _light = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPowerCellSystem _cell = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<NightVisionDeviceComponent, InventoryRelayedEvent<CanVisionAttemptEvent>>(OnNVDTrySee);
         SubscribeLocalEvent<NightVisionDeviceComponent, NightVisionDeviceUpdateVisualsEvent>(OnNightVisionDeviceUpdateVisuals);
+
+        SubscribeLocalEvent<NightVisionDeviceComponent, PowerCellChangedEvent>(OnPowerCellChanged);
+        SubscribeLocalEvent<NightVisionDeviceComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
 
         SubscribeLocalEvent<NightVisionDeviceComponent, GetItemActionsEvent>(OnGetActions);
         SubscribeLocalEvent<NightVisionDeviceComponent, ToggleActionEvent>(OnToggleAction);
@@ -56,7 +62,20 @@ private void OnShutdown(EntityUid uid, NightVisionDeviceComponent component, Com
     {
         _actionsSystem.RemoveAction(uid, component.ToggleActionEntity);
     }
+
+    private void OnPowerCellSlotEmpty(Entity<NightVisionDeviceComponent> ent, ref PowerCellSlotEmptyEvent args)
+    {
+        if (ent.Comp.isPowered)
+            Toggle(ent);
+    }
 
+    private void OnPowerCellChanged(Entity<NightVisionDeviceComponent> ent, ref PowerCellChangedEvent args)
+    {
+        if (args.Ejected || !_powerCell.HasDrawCharge(ent))
+            if (ent.Comp.isPowered)
+                Toggle(ent);
+    }
+
     private void OnToggleAction(Entity<NightVisionDeviceComponent> ent, ref ToggleActionEvent args)
     {
         if (args.Handled)
@@ -68,6 +87,13 @@ private void OnToggleAction(Entity<NightVisionDeviceComponent> ent, ref ToggleAc
             return;
         }
 
+        Toggle(ent);
+
+        args.Handled = true;
+    }
+
+    public void Toggle(Entity<NightVisionDeviceComponent> ent)
+    {
         var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
         RaiseLocalEvent(ent, ref updVisEv);
 
@@ -81,15 +107,22 @@ private void OnToggleAction(Entity<NightVisionDeviceComponent> ent, ref ToggleAc
 
         if (!_light.TryGetLight(ent.Owner, out var light))
             return;
+
+        var draw = Comp<PowerCellDrawComponent>(ent.Owner);
+        _cell.QueueUpdate((ent.Owner, draw));
+        _cell.SetDrawEnabled((ent.Owner, draw), ent.Comp.Activated);
 
         _appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated);
         _light.SetEnabled(ent.Owner, ent.Comp.Activated, comp: light);
 
-        var changeEv = new NightVisionDeviceToggledEvent(args.Performer);
-        RaiseLocalEvent(ent.Owner, ref changeEv);
-        Dirty(ent);
+        if (TryComp<TransformComponent>(ent.Owner, out var transform))
+        {
+            var equipped = transform.ParentUid;
 
-        args.Handled = true;
+            var changeEv = new NightVisionDeviceToggledEvent(equipped);
+            RaiseLocalEvent(ent.Owner, ref changeEv);
+        }
+        Dirty(ent);
     }
 }
 

diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml
@@ -38,7 +38,6 @@
   - type: PowerCellDraw
     drawRate: 0
     useRate: 20
-  - type: ToggleCellDraw
 
 - type: entity
   parent: [ClothingEyesNVD,ShowSecurityIcons]