From 27d6e223c326f6dff64cfe50c0355ca27e097d28 Mon Sep 17 00:00:00 2001 From: Rouden <149893554+Roudenn@users.noreply.github.com> Date: Sat, 11 Jan 2025 14:19:08 +0300 Subject: [PATCH] [Feature] New Drink Bacchus (#999) * New Drink Bacchus * Update drinks.yml --- .../ru-RU/backmen/flavors/flavor-profiles.ftl | 1 + .../entities/consumable/drinks/drinks.ftl | 5 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 6 ++-- .../Objects/Consumable/Drinks/drinks.yml | 16 ++++++++++ .../Prototypes/_Backmen/Flavors/flavors.yml | 5 ++++ .../Prototypes/_Backmen/Reactions/drinks.yml | 14 +++++++++ .../Reagents/Consumable/Drink/alcohol.yml | 22 +++++++++++++- .../Consumable/Drinks/bacchus.rsi/icon.png | Bin 0 -> 3725 bytes .../Consumable/Drinks/bacchus.rsi/meta.json | 28 ++++++++++++++++++ 9 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl create mode 100644 Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png create mode 100644 Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/meta.json diff --git a/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl index eb40b4da7df..b922b4c2f4b 100644 --- a/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/backmen/flavors/flavor-profiles.ftl @@ -1,4 +1,5 @@ flavor-complex-RedOrdenDrinkFlavour = триумф красного ордена +flavor-complex-bacchus-drink = нечто самое резкое и разрывное в вашем горле ## Nyano??? diff --git a/Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..148734047aa --- /dev/null +++ b/Resources/Locale/ru-RU/backmen/prototypes/entities/consumable/drinks/drinks.ftl @@ -0,0 +1,5 @@ +ent-DrinkBacchusBlessing = { ent-DrinkGlass } + .desc = { ent-DrinkGlass.desc } + +reagent-name-bacchus-blessing = Благословение Бахуса +reagent-desc-bacchus-blessing = Вас предупредили об этом. diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index b224f36d988..ffa07af76a7 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -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: @@ -180,7 +180,7 @@ type: Dwarf damage: types: - Poison: 0.2 + Poison: 0.1 # backmen: less toxins from alcohol - !type:HealthChange conditions: - !type:ReagentThreshold @@ -1976,4 +1976,4 @@ factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 \ No newline at end of file + amount: 0.25 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml index f1471f6d76b..1799e4c6753 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Consumable/Drinks/drinks.yml @@ -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: Backmen/Objects/Consumable/Drinks/bacchus.rsi + state: icon diff --git a/Resources/Prototypes/_Backmen/Flavors/flavors.yml b/Resources/Prototypes/_Backmen/Flavors/flavors.yml index 64ff790883a..6bb8a173339 100644 --- a/Resources/Prototypes/_Backmen/Flavors/flavors.yml +++ b/Resources/Prototypes/_Backmen/Flavors/flavors.yml @@ -87,3 +87,8 @@ id: corncob flavorType: Complex description: flavor-complex-corncob + +- type: flavor + id: BacchusDrinkFlavour + flavorType: Complex + description: flavor-complex-bacchus-drink diff --git a/Resources/Prototypes/_Backmen/Reactions/drinks.yml b/Resources/Prototypes/_Backmen/Reactions/drinks.yml index d5cffbdd4a3..6556667064a 100644 --- a/Resources/Prototypes/_Backmen/Reactions/drinks.yml +++ b/Resources/Prototypes/_Backmen/Reactions/drinks.yml @@ -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 diff --git a/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml index 0d169e1aa0d..3c2bd78686d 100644 --- a/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_Backmen/Reagents/Consumable/Drink/alcohol.yml @@ -71,4 +71,24 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.15 \ No newline at end of file + 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 diff --git a/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png b/Resources/Textures/Backmen/Objects/Consumable/Drinks/bacchus.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bbadac6166e282f9f66ee4d6bdb9b6f6b79620a6 GIT binary patch literal 3725 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