Weapon Categories: Krav Maga (#51785)

* BATONS * KNIVES * PISTOLS * RIFLES
CleverRaven · Sep 24, 2021 · 3e58f31 · 3e58f31
1 parent 9208dba
commit 3e58f31
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 118 deletions.
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -279,6 +279,7 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",
@@ -311,6 +312,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 39,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -20,6 +20,7 @@
     "dispersion": 150,
     "durability": 7,
     "min_cycle_recoil": 1350,
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -246,6 +247,7 @@
     "durability": 8,
     "min_cycle_recoil": 1350,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -421,6 +423,7 @@
     "durability": 6,
     "min_cycle_recoil": 1350,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -476,6 +479,7 @@
     "durability": 7,
     "min_cycle_recoil": 1350,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -521,6 +525,7 @@
         "description": "This is a shorter M4 carbine with a 10.3 inch barrel, intended for confined spaces and close quarters battle situations."
       }
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ]
   },
   {
@@ -660,6 +665,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -771,6 +777,7 @@
       [ "sling", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",

diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json
@@ -24,6 +24,7 @@
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_volume": "250 ml",
     "built_in_mods": [ "folding_stock" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -84,6 +85,7 @@
       [ "sling", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",

diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
@@ -23,6 +23,7 @@
     "min_cycle_recoil": 2700,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "barrel_volume": "500 ml",
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -56,6 +57,7 @@
     "min_cycle_recoil": 2700,
     "durability": 8,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -170,6 +172,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -324,6 +327,7 @@
     "ammo": [ "308" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -3 },
     "min_cycle_recoil": 2700,
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -399,6 +403,7 @@
     "min_cycle_recoil": 2700,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "default_mods": [ "adjustable_stock" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -432,6 +437,7 @@
     "durability": 8,
     "min_cycle_recoil": 2700,
     "default_mods": [ "adjustable_stock", "bipod", "rifle_scope", "suppressor" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -464,6 +470,7 @@
     "dispersion": 150,
     "durability": 7,
     "min_cycle_recoil": 2700,
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",

diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json
@@ -35,6 +35,7 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",
@@ -133,6 +134,7 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",

diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json
@@ -20,6 +20,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 540,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",
@@ -76,6 +77,7 @@
     "dispersion": 480,
     "durability": 6,
     "min_cycle_recoil": 540,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",

diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
@@ -70,6 +70,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 270,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "60 ml",

diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json
@@ -35,6 +35,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "500 ml",
@@ -66,6 +67,7 @@
     "ammo": [ "38super" ],
     "dispersion": 480,
     "durability": 7,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -57,6 +57,7 @@
     "durability": 6,
     "blackpowder_tolerance": 48,
     "min_cycle_recoil": 425,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],
@@ -193,6 +194,7 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -313,6 +315,7 @@
     "dispersion": 480,
     "durability": 8,
     "min_cycle_recoil": 504,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "185 ml",
@@ -343,6 +346,7 @@
     "dispersion": 480,
     "durability": 9,
     "min_cycle_recoil": 504,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "200 ml",
@@ -374,6 +378,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 504,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "312 ml",

diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
@@ -22,6 +22,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 1413,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
@@ -160,6 +160,7 @@
     "durability": 7,
     "min_cycle_recoil": 450,
     "blackpowder_tolerance": 48,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",
@@ -434,6 +435,7 @@
     "price_postapoc": 2500,
     "ranged_damage": { "damage_type": "bullet", "amount": 0 },
     "built_in_mods": [ "match_trigger" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",
@@ -473,6 +475,7 @@
     "dispersion": 480,
     "durability": 9,
     "min_cycle_recoil": 540,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "240 ml",
@@ -513,6 +516,7 @@
     "dispersion": 480,
     "durability": 7,
     "min_cycle_recoil": 540,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "353 ml",

diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
@@ -37,6 +37,7 @@
       [ "underbarrel", 1 ]
     ],
     "flags": [ "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",

diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
@@ -23,6 +23,7 @@
     "dispersion": 440,
     "durability": 8,
     "min_cycle_recoil": 81,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json
@@ -82,6 +82,7 @@
       [ "underbarrel", 1 ]
     ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
@@ -34,6 +34,7 @@
       [ "stock", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -132,6 +133,7 @@
       [ "underbarrel", 1 ]
     ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762": 10 }, "allowed_speedloaders": [ "762x39_clip" ] } ]
   },
   {

diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
@@ -69,6 +69,7 @@
     "dispersion": 225,
     "durability": 7,
     "min_cycle_recoil": 270,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "pocket_data": [
       {
         "magazine_well": "250 ml",

diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
@@ -206,6 +206,7 @@
       [ "underbarrel", 1 ]
     ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -297,6 +298,7 @@
     ],
     "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",