From 5d296d2dbbd1d4f4e729aada94c4a4adcc54adcd Mon Sep 17 00:00:00 2001 From: Coolsurf6 Date: Fri, 14 Mar 2025 16:49:26 +1000 Subject: [PATCH] Added Bacchus' Blessing Drink (#35306) * added start to bacchus blessing with few more things left to do * added sprites and trying to get the empty sprite to work * fixed empty sprite will fill layer * added missing fill image * made flavor, physical description, recipe reaction and tweaked reagent threshold * fixed fill levels * removed name from drinks.yml, updated suffix instead * delay is weird and broken, removing the difference * updated copyright --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 3 + .../en-US/reagents/meta/physical-desc.ftl | 1 + .../Random/Food_Drinks/drinks_glass.yml | 1 + .../Objects/Consumable/Drinks/drinks.yml | 17 ++++++ Resources/Prototypes/Flavors/flavors.yml | 5 ++ .../Reagents/Consumable/Drink/alcohol.yml | 57 +++++++++++++++++- .../Prototypes/Recipes/Reactions/drinks.yml | 14 +++++ .../Drinks/bacchusblessing.rsi/fill-1.png | Bin 0 -> 1096 bytes .../Drinks/bacchusblessing.rsi/fill-2.png | Bin 0 -> 1096 bytes .../Drinks/bacchusblessing.rsi/icon.png | Bin 0 -> 1096 bytes .../Drinks/bacchusblessing.rsi/icon_empty.png | Bin 0 -> 443 bytes .../Drinks/bacchusblessing.rsi/meta.json | 52 ++++++++++++++++ 13 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 112f26def2..38efd407ae 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -312,6 +312,7 @@ flavor-complex-toxins-special = like space exploration flavor-complex-vodka-martini = like a spy movie from Russia flavor-complex-vodka-tonic = refreshingly bitter flavor-complex-coconut-rum = like nutty fermented sugar +flavor-complex-bacchus-blessing = like a wall of bricks ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though flavor-complex-pilk = like sweet 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 3db20a61ab..3e2719cc0a 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -321,3 +321,6 @@ reagent-desc-whiskey-sour = What's the secret ingredient? Eggs. It's eggs. reagent-name-zombiecocktail = Zombie reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. + +reagent-name-bacchus-blessing = bacchus' blessing +reagent-desc-bacchus-blessing = You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...? diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 56953776e6..55818df8b9 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -95,3 +95,4 @@ reagent-physical-desc-reflective = reflective reagent-physical-desc-holy = holy reagent-physical-desc-slimy = slimy reagent-physical-desc-neural = neural +reagent-physical-desc-unidentifiable = unidentifiable 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 5167613cbe..c3a9a3a143 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 @@ -124,4 +124,5 @@ - DrinkShakeRobo - DrinkHoochGlass - DrinkBeepskySmashGlass + - DrinkBacchusBlessing rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 13f46cc76e..ca56fbcb35 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2526,3 +2526,20 @@ - type: Icon sprite: Objects/Consumable/Drinks/bloodglass.rsi state: icon + +- type: entity + parent: DrinkGlass + id: DrinkBacchusBlessing + suffix: bacchus blessing + description: You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BacchusBlessing + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/bacchusblessing.rsi + state: icon diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 2d488cf0c8..ffd6fe40b8 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1398,3 +1398,8 @@ id: zombiecocktail flavorType: Complex description: flavor-complex-zombiecocktail + +- type: flavor + id: bacchusblessing + flavorType: Complex + description: flavor-complex-bacchus-blessing diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 72205a8b0c..3504e64b77 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -2287,4 +2287,59 @@ factor: 1 - !type:AdjustReagent reagent: Ethanol - amount: 0.25 \ No newline at end of file + amount: 0.25 + +- type: reagent + id: BacchusBlessing + name: reagent-name-bacchus-blessing + parent: BaseAlcohol + desc: reagent-desc-bacchus-blessing + physicalDesc: reagent-physical-desc-unidentifiable + flavor: bacchusblessing + color: "#331303" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/bacchusblessing.rsi + state: icon_empty + metamorphicMaxFillLevels: 2 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.45 # TODO: Figure out why setting this to 0 means this does more damage... WHAT BUG IS THIS?!! + Alcohol: + effects: + - !type:Drunk + boozePower: 10 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 6 + - !type:OrganType + type: Dwarf + shouldHave: false + damage: + types: + Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives. + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 6 + - !type:OrganType + type: Dwarf + damage: + types: + Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4 + - !type:ChemVomit + probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it... + conditions: + - !type:ReagentThreshold + reagent: BacchusBlessing + min: 8 + - !type:OrganType + type: Dwarf + shouldHave: false diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 48884f0ad2..a46dfa2969 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1369,3 +1369,17 @@ amount: 1 products: ZombieCocktail: 4 + +- type: reaction + id: BacchusBlessing + reactants: + Hooch: + amount: 1 + Absinthe: + amount: 1 + ManlyDorf: + amount: 1 + SyndicateBomb: + amount: 1 + products: + BacchusBlessing: 4 diff --git a/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bacchusblessing.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c45889cd2d0bcc65e5a9e5b159ba31cc41812595 GIT binary patch literal 1096 zcmV-O1h@N%P))V zT$c?p{*L~yub+fvs3`6p;L%@8DDED>GE}@^z6nZeq51_0qH#@Y6x&|r{!XwARqO)W zUKYBUa=$o^&HddFs=t@`{Knpz zn2cWP58}^GpXROp=GGr5KcMU1;+n?L9&-nP?GlA$sIUwbKfb<%?Gi=d=aoaxYT97o z>309!dyVe;{?ER;56e)oU7|Qs4d(AVKL7wW_SR6`J-}OqB@v&mzxYS!@%f|tmZ2j5 z{!7SzaZ~tjKeZId|46r+Wy&ID%8(!$cWaHt)}C9!6Bkcm@|=R(7gS81Q{X8v9DKVE zw+6Vi8sgDL-GN4bg#S!+1)dVaN1to~*usU>JBQ-$=L7iz)V zT$c?p{*L~yub+fvs3`6p;L%@8DDED>GE}@^z6nZeq51_0qH#@Y6x&|r{!XwARqO)W zUKYBUa=$o^&HddFs=t@`{Knpz zn2cWP58}^GpXROp=GGr5KcMU1;+n?L9&-nP?GlA$sIUwbKfb<%?Gi=d=aoaxYT97o z>309!dyVe;{?ER;56e)oU7|Qs4d(AVKL7wW_SR6`J-}OqB@v&mzxYS!@%f|tmZ2j5 z{!7SzaZ~tjKeZId|46r+Wy&ID%8(!$cWaHt)}C9!6Bkcm@|=R(7gS81Q{X8v9DKVE zw+6Vi8sgDL-GN4bg#S!+1)dVaN1to~*usU>JBQ-$=L7iz)V zT$c?p{*L~yub+fvs3`6p;L%@8DDED>GE}@^z6nZeq51_0qH#@Y6x&|r{!XwARqO)W zUKYBUa=$o^&HddFs=t@`{Knpz zn2cWP58}^GpXROp=GGr5KcMU1;+n?L9&-nP?GlA$sIUwbKfb<%?Gi=d=aoaxYT97o z>309!dyVe;{?ER;56e)oU7|Qs4d(AVKL7wW_SR6`J-}OqB@v&mzxYS!@%f|tmZ2j5 z{!7SzaZ~tjKeZId|46r+Wy&ID%8(!$cWaHt)}C9!6Bkcm@|=R(7gS81Q{X8v9DKVE zw+6Vi8sgDL-GN4bg#S!+1)dVaN1to~*usU>JBQ-$=L7iz7;85Qe{vs>&!@XjN5ZcyM(nD7UOpQ4|m<>>lUf!9cT01yvs5VBtbTYqemYRWvH7 z3+`?&O_SX26|`VK$-wr^Kfh;Wn3$NDm^i}n%I2qM-mi0A*?xJy{v+nOywTLv%f*3y zy=3CK{HMHm?a~;fu58{kQal#iG{W8OO&|C9%U71W`^T}y=&|~*8;DVH4z4cBtZEQR z0NmZ)5ZexZe22H^y_roT#i6hg<6jyGqD2s8W=)Q1E0$6swjJ)n`-9Q8Bc+5fCVvYF zS8j8URtL_81O?GTRSRb=0E>D~Y&$-Fx+Jz8i+T=#vldk?h87=e0Ki(ClPV&@YIV<| zo)bb~QO{Ye?h%opQok|S>E1*MTraP&yKVr82oL^&bl8v59mUMrY>dg?uX9zs%igcE zF(%LK_J>$I?*9)S!JZ&elx0bb4I)2@vB8xkVfX5>uRpm}Gv_j@y{S`mMt5LOh_Oh} l&;6e