Improved solution container visuals (#13791)

Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Rounding;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -41,7 +42,6 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
             Logger.Error("Attempted to set solution container visuals volume ratio on " + ToPrettyString(uid) + " to a value greater than 1. Volume should never be greater than max volume!");
             fraction = 1f;
         }
-
         if (component.Metamorphic)
         {
             if (args.Sprite.LayerMapTryGet(component.BaseLayer, out var baseLayer))
@@ -79,7 +79,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
             }
         }
 
-        var closestFillSprite = (int) Math.Round(fraction * component.MaxFillLevels);
+        int closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.MaxFillLevels + 1);
 
         if (closestFillSprite > 0)
         {

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml

@@ -254,6 +254,13 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water_cup.rsi
-    state: icon-1
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-1
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: icon-
   - type: TrashOnEmpty
     solution: drink