Sensible Electric Motors for E-Bikes, Electric Mopeds, and (Slight Change) for E-Cars (#82902)

* E-Motors downgrading

Tiny and Small Electric Motors have been made into 250w and 750w respectively, to represent what's considered Class 1 Ebikes, and Class 3 Ebikes (technically classified as a motorized bike in MA.) Tiny motor's been made slightly heavier, with the Small Motor having it's weight cut by 3kg

* Removal of comments

Removed Offending // comments, they're not *really* necessary anyways

* Update Motor JSON Object

Changed Generic to ITEM

* Updated Drag Test Parameters

* Update data/mods/TEST_DATA/vehicle_drag_test.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/TEST_DATA/vehicle_drag_test.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/TEST_DATA/vehicle_drag_test.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Updated Vehicle Eff. Test

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: Kantonine

data/json/items/vehicle/motors.json

@@ -58,8 +58,8 @@
     "type": "ITEM",
     "id": "motor_small",
     "name": { "str": "small electric motor" },
-    "description": "A light-duty electric motor.  Strong enough for an electric moped or golf cart.",
-    "weight": "9 kg",
+    "description": "A light-duty electrical motor, strong enough for an electric mopeds, golf carts, and even hybrid mopeds.",
+    "weight": "4 kg",
     "volume": "6 L",
     "price": "20 USD",
     "price_postapoc": "5 USD",
@@ -70,8 +70,8 @@
     "type": "ITEM",
     "id": "motor_tiny",
     "name": { "str": "tiny electric motor" },
-    "description": "A small electric motor, suitable for powering a bicycle or a hedge trimmer.",
-    "weight": "1500 g",
+    "description": "A tiny electric motor just the right size for providing a gentle boost for a bicycle, or similarly light vehicles",
+    "weight": "2500 g",
     "color": "light_cyan",
     "symbol": ",",
     "material": [ "lc_steel", "plastic", "copper" ],

data/json/vehicleparts/motor.json

@@ -20,12 +20,12 @@
     "copy-from": "engine_motor",
     "type": "vehicle_part",
     "name": { "str": "tiny electric motor" },
-    "description": "A tiny electric motor just the right size for powering a bicycle or a hedge trimmer.",
+    "description": "A tiny electric motor just the right size for providing a gentle boost for a bicycle, or similarly light vehicles.",
     "item": "motor_tiny",
     "looks_like": "motor_small",
     "durability": 80,
-    "power": "1600 W",
-    "energy_consumption": "2 kW",
+    "power": "250 W",
+    "energy_consumption": "300 W",
     "damage_modifier": 80,
     "folded_volume": "750 ml",
     "requirements": {
@@ -44,11 +44,11 @@
     "copy-from": "engine_motor",
     "type": "vehicle_part",
     "name": { "str": "small electric motor" },
-    "description": "A light-duty electrical motor, strong enough for an electric moped or golf cart.",
+    "description": "A light-duty electrical motor, strong enough for an electric mopeds, golf carts, and electric mopeds posing as electric bicycles.",
     "item": "motor_small",
     "durability": 120,
-    "power": "7040 W",
-    "energy_consumption": "8 kW",
+    "power": "750 W",
+    "energy_consumption": "800 W",
     "damage_modifier": 80,
     "folded_volume": "6 L",
     "requirements": {
@@ -73,8 +73,8 @@
     "type": "vehicle_part",
     "description": "A medium-duty electrical motor, suitable for powering ultra-light vehicles, or as part of a hybrid gas-electric drivetrain.",
     "durability": 200,
-    "power": "36000 W",
-    "energy_consumption": "40 kW",
+    "power": "50000 W",
+    "energy_consumption": "55 kW",
     "damage_modifier": 80,
     "//": "20 cm weld per quadrant of damage",
     "folded_volume": "30 L",

data/mods/TEST_DATA/vehicle_drag_test.json

@@ -30,15 +30,15 @@
       "car_sports_electric": [ 0.294604, 1.889046, 1069.79625, 24285, 25179 ],
       "suv_electric": [ 0.304763, 1.692385, 684.588393, 16471, 17086 ],
       "car_mini": [ 0.392805, 1.577981, 1117.04375, 11204, 13400 ],
-      "bicycle_electric": [ 0.609525, 0.017902, 45.058333, 2857, 3057 ],
+      "bicycle_electric": [ 0.609525, 0.018316, 46.1, 1772, 2066 ],
       "motorcycle_sidecart": [ 0.880425, 0.841372, 445.83125, 6426, 7660 ],
       "scooter": [ 0.609525, 0.105371, 79.564583, 4295, 5102 ],
-      "scooter_electric": [ 0.609525, 0.119272, 90.060417, 4845, 5020 ],
+      "scooter_electric": [ 0.609525, 0.103683, 78.289583, 2261, 2345 ],
       "policesuv": [ 0.629843, 2.856996, 1155.686607, 13215, 15789 ],
       "truck_swat": [ 1.15197, 7.668418, 6620.852656, 8974, 10530 ],
       "fire_truck": [ 1.43577, 7.850092, 5203.913582, 9756, 11732 ],
       "flatbed_truck": [ 0.682733, 4.479992, 2005.603977, 10588, 12741 ],
-      "autosweeper": [ 1.20615, 1.298589, 919.264062, 6531, 6774 ],
+      "autosweeper": [ 1.20615, 1.345162, 952.232812, 7310, 7580 ],
       "hippie_van": [ 0.501165, 2.458824, 994.621429, 10173, 12207 ],
       "cube_van": [ 0.8643, 2.623349, 2269.367188, 10126, 12100 ],
       "security_van": [ 0.903, 7.811085, 6742.794844, 9601, 11291 ],
@@ -54,19 +54,19 @@
       "kayak_racing": [ 0.609525, 2.604776, 0.983417, 714, 1309 ],
       "DUKW": [ 0.918158, 3.636234, 78.648471, 9801, 11742 ],
       "raft": [ 0.997815, 9.743243, 5.51775, 216, 461 ],
-      "rara_x": [ 0.930735, 0.946989, 529.673611, 8401, 8709 ],
+      "rara_x": [ 0.930735, 0.946989, 529.673611, 9397, 9739 ],
       "aapc-mg": [ 1.9866, 8.699023, 4619.539062, 7576, 8873 ],
       "quad_bike": [ 0.690795, 1.093925, 698.691964, 6893, 8235 ],
-      "golf_cart": [ 1.069088, 1.127783, 709.645833, 6813, 7065 ],
+      "golf_cart": [ 1.069088, 1.127783, 709.645833, 7628, 7909 ],
       "unicycle": [ 0.690795, 0.00209, 21.0375, 1378, 1798 ],
       "tractor_plow": [ 0.835275, 0.866535, 1641.245192, 10783, 12475 ],
       "tractor_seed": [ 0.835275, 0.828333, 2039.86875, 10789, 12480 ],
       "tractor_reaper": [ 0.790125, 0.82846, 2039.86875, 10987, 12710 ],
       "oldtractor": [ 0.537285, 0.89602, 1654.898437, 12446, 14407 ],
-      "autotractor": [ 1.64475, 1.506677, 1590.049554, 7477, 7751 ],
-      "trencher": [ 0.729173, 1.037314, 1310.940625, 7719, 8006 ],
-      "forklift": [ 0.565988, 2.317921, 2100.279167, 8071, 8388 ],
-      "golf_cart_4seat": [ 1.069088, 1.095145, 689.108333, 6817, 7069 ],
+      "autotractor": [ 1.64475, 1.456037, 1536.478125, 8369, 8675 ],
+      "trencher": [ 0.729173, 1.064835, 1310.940625, 8641, 8960 ],
+      "forklift": [ 0.565988, 2.317921, 2100.279167, 9093, 9445 ],
+      "golf_cart_4seat": [ 1.069088, 1.095145, 689.108333, 7633, 7913 ],
       "tandem": [ 0.609525, 0.01059, 19.990625, 1430, 1870 ],
       "animalctrl": [ 0.660319, 2.666804, 1078.751786, 11007, 13168 ],
       "hearse": [ 0.592594, 2.645575, 1070.164286, 9628, 11553 ]

data/mods/TEST_DATA/vehicle_efficiency_test.json

@@ -19,7 +19,7 @@
       "fire_truck": { "forward": [ 6188743, 404800, 82000, 21260, 4751 ], "reverse": [ 6188743, 56790, 56830, 21220, 4673 ] },
       "apc": { "forward": [ 5832494, 1558000, 1042000, 143000, 96817 ], "reverse": [ 5832494, 376700, 376700, 142900, 92760 ] },
       "quad_bike": { "forward": [ 260845, 107400, 107400, 47040, 47040 ], "reverse": [ 260845, 18770, 18770, 14750, 14750 ] },
-      "golf_cart": { "forward": [ 340630, 44600, 44920, 20990, 12180 ], "reverse": [ 340630, 44670, 15800, 21030, 8274 ] },
+      "golf_cart": { "forward": [ 340630, 45188, 40690, 20469, 10927 ], "reverse": [ 340630, 45260, 15800, 20509, 7210 ] },
       "tractor_plow": { "forward": [ 682758, 689103, 689103, 149672, 149672 ], "reverse": [ 682758, 65753, 65753, 49009, 49009 ] }
     }
   }