Skip to content

Commit 3e70e41

Browse files
authored
Merge pull request #81918 from dynst/cheese-wheels
add cheese wheels
2 parents f8c7f1d + cc52fcb commit 3e70e41

File tree

5 files changed

+35
-4
lines changed

5 files changed

+35
-4
lines changed

data/json/itemgroups/Food/food.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"entries": [
99
{ "item": "jar_glass_sealed", "prob": 10 },
1010
{ "item": "jar_3l_glass_sealed", "prob": 10 },
11-
{ "prob": 5, "group": "cheese_hard_wrapper_8" },
11+
{ "prob": 15, "group": "cheese_hard_wrapper_8" },
12+
{ "prob": 20, "item": "cheese_hard", "count": -1 },
1213
{ "prob": 50, "group": "veggy_pickled_jar_glass_sealed_2" },
1314
{ "prob": 5, "group": "sauerkraut_jar_glass_sealed_2" },
1415
{ "prob": 20, "group": "meat_pickled_jar_glass_sealed_2" },

data/json/itemgroups/art_antiques_crafts.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
{ "item": "sword_bayonet", "prob": 10 },
151151
{ "item": "bagh_nakha", "prob": 5 },
152152
{ "item": "kris", "prob": 5 },
153-
{ "prob": 1, "group": "cheese_hard_wrapper_8" },
153+
{ "prob": 1, "item": "cheese_hard", "count": -1 },
154154
{ "item": "tinderbox", "prob": 4 },
155155
{ "item": "flint_steel", "prob": 7 },
156156
{ "item": "canteen_wood", "prob": 5 },

data/json/itemgroups/food_service.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@
14791479
{ "prob": 50, "count": [ 1, 3 ], "group": "tortilla_flour_bag_plastic_full" },
14801480
{ "item": "sauce_red", "prob": 30 },
14811481
{ "prob": 60, "count": [ 1, 3 ], "group": "nachos_bag_plastic_full" },
1482-
{ "prob": 40, "group": "cheese_hard_wrapper_8" },
1482+
{ "prob": 40, "item": "cheese_hard", "count": [ 4, -1 ] },
14831483
{ "prob": 20, "count": [ 1, 3 ], "group": "can_beans_can_medium_2" },
14841484
{ "prob": 60, "count": [ 1, 3 ], "group": "dry_beans_bag_plastic_full" },
14851485
{ "item": "dry_mushroom", "prob": 40, "count": [ 1, 3 ] },

data/json/items/comestibles/dairy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"copy-from": "cheese",
235235
"weight": "34 g",
236236
"spoils_in": "180 days",
237-
"container": "wrapper",
237+
"container": "cheese_wheel_wax",
238238
"quench": -5,
239239
"calories": 135,
240240
"description": "Hard, dry cheese made to last, unlike modern processed cheese. Will make you thirsty though.",
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[
2+
{
3+
"id": "cheese_wheel_wax",
4+
"type": "ITEM",
5+
"category": "container",
6+
"name": { "str": "wax coating" },
7+
"looks_like": "can_food",
8+
"description": "The wax coating for a big wheel of cheese. Could preserve it basically indefinitely, if left sealed.",
9+
"weight": "215 g",
10+
"volume": "2100 ml",
11+
"longest_side": "16 cm",
12+
"price": "0 cent",
13+
"price_postapoc": "0 cent",
14+
"material": [ "paraffin_wax" ],
15+
"symbol": "%",
16+
"color": "yellow",
17+
"pocket_data": [
18+
{
19+
"pocket_type": "CONTAINER",
20+
"rigid": true,
21+
"watertight": true,
22+
"//": "To be sealable, has to be sized for exactly 60 cheese. See issue #81781",
23+
"max_contains_volume": "1860 ml",
24+
"max_contains_weight": "3 kg",
25+
"sealed_data": { "spoil_multiplier": 0.0 },
26+
"item_restriction": [ "cheese_hard" ]
27+
}
28+
]
29+
}
30+
]

0 commit comments

Comments
 (0)