Merge pull request #204 from JustKekc/newyeartheii

Напиточное ДЛС к БАЛЬШОМУ НОВОГОДНЕМУ АПДЕЙТУ™
AdventureTimeSS14 · Dec 10, 2023 · 194c02f · 194c02f
2 parents 7f33637 + 24b7f20
commit 194c02f
Show file tree

Hide file tree

Showing 21 changed files with 538 additions and 19 deletions.
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -738,3 +738,12 @@ Entries:
   - {message: Незначительные багфиксы крашей, type: Fix}
   id: 55627 #костыль отображения в Обновлениях
   time: '2023-12-09T04:20:00.0000000+00:00'
+
+- author: JustKekc
+  changes:
+  - {message: Добавлено 6 новых напитков. Спрайты от @prazat911, type: Add}
+  - {message: Небольшие изменения в рецептах нескольких напитков, type: Tweak}
+  - {message: Обычный и гипоаллергенный шоколад можно измельчить в измельчителе реагентов, type: Tweak}
+  - {message: Электрическая гриль отныне греет и реагенты, type: Tweak}
+  id: 55627 #костыль отображения в Обновлениях
+  time: '2023-12-10T04:20:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl
@@ -31,6 +31,11 @@ flavor-complex-ADTBuckwheat = как гречневая каша
 
 flavor-base-adtpoppy = маково
 flavor-base-adtvanilla = ванильно
+flavor-base-holiday = празднично
+
+flavor-complex-milkshake = как приятный милкшейк
+flavor-complex-tea-cimmanon-lemon = как горячий кисло-сладкий чай 
+flavor-complex-sbiten-cimmanon-lemon = как кисло-сладкий, немного крепкий мёд
 
 flavor-complex-goldenale = как эль, золото и исцеление
 flavor-complex-sausagebeer = как хмель, солод и колбаска

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl
@@ -5,4 +5,22 @@ ent-ADTMulledWineColdGlass = стакан глинтвейна
     .desc = Вкусный и пряный новогодний напиток.
 
 ent-ADTChampagneMandarinGlass = стакан шампанского с мандарином
-    .desc = Шампанское, в которое намеренно кинули мандаринку. 
+    .desc = Шампанское, в которое намеренно кинули мандаринку. 
+
+ent-ADTChristmasMilkshakeGlass = стакан новогоднего милкшейка
+    .desc = Молочный коктейль для приятного времяпрепровождения с близкими.
+
+ent-ADTTeaCinnamonLemonGlass = стакан чая с корицей и лимоном
+    .desc = Приятный, праздничный чай.
+
+ent-ADTSbitenCinnamonLemonGlass = стакан сбитня с корицей и лимоном
+    .desc = Приятный, праздничный почти чай.
+
+ent-ADTHotCocoaGlass = стакан горячего какао
+    .desc = Вкуснейший какао с зефиром.
+
+ent-ADTHotChocolateGlass = стакан горячего шоколада
+    .desc = Смотри, не обожги губы.
+
+ent-ADTHotChocolateAllergicGlass = стакан гипоаллергенного горячего шоколада
+    .desc = Вкус хуже, чем у обычного, но не опасен для некоторых рас.
diff --git a/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl b/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl
@@ -12,3 +12,21 @@ reagent-desc-carnation = Это точно обычная гвоздика?
 
 reagent-name-cinnamon = корица
 reagent-desc-cinnamon = Ароматные палочки корицы.
+
+reagent-name-christmas-milkshake = новогодний милкшейк 
+reagent-desc-christmas-milkshake = Молочный коктейль для приятного времяпрепровождения с близкими.
+
+reagent-name-tea-cinnamon-lemon = чай с корицей и лимоном
+reagent-desc-tea-cinnamon-lemon = Приятный, праздничный чай.
+
+reagent-name-sbiten-cinnamon-lemon = сбитень с корицей и лимоном
+reagent-desc-sbiten-cinnamon-lemon = Приятный, праздничный почти чай.
+ 
+reagent-name-hot-cocoa = горячий какао
+reagent-desc-hot-cocoa = Вкуснейший какао с зефиром.
+
+reagent-name-hot-chocolate = горячий шоколад
+reagent-desc-hot-chocolate = Смотри, не обожги губы.
+
+reagent-name-hot-chocolate-allergic = гипоаллергенный горячий шоколад
+reagent-desc-hot-chocolate-allergic = Вкус хуже, чем у обычного, но не опасен для некоторых рас.
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml
@@ -54,3 +54,117 @@
   - type: Sprite
     sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
     state: champagne_mandarin
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTChristmasMilkshakeGlass
+  name: christmas-milkshake-name
+  description: christmas-milkshake-desc
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTChristmasMilkshake
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: christmas_milkshake
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTTeaCinnamonLemonGlass
+  name: tea-cinnamon-lemon-name
+  description: tea-cinnamon-lemon-desc
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTTeaCinnamonLemon
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: warm_tea_cinnamon_lemon
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTSbitenCinnamonLemonGlass
+  name: sbiten-cinnamon-lemon-name
+  description: sbiten-cinnamon-lemon-desc
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTSbitenCinnamonLemon
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: sbiten_cinnamon_lemon
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTHotCocoaGlass
+  name: hot-cocoa-name
+  description: hot-cocoa-desc
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTHotCocoa
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_cocoa
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTHotChocolateGlass
+  name: hot-chocolate-name
+  description: hot-chocolate-desc
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTHotChocolate
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_chocolate
+
+- type: entity
+  parent: DrinkGlassBase
+  id: ADTHotChocolateAllergicGlass
+  name: hot-chocolate-name-allergic
+  description: hot-chocolate-desc-allergic
+  suffix: New Year
+  components:
+  - type: Drink
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ADTHotChocolateAllergic
+          Quantity: 30
+  - type: Sprite
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_chocolate
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml
@@ -22,3 +22,5 @@
           Quantity: 8
         - ReagentId: CocoaPowder
           Quantity: 1
