Corvax drinks update

space-syndicate · Feb 25, 2024 · 10a6e43 · 10a6e43
1 parent f081ca4
commit 10a6e43
Show file tree

Hide file tree

Showing 125 changed files with 536 additions and 196 deletions.
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1,211 +1,210 @@
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkKvassGlass
-  name: kvass glass
-  description: A cool refreshing drink with a taste of socialism.
-  components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Kvass
-              Quantity: 30
-    - type: Sprite
-      sprite: Corvax/Objects/Consumable/Drinks/kvass.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkYorshGlass
-  name: yorsh glass
-  description: Taste of childhood.
+  parent: DrinkGlass
+  id: DrinkAlexanderGlass
+  suffix: alexander
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Yorsh
+        - ReagentId: Alexander
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/yorsh.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/alexander.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkAlexanderGlass
-  name: alexander glass
-  description: No Alexander was harmed during production. Maybe...
+  parent: DrinkGlass
+  id: DrinkBadTouchGlass
+  suffix: bad touch
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Alexander
+        - ReagentId: BadTouch
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/alexander.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/badTouch.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkDaiquiriGlass
-  name: daiquiri glass
-  description: Do you want to feel like a 19th century miner? The miner did not want to, and tried to forget himself in alcohol.
+  parent: DrinkGlass
+  id: DrinkBoyarskyGlass
+  suffix: boyarsky
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Daiquiri
+        - ReagentId: Boyarsky
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/daiquiri.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/boyarsky.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkNegroniGlass
-  name: negroni glass
-  description: Americano for alcoholics.
+  parent: DrinkGlass
+  id: DrinkBrambleGlass
+  suffix: bramble
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Negroni
+        - ReagentId: Bramble
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/negroni.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/bramble.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkEspressoMartiniGlass
-  name: espresso martini glass
-  description: Wake me up, then fu... Uh-h.. Okay, just wake me up.
+  parent: DrinkGlass
+  id: DrinkDaiquiriGlass
+  suffix: daiquiri
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: EspressoMartini
+        - ReagentId: Daiquiri
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/espressoMartini.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkOldFashionedGlass
-  name: old fashioned glass
-  description: "As the greatest classic said: “This is a classic”."
+  parent: DrinkGlass
+  id: DrinkDarkAndStormyGlass
+  suffix: dark and stormy
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: OldFashioned
+        - ReagentId: DarkAndStormy
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/oldFashioned.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/darkAndStormy.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkBadTouchGlass
-  name: bad touch glass
-  description: "We're nothing but mammals after all."
+  parent: DrinkGlass
+  id: DrinkEspressoMartiniGlass
+  suffix: espresso martini
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: BadTouch
+        - ReagentId: EspressoMartini
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/badTouch.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/espressoMartini.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
-  id: DrinkDarkAndStormyGlass
-  name: dark and stormy glass
-  description: "Straight from Bermuda! The pirate on the left says that this is why the drink disappears."
+  id: DrinkKvassGlass
+  name: kvass glass
+  description: A cool refreshing drink with a taste of socialism.
+  components:
+    - type: SolutionContainerManager
+      solutions:
+        drink:
+          maxVol: 30
+          reagents:
+            - ReagentId: Kvass
+              Quantity: 30
+    - type: Sprite
+      sprite: Corvax/Objects/Consumable/Drinks/kvass.rsi
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMaiTaiGlass
+  suffix: mai tai
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: DarkAndStormy
+        - ReagentId: MaiTai
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/darkAndStormy.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/maiTai.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkBrambleGlass
-  name: bramble glass
-  description: "Berries, gin, and a rather creepy look."
+  parent: DrinkGlass
+  id: DrinkMoscowMuleGlass
+  suffix: moscow mule
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Bramble
+        - ReagentId: MoscowMule
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/bramble.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/moscowMule.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkMaiTaiGlass
-  name: mai tai glass
-  description: "The first person who tried this cocktail exclaimed: ”Mai tai — roa ae!”. What does it mean in Thai... I don't know. Sounds cool!"
+  parent: DrinkGlass
+  id: DrinkNegroniGlass
+  suffix: negroni
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: MaiTai
+        - ReagentId: Negroni
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/maiTai.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/negroni.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkMoscowMuleGlass
-  name: moscow mule glass
-  description: "Cocktail from the USA. Why Moscow? Because vodka. Moscow vodka? No. So why Moscow? VODKA!"
+  parent: DrinkGlass
+  id: DrinkOldFashionedGlass
+  suffix: old fashioned
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: MoscowMule
+        - ReagentId: OldFashioned
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/moscowMule.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/oldFashioned.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPalomaGlass
-  name: paloma glass
-  description: "Cowboys on top. Maracas on bottom. Hard choice..."
+  suffix: paloma
   components:
   - type: SolutionContainerManager
     solutions:
@@ -215,22 +214,23 @@
         - ReagentId: Paloma
           Quantity: 30
   - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Corvax/Objects/Consumable/Drinks/paloma.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
-  id: DrinkBoyarskyGlass
-  name: boyarsky glass
-  description: "What to do if you are tired of life? MIX VODKA!"
+  parent: DrinkGlass
+  id: DrinkYorshGlass
+  suffix: yorsh
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         maxVol: 30
         reagents:
-        - ReagentId: Boyarsky
+        - ReagentId: Yorsh
           Quantity: 30
   - type: Drink
-  - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/boyarsky.rsi
+  - type: Icon
+    sprite: Corvax/Objects/Consumable/Drinks/yorsh.rsi
+    state: icon
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBottleGlassBaseFull
+  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
   id: DrinkCampariBottleFull
   name: campari bottle
   description: Tincture based on aromatic herbs and citrus fruits. Non-GMO!
@@ -11,4 +11,8 @@
         - ReagentId: Campari
           Quantity: 100
   - type: Sprite
-    sprite: Corvax/Objects/Consumable/Drinks/campari.rsi
+    sprite: Corvax/Objects/Consumable/Drinks/campari.rsi
+  - type: SolutionContainerVisuals
+    maxFillLevels: 10
+    fillBaseName: fill-
+  - type: Sealable