Add motocross bikes and street-legal dirt bikes (#31169)

* * add small motorbike battery (lightweight and expensive) * add modern watercooled big-bore dirt bike engine. 550cc, 55HP, fuel consumption same as the 50hp V-Twin (which would be air-cooled and less fuel efficient) * add motorcycle headlight (lightweight and fragile) * change dirt bike wheel diameter to 20" * add motocross bike and Street-Legal Dirt Bike (aka enduro bike – the enduro bike is similar to the mx bike but has a headlight and a stronger subframe so it can hold a bit of cargo) * add mx/enduro motorcycle spawns to some locations * rename pedal-powered 'Dirt bike' to 'Mountain bike'
CleverRaven · Jun 9, 2019 · 37a6167 · 37a6167
1 parent d76f9d1
commit 37a6167
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 1 deletion.
diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json
@@ -30,6 +30,19 @@
     "capacity": 500,
     "//": "12Ah @ 12VDC. Could supply ~140 watts for an hour"
   },
+  {
+    "id": "battery_motorbike_small",
+    "copy-from": "battery_car",
+    "type": "MAGAZINE",
+    "name": "small motorbike battery",
+    "name_plural": "small motorbike batteries",
+    "description": "A miniature 12v lead-acid battery used to power smaller vehicles' electrical systems.",
+    "weight": 1500,
+    "volume": 3,
+    "price": 20000,
+    "capacity": 150,
+    "//": "~2.4Ah @ 12VDC. Could supply ~140 watts 10 minutes or so"
+  },
   {
     "id": "medium_storage_battery",
     "copy-from": "storage_battery",

diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json
@@ -59,6 +59,18 @@
     "displacement": 40,
     "faults": [ "fault_engine_starter" ]
   },
+  {
+    "id": "1cyl_combustion_large",
+    "copy-from": "engine_gasoline",
+    "type": "ENGINE",
+    "name": "large 1-cylinder engine",
+    "description": "A powerful high-compression single-cylinder 4-stroke combustion engine.",
+    "weight": 40000,
+    "volume": 8,
+    "price": 10000,
+    "displacement": 55,
+    "faults": [ "fault_engine_starter" ]
+  },
   {
     "id": "1cyl_combustion_small",
     "copy-from": "engine_gasoline",

diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json
@@ -12,6 +12,16 @@
     "volume": 4,
     "price": 3000
   },
+  {
+    "id": "motorcycle_headlight",
+    "type": "GENERIC",
+    "name": "motorcycle headlight",
+    "description": "A motorcycle headlight to light up the way.",
+    "weight": 500,
+    "volume": 1,
+    "price": 5000,
+    "copy-from": "car_headlight"
+  },
   {
     "id": "car_wide_headlight",
     "type": "GENERIC",

diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
@@ -165,6 +165,7 @@
     "copy-from": "wheel_motorbike",
     "type": "WHEEL",
     "name": "off-road motorbike wheel",
+    "diameter": 20,
     "description": "A motorbike wheel, studded for improved off-road performance."
   },
   {

diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
@@ -18,6 +18,8 @@
       [ "bicycle", 400 ],
       [ "bicycle_electric", 100 ],
       [ "motorcycle", 200 ],
+      [ "motorcycle_cross", 20 ],
+      [ "motorcycle_enduro", 50 ],
       [ "superbike", 50 ],
       [ "motorcycle_sidecart", 100 ],
       [ "scooter", 200 ],
@@ -142,6 +144,8 @@
       [ "car_racing_electric", 5 ],
       [ "superbike", 50 ],
       [ "motorcycle", 200 ],
+      [ "motorcycle_cross", 25 ],
+      [ "motorcycle_enduro", 50 ],
       [ "motorcycle_sidecart", 100 ],
       [ "scooter", 100 ],
       [ "scooter_electric", 100 ],
@@ -433,6 +437,8 @@
     "//": "Selection of small vehicles suitable for cs_car_showroom",
     "vehicles": [
       [ "motorcycle", 200 ],
+      [ "motorcycle_cross", 150 ],
+      [ "motorcycle_enduro", 100 ],
       [ "superbike", 100 ],
       [ "motorcycle_sidecart", 100 ],
       [ "scooter", 200 ],
@@ -497,6 +503,7 @@
       [ "electric_car", 750 ],
       [ "hippie_van", 750 ],
       [ "motorcycle", 500 ],
+      [ "motorcycle_enduro", 50 ],
       [ "superbike", 50 ],
       [ "motorcycle_sidecart", 50 ],
       [ "car_sports", 30 ],
@@ -519,6 +526,8 @@
       [ "car_mini", 800 ],
       [ "beetle", 500 ],
       [ "motorcycle", 200 ],
+      [ "motorcycle_cross", 50 ],
+      [ "motorcycle_enduro", 50 ],
       [ "motorcycle_sidecart", 100 ],
       [ "scooter", 200 ],
       [ "scooter_electric", 300 ],

diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json
@@ -36,6 +36,20 @@
       { "item": "scrap", "count": [ 4, 7 ] }
     ]
   },
