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 0000000000..9fa76eee2c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json new file mode 100644 index 0000000000..26120dfca2 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "drawn by givazaa", "states": [{"name": "icon"}]} diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon.png new file mode 100644 index 0000000000..35ab18e8f0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon.png differ 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]]}]}