1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -370,8 +370,8 @@
"description": "A dense and tasty fried bread treat.",
"price": 275,
"price_postapoc": 300,
- "material": [ "wheat", "junk" ],
- "primary_material": "wheat",
+ "material": [ "veggy", "junk" ],
+ "primary_material": "veggy",
"volume": "250 ml",
"charges": 6,
"flags": [ "EATEN_HOT" ],
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -38,7 +38,8 @@
"description": "Wait, you can milk almonds? Not quite, but you can blend them with water! A dairy-free alternative high in calcium, and rival to soy milk.",
"price": 40,
"price_postapoc": 50,
- "material": [ "water", "nut" ],
+ "material": "nut",
+ "primary_material": "water",
"volume": "250 ml",
"phase": "liquid",
"vitamins": [ [ "calcium", 11 ] ],
@@ -61,7 +62,8 @@
"description": "Wait, you can milk soybeans? Not quite, but you can blend them with water! A dairy-free alternative high in protein, and rival to almond milk.",
"price": 40,
"price_postapoc": 50,
- "material": [ "water", "veggy" ],
+ "material": "veggy",
+ "primary_material": "water",
"volume": "250 ml",
"phase": "liquid",
"vitamins": [ [ "iron", 1 ], [ "calcium", 7 ] ],
--- a/data/json/items/comestibles/nuts.json
+++ b/data/json/items/comestibles/nuts.json
@@ -443,6 +443,7 @@
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "jar_glass_sealed",
+ "material": [ "nut", "junk" ],
"primary_material": "junk",
"quench": -2,
"calories": 190,
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -79,6 +79,7 @@
"description": "A translucent hexagonal chunk of wax, filled with dense, milky, bitter and acidic-tasting jelly. Though some hold it as a panacea, it doesn't have any medical benefit. Still it is rich with the most beneficial substances the hive can produce.",
"price": 20000,
"price_postapoc": 400,
+ "material": "honey",
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
"fun": -5
|
