From 5ab65d545fc76b3cbb8832bb4fbff922464a2949 Mon Sep 17 00:00:00 2001 From: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> Date: Mon, 15 Apr 2024 03:23:19 +0200 Subject: [PATCH] feat: revamp brewing.json file to use copy-from using abstract (#4484) * feat: revamp brewing.json file to use copy-from using abstract * more optimation --- data/json/items/comestibles/brewing.json | 303 ++++------------------- 1 file changed, 53 insertions(+), 250 deletions(-) diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index fd51c62ec7b7..87b3a4a98917 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -1,23 +1,35 @@ [ + { + "type": "COMESTIBLE", + "abstract": "brew_base", + "name": "base brew", + "price": "0 cent", + "price_postapoc": "10 cent", + "volume": "250 ml", + "charges": 7, + "calories": 17, + "quench": 4, + "fun": -15, + "phase": "liquid", + "comestible_type": "DRINK", + "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], + "weight": "35 g", + "color": "brown", + "container": "bottle_glass", + "symbol": "~" + }, { "type": "COMESTIBLE", "id": "brew_mycus_wine", "name": "mycus wine must", "description": "Unfermented mycus wine. A goopy white mess, made from fruit of mycus. It smells sweetly of mushrooms.", - "weight": "33 g", + "copy-from": "brew_base", "color": "white", - "container": "bottle_glass", - "flags": [ "EATEN_COLD", "MYCUS_OK", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", + "extend": { "flags": [ "EATEN_COLD", "MYCUS_OK" ] }, "calories": 25, "quench": -5, "fun": 4, - "price": "4 cent", - "price_postapoc": "10 cent", - "volume": "250 ml", "charges": 5, - "phase": "liquid", - "comestible_type": "DRINK", "brewable": { "time": "15 hours", "results": [ "wine_mycus", "yeast" ] } }, { @@ -25,20 +37,7 @@ "id": "brew_whiskey", "name": "whiskey wort", "description": "Unfermented whiskey. The base of a fine drink. Not the traditional preparation, but you don't have the time.", - "weight": "33 g", - "color": "brown", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 17, - "quench": 4, - "fun": -15, - "price": "0 cent", - "price_postapoc": "10 cent", - "volume": "250 ml", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", + "copy-from": "brew_base", "brewable": { "time": "12 hours", "results": [ "wash_whiskey", "yeast" ] } }, { @@ -46,45 +45,24 @@ "id": "wash_whiskey", "name": { "str": "whiskey wash", "str_pl": "whiskey washes" }, "description": "Fermented, but not distilled whiskey. No longer tastes sweet.", - "weight": "33 g", - "color": "brown", + "copy-from": "brew_base", "addiction_type": "alcohol", "addiction_potential": 1, "use_action": "ALCOHOL_WEAK", "stim": -2, "container": "jug_plastic", - "symbol": "~", "calories": 26, "quench": 2, "healthy": -2, "fun": 2, - "material": [ "water", "alcohol" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "comestible_type": "DRINK" + "material": [ "water", "alcohol" ] }, { "type": "COMESTIBLE", "id": "brew_gin", "name": { "str": "fermenting gin mash", "str_pl": "fermenting gin mashes" }, "description": "Undistilled gin mash. Distilling it will produce gin.", - "weight": "33 g", - "color": "brown", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 17, - "quench": 4, - "fun": -15, - "price": "0 cent", - "price_postapoc": "10 cent", - "volume": "250 ml", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", + "copy-from": "brew_base", "brewable": { "time": "24 hours", "results": [ "gin_mash" ] } }, { @@ -92,45 +70,18 @@ "id": "gin_mash", "name": { "str": "gin mash", "str_pl": "gin mashes" }, "description": "Gin mash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.", - "weight": "33 g", - "color": "yellow", - "addiction_type": "alcohol", - "addiction_potential": 1, - "use_action": "ALCOHOL_WEAK", - "stim": -2, - "container": "jug_plastic", - "symbol": "~", - "calories": 26, - "quench": 2, - "healthy": -2, - "fun": 2, - "material": [ "water", "alcohol" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "comestible_type": "DRINK" + "copy-from": "wash_whiskey", + "color": "yellow" }, { "type": "COMESTIBLE", "id": "brew_vodka", "name": "vodka wort", "description": "Unfermented vodka. Water with sugar from enzymatic breakdown of malted grains or just added in pure form.", + "copy-from": "brew_base", "weight": "50 g", "color": "light_cyan", - "container": "bottle_glass", - "symbol": "~", - "calories": 17, - "quench": 4, "fun": -5, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "6 hours", "results": [ "wash_vodka", "yeast" ] } }, { @@ -138,45 +89,18 @@ "id": "wash_vodka", "name": { "str": "vodka wash", "str_pl": "vodka washes" }, "description": "Fermented, but not distilled vodka. No longer tastes sweet.", - "weight": "33 g", + "copy-from": "wash_whiskey", "color": "light_cyan", - "addiction_type": "alcohol", - "addiction_potential": 1, - "use_action": "ALCOHOL_WEAK", - "stim": -2, - "container": "jug_plastic", - "symbol": "~", - "calories": 9, - "quench": 2, - "healthy": -2, - "fun": 2, - "material": [ "water", "alcohol" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "comestible_type": "DRINK" + "calories": 9 }, { "type": "COMESTIBLE", "id": "brew_rum", "name": "rum wort", "description": "Unfermented rum. Sugar caramel or molasses brewed into sweet water. Basically a saccharine soup.", - "weight": "33 g", + "copy-from": "brew_base", "color": "light_cyan", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 17, - "quench": 4, "fun": -5, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", "brewable": { "time": "12 hours", "results": [ "wash_rum", "yeast" ] } }, { @@ -184,90 +108,31 @@ "id": "wash_rum", "name": { "str": "rum wash", "str_pl": "rum washes" }, "description": "Fermented, but not distilled rum. No longer tastes sweet.", - "weight": "50 g", - "color": "light_cyan", - "addiction_type": "alcohol", - "addiction_potential": 1, - "use_action": "ALCOHOL_WEAK", - "stim": -2, - "container": "jug_plastic", - "symbol": "~", - "calories": 26, - "quench": 2, - "healthy": -2, - "fun": 2, - "material": [ "water", "alcohol" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "comestible_type": "DRINK" + "copy-from": "wash_whiskey", + "color": "light_cyan" }, { "type": "COMESTIBLE", "id": "brew_fruit_wine", "name": "fruit wine must", "description": "Unfermented fruit wine. A sweet, boiled juice made from berries or fruit.", + "copy-from": "brew_base", "weight": "46 g", "color": "light_red", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 17, "quench": 6, "fun": -5, - "price": "0 cent", "material": [ "fruit", "water" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", "brewable": { "time": "12 hours", "results": [ "fruit_wine", "yeast" ] } }, - { - "type": "COMESTIBLE", - "id": "brew_mead", - "name": "spiced mead must", - "description": "Unfermented spiced mead. Diluted honey and yeast.", - "weight": "38 g", - "color": "yellow", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 35, - "quench": 6, - "fun": -15, - "price": "0 cent", - "material": "honey", - "primary_material": "water", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", - "brewable": { "time": "5 days", "results": [ "mead", "yeast" ] } - }, { "type": "COMESTIBLE", "id": "brew_dandelion_wine", "name": "dandelion wine must", "description": "Unfermented dandelion wine. A sticky mixture of water, sugar, yeast, and dandelion petals.", - "weight": "38 g", + "copy-from": "brew_base", "color": "yellow", - "container": "bottle_glass", - "symbol": "~", "calories": 35, "quench": 6, - "fun": -15, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "1 day 12 hours 40 minutes", "results": [ "dandelion_wine", "yeast" ] } }, { @@ -275,20 +140,7 @@ "id": "brew_burdock_wine", "name": "burdock wine must", "description": "Unfermented burdock wine. A sticky mixture of water, sugar, yeast, and burdock roots.", - "weight": "250 g", - "color": "yellow", - "container": "bottle_glass", - "symbol": "~", - "calories": 35, - "quench": 6, - "fun": -15, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], + "copy-from": "brew_dandelion_wine", "brewable": { "time": "1 day 12 hours 40 minutes", "results": [ "burdock_wine", "yeast" ] } }, { @@ -296,39 +148,29 @@ "id": "brew_pine_wine", "name": "pine wine must", "description": "Unfermented pine wine. A sticky mixture of water, sugar, yeast, and pine resins.", - "weight": "38 g", + "copy-from": "brew_dandelion_wine", "color": "green", - "container": "bottle_glass", - "symbol": "~", - "calories": 35, - "quench": 6, - "fun": -20, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "1 day 16 hours 50 minutes", "results": [ "pine_wine", "yeast" ] } }, + { + "type": "COMESTIBLE", + "id": "brew_mead", + "name": "spiced mead must", + "description": "Unfermented spiced mead. Diluted honey and yeast.", + "copy-from": "brew_dandelion_wine", + "material": [ "honey", "water" ], + "brewable": { "time": "5 days", "results": [ "mead", "yeast" ] } + }, { "type": "COMESTIBLE", "id": "brew_hb_beer", "name": { "str": "beer wort" }, "description": "Unfermented homebrew beer. A boiled and chilled mash of malted barley, spiced with some fine hops.", + "copy-from": "brew_base", "weight": "249 g", - "color": "brown", "container": "jug_plastic", - "symbol": "~", + "charges": 1, "calories": 35, - "quench": 4, - "fun": -20, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "9 hours", "results": [ "hb_beer", "yeast" ] } }, { @@ -336,19 +178,13 @@ "id": "brew_moonshine", "name": { "str": "moonshine mash", "str_pl": "moonshine mashes" }, "description": "Unfermented moonshine. Just some water, sugar and corn, like good ol' aunt's recipe.", + "copy-from": "brew_base", "weight": "50 g", - "color": "brown", "container": "jug_plastic", - "symbol": "~", "calories": 104, "quench": 2, "fun": -5, "material": [ "water", "junk" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "6 hours", "results": [ "wash_moonshine", "yeast" ] } }, { @@ -356,45 +192,21 @@ "id": "wash_moonshine", "name": { "str": "moonshine wash", "str_pl": "moonshine washes" }, "description": "Fermented, but not distilled moonshine. Contains all the contaminants you don't want in your moonshine.", - "weight": "50 g", - "color": "brown", - "addiction_type": "alcohol", - "addiction_potential": 1, - "use_action": "ALCOHOL_WEAK", - "stim": -3, - "container": "jug_plastic", - "symbol": "~", - "calories": 33, + "copy-from": "wash_whiskey", "quench": -2, "healthy": -10, - "fun": -20, - "material": [ "water", "alcohol" ], - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "comestible_type": "DRINK" + "fun": -20 }, { "type": "COMESTIBLE", "id": "brew_vinegar", "name": "unfermented vinegar", "description": "Mixture of water, alcohol and fruit juice that will eventually become vinegar.", + "copy-from": "brew_base", "weight": "15 g", "color": "yellow", "container": "jug_plastic", - "symbol": "~", - "calories": 35, - "quench": 6, - "fun": -15, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", "charges": 16, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], "brewable": { "time": "7 hours", "results": [ "vinegar" ] } }, { @@ -402,20 +214,11 @@ "id": "brew_sake", "name": "sake must", "description": "Unfermented sake, made from rice.", + "copy-from": "brew_base", "weight": "46 g", "color": "light_red", - "container": "bottle_glass", - "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME", "NUTRIENT_OVERRIDE" ], - "symbol": "~", - "calories": 17, "quench": 6, "fun": -5, - "price": "0 cent", - "volume": "250 ml", - "price_postapoc": "10 cent", - "charges": 7, - "phase": "liquid", - "comestible_type": "DRINK", "brewable": { "time": "12 hours", "results": [ "sake", "yeast" ] } } ]