Skip to content

Commit

Permalink
A bunch of random density fixes (#78501)
Browse files Browse the repository at this point in the history
* a bunch of density

* Update drink.json

* Update alcohol.json
  • Loading branch information
Karol1223 authored Dec 14, 2024
1 parent 791bd3f commit 9962573
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 18 deletions.
2 changes: 1 addition & 1 deletion data/json/items/armor/integrated.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/alcohol.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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": "~",
Expand All @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion data/json/items/comestibles/spice.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -164,6 +165,7 @@
"price_postapoc": "25 cent",
"weight": "24 g",
"volume": "250 ml",
"material": [ "water" ],
"calories": 17,
"comestible_type": "DRINK",
"container": "bottle_glass",
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/tool/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"volume": "2 ml",
"price": "5 cent",
"price_postapoc": "2 cent",
"material": "cotton",
"material": [ "cotton" ],
"symbol": "!",
"color": "white",
"flags": [ "SINGLE_USE" ],
Expand All @@ -25,6 +25,7 @@
"volume": "3 ml",
"price": "10 cent",
"price_postapoc": "6 cent",
"material": [ "cotton" ],
"symbol": ",",
"color": "white",
"flags": [ "SINGLE_USE", "IRREPLACEABLE_CONSUMABLE" ],
Expand Down
8 changes: 0 additions & 8 deletions data/mods/TEST_DATA/known_bad_density.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"bot_lab_security_drone_YM",
"extinguishing_agent",
"dayquil",
"pine_tea",
"soysauce",
"johnnycake",
"bot_gasbomb_hack",
"tailoring_pattern_set",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -135,7 +129,6 @@
"dried_salad",
"lung_provence",
"portal",
"dandelion_tea",
"scots_cookbook",
"primitive_hammer",
"throwing_stick",
Expand Down Expand Up @@ -436,7 +429,6 @@
"robofac_armor_rig",
"sweet_milk_fortified",
"purifier_smart_shot",
"alcohol_wipes",
"colander_steel",
"porkbelly",
"airhorn",
Expand Down

0 comments on commit 9962573

Please sign in to comment.