From 4fdc6b05d2cdaf495d5bd363fe9ea3ceca79538e Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sat, 9 Dec 2023 21:24:37 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=BD=D0=B5=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=BE=D0=B5=20=D0=B2=D1=81=D1=91.=20=D0=98?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=BB=D0=BE=D0=BF=D0=B0=D0=BD=D1=8C?= =?UTF-8?q?=D0=B5=20=D1=81=D1=82=D0=B0=D0=BA=D0=B0=D0=BD=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Flavors/flavor-profiles.ftl | 5 + .../Locale/ru-RU/ADT/Reagents/new_year.ftl | 15 +++ .../Objects/Consumable/Drinks/new_year.yml | 5 +- Resources/Prototypes/ADT/Flavors/flavors.yml | 21 ++++ .../Reagents/Consumable/Drink/new_year.yml | 62 ++++++++++- .../ADT/Recipes/Construction/Graph/drinks.yml | 16 +++ .../ADT/Recipes/Reactions/new_year.yml | 96 +++++++++++++++++- .../Objects/Consumable/Drinks/drinks.yml | 14 +++ .../Objects/Consumable/Food/snacks.yml | 2 + .../Entities/Structures/Machines/grill.yml | 1 + .../new_year.rsi/christmas_milkshake.png | Bin 0 -> 524 bytes .../Drinks/new_year.rsi/hot_chocolate.png | Bin 0 -> 356 bytes .../Drinks/new_year.rsi/hot_cocoa.png | Bin 0 -> 530 bytes .../Consumable/Drinks/new_year.rsi/meta.json | 25 ++++- .../new_year.rsi/sbiten_cinnamon_lemon.png | Bin 0 -> 711 bytes .../new_year.rsi/warm_tea_cinnamon_lemon.png | Bin 0 -> 524 bytes 16 files changed, 251 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/drinks.yml create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/hot_chocolate.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/hot_cocoa.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/sbiten_cinnamon_lemon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/warm_tea_cinnamon_lemon.png diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index b04db076465..5c49415512b 100644 --- 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/Reagents/new_year.ftl b/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl index ce828cd43ba..7af01bc672f 100644 --- a/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl +++ b/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl @@ -12,3 +12,18 @@ 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 = Смотри, не обожги губы. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml index 596e30a86e6..f865ac62d94 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml @@ -1,5 +1,5 @@ - type: entity - parent: DrinkGlassBase + parent: DrinkGlass id: ADTMulledWineGlass name: mulled-wine-name description: mulled-wine-desc @@ -13,9 +13,6 @@ reagents: - ReagentId: ADTMulledWine Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: mulled_wine - type: entity parent: DrinkGlassBase diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index e3a68ab32aa..d47bebb5424 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -189,3 +189,24 @@ id: adt_pumpkin flavorType: Base description: flavor-base-pumpkin + +#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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml index ce8ff0a9f8a..86ceda0c85c 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml @@ -26,12 +26,72 @@ 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: BaseDrink + 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 + - 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 new file mode 100644 index 00000000000..bbbdf1c8ed0 --- /dev/null +++ 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/new_year.yml b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml index 156e21f2192..31040ea17a0 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml @@ -27,9 +27,74 @@ minTemp: 353 reactants: ADTMulledWineCold: + amount: 0.5 + products: + ADTMulledWine: 0.5 + +- type: reaction + id: ADTChristmasMilkshake + reactants: + Milk: + amount: 3 + IceCream: + amount: 1 + CocoaPowder: + amount: 2 + products: + ADTChristmasMilkshake: 6 + +- type: reaction + id: ADTTeaCinnamonLemon + reactants: + Tea: + amount: 3 + JuiceLemon: + amount: 2 + ADTСinnamon: + amount: 1 + products: + ADTTeaCinnamonLemon: 6 + +- type: reaction + id: ADTSbitenCinnamonLemon + minTemp: 373 #температура кипячения. ~99°C + reactants: + Water: + amount: 2 + Mead: + amount: 1 #заменить на мёд. КОГДА ОН ПОЯВИТСЯ + JuiceLemon: + amount: 1 + ADTСinnamon: + amount: 1 + ADTCarnation: + amount: 1 + products: + ADTSbitenCinnamonLemon: 6 + +- type: reaction + id: ADTHotCocoa + minTemp: 373 + reactants: + ADTCocoaDrink: + amount: 2 + Cream: amount: 1 products: - ADTMulledWine: 1 + ADTHotCocoa: 3 + +- type: reaction + id: ADTHotChocolate + minTemp: 373 + reactants: + Nutriment: + amount: 10 + Theobromine: + amount: 3 + CocoaPowder: + amount: 1 #просто перемолотая плитка шоколада. + products: + ADTHotChocolate: 15 #технически не совсем приготовление напитка, но всё же - type: microwaveMealRecipe @@ -41,3 +106,32 @@ ADTMulledWineCold: 30 solids: DrinkGlass: 1 + +- type: microwaveMealRecipe + id: RecipeMulledWineWarm2 + name: warm mulled wine recipe + result: ADTMulledWineGlass + time: 10 + reagents: + ADTMulledWineCold: 30 + solids: + ADTMulledWineGlass: 1 #Костыли, но по-другому я никак не могу придумать. + +- type: microwaveMealRecipe + id: RecipeADTHotChocolate2 + name: hot chocolate recipe + result: ADTHotChocolateGlass + time: 10 + solids: + DrinkGlass: 1 + FoodSnackChocolateBar: 1 + +- type: microwaveMealRecipe + id: RecipeADTHotCocoa2 + name: hot cocoa recipe + result: ADTMulledWineGlass + time: 10 + reagents: + ADTCocoaDrink: 30 + solids: + DrinkGlass: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 7c819569ac7..c1842388d36 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -76,6 +76,17 @@ Glass: 25 - type: ExaminableSolution solution: drink + # нужно для того, чтобы стекло лопалось. + - type: AtmosExposed + - type: Construction + graph: DrinkBurst + node: start + - type: Temperature + currentTemperature: 290 + - type: InternalTemperature + thickness: 0.02 + area: 0.02 + conductivity: 0.43 # Transformable container - normal glass - type: entity @@ -107,6 +118,9 @@ sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon - type: TransformableContainer + - type: Construction + graph: DrinkBurst + node: start - type: entity name: Coupe glass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 2a4debd5258..806b828ed56 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -136,6 +136,8 @@ Quantity: 3 - ReagentId: CocoaPowder Quantity: 1 + - type: Extractable + grindableSolutionName: food - type: entity name: energy bar diff --git a/Resources/Prototypes/Entities/Structures/Machines/grill.yml b/Resources/Prototypes/Entities/Structures/Machines/grill.yml index 29dd5ed49f4..e2c1045272a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/grill.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/grill.yml @@ -23,6 +23,7 @@ whitelist: components: - Temperature + - FitsInDispenser - type: PlaceableSurface - type: Machine board: ElectricGrillMachineCircuitboard diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d3914ba6d7dd1ed83b66f8ca017e3844171681 GIT binary patch literal 524 zcmV+n0`vWeP)Px$#z{m$R9Hu2WEfz;IKcKZj5=U61jr77<3|tvzk2orLrPvb+>Cec-u>V1XwBfc z|0siykPuO36Qu|}r_7nu`5$C4x+9kAYyOYEc%2bO6O+TpasbF+nC05W77Uiw_KYCk z6YFbahmqv~kmV|BS`2q?U1NaJ_p&k=K)xr&*AzJb6#O7xgDeICkR#MJbs276zYGou znmb_T#v}ikA0A}@IRXSg36XQ|0tU`$YZ-#9wP^2vbw{uL|M=-E*m6-3A-IQSco-NA zG?i)ZfaQD7{#W4m0*`xG8sHR?8CVA}aSAh-8|lzK1SYNA{ohoE4I=~|{NQ1TbT+2F z13Kny{4et51~?Id5+ID`)^?$f13;;6|KXGW@18#Zw_Ml8o2=jmnMHDtfi%tCbol@N zIjsy1E{+Tb_UvbHOsQr__Om6+EV49#qT$Mh>F_M56OhSJk>pR7S!8Jf*$i_8C6<#N z1u(B)y7lOqo|+t_OePbM9ReWxCagVrtsvNXU>vaW=&ftdU%X~;(v@YPBoxRB0g%r@ zAs{Is3J!QpQ4X>lL6!qRmV!b6WHAWPJp{;1Z&Px$9!W$&R9Hu2WEfz;IKcKZj5=U61V%$(Gz5lj2*mh#{C9A1WJt*?r^pi&X{LrF z$acV-NuB?-jV-`ciG_6$10%y(vdkh&6UcHe!95JD9?Rf$*_~V07%Z*rNj8sU4X|Jb z`Cdg$iy?MlC_}wvBg56RC&)?1 zYyOvFN7eT1=YMcicnY#G$a4Q-h`va?Lr8W2CUxsWdJz>76ME4 zHUAUq2%0#cLq+$0#huGUnN5@;Px$%t=H+R9Hu2WEfz;IKcKZj5=U61V%$(Gz3ONfaDP9Uwz~*sQ4BW69$*!%0le$ z(%eE~qy{&(Kp{B_U|H<> z^Ve|m9Q0&~j&pQJkmUfF?_q|KlIW=70FWUA8U;iqaH5ov6$M0@Or)Yw2aJXQ03DH{ UA*`wGPx%XGugsR9Hu2WEfz;IKcKZj5=WGgg~&m!2h*3KTzGlL>UOOoR^PCs1qu!ZN|NK1+{=ty#brEm9|h=44XHmCygpI&GKJA#;y zAld;SgJDtOzVh`-ys!{B`&pSm;%+kaLty2Jd#^dZz7XsUcV-q9W(PaM%|Qq5i1OL9c(;M0M%o5_F4BC?1f03i2IX9BIq-PPsrb;L3 z<^qrN#=ynJ%=`cUe+DLIgaf{Q`NQz`{V&=&02TsYKK zZ0St0*0XjK)yzf z2J}!MC;mZZ5S1XDa(z#h17K0HvNq`( z$YKzfxNJ3xhM_T}Y9tYm6a~m;|NsC02#n9j$Y?{Ny>R7ZIbhY{8%Gr6rQwE{%JMLf z>j;t^fNc4Lhff(`4k6bOBs&1)ZIB~CG{|z0#o)w5W;BrH0CM9So4!#8jD`RJ_7X2J tT4F$x0000EWmrjOO-%qQ00008000000002eQPx$#z{m$R9Hu2WEfz;IKcKZj5=U61V%$(Gz3Tv0Z#+<|JyIzBv~J>0*@qvK$Z&# za5F4FaE>H>_)1%n3^I_D_%A8M&oE#i0P+d7LxH3a0672_3hk@*JV6gy12tJ$QY$x- z9589!vB#RKhOwpIiu*xPQMCAiBeI2}>~9u>9I^7q&6^tHTnzfEvg(8!M3Mtm9liDV z#mhGgoD4r?n3$Ltctxe2sEKmI?YQ;&JHzuAufF96+kh>;c>D29LXIHW0fKz8@DLE< ze)swJmw#Xfq%L{l2MU3kufBZ?w^0W>02C51HdV4==j_#gFD=OW$}7SLH}CVCPhd94 zA+B{Rxl@B(m_huBYmeN7g#^{IA;_S8hmQW8TN&^bW+*HKK$d@JdD-RPq?!o0l)^zTw^e}MzlLAN%0g&M!M~I6F zGbjpkF#P-XpW*)79}KX>M~dZSg#f7*5K>Q82oN%q6!}pHjE2By2mk;%9jGDv%Gam> O0000 Date: Sun, 10 Dec 2023 11:47:32 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BD=D0=B0=D0=BF=D0=B8=D1=82=D0=BA=D0=B8.?= =?UTF-8?q?=20"=D0=91=D0=90=D0=9B=D0=AC=D0=A8=D0=9E=D0=99=20=D0=A1=D0=95?= =?UTF-8?q?=D0=A0=D0=92=D0=98=D0=A1=D0=9D=D0=AB=D0=99=20=D0=90=D0=9F=D0=94?= =?UTF-8?q?=D0=95=D0=99=D0=A2=20II"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 9 ++ .../Objects/Consumable/Drinks/new_year.ftl | 20 ++- .../Locale/ru-RU/ADT/Reagents/new_year.ftl | 5 +- .../Objects/Consumable/Drinks/new_year.yml | 118 +++++++++++++++++- .../Food/hypoallergen_chocolate.yml | 2 + .../Reagents/Consumable/Drink/new_year.yml | 22 +++- .../Reactions/just_kekc_coctails_recipe.yml | 10 +- .../ADT/Recipes/Reactions/new_year.yml | 54 +++++++- .../Objects/Consumable/Drinks/drinks.yml | 3 - Resources/ServerInfo/ADT/NewCocktails.xml | 77 ++++++++++-- 10 files changed, 298 insertions(+), 22 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index f31d25c529e..49941500303 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -722,3 +722,12 @@ Entries: - {message: Добавлен суп с опилками для ивента, type: Add} id: 55626 #костыль отображения в Обновлениях time: '2023-12-09T07: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/Objects/Consumable/Drinks/new_year.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl index df241a8a857..83ce4deb3a5 100644 --- 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 = Шампанское, в которое намеренно кинули мандаринку. \ No newline at end of file + .desc = Шампанское, в которое намеренно кинули мандаринку. + +ent-ADTChristmasMilkshakeGlass = стакан новогоднего милкшейка + .desc = Молочный коктейль для приятного времяпрепровождения с близкими. + +ent-ADTTeaCinnamonLemonGlass = стакан чая с корицей и лимоном + .desc = Приятный, праздничный чай. + +ent-ADTSbitenCinnamonLemonGlass = стакан сбитня с корицей и лимоном + .desc = Приятный, праздничный почти чай. + +ent-ADTHotCocoaGlass = стакан горячего какао + .desc = Вкуснейший какао с зефиром. + +ent-ADTHotChocolateGlass = стакан горячего шоколада + .desc = Смотри, не обожги губы. + +ent-ADTHotChocolateGlass = стакан гипоаллергенного горячего шоколада + .desc = Вкус хуже, чем у обычного, но не опасен для некоторых рас. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl b/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl index 7af01bc672f..b663ceb60fa 100644 --- a/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl +++ b/Resources/Locale/ru-RU/ADT/Reagents/new_year.ftl @@ -26,4 +26,7 @@ reagent-name-hot-cocoa = горячий какао reagent-desc-hot-cocoa = Вкуснейший какао с зефиром. reagent-name-hot-chocolate = горячий шоколад -reagent-desc-hot-chocolate = Смотри, не обожги губы. \ No newline at end of file +reagent-desc-hot-chocolate = Смотри, не обожги губы. + +reagent-name-hot-chocolate-allergic = гипоаллергенный горячий шоколад +reagent-desc-hot-chocolate-allergic = Вкус хуже, чем у обычного, но не опасен для некоторых рас. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml index f865ac62d94..749c5564a19 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml @@ -15,7 +15,7 @@ Quantity: 30 - type: entity - parent: DrinkGlassBase + parent: DrinkGlass id: ADTMulledWineColdGlass name: mulled-wine-cold-name description: mulled-wine-cold-desc @@ -34,7 +34,7 @@ state: mulled_wine_cold - type: entity - parent: DrinkGlassBase + parent: DrinkGlass id: ADTChampagneMandarinGlass name: champagne-mandarin-name description: champagne-mandarin-desc @@ -51,3 +51,117 @@ - type: Sprite sprite: ADT/Objects/Consumable/Drinks/new_year.rsi state: champagne_mandarin + +- type: entity + parent: DrinkGlass + 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: DrinkGlass + 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: DrinkGlass + 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: DrinkGlass + 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: DrinkGlass + 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: DrinkGlass + 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 index cfd2a70302e..01c6308189e 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml index 86ceda0c85c..b5c4650b856 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml @@ -59,7 +59,7 @@ - type: reagent id: ADTSbitenCinnamonLemon name: reagent-name-sbiten-cinnamon-lemon - parent: BaseDrink + parent: BaseAlcohol desc: reagent-desc-sbiten-cinnamon-lemon physicalDesc: reagent-physical-desc-aromatic flavor: ADTSbitenCinnamonLemon @@ -91,6 +91,26 @@ 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 #гвоздика, чисто нужна для напитков. diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml b/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml index af7a6790461..fc6541dc854 100644 --- 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 diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml index 31040ea17a0..cadf53003c2 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml @@ -96,6 +96,17 @@ products: ADTHotChocolate: 15 +- type: reaction + id: ADTHotChocolateAllergic + minTemp: 373 + reactants: + Nutriment: + amount: 8 + CocoaPowder: + amount: 1 #просто перемолотая плитка гипо-шоколада. + products: + ADTHotChocolateAllergic: 10 + #технически не совсем приготовление напитка, но всё же - type: microwaveMealRecipe id: RecipeMulledWineWarm @@ -117,21 +128,58 @@ solids: ADTMulledWineGlass: 1 #Костыли, но по-другому я никак не могу придумать. +- type: microwaveMealRecipe + id: RecipeADTHotChocolate + name: hot chocolate recipe + result: ADTHotChocolateGlass + time: 10 + solids: + DrinkGlass: 1 + FoodSnackChocolateBar: 2 + - type: microwaveMealRecipe id: RecipeADTHotChocolate2 name: hot chocolate recipe result: ADTHotChocolateGlass time: 10 + solids: + ADTHotChocolateGlass: 1 + FoodSnackChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotChocolate + name: hot hypoallergen chocolate recipe + result: ADTHotChocolateAllergicGlass + time: 10 solids: DrinkGlass: 1 - FoodSnackChocolateBar: 1 + ADTHypoAllergenChocolateBar: 2 - type: microwaveMealRecipe - id: RecipeADTHotCocoa2 + id: RecipeADTHotChocolate2 + name: hot hypoallergen chocolate recipe + result: ADTHotChocolateAllergicGlass + time: 10 + solids: + ADTHotChocolateAllergicGlass: 1 + ADTHypoAllergenChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotCocoa name: hot cocoa recipe - result: ADTMulledWineGlass + result: ADTHotCocoaGlass time: 10 reagents: ADTCocoaDrink: 30 solids: DrinkGlass: 1 + +- type: microwaveMealRecipe + id: RecipeADTHotCocoa2 + name: hot cocoa recipe + result: ADTHotCocoaGlass + time: 10 + reagents: + ADTCocoaDrink: 30 + solids: + ADTHotCocoaGlass: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index c1842388d36..f078e4f3a5d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -118,9 +118,6 @@ sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon - type: TransformableContainer - - type: Construction - graph: DrinkBurst - node: start - type: entity name: Coupe glass diff --git a/Resources/ServerInfo/ADT/NewCocktails.xml b/Resources/ServerInfo/ADT/NewCocktails.xml index b76e38052ec..11afe7e9bfd 100644 --- a/Resources/ServerInfo/ADT/NewCocktails.xml +++ b/Resources/ServerInfo/ADT/NewCocktails.xml @@ -4,6 +4,67 @@ В этом блокноте собраны рецепты более полутора десятков уникальных коктейлей от одного хорошего бармена-слаймолюда. ## Новогодние напитки + + + + + +[bold]Новогодний милкшейк:[/bold] новогоднего в нём мало, но вкуса, как говорят клиенты, достаточно. + +Рецепт: +- Молоко, 3 части +- Мороженое, 1 часть +- Какао порошок, 2 части + +[bold]Горячее какао:[/bold] название не лжёт, надо пить осторожно. + +Рецепт: +- Какао, 2 части +- Сливки, 1 часть +- Разогреть на плите в кухне или у химиков до кипячения. + +Альтернативный рецепт: +- Какао, 30 единиц +- В микроволновку на 10 секунд + +[bold]Горячий шоколад:[/bold] такой напиток очень любят на Земле. Если клиент унатх, таяр или вульпканин - подавать гипоаллергенный вариант. + +Рецепт: +- Перемолоть 2 плитки шоколада +- Подогреть на плите кухни или химиков до кипячения + +Альтернативный рецепт: +- Положить 2 плитки шоколада и стакан в микроволновку +- Греть секунд 10 + +[bullet]Второй рецепт:[/bullet] +- Перемолоть 2 плитки гипоаллергенного шоколада +- Подогреть на плите кухни или химиков до кипячения + +[bullet]Второй альтернативный рецепт:[/bullet] +- Положить 2 плитки гипоаллергенного шоколада и стакан в микроволновку +- Подогреть на 10 секунд + + + + + +[bold]Чай с корицей и лимоном:[/bold] простой, но праздничный чай. + +Рецепт: +- Чай чёрный, 3 части +- Сок лимона, 2 части +- Корица, 1 палочка + +[bold]Сбитень с корицей и лимоном:[/bold] чуть более крепкий, но такой же праздничный напиток. + +Рецепт: +- Вода, 2 части +- Медовуха, 1 часть +- Сок лимона, 1 часть +- Корица, 1 палочка +- Гвоздика, 1 гвоздь + @@ -12,11 +73,10 @@ [bold]Глинтвейн:[/bold] традиционный напиток на многих точках Земли, разве что его разогревают для приготовления. Рецепт: -- Корица, 1 часть -- Гвоздика, 2 части +- Корица, 1 палочка +- Гвоздика, 2 гвозди - Сок лимона, 1 часть - Вино, 2 части - [bullet]Корицу и гвоздику можно найти, покопавшись в АлкоМате[/bullet] [bold]Глинтвейн разогретый:[/bold] тот же традиционный глинтвейн, но доведённый до кипячения. @@ -50,10 +110,10 @@ [bold]Зимнее солнце:[/bold] помогает согреться на холодной станции. -Рецепт (молоко добавлять обязательно в самом конце!): - - Кофе, 2 части - - Сливки, 1 часть - - Молоко, 3 части +Рецепт: + - Латте, 3 части + - Сливки, 2 части + - Корица, 1 палочка [bold]Похмельный ангел:[/bold] всучивать своим самым страдающим от прошлой смены у тебя же клиентам. @@ -85,8 +145,9 @@ Рецепт: - Мороженое, 2 части - - Чай, 3 части + - Чай, 2 части - Молоко, 1 часть + - Корица, 1 палочка [bold]Арктический взрыв:[/bold] взорвёт горло холодом, если пить залпом. From 54495ae9ad5e85145098271261c5f6c39ab76ac2 Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 10 Dec 2023 12:29:16 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=B1=D1=8B=D1=81=D1=82=D1=80=D1=8B=D0=B9?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8B=D1=85=20=D0=BF=D1=80=D0=B8=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl | 2 +- Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index 83ce4deb3a5..fd44f3a886e 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/new_year.ftl @@ -22,5 +22,5 @@ ent-ADTHotCocoaGlass = стакан горячего какао ent-ADTHotChocolateGlass = стакан горячего шоколада .desc = Смотри, не обожги губы. -ent-ADTHotChocolateGlass = стакан гипоаллергенного горячего шоколада +ent-ADTHotChocolateAllergicGlass = стакан гипоаллергенного горячего шоколада .desc = Вкус хуже, чем у обычного, но не опасен для некоторых рас. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml index cadf53003c2..d380f18c5bb 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml @@ -147,7 +147,7 @@ FoodSnackChocolateBar: 2 - type: microwaveMealRecipe - id: RecipeADTHotChocolate + id: RecipeADTHotChocolateAllergic name: hot hypoallergen chocolate recipe result: ADTHotChocolateAllergicGlass time: 10 @@ -156,7 +156,7 @@ ADTHypoAllergenChocolateBar: 2 - type: microwaveMealRecipe - id: RecipeADTHotChocolate2 + id: RecipeADTHotChocolateAllergic2 name: hot hypoallergen chocolate recipe result: ADTHotChocolateAllergicGlass time: 10 From 6111f365f1280a9431fcb756ae2486d8f5a13934 Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 10 Dec 2023 12:44:26 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=8F=D0=BC=D0=BB=20=D0=93=D0=98-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Drinks/new_year.yml | 18 +++++++++--------- .../Consumable/Drinks/new_year.rsi/meta.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml index 749c5564a19..2eb49b5e67c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml @@ -1,5 +1,5 @@ - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTMulledWineGlass name: mulled-wine-name description: mulled-wine-desc @@ -15,7 +15,7 @@ Quantity: 30 - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTMulledWineColdGlass name: mulled-wine-cold-name description: mulled-wine-cold-desc @@ -34,7 +34,7 @@ state: mulled_wine_cold - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTChampagneMandarinGlass name: champagne-mandarin-name description: champagne-mandarin-desc @@ -53,7 +53,7 @@ state: champagne_mandarin - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTChristmasMilkshakeGlass name: christmas-milkshake-name description: christmas-milkshake-desc @@ -72,7 +72,7 @@ state: christmas_milkshake - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTTeaCinnamonLemonGlass name: tea-cinnamon-lemon-name description: tea-cinnamon-lemon-desc @@ -91,7 +91,7 @@ state: warm_tea_cinnamon_lemon - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTSbitenCinnamonLemonGlass name: sbiten-cinnamon-lemon-name description: sbiten-cinnamon-lemon-desc @@ -110,7 +110,7 @@ state: sbiten_cinnamon_lemon - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTHotCocoaGlass name: hot-cocoa-name description: hot-cocoa-desc @@ -129,7 +129,7 @@ state: hot_cocoa - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTHotChocolateGlass name: hot-chocolate-name description: hot-chocolate-desc @@ -148,7 +148,7 @@ state: hot_chocolate - type: entity - parent: DrinkGlass + parent: DrinkGlassBase id: ADTHotChocolateAllergicGlass name: hot-chocolate-name-allergic description: hot-chocolate-desc-allergic diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/meta.json index 2ce077326f5..9698327c4ea 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/new_year.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Я хрен знает.", + "copyright": "Создано Умой и @prazat911 для Времени Приключений МРП сервер", "size": { "x": 32, "y": 32 From 24b7f20fc6580a327de5277735e789e5dc04537c Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 10 Dec 2023 12:55:56 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=B2=20=D1=8D=D1=82=D0=BE=D0=BC,?= =?UTF-8?q?=20=D1=82=D0=BE=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20bruh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Consumable/Drinks/new_year.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml index 2eb49b5e67c..c0305497673 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml @@ -13,6 +13,9 @@ reagents: - ReagentId: ADTMulledWine Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine - type: entity parent: DrinkGlassBase