sidrbleat

EndrAnimet · May 25, 2024 · 85f0754 · 85f0754
1 parent b36e345
commit 85f0754
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 10 deletions.
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -1,6 +1,7 @@
 - type: reagentDispenserInventory
   id: SodaDispenserInventory
   inventory:
+  - JuiceAppleJug
   - DrinkCoconutWaterJug
   - DrinkCoffeeJug
   - DrinkColaBottleFull

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -11,6 +11,7 @@
     DrinkIceBucket: 2
     BarSpoon: 3
     CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
+    DrinkInglandSidr: 8
     DrinkAbsintheBottleFull: 2
     DrinkAleBottleFull: 5
     DrinkBeerBottleFull: 5

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
@@ -8,6 +8,7 @@
     DrinkFlaskBar: 1
     DrinkShaker: 4
     CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
+    DrinkInglandSidr: 8
     DrinkAleBottleFull: 8
     DrinkBeerBottleFull: 8
     DrinkBeerCan: 8

diff --git a/Resources/Prototypes/Stray/Entities/Objects/Consumable/Drinks/Drinks.yml b/Resources/Prototypes/Stray/Entities/Objects/Consumable/Drinks/Drinks.yml
@@ -1,3 +1,37 @@
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkInglandSidr
+  name: Английский Сидр
+  description: О да тебя придеться по кусочкам собирать. В АДУ!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+        reagents:
+        - ReagentId: InglandSidr
+          Quantity: 100
+  - type: Drink
+  - type: Sprite
+    sprite: Stray/Objects/Consumable/Drinks/Sidr.rsi
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: JuiceAppleJug
+  name: Кувшин яблочного сока
+  description: Это Кувшин яблочного сока
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 300
+        reagents:
+        - ReagentId: JuiceApple
+          Quantity: 300
+  - type: Drink
+  - type: Label
+    currentLabel: Яблочный сок
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkAnnasGift
@@ -31,7 +65,7 @@
   - type: Drink
   - type: Sprite
     sprite: Stray/Objects/Consumable/Drinks/myusuo.rsi
-  
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkGayach
@@ -88,7 +122,7 @@
   id: DrinkDilEater
   name: Пожиратель диловена
   description: Он жаждет диловен! Он УБИВАЕТ!
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -105,7 +139,7 @@
   id: DrinkSbiv
   name: Сбиватель с ног
   description: Один глоток, и ты прилёг!
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -122,7 +156,7 @@
   id: DrinkDeadGob
   name: Мёртвый гоблин
   description: Он был великим воином.
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -139,7 +173,7 @@
   id: DrinkOpres
   name: Опреснитель
   description: Лекарство в правильных руках.
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -156,7 +190,7 @@
   id: DrinkBomba
   name: Бомба
   description:  У нас есть 10 секунд, ПЕЙ!
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -183,4 +217,4 @@
           Quantity: 30
   - type: Drink
   - type: Sprite
-    sprite: Stray/Objects/Consumable/Drinks/BosTea.rsi
+    sprite: Stray/Objects/Consumable/Drinks/BosTea.rsi
diff --git a/Resources/Prototypes/Stray/Reagents/Materials/Consumable/Drink/NewAlcohol.yml b/Resources/Prototypes/Stray/Reagents/Materials/Consumable/Drink/NewAlcohol.yml
@@ -1,3 +1,23 @@
+- type: reagent
+  id: InglandSidr
+  name: Английский Сидр
+  parent: BaseAlcohol
+  desc: О да тебя придеться по кусочкам собирать. В АДУ!
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: alcohol
+  color: "#BC9377"
+  metamorphicSprite:
+    sprite: Stray/Objects/Consumable/Drinks/Sidr.rsi
+    state: icon
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 0
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.08
+
 - type: reagent
   id: AnnasGift
   name: reagent-name-annasgift
@@ -258,7 +278,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Ethanol
-        amount: 0.4 
+        amount: 0.4
 
 - type: reagent
   id: Empt
@@ -996,4 +1016,4 @@
 #    Drink:
 #      effects:
 #      - !type:SatiateThirst
-#        factor: 5
+#        factor: 5
diff --git a/Resources/Prototypes/Stray/Recipes/Reactions/NewDrinks.yml b/Resources/Prototypes/Stray/Recipes/Reactions/NewDrinks.yml
@@ -1,3 +1,13 @@
+- type: reaction
+  id: InglandSidr
+  reactants:
+    JuiceApple:
+      amount: 2
+    Sugar:
+      amount: 1
+  products:
+    InglandSidr: 3
+
 - type: reaction
   id: AnnasGift
   reactants:
@@ -540,4 +550,4 @@
 #    Beer:
 #      amount: 1
 #  products:
-#    GoodTea: 2
+#    GoodTea: 2
diff --git a/Resources/Textures/Stray/Objects/Consumable/Drinks/Sidr.rsi/icon.png b/Resources/Textures/Stray/Objects/Consumable/Drinks/Sidr.rsi/icon.png
diff --git a/Resources/Textures/Stray/Objects/Consumable/Drinks/Sidr.rsi/meta.json b/Resources/Textures/Stray/Objects/Consumable/Drinks/Sidr.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "DeltaV - Stray    made by ne_takumi", "states": [{"name": "icon"}]}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "DeltaV - Stray made by ne_takumi", "states": [{"name": "icon"}]}