add 5gal bucket (CleverRaven#72357)

* add 5gal bucket * zoo_keeper can't hold a 5gal bucket
Kamayana · Mar 18, 2024 · 9733666 · 9733666
1 parent a24bfc1
commit 9733666
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 17 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2678,7 +2678,11 @@
     "required_skills": [ [ "fabrication", 4 ], [ "survival", 4 ] ],
     "time": "120 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
-    "components": [ [ [ "rope_natural", 1, "LIST" ] ], [ [ "bucket", 1 ], [ "bucket_wood", 1 ] ], [ [ "2x4", 4 ], [ "stick", 4 ] ] ],
+    "components": [
+      [ [ "rope_natural", 1, "LIST" ] ],
+      [ [ "bucket", 1 ], [ "bucket_5gal", 1 ], [ "bucket_wood", 1 ] ],
+      [ [ "2x4", 4 ], [ "stick", 4 ] ]
+    ],
     "pre_terrain": "t_covered_well",
     "post_terrain": "t_wooden_well"
   },

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -52,6 +52,7 @@
       [ "trimmer_off", 60 ],
       [ "boots", 60 ],
       [ "bucket", 40 ],
+      [ "bucket_5gal", 40 ],
       [ "gloves_rubber", 60 ],
       [ "fertilizer_liquid", 20 ],
       { "group": "fertilizer_commercial_bag_canvas_60", "prob": 30 },
@@ -176,6 +177,7 @@
       [ "shovel", 5 ],
       { "item": "trimmer_off", "prob": 5, "charges": [ 0, 600 ] },
       [ "bucket", 5 ],
+      [ "bucket_5gal", 10 ],
       [ "rake", 15 ],
       [ "rake_plastic", 5 ],
       [ "stepladder", 15 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -614,6 +614,7 @@
       [ "fish_bait", 100 ],
       [ "fish_trap", 100 ],
       [ "bucket", 100 ],
+      [ "bucket_5gal", 100 ],
       [ "fishing_hook_basic", 100 ]
     ]
   },
@@ -1332,7 +1333,8 @@
       [ "shovel", 10 ],
       [ "e_tool", 5 ],
       { "item": "miner_hat", "prob": 40, "charges": [ 0, 100 ] },
-      [ "bucket", 10 ],
+      [ "bucket", 5 ],
+      [ "bucket_5gal", 20 ],
       [ "grapnel", 1 ],
       { "group": "tools_toolbox", "prob": 1 },
       [ "apron_leather", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -764,6 +764,7 @@
       [ "signal_flare", 25 ],
       [ "grapnel", 10 ],
       [ "bucket", 4 ],
+      [ "bucket_5gal", 4 ],
       [ "folding_poncho", 5 ],
       [ "quikclot", 20 ],
       [ "bfipowder", 20 ],
@@ -1337,6 +1338,7 @@
       { "item": "bow_saw", "prob": 30 },
       { "item": "chainsaw_off", "prob": 10, "charges": [ 0, 450 ] },
       [ "bucket", 100 ],
+      [ "bucket_5gal", 100 ],
       [ "tree_spile", 100 ],
       [ "pot", 100 ]
     ]

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1616,6 +1616,7 @@
       [ "scythe", 1 ],
       [ "straw_hat", 50 ],
       [ "bucket", 40 ],
+      [ "bucket_5gal", 40 ],
       [ "shovel", 40 ],
       [ "clay_pot_flower", 40 ],
       [ "plastic_pot_flower", 60 ],

diff --git a/data/json/itemgroups/SUS/office.json b/data/json/itemgroups/SUS/office.json
@@ -54,6 +54,7 @@
       { "item": "towel", "count": [ 1, 2 ], "prob": 80 },
       { "item": "brush", "prob": 95 },
       { "item": "bucket", "prob": 90 },
+      { "item": "bucket_5gal", "prob": 90, "count": [ 1, 2 ] },
       { "item": "boots_rubber", "prob": 90 },
       { "item": "gloves_rubber", "prob": 90 },
       { "item": "apron_plastic", "prob": 40 },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1422,6 +1422,7 @@
       { "group": "coat_rack", "prob": 5 },
       { "item": "hair_dryer", "prob": 3 },
       { "item": "bucket", "prob": 3 },