+  - type: Extractable
+    grindableSolutionName: food
diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml
@@ -194,3 +194,24 @@
   id: ADTSawdust
   flavorType: Complex
   description: flavor-complex-ADTSawdust
+
+#New Year
+- type: flavor
+  id: ADTHoliday
+  flavorType: Base
+  description: flavor-base-holiday
+
+- type: flavor
+  id: ADTMilkshake
+  flavorType: Complex
+  description: flavor-complex-milkshake
+
+- type: flavor
+  id: ADTTeaCinnamonLemon
+  flavorType: Complex
+  description: flavor-complex-tea-cimmanon-lemon
+
+- type: flavor
+  id: ADTSbitenCinnamonLemon
+  flavorType: Complex
+  description: flavor-complex-sbiten-cimmanon-lemon
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml
@@ -26,12 +26,92 @@
   parent: BaseDrink
   desc: reagent-desc-mulled-wine
   physicalDesc: reagent-physical-desc-cloudy
-  flavor: alcohol
+  flavor: ADTHoliday
   color: "#743636"
   metamorphicSprite:
     sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
     state: mulled_wine
 
+- type: reagent
+  id: ADTChristmasMilkshake
+  name: reagent-name-christmas-milkshake
+  parent: BaseSoda
+  desc: reagent-desc-christmas-milkshake
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: ADTMilkshake
+  color: "#c7c5c1"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: christmas_milkshake
+
+- type: reagent
+  id: ADTTeaCinnamonLemon
+  name: reagent-name-tea-cinnamon-lemon
+  parent: BaseDrink
+  desc: reagent-desc-tea-cinnamon-lemon
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: ADTTeaCinnamonLemon
+  color: "#5b3b15"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: warm_tea_cinnamon_lemon
+
+- type: reagent
+  id: ADTSbitenCinnamonLemon
+  name: reagent-name-sbiten-cinnamon-lemon
+  parent: BaseAlcohol
+  desc: reagent-desc-sbiten-cinnamon-lemon
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: ADTSbitenCinnamonLemon
+  color: "#5a3a28"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: sbiten_cinnamon_lemon
+
+- type: reagent
+  id: ADTHotCocoa
+  name: reagent-name-hot-cocoa
+  parent: BaseDrink
+  desc: reagent-desc-hot-cocoa
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: ADTCocoaDrinkFlavor
+  color: "#b29b7b"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_cocoa
+
+- type: reagent
+  id: ADTHotChocolate
+  name: reagent-name-hot-chocolate
+  parent: BaseDrink
+  desc: reagent-desc-hot-chocolate
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: ADTChocolateDrinkFlavor 
+  color: "#9c9289"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_chocolate
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Theobromine
+        amount: 0.05
+
+- type: reagent
+  id: ADTHotChocolateAllergic
+  name: reagent-name-hot-chocolate-allergic
+  parent: BaseDrink
+  desc: reagent-desc-hot-chocolate-allergic
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: ADTChocolateDrinkFlavor 
+  color: "#9c9289"
+  metamorphicSprite:
+    sprite: ADT/Objects/Consumable/Drinks/new_year.rsi
+    state: hot_chocolate
+
 - type: reagent
   id: ADTCarnation #гвоздика, чисто нужна для напитков.
   name: reagent-name-carnation

diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/drinks.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/drinks.yml
@@ -0,0 +1,16 @@
+- type: constructionGraph
+  id: DrinkBurst
+  start: start
+  graph:
+
+  - node: start
+    edges:
+    - to: burst
+      completed:
+      - !type:DamageEntity
+        damage:
+          Blunt: 6 #стеклу не важно, какой урон, главное чтобы был 5.
+      steps:
+      - minTemperature: 353
+
+  - node: burst
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml b/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml
@@ -16,11 +16,13 @@
   id: ADTWinterSun
   reactants:
     CafeLatte: #Проблема с Coffe почемуто не может быть компонентом, заменено на CofeLatte
-      amount: 2
+      amount: 3
     Cream:
+      amount: 2
+    ADTСinnamon:
       amount: 1
   products:
-    ADTWinterSun: 3
+    ADTWinterSun: 6
 
 - type: reaction
   id: ADTHungoverAngel
@@ -62,9 +64,11 @@
     IceCream:
       amount: 2
     Tea:
-      amount: 3
+      amount: 2
     Milk:
       amount: 1
+    ADTСinnamon:
+      amount: 1
   products:
     ADTMilkEclipse: 6