Concrete Mixer audit

data/json/construction.json

@@ -1120,7 +1120,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "60 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ],
     "pre_terrain": "t_pit_shallow",
@@ -1299,7 +1299,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_pit_shallow",
@@ -1313,7 +1313,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_sconc_wall_halfway",
@@ -1354,7 +1354,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_reb_cage",
@@ -1368,7 +1368,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -1382,7 +1382,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "rope_6", 8 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -1410,7 +1410,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_reb_cage",
@@ -1424,7 +1424,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_column_halfway",
@@ -1465,7 +1465,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_ov_smreb_cage",
@@ -1493,7 +1493,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ],
     "pre_terrain": "t_ov_reb_cage",
@@ -1507,7 +1507,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ],
     "pre_terrain": "t_strconc_floor_halfway",
@@ -1997,7 +1997,7 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
     "//": "The frame is used to keep the shape of the hole until the concrete is solid",
-    "tools": [ [ [ "con_mix", 50 ] ], [ [ "frame_wood", -1 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ], [ [ "frame_wood", -1 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_sconc_wall_halfway",
@@ -2011,7 +2011,7 @@
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
     "//": "The frame is used to keep the shape of the hole until the concrete is solid",
-    "tools": [ [ [ "con_mix", 50 ] ], [ [ "frame_wood", -1 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ], [ [ "frame_wood", -1 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -2732,7 +2732,7 @@
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ], [ { "id": "SMOOTH", "level": 2 } ] ],
     "using": [ [ "welding_standard", 500 ], [ "welding_standard", 500 ] ],
     "//1": "lots of 1 meter square metal sheet and plating so very big weld",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "components": [
       [ [ "hdframe", 1 ] ],
       [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 40 ] ],
@@ -4947,7 +4947,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
-    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ],
     "pre_special": [ "check_empty", "check_stable", "check_up_OK", "check_nofloor_above" ],
@@ -4963,7 +4963,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
-    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ],
     "pre_special": [ "check_empty", "check_stable", "check_up_OK", "check_nofloor_above", "check_ramp_high" ],

data/json/itemgroups/tools.json

@@ -93,7 +93,7 @@
     "items": [
       { "item": "brick_kiln", "prob": 80, "charges": [ 0, 1000 ] },
       { "item": "kiln", "prob": 40 },
-      { "item": "con_mix", "prob": 120, "charges": [ 0, 500 ] },
+      { "item": "con_mix_foldable", "prob": 120 },
       { "item": "elec_jackhammer", "prob": 40, "charges": [ 0, 6600 ] },
       { "item": "reciprocating_saw", "prob": 80, "charges": [ 0, 500 ] },
       { "item": "cordless_impact_wrench", "prob": 20, "charges": [ 0, 500 ] },

data/json/items/containers/containers.json

@@ -43,15 +43,16 @@
     "id": "30gal_barrel",
     "type": "GENERIC",
     "category": "container",
-    "name": { "str": "30 gallon barrel" },
+    "name": { "str": "30 gallon plastic barrel" },
     "looks_like": "55gal_drum",
     "description": "A huge plastic barrel with a watertight lid.",
     "ascii_picture": "30gal_barrel",
     "weight": "6800 g",
-    "volume": "118125 ml",
-    "price": 5000,
+    "volume": "165640 ml",
+    "longest_side": "72 cm",
+    "price": "71 USD",
     "price_postapoc": 250,
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": "0",
     "color": "light_blue",
@@ -60,13 +61,14 @@
         "pocket_type": "CONTAINER",
         "watertight": true,
         "rigid": true,
-        "max_contains_volume": "112500 ml",
+        "max_contains_volume": "113560 ml",
         "max_contains_weight": "255 kg"
       }
     ],
     "qualities": [ [ "CONTAIN", 1 ] ],
     "flags": [ "COLLAPSE_CONTENTS" ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 8 },
+    "//": "Based on https://www.amazon.com/dp/B0025QI4XC"
   },
   {
     "id": "30gal_drum",

data/json/items/fake.json

@@ -406,5 +406,12 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "default_magazine": "pseudo_battery" } ],
     "charges_per_use": 100,
     "charged_qualities": [ [ "PRESSURIZATION", 10 ] ]
+  },
+  {
+    "id": "concrete_mix_tool",
+    "type": "TOOL",
+    "name": { "str": "concrete mixer" },
+    "copy-from": "fake_appliance_tool",
+    "charges_per_use": 20
   }
 ]

