Nozzle refactor

Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs

@@ -19,6 +19,10 @@
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
+using Content.Shared.SS220.Spray.Components;
+using Content.Shared.SS220.Spray.Events;
+using Content.Shared.SS220.Spray.System;
+using YamlDotNet.Core.Tokens;
 
 namespace Content.Shared.Chemistry.EntitySystems;
 
@@ -76,6 +80,7 @@ public override void Initialize()
         SubscribeLocalEvent<ExaminableSolutionComponent, ExaminedEvent>(OnExamineSolution);
         SubscribeLocalEvent<ExaminableSolutionComponent, GetVerbsEvent<ExamineVerb>>(OnSolutionExaminableVerb);
         SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnMapInit);
+        //SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnGetSolution);
 
         if (NetManager.IsServer)
         {
@@ -1203,4 +1208,14 @@ public FixedPoint2 ClampReagentAmountByConcentration(
             dissolvedReagentAmount += overflow;
         return dissolvedReagentAmount;
     }
+
+    // SS220 Refactor nuzzle begin
+    private void OnGetSolution(EntityUid uid, TakeSolutionEvent takeSolutionEvent)
+    {
+        if (!TryGetSolution(uid, ClothingSlotSolutionProviderComponent.ContainmentSolutionName, out var soln, out var solution))
+            return;
+
+        SplitSolution(uid, FixedPoint2.Value, FixedPoint2.New(takeSolutionEvent.SolutionAmount));
+    }
+    // SS220 Refactor nuzzle end
 }

Content.Shared/SS220/Spray/Components/ClothingSlotSolutionProviderComponent.cs

@@ -0,0 +1,27 @@
+using Content.Shared.Inventory;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Content.Shared.SS220.Spray.System;
+
+namespace Content.Shared.SS220.Spray.Components;
+
+/// <summary>
+/// This is used for relaying solition events
+/// to an entity in the user's clothing slot.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSpraySystem))]
+public sealed partial class ClothingSlotSolutionProviderComponent : SolutionProviderComponent
+{
+    public const string ContainmentSolutionName = "containmentsolution";
+    /// <summary>
+    /// The slot that the ammo provider should be located in.
+    /// </summary>
+    [DataField("solutionRequiredSlot", required: true)]
+    public SlotFlags SolutionRequiredSlot;
+
+    /// <summary>
+    /// A whitelist for determining whether or not an solution provider is valid.
+    /// </summary>
+    [DataField("solutionProviderWhitelist")]
+    public EntityWhitelist? SolutionProviderWhitelist;
+}

Content.Shared/SS220/Spray/Components/SolutionProviderComponent.cs

@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.SS220.Spray.Components;
+
+[NetworkedComponent]
+public abstract partial class SolutionProviderComponent : Component {}

Content.Shared/SS220/Spray/Events/GetSolutionCountEvent.cs

@@ -0,0 +1,11 @@
+namespace Content.Shared.SS220.Spray.Events;
+
+/// <summary>
+/// Raised on an AmmoProvider to request deets.
+/// </summary>
+[ByRefEvent]
+public struct GetSolutionCountEvent
+{
+    public int Count;
+    public int Capacity;
+}

Content.Shared/SS220/Spray/Events/TakeSolutionEvent.cs

@@ -0,0 +1,23 @@
+using Robust.Shared.Map;
+using Content.Shared.Weapons.Ranged;
+
+namespace Content.Shared.SS220.Spray.Events;
+
+/// <summary>
+/// Raised on a gun when it would like to take the specified amount of ammo.
+/// </summary>
+public sealed class TakeSolutionEvent : EntityEventArgs
+{
+    public readonly EntityUid? User;
+    public byte SolutionAmount { get; }
+
+    /// <summary>
+    /// If no ammo returned what is the reason for it?
+    /// </summary>
+    public string? Reason;
+
+    public TakeSolutionEvent(EntityUid? user, byte solutionAmount)
+    {
+    }
+
+}

Content.Shared/SS220/Spray/Systems/SharedSpraySystem.Clothing.cs

@@ -0,0 +1,61 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Inventory;
+using Content.Shared.SS220.Spray.Components;
+using Content.Shared.SS220.Spray.Events;
+using Content.Shared.Whitelist;
+using Linguini.Bundle.Errors;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.SS220.Spray.System;
+
+public sealed partial class SharedSpraySystem : EntitySystem
+{
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnClothingTakeSolution);
+        SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, GetSolutionCountEvent>(OnClothingSolutionCount);
+    }
+
+    private void OnClothingTakeSolution(EntityUid uid, ClothingSlotSolutionProviderComponent component, TakeSolutionEvent args)
+    {
+        if (!TryGetClothingSlotEntity(uid, component, out var entity))
+            return;
+        RaiseLocalEvent(entity.Value, args);
+    }
+
+    private void OnClothingSolutionCount(EntityUid uid, ClothingSlotSolutionProviderComponent component, ref GetSolutionCountEvent args)
+    {
+        if (!TryGetClothingSlotEntity(uid, component, out var entity))
+            return;
+        RaiseLocalEvent(entity.Value, ref args);
+    }
+
+    private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotSolutionProviderComponent component, [NotNullWhen(true)] out EntityUid? slotEntity)
+    {
+        slotEntity = null;
+
+        if (!_container.TryGetContainingContainer(uid, out var container))
+            return false;
+        var user = container.Owner;
+
+        if (!_inventory.TryGetContainerSlotEnumerator(user, out var enumerator, component.SolutionRequiredSlot))
+            return false;
+
+        while (enumerator.NextItem(out var item))
+        {
+            if (component.SolutionProviderWhitelist == null ||
+            !_whitelistSystem.IsValid(component.SolutionProviderWhitelist, uid))
+                continue;
+
+            slotEntity = item;
+            return true;
+        }
+
+        return false;
+    }
+}
+

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/basic/spraynozzle.ftl

