Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] New Drink Bacchus #999

Merged
merged 2 commits into from
Jan 11, 2025
Merged

[Feature] New Drink Bacchus #999

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6137336
New Drink Bacchus
Roudenn Jan 11, 2025
dc69876
Update drinks.yml
Roudenn Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
flavor-complex-RedOrdenDrinkFlavour = триумф красного ордена
flavor-complex-bacchus-drink = нечто самое резкое и разрывное в вашем горле

## Nyano???

Expand Down
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-DrinkBacchusBlessing = { ent-DrinkGlass }
.desc = { ent-DrinkGlass.desc }
reagent-name-bacchus-blessing = Благословение Бахуса
reagent-desc-bacchus-blessing = Вас предупредили об этом.
6 changes: 3 additions & 3 deletions Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
shouldHave: false
damage:
types:
Poison: 1
Poison: 0.5 # backmen: less toxins from alcohol
# dwarves take less toxin damage and heal a marginal amount of brute
- !type:HealthChange
conditions:
Expand All @@ -180,7 +180,7 @@
type: Dwarf
damage:
types:
Poison: 0.2
Poison: 0.1 # backmen: less toxins from alcohol
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -1976,4 +1976,4 @@
factor: 1
- !type:AdjustReagent
reagent: Ethanol
amount: 0.25
amount: 0.25
16 changes: 16 additions & 0 deletions Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,19 @@
- type: Drink
- type: Sprite
sprite: Backmen/Objects/Consumable/Drinks/RedOrdenDrink.rsi

- type: entity
parent: DrinkGlass
id: DrinkBacchusBlessing
suffix: Благословение Бахуса
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: BacchusBlessing
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/bacchus.rsi
state: icon
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Backmen/Flavors/flavors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,8 @@
id: corncob
flavorType: Complex
description: flavor-complex-corncob

- type: flavor
id: BacchusDrinkFlavour
flavorType: Complex
description: flavor-complex-bacchus-drink
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Backmen/Reactions/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,17 @@
amount: 1
products:
CondensedMilk: 2

- type: reaction
id: BacchusDrink
reactants:
Hooch:
amount: 1
Absinthe:
amount: 1
ManlyDorf:
amount: 1
SyndicateBomb:
amount: 1
products:
BacchusBlessing: 3
22 changes: 21 additions & 1 deletion Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,24 @@
factor: 2
- !type:AdjustReagent
reagent: Ethanol
amount: 0.15
amount: 0.15

- type: reagent
id: BacchusBlessing
name: reagent-name-bacchus-blessing
parent: BaseAlcohol
desc: reagent-desc-bacchus-blessing
physicalDesc: reagent-physical-desc-strong-smelling
flavor: BacchusDrinkFlavour
color: "#FAFAFA"
metamorphicSprite:
sprite: Backmen/Objects/Consumable/Drinks/bacchus.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 3
- !type:AdjustReagent
reagent: Ethanol
amount: 0.5
Binary file added Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from at commit ",
"states": [
{
"name": "icon",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}
Loading