transfer tank treads and their dependents from blazemod to tankmod

Transfers integration of the items, recipes and vehicle parts for treads into Tankmod's files, and makes Tankmod self-sufficient. Transfers dependency from blazemod to tankmod for `Heavy Miners` obsolete mod for time being. Tankmod updated to use vanilla turrets as well to eradicate errors leftover from dependency on obsolete turretframe.
CleverRaven · May 2, 2020 · 6560c65 · 6560c65
1 parent cb7d243
commit 6560c65
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 105 deletions.
diff --git a/data/mods/HeavyMining/modinfo.json b/data/mods/HeavyMining/modinfo.json
@@ -5,9 +5,9 @@
     "name": "Roadheader and other mining vehicles",
     "authors": [ "Ckpyt" ],
     "maintainers": [ "Ckpyt in the forest" ],
-    "description": "Adds a few mining vehicles, requires Vehicle Additions Pack.",
+    "description": "Adds a few mining vehicles, requires Tanks and Other Vehicles as it is no longer dependent on blazemod.",
     "category": "vehicles",
-    "dependencies": [ "dda", "blazemod" ],
+    "dependencies": [ "dda", "Tanks" ],
     "obsolete": true
   }
 ]
diff --git a/data/mods/Tanks/items.json b/data/mods/Tanks/items.json
@@ -506,5 +506,56 @@
     "skill": "launcher",
     "price": 6000,
     "required_level": 3
+  },
+  {
+    "id": "tread1",
+    "type": "WHEEL",
+    "category": "veh_parts",
+    "name": { "str": "Rubber Caterpillar Track" },
+    "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels.  Similar with what you might see used on light construction vehicles.  It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.",
+    "weight": "32368 g",
+    "volume": "50 L",
+    "price": 25500,
+    "to_hit": -3,
+    "bashing": 30,
+    "material": [ "plastic", "steel" ],
+    "symbol": "]",
+    "color": "white",
+    "diameter": 30,
+    "width": 15
+  },
+  {
+    "id": "tread2",
+    "type": "WHEEL",
+    "category": "veh_parts",
+    "name": { "str": "Steel Caterpillar Track" },
+    "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels.  Similar with what you might see used on large construction vehicles.  It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.",
+    "weight": "95968 g",
+    "volume": "75 L",
+    "price": 45500,
+    "to_hit": -3,
+    "bashing": 30,
+    "material": [ "steel" ],
+    "symbol": "]",
+    "color": "white",
+    "diameter": 50,
+    "width": 25
+  },
+  {
+    "id": "tread3",
+    "type": "WHEEL",
+    "category": "veh_parts",
+    "name": { "str": "Reinforced Caterpillar Track" },
+    "description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels.  Similar with what you might see used on APCs and armored vehicles.  It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.",
+    "weight": "287824 g",
+    "volume": "87500 ml",
+    "price": 75500,
+    "to_hit": -3,
+    "bashing": 30,
+    "material": [ "hardsteel", "steel" ],
+    "symbol": "]",
+    "color": "white",
+    "diameter": 60,
+    "width": 30
   }
 ]
diff --git a/data/mods/Tanks/modinfo.json b/data/mods/Tanks/modinfo.json
@@ -7,7 +7,7 @@
     "maintainers": [ "BorkBorkGoesTheCode" ],
     "description": "Adds a few armored fighting vehicles and other such things, requires Vehicle Additions Pack.",
     "category": "vehicles",
-    "dependencies": [ "dda", "blazemod" ],
+    "dependencies": [ "dda" ],
     "obsolete": true
   }
 ]
diff --git a/data/mods/Tanks/recipes.json b/data/mods/Tanks/recipes.json
@@ -179,5 +179,50 @@
       [ [ "cable", 10 ] ],
       [ [ "chem_hmtd", 10 ] ]
     ]
