[Experimental] routine update 2

.gitattributes

@@ -1,6 +1,6 @@
 # Automatically normalize line endings for all files
 # detected as text (Convert CRLF => LF).
-*         text=lf
+*         text=CRLF
 
 # Explicitly normalize files with these extensions in
 # case Git doesn't detect them as text for some reason.

.gitignore

@@ -5,10 +5,7 @@ Scripts/lint-json.sh
 CMakeSettings.json
 AStyle/
 *.ninja
-Tools/format/out/build/x64-Debug (default)/CMakeFiles/cmake.check_cache
-Tools/format/out/build/x64-Debug (default)/CMakeFiles/3.17.20032601-MSVC_2/CMakeDetermineCompilerABI_CXX.bin
-Tools/format/out/build/x64-Debug (default)/CMakeFiles/3.17.20032601-MSVC_2/CMakeDetermineCompilerABI_C.bin
-Tools/format/out/build/x64-Debug (default)/CMakeCache.txt
+Tools/format/out/
 Workshop/names.json
 *.log
 __pycache__/
@@ -17,4 +14,4 @@ json_formatter.exe
 # IDE's
 .vscode/
 .idea/
-.vs/
+.vs/

data/Legacy_mods/mods/Salvaged_Robots/robot_additions/vehicles.json

@@ -12,16 +12,15 @@
     "parts": [
       { "x": 0, "y": 0, "parts": [ "frame_vertical", "robot_controls", "roof" ] },
       { "x": 0, "y": 1, "parts": [ "frame_vertical", "windshield", "engine_electric_large" ] },
-      { "x": 0, "y": 2, "parts": [ "frame_vertical", "halfboard_vertical", "storage_battery_mount" ] },
-      { "x": 0, "y": 2, "part": "storage_battery_removable" },
-      { "x": 0, "y": -1, "parts": [ "frame_vertical", "windshield", "frame_vertical", "windshield" ] },
+      { "x": 0, "y": 2, "parts": [ "frame_vertical", "halfboard_vertical" ] },
+      { "x": 0, "y": 2, "parts": [ "storage_battery_mount", "storage_battery_removable" ] },
+      { "x": 0, "y": -1, "parts": [ "frame_vertical", "windshield" ] },
       { "x": 1, "y": 0, "parts": [ "frame_vertical", "windshield", "headlight" ] },
       { "x": 1, "y": 1, "parts": [ "frame_vertical", "windshield" ] },
-      { "x": 1, "y": 2, "parts": [ "frame_vertical", "halfboard_vertical", "storage_battery_mount" ] },
-      { "x": 1, "y": 2, "parts": [ "storage_battery_removable", "wheel_mount_medium_steerable" ] },
-      { "x": 1, "y": 2, "part": "wheel" },
-      { "x": 1, "y": -1, "parts": [ "frame_vertical", "windshield", "wheel_mount_medium_steerable" ] },
-      { "x": 1, "y": -1, "part": "wheel" },
+      { "x": 1, "y": 2, "parts": [ "frame_vertical", "halfboard_vertical" ] },
+      { "x": 1, "y": 2, "parts": [ "storage_battery_mount", "storage_battery_removable" ] },
+      { "x": 1, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 1, "y": -1, "parts": [ "frame_vertical", "windshield", "wheel_mount_medium_steerable", "wheel" ] },
       { "x": -1, "y": 0, "parts": [ "frame_vertical", "windshield" ] },
       { "x": -1, "y": 1, "parts": [ "frame_vertical", "windshield", "headlight" ] },
       { "x": -1, "y": 2, "parts": [ "frame_vertical", "windshield" ] },
@@ -49,12 +48,9 @@
       { "x": 0, "y": 1, "parts": [ "hdframe_vertical_2", "robot_cargo", "hdroof" ] },
       { "x": 0, "y": 2, "parts": [ "hdframe_vertical", "hddoor_opaque", "plating_military" ] },
       { "x": 0, "y": 2, "parts": [ "wheel_mount_heavy", "wheel_armor" ] },
-      { "x": 0, "y": -1, "parts": [ "hdframe_vertical_2", "robot_cargo", "hdroof", "hdframe_vertical_2" ] },
-      { "x": 0, "y": -1, "parts": [ "robot_cargo", "hdroof" ] },
+      { "x": 0, "y": -1, "parts": [ "hdframe_vertical_2", "robot_cargo", "hdroof" ] },
       { "x": 0, "y": -2, "parts": [ "hdframe_vertical", "hddoor_opaque", "wheel_mount_heavy" ] },
-      { "x": 0, "y": -2, "parts": [ "wheel_armor", "plating_military", "hdframe_vertical" ] },
-      { "x": 0, "y": -2, "parts": [ "hddoor_opaque", "plating_military", "wheel_mount_heavy" ] },
-      { "x": 0, "y": -2, "part": "wheel_armor" },
+      { "x": 0, "y": -2, "parts": [ "wheel_armor", "plating_military" ] },
       { "x": 1, "y": 0, "parts": [ "hdframe_vertical_2", "aisle_horizontal", "hdroof" ] },
       { "x": 1, "y": 1, "parts": [ "hdframe_vertical_2", "robot_cargo", "hdroof" ] },
       { "x": 1, "y": 2, "parts": [ "hdframe_vertical", "hddoor_opaque", "plating_military" ] },
@@ -69,32 +65,25 @@
       { "x": 2, "y": -1, "parts": [ "hdframe_vertical_2", "robot_cargo", "hdroof" ] },
       { "x": 2, "y": -2, "parts": [ "hdframe_vertical", "hddoor_opaque", "plating_military" ] },
       { "x": 2, "y": -2, "parts": [ "wheel_mount_heavy", "wheel_armor" ] },
-      { "x": 3, "y": 0, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "diesel_engine_v6" ] },
-      { "x": 3, "y": 0, "parts": [ "hdroof", "battery_car", "plating_military", "alternator_truck" ] },
-      { "x": 3, "y": 0, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "hdroof" ] },
-      { "x": 3, "y": 0, "parts": [ "diesel_engine_v6", "battery_car", "alternator_truck" ] },
-      { "x": 3, "y": 0, "part": "plating_military" },
+      { "x": 3, "y": 0, "parts": [ "hdframe_vertical_2", "stowboard_vertical", "diesel_engine_v6", "hdroof" ] },
+      { "x": 3, "y": 0, "parts": [ "battery_car", "plating_military" ] },
+      { "x": 3, "y": 0, "part": "alternator_truck" },
       { "x": 3, "y": 1, "parts": [ "hdframe_vertical_2", "cam_control", "plating_military", "seat" ] },
       { "x": 3, "y": 1, "parts": [ "seatbelt_heavyduty", "turret_mount", "mounted_browning" ] },