+      { "item": "bucket_5gal", "prob": 3 },
       { "item": "briefcase", "prob": 2 },
       { "item": "suitcase_m", "prob": 2 },
       { "item": "candle", "prob": 3, "charges": [ 5, 50 ] },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -736,6 +736,7 @@
       { "item": "match_trigger", "prob": 2 },
       { "item": "grapnel", "prob": 1 },
       { "item": "bucket", "prob": 4 },
+      { "item": "bucket_5gal", "prob": 4 },
       { "item": "sheath", "prob": 13 },
       { "item": "bootsheath", "prob": 8 },
       { "item": "leg_sheath6", "prob": 2 },

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -98,6 +98,7 @@
     "//": "Common household tools",
     "items": [
       [ "bucket", 5 ],
+      [ "bucket_5gal", 5 ],
       [ "funnel", 50 ],
       [ "rake", 15 ],
       [ "rake_plastic", 25 ],
@@ -274,7 +275,7 @@
     "//": "Portable tools for earthworking or farming",
     "items": [
       [ "ax", 80 ],
-      [ "bucket", 40 ],
+      [ "bucket_5gal", 40 ],
       { "item": "chainsaw_off", "prob": 30, "charges": [ 0, 450 ] },
       { "item": "elec_chainsaw_off", "prob": 30, "charges": [ 0, 500 ] },
       { "item": "polesaw_off", "prob": 10, "charges": [ 0, 450 ] },
@@ -308,6 +309,7 @@
       [ "crowbar", 10 ],
       [ "pliers", 200 ],
       [ "bucket", 50 ],
+      [ "bucket_5gal", 50 ],
       [ "mop", 60 ],
       [ "mop_folded", 40 ],
       [ "shovel", 40 ],

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
@@ -1343,6 +1343,33 @@
     ],
     "qualities": [ [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
   },
+  {
+    "id": "bucket_5gal",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "large plastic bucket" },
+    "description": "A bright orange plastic bucket about the size of your torso.",
+    "//": "https://www.homedepot.com/p/The-Home-Depot-5-Gallon-Orange-Homer-Bucket-05GLHD2/100087613",
+    "weight": "815 g",
+    "volume": "26300 ml",
+    "longest_side": "37 cm",
+    "price": 450,
+    "price_postapoc": 10,
+    "material": [ "plastic" ],
+    "symbol": ")",
+    "color": "light_gray",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "watertight": true,
+        "open_container": true,
+        "max_contains_volume": "20000 ml",
+        "max_contains_weight": "40 kg"
+      }
+    ],
+    "qualities": [ [ "CONTAIN", 1 ] ]
+  },
   {
     "id": "bucket_wood",
     "type": "GENERIC",

diff --git a/data/json/mapgen/farm_dairy_2.json b/data/json/mapgen/farm_dairy_2.json
@@ -154,9 +154,9 @@
       },
       "item": {
         "?": { "item": "bottle_glass", "chance": 70, "repeat": 6 },
-        "^": [ { "item": "bucket", "chance": 100 }, { "item": "mop", "chance": 100 } ],
+        "^": [ { "item": "bucket_5gal", "chance": 100 }, { "item": "mop", "chance": 100 } ],
         "A": { "item": "wheel_wood", "chance": 100 },
-        "C": { "item": "bucket", "chance": 100 },
+        "C": { "item": "bucket_5gal", "chance": 100 },
         "j": { "item": "jerrycan", "chance": 100 },
         "h": { "item": "2x4", "chance": 100, "repeat": 2 },
         "o": { "item": "straw_pile", "chance": 100, "repeat": [ 5, 10 ] },

diff --git a/data/json/mapgen/farm_horse.json b/data/json/mapgen/farm_horse.json
@@ -228,7 +228,7 @@
         { "group": "farming_tools", "x": [ 74, 77 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 79, 81 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 75, 81 ], "y": [ 17, 22 ], "chance": 50, "repeat": [ 2, 4 ] },
-        { "item": "bucket", "x": [ 3, 19 ], "y": [ 10, 20 ], "chance": 20, "repeat": 4 },
+        { "item": "bucket_5gal", "x": [ 3, 19 ], "y": [ 10, 20 ], "chance": 20, "repeat": 4 },
         { "item": "cattlefodder_large", "x": [ 3, 19 ], "y": [ 10, 20 ], "chance": 80, "repeat": [ 6, 10 ] }
       ],
       "monsters": { "[": { "monster": "GROUP_HORSES_STABLES", "chance": 1, "density": 0.01 } }

