From 20441746bef4c07bcb2635f0c5f31d9d8dc07c83 Mon Sep 17 00:00:00 2001 From: Filokini Date: Mon, 9 Sep 2024 17:14:13 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BA=D1=82=D0=B5=D0=B9=D0=BB=D1=8C=20=D0=B8=D0=B7=20=D0=BA?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Flavors/flavor-profiles.ftl | 1 + .../Objects/Consumable/Drinks/drinks.ftl | 5 ++++ .../ADT/reagents/meta/consumable/alcohol.ftl | 3 +++ .../Objects/Consumable/Drinks/drinks.yml | 16 +++++++++++++ Resources/Prototypes/ADT/Flavors/flavors.yml | 6 +++++ .../ADT/Reagents/Consumable/Drink/alcohol.yml | 23 +++++++++++++++++++ .../ADT/Recipes/Reactions/drinks.yml | 18 +++++++++++++++ 7 files changed, 72 insertions(+) diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index 55aeec7d216..02c8515fdff 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -23,3 +23,4 @@ flavor-complex-businessconversation = как горечь, алкоголь и flavor-complex-applemartini = как алкоголь и зелёное яблоко flavor-complex-bacardiapple = как ром с привкусом яблока flavor-complex-elderguards = как закон и очень странная смесь алкоголя с нотками уксуса +flavor-complex-limeshade = как теплая тень с лаймовым привкусом \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl index 78c10c202bc..aefad7612c4 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl @@ -81,3 +81,8 @@ ent-ADTDrinkBacardiAppleGlass = { ent-DrinkGlass } ent-ADTDrinkElderGuardsGlass = { ent-DrinkGlass } .suffix = Старая гвардия .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkLimeShadeGlass = { ent-DrinkGlass } + .suffix = Лаймовый Шэйд + .desc = { ent-DrinkGlass.desc } + diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl index 9604e7e3a77..a096152c01d 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl @@ -39,3 +39,6 @@ bacardi-apple-desc = "Вам нравятся лонги и физзы?" elder-guards-name = старая гвардия elder-guards-desc = Рецепт данного напитка когда-то давно был выдуман находу одним детективом с протезом руки. + +lime-shade-name = лаймовый Шэйд +lime-shade-desc = Говорят кому удосужилось попробовать его, жаловались на резкие скачки в стороны, скорее всего они просто переборщили со спиртным. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index d271f986d9d..d7db590caee 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -339,3 +339,19 @@ - type: Icon sprite: ADT/Objects/Consumable/Drinks/elderguards.rsi state: icon + +- type: entity + parent: DrinkGlass + id: ADTDrinkLimeShadeGlass + suffix: LimeShade + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLimeShade + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi + state: icon diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index 030e8b467fb..74ba72cfd9d 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -112,3 +112,9 @@ id: adt_elderguards flavorType: Complex description: flavor-complex-elderguards + +- type: flavor + id: adt_limeshade + flavorType: Complex + description: flavor-complex-limeshade + diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml index 79629924044..73c92e1abdd 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml @@ -371,3 +371,26 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.2 + +- type: reagent + id: ADTLimeShade + name: lime-shade-name + parent: BaseAlcohol + desc: lime-shade-desc + physicalDesc: reagent-physical-desc-exotic-smelling + flavor: adt_limeshade + color: "#5c1e52" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml index c44a1fee846..3067b6ad6c6 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml @@ -293,3 +293,21 @@ amount: 1 products: ADTElderGuards: 10 #polar bear heater. типо напиток из фильма, который по факту был придуман как шутка. + +- type: reaction + id: ADTLimeShade + requiredMixerCategories: + - Shake + reactants: + JuiceLime: + amount: 1 + ShadekinBlood: + amount: 1 + Wine: + amount: 2 + CoffeeLiqueur: + amount: 1 + products: + ADTLimeShade: 5 + +