Assorted equipment updates

nocts_cata_mod_BN/Char_creation/c_classes_r.json

@@ -9,7 +9,7 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "cowboy_hat_surv_surv_drifter",
-    "entries": [ { "item": "36navy_makeshift_magnum", "charges": 6 } ]
+    "entries": [ { "item": "36navy_makeshift_magnum", "charges": 12 } ]
   },
   {
     "type": "profession",
@@ -101,7 +101,7 @@
           { "item": "flintlock_pouch", "contents-group": "flintlock_pouch_surv_drifter" },
           { "item": "knife_hunting", "container-item": "sheath" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "36navy_makeshift_magnum", "charges": 14 }
+          { "item": "36navy_makeshift_magnum", "charges": 8 }
         ]
       },
       "male": [ "boxer_shorts" ],

nocts_cata_mod_BN/Recipe/c_recipes.json

@@ -2596,6 +2596,7 @@
     "skills_required": [ "fabrication", 3 ],
     "time": "1 h",
     "autolearn": true,
+    "book_learn": [ [ "recipe_surv", 3 ] ],
     "using": [ [ "sewing_standard", 40 ] ],
     "tools": [ [ [ "welder", 16 ], [ "welder_crude", 24 ], [ "soldering_iron", 24 ], [ "toolset", 24 ] ] ],
     "components": [
@@ -2605,5 +2606,35 @@
       [ [ "leather", 3 ] ],
       [ [ "duct_tape", 40 ] ]
     ]
+  },
+  {
+    "result": "legrig_surv",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "fabrication", 4 ],
+    "time": "1 h 20 m",
+    "autolearn": true,
+    "book_learn": [ [ "recipe_surv", 5 ] ],
+    "using": [ [ "sewing_standard", 100 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "components": [
+      [ [ "rag", 4 ] ],
+      [ [ "leather", 4 ] ],
+      [
+        [ "tacvest", 1 ],
+        [ "legrig", 1 ],
+        [ "vest", 1 ],
+        [ "tool_belt", 1 ],
+        [ "ragpouch", 4 ],
+        [ "leather_pouch", 2 ],
+        [ "dump_pouch", 1 ],
+        [ "purse", 2 ],
+        [ "fanny", 2 ]
+      ],
+      [ [ "duct_tape", 50 ] ]
+    ]
   }
 ]

nocts_cata_mod_BN/Surv_help/c_armor.json