diff --git a/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json b/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
@@ -160,11 +160,11 @@
         { "group": "farming_tools", "x": [ 74, 77 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 79, 81 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 75, 81 ], "y": [ 17, 22 ], "chance": 50, "repeat": [ 2, 4 ] },
-        { "item": "bucket", "x": 46, "y": 48, "chance": 20 },
-        { "item": "bucket", "x": 56, "y": 52, "chance": 30 },
-        { "item": "bucket", "x": 56, "y": 33, "chance": 30 },
-        { "item": "bucket", "x": 56, "y": 37, "chance": 30 },
-        { "item": "bucket", "x": 64, "y": 41, "chance": 30 },
+        { "item": "bucket_5gal", "x": 46, "y": 48, "chance": 20 },
+        { "item": "bucket_5gal", "x": 56, "y": 52, "chance": 30 },
+        { "item": "bucket_5gal", "x": 56, "y": 33, "chance": 30 },
+        { "item": "bucket_5gal", "x": 56, "y": 37, "chance": 30 },
+        { "item": "bucket_5gal", "x": 64, "y": 41, "chance": 30 },
         { "item": "cattlefodder", "x": [ 52, 68 ], "y": [ 31, 41 ], "chance": 80, "repeat": [ 6, 10 ] },
         { "item": "birdfood", "x": [ 40, 44 ], "y": [ 48, 52 ], "chance": 80, "repeat": [ 2, 4 ] }
       ],

diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -408,6 +408,7 @@
       [ "broccoli", 1 ],
       [ "broth", 5 ],
       [ "bucket", 2 ],
+      [ "bucket_5gal", 2 ],
       [ "bum_wine", 5 ],
       [ "c_fishspear", 1 ],
       [ "c4", 1 ],

diff --git a/data/json/npcs/mine/spiral_madman.json b/data/json/npcs/mine/spiral_madman.json
@@ -52,7 +52,7 @@
     "items": [
       [ "pickaxe", 50 ],
       [ "shovel", 50 ],
-      [ "bucket", 20 ],
+      [ "bucket_5gal", 20 ],
       [ "gasoline_lantern", 10 ],
       [ "electric_lantern", 10 ],
       [ "oil_lamp", 10 ],

diff --git a/data/mods/No_Hope/Mapgen/farm_horse_isherwood.json b/data/mods/No_Hope/Mapgen/farm_horse_isherwood.json
@@ -171,11 +171,11 @@
         { "group": "farming_tools", "x": [ 74, 77 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 79, 81 ], "y": 15, "chance": 40, "repeat": [ 2, 4 ] },
         { "group": "farming_tools", "x": [ 75, 81 ], "y": [ 17, 22 ], "chance": 50, "repeat": [ 2, 4 ] },
-        { "item": "bucket", "x": 46, "y": 48, "chance": 20 },
-        { "item": "bucket", "x": 56, "y": 52, "chance": 30 },
-        { "item": "bucket", "x": 56, "y": 33, "chance": 30 },
-        { "item": "bucket", "x": 56, "y": 37, "chance": 30 },
-        { "item": "bucket", "x": 64, "y": 41, "chance": 30 },
+        { "item": "bucket_5gal", "x": 46, "y": 48, "chance": 20 },
+        { "item": "bucket_5gal", "x": 56, "y": 52, "chance": 30 },
+        { "item": "bucket_5gal", "x": 56, "y": 33, "chance": 30 },
+        { "item": "bucket_5gal", "x": 56, "y": 37, "chance": 30 },
+        { "item": "bucket_5gal", "x": 64, "y": 41, "chance": 30 },
         { "item": "cattlefodder", "x": [ 52, 68 ], "y": [ 31, 41 ], "chance": 80, "repeat": [ 6, 10 ] },
         { "item": "birdfood", "x": [ 40, 44 ], "y": [ 48, 52 ], "chance": 80, "repeat": [ 2, 4 ] }
       ],