Skip to content

Commit

Permalink
Added french-75 cocktail (SerbiaStrong-220#1649)
Browse files Browse the repository at this point in the history
* Added french-75 cocktail

* Update meta.json

* shake
  • Loading branch information
Oxygen033 authored Aug 26, 2024
1 parent fbb45d5 commit 7ab41d0
Show file tree
Hide file tree
Showing 14 changed files with 145 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ent-DrinkHotArachneGlass = { ent-DrinkGlass }
.suffix = горячая арахна
.desc = { ent-DrinkGlass.desc }
ent-DrinkFrench75Glass = { ent-DrinkGlass }
.suffix = френч-75
.desc = { ent-DrinkGlass.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Не только блюспейс артиллерия всё ещё может задать жару.
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
- DrinkTheMartinez
- DrinkMoonshineGlass
- DrinkHotArachneGlass #SS220 HotArachne cocktail
- DrinkFrench75Glass #SS220 French 75 cocktail
chance: 0.8
offset: 0.0
#rare
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions Resources/Prototypes/SS220/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@
id: soothing
flavorType: Base
description: успокаивающе

- type: flavor
id: french75
flavorType: Complex
description: терпко-сладко
26 changes: 26 additions & 0 deletions Resources/Prototypes/SS220/Reagents/Consumable/Drink/alcohol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 16 additions & 0 deletions Resources/Prototypes/SS220/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}

0 comments on commit 7ab41d0

Please sign in to comment.