Split vehicle part wheel_caster into small and large variants

data/json/items/vehicle/wheel.json

@@ -480,18 +480,37 @@
     "id": "wheel_caster",
     "category": "veh_parts",
     "type": "WHEEL",
-    "name": { "str": "set of casters", "str_pl": "sets of casters" },
-    "description": "A set of casters, like you'd find on a shopping cart.",
-    "weight": "1500 g",
+    "name": { "str": "set of small casters", "str_pl": "sets of small casters" },
+    "description": "A set of small casters, like you'd find on an office chair.",
+    "weight": "1150 g",
     "volume": "1250 ml",
     "longest_side": "102 mm",
-    "price": 14000,
+    "price": 2400,
     "price_postapoc": 100,
     "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "]",
     "color": "dark_gray",
-    "diameter": 4,
+    "diameter": 2,
+    "width": 1,
+    "melee_damage": { "bash": 5 }
+  },
+  {
+    "id": "wheel_caster_large",
+    "category": "veh_parts",
+    "type": "WHEEL",
+    "name": { "str": "set of large casters", "str_pl": "sets of large casters" },
+    "description": "A set of large casters, like you'd find on a shopping cart.",
+    "weight": "2700 g",
+    "volume": "3150 ml",
+    "longest_side": "190 mm",
+    "price": 4500,
+    "price_postapoc": 200,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "]",
+    "color": "dark_gray",
+    "diameter": 6,
     "width": 1,
     "melee_damage": { "bash": 6 }
   },

data/json/recipes/recipe_vehicle.json

@@ -643,6 +643,22 @@
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [ [ [ "plastic_chunk", 4 ] ] ]
   },
+  {
+    "result": "wheel_caster_large",
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "time": "90 m",
+    "autolearn": true,
+    "//": "22cm weld",
+    "using": [ [ "welding_standard", 22 ], [ "steel_tiny", 5 ], [ "plastic_molding", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 } ],
+    "components": [ [ [ "plastic_chunk", 12 ] ] ]
+  },
   {
     "result": "mounted_spare_tire",
     "type": "recipe",

data/json/vehicleparts/wheel.json

@@ -352,7 +352,7 @@
     "categories": [ "movement" ],
     "color": "dark_gray",
     "durability": 70,
-    "description": "A set of small wheels, mounted on pivots, like the ones on a rolling office chair or grocery cart.",
+    "description": "A set of small wheels, mounted on pivots, like the ones on a rolling office chair.",
     "damage_modifier": 50,
     "folded_volume": "1250 ml",
     "breaks_into": [
@@ -372,6 +372,35 @@
     "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "STEERABLE" ],
     "variants": [ { "symbols": "o", "symbols_broken": "x" } ]
   },
+  {
+    "id": "wheel_caster_large",
+    "type": "vehicle_part",
+    "name": { "str": "large casters" },
+    "item": "wheel_caster_large",
+    "location": "under",
+    "categories": [ "movement" ],
+    "color": "dark_gray",
+    "description": "A set of wheels, mounted on pivots, like the ones on a grocery cart.",
+    "durability": 70,
+    "damage_modifier": 50,
+    "folded_volume": "3150 ml",
+    "breaks_into": [
+      { "item": "steel_lump", "prob": 50 },
+      { "item": "steel_chunk", "count": [ 1, 2 ] },
+      { "item": "scrap", "count": [ 1, 2 ] }
+    ],
+    "rolling_resistance": 14.0,
+    "wheel_offroad_rating": 0.4,
+    "wheel_terrain_modifiers": { "FLAT": [ 0, 6 ], "ROAD": [ 0, 3 ] },
+    "contact_area":12,
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_1", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_1", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "soldering_standard", 15 ] ] }
+    },
+    "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "STEERABLE" ],
+    "variants": [ { "symbols": "o", "symbols_broken": "x" } ]
+  },
   {
     "id": "wheel_skateboard",
     "type": "vehicle_part",

data/json/vehicles/carts.json

@@ -130,15 +130,15 @@
     "type": "vehicle",
     "name": "Shopping Cart",
     "blueprint": [ "o" ],
-    "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "basketlg#cart" ] } ],
+    "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster_large", "basketlg#cart" ] } ],
     "items": [ { "x": 0, "y": 0, "chance": 35, "item_groups": [ "trash_cart" ] } ]
   },
   {
     "id": "rolling_trash_can",
     "type": "vehicle",
     "name": "Rolling Trash Can",
     "blueprint": [ [ "o" ] ],
-    "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe", "wheel_caster", "integrated_trashcan" ] } ],
+    "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe", "wheel_caster_large", "integrated_trashcan" ] } ],
     "items": [
       { "x": 0, "y": 0, "chance": 20, "item_groups": [ "rolling_trash" ] },
       { "x": 0, "y": 0, "chance": 20, "item_groups": [ "rolling_trash" ] },
@@ -154,7 +154,7 @@
       [ "-" ]
     ],
     "parts": [
-      { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "basketlg#cart" ] },
+      { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster_large", "basketlg#cart" ] },
       { "x": -1, "y": 0, "parts": [ "cart_handle" ] }
     ],
     "items": [ { "x": 0, "y": 0, "chance": 35, "item_groups": [ "trash_cart" ] } ]
@@ -211,7 +211,7 @@
     "name": "Welding Cart",
     "blueprint": [ "&" ],
     "parts": [
-      { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "small_storage_battery" ] },
+      { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster_large", "small_storage_battery" ] },
       { "x": 0, "y": 0, "parts": [ { "part": "veh_tools_workshop", "tools": [ "welder", "soldering_iron" ] } ] }
     ],
     "items": [ { "x": 0, "y": 0, "chance": 30, "items": [ "goggles_welding" ] } ]

tests/submap_load_test.cpp

@@ -459,9 +459,9 @@ static std::string submap_vehicle_ss(
     "          \"ammo_pref\": \"null\"\n"
     "        },\n"
     "        {\n"
-    "          \"id\": \"wheel_caster\",\n"
+    "          \"id\": \"wheel_caster_large\",\n"
     "          \"base\": {\n"
-    "            \"typeid\": \"wheel_caster\",\n"
+    "            \"typeid\": \"wheel_caster_large\",\n"
     "            \"damaged\": 3372,\n"
     "            \"item_tags\": [ \"VEHICLE\" ],\n"
     "            \"relic_data\": null,\n"