From fc4c964e61e9061e1ec6a56bc28c9282ab0456bb Mon Sep 17 00:00:00 2001 From: SpaceCat <99134830+Verslebas@users.noreply.github.com> Date: Fri, 28 Jul 2023 20:54:36 +0500 Subject: [PATCH] adds champagne (#18344) Co-authored-by: Pieter-Jan Briers --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 3 +++ .../VendingMachines/Inventories/boozeomat.yml | 1 + .../Consumable/Drinks/drinks_bottles.yml | 15 +++++++++++++ Resources/Prototypes/Flavors/flavors.yml | 5 +++++ .../Reagents/Consumable/Drink/alcohol.yml | 21 ++++++++++++++++++ .../Drinks/champagnebottle.rsi/icon.png | Bin 0 -> 690 bytes .../Drinks/champagnebottle.rsi/meta.json | 1 + .../Drinks/champagneglass.rsi/icon.png | Bin 0 -> 675 bytes .../Drinks/champagneglass.rsi/meta.json | 1 + 10 files changed, 48 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 4739278200..54e763ae6c 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -166,6 +166,7 @@ flavor-complex-rum = like fermented sugar flavor-complex-coffee-liquor = like strong, bitter coffee flavor-complex-whiskey = like molasses flavor-complex-shitty-wine = like grape rinds +flavor-complex-champagne = like freshly baked bread flavor-complex-iced-tea = like iced tea flavor-complex-coffee = like coffee flavor-complex-milk = like milk diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 9275b13010..4719e1c611 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -55,6 +55,9 @@ reagent-desc-whiskey = A type of distilled alcoholic beverage made from fermente reagent-name-wine = wine reagent-desc-wine = An premium alchoholic beverage made from distilled grape juice. +reagent-name-champagne = champagne +reagent-desc-champagne = A premium sparkling wine + reagent-name-acid-spit = acidspit reagent-desc-acid-spit = A drink for the daring, can be deadly if incorrectly prepared! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 452300dae2..ef6011f7d0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -33,3 +33,4 @@ DrinkVodkaBottleFull: 5 DrinkWhiskeyBottleFull: 5 DrinkWineBottleFull: 5 + DrinkСhampagneBottleFull: 2 #because the premium drink diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 4779150801..14acce5e86 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -381,6 +381,21 @@ - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi +- type: entity + parent: DrinkBottleBaseFull + id: DrinkСhampagneBottleFull + name: champagne bottle + description: Only people devoid of imagination can't find an excuse for champagne. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Champagne + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/champagnebottle.rsi + - type: entity parent: DrinkBottleBaseFull id: DrinkWaterBottleFull diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 5690148621..7e61b24334 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -574,6 +574,11 @@ flavorType: Complex description: flavor-complex-shitty-wine +- type: flavor + id: champagne + flavorType: Complex + description: flavor-complex-champagne + - type: flavor id: icedtea flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index d776094948..7ed30a5f6a 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -363,6 +363,27 @@ sprite: Objects/Consumable/Drinks/wineglass.rsi state: icon +- type: reagent + id: Champagne + name: reagent-name-сhampagne + parent: BaseAlcohol + desc: reagent-desc-champagne + physicalDesc: reagent-physical-desc-strong-smelling + flavor: champagne + color: "#FCFCEE" + recognizable: true + metamorphicSprite: + sprite: Objects/Consumable/Drinks/champagneglass.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + # Mixed Alcohol - type: reagent diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa76eee2ce8813b7d5262f55cb2af43534d8b94 GIT binary patch literal 690 zcmV;j0!{siP)Px#1ZP1_K>z@;j|==^1poj7LPn6nEocJ9)Z9I*hy?}a&$(UqKy>i}Vnr!hJ*q$?Q(2_Wj~qdJoz+B(-y zMx9tFpex`=({8DyVk)HJ+Gjq0~NL=GGcH#+CN3y8(zSj^>+92~^s zWe-xBp?~ARto;KMmW8oY3d56=n6hoyKbQ0<54Pg``6v6SdHhTmMks<$ANz6f-h0+R z*$%v3Sw)X;S~dT0&I_j_s`CDbg%>OOBL<==n4eiz&8tHOvg0O-yAJ6QJ|Y37J4%!Y zYEB}8Mo^FNVa?a!6MLMheOpv>5<$(0?^X_x-SsMec|VQkUF%;5YzN%tt^@S=wv{72 zHln}a!4}{)r$~?s`3`UqIglRN!%Jh=d(pM*8b!hDtc{PYiLmQdJ%2IzDJkQ+%|v<$35zy=B=mKZbuFx0ptLk z{fUQJRZH&yf-PY9i>VxV(|r{^Hx8(GH_uk9D1p5QeKo6pY{jyQt(co$`W>y$9@Zjc z2_Re%F8Lz3%?Y*uf<)*P+x?|F1H1Vq0PqWgqV35BGBhFp000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$fPx%T}ebiRCt{2nlVemKorOSS5s{jQChJyyV5}f-9&_r9mLJeuOf&a!Ohj(MFka? zf`W_S;;t^K5yYW`)f(f_oTNpNyLaAM`+iGmX!3h~&84mH5Bw9J!qeE9%&Po{S_Vh{ z*Rb7;w2$Hzst45TbsRlLLGouQ*@ghHIz8l9t5w}vocKM}0uCP9!P@e?EMOwp1^{q$ zc@qHeRnO_tuiSvw;Vc%XCKt93FG2vhWVa6h-uRg6>69_;S8hNY1EV9^=IYYi7J!vx z_c;KZ+}v&{SK!#M+yEhfD0-WiZXWNZc5iexm4@p1O!!O1@<#a7(DG*}#gvNWuB~mP zxAWrlP;S6@KKJ!liYWz{@KaE3K=Y*qp!;37c?C#+8j4?Q31o!V)qR^+fb^%ax&(T0 zwf;@jpxl7<0{qRhtH#W1=f*F)zjt40)bg!g{Sx$@U)G@O*SZ2~`If(VcJ+1L*?RH4 z{>eg(>{tFCkS=2Hz7omDy62(zcdqXuphEJK?g6jucgo>pO!!F+Xtmqq0$lsGmq0>D zuE4RM_AwX(aqRG)LI(V#1_;slb><2ae&r>w|15%!IL7G6FtXk|gaA%nazW}Tzxs*b z+Rrcy!!QiP3^b-DvsC||8qW`0NWyjZP5C(=pjrUu12`YR`2eHyd5XVOEX&E1c0PeT z8wBhRM@@Q3`2ZIq^0eQCTRR^Bz{!aGyL^E4@p$ii-u8$*BRpfyzP$&eolf%sQa-Tx z0E%1}llg?c&Ig$Ab3TA_Fy{j}AHewl&IfQlfMFPhVHl=Q`2_AC$KA09gY^Ia002ov JPDHLkV1iJ6QVIY7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json new file mode 100644 index 0000000000..92fe4990f1 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "drawn by verslebas", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}