Aftershock vehicle cleanup and Blaze Industries vehicle migration. (C…

…leverRaven#49390)

data/json/vehicles/cars.json

@@ -701,6 +701,7 @@
   {
     "id": "car_sports_atomic",
     "type": "vehicle",
+    "//": "This definition is here for regression testing, do not move.",
     "name": "Atomic Sports Car",
     "blueprint": [
       [ "o--+-o" ],

data/mods/Aftershock/items/obsolete.json

@@ -681,5 +681,52 @@
     "color": "magenta",
     "name": "broken advanced robot",
     "description": "A broken advanced robot.  This one is armed with an integrated laser-emitter.  Could be stripped for parts."
+  },
+  {
+    "id": "40mm_emp",
+    "type": "AMMO",
+    "name": { "str": "40mm EMP grenade" },
+    "description": "A 40mm grenade with an EMP charge.  It will release an electromagnetic pulse capable of damaging robots and some equipment.",
+    "weight": "230 g",
+    "volume": "250 ml",
+    "price": 40000,
+    "material": [ "steel", "powder" ],
+    "symbol": "=",
+    "color": "yellow",
+    "count": 4,
+    "stack_size": 4,
+    "ammo_type": "40x46mm",
+    "casing": "40x46mm_m118_casing",
+    "range": 40,
+    "bashing": 5,
+    "dispersion": 30,
+    "recoil": 225,
+    "drop": "40mmEMP_act",
+    "effects": [ "COOKOFF", "NEVER_MISFIRES", "NO_EMBED" ]
+  },
+  {
+    "id": "40mmEMP_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": "active EMP grenade",
+    "description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy.  You may not want to be holding it much longer.",
+    "weight": "400 g",
+    "volume": "250 ml",
+    "price": 0,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "*",
+    "color": "cyan",
+    "initial_charges": 0,
+    "max_charges": 0,
+    "turns_per_charge": 1,
+    "use_action": {
+      "type": "explosion",
+      "draw_explosion_radius": 8,
+      "draw_explosion_color": "light_blue",
+      "emp_blast_radius": 8,
+      "sound_volume": 0
+    },
+    "flags": [ "TRADER_AVOID" ]
   }
 ]

data/mods/BlazeIndustries/items/items.json

@@ -0,0 +1,37 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "afs_scrap_titanium",
+    "symbol": ",",
+    "color": "light_gray",
+    "name": { "str_sp": "scrap titanium" },
+    "category": "spare_parts",
+    "description": "A piece of light titanium, usable for crafting or repairs.",
+    "price": 1000,
+    "material": [ "titanium" ],
+    "looks_like": "scrap",
+    "weight": "450 g",
+    "volume": "100 ml",
+    "bashing": 1,
+    "to_hit": -2
+  },
+  {
+    "id": "afs_titanium_small",
+    "type": "AMMO",
+    "category": "spare_parts",
+    "name": { "str_sp": "titanium" },
+    "description": "A strong, durable metal.  Highly valued for its weight to strength ratio and an excellent upgrade to aluminum for those properties - albeit a lot more expensive due to rarity.  More commonly used in jewelry and medical implants.",
+    "weight": "1 g",
+    "//": "Density 4.506g/cm³ ~ 1.127kg/250ml @ stack 1000 = 1g/unit",
+    "volume": "50 ml",
+    "price": 10000,
+    "price_postapoc": 750,
+    "count": 100,
+    "stack_size": 200,
+    "material": [ "titanium" ],
+    "looks_like": "silver_small",
+    "symbol": "/",
+    "color": "light_gray",
+    "ammo_type": "components"
+  }
+]

data/mods/BlazeIndustries/items/materials.json

@@ -0,0 +1,19 @@
+[
+  {
+    "type": "material",
+    "id": "titanium",
+    "name": "Titanium",
+    "density": 10,
+    "bash_resist": 4,
+    "cut_resist": 9,
+    "bullet_resist": 7,
+    "acid_resist": 14,
+    "fire_resist": 4,
+    "elec_resist": 8,
+    "chip_resist": 20,
+    "repaired_with": "afs_scrap_titanium",
+    "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
+    "bash_dmg_verb": "dented",
+    "cut_dmg_verb": "scratched"
+  }
+]

