diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-07-25 17:55:04 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-07-25 17:55:04 -0700 |
| commit | 5d092e1d2eb0ce4da58887a6bd16cecdc4bb4fe9 (patch) | |
| tree | c2c491624732d6f63625c42a670bb44f49712704 /foods-06_sealed-foods-not-full.patch | |
| parent | Allow the FMC broker to take canned cheese spreads. (diff) | |
| download | cataclysm-bn-5d092e1d2eb0ce4da58887a6bd16cecdc4bb4fe9.tar.xz | |
Fix several more sealed foods spawning partially full. Also fix building with gcc14.
Diffstat (limited to 'foods-06_sealed-foods-not-full.patch')
| -rw-r--r-- | foods-06_sealed-foods-not-full.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/foods-06_sealed-foods-not-full.patch b/foods-06_sealed-foods-not-full.patch index b186449..707a1b7 100644 --- a/foods-06_sealed-foods-not-full.patch +++ b/foods-06_sealed-foods-not-full.patch @@ -1,3 +1,50 @@ +--- a/data/json/itemgroups/Food/food.json ++++ b/data/json/itemgroups/Food/food.json +@@ -12,14 +12,14 @@ + { "item": "veggy_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" }, + { "item": "jar_sauerkraut_pickled", "prob": 5 }, + { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, ++ { "item": "potted_meat", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" }, + { "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": 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": "potted_meat", "prob": 10, "charges": 24, "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": "lobster_pickled", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" }, +@@ -253,7 +253,7 @@ + { "item": "dry_lentils", "prob": 40 }, + { "item": "dry_rice", "prob": 40 }, + { "item": "meat_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" }, ++ { "item": "potted_meat", "prob": 6, "charges": 4, "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": 24, "container-item": "jar_3l_glass_sealed" }, +@@ -261,7 +261,7 @@ + { "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": "potted_meat", "prob": 4, "charges": 24, "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": 48, "container-item": "jar_3l_glass_sealed" }, +@@ -674,7 +674,7 @@ + { "item": "hotdogs_frozen", "prob": 20, "charges": [ 5, 10 ] }, + { "item": "lunchmeat", "prob": 30 }, + { "item": "meat_pickled", "prob": 3, "charges": [ 1, 2 ], "container-item": "jar_glass" }, +- { "item": "potted_meat", "prob": 2, "charges": [ 1, 2 ], "container-item": "jar_glass" }, ++ { "item": "potted_meat", "prob": 2, "charges": [ 1, 4 ], "container-item": "jar_glass" }, + { "item": "tofu", "prob": 15 } + ] + }, + --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -148,7 +148,7 @@ @@ -29,3 +76,15 @@ { "item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" }, { "group": "big_canned_food", "prob": 4 } ] + +--- a/data/json/itemgroups/stashes.json ++++ b/data/json/itemgroups/stashes.json +@@ -31,7 +31,7 @@ + [ "lutefisk", 1 ], + [ "pemmican", 10 ], + { "item": "meat_pickled", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" }, +- { "item": "potted_meat", "prob": 20, "charges": 2, "container-item": "jar_glass_sealed" } ++ { "item": "potted_meat", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" } + ] + }, + { |