Skip to content

Commit

Permalink
Complete mess of vehicle changes (CleverRaven#68248)
Browse files Browse the repository at this point in the history
* initial commit

* move car_sports_atomic to TEST_DATA

* and to aftershock since it uses it

* add bicycle_folding to vehicle groups

* rename motorcycle_rail

* part two

* replace mountable heater with integrated

* replace mounted cooler with integrated one

* you should copy-from it, not replace it

* add cooler as separate item

* lint

* tweak vehicle efficiency test accordingly

* more test fixes

* Remove bicycle_folding

* i don't know what i'm doing
  • Loading branch information
GuardianDll authored Sep 23, 2023
1 parent aeb77dc commit d17fca5
Show file tree
Hide file tree
Showing 16 changed files with 743 additions and 160 deletions.
12 changes: 12 additions & 0 deletions data/json/items/vehicle/utilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@
"price_postapoc": 1500,
"melee_damage": { "bash": 12 }
},
{
"type": "GENERIC",
"copy-from": "mountable_cooler",
"id": "integrated_cooler",
"name": { "str": "small integrated cooler" },
"description": "A small vehicle-mounted area cooler.",
"weight": "6000 g",
"volume": "3750 ml",
"price": 10000,
"price_postapoc": 750,
"melee_damage": { "bash": 3 }
},
{
"type": "GENERIC",
"id": "mountable_heater",
Expand Down
24 changes: 24 additions & 0 deletions data/json/vehicleparts/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -1358,6 +1358,16 @@
"breaks_into": [ { "item": "steel_lump" }, { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 1, 3 ] } ],
"damage_reduction": { "all": 15 }
},
{
"id": "integrated_heater_small",
"copy-from": "mountable_heater_small",
"description": "Set of tubes, that move heat from the engine into the vehicle cabin, heating it up.",
"type": "vehicle_part",
"location": "",
"name": { "str": "small integrated heater" },
"//": "can't be installed or unistalled, can only be bashed away",
"requirements": { "install": { "skills": [ [ "mechanics", 99 ] ] }, "removal": { "skills": [ [ "mechanics", 99 ] ] } }
},
{
"id": "mountable_cooler",
"type": "vehicle_part",
Expand All @@ -1381,6 +1391,20 @@
"damage_reduction": { "all": 15 },
"variants": [ { "symbols": "C", "symbols_broken": ":" } ]
},
{
"id": "integrated_cooler",
"copy-from": "mountable_cooler",
"type": "vehicle_part",
"location": "",
"name": { "str": "small integrated cooler" },
"description": "Small set of mechanisms, that cool the vehicle out when turned on.",
"item": "integrated_cooler",
"requirements": {
"install": { "skills": [ [ "mechanics", 4 ], [ "electronics", 1 ] ], "time": "3 h", "using": [ [ "vehicle_screw", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 4 ], [ "electronics", 1 ] ], "time": "3 h", "using": [ [ "vehicle_screw", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 s", "using": [ [ "adhesive", 1 ] ] }
}
},
{
"type": "vehicle_part",
"id": "controls_electronic",
Expand Down
12 changes: 0 additions & 12 deletions data/json/vehicles/bikes.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,6 @@
{ "x": -1, "y": 0, "parts": [ "small_storage_battery", "engine_electric_tiny" ] }
]
},
{
"id": "bicycle_folding",
"type": "vehicle",
"name": "Folding Bicycle",
"blueprint": [ "o#o" ],
"parts": [
{ "x": 0, "y": 0, "parts": [ "folding_frame", "saddle#pedal", "horn_bicycle", "foot_pedals" ] },
{ "x": 1, "y": 0, "parts": [ "folding_frame", "wheel_mount_light_steerable", "wheel_bicycle" ] },
{ "x": -1, "y": 0, "parts": [ "folding_frame", "wheel_mount_light" ] },
{ "x": -1, "y": 0, "parts": [ "wheel_bicycle#rear", "basketsm#bike_rear" ] }
]
},
{
"id": "motorcycle_cross",
"type": "vehicle",
Expand Down
Loading

0 comments on commit d17fca5

Please sign in to comment.