Further mention removal + additional gun removal

Cleans up mentions in NPC shopkeeps, also removes handmade lever shotgun. Was gonna replace it with a winchester 1901 but they do not seem to exist within large enough quantities
CleverRaven · Mar 16, 2024 · 3ff5f7c · 3ff5f7c
1 parent 7d2af14
commit 3ff5f7c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 59 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -215,7 +215,6 @@
       [ "458wm", 1 ],
       [ "sw629", 3 ],
       { "group": "modular_deagle_44", "prob": 2 },
-      [ "lemat_revolver", 1 ],
       [ "m1911", 5 ],
       [ "mosin91_30", 1 ],
       [ "match_trigger", 3 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -188,7 +188,6 @@
       { "group": "nested_bfr", "prob": 10 },
       { "group": "nested_cop_38", "prob": 10 },
       { "group": "nested_colt_saa", "prob": 8 },
-      { "group": "nested_lemat_revolver", "prob": 5 },
       { "group": "nested_mauser_c96", "prob": 15 },
       { "group": "nested_TDI_10", "prob": 4 },
       { "group": "nested_draco", "prob": 20 },
@@ -232,7 +231,6 @@
       { "item": "bfr", "prob": 10 },
       { "item": "cop_38", "prob": 45 },
       { "item": "colt_saa", "prob": 8 },
-      { "item": "lemat_revolver", "prob": 13 },
       { "item": "mauser_c96", "prob": 15 },
       { "item": "makarov", "prob": 8 },
       { "item": "tokarev", "prob": 5 },
@@ -833,7 +831,7 @@
     "type": "item_group",
     "id": "guns_rifle_improvised",
     "//": "Makeshift or otherwise poor quality rifles.",
-    "items": [ { "item": "rifle_22", "prob": 60 }, { "item": "remington_700", "prob": 30 }, { "item": "rifle_9mm", "prob": 60 } ]
+    "items": [ { "item": "rifle_22", "prob": 60 }, { "item": "remington_700", "prob": 30 } ]
   },
   {
     "type": "item_group",
@@ -998,8 +996,7 @@
       { "item": "bigun", "prob": 10, "charges-min": 0, "charges-max": 6 },
       { "item": "pipe_double_shotgun", "prob": 70, "charges-min": 0, "charges-max": 2 },
       { "item": "pipe_shotgun", "prob": 100 },
-      { "item": "revolver_shotgun", "prob": 30, "charges-min": 0, "charges-max": 6 },
-      { "item": "lever_shotgun", "prob": 10, "charges-min": 0, "charges-max": 6 }
+      { "item": "revolver_shotgun", "prob": 30, "charges-min": 0, "charges-max": 6 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -966,14 +966,6 @@
       { "group": "on_hand_460" }
     ]
   },
-  {
-    "id": "nested_lemat_revolver",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [ { "item": "lemat_revolver", "charges-min": 0, "charges-max": 9 }, { "group": "on_hand_44paper" } ]
-  },
   {
     "id": "nested_makarov",
     "type": "item_group",
@@ -2017,7 +2009,7 @@
     "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
     "subtype": "collection",
     "ammo": 100,
-    "entries": [ { "item": "bh_m89", "charges-min": 0, "charges-max": 1 }, { "group": "on_hand_50" } ]
+    "entries": [ { "item": "bfg50", "charges-min": 0, "charges-max": 1 }, { "group": "on_hand_50" } ]
   },
   {
     "id": "nested_carbine_flintlock",

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1366,7 +1366,6 @@
       [ "carbine_flintlock", 1 ],
       [ "rifle_flintlock", 1 ],
       { "group": "modular_deagle_44", "prob": 25, "charges": [ 0, 8 ] },
-      { "item": "lemat_revolver", "prob": 25, "charges": [ 0, 9 ] },
       [ "fencing_foil", 20 ],
       [ "fencing_sabre", 20 ],
       [ "fencing_epee", 20 ],

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -76,7 +76,6 @@
     "entries": [
       { "item": "pistol_flintlock", "prob": 60 },
       { "item": "carbine_flintlock", "prob": 40 },
-      { "item": "lemat_revolver", "prob": 30 },
       { "item": "rifle_flintlock", "prob": 75 },
       { "item": "colt_army", "prob": 30 },
       { "item": "colt_navy", "prob": 30 }
@@ -91,7 +90,6 @@
     "entries": [
       { "item": "pistol_flintlock", "prob": 60 },
       { "item": "carbine_flintlock", "prob": 40 },
-      { "item": "lemat_revolver", "prob": 30 },
       { "item": "rifle_flintlock", "prob": 75 },
       { "item": "colt_army", "prob": 30 },
       { "item": "colt_navy", "prob": 30 }

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -61,44 +61,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "lever_shotgun",
-    "copy-from": "shotgun_base",
-    "looks_like": "remington_870",
-    "type": "GUN",
-    "name": { "str": "handmade lever shotgun" },
-    "description": "A short, homemade lever-action shotgun with a small internal tube magazine.  While still a primitive design - made from a pipe and a plank - it is a formidable shotgun in its own right with room for improvement.",
-    "weight": "2311 g",
-    "volume": "2 L",
-    "longest_side": "85 cm",
-    "barrel_length": "356 mm",
-    "//": "length of a 6 round shotshell tube",
-    "price": 10000,
-    "price_postapoc": 2250,
-    "to_hit": -1,
-    "material": [ "steel", "wood" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
-    "dispersion": 550,
-    "durability": 6,
-    "barrel_volume": "500 ml",
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "brass catcher", 1 ],
-      [ "muzzle", 1 ],
-      [ "stock mount", 1 ],
-      [ "mechanism", 4 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
-    "clip_size": 6,
-    "extend": { "flags": [ "RELOAD_ONE", "EASY_CLEAN" ] },
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ],
-    "melee_damage": { "bash": 10 }
-  },
   {
     "id": "ksg",
     "copy-from": "shotgun_pump",

diff --git a/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json b/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json
@@ -117,8 +117,7 @@
       [ "9mmfmj", 35 ],
       [ "45_acp", 20 ],
       [ "reloaded_45_acp", 25 ],
-      [ "45_jhp", 10 ],
-      [ "rifle_9mm", 25 ],
+      [ "45_jhp", 10 ],,
       [ "rifle_22", 25 ],
       [ "uzi", 10 ],
       [ "mac_10", 10 ],

diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json b/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json
@@ -207,7 +207,6 @@
       [ "45_acp", 10 ],
       [ "reloaded_45_acp", 25 ],
       [ "45_jhp", 1 ],
-      [ "rifle_9mm", 20 ],
       [ "rifle_22", 20 ],
       [ "uzi", 10 ],
       [ "mac_10", 10 ],

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1206,5 +1206,10 @@
     "id": "shot_paper_dragon",
     "type": "MIGRATION",
     "replace": "44army"
+  },
+  {
+    "id": "lever_shotgun",
+    "type": "MIGRATION",
+    "replace": "remington_870"
   }
 ]