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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
--- a/data/json/itemgroups/Food/food.json
+++ b/data/json/itemgroups/Food/food.json
@@ -16,13 +16,13 @@
{ "item": "fish_pickled", "prob": 30, "charges": 2, "container-item": "jar_glass_sealed" },
{ "item": "meat_canned", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_canned", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "apple_canned", "prob": 30, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "can_tomato", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "apple_canned", "prob": 30, "charges": 24, "container-item": "jar_3l_glass_sealed" },
+ { "item": "can_tomato", "prob": 40, "charges": 24, "container-item": "jar_3l_glass_sealed" },
{ "item": "meat_pickled", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "potted_meat", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_pickled", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "sauce_red", "prob": 60, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "sauce_red", "prob": 60, "charges": 48, "container-item": "jar_3l_glass_sealed" },
{ "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }
]
},
@@ -249,15 +249,15 @@
{ "item": "potted_meat", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" },
{ "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "apple_canned", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" },
{ "item": "offal_canned", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "sauce_red", "prob": 4, "charges": 48, "container-item": "jar_3l_glass_sealed" },
{ "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "group": "big_canned_food", "prob": 4 }
]
@@ -270,8 +270,8 @@
{ "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" },
{ "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" },
{ "item": "can_pineapple", "prob": 3, "charges": 12, "container-item": "can_food_big" },
- { "item": "can_corn", "prob": 3, "charges": 6, "container-item": "can_food_big" },
- { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" },
+ { "item": "can_corn", "prob": 3, "charges": 12, "container-item": "can_food_big" },
+ { "item": "sauce_red", "prob": 3, "charges": 48, "container-item": "can_food_big" },
{ "item": "coffee_raw", "prob": 6, "charges": 240, "container-item": "can_food_big" }
]
},
--- a/data/json/itemgroups/SUS/domestic.json
+++ b/data/json/itemgroups/SUS/domestic.json
@@ -148,7 +148,7 @@
{
"distribution": [
{ "item": "coffee_raw", "prob": 50 },
- { "item": "coffee_raw", "prob": 50, "charges": [ 1, 200 ], "container-item": "can_food_big" }
+ { "item": "coffee_raw", "prob": 50, "charges": 240, "container-item": "can_food_big" }
],
"prob": 80
},
--- a/data/json/itemgroups/collections_domestic.json
+++ b/data/json/itemgroups/collections_domestic.json
@@ -552,13 +552,13 @@
{ "item": "thermos", "prob": 15 },
{ "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "apple_canned", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" },
+ { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
- { "item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+ { "item": "sauce_red", "prob": 4, "charges": 48, "container-item": "jar_3l_glass_sealed" },
{ "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "group": "big_canned_food", "prob": 4 }
]
|