data/json/items/tool/workshop.json

@@ -245,32 +245,39 @@
     "//2": "Based on https://www.amazon.com/dp/B000A24RCA"
   },
   {
-    "id": "con_mix",
+    "id": "con_mix_foldable",
     "type": "TOOL",
     "name": { "str": "concrete mixer" },
-    "description": "A portable concrete mixer.  It is still large and heavy, but it can be operated solo, and runs on batteries.  It also has a heater built in.",
-    "weight": "9071 g",
-    "volume": "5 L",
-    "price": 50000,
+    "description": "A portable concrete mixer.  It is large and heavy, but it can be operated solo.  Unfold to use.",
+    "looks_like": "con_mix",
+    "weight": "40823 g",
+    "volume": "250 L",
+    "longest_side": "118 cm",
+    "//1": "Calculated by assuming a cylinder with dimensions taken from the drum opening (14.5in) and product length (46.5in) and then doubling it. Calculating volume from the product dimensions inflated it artifically as it counted all the free space inbetween the handles, wheels, etc resulting in 600+l of volume (a portable concrete mixer that can't be transported in a vehicle lmao).",
+    "price": "400 USD",
     "price_postapoc": 500,
-    "to_hit": -6,
-    "material": [ "steel" ],
-    "symbol": "$",
-    "color": "dark_gray",
-    "ammo": [ "battery" ],
-    "charges_per_use": 20,
-    "qualities": [ [ "CONTAIN", 1 ] ],
-    "flags": [ "ALLOWS_REMOTE_USE" ],
-    "use_action": [ "HOTPLATE", { "type": "link_up", "cable_length": 15, "charge_rate": "1500 W" } ],
+    "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" },
+    "material": [ "plastic", "steel" ],
     "pocket_data": [
       {
-        "pocket_type": "MAGAZINE_WELL",
-        "rigid": true,
-        "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_battery_cell"
+        "max_contains_volume": "100 L",
+        "max_contains_weight": "300 kg",
+        "watertight": true,
+        "open_container": true,
+        "rigid": true
       }
     ],
-    "melee_damage": { "bash": 15 }
+    "symbol": "$",
+    "color": "dark_gray",
+    "qualities": [ [ "CONTAIN", 1 ] ],
+    "flags": [ "NO_SALVAGE" ],
+    "use_action": [ "UNFOLD_GENERIC" ],
+    "variables": {
+      "vehicle_name": "Concrete mixer",
+      "folded_parts": "[{\"id\": \"frame_concrete_mix\",\"base\":{\"typeid\":\"frame_concrete_mix\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"wheel_mount_concrete_mix\",\"base\":{\"typeid\":\"wheel_mount_concrete_mix\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\": 0,\"mount_dy\": 0},{\"id\":\"wheel_set_concrete_mix\",\"base\":{\"typeid\":\"wheel_set_concrete_mix\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\": 0,\"mount_dy\":0},{\"id\":\"drum_concrete_mix\",\"base\":{\"typeid\":\"30gal_barrel\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"engine_electric_small\",\"base\":{\"typeid\":\"motor_small\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0},{\"id\":\"small_storage_battery\",\"base\":{\"typeid\":\"small_storage_battery\",\"item_tags\":[\"VEHICLE\"]},\"mount_dx\":0,\"mount_dy\":0}]"
+    },
+    "melee_damage": { "bash": 15 },
+    "//2": "Based on https://www.amazon.com/dp/B01EGB6TJ4 - save for the numbers that the Amazon arcticle got straight up wrong (weight and drum opening) which were taken from the owner's manual - https://assets.northerntool.com/products/494/documents/manuals/49413.pdf"
   },
   {
     "id": "cordless_drill",

data/json/items/vehicle/frames.json

@@ -118,5 +118,16 @@
     "price": 1000,
     "price_postapoc": 50,
     "copy-from": "foldframe"
+  },
+  {
+    "type": "GENERIC",
+    "id": "frame_concrete_mix",
+    "name": { "str_sp": "concrete mixer chassis" },
+    "description": "The chassis of a concrete mixer.",
+    "weight": "9700 g",
+    "volume": "10 L",
+    "color": "light_gray",
+    "symbol": "]",
+    "category": "veh_parts"
   }
 ]