+  {
+    "id": "battery_motorbike_small",
+    "copy-from": "battery_car",
+    "type": "vehicle_part",
+    "name": "motorbike battery, small",
+    "item": "battery_motorbike_small",
+    "durability": 30,
+    "folded_volume": 3,
+    "breaks_into": [
+      { "item": "steel_lump", "count": [ 4, 7 ] },
+      { "item": "steel_chunk", "count": [ 4, 7 ] },
+      { "item": "scrap", "count": [ 4, 7 ] }
+    ]
+  },
   {
     "id": "medium_storage_battery",
     "copy-from": "storage_battery",

diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json
@@ -113,6 +113,25 @@
     ],
     "extend": { "flags": [ "FOLDABLE" ] }
   },
+  {
+    "id": "engine_1cyl_large",
+    "copy-from": "gasoline_engine",
+    "type": "vehicle_part",
+    "item": "1cyl_combustion_large",
+    "//": "55 HP high-performance water-cooled single-cylinder engine",
+    "difficulty": 3,
+    "durability": 150,
+    "epower": 0,
+    "power": 41000,
+    "energy_consumption": 124500,
+    "folded_volume": 8,
+    "breaks_into": [
+      { "item": "steel_lump", "count": [ 6, 12 ] },
+      { "item": "steel_chunk", "count": [ 6, 12 ] },
+      { "item": "scrap", "count": [ 6, 12 ] }
+    ],
+    "extend": { "flags": [ "FOLDABLE" ] }
+  },
   {
     "id": "engine_1cyl_small",
     "copy-from": "gasoline_engine",

diff --git a/data/json/vehicleparts/lights.json b/data/json/vehicleparts/lights.json
@@ -113,6 +113,29 @@
     },
     "flags": [ "CONE_LIGHT", "FOLDABLE", "ENABLED_DRAINS_EPOWER" ]
   },
+  {
+    "id": "motorcycle_headlight",
+    "type": "vehicle_part",
+    "name": "motorcycle headlight",
+    "item": "motorcycle_headlight",
+    "symbol": "*",
+    "broken_symbol": "*",
+    "color": "white",
+    "broken_color": "white",
+    "durability": 8,
+    "description": "A small, lightweight, bright light that illuminates a narrow cone outside the vehicle when turned on.  During installation, you can choose what direction to point the light, so multiple headlights can illuminate the sides or rear, as well as the front.",
+    "epower": -187,
+    "bonus": 8000,
+    "damage_modifier": 10,
+    "folded_volume": 1,
+    "breaks_into": [ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "scrap", "count": [ 0, 2 ] } ],
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": 20000, "qualities": [ { "id": "SCREW", "level": 1 } ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] },
+      "repair": { "skills": [ [ "mechanics", 1 ] ], "time": 2000, "using": [ [ "adhesive", 1 ] ] }
+    },
+    "flags": [ "CONE_LIGHT", "FOLDABLE", "ENABLED_DRAINS_EPOWER" ]
+  },
   {
     "id": "wide_headlight",
     "type": "vehicle_part",

diff --git a/data/json/vehicles/bikes.json b/data/json/vehicles/bikes.json
@@ -13,7 +13,7 @@
   {
     "id": "bicycle_dirt",
     "type": "vehicle",
-    "name": "Dirt bike",
+    "name": "Mountain bike",
     "blueprint": [ "o#o" ],
     "parts": [
       { "x": 0, "y": 0, "parts": [ "xlframe_vertical_2", "saddle", "horn_bicycle", "foot_pedals" ] },
@@ -34,6 +34,52 @@
       { "x": -1, "y": 0, "parts": [ "small_storage_battery", "engine_electric_tiny" ] }
     ]
   },
+  {
+    "id": "motorcycle_cross",
+    "type": "vehicle",
+    "name": "Motocross Bike",
+    "blueprint": [ "o#o" ],
+    "parts": [
+      { "x": 1, "y": 0, "parts": [ "frame_vertical_2", "wheel_motorbike_or_steerable" ] },
+      {
+        "x": 0,
+        "y": 0,
+        "parts": [
+          "frame_vertical",
+          { "part": "tank_small", "fuel": "gasoline" },
+          "saddle",
+          "controls",
+          "battery_motorbike_small",
+          "engine_1cyl_large"
+        ]
+      },
+      { "x": -1, "y": 0, "parts": [ "xlframe_vertical", "muffler", "wheel_motorbike_or" ] }
+    ]
+  },
+  {
+    "id": "motorcycle_enduro",
+    "type": "vehicle",
+    "name": "Street-Legal Dirt Bike",
+    "blueprint": [ "o#o" ],
+    "parts": [
+      { "x": 1, "y": 0, "parts": [ "frame_vertical_2", "motorcycle_headlight", "wheel_motorbike_or_steerable" ] },
+      {
+        "x": 0,
+        "y": 0,
+        "parts": [
+          "frame_vertical",
+          { "part": "tank_small", "fuel": "gasoline" },
+          "horn_car",
+          "controls",
+          "saddle",
+          "controls_electronic",
+          "battery_motorbike_small",
+          "engine_1cyl_large"
+        ]
+      },
+      { "x": -1, "y": 0, "parts": [ "frame_handle", "muffler", "wheel_motorbike_or" ] }
+    ]
+  },
   {
     "id": "motorcycle",
     "type": "vehicle",