Add more generic_factory checks to vpart_info loader

data/json/furniture_and_terrain/appliances.json

@@ -115,8 +115,6 @@
     "durability": 80,
     "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "oven" }, { "id": "hotplate", "hotkey": "h" } ],
-    "//": "Doesn't draw power at baseline, only when cooking.",
-    "epower": "0 W",
     "item": "oven",
     "looks_like": "f_oven",
     "breaks_into": [
@@ -142,7 +140,6 @@
     "durability": 60,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "water_purifier", "hotkey": "p" } ],
-    "epower": "0 W",
     "item": "stationary_water_purifier",
     "looks_like": "f_water_purifier",
     "breaks_into": [
@@ -197,9 +194,6 @@
   {
     "type": "vehicle_part",
     "id": "ap_stereo",
-    "name": { "str": "stereo system" },
-    "description": "A stereo system.  When turned on, it plays music, improving your mood.",
-    "item": "stereo",
     "flags": [ "STEREO", "APPLIANCE", "ENABLED_DRAINS_EPOWER" ],
     "copy-from": "stereo"
   },
@@ -226,7 +220,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "drill_press_tool" } ],
-    "epower": "0 W",
     "item": "drill_press",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -251,7 +244,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "tablesaw_tool" } ],
-    "epower": "0 W",
     "item": "tablesaw",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -276,7 +268,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "mitresaw_tool" } ],
-    "epower": "0 W",
     "item": "mitresaw",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -301,7 +292,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "bandsaw_tool" } ],
-    "epower": "0 W",
     "item": "bandsaw",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -326,7 +316,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "router_tool" } ],
-    "epower": "0 W",
     "item": "router",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -351,7 +340,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "planer_tool" } ],
-    "epower": "0 W",
     "item": "planer",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -376,7 +364,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "jointer_tool" } ],
-    "epower": "0 W",
     "item": "jointer",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -401,7 +388,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "catalytic_cracking_reactor_tool" } ],
-    "epower": "0 W",
     "item": "catalytic_cracking_reactor",
     "breaks_into": [
       { "item": "element", "charges": [ 4, 8 ] },
@@ -427,7 +413,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "hydraulic_press_tool" } ],
-    "epower": "0 W",
     "item": "hydraulic_press",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -451,7 +436,6 @@
     "durability": 80,
     "flags": [ "OBSTACLE", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "air_compressor_tool" } ],
