From 465eaa87d35b7b7c8673dc9f9c2be0d9ecb410ba Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 21 Apr 2021 21:12:37 +0000 Subject: [PATCH] Deprecates DrinkFoodVisualizer.cs in favor of SolutionContainerVisualizer.cs (#3876) * Initial * Removes DrinkFoodVisualizer.cs * Tests --- .../Nutrition/DrinkFoodVisualizer.cs | 38 --------- .../Inventories/dinnerware.yml | 2 - .../Entities/Objects/Consumable/drinks.yml | 28 ------- .../Objects/Consumable/drinks_cups.yml | 77 ----------------- .../drinks_solutioncontainerexample.yml | 59 +++++++++++++ .../Consumable/Drinks/pitcher.rsi/fill-1.png | Bin 0 -> 93 bytes .../Consumable/Drinks/pitcher.rsi/fill-2.png | Bin 0 -> 112 bytes .../Consumable/Drinks/pitcher.rsi/fill-3.png | Bin 0 -> 115 bytes .../Consumable/Drinks/pitcher.rsi/fill-4.png | Bin 0 -> 130 bytes .../Consumable/Drinks/pitcher.rsi/fill-5.png | Bin 0 -> 127 bytes .../Consumable/Drinks/pitcher.rsi/fill-6.png | Bin 0 -> 140 bytes .../pitcher.rsi/{icon-0.png => icon.png} | Bin .../Consumable/Drinks/pitcher.rsi/meta.json | 78 +++++++++++------- 13 files changed, 107 insertions(+), 175 deletions(-) delete mode 100644 Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png rename Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/{icon-0.png => icon.png} (100%) diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs deleted file mode 100644 index c5d493c02c..0000000000 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Shared.GameObjects.Components.Nutrition; -using Content.Shared.Utility; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Client.GameObjects.Components.Nutrition -{ - [UsedImplicitly] - public sealed class DrinkFoodVisualizer : AppearanceVisualizer - { - [DataField("steps")] - private int _steps; - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - var sprite = component.Owner.GetComponent(); - - if (!component.TryGetData(SharedFoodComponent.FoodVisuals.MaxUses, out var maxUses)) - { - return; - } - - if (component.TryGetData(SharedFoodComponent.FoodVisuals.Visual, out var usesLeft)) - { - var step = ContentHelpers.RoundToLevels(usesLeft, maxUses, _steps); - sprite.LayerSetState(0, $"icon-{step}"); - } - else - { - sprite.LayerSetState(0, "icon-0"); - } - } - } -} diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index f08edb5fcd..4660f9b783 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -7,7 +7,6 @@ ButchCleaver: 1 KitchenKnife: 5 DrinkGlass: 10 - DrinkPitcher: 1 DrinkMug: 5 DrinkMugBlack: 2 DrinkMugBlue: 2 @@ -18,4 +17,3 @@ DrinkMugOne: 1 DrinkMugRainbow: 2 DrinkMugRed: 2 - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 5221581a2c..19e12c64a4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -13,7 +13,6 @@ - type: Drink - type: Sprite state: icon - - type: Spillable - type: entity @@ -45,7 +44,6 @@ - type: DamageOtherOnHit amount: 5 - # Transformable container - normal glass - type: entity name: Drinking glass @@ -76,7 +74,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/aleglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkAntifreeze @@ -93,7 +90,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/antifreeze.rsi - - type: entity parent: DrinkGlassBase id: DrinkAtomicbombglass @@ -110,7 +106,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/atomicbombglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkB52Glass @@ -127,7 +122,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/b52glass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBananahonkglass @@ -138,7 +132,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bananahonkglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeepskySmashGlass @@ -149,7 +142,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeer @@ -165,7 +157,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beer.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeerglass @@ -181,7 +172,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beerglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBerryJuice @@ -198,7 +188,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/berryjuice.rsi - - type: entity parent: DrinkGlassBase id: DrinkBlackRussianGlass @@ -209,7 +198,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/blackrussianglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBloodyMaryGlass @@ -220,7 +208,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBooger @@ -231,7 +218,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/booger.rsi - - type: entity parent: DrinkGlassBase id: DrinkBraveBullGlass @@ -242,7 +228,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bravebullglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBrownStar @@ -253,7 +238,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/brownstar.rsi - - type: entity parent: DrinkGlassBase id: DrinkCarafe @@ -265,11 +249,6 @@ sprite: Objects/Consumable/Drinks/carafe.rsi state: icon-10 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 11 - - type: entity parent: DrinkGlassBase id: DrinkCarrotJuice @@ -286,7 +265,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/carrotjuice.rsi - - type: entity parent: DrinkGlassBase id: DrinkChocolateGlass @@ -1730,11 +1708,6 @@ sprite: Objects/Consumable/Drinks/water_cup.rsi state: icon-1 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 2 - - type: entity parent: DrinkGlassBase id: DrinkWhiskeyColaGlass @@ -1814,4 +1787,3 @@ Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/wineglass.rsi - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml index f9176f5fdc..2122b384d9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml @@ -13,7 +13,6 @@ isOpen: true - type: Sprite state: icon - - type: Spillable - type: entity @@ -27,24 +26,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/golden_cup.rsi - -- type: entity - parent: DrinkBaseCup - id: DrinkPitcher - name: insulated pitcher - description: A stainless steel insulated pitcher. Everyone's best friend in the morning. - components: - - type: SolutionContainer - maxVol: 15 - - type: Sprite - sprite: Objects/Consumable/Drinks/pitcher.rsi - state: icon-6 - - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 7 - - type: entity parent: DrinkBaseCup id: DrinkMug @@ -57,11 +38,6 @@ sprite: Objects/Consumable/Drinks/mug.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugBlack @@ -74,11 +50,6 @@ sprite: Objects/Consumable/Drinks/mug_black.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugBlue @@ -91,11 +62,6 @@ sprite: Objects/Consumable/Drinks/mug_blue.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugGreen @@ -108,11 +74,6 @@ sprite: Objects/Consumable/Drinks/mug_green.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugHeart @@ -125,11 +86,6 @@ sprite: Objects/Consumable/Drinks/mug_heart.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugMetal @@ -142,11 +98,6 @@ sprite: Objects/Consumable/Drinks/mug_metal.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugMoebius @@ -159,11 +110,6 @@ sprite: Objects/Consumable/Drinks/mug_moebius.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugOne @@ -176,11 +122,6 @@ sprite: Objects/Consumable/Drinks/mug_one.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugRainbow @@ -193,11 +134,6 @@ sprite: Objects/Consumable/Drinks/mug_rainbow.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugRed @@ -210,11 +146,6 @@ sprite: Objects/Consumable/Drinks/mug_red.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkHotCoco @@ -225,7 +156,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/hot_coco.rsi - - type: entity parent: DrinkBaseCup id: DrinkHotCoffee @@ -241,7 +171,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/hot_coffee.rsi - - type: entity parent: DrinkBaseCup id: DrinkTeacup @@ -258,11 +187,6 @@ sprite: Objects/Consumable/Drinks/teacup.rsi state: icon-1 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 2 - - type: entity parent: DrinkBaseCup id: DrinkLean @@ -278,6 +202,5 @@ - type: Sprite sprite: Objects/Consumable/Drinks/lean.rsi state: icon - - type: Item sprite: Objects/Consumable/Drinks/lean.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml new file mode 100644 index 0000000000..183212f460 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml @@ -0,0 +1,59 @@ +# For empty check out chemistry bottles + +# With cut-out + +- type: entity + parent: DrinkBaseCup + id: DrinkVisualizerTestCut + name: insulated pitcher + description: A stainless steel insulated pitcher. Everyone's best friend in the morning. + components: + - type: SolutionContainer + maxVol: 30 + contents: + reagents: + - ReagentId: WatermelonJuice + Quantity: 30 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Drinks/pitcher.rsi + layers: + - state: icon + - state: fill-6 + map: ["enum.SolutionContainerLayers.Fill"] + # REMEMBER IF YOU'RE SPAWNING WITH LIQUID ALREADY IN IT YOU WANT THIS TRUE + visible: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: fill- + +# Without (For food, non cut-out stuff) + +- type: entity + parent: DrinkBaseCup + id: DrinkVisualizerTestNot + name: insulated pitcher + description: A stainless steel insulated pitcher. Everyone's best friend in the morning. + components: + - type: SolutionContainer + maxVol: 30 + contents: + reagents: + - ReagentId: WatermelonJuice + Quantity: 30 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Drinks/pitcher.rsi + layers: + - state: icon-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: icon- + changeColor: false + emptySpriteName: icon diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..63f4f8d6e3ba2658807fc2db8cf414c9f5f7f5e0 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6;Bt(kcif|7YunB7&w?W{Jd_G q|Ddsd$S2M^72nwIB;<(P?J^cXC2nJ7A KKbLh*2~7ajt|N8; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..9f70ab226d432dc178e093333c0102c2f16c671d GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzD^C~4kcif|7Y=eVIB+l@49T8q zHd$!Rfx}`?4xHzEA|D1+bEAVJHEsUU&389%W)5Dk>Kz{g!@h}M7<}Rd*7e)YFb1k% N@O1TaS?83{1OPHcB>w;a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..3ae4758e01e6258fec875e2059c830de5679aeff GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekcif|7Y=eB2;g7|oE)|0 z?4vb~-JhPFogj9Io%2kyEmt!W1H%VzLBpAr>bKtOyT7Yj`Rd;LRay7evd)-U@;#1$ e;emu;CBxA+(J8mj?bZYu%HZkh=d#Wzp$Pz7buP~U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..4e292daf6abd8d656e0ebdf767a7167e3982bdb6 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzH%}MGkcif|7dCP-1ahzhuHNc3 zdn1c6^TB>y8TQ#{n$NbIGB7mg-?^)ll=?jN*}W9T?+&3anRZp@Z)&JcNGoAvXt+P) aCUf<3*@a7I6i)=2$l&Sf=d#Wzp$PyN11lo{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png new file mode 100644 index 0000000000000000000000000000000000000000..4470f650543e4e57264d772db1e46b5c979baff6 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU{4pvkcif|7Y=eBaNuwWoE(>P z_R*Sy%l1?X@NN?jOG%VF6ZpdesIWlQ`1Q@sZ{N>PTxEA=&v)zc_cx;&Is#nYu%@J) mzsB^8IdrQyP}y;Ti|q5JDlLuOz~%