+  },
+  {
+    "result": "tread1",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "skills_required": [ "mechanics", 6 ],
+    "time": "116 h 40 m",
+    "autolearn": true,
+    "using": [ [ "forging_standard", 10 ], [ "steel_standard", 10 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "wire", 20 ] ], [ [ "plastic_chunk", 200 ] ], [ [ "chain", 6 ] ] ]
+  },
+  {
+    "result": "tread2",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "skills_required": [ "mechanics", 7 ],
+    "time": "144 h 26 m 40 s",
+    "autolearn": true,
+    "using": [ [ "forging_standard", 15 ], [ "steel_standard", 15 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "steel_plate", 10 ] ], [ [ "chain", 6 ] ] ]
+  },
+  {
+    "result": "tread3",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "skills_required": [ "mechanics", 7 ],
+    "time": "200 h",
+    "autolearn": true,
+    "using": [ [ "forging_standard", 20 ], [ "steel_standard", 20 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
+    "components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]
   }
 ]
diff --git a/...s/blazemod/vehicleparts/blaze_treads.json → data/mods/Tanks/treads.json b/...s/blazemod/vehicleparts/blaze_treads.json → data/mods/Tanks/treads.json
diff --git a/data/mods/Tanks/vehicles.json b/data/mods/Tanks/vehicles.json
@@ -120,8 +120,8 @@
       { "x": 0, "y": 1, "part": "plating_military" },
       { "x": 1, "y": 1, "part": "hdframe_vertical_2" },
       { "x": 1, "y": 1, "part": "hdhalfboard_ne" },
-      { "x": 1, "y": 1, "part": "turretframe" },
-      { "x": 1, "y": 1, "part": "am2browning", "ammo": 80, "ammo_qty": [ 10, 100 ] },
+      { "x": 1, "y": 1, "part": "turret_mount" },
+      { "x": 1, "y": 1, "part": "mounted_browning", "ammo": 80, "ammo_qty": [ 10, 100 ] },
       { "x": 1, "y": 1, "part": "plating_military" },
       { "x": 2, "y": 1, "part": "hdframe_vertical_2" },
       { "x": 2, "y": 1, "part": "hdhalfboard_horizontal" },
@@ -1521,7 +1521,7 @@
       { "x": -4, "y": 1, "part": "hdroof" },
       { "x": -3, "y": 1, "part": "hdframe_vertical_2" },
       { "x": -3, "y": 1, "part": "hdboard_vertical" },
-      { "x": -3, "y": 1, "part": "turretframe" },
+      { "x": -3, "y": 1, "part": "turret_mount" },
       {
         "x": -3,
         "y": 1,
@@ -2071,7 +2071,7 @@
       { "x": 0, "y": -2, "part": "hdframe_vertical_2" },
       { "x": 0, "y": -2, "part": "seat" },
       { "x": 0, "y": -2, "part": "seatbelt_heavyduty" },
-      { "x": 0, "y": -2, "part": "turretframe" },
+      { "x": 0, "y": -2, "part": "turret_mount" },
       { "x": 0, "y": -2, "part": "tow_turret", "ammo": 60, "ammo_qty": [ 1, 2 ] },
       { "x": 0, "y": -2, "part": "controls" },
       { "x": 0, "y": -2, "part": "dashboard" },

diff --git a/data/mods/blazemod/items/vehicle/blaze_treads.json b/data/mods/blazemod/items/vehicle/blaze_treads.json
diff --git a/data/mods/blazemod/recipes/blaze_other_recipes.json b/data/mods/blazemod/recipes/blaze_other_recipes.json
@@ -87,51 +87,6 @@
       [ [ "reinforced_solar_panel_v2", 3 ] ]
     ]
   },
-  {
-    "result": "tread1",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "skills_required": [ "mechanics", 6 ],
-    "time": "116 h 40 m",
-    "autolearn": true,
-    "using": [ [ "forging_standard", 10 ], [ "steel_standard", 10 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "wire", 20 ] ], [ [ "plastic_chunk", 200 ] ], [ [ "chain", 6 ] ] ]
-  },
-  {
-    "result": "tread2",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "fabrication",
-    "difficulty": 7,
-    "skills_required": [ "mechanics", 7 ],
-    "time": "144 h 26 m 40 s",
-    "autolearn": true,
-    "using": [ [ "forging_standard", 15 ], [ "steel_standard", 15 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "steel_plate", 10 ] ], [ [ "chain", 6 ] ] ]
-  },
-  {
-    "result": "tread3",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "fabrication",
-    "difficulty": 7,
-    "skills_required": [ "mechanics", 7 ],
-    "time": "200 h",
-    "autolearn": true,
-    "using": [ [ "forging_standard", 20 ], [ "steel_standard", 20 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
-    "tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "vehicle_shelving",

diff --git a/...mod/vehicleparts/blaze_weapons_parts.json → ...d/vehicleparts/blaze_turrets_vanilla.json b/...mod/vehicleparts/blaze_weapons_parts.json → ...d/vehicleparts/blaze_turrets_vanilla.json