Skip to content

Commit

Permalink
Density balance: alcohol and liquid food (#56664)
Browse files Browse the repository at this point in the history 
* Density balance: alcohol and liquid food

Corrected or unified densities of liquid food consumables

* Fix evap milk and syrups

Fixed density of evaporated milk. Made syrup densities consistent.

* Correct weights of mash

must, mash, wort, and wash should not weigh less than the products they ferment into
  • Loading branch information
@batekulve
batekulve authored Apr 20, 2022
1 parent 500e264 commit a2b1847
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 75 deletions.
68 changes: 34 additions & 34 deletions data/json/items/comestibles/alcohol.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"id": "wine_mycus",
"looks_like": "wine_cabernet",
"name": { "str_sp": "Mycus wine" },
"weight": "33 g",
"weight": "50 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": [ "MYCUS" ],
Expand Down Expand Up @@ -32,7 +32,7 @@
"id": "wine_marloss",
"looks_like": "wine_mycus",
"name": { "str_sp": "Marloss wine" },
"weight": "33 g",
"weight": "50 g",
"color": "pink",
"addiction_type": "marloss_r",
"use_action": [ "MARLOSS" ],
Expand Down Expand Up @@ -256,7 +256,7 @@
"type": "COMESTIBLE",
"id": "whiskey",
"name": { "str_sp": "whiskey" },
"weight": "33 g",
"weight": "36 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -285,7 +285,7 @@
"id": "vodka",
"looks_like": "water",
"name": { "str_sp": "vodka" },
"weight": "33 g",
"weight": "36 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -313,7 +313,7 @@
"id": "gin",
"looks_like": "vodka",
"name": { "str_sp": "gin" },
"weight": "33 g",
"weight": "36 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -341,7 +341,7 @@
"id": "rum",
"looks_like": "whiskey",
"name": { "str_sp": "rum" },
"weight": "33 g",
"weight": "36 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -369,7 +369,7 @@
"id": "tequila",
"looks_like": "vodka",
"name": { "str_sp": "tequila" },
"weight": "34 g",
"weight": "36 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -397,7 +397,7 @@
"id": "triple_sec",
"looks_like": "whiskey",
"name": { "str_sp": "triple sec" },
"weight": "30 g",
"weight": "36 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -425,7 +425,7 @@
"id": "sake_filtered",
"looks_like": "vodka",
"name": { "str_sp": "sake" },
"weight": "33 g",
"weight": "36 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
Expand Down Expand Up @@ -453,7 +453,7 @@
"id": "sake_unfiltered",
"looks_like": "vodka",
"name": { "str_sp": "nigori sake" },
"weight": "33 g",
"weight": "36 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -482,7 +482,7 @@
"id": "bum_wine",
"looks_like": "wine_cabernet",
"name": { "str_sp": "cheap wine" },
"weight": "35 g",
"weight": "36 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down Expand Up @@ -512,7 +512,7 @@
"id": "mixed_alcohol_strong",
"looks_like": "bum_wine",
"name": { "str_sp": "strong mixed alcohol" },
"weight": "34 g",
"weight": "36 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -598,7 +598,7 @@
"id": "brandy",
"looks_like": "whiskey",
"name": { "str_sp": "brandy" },
"weight": "34 g",
"weight": "36 g",
"color": "light_red",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -626,7 +626,7 @@
"id": "irish_coffee",
"looks_like": "coffee",
"name": { "str_sp": "Irish coffee" },
"weight": "260 g",
"weight": "252 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand All @@ -653,7 +653,7 @@
"id": "long_island",
"looks_like": "cola",
"name": { "str_sp": "Long Island iced tea" },
"weight": "232 g",
"weight": "250 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -683,7 +683,7 @@
"looks_like": "juice",
"name": { "str": "screwdriver cocktail" },
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "cranberry_juice", "name": { "str_sp": "vodka cranberry" } } ],
"weight": "258 g",
"weight": "252 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -712,7 +712,7 @@
"id": "drink_wild_apple",
"looks_like": "vodka",
"name": { "str_sp": "wild apple" },
"weight": "258 g",
"weight": "252 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -749,7 +749,7 @@
{ "type": "COMPONENT_ID", "condition": "canadian_whiskey", "name": { "str_sp": "whiskey and cola" } },
{ "type": "COMPONENT_ID", "condition": "sake_filtered", "name": { "str_sp": "sake and cola" } }
],
"weight": "251 g",
"weight": "252 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -778,7 +778,7 @@
"looks_like": "gin",
"name": { "str_sp": "gin and tonic" },
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "vodka", "name": { "str_sp": "vodka and tonic" } } ],
"weight": "251 g",
"weight": "252 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -815,7 +815,7 @@
{ "type": "COMPONENT_ID", "condition": "vodka", "name": { "str_sp": "chi chi" } },
{ "type": "COMPONENT_ID", "condition": "tequila", "name": { "str_sp": "tequila colada" } }
],
"weight": "251 g",
"weight": "252 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -849,7 +849,7 @@
{ "type": "COMPONENT_ID", "condition": "rum", "name": { "str_sp": "Caribbean sunrise" } },
{ "type": "COMPONENT_ID", "condition": "pineapple_juice", "name": { "str_sp": "Panama sunrise" } }
],
"weight": "251 g",
"weight": "252 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -963,7 +963,7 @@
"id": "burdock_wine",
"looks_like": "wine_chardonnay",
"name": { "str_sp": "burdock wine" },
"weight": "247 g",
"weight": "36 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down Expand Up @@ -1165,7 +1165,7 @@
"id": "stout",
"looks_like": "coffee",
"name": { "str_sp": "stout" },
"weight": "205 g",
"weight": "250 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down Expand Up @@ -1312,7 +1312,7 @@
"id": "single_malt_whiskey",
"looks_like": "whiskey",
"name": { "str_sp": "single malt whiskey" },
"weight": "33 g",
"weight": "36 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1371,7 +1371,7 @@
"id": "sherry",
"looks_like": "brandy",
"name": { "str_sp": "sherry" },
"weight": "120 g",
"weight": "36 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1477,7 +1477,7 @@
"id": "drink_beeknees",
"looks_like": "gin",
"name": { "str_sp": "bee's knees" },
"weight": "248 g",
"weight": "500 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down Expand Up @@ -1531,7 +1531,7 @@
"id": "honey_gold",
"looks_like": "beer",
"name": { "str": "honeygold brew" },
"weight": "259 g",
"weight": "252 g",
"color": "yellow",
"use_action": [ "ALCOHOL_WEAK" ],
"stim": 1,
Expand All @@ -1558,7 +1558,7 @@
"id": "honey_ant",
"looks_like": "honey_gold",
"name": { "str": "honey ball" },
"weight": "178 g",
"weight": "130 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand All @@ -1585,7 +1585,7 @@
"id": "eggnog_spiked",
"looks_like": "eggnog",
"name": { "str": "spiked eggnog" },
"weight": "132 g",
"weight": "130 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1617,7 +1617,7 @@
"looks_like": "gin",
"name": { "str": "martini" },
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "tequila", "name": { "str_sp": "tequini" } } ],
"weight": "49600 mg",
"weight": "49 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1645,7 +1645,7 @@
"id": "drink_bloody_mary",
"looks_like": "tomato_juice",
"name": { "str": "Bloody Mary cocktail" },
"weight": "258 g",
"weight": "252 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1674,7 +1674,7 @@
"id": "drink_bloody_mary_blood",
"looks_like": "drink_bloody_mary",
"name": { "str_sp": "'very' Bloody Mary cocktail" },
"weight": "258 g",
"weight": "252 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL" ],
Expand Down Expand Up @@ -1702,7 +1702,7 @@
"id": "drink_hard_seltzer",
"looks_like": "water",
"name": { "str_sp": "hard seltzer" },
"weight": "249 g",
"weight": "250 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down Expand Up @@ -1731,7 +1731,7 @@
"id": "hb_seltzer",
"looks_like": "drink_hard_seltzer",
"name": { "str_sp": "homebrew hard seltzer" },
"weight": "249 g",
"weight": "250 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": [ "ALCOHOL_WEAK" ],
Expand Down
Loading

0 comments on commit a2b1847

Please sign in to comment.