From 07564b932c2dfd7ed65d1daa29a6f5c4c9153e6b Mon Sep 17 00:00:00 2001
From: Soup-de-Loop <40143107+Soup-de-Loop@users.noreply.github.com>
Date: Wed, 29 Apr 2020 18:15:03 +1000
Subject: [PATCH] Separate blaze turrets from expanded vanilla turrets

Simply separates out the few non-special blaze turrets out from the extended-vanilla turret file, which will be renamed in another PR for posterity.
---
 .../vehicleparts/blaze_custom_turret.json     | 118 ++++++++++++++++++
 .../vehicleparts/blaze_weapons_parts.json     | 116 -----------------
 2 files changed, 118 insertions(+), 116 deletions(-)
 create mode 100644 data/mods/blazemod/vehicleparts/blaze_custom_turret.json

diff --git a/data/mods/blazemod/vehicleparts/blaze_custom_turret.json b/data/mods/blazemod/vehicleparts/blaze_custom_turret.json
new file mode 100644
index 0000000000000..6b2ba2ce895ef
--- /dev/null
+++ b/data/mods/blazemod/vehicleparts/blaze_custom_turret.json
@@ -0,0 +1,118 @@
+[
+  {
+    "id": "mounted_cangun",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted slingshot cannon" },
+    "item": "cangun",
+    "color": "brown",
+    "broken_color": "brown",
+    "breaks_into": [ { "item": "cangun", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+  },
+  {
+    "id": "mounted_cutter",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted lacerator" },
+    "item": "cutter",
+    "broken_symbol": "x",
+    "color": "dark_gray",
+    "broken_color": "dark_gray",
+    "power": -1750,
+    "breaks_into": [ { "item": "cutter", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } },
+    "extend": { "flags": [ "EXTRA_DRAG" ] }
+  },
+  {
+    "id": "mounted_gattler",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted rotary cannon" },
+    "item": "gattler",
+    "color": "dark_gray",
+    "broken_color": "dark_gray",
+    "breaks_into": [ { "item": "gattler", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 5 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } }
+  },
+  {
+    "id": "mounted_lasgun",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted laser cannon" },
+    "item": "lasgun",
+    "color": "blue",
+    "broken_color": "blue",
+    "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
+  },
+  {
+    "id": "mounted_lasgunp",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted pulse laser" },
+    "item": "lasgunp",
+    "color": "blue",
+    "broken_color": "blue",
+    "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
+  },
+  {
+    "id": "mounted_lasgunx",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted turbolaser" },
+    "item": "lasgunx",
+    "color": "magenta",
+    "broken_color": "magenta",
+    "breaks_into": [ { "item": "lasgunx", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
+  },
+  {
+    "id": "mounted_ripper",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted ripper" },
+    "item": "ripper",
+    "broken_symbol": "x",
+    "color": "dark_gray",
+    "broken_color": "dark_gray",
+    "power": -8750,
+    "breaks_into": [ { "item": "ripper", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 5 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } },
+    "extend": { "flags": [ "EXTRA_DRAG" ] }
+  },
+  {
+    "id": "mounted_scorpion",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted scorpion ballista" },
+    "item": "scorpion",
+    "color": "brown",
+    "broken_color": "brown",
+    "breaks_into": [ { "item": "scorpion", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+  },
+  {
+    "id": "mounted_slauncher",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted speargun" },
+    "item": "slauncher",
+    "color": "light_gray",
+    "broken_color": "light_gray",
+    "breaks_into": [ { "item": "slauncher", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+  },
+  {
+    "id": "mounted_teslagun",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted tesla cannon" },
+    "item": "teslagun",
+    "color": "blue",
+    "broken_color": "blue",
+    "breaks_into": [ { "item": "teslagun", "count": [ 0, 1 ] } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+  }
+]
diff --git a/data/mods/blazemod/vehicleparts/blaze_weapons_parts.json b/data/mods/blazemod/vehicleparts/blaze_weapons_parts.json
index 5995124d94ee3..1b62f57fe0350 100644
--- a/data/mods/blazemod/vehicleparts/blaze_weapons_parts.json
+++ b/data/mods/blazemod/vehicleparts/blaze_weapons_parts.json
@@ -8,17 +8,6 @@
     "breaks_into": [ { "item": "TDI", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } }
   },
-  {
-    "id": "mounted_cangun",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted slingshot cannon" },
-    "item": "cangun",
-    "color": "brown",
-    "broken_color": "brown",
-    "breaks_into": [ { "item": "cangun", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
-  },
   {
     "id": "mounted_acr",
     "copy-from": "turret",
@@ -28,17 +17,6 @@
     "breaks_into": [ { "item": "acr", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } }
   },
-  {
-    "id": "mounted_gattler",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted rotary cannon" },
-    "item": "gattler",
-    "color": "dark_gray",
-    "broken_color": "dark_gray",
-    "breaks_into": [ { "item": "gattler", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 5 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } }
-  },
   {
     "id": "mounted_ak47",
     "copy-from": "turret",
@@ -57,39 +35,6 @@
     "breaks_into": [ { "item": "ak74", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } }
   },
-  {
-    "id": "mounted_lasgun",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted laser cannon" },
-    "item": "lasgun",
-    "color": "blue",
-    "broken_color": "blue",
-    "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
-  },
-  {
-    "id": "mounted_lasgunp",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted pulse laser" },
-    "item": "lasgunp",
-    "color": "blue",
-    "broken_color": "blue",
-    "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
-  },
-  {
-    "id": "mounted_lasgunx",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted turbolaser" },
-    "item": "lasgunx",
-    "color": "magenta",
-    "broken_color": "magenta",
-    "breaks_into": [ { "item": "lasgunx", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 6 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } }
-  },
   {
     "id": "mounted_american_180",
     "copy-from": "turret",
@@ -117,53 +62,6 @@
     "breaks_into": [ { "item": "ar15", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 1 ] ] } }
   },
-  {
-    "id": "mounted_ripper",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted ripper" },
-    "item": "ripper",
-    "broken_symbol": "x",
-    "color": "dark_gray",
-    "broken_color": "dark_gray",
-    "power": -8750,
-    "breaks_into": [ { "item": "ripper", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 5 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } },
-    "extend": { "flags": [ "EXTRA_DRAG" ] }
-  },
-  {
-    "id": "mounted_scorpion",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted scorpion ballista" },
-    "item": "scorpion",
-    "color": "brown",
-    "broken_color": "brown",
-    "breaks_into": [ { "item": "scorpion", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
-  },
-  {
-    "id": "mounted_slauncher",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted speargun" },
-    "item": "slauncher",
-    "color": "light_gray",
-    "broken_color": "light_gray",
-    "breaks_into": [ { "item": "slauncher", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
-  },
-  {
-    "id": "mounted_teslagun",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted tesla cannon" },
-    "item": "teslagun",
-    "color": "blue",
-    "broken_color": "blue",
-    "breaks_into": [ { "item": "teslagun", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
-  },
   {
     "id": "mounted_bigun",
     "copy-from": "turret",
@@ -214,20 +112,6 @@
     "breaks_into": [ { "item": "carbine_flintlock", "count": [ 0, 1 ] } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
   },
-  {
-    "id": "mounted_cutter",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted lacerator" },
-    "item": "cutter",
-    "broken_symbol": "x",
-    "color": "dark_gray",
-    "broken_color": "dark_gray",
-    "power": -1750,
-    "breaks_into": [ { "item": "cutter", "count": [ 0, 1 ] } ],
-    "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } },
-    "extend": { "flags": [ "EXTRA_DRAG" ] }
-  },
   {
     "id": "mounted_cx4",
     "copy-from": "turret",