@@ -1,11 +1,7 @@
 [
   {
     "type": "charge_removal_blacklist",
-    "list": [
-      "lmil_helm",
-      "mil_helm",
-      "hmil_helm"
-    ]
+    "list": [ "lmil_helm", "mil_helm", "hmil_helm" ]
   },
   {
     "id": "survbowpack",
@@ -378,7 +374,7 @@
     "id": "lmil_armor",
     "type": "ARMOR",
     "name": { "str_sp": "light military armor" },
-    "description": "A fairly light full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made from a fabric bodysuit with advanced composite plates, it is relatively easy to move in but protection is minimal, only rated for pistol-caliber rounds and fragmentation.",
+    "description": "A fairly light full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made from a fabric bodysuit with advanced composite plates, it is relatively easy to move in but protection is minimal, only rated for pistol-caliber rounds and fragmentation.  It also has two pouches for various sizes of small and medium magazines.",
     "weight": "9045 g",
     "volume": "10250 ml",
     "price": "1600 USD",
@@ -395,13 +391,24 @@
     "warmth": 30,
     "material_thickness": 1,
     "environmental_protection": 5,
+    "//": "Designed to be able to hold military light and medium atomic cells.",
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash magazine",
+      "holster_msg": "You stash your %s.",
+      "multi": 2,
+      "min_volume": "35 ml",
+      "max_volume": "525 ml",
+      "draw_cost": 40,
+      "flags": [ "MAG_COMPACT" ]
+    },
     "flags": [ "STURDY", "NO_SALVAGE" ]
   },
   {
     "id": "mil_armor",
     "type": "ARMOR",
     "name": { "str_sp": "military armor" },
-    "description": "A full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made with leather lining and advanced composite plates, it provides adequate protection against anything up to intermediate caliber ammunition, but may fail against full-power rifle rounds.",
+    "description": "A full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made with leather lining and advanced composite plates, it provides adequate protection against anything up to intermediate caliber ammunition, but may fail against full-power rifle rounds.  It also has two pouches for various sizes of small and medium magazines.",
     "weight": "11700 g",
     "volume": "11250 ml",
     "price": "1750 USD",
@@ -418,13 +425,24 @@
     "warmth": 30,
     "material_thickness": 1,
     "environmental_protection": 5,
+    "//": "Designed to be able to hold military light and medium atomic cells.",
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash magazine",
+      "holster_msg": "You stash your %s.",
+      "multi": 2,
+      "min_volume": "35 ml",
+      "max_volume": "525 ml",
+      "draw_cost": 40,
+      "flags": [ "MAG_COMPACT" ]
+    },
     "flags": [ "STURDY", "NO_SALVAGE" ]
   },
   {
     "id": "hmil_armor",
     "type": "ARMOR",
     "name": { "str_sp": "heavy military armor" },
-    "description": "A heavy-duty full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made from heavy-duty lining with advanced plating, it protects the body rather well against most rifle rounds, but may be too cumbersome for most situations.",
+    "description": "A heavy-duty full-body suit of gray ballistic armor, one size fits most, with separate helmet.  Made from heavy-duty lining with advanced plating, it protects the body rather well against most rifle rounds, but may be too cumbersome for most situations.  It also has two pouches for various sizes of medium and large magazines.",
     "weight": "20250 g",
     "volume": "13500 ml",
     "price": "2000 USD",
@@ -441,6 +459,17 @@
     "warmth": 30,
     "material_thickness": 1,
     "environmental_protection": 5,
+    "//": "Designed to be able to hold military medium and heavy atomic cells.",
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash magazine",
+      "holster_msg": "You stash your %s.",
+      "multi": 2,
+      "min_volume": "525 ml",
+      "max_volume": "1500 ml",
+      "draw_cost": 40,
+      "flags": [ "MAG_COMPACT", "MAG_BULKY" ]
+    },
     "flags": [ "STURDY", "NONCONDUCTIVE", "NO_SALVAGE" ]
   },
   {
@@ -799,7 +828,7 @@
     "material_thickness": 4,
     "use_action": {
       "type": "bandolier",
-      "capacity": 6,
+      "capacity": 12,
       "ammo": [
         "32",
         "762x25",
@@ -849,5 +878,37 @@
       "draw_cost": 30
     },
     "extend": { "effects": [ "STURDY" ] }
+  },
+  {
+    "type": "ARMOR",
+    "id": "legrig_surv",
+    "name": { "str": "survivor leg rig" },
+    "description": "A custom set of low-slung adjustable straps and rings, designed to secure a variety of equipment strapped to the legs.  Its straps can handle a wide range of short blades, firearms, magazines, and most items that would fit on a tool belt.  Activate it to store up to 4 items.",
+    "weight": "250 g",
+    "volume": "1500 ml",
+    "price": "100 USD",
+    "price_postapoc": "5 USD",
+    "rigid": false,
+    "material": [ "cotton", "leather" ],
+    "symbol": "[",
+    "looks_like": "legrig",
+    "color": "dark_gray",
+    "covers": [ "legs" ],
+    "coverage": 20,
+    "encumbrance": 2,
+    "max_encumbrance": 6,
+    "material_thickness": 1,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash item",
+      "holster_msg": "You stash your %s.",
+      "multi": 4,
+      "min_volume": "50 ml",
+      "max_volume": "1750 ml",
+      "skills": [ "pistol", "smg", "shotgun", "rifle" ],
+      "draw_cost": 75,
+      "flags": [ "SHEATH_KNIFE", "BELT_CLIP", "SHEATH_SWORD", "MAG_COMPACT", "MAG_BULKY", "SPEEDLOADER" ]
+    },
+    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
   }
 ]

nocts_cata_mod_BN/Weapons/c_magazines.json

