Moved Flaming Electric Car to Bright Nights mod, renamed it to Flamin…

…g Atomic Car and made it spawn (#30423) * Moved definition of flaming electric car to BN's cars.json * Added flaming electric car to BN's vehicle spawn tables with a fairly low chance * Added minireactor * Renamed electric car to atomic * Update vehicle_groups.json
CleverRaven · May 13, 2019 · e7c3006 · e7c3006
1 parent aacd05a
commit e7c3006
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 55 deletions.
diff --git a/data/json/vehicles/cars.json b/data/json/vehicles/cars.json
@@ -904,56 +904,6 @@
       { "x": -3, "y": 2, "part": "solar_panel" }
     ]
   },
-  {
-    "id": "electric_car_flame",
-    "type": "vehicle",
-    "name": "Flaming Electric Car",
-    "blueprint": [
-      [ "##++-o" ],
-      [ "+=##'|" ],
-      [ "+=##'|" ],
-      [ "##++-o" ]
-    ],
-    "parts": [
-      { "x": 0, "y": 0, "part": "frame_vertical_2" },
-      { "x": 0, "y": 0, "part": "seat" },
-      { "x": 0, "y": 0, "part": "seatbelt" },
-      { "x": 0, "y": 0, "part": "controls" },
-      { "x": 0, "y": 0, "part": "dashboard" },
-      { "x": 0, "y": 0, "part": "roof" },
-      { "x": 0, "y": 0, "part": "tank", "fuel": "napalm" },
-      { "x": 0, "y": 1, "part": "frame_vertical_2" },
-      { "x": 0, "y": 1, "part": "tank", "fuel": "gasoline" },
-      { "x": 0, "y": -1, "part": "frame_vertical" },
-      { "x": 0, "y": -1, "part": "tank", "fuel": "water_clean" },
-      { "x": 0, "y": -1, "part": "turret_mount" },
-      { "x": 0, "y": -1, "part": "laser_rifle" },
-      { "x": 0, "y": 2, "part": "frame_vertical" },
-      { "x": -1, "y": 0, "part": "frame_vertical_2" },
-      { "x": -1, "y": 1, "part": "frame_vertical_2" },
-      { "x": -1, "y": -1, "part": "frame_vertical" },
-      { "x": -1, "y": -1, "part": "wheel" },
-      { "x": -1, "y": -1, "part": "storage_battery" },
-      { "x": -1, "y": 2, "part": "frame_vertical" },
-      { "x": -1, "y": 2, "part": "wheel" },
-      { "x": -1, "y": 2, "part": "storage_battery" },
-      { "x": 1, "y": 0, "part": "frame_horizontal" },
-      { "x": 1, "y": 0, "part": "engine_electric_large" },
-      { "x": 1, "y": 0, "part": "turret_mount" },
-      { "x": 1, "y": 0, "part": "flamethrower" },
-      { "x": 1, "y": 1, "part": "frame_horizontal" },
-      { "x": 1, "y": 1, "part": "storage_battery_mount", "//": "to make the blazemod happy" },
-      { "x": 1, "y": -1, "part": "frame_nw" },
-      { "x": 1, "y": -1, "part": "wheel_steerable" },
-      { "x": 1, "y": -1, "part": "turret_mount" },
-      { "x": 1, "y": -1, "part": "watercannon" },
-      { "x": 1, "y": 2, "part": "frame_ne" },
-      { "x": 1, "y": 2, "part": "wheel_steerable" },
-      { "x": 1, "y": 2, "part": "tank", "fuel": "water" },
-      { "x": 1, "y": 2, "part": "turret_mount" },
-      { "x": 1, "y": 2, "part": "m249", "ammo": 100 }
-    ]
-  },
   {
     "id": "rara_x",
     "type": "vehicle",

diff --git a/data/mods/BrightNights/vehicle_groups.json b/data/mods/BrightNights/vehicle_groups.json
@@ -2,26 +2,32 @@
   {
     "id": "city_vehicles",
     "type": "vehicle_group",
-    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 500 ] ]
+    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 500 ], [ "car_atomic_flame", 100 ] ]
   },
   {
     "id": "city_pileup",
     "type": "vehicle_group",
-    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ] ]
+    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ], [ "car_atomic_flame", 100 ] ]
   },
   {
     "id": "highway",
     "type": "vehicle_group",
-    "vehicles": [ [ "car_atomic", 1500 ], [ "suv_atomic", 1500 ], [ "compact_atomic", 300 ] ]
+    "vehicles": [ [ "car_atomic", 1500 ], [ "suv_atomic", 1500 ], [ "compact_atomic", 300 ], [ "car_atomic_flame", 100 ] ]
   },
   {
     "id": "suburban_home",
     "type": "vehicle_group",
-    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ] ]
+    "vehicles": [ [ "car_atomic", 1000 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ], [ "car_atomic_flame", 100 ] ]
   },
   {
     "id": "parkinglot",
     "type": "vehicle_group",
-    "vehicles": [ [ "car_atomic", 1000 ], [ "car_sports_atomic", 100 ], [ "suv_atomic", 1000 ], [ "compact_atomic", 300 ] ]
+    "vehicles": [
+      [ "car_atomic", 1000 ],
+      [ "car_sports_atomic", 100 ],
+      [ "suv_atomic", 1000 ],
+      [ "compact_atomic", 300 ],
+      [ "car_atomic_flame", 100 ]
+    ]
   }
 ]