@@ -1,2 +1,2 @@
-ent-WeaponSprayNozzle = форсунка-распылитель
-    .desc = Мощное разбрызгивающее устройство, используемое в связке с ранцевым резервуаром с водой.
+ent-SprayNozzle = пневматический распылитель высокого давления
+    .desc = Мощное разбрызгивающее устройство, используемое в связке с ранцевым резервуаром с космическим очистителем.

Resources/Maps/Nonstations/nukieplanet.yml

@@ -15167,7 +15167,7 @@ entities:
       parent: 104
     - type: BallisticAmmoProvider
       unspawnedCount: 2
-- proto: WeaponSprayNozzle
+- proto: SprayNozzle
   entities:
   - uid: 152
     components:

Resources/Maps/Shuttles/dart.yml

@@ -6687,7 +6687,7 @@ entities:
     - type: Transform
       pos: -1.5,6.5
       parent: 1
-- proto: WeaponSprayNozzle
+- proto: SprayNozzle
   entities:
   - uid: 337
     components:

Resources/Prototypes/Entities/Clothing/Back/specific.yml

@@ -19,7 +19,7 @@
         enum.ChameleonUiKey.Key:
           type: ChameleonBoundUserInterface
 # Corvax-HiddenDesc-Start
-    - type: HiddenDescription 
+    - type: HiddenDescription
       entries:
       - label: corvax-hidden-desc-Chameleon-syndicate
         whitelistMind:
@@ -68,6 +68,10 @@
     interfaces:
       enum.TransferAmountUiKey.Key:
         type: TransferAmountBoundUserInterface
+      # SS220 Nuzzle refactor begin
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+      # SS220 Nuzzle refactor end
   - type: DrawableSolution
     solution: tank
   - type: RefillableSolution
@@ -76,3 +80,11 @@
     solution: tank
   - type: ExaminableSolution
     solution: tank
+    # SS220 Nuzzle refactor begin
+  - type: Storage
+    grid:
+    - 0,0,1,1
+    whitelist:
+      components:
+      - ClothingSlotSolutionProvider
+    # SS220 Nuzzle refactor begin

Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml

@@ -0,0 +1,43 @@
+- type: entity
+  id: SprayNozzle
+  parent: BaseItem
+  name: spray nozzle
+  description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
+    size: Normal
+  # SS220 Nozzle fix begin
+  #- type: Gun
+  #  cameraRecoilScalar: 0 #no recoil
+  #  fireRate: 4
+  #  selectedMode: FullAuto
+  #  availableModes:
+  #  - FullAuto
+  #  soundGunshot:
+  #    path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
+  - type: UseDelay
+  - type: Spray
+    transferAmount: 15
+    sprayedPrototype: BigVapor
+    sprayVelocity: 4
+    sprayDistance: 6
+    spraySound:
+      path: /Audio/Effects/spray2.ogg
+  - type: Drink
+    solution: spray
+    ignoreEmpty: true
+    useSound:
+      path: /Audio/Effects/spray3.ogg
+    transferAmount: 10
+  - type: SolutionItemStatus
+    solution: spray
+  - type: Appearance
+  - type: ClothingSlotSolutionProvider
+    solutionRequiredSlot: BACK
+    solutionProviderWhitelist:
+      tags:
+      - NozzleBackTank

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -291,7 +291,7 @@
       - ChemistryEmptyBottle01
       - AdvMopItem
       - TrashBagAdvanced #SS220 Borg Modules
-      - WeaponSprayNozzle
+      - SprayNozzle
       - ClothingBackpackWaterTank
       - MegaSprayBottle
       - TimerTrigger

Resources/Prototypes/Recipes/Lathes/janitorial.yml

@@ -90,8 +90,8 @@
     Wood: 200
 
 - type: latheRecipe
-  id: WeaponSprayNozzle
-  result: WeaponSprayNozzle
+  id: SprayNozzle
+  result: SprayNozzle
   completetime: 5
   materials:
     Steel: 1500

Resources/Prototypes/Research/civilianservices.yml

@@ -189,7 +189,7 @@
   tier: 2
   cost: 10000
   recipeUnlocks:
-  - WeaponSprayNozzle
+  - SprayNozzle
   - ClothingBackpackWaterTank
 
 - type: technology