@@ -253,7 +253,7 @@
     "capacity": 20,
     "reliability": 5,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
   {
     "id": "light_atomic_battery_cell_rechargeable",
@@ -262,7 +262,7 @@
     "category": "spare_parts",
     "name": { "str": "light rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
-    "extend": { "flags": [ "RECHARGE" ] }
+    "extend": { "flags": [ "RECHARGE", "MAG_COMPACT" ] }
   },
   {
     "id": "medium_atomic_battery_cell_rechargeable",
@@ -271,15 +271,15 @@
     "category": "spare_parts",
     "name": { "str": "medium rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
-    "extend": { "flags": [ "RECHARGE" ] }
+    "extend": { "flags": [ "RECHARGE", "MAG_COMPACT" ] }
   },
   {
     "id": "heavy_atomic_battery_cell_rechargeable",
     "copy-from": "heavy_atomic_battery_cell",
     "type": "MAGAZINE",
     "category": "spare_parts",
-    "name": { "str": " heavy rechargeable plutonium cell" },
+    "name": { "str": "heavy rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
-    "extend": { "flags": [ "RECHARGE" ] }
+    "extend": { "flags": [ "RECHARGE", "MAG_BULKY" ] }
   }
 ]

nocts_cata_mod_BN/Weapons/c_ranged.json

@@ -1593,7 +1593,7 @@
     "price_postapoc": "90 USD",
     "material": [ "superalloy", "steel" ],
     "ammo_effects": [ "PLASMA", "EXPLOSIVE_HUGE", "STREAM_BIG", "INCENDIARY", "WIDE", "EMP", "FLASHBANG" ],
-    "flags": [ "ALWAYS_TWOHAND", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE", "PYROMANIAC_WEAPON" ],
+    "flags": [ "ALWAYS_TWOHAND", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE", "PYROMANIAC_WEAPON", "RELOAD_ONE" ],
     "ups_charges": 150,
     "skill": "launcher",
     "ammo": [ "plasma" ],
@@ -1606,7 +1606,7 @@
     "recoil": 300,
     "loudness": 25,
     "durability": 10,
-    "clip_size": 1,
+    "clip_size": 5,
     "reload": 1000,
     "valid_mod_locations": [ [ "accessories", 2 ], [ "sling", 1 ], [ "stock", 1 ] ]
   },

nocts_cata_mod_DDA/Char_creation/c_classes_r.json

@@ -9,7 +9,7 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "cowboy_hat_surv_surv_drifter",
-    "entries": [ { "item": "36navy_makeshift_magnum", "charges": 6 } ]
+    "entries": [ { "item": "36navy_makeshift_magnum", "charges": 12 } ]
   },
   {
     "type": "profession",
@@ -104,7 +104,7 @@
           { "item": "flintlock_pouch", "contents-group": "flintlock_pouch_surv_drifter" },
           { "item": "knife_hunting", "container-item": "sheath" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "36navy_makeshift_magnum", "charges": 14 },
+          { "item": "36navy_makeshift_magnum", "charges": 8 },
           { "group": "charged_ref_lighter" }
         ]
       },

nocts_cata_mod_DDA/Recipe/c_recipes.json

@@ -2781,6 +2781,7 @@
     "skills_required": [ "fabrication", 3 ],
     "time": "1 h",
     "autolearn": true,
+    "book_learn": [ [ "recipe_surv", 3 ] ],
     "using": [ [ "sewing_standard", 40 ] ],
     "tools": [ [ [ "welder", 16 ], [ "welder_crude", 24 ], [ "soldering_iron", 24 ], [ "toolset", 24 ] ] ],
     "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_leatherworking_basic" } ],
@@ -2791,5 +2792,37 @@
       [ [ "leather", 3 ] ],
       [ [ "duct_tape", 40 ] ]
     ]
+  },
+  {
+    "result": "legrig_surv",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "skills_required": [ "fabrication", 4 ],
+    "time": "1 h 20 m",
+    "autolearn": true,
+    "book_learn": [ [ "recipe_surv", 5 ] ],
+    "using": [ [ "sewing_standard", 100 ], [ "steel_tiny", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "components": [
+      [ [ "rag", 4 ] ],
+      [ [ "leather", 4 ] ],
+      [
+        [ "tacvest", 1 ],
+        [ "legrig", 1 ],
+        [ "vest", 1 ],
+        [ "tool_belt", 1 ],
+        [ "ragpouch", 4 ],
+        [ "leather_pouch", 2 ],
+        [ "dump_pouch", 1 ],
+        [ "purse", 2 ],
+        [ "fanny", 2 ]
+      ],
+      [ [ "duct_tape", 50 ] ]
+    ]
   }
 ]