-      { "x": 3, "y": 1, "parts": [ "hdframe_vertical_2", "cam_control", "plating_military", "seat" ] },
-      { "x": 3, "y": 1, "parts": [ "seatbelt_heavyduty", "turret_mount", "mounted_browning" ] },
-      { "x": 3, "y": 2, "parts": [ "hdframe_vertical", "hdboard_vertical", "omnicam" ] },
-      { "x": 3, "y": 2, "parts": [ "plating_military", "wheel_mount_heavy_steerable", "wheel_armor" ] },
-      { "x": 3, "y": 2, "parts": [ "hdframe_vertical", "hdboard_vertical", "omnicam" ] },
-      { "x": 3, "y": 2, "parts": [ "plating_military", "wheel_mount_heavy_steerable", "wheel_armor" ] },
+      { "x": 3, "y": 2, "parts": [ "hdframe_vertical", "hdboard_vertical", "omnicam", "plating_military" ] },
+      { "x": 3, "y": 2, "parts": [ "wheel_mount_heavy_steerable", "wheel_armor" ] },
       { "x": 3, "y": -1, "parts": [ "hdframe_vertical_2", "seat", "controls", "dashboard", "cam_control" ] },
       { "x": 3, "y": -1, "parts": [ "vehicle_clock", "seatbelt_heavyduty", "hdroof" ] },