-    "epower": "0 W",
     "item": "air_compressor",
     "breaks_into": [
       { "item": "cable", "charges": [ 0, 4 ] },
@@ -600,7 +584,6 @@
     "color": "yellow",
     "broken_color": "dark_gray",
     "damage_modifier": 10,
-    "epower": "0 W",
     "//": "Epower for POWER_TRANSFER stuff is how much percentage-wise loss there is in transmission",
     "durability": 120,
     "description": "A power cord sticking out of an appliance.  You need to plug it into a powered grid for the appliance to work properly.",
@@ -690,8 +673,6 @@
   {
     "type": "vehicle_part",
     "id": "ap_solar_panel",
-    "name": { "str": "solar panel" },
-    "color": "yellow",
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A solar panel, mounted on a frame and ready to power other appliances.",
     "copy-from": "solar_panel",
@@ -702,7 +683,6 @@
   {
     "type": "vehicle_part",
     "id": "ap_reinforced_solar_panel",
-    "name": { "str": "reinforced solar panel" },
     "color": "yellow",
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A reinforced solar panel, mounted on a frame and ready to power other appliances.",
@@ -714,8 +694,6 @@
   {
     "type": "vehicle_part",
     "id": "ap_solar_panel_v2",
-    "name": { "str": "advanced solar panel" },
-    "color": "yellow",
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A high-performance solar panel, mounted on a frame and ready to power other appliances.",
     "copy-from": "solar_panel_v2",
@@ -726,7 +704,6 @@
   {
     "type": "vehicle_part",
     "id": "ap_reinforced_solar_panel_v2",
-    "name": { "str": "advanced reinforced solar panel" },
     "color": "yellow",
     "flags": [ "SOLAR_PANEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A high-performance reinforced solar panel, mounted on a frame and ready to power other appliances.",
@@ -738,9 +715,7 @@
   {
     "type": "vehicle_part",
     "id": "ap_wind_turbine",
-    "name": { "str": "wind turbine" },
     "location": "structure",
-    "color": "yellow",
     "flags": [ "WIND_TURBINE", "OBSTACLE", "APPLIANCE" ],
     "description": "A mounted wind turbine, ready to power other appliances.",
     "copy-from": "wind_turbine",
@@ -750,9 +725,7 @@
   {
     "type": "vehicle_part",
     "id": "ap_xl_wind_turbine",
-    "name": { "str": "large wind turbine" },
     "location": "structure",
-    "color": "yellow",
     "flags": [ "WIND_TURBINE", "OBSTACLE", "APPLIANCE" ],
     "description": "A large mounted wind turbine, ready to power other appliances.",
     "copy-from": "xl_wind_turbine",
@@ -762,9 +735,7 @@
   {
     "type": "vehicle_part",
     "id": "ap_water_wheel",
-    "name": { "str": "water wheel" },
     "location": "structure",
-    "color": "yellow",
     "flags": [ "WATER_WHEEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A mounted water wheel, ready to power other appliances.",
     "copy-from": "water_wheel",
@@ -774,9 +745,7 @@
   {
     "type": "vehicle_part",
     "id": "ap_xl_water_wheel",
-    "name": { "str": "large water wheel" },
     "location": "structure",
-    "color": "yellow",
     "flags": [ "WATER_WHEEL", "OBSTACLE", "APPLIANCE" ],
     "description": "A mounted large water wheel, ready to power other appliances.",
     "copy-from": "xl_water_wheel",
@@ -798,7 +767,6 @@
     "type": "vehicle_part",
     "id": "ap_battery_medium",
     "name": { "str": "medium grid battery" },
-    "color": "yellow",
     "flags": [ "APPLIANCE" ],
     "description": "A medium battery to store electrical power in a static power grid.",
     "copy-from": "medium_storage_battery",
@@ -849,9 +817,7 @@
   {
     "type": "vehicle_part",
     "id": "ap_washing_machine",
-    "name": { "str": "washing machine" },
     "looks_like": "f_washer",
-    "color": "light_blue",
     "flags": [ "OBSTACLE", "APPLIANCE", "WASHING_MACHINE", "CARGO", "COVERED", "ENABLED_DRAINS_EPOWER" ],
     "description": "An appliance used to clean laundry, plugged into a power supply and using internal water tanks.",
     "size": "135 L",
@@ -865,7 +831,6 @@
     "id": "ap_dishwasher",
     "name": { "str": "dishwasher" },
     "looks_like": "f_dishwasher",
-    "color": "light_blue",
     "flags": [ "OBSTACLE", "APPLIANCE", "DISHWASHER", "CARGO", "COVERED", "ENABLED_DRAINS_EPOWER" ],
     "description": "An appliance used to clean dishes, plugged into a power supply and using internal tanks.",
     "size": "120 L",
@@ -1008,7 +973,6 @@
     "type": "vehicle_part",
     "id": "ap_oxygen_concentrator",
     "name": { "str": "oxygen concentrator" },
-    "color": "light_gray",
     "categories": [ "utility" ],
     "broken_color": "dark_gray",
     "damage_modifier": 35,
@@ -1029,7 +993,6 @@
     "type": "vehicle_part",
     "id": "ap_hd_compressor_unit",
     "name": { "str": "high pressure compressor unit" },
-    "color": "light_gray",
     "categories": [ "utility" ],
     "broken_color": "dark_gray",
     "damage_modifier": 45,

data/json/vehicleparts/armor.json

@@ -7,7 +7,6 @@
     "location": "armor",
     "categories": [ "warfare" ],
     "color": "dark_gray",
-    "broken_color": "light_gray",
     "durability": 150,
     "folded_volume": "1 L",
     "//": "4x80cm rebars arranged in a # or //// pattern. Half the surface area is welded (40 cm per rebar)",

data/json/vehicleparts/battery.json

@@ -71,7 +71,6 @@
     "copy-from": "large_storage_battery",
     "type": "vehicle_part",
     "name": { "str": "swappable very large storage battery" },
-    "item": "large_storage_battery",
     "location": "on_battery_mount",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 0 ] ], "time": "10 s", "using": [  ] },
@@ -140,7 +139,6 @@
     "copy-from": "storage_battery",
     "type": "vehicle_part",
     "name": { "str": "swappable large storage battery" },
-    "item": "storage_battery",
     "location": "on_battery_mount",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 0 ] ], "time": "10 s", "using": [  ] },

data/json/vehicleparts/boards.json

@@ -161,7 +161,6 @@
     "name": { "str": "stow board" },
     "item": "sheet_metal",
     "color": "white",
-    "broken_color": "light_gray",
     "durability": 80,
     "description": "A metal wall with a storage locker.  Keeps zombies outside the vehicle and prevents people from seeing through it.",
     "size": "62500 ml",
@@ -215,7 +214,6 @@
     "type": "vehicle_part",
     "copy-from": "hdboard_abstract",
     "name": { "str": "heavy-duty board" },
-    "description": "A strong metal wall.  Keeps zombies outside the vehicle and prevents people from seeing through it.",
     "extend": { "flags": [ "OPAQUE", "FULL_BOARD" ] }
   },
   {

data/json/vehicleparts/cargo.json

@@ -4,7 +4,6 @@
     "id": "cargo_bag",
     "name": { "str": "storage bag" },
     "categories": [ "cargo" ],
-    "color": "light_gray",
     "broken_color": "dark_gray",
     "damage_modifier": 60,
     "durability": 15,
@@ -195,7 +194,6 @@
     "item": "cargo_rack",
     "location": "structure",
     "categories": [ "cargo" ],
-    "color": "light_gray",
     "broken_color": "dark_gray",
     "durability": 250,
     "description": "Storage space, mounted outside your vehicle's armor and vulnerable to damage.",
@@ -222,7 +220,6 @@
     "item": "bike_rack",
     "location": "anywhere",
     "categories": [ "cargo" ],
-    "color": "light_gray",
     "broken_color": "dark_gray",
     "durability": 150,
     "description": "A collection of pipes and frames for supporting a bike or other small vehicle and carrying it on your vehicle.  Move a single tile wide vehicle so that all of that vehicle's tiles are next to bike racks, and then 'e'xamine any bike rack to mount that vehicle onto the bike rack.  'e'xamine the bike rack to unmount the carried vehicle.",
@@ -248,7 +245,6 @@
     "item": "mounted_spare_tire",
     "location": "structure",
     "categories": [ "other" ],
-    "color": "light_gray",
     "broken_color": "dark_gray",
     "durability": 75,
     "description": "Spare tire stored on an external carrier rig.",

data/json/vehicleparts/combustion.json

@@ -167,7 +167,6 @@
     "item": "1cyl_combustion",
     "description": "A 50cc gasoline engine, suitable for a lawnmower, golf cart or moped.",
     "durability": 150,
-    "epower": "0 W",
     "power": "7370 W",
     "energy_consumption": "18425 W",
     "folded_volume": "12 L",
@@ -194,7 +193,6 @@
     "item": "1cyl_combustion_large",
     "description": "A 200cc engine, suitable for a dirt bike or scooter.",
     "durability": 150,
-    "epower": "0 W",
     "power": "21000 W",
     "energy_consumption": "49800 W",
     "folded_volume": "42 L",
@@ -220,9 +218,7 @@
     "type": "vehicle_part",
     "item": "1cyl_combustion_small",
     "description": "A small 25cc gasoline engine, suitable for a hedge trimmer or installing on a bicycle.",
-    "fuel_type": "gasoline",
     "durability": 120,
-    "epower": "0 W",
     "power": "3728 W",
     "energy_consumption": "9320 W",
     "folded_volume": "6 L",
@@ -445,7 +441,6 @@
     "type": "vehicle_part",
     "item": "steam_watts_small",
     "durability": 200,
-    "epower": "0 W",
     "power": "55950 W",
     "energy_consumption": "112000 W",
     "breaks_into": [
@@ -471,7 +466,6 @@
     "type": "vehicle_part",
     "item": "steam_triple_small",
     "durability": 200,
-    "epower": "0 W",
     "power": "93250 W",
     "energy_consumption": "186500 W",
     "breaks_into": [

data/json/vehicleparts/doors.json

@@ -115,7 +115,6 @@
     "copy-from": "door_opaque",
     "damage_modifier": 75,
     "description": "An interior door.  Solid construction means you can't see through it when closed.",
-    "durability": 240,
     "name": { "str": "internal door" },
     "type": "vehicle_part"
   },
@@ -201,7 +200,6 @@
     "damage_modifier": 75,
     "durability": 160,
     "size": "0 ml",
-    "description": "A door.  Has a window so you can see out of it, even when closed.",
     "item": "frame_wood",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
@@ -220,7 +218,6 @@
     "name": { "str": "opaque wooden door" },
     "durability": 170,
     "description": "A door.  Solid construction means you can't see through it when closed.",
-    "size": "0 ml",
     "extend": { "flags": [ "OPAQUE" ] },
     "delete": { "flags": [ "WINDOW" ] },
     "damage_reduction": { "all": 12 }
@@ -283,9 +280,7 @@
     "copy-from": "door_trunk",
     "name": { "str": "sliding door" },
     "looks_like": "door",
-    "durability": 150,
     "description": "A door.  A window lets you see through it when closed.",
-    "item": "frame",
     "breaks_into": "ig_vp_frame",
     "delete": { "flags": [ "LOW_FINAL_AIR_DRAG", "NO_ROOF_NEEDED", "WINDOW" ] }
   }