From a34ee7c300414a9a28b583d12b293a5e010e9deb Mon Sep 17 00:00:00 2001 From: cool dolphin <36332236+Afrokada@users.noreply.github.com> Date: Tue, 9 Jan 2024 03:24:32 +0100 Subject: [PATCH] Add delicious mopwata (#23740) * added delicious mopwata * added mopwata, the reagent * fixed issues, changed color, added more possible fills --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../reagents/meta/consumable/drink/drinks.ftl | 3 + .../en-US/reagents/meta/physical-desc.ftl | 1 + .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 + .../Objects/Consumable/Drinks/drinks_fun.yml | 71 +++++++++++++++++- Resources/Prototypes/Flavors/flavors.yml | 5 ++ .../Reagents/Consumable/Drink/drinks.yml | 14 ++++ .../Consumable/Drinks/mopwata.rsi/icon.png | Bin 0 -> 581 bytes .../Consumable/Drinks/mopwata.rsi/meta.json | 1 + 9 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 0116bd3c8c..10e7d96528 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -183,6 +183,7 @@ flavor-complex-coffee = like coffee flavor-complex-milk = like milk flavor-complex-tea = like tea flavor-complex-ice = like ice +flavor-complex-mopwata = like stagnant, dirty water ## Cocktails flavor-complex-long-island = suspiciously like iced tea diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index 00091ad9fe..ad0ade7c96 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -84,3 +84,6 @@ reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgot reagent-name-white-gilgamesh = white gilgamesh reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood. + +reagent-name-mopwata = mopwata +reagent-desc-mopwata = Dirty, stagnant mop water. \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 183fd9db03..d720aab3a5 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -20,6 +20,7 @@ reagent-physical-desc-chalky = chalky reagent-physical-desc-roaring = roaring reagent-physical-desc-robust = robust reagent-physical-desc-sickly = sickly +reagent-physical-desc-murky = murky reagent-physical-desc-bubbling = bubbling reagent-physical-desc-wormy = wormy reagent-physical-desc-frosty = frosty diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 6acbe12af2..4bf07481d7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -146,6 +146,8 @@ prob: 0.25 - id: StrangePill prob: 0.20 + - id: DrinkMopwataBottleRandom + prob: 0.20 - id: ModularReceiver prob: 0.1 - id: DrinkSpaceGlue diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index 4637732f88..f89b56ea87 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -67,4 +67,73 @@ fillBaseName: fill - type: Lube - type: TrashOnSolutionEmpty - solution: drink \ No newline at end of file + solution: drink + + +# Mopwata +- type: weightedRandomFillSolution + id: RandomFillMopwata + fills: + - quantity: 10 + weight: 5 + reagents: + - Blood + - CopperBlood + - Slime + - Vomit + - quantity: 10 + weight: 4 + reagents: + - Coffee + - Tea + - Cola + - RootBeer + - DrGibb + - GrapeSoda + - Starkist + - SpaceUp + - SpaceMountainWind + - LemonLime + - PwrGame + - quantity: 10 + weight: 3 + reagents: + - Whiskey + - Vodka + - Beer + - Ale + - Rum + - Tequila + - Absinthe + - quantity: 10 + weight: 1 + reagents: + - SpaceDrugs + - Mold + - SpaceLube + - SpaceGlue + - SoapyWater + - SpaceCleaner + - MilkSpoiled + - FourteenLoko + +- type: entity + parent: DrinkBottleGlassBaseFull + id: DrinkMopwataBottleRandom + name: delicious mopwata + description: A foggy brown bottle with a faded label depicting a mop. It comes full of murky... vintage. + components: + - type: Item + size: Small + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Mopwata + Quantity: 40 + - type: RandomFillSolution + solution: drink + weightedRandomId: RandomFillMopwata + - type: Sprite + sprite: Objects/Consumable/Drinks/mopwata.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index cd2e9a237f..688a859f24 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -534,6 +534,11 @@ flavorType: Complex description: flavor-complex-water +- type: flavor + id: mopwata + flavorType: Complex + description: flavor-complex-mopwata + - type: flavor id: beer flavorType: Complex diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 299126ade8..5f60d76c14 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -424,3 +424,17 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/rewriter.rsi state: icon + +- type: reagent + id: Mopwata + name: reagent-name-mopwata + parent: BaseDrink + desc: reagent-desc-mopwata + physicalDesc: reagent-physical-desc-murky + flavor: mopwata + color: "#59502b" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.6 \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..74690a0060bbc46604b13b5016e1619e06c8e37c GIT binary patch literal 581 zcmV-L0=oT)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0oqAKK~z{rW1P~} z$S{zA2}%zb7SQj10D|UA6$58W1J~$clm=zyJO} zzHi&M1=IQ%>Wi`%etiG-6DmbAAj<(9tjyrxW@TlImX?tMi;)Y+a=?{yr~W^A@y6@X z^H)p7Enl?Jn{g^4gmT7{N<})%a5Nr0~UMq z^f|-x=g%0(2?dHmfEr+EIRIPm!vML_K(Hi4E=)lAA5{9?ymEoz?)?W0UcLd~k`M-t z?c2_vq@fGXrXcX<%^N5SJ0L3x)O8HNmLmgo9YY2yCr>aN