From 980c3ef799b334582f05567e7055c2c9ead5082c Mon Sep 17 00:00:00 2001
From: adamsong <adamsong@users.noreply.github.com>
Date: Wed, 22 Mar 2023 23:49:42 -0400
Subject: [PATCH] Improved solution container visuals (#13791)

---
 .../SolutionContainerVisualsSystem.cs           |   4 ++--
 .../Objects/Consumable/Drinks/drinks_cups.yml   |   9 ++++++++-
 .../Consumable/Drinks/water_cup.rsi/icon-0.png  | Bin 296 -> 284 bytes
 .../Consumable/Drinks/water_cup.rsi/icon-1.png  | Bin 284 -> 165 bytes
 .../Consumable/Drinks/water_cup.rsi/meta.json   |   2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 5686c9c363..3eea146050 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/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)
         {
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 58395f6f9b..f70c0e179d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/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
diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-0.png
index 8b0a5636be026852b2a49fe460b185965489c870..dac639fd21e0b2d67b914b660ae1993adf80cc86 100644
GIT binary patch
delta 256
zcmV+b0ssD}0-OSnB!A;cL_t(|ob8pd4Z<)KM9+v3(oy(22B4%!nN27%03$F05)9xS
z(j^5$r2CO5Q__b9M@b|k{38g3uk$JPy?oo>rYuV=snw$C5g-CYfC%sp0Bh|;lHG7D
zBIYLmK3GKF`9UB-03^F<u$T8=-+T-abOuDkkc3NXxU}wlmwDD836jATFrm+}FZIb5
zBmeFW0D$AB`rZ}*eHFUPb%!QPdOuf$1IlY?i*_{5Z&tI69-!Jj%oIfP_iBKlY|-Mp
zZ`AYE0KN)MmZ+Q1EC3%qSL#*_=-cm5i$6vYAOb{y2=D~99ZGc`AvKu*0000<MNUMn
GLSTZ=^=}LS

delta 269
zcmV+o0rLKw0;mFzB!BNoL_t(|ob8n%4#F@LhX0ZsVF_ZQ&v5`GvVxl+b^wmR5lBEz
zaEA$!O(1rQF2O9BL@p_UblK+m78v6Fu7A@0Util-RTKr5)N0Xm0T2KI5P*LGh`1Ap
z$PLHVTJ;kEAAFD2Bi|4l2P6o9h}<;T%ln4lLLh?ffVEbcu75$5WT=v?_p2m>=^B`>
z39f(&{f_++oOC|&pSJ@5;Fy%(I|ATS1tM~n>lXDs?){Vz4ltjg&fC#AeQ3@ye1LNE
zQd1Dl?%4oC>Ab~xSF`7{0elteeavn`vjBYfT(Mg*z;C}pE&dq^fB*=90K5Tdi%HWZ
Tj+C|l0000<MFvhpu0mjfrOA0?

diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/icon-1.png
index dac639fd21e0b2d67b914b660ae1993adf80cc86..6456f4e651d69975f20b1b6c7af8f7b702817489 100644
GIT binary patch
delta 137
zcmbQkw3KmzN<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3
zR|8Pc%G1R$B*OjeIYS`^0~VLScl9q6Hc#!-oBUsDwZSz8hWo{5H%=DO_wQ1Ey!hXa
m+hUO`ja;=E7!GuwVTzRC|NTedlQGZ~22WQ%mvv4|2~7Zy1ui%M

delta 256
zcmV+b0ssD`0h|JmB!A;cL_t(|ob8pd4Z<)KM9+v3(oy(22B4%!nN27%03$F05)9xS
z(j^5$r2CO5Q__b9M@b|k{38g3uk$JPy?oo>rYuV=snw$C5g-CYfC%sp0Bh|;lHG7D
zBIYLmK3GKF`9UB-03^F<u$T8=-+T-abOuDkkc3NXxU}wlmwDD836jATFrm+}FZIb5
zBmeFW0D$AB`rZ}*eHFUPb%!QPdOuf$1IlY?i*_{5Z&tI69-!Jj%oIfP_iBKlY|-Mp
zZ`AYE0KN)MmZ+Q1EC3%qSL#*_=-cm5i$6vYAOb{y2=D~99ZGc`AvKu*0000<MNUMn
GLSTZ+_HPIP

diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
index 80ac521b6f..7c719f160d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json
@@ -14,4 +14,4 @@
             "name": "icon-1"
         }
     ]
-}
\ No newline at end of file
+}
-- 
2.51.2