-      { "x": 3, "y": -2, "parts": [ "hdframe_vertical", "hdboard_vertical", "omnicam" ] },
-      { "x": 3, "y": -2, "parts": [ "plating_military", "wheel_mount_heavy_steerable", "wheel_armor" ] },
+      { "x": 3, "y": -2, "parts": [ "hdframe_vertical", "hdboard_vertical", "omnicam", "plating_military" ] },
+      { "x": 3, "y": -2, "parts": [ "wheel_mount_heavy_steerable", "wheel_armor" ] },
       { "x": 4, "y": 0, "parts": [ "hdframe_horizontal", "hdboard_ne", "plating_military" ] },
       { "x": 4, "y": 1, "parts": [ "hdframe_horizontal", "hdboard_horizontal", "headlight_reinforced" ] },
       { "x": 4, "y": 1, "part": "plating_military" },
       { "x": 4, "y": 2, "parts": [ "hdframe_ne", "hdboard_ne", "plating_military" ] },
-      { "x": 4, "y": -1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "x": 4, "y": -1, "parts": [ "headlight_reinforced", "plating_military" ] },
+      { "x": 4, "y": -1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "x": 4, "y": -1, "part": "plating_military" },
       { "x": 4, "y": -2, "parts": [ "hdframe_nw", "hdboard_nw", "plating_military" ] },
-      { "x": 5, "y": 0, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "horn_big" ] },
-      { "x": 5, "y": 0, "part": "plating_military" },
+      { "x": 5, "y": 0, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "horn_big", "plating_military" ] },
       { "x": 5, "y": 1, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "plating_military" ] },
       { "x": 5, "y": 2, "parts": [ "hdframe_ne", "hdhalfboard_ne", "plating_military" ] },
       { "x": 5, "y": -1, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "plating_military" ] },
@@ -123,24 +112,23 @@
       [ "O-++-OH" ]
     ],
     "parts": [
-      { "x": 0, "y": 0, "parts": [ "hdframe_vertical_2", "controls", "dashboard", "vehicle_clock" ] },
-      { "x": 0, "y": 0, "parts": [ "horn_big", "seat", "seatbelt", "hdroof" ] },
+      { "x": 0, "y": 0, "parts": [ "hdframe_vertical_2", "controls", "dashboard", "vehicle_clock", "horn_big" ] },
+      { "x": 0, "y": 0, "parts": [ "seat", "seatbelt", "hdroof" ] },
       { "x": 0, "y": 1, "parts": [ "hdframe_vertical_2", "box", "recharge_station", "hdroof" ] },
       { "x": 0, "y": 2, "parts": [ "hdframe_vertical_2", "seat", "seatbelt", "hdroof" ] },
       { "x": 0, "y": 3, "parts": [ "hdframe_vertical", "hddoor" ] },
       { "x": 0, "y": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
-      { "x": 1, "y": 0, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "x": 1, "y": 0, "part": "headlight_reinforced" },
+      { "x": 1, "y": 0, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
       { "x": 1, "y": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "x": 1, "y": 2, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "x": 1, "y": 3, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "x": 1, "y": -1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
-      { "x": 2, "y": 0, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "plating_military" ] },
-      { "x": 2, "y": 0, "part": "headlight_reinforced" },
-      { "x": 2, "y": 1, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "diesel_engine_v8" ] },
-      { "x": 2, "y": 1, "parts": [ "alternator_truck", "battery_car", "plating_military" ] },
-      { "x": 2, "y": 2, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal", "plating_military" ] },
-      { "x": 2, "y": 2, "part": "headlight_reinforced" },
+      { "x": 2, "y": 0, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal" ] },
+      { "x": 2, "y": 0, "parts": [ "plating_military", "headlight_reinforced" ] },
+      { "x": 2, "y": 1, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal" ] },
+      { "x": 2, "y": 1, "parts": [ "diesel_engine_v8", "alternator_truck", "battery_car", "plating_military" ] },
+      { "x": 2, "y": 2, "parts": [ "hdframe_horizontal", "hdhalfboard_horizontal" ] },
+      { "x": 2, "y": 2, "parts": [ "plating_military", "headlight_reinforced" ] },
       { "x": 2, "y": 3, "parts": [ "hdframe_ne", "hdhalfboard_ne", "plating_military" ] },
       { "x": 2, "y": 3, "parts": [ "wheel_mount_heavy_steerable", "wheel_armor" ] },
       { "x": 2, "y": -1, "parts": [ "hdframe_nw", "hdhalfboard_nw", "plating_military" ] },
@@ -152,14 +140,7 @@
       { "x": 3, "y": -1, "parts": [ "hdframe_horizontal", "plating_military" ] },
       { "x": -1, "y": 0, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
       { "x": -1, "y": 1, "parts": [ "hdframe_horizontal_2", "aisle_horizontal", "roof" ] },
-      {
-        "x": -1,
-        "y": 1,
-        "part": [ "turret_mount", "mounted_mk19" ],
-        "ammo": 60,
-        "ammo_types": [ "40x46mm_m433", "40mm_emp" ],
-        "ammo_qty": [ 1, 25 ]
-      },
+      { "x": -1, "y": 1, "parts": [ "turret_mount", "mounted_mk19" ] },
       { "x": -1, "y": 2, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
       { "x": -1, "y": 3, "parts": [ "hdframe_vertical", "hddoor" ] },
       { "x": -1, "y": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
@@ -171,10 +152,10 @@
       { "x": -3, "y": 0, "parts": [ "hdframe_horizontal", "hddoor_trunk", "muffler", "plating_military" ] },
       { "x": -3, "y": 1, "parts": [ "hdframe_horizontal", "hddoor_trunk", "plating_military" ] },
       { "x": -3, "y": 2, "parts": [ "hdframe_horizontal", "hddoor_trunk", "plating_military" ] },
-      { "x": -3, "y": 3, "parts": [ "hdframe_se", "hdboard_se", "plating_military", "wheel_mount_heavy" ] },
-      { "x": -3, "y": 3, "part": "wheel_armor" },
-      { "x": -3, "y": -1, "parts": [ "hdframe_sw", "hdboard_sw", "plating_military", "wheel_mount_heavy" ] },
-      { "x": -3, "y": -1, "part": "wheel_armor" }
+      { "x": -3, "y": 3, "parts": [ "hdframe_se", "hdboard_se", "plating_military" ] },
+      { "x": -3, "y": 3, "parts": [ "wheel_mount_heavy", "wheel_armor" ] },
+      { "x": -3, "y": -1, "parts": [ "hdframe_sw", "hdboard_sw", "plating_military" ] },
+      { "x": -3, "y": -1, "parts": [ "wheel_mount_heavy", "wheel_armor" ] }
     ],
     "items": [
       { "x": 0, "y": 0, "chance": 5, "items": [ "id_military" ] },

data/Mainline_mods/Mods/BlazeIndustries/blaze_furniture.json

@@ -0,0 +1,68 @@
+[
+  {
+    "id": "f_afs_fridge_vehicle",
+    "type": "furniture",
+    "name": "vehicle refrigerator",
+    "symbol": "{",
+    "description": "This fridge has been converted to run off of a vehicle's power supply.  You'll need to take it down first.",
+    "color": "white",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] },
+    "max_volume": "1000 L",
+    "deployed_item": "afs_fridge",
+    "examine_action": "deployed_furniture",
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "sheet_metal", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 0, 3 ] },
+        { "item": "scrap", "count": [ 2, 8 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "cu_pipe", "count": [ 2, 4 ] },
+        { "item": "scrap_copper", "count": [ 1, 2 ] },
+        { "item": "motor_tiny", "prob": 25 }
+      ]
+    },
+    "looks_like": "f_fridge"
+  },
+  {
+    "id": "f_afs_freezer_vehicle",
+    "type": "furniture",
+    "name": "vehicle freezer",
+    "symbol": "{",
+    "description": "This fridge has been further refurbished, and runs at a much lower temperature.  You'll need to take it down first.",
+    "color": "light_blue",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] },
+    "max_volume": "1000 L",
+    "deployed_item": "afs_freezer",
+    "examine_action": "deployed_furniture",
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "sheet_metal", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 0, 3 ] },
+        { "item": "scrap", "count": [ 2, 8 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "hose", "count": 1 },
+        { "item": "cu_pipe", "count": [ 2, 4 ] },
+        { "item": "scrap_copper", "count": [ 1, 2 ] },
+        { "item": "motor_tiny", "prob": 25 }
+      ]
+    },
+    "looks_like": "f_fridge"
+  }
+]

data/Mainline_mods/Mods/BlazeIndustries/items/vehicle/blaze_other.json

@@ -14,5 +14,53 @@
     "category": "veh_parts",
     "price": "800 USD",
     "price_postapoc": "10 USD"
+  },
+  {
+    "id": "afs_fridge",
+    "category": "veh_parts",
+    "type": "GENERIC",
+    "name": { "str": "vehicle refrigerator" },
+    "description": "A household refrigerator with impressive capacity.  Its power connection has been refurbished, and it can be mounted onto a vehicle to draw from its power.",
+    "symbol": "{",
+    "color": "white",
+    "weight": "142882 g",
+    "volume": "300 L",
+    "price": 40000,
+    "price_postapoc": 10000,
+    "material": [ "steel" ],
+    "to_hit": -4,
+    "bashing": 8,
+    "flags": [ "DURABLE_MELEE" ],
+    "looks_like": "minifridge"
+  },
+  {
+    "id": "afs_freezer",
+    "category": "veh_parts",
+    "type": "GENERIC",
+    "name": { "str": "vehicle freezer" },
+    "copy-from": "afs_fridge",
+    "description": "This refurbished refrigerator has been stripped of much of its internal components and converted to run at a much lower temperature, causing it to serve as a freezer for more power.  Like its predecessor, it runs on vehicle power.",
+    "color": "light_blue"
+  },
+  {
+    "id": "afs_metal_rig",
+    "type": "GENERIC",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "MetalMaster forge buddy", "str_pl": "MetalMaster forge buddies" },
+    "description": "From the makers of the best-selling* FOODCO kitchen buddy comes the MetalMaster forge buddy, for all your metalworking, firing, and welding needs!  It's just as clunky and awkward as the thing it's spinning off, and still requires a vehicle battery to function."
+  },
+  {
+    "id": "afs_kitchen_rig",
+    "type": "GENERIC",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "KitchenMaster cooking buddy", "str_pl": "KitchenMaster cooking buddies" },
+    "description": "Because it *clearly* needed one, this large all-in-one station provides the functions of FOODCO's kitchen buddy, now with complementary fume hoods and chemistry materials.  Why a chef would need a chemical rig is anyone's guess, but you can mount it on a vehicle to make use of it."
+  },
+  {
+    "id": "afs_cooking_rig",
+    "type": "GENERIC",
+    "copy-from": "vehicle_rig",
+    "name": { "str": "cooking rig" },
+    "description": "Skillet, pot, hotplate, and chemistry set; everything you need to cook food and chemicals.  Includes proper fume vents and a separator, so you don't contaminate your food with toxic chemicals."
   }
 ]

data/Mainline_mods/Mods/BlazeIndustries/recipes/blaze_construction_recipes.json

@@ -0,0 +1,28 @@
+[
+  {
+    "id": "constr_blz_fridge_vehicle",
+    "type": "construction",
+    "group": "convert_fridge_power_supply",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 3 ], [ "electronics", 4 ], [ "mechanics", 3 ] ],
+    "time": 30,
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "cable", 10 ] ], [ [ "power_supply", 1 ] ], [ [ "plastic_chunk", 2 ] ] ],
+    "pre_note": "Converts a fridge to run off of vehicle power.  You can 'e'xamine it afterwards to take it down for mounting.",
+    "pre_terrain": "f_fridge",
+    "post_terrain": "f_afs_fridge_vehicle"
+  },
+  {
+    "id": "constr_blz_freezer_vehicle",
+    "type": "construction",
+    "group": "convert_vehicle_fridge_to_freezer",
+    "category": "FURN",
+    "required_skills": [ [ "electronics", 3 ], [ "mechanics", 3 ] ],
+    "time": 20,
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "cable", 10 ] ], [ [ "amplifier", 3 ] ], [ [ "refrigerant_tank", 2 ] ] ],
+    "pre_note": "Further modifies a converted fridge to function as a freezer.  You can 'e'xamine it afterwards to take it down for mounting.",
+    "pre_terrain": "f_afs_fridge_vehicle",
+    "post_terrain": "f_afs_freezer_vehicle"
+  }
+]