data/mods/BlazeIndustries/vehicleparts/vehicle_parts.json

@@ -0,0 +1,173 @@
+[
+  {
+    "abstract": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "name": { "str": "ultralight frame" },
+    "item": "afs_titanium_frame",
+    "location": "structure",
+    "categories": [ "hull" ],
+    "color": "light_gray",
+    "symbol": "c",
+    "durability": 100,
+    "description": "An ultralight titanium framework.  Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.",
+    "breaks_into": [ { "item": "afs_scrap_titanium", "count": [ 1, 3 ] } ],
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
+    },
+    "flags": [ "MOUNTABLE" ]
+  },
+  {
+    "id": "afs_lightweight_frame_cover",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "^"
+  },
+  {
+    "id": "afs_lightweight_frame_cross",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "c",
+    "extend": { "flags": [ "INITIAL_PART" ] }
+  },
+  {
+    "id": "afs_lightweight_frame_horizontal",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "h"
+  },
+  {
+    "id": "afs_lightweight_frame_horizontal_2",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "="
+  },
+  {
+    "id": "afs_lightweight_frame_ne",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "u"
+  },
+  {
+    "id": "afs_lightweight_frame_nw",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "y"
+  },
+  {
+    "id": "afs_lightweight_frame_se",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "n"
+  },
+  {
+    "id": "afs_lightweight_frame_sw",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "b"
+  },
+  {
+    "id": "afs_lightweight_frame_vertical",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "j"
+  },
+  {
+    "id": "afs_lightweight_frame_vertical_2",
+    "copy-from": "afs_lightweight_frame",
+    "type": "vehicle_part",
+    "symbol": "H"
+  },
+  {
+    "abstract": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "name": { "str": "ultralight foldable frame" },
+    "item": "afs_titanium_foldable_frame",
+    "location": "structure",
+    "categories": [ "hull" ],
+    "color": "light_gray",
+    "durability": 75,
+    "symbol": "H",
+    "folded_volume": "10 L",
+    "description": "An ultralight titanium foldable framework.  Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.",
+    "breaks_into": [ { "item": "afs_scrap_titanium", "count": [ 1, 3 ] } ],
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
+    },
+    "flags": [ "INITIAL_PART", "MOUNTABLE", "FOLDABLE" ]
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_cover",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_cover",
+    "symbol": "^"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_cross",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_cross",
+    "symbol": "c",
+    "extend": { "flags": [ "INITIAL_PART" ] }
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_horizontal",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_horizontal",
+    "symbol": "h"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_horizontal_2",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_horizontal_2",
+    "symbol": "="
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_ne",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_ne",
+    "symbol": "u"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_nw",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_nw",
+    "symbol": "y"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_se",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_se",
+    "symbol": "n"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_sw",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_sw",
+    "symbol": "b"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_vertical",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_vertical",
+    "symbol": "j"
+  },
+  {
+    "id": "afs_lightweight_foldable_frame_vertical_2",
+    "copy-from": "afs_lightweight_foldable_frame",
+    "type": "vehicle_part",
+    "looks_like": "afs_lightweight_frame_vertical_2",
+    "symbol": "H"
+  }
+]

data/mods/BlazeIndustries/vehicles/part_items.json

@@ -0,0 +1,26 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "afs_titanium_frame",
+    "name": { "str": "ultralight frame" },
+    "description": "A sturdy, lightweight frame made from titanium.  Useful for crafting.",
+    "weight": "1 kg",
+    "to_hit": -3,
+    "color": "white",
+    "symbol": "]",
+    "material": [ "titanium" ],
+    "looks_like": "xlframe",
+    "techniques": [ "DEF_DISARM" ],
+    "volume": "7500 ml",
+    "bashing": 15,
+    "category": "veh_parts",
+    "price": 4000
+  },
+  {
+    "type": "GENERIC",
+    "id": "afs_titanium_foldable_frame",
+    "copy-from": "afs_titanium_frame",
+    "name": { "str": "ultralight foldable frame" },
+    "description": "A sturdy, lightweight foldable frame made from titanium."
+  }
+]