Skip to content

Commit

Permalink
Merge pull request CleverRaven#62525 from irwiss/veh-part-sizes
Browse files Browse the repository at this point in the history
Tidy up vehicle part "size" field
  • Loading branch information
Rivet-the-Zombie authored Dec 9, 2022
2 parents 5fd0f93 + 86f6561 commit 50d81a1
Show file tree
Hide file tree
Showing 20 changed files with 108 additions and 116 deletions.
16 changes: 6 additions & 10 deletions data/json/furniture_and_terrain/appliances.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"description": "A fridge. When turned on, it will cool the food inside, extending the time until the food spoils.",
"//": "Use average consumption, not the max on the appliance rating plate. 30W ~ 260kWh per annum",
"epower": -30,
"size": 2000,
"size": "500 L",
"item": "fridge",
"requirements": {
"removal": { "time": "2 m" },
Expand Down Expand Up @@ -53,7 +53,7 @@
"durability": 100,
"description": "A chest freezer. When turned on, it will freeze and preserve the food inside.",
"epower": -35,
"size": 1800,
"size": "450 L",
"item": "freezer",
"requirements": {
"repair": {
Expand Down Expand Up @@ -108,7 +108,7 @@
{ "item": "element", "count": [ 1, 3 ] },
{ "item": "cable", "charges": [ 1, 3 ] }
],
"size": 200,
"size": "50 L",
"type": "vehicle_part"
},
{
Expand Down Expand Up @@ -164,7 +164,6 @@
{ "item": "power_supply", "prob": 50 },
{ "item": "RAM", "count": [ 0, 2 ] }
],
"size": 200,
"type": "vehicle_part"
},
{
Expand Down Expand Up @@ -809,7 +808,6 @@
"color": "light_blue",
"flags": [ "OBSTACLE", "APPLIANCE", "WASHING_MACHINE", "CARGO", "COVERED", "FLUIDTANK", "ENABLED_DRAINS_EPOWER" ],
"description": "An appliance used to do laundry, plugged into a power supply and using internal tanks.",
"size": 540,
"copy-from": "washing_machine",
"item": "household_washing_machine",
"requirements": { "removal": { "time": "6 m" } }
Expand All @@ -823,7 +821,6 @@
"color": "light_blue",
"flags": [ "OBSTACLE", "APPLIANCE", "DISHWASHER", "CARGO", "COVERED", "FLUIDTANK", "ENABLED_DRAINS_EPOWER" ],
"description": "An appliance used to clean dishes, plugged into a power supply and using internal tanks.",
"size": 480,
"copy-from": "dishwasher",
"item": "household_dishwasher",
"requirements": { "removal": { "time": "6 m" } }
Expand All @@ -837,7 +834,6 @@
"color": "light_blue",
"flags": [ "OBSTACLE", "APPLIANCE", "AUTOCLAVE", "CARGO", "COVERED", "FLUIDTANK", "ENABLED_DRAINS_EPOWER" ],
"description": "An autoclave that can steam its contents at high enough temperatures to completely sterilize them, killing any possible contaminants. This one is plugged into a power grid and running off internal water tanks",
"size": 200,
"copy-from": "autoclave",
"item": "autoclave",
"requirements": { "removal": { "time": "6 m" } }
Expand All @@ -855,7 +851,7 @@
"durability": 40,
"description": "An appliance for recharging batteries. When turned on, it steadily charges any rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly in the attached storage space.",
"bonus": 600,
"size": 800,
"size": "200 L",
"item": "foot_locker_recharge_station",
"flags": [ "CARGO", "OBSTACLE", "RECHARGE", "COVERED", "APPLIANCE", "CTRL_ELECTRONIC" ],
"breaks_into": [
Expand All @@ -880,7 +876,7 @@
"durability": 20,
"description": "An appliance for recharging batteries. When turned on, it slowly charges any rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly in the attached storage space.",
"bonus": 15,
"size": 200,
"size": "50 L",
"item": "box_battery_charger",
"flags": [ "CARGO", "OBSTACLE", "RECHARGE", "COVERED", "APPLIANCE", "CTRL_ELECTRONIC" ],
"breaks_into": [
Expand Down Expand Up @@ -909,7 +905,7 @@
"durability": 500,
"description": "A military-grade ASRG covered in heavy plating. Provides constant power when plugged in to your power grid.",
"epower": 130,
"size": 1800,
"size": "450 L",
"item": "compact_ASRG_containment",
"requirements": {
"repair": {
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/boards.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"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": 250,
"size": "62500 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
Expand Down
17 changes: 8 additions & 9 deletions data/json/vehicleparts/cargo.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"damage_modifier": 60,
"durability": 15,
"folded_volume": "1 L",
"size": 60,
"size": "15 L",
"item": "bag_canvas",
"location": "center",
"requirements": {
Expand All @@ -34,7 +34,7 @@
"broken_color": "brown",
"damage_modifier": 60,
"durability": 75,
"size": 600,
"size": "150 L",
"item": "basket",
"location": "center",
"requirements": {
Expand Down Expand Up @@ -75,7 +75,7 @@
"broken_color": "brown",
"durability": 75,
"description": "Storage space, mounted outside your vehicle's armor and vulnerable to damage.",
"size": 200,
"size": "50 L",
"damage_modifier": 60,
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
Expand All @@ -97,7 +97,7 @@
"broken_color": "brown",
"damage_modifier": 60,
"durability": 75,
"size": 600,
"size": "150 L",
"folded_volume": "6 L",
"item": "folding_basket",
"location": "center",
Expand Down Expand Up @@ -126,7 +126,7 @@
"damage_modifier": 60,
"durability": 75,
"folded_volume": "1500 ml",
"size": 80,
"size": "20 L",
"item": "bike_basket",
"location": "center",
"requirements": {
Expand Down Expand Up @@ -176,7 +176,7 @@
"broken_color": "brown",
"durability": 75,
"description": "Storage space, mounted outside your vehicle's armor and vulnerable to damage.",
"size": 60,
"size": "15 L",
"damage_modifier": 60,
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
Expand All @@ -198,7 +198,7 @@
"broken_color": "brown",
"damage_modifier": 60,
"durability": 100,
"size": 275,
"size": "68750 ml",
"item": "frame",
"location": "center",
"requirements": {
Expand Down Expand Up @@ -236,7 +236,7 @@
"broken_color": "dark_gray",
"durability": 250,
"description": "Storage space, mounted outside your vehicle's armor and vulnerable to damage.",
"size": 1000,
"size": "250 L",
"breaks_into": [ ],
"requirements": {
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
Expand Down Expand Up @@ -285,7 +285,6 @@
"broken_color": "dark_gray",
"durability": 75,
"description": "Spare tire stored on an external carrier rig.",
"size": 60,
"damage_modifier": 60,
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
Expand Down
16 changes: 8 additions & 8 deletions data/json/vehicleparts/doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
},
"size": 10,
"size": "2500 ml",
"symbol": "+",
"symbols": {
"ne": "+",
Expand Down Expand Up @@ -101,7 +101,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
},
"size": 10,
"size": "2500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand Down Expand Up @@ -138,7 +138,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"size": 10,
"size": "2500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand Down Expand Up @@ -175,7 +175,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"size": 10,
"size": "2500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand Down Expand Up @@ -237,7 +237,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
},
"size": 150,
"size": "37500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand All @@ -263,7 +263,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
},
"size": 150,
"size": "37500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand All @@ -289,7 +289,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"size": 150,
"size": "37500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand All @@ -315,7 +315,7 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"size": 150,
"size": "37500 ml",
"symbol": "+",
"symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
"type": "vehicle_part"
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/engineering.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"damage_modifier": 200,
"durability": 300,
"description": "A pair of forklift arms. If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want to jack up the other vehicle to change its wheels. To use it to lift a heavy component like an engine that you are installing or removing, the crane must have line of sight to where it is going and it must be within four tiles of it.",
"size": 50,
"size": "12500 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 4, 6 ] },
{ "item": "steel_chunk", "count": [ 4, 6 ] },
Expand Down
7 changes: 3 additions & 4 deletions data/json/vehicleparts/seats.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
}
},
"size": 100,
"size": "25 L",
"symbol": "#",
"type": "vehicle_part"
},
Expand Down Expand Up @@ -89,7 +89,7 @@
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
}
},
"size": 25,
"size": "6250 ml",
"symbol": "#",
"type": "vehicle_part"
},
Expand Down Expand Up @@ -129,7 +129,7 @@
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
}
},
"size": 120,
"size": "30 L",
"standard_symbols": false,
"symbols": { "vertical": "#", "vertical_left": "#", "vertical_right": "#", "left": "#", "right": "#" },
"type": "vehicle_part"
Expand Down Expand Up @@ -225,7 +225,6 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": "vehicle_weld_removal" },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"size": 25,
"symbol": "#",
"type": "vehicle_part"
},
Expand Down
Loading

0 comments on commit 50d81a1

Please sign in to comment.