Merge pull request #23768 from Night-Pryanik/use-copy-from-for-location

Replaced location field with use of copy-from
Coolthulhu · May 19, 2018 · e7cbb32 · e7cbb32
2 parents 65b29eb + 356e24a
commit e7cbb32
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 40 deletions.
diff --git a/data/json/vehicleparts/turret.json b/data/json/vehicleparts/turret.json
@@ -5,6 +5,7 @@
     "symbol": "t",
     "durability": 400,
     "damage_modifier": 80,
+    "location": "on_roof",
     "flags": [ "TURRET", "TOOL_NONE" ]
   },
   {
@@ -17,7 +18,6 @@
     "color": "dark_gray",
     "broken_color": "dark_gray",
     "difficulty": 5,
-	"location": "on_roof",
     "breaks_into": [ { "item": "flamethrower", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -39,7 +39,6 @@
     "color": "magenta",
     "broken_color": "magenta",
     "difficulty": 6,
-	"location": "on_roof",
     "breaks_into": [ { "item": "ftk93", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -60,7 +59,6 @@
     "color": "magenta",
     "broken_color": "magenta",
     "difficulty": 5,
-	"location": "on_roof",
     "breaks_into": [ { "item": "laser_rifle", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -81,7 +79,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "difficulty": 3,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m249", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -102,7 +99,6 @@
     "color": "green",
     "broken_color": "green",
     "difficulty": 3,
-	"location": "on_roof",
     "breaks_into": [ { "item": "abzats", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -123,7 +119,6 @@
     "color": "green",
     "broken_color": "green",
     "difficulty": 4,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m2browning", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -144,7 +139,6 @@
     "color": "green",
     "broken_color": "green",
     "difficulty": 6,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m134", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -165,7 +159,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "difficulty": 4,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m1918", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -186,7 +179,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "difficulty": 4,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m240", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -207,7 +199,6 @@
     "color": "cyan",
     "broken_color": "cyan",
     "difficulty": 4,
-	"location": "on_roof",
     "breaks_into": [ { "item": "m60", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -228,7 +219,6 @@
     "color": "green",
     "broken_color": "green",
     "difficulty": 5,
-	"location": "on_roof",
     "breaks_into": [ { "item": "mark19", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -249,7 +239,6 @@
     "color": "white",
     "broken_color": "white",
     "difficulty": 6,
-	"location": "on_roof",
     "breaks_into": [ { "item": "rm298", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -270,7 +259,6 @@
     "color": "white",
     "broken_color": "white",
     "difficulty": 6,
-	"location": "on_roof",
     "breaks_into": [ { "item": "rm614_lmg", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -291,7 +279,6 @@
     "color": "light_blue",
     "broken_color": "light_blue",
     "difficulty": 5,
-	"location": "on_roof",
     "breaks_into": [ { "item": "plasma_rifle", "prob": 50 } ],
     "requirements": {
       "install": {
@@ -313,7 +300,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 4,
-	"location": "on_roof",
     "breaks_into": [ { "item": "watercannon", "prob": 50 } ],
     "requirements": {
       "install": {

diff --git a/data/mods/Tanks/parts.json b/data/mods/Tanks/parts.json
@@ -19,7 +19,6 @@
     "size": 10,
     "extend": { "flags": [ "MANUAL" ] },
     "breaks_into": [ { "item": "tank_gun_manual", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 2 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -35,7 +34,6 @@
     "size": 50,
     "extend": { "flags": [ "MANUAL" ] },
     "breaks_into": [ { "item": "tank_gun_auto", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 2 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -51,7 +49,6 @@
     "size": 100,
     "extend": { "flags": [ "NEEDS_BATTERY_MOUNT" ] },
     "breaks_into": [ { "item": "tank_gun_rws", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 3 ], [ "electronics", 3 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -67,7 +64,6 @@
     "size": 15,
     "extend": { "flags": [ "MANUAL" ] },
     "breaks_into": [ { "item": "howitzer_gun", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 3 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -83,7 +79,6 @@
     "size": 35,
     "extend": { "flags": [ "MANUAL" ] },
     "breaks_into": [ { "item": "atgm_launcher", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 3 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -99,7 +94,6 @@
     "size": 35,
     "extend": { "flags": [ "NEEDS_BATTERY_MOUNT" ] },
     "breaks_into": [ { "item": "atgm_turret", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "launcher", 3 ], [ "electronics", 3 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }
@@ -115,7 +109,6 @@
     "size": 50,
     "extend": { "flags": [ "MANUAL" ] },
     "breaks_into": [ { "item": "30mm_autocannon", "prob": 50 } ],
-	"location": "on_roof",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 5 ], [ "rifle", 3 ] ], "time": 10000 },
       "removal": { "skills": [ [ "mechanics", 3 ] ] }

diff --git a/data/mods/blazemod/blaze_autoweapons_parts.json b/data/mods/blazemod/blaze_autoweapons_parts.json
@@ -8,6 +8,7 @@
     "broken_color": "dark_gray",
     "durability": 400,
     "damage_modifier": 80,
+    "location": "on_roof",
     "flags": [ "FOLDABLE", "TURRET", "NEEDS_BATTERY_MOUNT", "TOOL_NONE" ]
   },
   {

diff --git a/data/mods/blazemod/blaze_weapons_parts.json b/data/mods/blazemod/blaze_weapons_parts.json
@@ -6,6 +6,7 @@
     "broken_symbol": "#",
     "durability": 400,
     "damage_modifier": 80,
+    "location": "on_roof",
     "flags": [ "FOLDABLE", "TURRET", "MANUAL", "TOOL_NONE" ]
   },
   {
@@ -17,7 +18,6 @@
     "color": "light_gray",
     "broken_color": "light_gray",
     "difficulty": 4,
-	"location": "on_roof",
     "folded_volume": 12,
     "breaks_into": [ { "item": "bolter", "count": [ 0, 1 ] } ]
   },
@@ -30,7 +30,6 @@
     "color": "brown",
     "broken_color": "brown",
     "difficulty": 4,
-	"location": "on_roof",
     "folded_volume": 22,
     "breaks_into": [ { "item": "cangun", "count": [ 0, 1 ] } ]
   },
@@ -43,7 +42,6 @@
     "color": "dark_gray",
     "broken_color": "dark_gray",
     "difficulty": 5,
-	"location": "on_roof",
     "range": 15,
     "folded_volume": 15,
     "breaks_into": [ { "item": "gattler", "count": [ 0, 1 ] } ]
@@ -57,7 +55,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 6,
-	"location": "on_roof",
     "folded_volume": 12,
     "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ]
   },
@@ -70,7 +67,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 6,
-	"location": "on_roof",
     "folded_volume": 12,
     "breaks_into": [ { "item": "lasgun", "count": [ 0, 1 ] } ]
   },
@@ -83,7 +79,6 @@
     "color": "magenta",
     "broken_color": "magenta",
     "difficulty": 6,
-	"location": "on_roof",
     "folded_volume": 18,
     "breaks_into": [ { "item": "lasgunx", "count": [ 0, 1 ] } ]
   },
@@ -97,7 +92,6 @@
     "color": "dark_gray",
     "broken_color": "dark_gray",
     "difficulty": 5,
-	"location": "on_roof",
     "durability": 400,
     "power": -5,
     "range": 12,
@@ -114,7 +108,6 @@
     "color": "red",
     "broken_color": "red",
     "difficulty": 4,
-	"location": "on_roof",
     "range": 12,
     "folded_volume": 19,
     "breaks_into": [ { "item": "rm451_flamethrower", "count": [ 0, 1 ] } ],
@@ -129,7 +122,6 @@
     "color": "dark_gray",
     "broken_color": "dark_gray",
     "difficulty": 5,
-	"location": "on_roof",
     "folded_volume": 10,
     "breaks_into": [ { "item": "nailer", "count": [ 0, 1 ] } ]
   },
@@ -142,7 +134,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 5,
-	"location": "on_roof",
     "folded_volume": 15,
     "breaks_into": [ { "item": "needler", "count": [ 0, 1 ] } ]
   },
@@ -155,7 +146,6 @@
     "color": "magenta",
     "broken_color": "magenta",
     "difficulty": 5,
-	"location": "on_roof",
     "range": 14,
     "folded_volume": 16,
     "breaks_into": [ { "item": "railturret", "count": [ 0, 1 ] } ]
@@ -170,7 +160,6 @@
     "color": "dark_gray",
     "broken_color": "dark_gray",
     "difficulty": 5,
-	"location": "on_roof",
     "durability": 400,
     "power": -25,
     "range": 15,
@@ -184,7 +173,6 @@
     "type": "vehicle_part",
     "name": "manual rotary speargun",
     "item": "rslauncher",
-	"location": "on_roof",
     "color": "light_gray",
     "broken_color": "light_gray",
     "difficulty": 5,
@@ -200,7 +188,6 @@
     "color": "brown",
     "broken_color": "brown",
     "difficulty": 4,
-	"location": "on_roof",
     "folded_volume": 20,
     "breaks_into": [ { "item": "scorpion", "count": [ 0, 1 ] } ]
   },
@@ -213,7 +200,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 6,
-	"location": "on_roof",
     "folded_volume": 14,
     "breaks_into": [ { "item": "shardgun", "count": [ 0, 1 ] } ]
   },
@@ -226,7 +212,6 @@
     "color": "light_gray",
     "broken_color": "light_gray",
     "difficulty": 3,
-	"location": "on_roof",
     "folded_volume": 12,
     "breaks_into": [ { "item": "slauncher", "count": [ 0, 1 ] } ]
   },
@@ -239,7 +224,6 @@
     "color": "blue",
     "broken_color": "blue",
     "difficulty": 3,
-	"location": "on_roof",
     "folded_volume": 15,
     "breaks_into": [ { "item": "teslagun", "count": [ 0, 1 ] } ]
   },
@@ -252,7 +236,6 @@
     "color": "light_gray",
     "broken_color": "light_gray",
     "difficulty": 4,
-	"location": "on_roof",
     "folded_volume": 15,
     "breaks_into": [ { "item": "tiharturret", "count": [ 0, 1 ] } ]
   }