Remove survivor launchers (#75172)

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -724,12 +724,6 @@
  { "group": "guns_launcher_rocket", "prob": 30 }
  ]
  },
- {
- "type": "item_group",
- "id": "guns_launcher_improvised",
- "//": "Makeshift or otherwise poor quality grenade and rocket launchers",
- "items": [ { "item": "launcher_simple", "prob": 100 }, { "item": "triple_launcher_simple", "prob": 15, "charges": [ 0, 3 ] } ]
- },
  {
  "type": "item_group",
  "id": "guns_common",
@@ -826,8 +820,7 @@
  { "group": "guns_pistol_improvised", "prob": 41 },
  { "group": "guns_smg_improvised", "prob": 1 },
  { "group": "guns_rifle_improvised", "prob": 56 },
- { "group": "guns_shotgun_improvised", "prob": 1 },
- { "group": "guns_launcher_improvised", "prob": 1 }
+ { "group": "guns_shotgun_improvised", "prob": 1 }
  ]
  },
  {

data/json/items/gun/40x46mm.json

@@ -1,38 +1,4 @@
 [
- {
- "id": "launcher_simple",
- "copy-from": "launcher_base",
- "looks_like": "m79",
- "type": "GUN",
- "name": { "str": "tube 40mm launcher" },
- "description": "A simple, home-made grenade launcher. Basically a tube with a pin firing mechanism to activate the grenade.",
- "weight": "2267 g",
- "volume": "1250 ml",
- "longest_side": "450 mm",
- "barrel_length": "368 mm",
- "price": "400 USD",
- "price_postapoc": "7 USD 50 cent",
- "to_hit": -3,
- "material": [ "steel", "wood" ],
- "ammo": [ "40x46mm" ],
- "dispersion": 550,
- "durability": 6,
- "blackpowder_tolerance": 60,
- "clip_size": 1,
- "reload": 350,
- "flags": [ "EASY_CLEAN" ],
- "valid_mod_locations": [
- [ "barrel", 1 ],
- [ "sights", 1 ],
- [ "sling", 1 ],
- [ "grip mount", 1 ],
- [ "rail mount", 1 ],
- [ "stock mount", 1 ],
- [ "underbarrel mount", 1 ]
- ],
- "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 1 } } ],
- "melee_damage": { "bash": 12 }
- },
  {
  "id": "m320",
  "copy-from": "launcher_base",
@@ -128,18 +94,6 @@
  "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 6 } } ],
  "melee_damage": { "bash": 12 }
  },
- {
- "id": "triple_launcher_simple",
- "copy-from": "launcher_simple",
- "type": "GUN",
- "name": { "str": "triple-barrel 40mm launcher" },
- "description": "A homemade triple-barrel 40mm grenade launcher. Capable of launching all three grenades at once, it is extremely powerful for a homemade weapon.",
- "clip_size": 3,
- "price_postapoc": "17 USD 50 cent",
- "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ], [ "MULTI", "multi", 3, [ "NPC_AVOID" ] ] ],
- "proportional": { "weight": 1.5, "volume": 1.8, "price": 2 },
- "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 3 } } ]
- },
  {
  "id": "pseudo_m203",
  "copy-from": "launcher_base",

data/json/items/gunmod/underbarrel.json

@@ -432,37 +432,6 @@
  "description": "The Modular Accessory Shotgun System is an underbarrel bolt-action shotgun that was inspired by the \"Masterkey\" and fixed most of its predecessor's problems. This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns.",
  "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
  },
- {
- "id": "pipe_launcher40mm",
- "copy-from": "underbarrel_base",
- "type": "GUNMOD",
- "name": { "str": "40mm pipe launcher" },
- "description": "A home-built launcher tube that can be attached to almost any weapon except handguns. It allows a single 40mm grenade to be loaded and fired.",
- "weight": "2080 g",
- "volume": "750 ml",
- "price": "250 USD",
- "price_postapoc": "5 USD",
- "install_time": "10 m",
- "material": [ "steel", "plastic" ],
- "symbol": ":",
- "color": "light_gray",
- "location": "underbarrel",
- "blacklist_mod": [ "knife_combat_army", "knife_combat", "enfield_bayonet", "knife_combat_marine", "makeshift_bayonet", "sword_bayonet" ],
- "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ],
- "gun_data": {
- "barrel_length": "370 mm",
- "ammo": "40x46mm",
- "skill": "launcher",
- "dispersion": 450,
- "durability": 10,
- "blackpowder_tolerance": 60,
- "clip_size": 1
- },
- "min_skills": [ [ "weapon", 1 ], [ "launcher", 1 ] ],
- "flags": [ "RELOAD_EJECT" ],
- "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
- "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
- },
  {
  "id": "pistol_bayonet",
  "type": "GUNMOD",

data/json/items/melee/swords_and_blades.json

@@ -331,7 +331,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",
@@ -403,7 +402,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",
@@ -462,7 +460,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",
@@ -1692,7 +1689,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",
@@ -3124,7 +3120,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",
@@ -3174,7 +3169,6 @@
  "makeshift_bayonet",
  "m26_mass",
  "m26_mass_mod",
- "pipe_launcher40mm",
  "rm121aux",
  "rm121aux_mod",
  "masterkey",

data/json/monsterdrops/zombie_survivor.json

@@ -262,8 +262,7 @@
  "distribution": [
  { "group": "guns_smg_improvised", "prob": 10 },
  { "group": "guns_rifle_improvised", "prob": 100 },
- { "group": "guns_shotgun_improvised", "prob": 100 },
- { "group": "guns_launcher_improvised", "prob": 30 }
+ { "group": "guns_shotgun_improvised", "prob": 100 }
  ],
  "prob": 200
  },

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -1552,6 +1552,21 @@
  "type": "MIGRATION",
  "replace": "sling-ready_molotov"
  },
+ {
+ "id": "triple_launcher_simple",
+ "type": "MIGRATION",
+ "replace": "mgl"
+ },
+ {
+ "id": "launcher_simple",
+ "type": "MIGRATION",
+ "replace": "m79"
+ },
+ {
+ "id": "pipe_launcher40mm",
+ "type": "MIGRATION",
+ "replace": "m203"
+ },
  {
  "id": "hk_g36",
  "type": "MIGRATION",

data/json/recipes/weapon/mods.json

@@ -794,21 +794,6 @@
  "qualities": [ { "id": "CUT", "level": 2 } ],
  "components": [ [ [ "fur", 1 ] ], [ [ "bone_glue", 1 ] ] ]
  },
- {
- "type": "recipe",
- "activity_level": "MODERATE_EXERCISE",
- "result": "pipe_launcher40mm",
- "//": "underbarrel mount",
- "category": "CC_WEAPON",
- "subcategory": "CSC_WEAPON_MODS",
- "skill_used": "mechanics",
- "skills_required": [ "launcher", 3 ],
- "difficulty": 6,
- "time": "30 m",
- "book_learn": [ [ "manual_launcher", 3 ], [ "mag_launcher", 4 ] ],
- "qualities": [ { "id": "SAW_M", "level": 1 } ],
- "components": [ [ [ "pipe", 1 ] ], [ [ "duct_tape", 50 ] ], [ [ "nail", 1 ] ] ]
- },
  {
  "type": "recipe",
  "activity_level": "MODERATE_EXERCISE",

data/json/recipes/weapon/ranged.json

@@ -928,44 +928,6 @@
  "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
  "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "2x4", 1 ] ] ]
  },
- {
- "type": "recipe",
- "activity_level": "MODERATE_EXERCISE",
- "result": "triple_launcher_simple",
- "category": "CC_WEAPON",
- "subcategory": "CSC_WEAPON_RANGED",
- "skill_used": "fabrication",
- "skills_required": [ [ "traps", 2 ], [ "mechanics", 2 ], [ "launcher", 4 ] ],
- "difficulty": 7,
- "time": "4 h",
- "autolearn": true,
- "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ],
- "//": "90cm weld",
- "using": [ [ "welding_standard", 90 ] ],
- "proficiencies": [
- { "proficiency": "prof_metalworking" },
- { "proficiency": "prof_welding_basic" },
- { "proficiency": "prof_gunsmithing_basic" },
- { "proficiency": "prof_gunsmithing_improv" }
- ],
- "components": [ [ [ "pipe", 3 ] ], [ [ "nails", 3, "LIST" ] ], [ [ "scrap", 3 ] ], [ [ "2x4", 1 ] ] ]
- },
- {
- "type": "recipe",
- "activity_level": "MODERATE_EXERCISE",
- "result": "launcher_simple",
- "category": "CC_WEAPON",
- "subcategory": "CSC_WEAPON_RANGED",
- "skill_used": "fabrication",
- "skills_required": [ [ "traps", 1 ], [ "launcher", 3 ] ],
- "difficulty": 6,
- "time": "2 h",
- "reversible": true,
- "autolearn": true,
- "proficiencies": [ { "proficiency": "prof_gunsmithing_basic" }, { "proficiency": "prof_gunsmithing_improv" } ],
- "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
- "components": [ [ [ "pipe", 1 ] ], [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "nails", 1, "LIST" ] ], [ [ "spring", 1 ] ] ]
- },
  {
  "type": "recipe",
  "activity_level": "LIGHT_EXERCISE",

data/mods/Backrooms/itemgroups.json

@@ -181,7 +181,6 @@
  { "group": "guns_rifle_rare", "prob": 15 },
  { "group": "guns_shotgun_common", "prob": 60 },
  { "group": "guns_shotgun_rare", "prob": 25 },
- { "group": "guns_launcher_improvised", "prob": 5 },
  { "group": "mags_pistol_common", "prob": 75 },
  { "group": "mags_pistol_rare", "prob": 50 },
  { "group": "mags_smg_common", "prob": 50 },

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -15,7 +15,7 @@
  "replace": "black_powder_rifle"
  },
  {
- "id": [ "brogyaga", "launcher_simple", "m79" ],
+ "id": [ "brogyaga", "m79" ],
  "type": "MIGRATION",
  "replace": "grenade_blooper"
  },
