Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(balance): more vehicle repairs besides tires and solar panels require materials now #4293

Merged
merged 6 commits into from
Mar 6, 2024
Merged

feat(balance): more vehicle repairs besides tires and solar panels require materials now #4293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
575f4eb
commit for remote
chaosvolt Feb 28, 2024
bb6390f
feat(balance): more vehicle repairs besides tires and solar panels re…
chaosvolt Mar 4, 2024
ee3eab8
style(autofix.ci): automated formatting
autofix-ci[bot] Mar 4, 2024
ca36c99
Update vehicle_interact_test.cpp
chaosvolt Mar 4, 2024
8e4796c
Merge branch 'vehicle-repair-material-need' of https://github.com/cha…
chaosvolt Mar 4, 2024
b8bb146
Update vehicle_interact_test.cpp
chaosvolt Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions data/json/requirements/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,42 @@
"//": "Materials used for repairing tires",
"components": [ [ [ "chunk_rubber", 1 ] ] ]
},
{
"id": "vehicle_repair_aluminium",
"type": "requirement",
"//": "Materials used for repairing aluminum parts",
"components": [ [ [ "material_aluminium_ingot", 1 ] ] ]
},
{
"id": "vehicle_repair_electronics",
"type": "requirement",
"//": "Materials used for repairing alternators and general electronics",
"components": [ [ [ "scrap", 1 ] ], [ [ "cable", 3 ] ] ]
},
{
"id": "vehicle_repair_glass",
"type": "requirement",
"//": "Materials used for repairing glass parts",
"components": [ [ [ "glass_shard", 1 ] ] ]
},
{
"id": "vehicle_repair_small_metal",
"type": "requirement",
"//": "Materials used for repairing small metal vehicleparts, that don't warrant use of steel_tiny",
"components": [ [ [ "scrap", 1 ] ] ]
},
{
"id": "vehicle_repair_small_wood",
"type": "requirement",
"//": "Materials used for repairing small wooden vehicleparts, that don't warrant use of wood_structural_small",
"components": [ [ [ "splinter", 1 ] ] ]
},
{
"id": "vehicle_repair_superalloy",
"type": "requirement",
"//": "Materials used for repairing superalloy parts",
"components": [ [ [ "alloy_sheet", 1 ] ] ]
},
{
"id": "wood_structural",
"type": "requirement",
Expand Down
6 changes: 3 additions & 3 deletions data/json/requirements/tailoring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"type": "requirement",
"//": "Shaping and attaching a biosillicified chitin plate to something, per 112 g of biosillicified chitin. Time needed is 10 minutes per unit.",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "acidchitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
"components": [ [ [ "acidchitin_piece", 1 ] ] ]
},
{
"id": "armor_chitin",
"type": "requirement",
"//": "Shaping and attaching a chitin plate to something, per 90 g of chitin. Time needed is 10 minutes per unit.",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "chitin_piece", 1 ] ], [ [ "filament", 1, "LIST" ] ] ]
"components": [ [ [ "chitin_piece", 1 ] ] ]
},
{
"id": "armor_kevlar_plate",
"type": "requirement",
"//": "Shaping and attaching a rigid Kevlar plate to something, per 300 g of rigid Kevlar. Time needed is 10 minutes per unit.",
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "kevlar_plate", 1 ] ], [ [ "superglue", 1 ] ] ]
"components": [ [ [ "kevlar_plate", 1 ] ], [ [ "adhesive", 1, "LIST" ] ] ]
},
{
"id": "armor_steel_plate",
Expand Down
30 changes: 25 additions & 5 deletions data/json/vehicleparts/alternator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "adhesive", 1 ] ] }
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "60 m",
"using": [ [ "adhesive", 1 ], [ "vehicle_repair_electronics", 1 ] ]
}
},
"extend": { "flags": [ "FOLDABLE" ] },
"damage_reduction": { "all": 12 }
Expand All @@ -54,7 +58,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "adhesive", 1 ] ] }
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "60 m",
"using": [ [ "adhesive", 1 ], [ "vehicle_repair_electronics", 1 ] ]
}
},
"extend": { "flags": [ "FOLDABLE" ] },
"damage_reduction": { "all": 12 }
Expand All @@ -78,7 +86,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "60 m",
"using": [ [ "soldering_standard", 5 ], [ "vehicle_repair_electronics", 2 ] ]
}
},
"damage_reduction": { "all": 20 }
},
Expand All @@ -101,7 +113,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "60 m",
"using": [ [ "soldering_standard", 5 ], [ "vehicle_repair_electronics", 2 ] ]
}
},
"damage_reduction": { "all": 20 }
},
Expand All @@ -125,7 +141,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 4 ] ],
"time": "60 m",
"using": [ [ "soldering_standard", 5 ], [ "vehicle_repair_electronics", 2 ] ]
}
},
"damage_reduction": { "all": 25 }
}
Expand Down
6 changes: 5 additions & 1 deletion data/json/vehicleparts/battery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "600 s",
"using": [ [ "soldering_standard", 5 ], [ "vehicle_repair_electronics", 1 ], [ "plastics", 1 ] ]
}
},
"flags": [ "FOLDABLE" ]
},
Expand Down
20 changes: 14 additions & 6 deletions data/json/vehicleparts/boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "60 m",
"using": [ [ "welding_standard", 5 ], [ "vehicle_repair_small_metal", 3 ] ]
}
},
"damage_reduction": { "all": 28 }
},
Expand All @@ -30,7 +34,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "sewing_standard", 2 ], [ "fabric_standard", 1 ] ] }
},
"flags": [ "OPAQUE", "OBSTACLE", "FOLDABLE", "FULL_BOARD", "NO_ROOF_NEEDED" ]
},
Expand Down Expand Up @@ -70,7 +74,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "OBSTACLE", "OPAQUE", "CARGO", "COVERED", "FULL_BOARD", "NO_ROOF_NEEDED", "LOCKABLE_CARGO" ],
"damage_reduction": { "all": 28 }
Expand Down Expand Up @@ -100,7 +104,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "OPAQUE", "OBSTACLE", "FULL_BOARD", "NO_ROOF_NEEDED" ],
"damage_reduction": { "all": 75, "cut": 80, "stab": 80 }
Expand Down Expand Up @@ -130,7 +134,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ], [ "wood_structural_small", 1 ] ] }
},
"flags": [ "OPAQUE", "OBSTACLE", "FULL_BOARD", "NO_ROOF_NEEDED" ],
"damage_reduction": { "all": 16, "cut": 8, "stab": 8 }
Expand Down Expand Up @@ -159,7 +163,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "60 m",
"using": [ [ "welding_standard", 5 ], [ "vehicle_repair_small_metal", 4 ] ]
}
},
"flags": [ "OBSTACLE", "HALF_BOARD", "NO_ROOF_NEEDED" ],
"damage_reduction": { "all": 8 }
Expand Down
40 changes: 30 additions & 10 deletions data/json/vehicleparts/cargo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "sewing_standard", 2 ], [ "fabric_standard", 1 ] ] }
},
"flags": [ "CARGO", "BOARDABLE", "COVERED", "FOLDABLE" ],
"breaks_into": "ig_vp_cloth"
Expand All @@ -38,7 +38,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "450 s", "using": [ [ "welding_standard", 2 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "450 s", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ], "time": "350 s", "using": [ [ "welding_standard", 2 ] ] }
"repair": {
"skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ],
"time": "350 s",
"using": [ [ "welding_standard", 2 ], [ "vehicle_repair_small_metal", 1 ] ]
}
},
"flags": [ "CARGO", "BOARDABLE" ],
"damage_reduction": { "all": 6 }
Expand Down Expand Up @@ -73,7 +77,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "60 m",
"using": [ [ "welding_standard", 5 ], [ "vehicle_repair_small_metal", 1 ] ]
}
},
"flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION" ],
"damage_reduction": { "all": 6 }
Expand All @@ -96,7 +104,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "450 s", "using": [ [ "welding_standard", 2 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "450 s", "qualities": [ { "id": "SAW_M", "level": 1 } ] },
"repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ], "time": "350 s", "using": [ [ "welding_standard", 2 ] ] }
"repair": {
"skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ],
"time": "350 s",
"using": [ [ "welding_standard", 2 ], [ "vehicle_repair_small_metal", 1 ] ]
}
},
"flags": [ "CARGO", "BOARDABLE", "FOLDABLE" ],
"damage_reduction": { "all": 4 }
Expand All @@ -119,7 +131,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "150 s", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "150 s", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 1 ] ], "time": "250 s", "using": [ [ "welding_standard", 1 ] ] }
"repair": {
"skills": [ [ "mechanics", 1 ], [ "fabrication", 1 ] ],
"time": "250 s",
"using": [ [ "welding_standard", 1 ], [ "vehicle_repair_small_metal", 1 ] ]
}
},
"flags": [ "CARGO", "BOARDABLE", "FOLDABLE" ],
"damage_reduction": { "all": 6 }
Expand Down Expand Up @@ -156,7 +172,11 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "60 m",
"using": [ [ "welding_standard", 5 ], [ "vehicle_repair_small_metal", 1 ] ]
}
},
"flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION" ],
"damage_reduction": { "all": 6 }
Expand All @@ -178,7 +198,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 0 ] ], "time": "30 m", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 0 ] ], "time": "15 m", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "adhesive", 1 ] ] }
"repair": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "adhesive", 1 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "CARGO", "BOARDABLE", "COVERED", "LOCKABLE_CARGO" ],
"breaks_into": "ig_vp_frame",
Expand Down Expand Up @@ -214,7 +234,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "UNMOUNT_ON_DAMAGE", "CARGO", "PROTRUSION", "COVERED", "BOARDABLE" ],
"damage_reduction": { "all": 26 }
Expand All @@ -239,7 +259,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "BIKE_RACK_VEH", "MULTISQUARE" ],
"damage_reduction": { "all": 10 }
Expand All @@ -261,7 +281,7 @@
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"flags": [ "UNMOUNT_ON_DAMAGE", "PROTRUSION" ],
"damage_reduction": { "all": 10 }
Expand Down
Loading
Loading