data/json/items/vehicle/wheel.json

@@ -778,5 +778,24 @@
     "name": { "str": "banded wooden cart wheel" },
     "description": "A handmade wooden cart wheel with metal bands for durability.",
     "relative": { "weight": "500 g" }
+  },
+  {
+    "id": "wheel_mount_concrete_mix",
+    "type": "GENERIC",
+    "name": { "str_sp": "concrete mixer wheel mounts" },
+    "description": "A set of two small wheel mounts from a concrete mixer.",
+    "copy-from": "wheel_mount_light",
+    "weight": "300 g",
+    "volume": "500 ml"
+  },
+  {
+    "id": "wheel_set_concrete_mix",
+    "type": "WHEEL",
+    "name": { "str_sp": "concrete mixer wheels" },
+    "description": "A set of two small wheels from a concrete mixer.",
+    "copy-from": "wheel_small",
+    "weight": "5444 g",
+    "volume": "5500 ml",
+    "width": 6
   }
 ]

data/json/mapgen/construction_site.json

@@ -33,7 +33,7 @@
         "                        "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 0, 8 ], "y": [ 5, 7 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 0, 8 ], "y": [ 5, 7 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 12, "y": 4, "chance": 70, "rotation": 180 } ]
     }
   },
@@ -71,7 +71,7 @@
         "                        "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 5, 9 ], "y": [ 4, 7 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 5, 9 ], "y": [ 4, 7 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 12, "y": 4, "chance": 70, "rotation": 0 } ]
     }
   },
@@ -109,7 +109,7 @@
         "   c            ss      "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 0, 4 ], "y": [ 17, 19 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 0, 4 ], "y": [ 17, 19 ] } ],
       "place_vehicles": [
         { "vehicle": "small_utility_vehicles", "x": 22, "y": 4, "chance": 66, "rotation": 270 },
         { "vehicle": "small_utility_vehicles", "x": 12, "y": 21, "chance": 66, "rotation": 180 }
@@ -150,7 +150,7 @@
         "   --  --  --  --  --   "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 0, 17 ], "y": 1 } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 0, 17 ], "y": 1 } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 20, "y": [ 6, 11 ], "chance": 70, "rotation": 270 } ]
     }
   },
@@ -188,7 +188,7 @@
         " c c                    "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 5, 11 ], "y": [ 20, 23 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 5, 11 ], "y": [ 20, 23 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 15, "y": 21, "chance": 70, "rotation": 180 } ]
     }
   }

data/json/mapgen/house/house_vacant.json

@@ -34,7 +34,7 @@
         "   --  --  --  --  --   "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 12, 22 ], "y": [ 19, 22 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 12, 22 ], "y": [ 19, 22 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 11, "y": 2, "chance": 70, "rotation": 0 } ]
     }
   },
@@ -73,7 +73,7 @@
         "   @@  sss   11 22 22   "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 1, 9 ], "y": [ 16, 19 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 1, 9 ], "y": [ 16, 19 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 20, "y": 2, "chance": 70, "rotation": 0 } ]
     }
   },
@@ -112,7 +112,7 @@
         " ss      --   --        "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 2, 8 ], "y": [ 19, 21 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 2, 8 ], "y": [ 19, 21 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 5, "y": 2, "chance": 70, "rotation": 0 } ]
     }
   },
@@ -151,7 +151,7 @@
         "                        "
       ],
       "palettes": [ "construction_site_palette" ],
-      "place_loot": [ { "item": "con_mix", "x": [ 7, 13 ], "y": [ 1, 5 ] } ],
+      "place_loot": [ { "item": "con_mix_foldable", "x": [ 7, 13 ], "y": [ 1, 5 ] } ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 4, "y": 4, "chance": 70, "rotation": 90 } ]
     }
   }

data/json/npcs/NC_JUNK_SHOPKEEP.json

@@ -242,7 +242,7 @@
       { "item": "polisher", "prob": 20 },
       { "item": "screwdriver", "prob": 40 },
       { "item": "hammer", "prob": 35 },
-      { "item": "con_mix", "prob": 10 },
+      { "item": "con_mix_foldable", "prob": 10 },
       { "item": "brick_kiln", "prob": 10 },
       { "item": "kiln", "prob": 4 },
       { "item": "g_shovel", "prob": 20 },