@@ -30,7 +30,7 @@
  "replace": "grenade_pistol"
  },
  {
- "id": [ "mgl", "sapra", "robofac_gun_40mm", "triple_launcher_simple", "pseudo_m203" ],
+ "id": [ "mgl", "sapra", "robofac_gun_40mm", "pseudo_m203" ],
  "type": "MIGRATION",
  "replace": "grenade_revolver"
  },

data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json

@@ -1,6 +1,6 @@
 [
  {
- "id": [ "m203", "m320_mod", "pipe_launcher40mm" ],
+ "id": [ "m203", "m320_mod" ],
  "type": "MIGRATION",
  "replace": "grenade_under"
  },

data/mods/Generic_Guns/recipes/recipe_obsolete.json

@@ -279,21 +279,6 @@
  "result": "rifle_223",
  "obsolete": true
  },
- {
- "type": "recipe",
- "result": "triple_launcher_simple",
- "obsolete": true
- },
- {
- "type": "recipe",
- "result": "launcher_simple",
- "obsolete": true
- },
- {
- "type": "recipe",
- "result": "pipe_launcher40mm",
- "obsolete": true
- },
  {
  "type": "recipe",
  "result": "m320",

data/mods/TEST_DATA/legacy_to_hit.json

@@ -799,7 +799,6 @@
  "large_tent_kit",
  "largebroketent",
  "laser_rifle",
- "launcher_simple",
  "lawn_dart",
  "lawnmower",
  "lc_brigandine_hands",

data/mods/innawood/itemgroups/guns.json

@@ -191,12 +191,6 @@
  "//": "Factory manufactured grenade and rocket launchers (excludes improvised weapons)",
  "items": [ { "group": "archery", "prob": 50 } ]
  },
