Remove crude gun mod locations (#75157)

* removes most mods * Add in revolving shotgun
CleverRaven · Jul 23, 2024 · bd5790c · bd5790c
1 parent 517baa6
commit bd5790c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 67 deletions.
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -86,15 +86,7 @@
     "clip_size": 1,
     "reload": 200,
     "barrel_volume": "360 ml",
-    "valid_mod_locations": [
-      [ "muzzle", 1 ],
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 1 } } ],

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
@@ -26,7 +26,7 @@
     "blackpowder_tolerance": 60,
     "clip_size": 2,
     "reload": 200,
-    "valid_mod_locations": [ [ "grip", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "rail mount", 1 ], [ "stock mount", 1 ] ],
+    "valid_mod_locations": [  ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38": 2 } } ],
@@ -89,15 +89,7 @@
     "reload": 200,
     "barrel_volume": "360 ml",
     "barrel_length": "600 mm",
-    "valid_mod_locations": [
-      [ "muzzle", 1 ],
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38": 1 } } ],

diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
@@ -107,15 +107,7 @@
     "reload": 200,
     "barrel_volume": "750 ml",
     "barrel_length": "600 mm",
-    "valid_mod_locations": [
-      [ "muzzle", 1 ],
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44": 1 } } ],

diff --git a/data/json/items/gun/chemical_spray.json b/data/json/items/gun/chemical_spray.json
@@ -20,7 +20,7 @@
     "ammo": [ "chemical_spray" ],
     "dispersion": 300,
     "durability": 6,
-    "valid_mod_locations": [ [ "grip", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
+    "valid_mod_locations": [ [ "sights mount", 1 ], [ "sling", 1 ] ],
     "pocket_data": [ { "magazine_well": "2 L", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "pressurized_tank_chem" ] } ],
     "melee_damage": { "bash": 9 }
   }

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -22,14 +22,7 @@
     "durability": 6,
     "clip_size": 1,
     "reload": 80,
-    "valid_mod_locations": [
-      [ "grip", 1 ],
-      [ "stock mount", 1 ],
-      [ "mechanism", 2 ],
-      [ "sights mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [  ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
@@ -54,7 +47,7 @@
     "modes": [ [ "DEFAULT", "burst", 6 ] ],
     "energy_drain": "1 kJ",
     "reload": 200,
-    "valid_mod_locations": [ [ "sights", 1 ], [ "rail mount", 1 ] ],
+    "valid_mod_locations": [ [ "sights mount", 1 ], [ "sling", 1 ] ],
     "flags": [ "MOUNTED_GUN", "USE_UPS" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ],
     "melee_damage": { "bash": 9 }
@@ -285,15 +278,7 @@
     "modes": [ [ "DEFAULT", "single", 1 ], [ "DOUBLE", "double", 2 ] ],
     "relative": { "weight": "625 g", "volume": "360 ml", "price": "50 USD" },
     "barrel_volume": "720 ml",
-    "valid_mod_locations": [
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "barrel", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "extend": { "flags": [ "RELOAD_ONE" ] },
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ]
   },
@@ -318,16 +303,7 @@
     "reload": 200,
     "barrel_volume": "360 ml",
     "barrel_length": "600 mm",
-    "valid_mod_locations": [
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "barrel", 1 ],
-      [ "muzzle", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
     "melee_damage": { "bash": 12 }
@@ -472,15 +448,7 @@
     "clip_size": 6,
     "reload": 200,
     "barrel_volume": "360 ml",
-    "valid_mod_locations": [
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "barrel", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ],
     "melee_damage": { "bash": 12 }
@@ -911,7 +879,7 @@
     "clip_size": 1,
     "reload": 600,
     "modes": [ [ "DEFAULT", "single", 1 ] ],
-    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ],
+    "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ],
     "flags": [ "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
     "melee_damage": { "bash": 8 }