Skip to content

Commit

Permalink
Convert folded_volume to metric with units
Browse files Browse the repository at this point in the history
Contributes to CleverRaven#36110
  • Loading branch information
wapcaplet committed Jun 22, 2020
1 parent f96f302 commit 13c4382
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 78 deletions.
4 changes: 2 additions & 2 deletions data/json/vehicleparts/alternator.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"power": -75,
"epower": 36,
"damage_modifier": 80,
"folded_volume": 5,
"folded_volume": "1250 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 2, 5 ] },
{ "item": "steel_chunk", "count": [ 2, 5 ] },
Expand All @@ -45,7 +45,7 @@
"power": -746,
"epower": 360,
"damage_modifier": 80,
"folded_volume": 5,
"folded_volume": "1250 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 2, 5 ] },
{ "item": "steel_chunk", "count": [ 2, 5 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"color": "dark_gray",
"broken_color": "light_gray",
"durability": 150,
"folded_volume": 4,
"folded_volume": "1 L",
"description": "Improvised armor plate. Will partially protect other components on the same frame from damage.",
"breaks_into": [ { "item": "rebar", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 4, 8 ] } ],
"requirements": {
Expand Down
10 changes: 5 additions & 5 deletions data/json/vehicleparts/battery.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"broken_color": "red",
"durability": 120,
"description": "A battery for storing electrical power, and discharging it to power electrical devices built into the vehicle.",
"folded_volume": 25,
"folded_volume": "6250 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 6, 9 ] },
{ "item": "steel_chunk", "count": [ 6, 9 ] },
Expand All @@ -30,7 +30,7 @@
"name": { "str": "motorbike battery" },
"item": "battery_motorbike",
"durability": 100,
"folded_volume": 5,
"folded_volume": "1250 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 4, 7 ] },
{ "item": "steel_chunk", "count": [ 4, 7 ] },
Expand All @@ -44,7 +44,7 @@
"name": { "str": "motorbike battery, small" },
"item": "battery_motorbike_small",
"durability": 30,
"folded_volume": 3,
"folded_volume": "750 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 4, 7 ] },
{ "item": "steel_chunk", "count": [ 4, 7 ] },
Expand Down Expand Up @@ -87,7 +87,7 @@
"item": "medium_storage_battery",
"difficulty": 1,
"durability": 250,
"folded_volume": 10,
"folded_volume": "2500 ml",
"breaks_into": [ { "item": "scrap", "count": [ 1, 4 ] }, { "item": "small_storage_battery", "count": [ 0, 7 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "200 s", "using": "vehicle_screw" },
Expand All @@ -103,7 +103,7 @@
"item": "small_storage_battery",
"difficulty": 1,
"durability": 100,
"folded_volume": 2,
"folded_volume": "500 ml",
"breaks_into": [ { "item": "scrap", "count": [ 1, 2 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "100 s", "using": [ ] },
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 @@ -25,7 +25,7 @@
"broken_color": "dark_gray",
"durability": 15,
"description": "A cloth wall. Keeps zombies outside the vehicle and prevents people from seeing through it.",
"folded_volume": 15,
"folded_volume": "3750 ml",
"breaks_into": "ig_vp_cloth",
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
Expand Down
8 changes: 4 additions & 4 deletions data/json/vehicleparts/combustion.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"epower": 0,
"power": 7370,
"energy_consumption": 18425,
"folded_volume": 6,
"folded_volume": "1500 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 5, 10 ] },
{ "item": "steel_chunk", "count": [ 5, 10 ] },
Expand All @@ -152,7 +152,7 @@
"epower": 0,
"power": 41000,
"energy_consumption": 124500,
"folded_volume": 8,
"folded_volume": "2 L",
"breaks_into": [
{ "item": "steel_lump", "count": [ 6, 12 ] },
{ "item": "steel_chunk", "count": [ 6, 12 ] },
Expand All @@ -177,7 +177,7 @@
"epower": 0,
"power": 3728,
"energy_consumption": 9320,
"folded_volume": 3,
"folded_volume": "750 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 2, 4 ] },
{ "item": "steel_chunk", "count": [ 2, 4 ] },
Expand Down Expand Up @@ -326,7 +326,7 @@
"epower": -50,
"power": 37300,
"energy_consumption": 124500,
"folded_volume": 8,
"folded_volume": "2 L",
"breaks_into": [
{ "item": "steel_lump", "count": [ 10, 20 ] },
{ "item": "steel_chunk", "count": [ 10, 20 ] },
Expand Down
6 changes: 3 additions & 3 deletions data/json/vehicleparts/engineering.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"broken_color": "light_blue",
"durability": 100,
"description": "An extendable cantilever crane. If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the 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.",
"folded_volume": 12,
"folded_volume": "3 L",
"breaks_into": [ { "item": "pipe", "count": [ 2, 8 ] }, { "item": "scrap", "count": [ 2, 6 ] } ],
"qualities": [ [ "LIFT", 7 ], [ "JACK", 7 ] ],
"requirements": {
Expand All @@ -65,7 +65,7 @@
"broken_color": "light_blue",
"durability": 100,
"description": "A small pallet lifter. If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the 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.",
"folded_volume": 12,
"folded_volume": "3 L",
"breaks_into": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 2, 6 ] } ],
"qualities": [ [ "LIFT", 1 ], [ "JACK", 1 ] ],
"requirements": {
Expand Down Expand Up @@ -118,7 +118,7 @@
"damage_modifier": 100,
"durability": 300,
"description": "A large metal disc, powered by the vehicle's engines. Use the vehicle controls to turn it on or off. When turned on, it will stop the vehicle unless it has a strong engine. When turned on, it will dig a shallow pit in dirt. Mount it on the edge of your vehicle.",
"folded_volume": 12,
"folded_volume": "3 L",
"power": -70000,
"breaks_into": [
{ "item": "steel_lump", "count": [ 4, 6 ] },
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicleparts/frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"symbol": "h",
"durability": 50,
"description": "A light metal framework, designed to fold. Other vehicle components can be mounted on it. If all the frames and components of a vehicle are foldable, the vehicle can be folding into a small package and picked up as a normal item.",
"folded_volume": 10,
"folded_volume": "2500 ml",
"breaks_into": [ { "item": "steel_chunk", "count": [ 0, 2 ] }, { "item": "scrap", "count": [ 1, 2 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
Expand All @@ -29,7 +29,7 @@
"broken_color": "brown",
"durability": 15,
"description": "A light wooden framework, designed to fold. Other vehicle components can be mounted on it. If all the frames and components of a vehicle are foldable, the vehicle can be folding into a small package and picked up as a normal item.",
"folded_volume": 15,
"folded_volume": "3750 ml",
"breaks_into": [ { "item": "splinter", "count": [ 0, 6 ] }, { "item": "nail", "charges": [ 1, 15 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
Expand Down
14 changes: 7 additions & 7 deletions data/json/vehicleparts/lights.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"//": "essentially an 800lm 10W LED flashlight",
"epower": -10,
"bonus": 30,
"folded_volume": 2,
"folded_volume": "500 ml",
"breaks_into": [ { "item": "scrap", "count": [ 0, 2 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
Expand All @@ -33,7 +33,7 @@
"durability": 20,
"description": "A bright light, self-powered by an atomic decay reaction that never stops. When turned on, it illuminates several squares inside the vehicle.",
"bonus": 30,
"folded_volume": 4,
"folded_volume": "1 L",
"breaks_into": [ { "item": "scrap", "prob": 50 } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
Expand All @@ -50,7 +50,7 @@
"item": "atomic_light",
"description": "A very dim light, self-powered by an atomic decay reaction that never stops. When turned on, it illuminates a single square inside the vehicle that isn't suitable for crafting.",
"bonus": 5,
"folded_volume": 2
"folded_volume": "500 ml"
},
{
"id": "floodlight",
Expand All @@ -67,7 +67,7 @@
"epower": -200,
"bonus": 8000,
"damage_modifier": 10,
"folded_volume": 8,
"folded_volume": "2 L",
"breaks_into": [
{ "item": "cable", "charges": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 0, 2 ] },
Expand Down Expand Up @@ -106,7 +106,7 @@
"epower": -100,
"bonus": 8000,
"damage_modifier": 10,
"folded_volume": 1,
"folded_volume": "250 ml",
"breaks_into": [ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "scrap", "count": [ 0, 2 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
Expand All @@ -129,7 +129,7 @@
"epower": -187,
"bonus": 8000,
"damage_modifier": 10,
"folded_volume": 1,
"folded_volume": "250 ml",
"breaks_into": [ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "scrap", "count": [ 0, 2 ] } ],
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
Expand Down Expand Up @@ -181,7 +181,7 @@
"epower": -10,
"bonus": 500,
"damage_modifier": 10,
"folded_volume": 2,
"folded_volume": "500 ml",
"breaks_into": [
{ "item": "steel_lump", "count": [ 4, 6 ] },
{ "item": "steel_chunk", "count": [ 4, 6 ] },
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicleparts/manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"description": "A set of bicycle style foot pedals. If mounted on the same tile as seat, they allow you to move the vehicle at the cost of your stamina.",
"power": 1600,
"muscle_power_factor": 140,
"folded_volume": 2,
"folded_volume": "500 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
Expand All @@ -46,7 +46,7 @@
"power": 800,
"muscle_power_factor": 50,
"damage_modifier": 50,
"folded_volume": 2,
"folded_volume": "500 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
Expand Down
6 changes: 3 additions & 3 deletions data/json/vehicleparts/motor.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"power": 800,
"energy_consumption": 1000,
"damage_modifier": 80,
"folded_volume": 1,
"folded_volume": "250 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
Expand All @@ -44,7 +44,7 @@
"power": 7040,
"energy_consumption": 8000,
"damage_modifier": 80,
"folded_volume": 1,
"folded_volume": "250 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
Expand All @@ -68,7 +68,7 @@
"power": 36000,
"energy_consumption": 40000,
"damage_modifier": 80,
"folded_volume": 6,
"folded_volume": "1500 ml",
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
Expand Down
Loading

0 comments on commit 13c4382

Please sign in to comment.