- {
- "type": "item_group",
- "id": "guns_launcher_improvised",
- "//": "Makeshift or otherwise poor quality grenade and rocket launchers",
- "items": [ { "group": "archery", "prob": 50 } ]
- },
  {
  "type": "item_group",
  "id": "guns_common",

tests/reloading_test.cpp

@@ -607,7 +607,7 @@ TEST_CASE( "gunmod_reloading", "[reload],[gun]" )
 {
  SECTION( "empty gun and gunmod" ) {
  item gun( "modular_m4_carbine" );
- item mod( "pipe_launcher40mm" );
+ item mod( "m203" );
  gun.force_insert_item( mod, pocket_type::MOD );
 
  SECTION( "wrong ammo" ) {
@@ -631,7 +631,7 @@ TEST_CASE( "gunmod_reloading", "[reload],[gun]" )
 
  SECTION( "partially empty gun and empty gunmod" ) {
  item gun( "modular_m4_carbine" );
- item mod( "pipe_launcher40mm" );
+ item mod( "m203" );
  item mag1( "stanag30" );
  mag1.put_in( item( "556", calendar::turn, 10 ), pocket_type::MAGAZINE );
 
@@ -665,7 +665,7 @@ TEST_CASE( "gunmod_reloading", "[reload],[gun]" )
 
  SECTION( "partially empty gun and full gunmod" ) {
  item gun( "modular_m4_carbine" );
- item mod( "pipe_launcher40mm" );
+ item mod( "m203" );
  item mag1( "stanag30" );
  mag1.put_in( item( "556", calendar::turn, 10 ), pocket_type::MAGAZINE );
  mod.put_in( item( "40x46mm_m433", calendar::turn, 1 ), pocket_type::MAGAZINE );
@@ -700,7 +700,7 @@ TEST_CASE( "gunmod_reloading", "[reload],[gun]" )
 
  SECTION( "partially empty gun and gunmod with casing" ) {
  item gun( "modular_m4_carbine" );
- item mod( "pipe_launcher40mm" );
+ item mod( "m203" );
  item mag1( "stanag30" );
  mag1.put_in( item( "556", calendar::turn, 10 ), pocket_type::MAGAZINE );
  mod.force_insert_item( item( "40x46mm_m118_casing" ).set_flag( json_flag_CASING ),
@@ -736,7 +736,7 @@ TEST_CASE( "gunmod_reloading", "[reload],[gun]" )
 
  SECTION( "full gun and empty gunmod" ) {
  item gun( "modular_m4_carbine" );
- item mod( "pipe_launcher40mm" );
+ item mod( "m203" );
  item mag1( "stanag30" );
  mag1.put_in( item( "556", calendar::turn, 30 ), pocket_type::MAGAZINE );