diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl index 3ed6a8825ec682..09a43c3c5c9e69 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -1,3 +1,6 @@ ent-DrinkHotArachneGlass = { ent-DrinkGlass } .suffix = горячая арахна .desc = { ent-DrinkGlass.desc } +ent-DrinkFrench75Glass = { ent-DrinkGlass } + .suffix = френч-75 + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl index acca38f63e53d7..627445b4bcf81b 100644 --- a/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl +++ b/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl @@ -10,3 +10,5 @@ reagent-name-bankate = банкате reagent-desc-bankate = Выглядит как то, что не стоит пить... reagent-name-hot-arachne = горячая арахна reagent-desc-hot-arachne = Горячие арахны всего в 300 метрах от вас! +reagent-name-french-75 = френч-75 +reagent-desc-french-75 = Не только блюспейс артиллерия всё ещё может задать жару. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 9e21c9c5b71e34..9b68465b34ccd2 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -108,6 +108,7 @@ - DrinkTheMartinez - DrinkMoonshineGlass - DrinkHotArachneGlass #SS220 HotArachne cocktail + - DrinkFrench75Glass #SS220 French 75 cocktail chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml index 6b16c9d19417de..d6d52e383effbd 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/drinks.yml @@ -47,3 +47,19 @@ - type: Icon sprite: SS220/Objects/Consumable/Drinks/glass_hot_arachne.rsi state: icon + +- type: entity + parent: DrinkGlass + id: DrinkFrench75Glass + suffix: French75 + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: French75 + Quantity: 30 + - type: Icon + sprite: SS220/Objects/Consumable/Drinks/french75.rsi + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index 5b2ae086052c3d..34995c6757be16 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -37,3 +37,8 @@ id: soothing flavorType: Base description: успокаивающе + +- type: flavor + id: french75 + flavorType: Complex + description: терпко-сладко \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml index 9c1d1be6e9d036..da46e0951c3e0a 100644 --- a/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml @@ -55,3 +55,29 @@ damage: types: Radiation: -0.5 + +#French75 + +- type: reagent + id: French75 + name: reagent-name-french-75 + parent: BaseAlcohol + desc: reagent-desc-french-75 + physicalDesc: reagent-physical-desc-strong-smelling + flavor: french75 + color: "#b4b59f" + metamorphicSprite: + sprite: SS220/Objects/Consumable/Drinks/french75.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.12 + fizziness: 0.15 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml b/Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml index 43be4492d65697..4dd8726e2e88e2 100644 --- a/Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml @@ -45,3 +45,19 @@ amount: 1 products: HotArachne: 6 + +- type: reaction + id: French75 + requiredMixerCategories: + - Shake + reactants: + Gin: + amount: 2 + Champagne: + amount: 2 + JuiceLemon: + amount: 1 + Sugar: + amount: 1 + products: + French75: 6 diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-1.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-1.png new file mode 100644 index 00000000000000..7ddd467dc5f05e Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-1.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-2.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-2.png new file mode 100644 index 00000000000000..cfacd061cde0af Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-2.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-3.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-3.png new file mode 100644 index 00000000000000..8c79c0c756c892 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-3.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-4.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-4.png new file mode 100644 index 00000000000000..bd235281981667 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/fill-4.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon.png new file mode 100644 index 00000000000000..f2b12dc8cd6352 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon_empty.png b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon_empty.png new file mode 100644 index 00000000000000..3d4792ec3079c0 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/icon_empty.png differ diff --git a/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/meta.json new file mode 100644 index 00000000000000..dcd4c06a8e82b0 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Consumable/Drinks/french75.rsi/meta.json @@ -0,0 +1,76 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by verslebas. Fills levels by Tayrtahn. Resprited by Oxygen033 for SS220", + "states": + [ + { + "name": "icon", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-2", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-3", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + }, + { + "name": "fill-4", + "delays": + [ + [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + ] + } + ] +}