From 9962573aa9fefd360f4fe1da6c035272c73f1da4 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 14 Dec 2024 03:23:22 +0100 Subject: [PATCH] A bunch of random density fixes (#78501) * a bunch of density * Update drink.json * Update alcohol.json --- data/json/items/armor/integrated.json | 2 +- data/json/items/comestibles/alcohol.json | 2 +- data/json/items/comestibles/drink.json | 8 ++++---- data/json/items/comestibles/other.json | 3 +-- data/json/items/comestibles/spice.json | 4 +++- data/json/items/tool/med.json | 3 ++- data/mods/TEST_DATA/known_bad_density.json | 8 -------- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json index c20987f31d3fb..e85b0307c93d4 100644 --- a/data/json/items/armor/integrated.json +++ b/data/json/items/armor/integrated.json @@ -526,7 +526,7 @@ "name": { "str": "patchwork skin" }, "description": "Beauty is only skin deep, but with this skin, a knife might find itself broken in the beauty layer.", "weight": "2 kg", - "volume": "500 ml", + "volume": "2 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "leather", "bone", "mut_fur", "acidchitin", "leather_arthropod", "wool", "flesh" ], diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index 499ad2f526c8e..40d3962fa73c4 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -969,7 +969,7 @@ "id": "beer", "looks_like": "water", "name": { "str_sp": "beer" }, - "weight": "251 g", + "weight": "250 g", "color": "brown", "addiction_type": "alcohol", "use_action": [ "ALCOHOL_WEAK" ], diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 2a83d1d9f689f..d9d107a681cea 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -476,7 +476,7 @@ "price_postapoc": "25 cent", "volume": "250 ml", "charges": 1, - "material": [ "water" ], + "material": [ "veggy", "water" ], "phase": "liquid", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 2 @@ -497,7 +497,7 @@ "price_postapoc": "25 cent", "volume": "250 ml", "charges": 1, - "material": [ "water" ], + "material": [ "veggy", "water" ], "phase": "liquid", "flags": [ "EATEN_HOT" ], "fun": 3 @@ -1141,7 +1141,7 @@ "id": "pine_tea", "looks_like": "tea", "name": { "str_sp": "pine needle tea" }, - "weight": "268 g", + "weight": "262 g", "color": "light_green", "comestible_type": "DRINK", "symbol": "~", @@ -1152,7 +1152,7 @@ "volume": "250 ml", "charges": 1, "calories": 1, - "material": [ "water" ], + "material": [ "veggy", "water" ], "phase": "liquid", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 1, diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 3919a9ba0b941..846dc0088e0ee 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -947,8 +947,7 @@ "name": { "str_sp": "Kentucky coffee grounds" }, "container": "bag_plastic_small", "description": "Coffee grounds created through washing, cleaning, and roasting the pods from a Kentucky coffeetree. They can be used to create coffee.", - "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ], - "volume": "12 ml" + "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ] }, { "id": "honey_glassed", diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index 455c716173c90..8b361a09eec52 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -23,9 +23,10 @@ "comestible_type": "DRINK", "name": { "str_sp": "hot sauce" }, "description": "Flamin' hot sauce. It'd be a bad idea to drink it on its own. You should probably wash your hands after handling it, too.", - "weight": "6 g", + "weight": "5 g", "charges": 50, "volume": "250 ml", + "material": [ "veggy", "water" ], "//": "hot sauces are very salty, hence the negative quench", "quench": -2, "calories": 5, @@ -164,6 +165,7 @@ "price_postapoc": "25 cent", "weight": "24 g", "volume": "250 ml", + "material": [ "water" ], "calories": 17, "comestible_type": "DRINK", "container": "bottle_glass", diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index 408a668b27fbb..059acd3230367 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -9,7 +9,7 @@ "volume": "2 ml", "price": "5 cent", "price_postapoc": "2 cent", - "material": "cotton", + "material": [ "cotton" ], "symbol": "!", "color": "white", "flags": [ "SINGLE_USE" ], @@ -25,6 +25,7 @@ "volume": "3 ml", "price": "10 cent", "price_postapoc": "6 cent", + "material": [ "cotton" ], "symbol": ",", "color": "white", "flags": [ "SINGLE_USE", "IRREPLACEABLE_CONSUMABLE" ], diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 14696cf01656c..1d359ebc2cb46 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -9,8 +9,6 @@ "bot_lab_security_drone_YM", "extinguishing_agent", "dayquil", - "pine_tea", - "soysauce", "johnnycake", "bot_gasbomb_hack", "tailoring_pattern_set", @@ -20,12 +18,10 @@ "venom_wasp", "cooked_marrow", "broken_mech_combat", - "beer", "ruined_chunks", "soaking_dandelion", "meat_smoked", "mycus_juice", - "hot_sauce", "liquid_soap", "chem_aluminium_sulphate", "bot_lab_security_drone_GR", @@ -58,13 +54,11 @@ "plastic_straw", "k_gambeson_pants", "corpse_stabbed", - "integrated_patchskin2", "bone_marrow", "conc_venom", "hoboreel", "dog_whistle_wood", "tailor_japanese", - "dandelionburdock_tea", "craft", "frozen_lemonade", "glowstick_dead", @@ -135,7 +129,6 @@ "dried_salad", "lung_provence", "portal", - "dandelion_tea", "scots_cookbook", "primitive_hammer", "throwing_stick", @@ -436,7 +429,6 @@ "robofac_armor_rig", "sweet_milk_fortified", "purifier_smart_shot", - "alcohol_wipes", "colander_steel", "porkbelly", "airhorn",