Skip to content

Commit

Permalink
Comestible modern json (#38135)
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup authored Feb 18, 2020
1 parent b5f18f3 commit bcfe074
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 36 deletions.
5 changes: 2 additions & 3 deletions data/json/items/comestibles/frozen.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@
"type": "COMESTIBLE",
"copy-from": "icecream",
"id": "icecream_sorbet",
"name": "sorbet",
"name_plural": "sorbet scoops",
"name": { "str": "sorbet", "str_pl": "sorbet scoops" },
"description": "A simple frozen dessert food made from water and fruit juice.",
"spoils_in": 336,
"spoils_in": "14 days",
"calories": 116,
"quench": 8,
"fun": 10,
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
{
"type": "COMESTIBLE",
"id": "toasterpastryfrozen",
"name": "toaster pastry (uncooked)",
"name_plural": "toaster pastries (uncooked)",
"name": { "str": "toaster pastry (uncooked)", "str_pl": "toaster pastries (uncooked)" },
"weight": "52 g",
"color": "red",
"spoils_in": "2 days 12 hours",
Expand All @@ -61,8 +60,7 @@
{
"type": "COMESTIBLE",
"id": "toasterpastry",
"name": "toaster pastry",
"name_plural": "toaster pastries",
"name": { "str": "toaster pastry", "str_pl": "toaster pastries" },
"copy-from": "toasterpastryfrozen",
"quench": 4,
"description": "A delicious fruit-filled pastry that you've cooked. It even comes with frosting!",
Expand Down Expand Up @@ -664,8 +662,7 @@
{
"type": "COMESTIBLE",
"id": "nachos",
"name": "tortilla chips",
"name_plural": "tortilla chips",
"name": { "str": "tortilla chips", "str_pl": "tortilla chips" },
"weight": "80 g",
"color": "yellow",
"spoils_in": "30 days",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/meat_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
{
"type": "COMESTIBLE",
"id": "sweet_sausage",
"name": "sweet sausage",
"name_plural": "sweet sausages",
"name": { "str": "sweet sausage", "str_pl": "sweet sausages" },
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ],
"weight": "148 g",
"color": "brown",
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 @@ -317,8 +317,7 @@
{
"type": "COMESTIBLE",
"id": "tofu",
"name": "tofu",
"name_plural": "tofu",
"name": { "str": "tofu", "str_pl": "tofu" },
"weight": "85 g",
"color": "white",
"spoils_in": "4 days",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/raw_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,7 @@
{
"type": "COMESTIBLE",
"id": "tea_raw",
"name": "tea leaf",
"name_plural": "tea leaves",
"name": { "str": "tea leaf", "str_pl": "tea leaves" },
"weight": "14 g",
"color": "green",
"use_action": "CAFF",
Expand All @@ -611,8 +610,7 @@
{
"type": "COMESTIBLE",
"id": "tomato",
"name": "tomato",
"name_plural": "tomatoes",
"name": { "str": "tomato", "str_pl": "tomatoes" },
"weight": "231 g",
"color": "red",
"spoils_in": "3 days 18 hours",
Expand Down
20 changes: 7 additions & 13 deletions data/json/items/comestibles/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@
"id": "seed_strawberries",
"copy-from": "seed_fruit",
"type": "COMESTIBLE",
"name": "strawberry seeds",
"name_plural": "strawberry seeds",
"name": { "str": "strawberry seeds", "str_pl": "strawberry seeds" },
"description": "Some strawberry seeds.",
"seed_data": { "plant_name": "strawberry", "fruit": "strawberries", "byproducts": [ "withered" ], "grow": "91 days" }
},
Expand All @@ -130,8 +129,7 @@
"type": "COMESTIBLE",
"id": "seed_tobacco",
"copy-from": "seed",
"name": "tobacco seeds",
"name_plural": "tobacco seeds",
"name": { "str": "tobacco seeds", "str_pl": "tobacco seeds" },
"description": "Some tobacco seeds.",
"seed_data": { "plant_name": "tobacco", "fruit": "tobacco_raw", "grow": "91 days" }
},
Expand All @@ -152,10 +150,9 @@
"id": "seed_sugar_beet",
"copy-from": "seed",
"price": 120,
"name": "sugar beet seeds",
"name_plural": "sugar beet seeds",
"name": { "str": "sugar beet seeds", "str_pl": "sugar beet seeds" },
"description": "Some sugar beet seeds.",
"volume": 0,
"volume": "1 ml",
"weight": "5 g",
"stack_size": 40,
"seed_data": { "plant_name": "sugar beet", "fruit": "sugar_beet", "grow": "90 days" }
Expand Down Expand Up @@ -184,8 +181,7 @@
"id": "seed_tomato",
"copy-from": "seed",
"price": 50,
"name": "tomato seeds",
"name_plural": "tomato seeds",
"name": { "str": "tomato seeds", "str_pl": "tomato seeds" },
"description": "Some tomato seeds.",
"seed_data": { "plant_name": "tomato", "fruit": "tomato", "byproducts": [ "withered" ], "grow": "65 days" }
},
Expand Down Expand Up @@ -467,8 +463,7 @@
"id": "seed_thyme",
"copy-from": "seed",
"price": 120,
"name": "thyme seeds",
"name_plural": "thyme seeds",
"name": { "str": "thyme seeds", "str_pl": "thyme seeds" },
"color": "green",
"description": "Some thyme seeds.",
"charges": 2,
Expand Down Expand Up @@ -502,8 +497,7 @@
"type": "COMESTIBLE",
"id": "seed_sunflower",
"copy-from": "seed",
"name": "sunflower seeds",
"name_plural": "sunflower seeds",
"name": { "str": "sunflower seeds", "str_pl": "sunflower seeds" },
"weight": "2 g",
"color": "green",
"use_action": "SEED",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/spice.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@
{
"type": "COMESTIBLE",
"id": "sugar",
"name": "sugar",
"name_plural": "sugar",
"name": { "str": "sugar", "str_pl": "sugar" },
"weight": "5 g",
"color": "white",
"container": "box_small",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/comestibles/veggy_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,7 @@
{
"type": "COMESTIBLE",
"id": "tofu_rice",
"name": "tofu fried rice",
"name_plural": "tofu fried rice",
"name": { "str": "tofu fried rice", "str_pl": "tofu fried rice" },
"weight": "135 g",
"color": "yellow",
"spoils_in": "15 days",
Expand All @@ -268,8 +267,7 @@
{
"type": "COMESTIBLE",
"id": "tofu_stirfry",
"name": "tofu stirfry",
"name_plural": "tofu stirfry",
"name": { "str": "tofu stirfry", "str_pl": "tofu stirfry" },
"weight": "135 g",
"color": "yellow",
"spoils_in": "4 days",
Expand Down

0 comments on commit bcfe074

Please sign in to comment.