diff --git a/data/mods/BrightNights/vehicles/cars.json b/data/mods/BrightNights/vehicles/cars.json
@@ -268,5 +268,56 @@
       { "x": -2, "y": 1, "chance": 15, "item_groups": [ "car_kit" ] },
       { "x": -2, "y": 1, "chance": 15, "items": [ "jack_small", "wheel" ] }
     ]
+  },
+  {
+    "id": "car_atomic_flame",
+    "type": "vehicle",
+    "name": "Flaming Atomic Car",
+    "blueprint": [
+      [ "##++-o" ],
+      [ "+=##'|" ],
+      [ "+=##'|" ],
+      [ "##++-o" ]
+    ],
+    "parts": [
+      { "x": 0, "y": 0, "part": "frame_vertical_2" },
+      { "x": 0, "y": 0, "part": "seat" },
+      { "x": 0, "y": 0, "part": "seatbelt" },
+      { "x": 0, "y": 0, "part": "controls" },
+      { "x": 0, "y": 0, "part": "dashboard" },
+      { "x": 0, "y": 0, "part": "roof" },
+      { "x": 0, "y": 0, "part": "tank", "fuel": "napalm" },
+      { "x": 0, "y": 1, "part": "frame_vertical_2" },
+      { "x": 0, "y": 1, "part": "tank", "fuel": "gasoline" },
+      { "x": 0, "y": -1, "part": "frame_vertical" },
+      { "x": 0, "y": -1, "part": "tank", "fuel": "water_clean" },
+      { "x": 0, "y": -1, "part": "turret_mount" },
+      { "x": 0, "y": -1, "part": "laser_rifle" },
+      { "x": 0, "y": 2, "part": "frame_vertical" },
+      { "x": -1, "y": 0, "part": "frame_vertical_2" },
+      { "x": -1, "y": 1, "part": "frame_vertical_2" },
+      { "x": -1, "y": 1, "part": "minireactor" },
+      { "x": -1, "y": -1, "part": "frame_vertical" },
+      { "x": -1, "y": -1, "part": "wheel" },
+      { "x": -1, "y": -1, "part": "storage_battery" },
+      { "x": -1, "y": 2, "part": "frame_vertical" },
+      { "x": -1, "y": 2, "part": "wheel" },
+      { "x": -1, "y": 2, "part": "storage_battery" },
+      { "x": 1, "y": 0, "part": "frame_horizontal" },
+      { "x": 1, "y": 0, "part": "engine_electric_large" },
+      { "x": 1, "y": 0, "part": "turret_mount" },
+      { "x": 1, "y": 0, "part": "flamethrower" },
+      { "x": 1, "y": 1, "part": "frame_horizontal" },
+      { "x": 1, "y": 1, "part": "storage_battery_mount", "//": "to make the blazemod happy" },
+      { "x": 1, "y": -1, "part": "frame_nw" },
+      { "x": 1, "y": -1, "part": "wheel_steerable" },
+      { "x": 1, "y": -1, "part": "turret_mount" },
+      { "x": 1, "y": -1, "part": "watercannon" },
+      { "x": 1, "y": 2, "part": "frame_ne" },
+      { "x": 1, "y": 2, "part": "wheel_steerable" },
+      { "x": 1, "y": 2, "part": "tank", "fuel": "water" },
+      { "x": 1, "y": 2, "part": "turret_mount" },
+      { "x": 1, "y": 2, "part": "m249", "ammo": 100 }
+    ]
   }
 ]