Bucket solution fills + ECS SolutionContainerVisualizer (#10289)

2022-08-07 01:50:52 -07:00
parent ee8d5d7828
commit b947151d9a
28 changed files with 200 additions and 185 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_solutioncontainerexample.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_solutioncontainerexample.yml
@@ -25,10 +25,9 @@
        # 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-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: fill-

 # Without (For food, non cut-out stuff)

@@ -53,9 +52,8 @@
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: true
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: icon-
-      changeColor: false
-      emptySpriteName: icon
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: icon-
+    changeColor: false
+    emptySpriteName: icon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -58,10 +58,9 @@
  - type: Icon
    state: packet-astrotame
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-trans-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-trans-

 - type: entity
  parent: FoodCondimentPacket
@@ -85,10 +84,9 @@
  - type: Icon
    state: packet-bbq
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-trans-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-trans-

 - type: entity
  parent: FoodCondimentPacket
@@ -112,10 +110,9 @@
  - type: Icon
    state: packet-cornoil
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-trans-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-trans-

 - type: entity
  parent: FoodCondimentPacket
@@ -139,10 +136,9 @@
  - type: Icon
    state: packet-frostoil
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-trans-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-trans-

 - type: entity
  parent: FoodCondimentPacket
@@ -166,10 +162,9 @@
  - type: Icon
    state: packet-greygoo
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 - type: entity
  parent: FoodCondimentPacket
@@ -193,10 +188,9 @@
  - type: Icon
    state: packet-hotsauce
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-trans-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-trans-

 - type: entity
  parent: FoodCondimentPacket
@@ -219,10 +213,9 @@
  - type: Icon
    state: packet-ketchup
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 - type: entity
  parent: FoodCondimentPacket
@@ -245,10 +238,9 @@
  - type: Icon
    state: packet-pepper
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 - type: entity
  parent: FoodCondimentPacket
@@ -273,10 +265,9 @@
  - type: Icon
    state: packet-salt
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 - type: entity
  parent: FoodCondimentPacket
@@ -299,10 +290,9 @@
  - type: Icon
    state: packet-soysauce
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 - type: entity
  parent: FoodCondimentPacket
@@ -325,10 +315,9 @@
  - type: Icon
    state: packet-sugar
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 2
-      fillBaseName: packet-solid-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: packet-solid-

 # Bottles

@@ -355,10 +344,9 @@
    sprite: Objects/Consumable/Food/condiments.rsi
    state: bottle-empty
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: bottle-alpha-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottle-alpha-
  - type: TrashOnEmpty
    solution: food

@@ -501,10 +489,9 @@
    sprite: Objects/Consumable/Food/condiments.rsi
    state: bottle-s-empty
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 3
-      fillBaseName: bottle-s-alpha-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: bottle-s-alpha-
  - type: TrashOnEmpty
    solution: food

--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -32,7 +32,9 @@
    sprite: Objects/Specific/Janitorial/janitorial.rsi
    layers:
    - state: mopbucket
-    - state: mopbucket_water
+    - state: mopbucket_water-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
    drawdepth: Objects
  - type: InteractionOutline
  - type: SolutionContainerManager
@@ -47,6 +49,8 @@
    solution: bucket
  - type: RefillableSolution
    solution: bucket
+  - type: ExaminableSolution
+    solution: bucket
  - type: Tag
    tags:
      - Wringer
@@ -67,6 +71,10 @@
  - type: Pullable
  - type: Drink
    isOpen: true
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: mopbucket_water-

 - type: entity
  name: wet floor sign
@@ -96,8 +104,9 @@
      sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
      layers:
        - state: cart
-        - state: cart_water_1
+        - state: cart_water-1
          map: ["enum.SolutionContainerLayers.Fill"]
+          visible: false
    - type: Rotatable
    - type: InteractionOutline
    - type: Storage
@@ -202,10 +211,9 @@
      visuals:
        - type: MappedItemVisualizer
          sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
-        - type: SolutionContainerVisualizer
-          maxFillLevels: 3
-          fillBaseName: cart_water_
-          changeColor: false
+    - type: SolutionContainerVisuals
+      maxFillLevels: 3
+      fillBaseName: cart_water-
    - type: UserInterface
      interfaces:
      - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -67,11 +67,10 @@
    solutionName: pen
    transferAmount: 15
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 1
-      changeColor: false
-      emptySpriteName: medipen_empty
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: medipen_empty
  - type: Tag
    tags:
    - Trash
@@ -126,11 +125,10 @@
    - state: hypovolemic
      map: [ "enum.SolutionContainerLayers.Fill" ]
  - type: Appearance
-    visuals:
-      - type: SolutionContainerVisualizer
-        maxFillLevels: 1
-        changeColor: false
-        emptySpriteName: hypovolemic_empty
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: hypovolemic_empty
  - type: Hypospray
    solutionName: pen
    transferAmount: 30
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -56,10 +56,9 @@
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: bottle-1-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottle-1-

 - type: entity
  name: bottle
@@ -74,10 +73,9 @@
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: bottle-2-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottle-2-

 - type: entity
  name: bottle
@@ -92,10 +90,9 @@
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: bottle-3-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottle-3-

 - type: entity
  name: bottle
@@ -110,10 +107,9 @@
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: bottle-4-
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: bottle-4-

 - type: entity
  id: EpinephrineChemistryBottle
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -41,10 +41,9 @@
  - type: Drink
    isOpen: true
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: beaker
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: beaker
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Glass
@@ -111,10 +110,9 @@
      beaker:
        maxVol: 100
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 6
-      fillBaseName: beakerlarge
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: beakerlarge

 - type: entity
  name: cryostasis beaker
@@ -204,10 +202,9 @@
  - type: Item
    sprite: Objects/Specific/Chemistry/dropper.rsi
  - type: Appearance
-    visuals:
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 1
-      fillBaseName: dropper
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: dropper

 - type: entity
  name: syringe
@@ -238,18 +235,9 @@
  - type: TrashOnEmpty
    solution: injector
  - type: Appearance
-    visuals:
-      # this visualizer used for reagent inside
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 4
-      fillBaseName: syringe
-      # this one for syrigine itself (plunger)
-    - type: SolutionContainerVisualizer
-      maxFillLevels: 4
-      fillBaseName: syringe_base
-      emptySpriteName: syringe_base0
-      layer: Base
-      changeColor: false
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: syringe

 - type: entity
  name: pill
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -10,7 +10,11 @@
  - type: Sprite
    netsync: false
    sprite: Objects/Tools/bucket.rsi
-    state: icon
+    layers:
+    - state: icon
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
  - type: Item
    size: 100
  - type: Clothing
@@ -38,3 +42,9 @@
    solution: bucket
  - type: DrainableSolution
    solution: bucket
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: fill-
+  - type: ExaminableSolution
+    solution: bucket
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -240,7 +240,7 @@
  parent: BaseDrink
  desc: reagent-desc-water
  physicalDesc: reagent-physical-desc-translucent
-  color: "#c0e0ff20"
+  color: "#75b1f0"
  boilingPoint: 100.0
  meltingPoint: 0.0
  metabolisms: