Merge branch 'master' into personal_mission

Author: PatrikLundell

data/json/artifact/artifact_item_types.json

@@ -234,7 +234,9 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "coat_fur",
     "name": { "str": "ornate fur coat" },
-    "description": "A heavy, finely crafted coat made of the fur of an unidentifiable creature.  It is the only one of its kind.\nIt may have unknown powers; try activating them."
+    "description": "A heavy, finely crafted coat made of the fur of an unidentifiable creature.  It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "//": "remove fur coat variants",
+    "variants": [  ]
   },
   {
     "id": "art_mask",

data/json/construction/appliances.json

@@ -875,5 +875,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance",
     "activity_level": "MODERATE_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "app_lathe",
+    "group": "place_lathe",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "lathe", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
   }
 ]

data/json/construction_group.json

@@ -2114,5 +2114,10 @@
     "type": "construction_group",
     "id": "build_beanbag",
     "name": "Place a bean bag"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_lathe",
+    "name": "Place a lathe"
   }
 ]

data/json/furniture_and_terrain/appliances.json

@@ -1095,5 +1095,27 @@
       { "item": "rock", "count": [ 6, 12 ] }
     ],
     "variants": [ { "symbols": "o", "symbols_broken": "x" } ]
+  },
+  {
+    "id": "ap_lathe",
+    "type": "vehicle_part",
+    "categories": [ "utility" ],
+    "name": { "str": "lathe" },
+    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.",
+    "looks_like": "f_heavy_lathe",
+    "variants": [ { "symbols": "4", "symbols_broken": "#" } ],
+    "color": "cyan_red",
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "fake_lathe" } ],
+    "item": "lathe",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 12, 20 ] },
+      { "item": "chunk_cast_iron", "count": [ 2, 4 ] },
+      { "item": "lump_cast_iron", "count": [ 1, 2 ] }
+    ]
   }
 ]

data/json/furniture_and_terrain/furniture-tools.json

@@ -992,29 +992,30 @@
     "id": "f_heavy_lathe",
     "name": "power lathe",
     "looks_like": "f_machinery_light",
-    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.",
+    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.  It's really heavy but you could take this down and use it for your own purposes if you wanted.",
     "symbol": "4",
     "color": "cyan_red",
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": 16,
     "flags": [ "BLOCKSDOOR" ],
+    "examine_action": { "type": "appliance_convert", "furn_set": "f_null", "item": "lathe" },
     "bash": {
       "str_min": 40,
       "str_max": 150,
       "sound_fail": "clang!",
       "items": [
         { "item": "cable", "charges": [ 0, 4 ] },
         { "item": "scrap", "count": [ 12, 20 ] },
-        { "item": "ch_steel_chunk", "count": [ 2, 4 ] },
-        { "item": "ch_steel_lump", "count": [ 1, 2 ] }
+        { "item": "chunk_cast_iron", "count": [ 2, 4 ] },
+        { "item": "lump_cast_iron", "count": [ 1, 2 ] }
       ]
     },
     "deconstruct": {
       "items": [
         { "item": "cable", "charges": [ 4, 8 ] },
-        { "item": "ch_steel_chunk", "count": [ 4, 6 ] },
-        { "item": "ch_steel_lump", "count": [ 2, 4 ] },
+        { "item": "chunk_cast_iron", "count": [ 4, 6 ] },
+        { "item": "lump_cast_iron", "count": [ 2, 4 ] },
         { "item": "scrap", "count": [ 12, 16 ] },
         { "item": "pipe", "count": [ 0, 4 ] },
         { "item": "motor_small", "count": 1 }

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -670,7 +670,8 @@
       [ "molle_pack", 40 ],
       [ "molle_medium_rucksack", 40 ],
       [ "molle_large_rucksack", 25 ],
-      [ "duffelbag", 10 ],
+      [ "duffelbag", 5 ],
+      [ "seabag", 5 ],
       { "group": "large_duffelbags", "prob": 10 },
       [ "backpack_tactical_large", 10 ],
       [ "binoculars", 20 ],

data/json/itemgroups/military.json

@@ -619,7 +619,8 @@
       { "group": "molle_backpacks_and_accessories", "prob": 15 },
       { "item": "heatpack", "prob": 30 },
       { "item": "sleeping_bag_roll", "prob": 20 },
-      { "item": "duffelbag", "prob": 25 },
+      { "item": "duffelbag", "prob": 15 },
+      { "item": "seabag", "prob": 10 },
       { "item": "mess_kit", "prob": 50 },
       { "item": "flashlight", "prob": 50, "charges": [ 0, 300 ] },
       { "item": "heavy_flashlight", "prob": 10, "charges": [ 0, 300 ] },

data/json/items/ammo/22.json

@@ -48,7 +48,27 @@
     "ammo_type": "22",
     "casing": "22_casing",
     "range": 13,
-    "damage": { "damage_type": "bullet", "amount": 12 },
+    "damage": {
+      "damage_type": "bullet",
+      "amount": 12,
+      "barrels": [
+        { "barrel_length": "5 mm", "amount": 3 },
+        { "barrel_length": "6 mm", "amount": 4 },
+        { "barrel_length": "9 mm", "amount": 5 },
+        { "barrel_length": "13 mm", "amount": 6 },
+        { "barrel_length": "19 mm", "amount": 7 },
+        { "barrel_length": "29 mm", "amount": 8 },
+        { "barrel_length": "42 mm", "amount": 9 },
+        { "barrel_length": "63 mm", "amount": 10 },
+        { "barrel_length": "93 mm", "amount": 11 },
+        { "barrel_length": "138 mm", "amount": 12 },
+        { "barrel_length": "205 mm", "amount": 13 },
+        { "barrel_length": "304 mm", "amount": 14 },
+        { "barrel_length": "452 mm", "amount": 15 },
+        { "barrel_length": "672 mm", "amount": 16 },
+        { "barrel_length": "998 mm", "amount": 17 }
+      ]
+    },
     "dispersion": 60,
     "recoil": 150,
     "effects": [ "COOKOFF" ]

data/json/items/ammo/9mm.json

@@ -20,7 +20,37 @@
     "ammo_type": "9mm",
     "casing": "9mm_casing",
     "range": 14,
-    "damage": { "damage_type": "bullet", "amount": 26 },
+    "damage": {
+      "damage_type": "bullet",
+      "amount": 23,
+      "barrels": [
+        { "barrel_length": "6 mm", "amount": 9 },
+        { "barrel_length": "8 mm", "amount": 10 },
+        { "barrel_length": "10 mm", "amount": 11 },
+        { "barrel_length": "12 mm", "amount": 12 },
+        { "barrel_length": "15 mm", "amount": 13 },
+        { "barrel_length": "18 mm", "amount": 14 },
+        { "barrel_length": "23 mm", "amount": 15 },
+        { "barrel_length": "28 mm", "amount": 16 },
+        { "barrel_length": "36 mm", "amount": 17 },
+        { "barrel_length": "44 mm", "amount": 18 },
+        { "barrel_length": "55 mm", "amount": 19 },
+        { "barrel_length": "69 mm", "amount": 20 },
+        { "barrel_length": "87 mm", "amount": 21 },
+        { "barrel_length": "109 mm", "amount": 22 },
+        { "barrel_length": "136 mm", "amount": 23 },
+        { "barrel_length": "171 mm", "amount": 24 },
+        { "barrel_length": "214 mm", "amount": 25 },
+        { "barrel_length": "268 mm", "amount": 26 },
+        { "barrel_length": "335 mm", "amount": 27 },
+        { "barrel_length": "420 mm", "amount": 28 },
+        { "barrel_length": "526 mm", "amount": 29 },
+        { "barrel_length": "660 mm", "amount": 30 },
+        { "barrel_length": "827 mm", "amount": 31 },
+        { "barrel_length": "1036 mm", "amount": 32 },
+        { "barrel_length": "1298 mm", "amount": 33 }
+      ]
+    },
     "dispersion": 60,
     "recoil": 500,
     "effects": [ "COOKOFF" ]

data/json/items/appliances.json

@@ -389,5 +389,19 @@
     "price_postapoc": "25 USD",
     "symbol": "o",
     "color": "brown"
+  },
+  {
+    "type": "ITEM",
+    "id": "lathe",
+    "//": "Based off https://www.grizzly.com/products/grizzly-8-x-16-variable-speed-benchtop-metal-lathe/g0768 because its longest side is roughly 1 m long (hence it'd fit in a tile) and it seemed standard enough.",
+    "name": { "str": "disconnected lathe" },
+    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.  Needs to be placed and plugged into a power source.",
+    "looks_like": "f_heavy_lathe",
+    "symbol": "4",
+    "color": "cyan_red",
+    "material": [ "iron" ],
+    "longest_side": "115 cm",
+    "volume": "275 L",
+    "weight": "150 kg"
   }
 ]