diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index a2e0980d37b85..48782ad80d681 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -513,46 +513,6 @@ } ] }, - { - "id": "rifle_223", - "copy-from": "gun_base", - "looks_like": "ar15", - "type": "GUN", - "name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" }, - "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", - "weight": "4080 g", - "volume": "3 L", - "price": 110000, - "price_postapoc": 500, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": [ "223" ], - "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, - "dispersion": 550, - "durability": 6, - "blackpowder_tolerance": 60, - "loudness": 25, - "clip_size": 1, - "reload": 200, - "barrel_length": "1000 ml", - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "muzzle", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "223": 1 } } ] - }, { "id": "ruger_mini", "copy-from": "rifle_semi", @@ -734,65 +694,5 @@ "item_restriction": [ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ] } ] - }, - { - "id": "surv_carbine_223", - "copy-from": "rifle_manual", - "looks_like": "ar15", - "type": "GUN", - "name": { "str": "handmade carbine" }, - "//": "It's smaller than an M4A1, plus it's a homemade firearm.", - "description": "A well-designed improvised lever-action carbine with a shortened barrel. Accepting crude detachable magazines or STANAG magazines, this is one of the better homemade weapons.", - "weight": "1950 g", - "volume": "1500 ml", - "price": 10000, - "price_postapoc": 2750, - "to_hit": -1, - "bashing": 6, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": [ "223" ], - "ranged_damage": { "damage_type": "bullet", "amount": -4 }, - "dispersion": 550, - "durability": 6, - "blackpowder_tolerance": 32, - "loudness": 25, - "reload": 200, - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ] - ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ - "survivor223mag", - "stanag30", - "stanag5", - "stanag10", - "stanag20", - "stanag40", - "stanag50", - "stanag60", - "stanag60drum", - "stanag90", - "stanag100", - "stanag100drum", - "stanag150" - ] - } - ] } ] diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 8ae9eeb979eb2..10cb19ae73476 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -210,46 +210,5 @@ "barrel_length": "750 ml", "flags": [ "RELOAD_ONE", "NEVER_JAMS" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 4 } } ] - }, - { - "id": "rifle_3006", - "looks_like": "ar15", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "pipe rifle: .30-06", "str_pl": "pipe rifles: .30-06" }, - "//": "It's the same size as the others, but it's still a scrap weapon.", - "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", - "weight": "4080 g", - "volume": "3 L", - "price": 110000, - "price_postapoc": 500, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": [ "3006" ], - "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, - "dispersion": 550, - "durability": 6, - "blackpowder_tolerance": 60, - "loudness": 25, - "clip_size": 1, - "reload": 200, - "barrel_length": "1000 ml", - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "muzzle", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ] } ] diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 7f66806aa8dbf..3bc215ec05d97 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -275,54 +275,6 @@ "description": "This is a semi-automatic civilian variant of the M60 machine gun, retaining the ability to be belt fed, an uncommon feature in civilian firearms.", "modes": [ [ "DEFAULT", "semi-auto", 1 ] ] }, - { - "id": "rifle_308", - "copy-from": "rifle_manual", - "looks_like": "ar15", - "type": "GUN", - "name": { "str": "handmade heavy carbine" }, - "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.", - "description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.", - "weight": "2311 g", - "volume": "2 L", - "price": 10000, - "price_postapoc": 2250, - "to_hit": -1, - "bashing": 10, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -5 }, - "dispersion": 550, - "durability": 6, - "blackpowder_tolerance": 60, - "reload": 200, - "barrel_length": "500 ml", - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "barrel", 1 ], - [ "bore", 1 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "stock", 1 ], - [ "mechanism", 4 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ "g3_makeshiftmag", "g3mag", "g3bigmag" ] - } - ] - }, { "id": "savage_111f", "copy-from": "rifle_manual", diff --git a/data/json/items/gun/combination.json b/data/json/items/gun/combination.json index d21bb40a2ab6f..399539152a8ac 100644 --- a/data/json/items/gun/combination.json +++ b/data/json/items/gun/combination.json @@ -39,44 +39,5 @@ [ "rail mount", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ] - }, - { - "id": "pipe_combination_gun", - "looks_like": "ar15", - "type": "GUN", - "reload_noise_volume": 10, - "symbol": "(", - "color": "brown", - "name": { "str": "pipe combination gun" }, - "description": "A home-made triple-barreled firearm, one barrel chambered in .30-06 and two other for shotgun shells. It is made from pipes and parts cannibalized from a double barrel shotgun.", - "price": 40000, - "//": "Attached mod will now have weight.", - "material": [ "steel", "wood" ], - "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], - "skill": "shotgun", - "ammo": [ "3006" ], - "weight": "2267 g", - "volume": "2 L", - "price_postapoc": 1250, - "bashing": 12, - "to_hit": -1, - "dispersion": 550, - "durability": 6, - "blackpowder_tolerance": 60, - "clip_size": 1, - "loudness": 25, - "barrel_length": "500 ml", - "built_in_mods": [ "combination_gun_shotgun_pipe" ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "valid_mod_locations": [ - [ "muzzle", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ] } ] diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index a59912fd2eea1..c80f7c9de45db 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -65,6 +65,42 @@ } ] }, + { + "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 pipe and 2x4 design, it is a formiddable shotgun in it's own right with room for improvement.", + "weight": "2311 g", + "volume": "2 L", + "price": 10000, + "price_postapoc": 2250, + "to_hit": -1, + "bashing": 10, + "material": [ "steel", "wood" ], + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, + "dispersion": 550, + "durability": 6, + "barrel_length": "500 ml", + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "muzzle", 1 ], + [ "stock", 1 ], + [ "mechanism", 4 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "clip_size": 6, + "extend": { "flags": [ "RELOAD_ONE" ] }, + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 6 } } ] + }, { "id": "browning_a5", "copy-from": "shotgun_base", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index c4382d0cc1a90..91866b6055182 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -47,25 +47,6 @@ "flags": [ "IRREMOVABLE", "RELOAD_ONE", "RELOAD_EJECT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ] }, - { - "id": "combination_gun_shotgun_pipe", - "type": "GUNMOD", - "name": { "str": "pipe combination gun shotgun" }, - "description": "The integrated underbarrel shotgun of a pipe combination gun which holds two shots. It's irremovable.", - "weight": "1134 g", - "volume": "1 L", - "price": 10000, - "price_postapoc": 500, - "to_hit": -1, - "material": [ "steel" ], - "symbol": ":", - "color": "light_red", - "location": "underbarrel", - "mod_targets": [ "rifle" ], - "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 480, "durability": 6, "clip_size": 2 }, - "flags": [ "IRREMOVABLE", "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ] - }, { "id": "factory_handguard", "type": "GUNMOD", diff --git a/data/json/obsolete.json b/data/json/obsolete.json index 332e4df4a0733..e37242e82a43d 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -1,4 +1,251 @@ [ + { + "id": "pipe_combination_gun", + "looks_like": "ar15", + "type": "GUN", + "reload_noise_volume": 10, + "symbol": "(", + "color": "brown", + "name": { "str": "pipe combination gun" }, + "description": "A home-made triple-barreled firearm, one barrel chambered in .30-06 and two other for shotgun shells. It is made from pipes and parts cannibalized from a double barrel shotgun.", + "price": 40000, + "//": "Attached mod will now have weight.", + "material": [ "steel", "wood" ], + "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], + "skill": "shotgun", + "ammo": [ "3006" ], + "weight": "2267 g", + "volume": "2 L", + "price_postapoc": 1250, + "bashing": 12, + "to_hit": -1, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 60, + "clip_size": 1, + "loudness": 25, + "barrel_length": "500 ml", + "built_in_mods": [ "combination_gun_shotgun_pipe" ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "valid_mod_locations": [ + [ "muzzle", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ] + }, + { + "id": "combination_gun_shotgun_pipe", + "type": "GUNMOD", + "name": { "str": "pipe combination gun shotgun" }, + "description": "The integrated underbarrel shotgun of a pipe combination gun which holds two shots. It's irremovable.", + "weight": "1134 g", + "volume": "1 L", + "price": 10000, + "price_postapoc": 500, + "to_hit": -1, + "material": [ "steel" ], + "symbol": ":", + "color": "light_red", + "location": "underbarrel", + "mod_targets": [ "rifle" ], + "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 480, "durability": 6, "clip_size": 2 }, + "flags": [ "IRREMOVABLE", "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ] + }, + { + "id": "rifle_3006", + "looks_like": "ar15", + "type": "GUN", + "reload_noise_volume": 10, + "name": { "str": "pipe rifle: .30-06", "str_pl": "pipe rifles: .30-06" }, + "//": "It's the same size as the others, but it's still a scrap weapon.", + "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", + "weight": "4080 g", + "volume": "3 L", + "price": 110000, + "price_postapoc": 500, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "wood" ], + "symbol": "(", + "color": "brown", + "ammo": [ "3006" ], + "skill": "rifle", + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 60, + "loudness": 25, + "clip_size": 1, + "reload": 200, + "barrel_length": "1000 ml", + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "muzzle", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "flags": [ "RELOAD_EJECT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ] + }, + { + "id": "rifle_308", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "handmade heavy carbine" }, + "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.", + "description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.", + "weight": "2311 g", + "volume": "2 L", + "price": 10000, + "price_postapoc": 2250, + "to_hit": -1, + "bashing": 10, + "material": [ "steel", "wood" ], + "symbol": "(", + "color": "brown", + "ammo": [ "308" ], + "ranged_damage": { "damage_type": "bullet", "amount": -5 }, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 60, + "reload": 200, + "barrel_length": "500 ml", + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "muzzle", 1 ], + [ "stock", 1 ], + [ "mechanism", 4 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "g3_makeshiftmag", "g3mag", "g3bigmag" ] + } + ] + }, + { + "id": "surv_carbine_223", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "handmade carbine" }, + "//": "It's smaller than an M4A1, plus it's a homemade firearm.", + "description": "A well-designed improvised lever-action carbine with a shortened barrel. Accepting crude detachable magazines or STANAG magazines, this is one of the better homemade weapons.", + "weight": "1950 g", + "volume": "1500 ml", + "price": 10000, + "price_postapoc": 2750, + "to_hit": -1, + "bashing": 6, + "material": [ "steel", "wood" ], + "symbol": "(", + "color": "brown", + "ammo": [ "223" ], + "ranged_damage": { "damage_type": "bullet", "amount": -4 }, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 32, + "loudness": 25, + "reload": 200, + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "barrel", 1 ], + [ "brass catcher", 1 ], + [ "muzzle", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "underbarrel", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ + "survivor223mag", + "stanag30", + "stanag5", + "stanag10", + "stanag20", + "stanag40", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150" + ] + } + ] + }, + { + "id": "rifle_223", + "copy-from": "gun_base", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" }, + "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", + "weight": "4080 g", + "volume": "3 L", + "price": 110000, + "price_postapoc": 500, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "wood" ], + "symbol": "(", + "color": "brown", + "ammo": [ "223" ], + "skill": "rifle", + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 60, + "loudness": 25, + "clip_size": 1, + "reload": 200, + "barrel_length": "1000 ml", + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "muzzle", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "flags": [ "RELOAD_EJECT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "223": 1 } } ] + }, { "id": "bio_advreactor", "type": "bionic", @@ -862,6 +1109,26 @@ "react_cost": "2 J", "time": 1 }, + { + "type": "recipe", + "result": "pipe_combination_gun", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "surv_carbine_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_3006", + "obsolete": true + }, { "type": "recipe", "result": "tihar", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index ff39e4b1c9979..a9bc654f012b0 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -637,20 +637,11 @@ "skill_used": "mechanics", "skills_required": [ [ "gun", 3 ] ], "difficulty": 3, - "time": "1 h", + "time": "2 h", "autolearn": true, "book_learn": [ [ "manual_shotgun", 2 ], [ "manual_pistol", 2 ] ], - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 3 ] ], "components": [ [ [ "shotgun_s", 1 ], [ "pipe_shotgun", 1 ] ], [ [ "pipe", 3 ] ], @@ -669,17 +660,8 @@ "time": "1 h 30 m", "autolearn": true, "book_learn": [ [ "manual_pistol", 3 ] ], - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 3 ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -693,17 +675,8 @@ "time": "2 h", "autolearn": true, "book_learn": [ [ "manual_pistol", 5 ] ], - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ - [ "oxy_torch", 6 ], - [ "welder", 30 ], - [ "welder_crude", 45 ], - [ "toolset", 45 ], - [ "small_repairkit", 150 ], - [ "large_repairkit", 30 ] - ] - ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 3 ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -854,31 +827,25 @@ }, { "type": "recipe", - "result": "pipe_combination_gun", + "result": "lever_shotgun", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "mechanics", - "skills_required": [ "gun", 5 ], + "skills_required": [ "gun", 3 ], "difficulty": 7, - "time": "4 h 30 m", - "autolearn": true, + "time": "6 h", + "book_learn": [ [ "manual_gun", 3 ] ], + "reversible": true, + "autolearn": false, "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 1 } - ], - "tools": [ - [ - [ "oxy_torch", 7 ], - [ "welder", 36 ], - [ "welder_crude", 54 ], - [ "toolset", 54 ], - [ "small_repairkit", 180 ], - [ "large_repairkit", 75 ] - ] + { "id": "WRENCH_FINE", "level": 1 }, + { "id": "DRILL", "level": 3 }, + { "id": "CUT", "level": 2 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "nail", 2 ] ], [ [ "spring", 1 ] ], [ [ "scrap", 3 ] ], [ [ "shotgun_d", 1 ] ] ] + "using": [ [ "welding_standard", 15 ] ], + "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 5 ] ], [ [ "2x4", 2 ] ], [ [ "scrap", 5 ] ] ] }, { "type": "recipe", @@ -894,61 +861,6 @@ "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "2x4", 1 ] ] ] }, - { - "type": "recipe", - "result": "rifle_308", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 3 ], - "difficulty": 7, - "time": "30 m", - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] - }, - { - "type": "recipe", - "result": "surv_carbine_223", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 3 ], - "difficulty": 7, - "time": "2 h", - "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] - }, - { - "type": "recipe", - "result": "rifle_3006", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 4 ], - "difficulty": 6, - "time": "4 h", - "autolearn": true, - "qualities": [ - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 30 ], - [ "welder", 150 ], - [ "large_repairkit", 75 ], - [ "small_repairkit", 150 ], - [ "welder_crude", 225 ], - [ "toolset", 225 ] - ] - ], - "components": [ [ [ "pipe", 3 ] ], [ [ "spring", 2 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] - }, { "type": "recipe", "result": "triple_launcher_simple", @@ -959,22 +871,8 @@ "difficulty": 7, "time": "4 h", "autolearn": true, - "qualities": [ - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 40 ], - [ "welder", 200 ], - [ "large_repairkit", 100 ], - [ "small_repairkit", 200 ], - [ "welder_crude", 300 ], - [ "toolset", 300 ] - ] - ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 20 ] ], "components": [ [ [ "pipe", 3 ] ], [ [ "nail", 3 ] ], [ [ "scrap", 3 ] ], [ [ "2x4", 1 ] ] ] }, { @@ -1180,22 +1078,8 @@ [ "manual_rifle", 4 ], [ "manual_launcher", 4 ] ], - "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 1 ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -1209,22 +1093,8 @@ "time": "25 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "manual_shotgun", 4 ], [ "manual_smg", 4 ], [ "manual_rifle", 4 ] ], - "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 1 ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "spring", 1 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -1257,22 +1127,8 @@ "time": "20 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 2 ], [ "manual_rifle", 3 ], [ "manual_launcher", 3 ] ], - "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 2 ], - [ "welder", 10 ], - [ "welder_crude", 20 ], - [ "toolset", 20 ], - [ "small_repairkit", 10 ], - [ "large_repairkit", 10 ] - ] - ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 1 ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -1343,22 +1199,8 @@ "time": "30 m", "autolearn": true, "book_learn": [ [ "manual_fabrication", 3 ], [ "manual_pistol", 4 ] ], - "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 1 ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 3 ] ], [ [ "plastic_chunk", 3 ] ] ] }, { @@ -1378,22 +1220,8 @@ [ "manual_rifle", 4 ], [ "manual_launcher", 4 ] ], - "qualities": [ - { "id": "HAMMER_FINE", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ - [ - [ "oxy_torch", 3 ], - [ "welder", 15 ], - [ "welder_crude", 25 ], - [ "toolset", 25 ], - [ "small_repairkit", 15 ], - [ "large_repairkit", 15 ] - ] - ], + "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 1 ] ], "components": [ [ [ "scrap", 6 ], [ "pipe", 1 ], [ "steel_chunk", 2 ] ], [ [ "plastic_chunk", 3 ] ], [ [ "spring", 2 ] ] ] }, { @@ -1440,9 +1268,9 @@ [ "m4a1", -1 ], [ "m16a4", -1 ] ], - [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 40 ], [ "toolset", 40 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], + "using": [ [ "welding_standard", 2 ] ], "components": [ [ [ "steel_plate", 1 ], [ "steel_lump", 2 ] ], [ [ "pipe", 1 ], [ "sheet_metal_small", 1 ] ], [ [ "scrap", 1 ] ] ] }, { @@ -1596,13 +1424,8 @@ "time": "3 h", "autolearn": true, "book_learn": [ [ "textbook_fabrication", 2 ] ], - "qualities": [ - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH_FINE", "level": 1 }, - { "id": "GLARE", "level": 2 } - ], - "tools": [ [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ] ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ], + "using": [ [ "welding_standard", 10 ] ], "components": [ [ [ "pipe", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "scrap", 2 ] ] ] }, { @@ -2669,11 +2492,9 @@ "difficulty": 6, "time": "3 h", "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 2 } ], - "tools": [ - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "welder_crude", 45 ], [ "toolset", 45 ] ], - [ [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] - ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "tools": [ [ [ "small_repairkit", 150 ], [ "large_repairkit", 30 ] ] ], + "using": [ [ "welding_standard", 3 ] ], "components": [ [ [ "m2browning", 1 ] ], [ [ "2x4", 1 ] ] ] }, { diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 9f75268a849c8..a3bb83542b657 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -207,16 +207,6 @@ "type": "MIGRATION", "replace": "rifle_lmg" }, - { - "id": [ "surv_carbine_223" ], - "type": "MIGRATION", - "replace": "rifle_pipe_carbine" - }, - { - "id": [ "rifle_3006", "rifle_223", "rifle_308" ], - "type": "MIGRATION", - "replace": "rifle_pipe_rifle" - }, { "id": [ "survivor_special_700", @@ -287,7 +277,7 @@ "replace": "shot_double" }, { - "id": [ "pipe_double_shotgun", "revolver_shotgun", "ashot", "pipe_combination_gun" ], + "id": [ "pipe_double_shotgun", "revolver_shotgun", "ashot" ], "type": "MIGRATION", "replace": "shot_pipe_double" }, diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json index bf4ceac88f10d..bfb9f1f249876 100644 --- a/data/mods/Generic_Guns/firearms/rifle.json +++ b/data/mods/Generic_Guns/firearms/rifle.json @@ -33,41 +33,6 @@ } ] }, - { - "id": "rifle_pipe_rifle", - "copy-from": "rifle_308", - "type": "GUN", - "name": { "str": "pipe rifle" }, - "ammo": [ "ammo_rifle" ], - "description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", - "clip_size": 1, - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ ] - } - ] - }, - { - "id": "rifle_pipe_carbine", - "copy-from": "surv_carbine_223", - "type": "GUN", - "name": "survivor carbine", - "ammo": [ "ammo_rifle" ], - "description": "A crudely constructed carbine chambered for standard rifle ammo, fed from service rifle magazines. It locks with a rudimentary lever action system. The high pressures involved and questionable construction make for less than ideal durability and reliability, but this should still be a serviceable weapon, provided you can stay accurate with it.", - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ "rifle_mag", "rifle_sniper_mag" ] - } - ] - }, { "id": "rifle_sniper", "copy-from": "m2010", diff --git a/data/mods/Generic_Guns/obsolete.json b/data/mods/Generic_Guns/obsolete.json new file mode 100644 index 0000000000000..452cccd75d252 --- /dev/null +++ b/data/mods/Generic_Guns/obsolete.json @@ -0,0 +1,47 @@ +[ + { + "id": "rifle_pipe_rifle", + "copy-from": "rifle_308", + "type": "GUN", + "name": { "str": "pipe rifle" }, + "ammo": [ "ammo_rifle" ], + "description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", + "clip_size": 1, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ ] + } + ] + }, + { + "id": "rifle_pipe_carbine", + "copy-from": "surv_carbine_223", + "type": "GUN", + "name": "survivor carbine", + "ammo": [ "ammo_rifle" ], + "description": "A crudely constructed carbine chambered for standard rifle ammo, fed from service rifle magazines. It locks with a rudimentary lever action system. The high pressures involved and questionable construction make for less than ideal durability and reliability, but this should still be a serviceable weapon, provided you can stay accurate with it.", + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_mag", "rifle_sniper_mag" ] + } + ] + }, + { + "type": "recipe", + "result": "rifle_pipe_carbine", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_pipe_rifle", + "obsolete": true + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json b/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json index cf40b9febfde4..65cd712efc726 100644 --- a/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json +++ b/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json @@ -56,31 +56,6 @@ ], "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] }, - { - "result": "rifle_pipe_carbine", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 3 ], - "difficulty": 7, - "time": "3 h", - "autolearn": true, - "using": [ [ "welding_standard", 15 ] ], - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "tools": [ - [ - [ "rifle_ball", -1 ], - [ "rifle_AP", -1 ], - [ "reloaded_rifle_ball", -1 ], - [ "reloaded_rifle_AP", -1 ], - [ "bp_rifle_ball", -1 ], - [ "bp_rifle_AP", -1 ], - [ "rifle_casing", -1 ] - ] - ], - "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] - }, { "type": "recipe", "result": "black_powder_revolver", diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms_single.json b/data/mods/Generic_Guns/recipes/recipes_firearms_single.json index 1d63b40db30fb..b1ed34bd60437 100644 --- a/data/mods/Generic_Guns/recipes/recipes_firearms_single.json +++ b/data/mods/Generic_Guns/recipes/recipes_firearms_single.json @@ -55,31 +55,6 @@ ], "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "steel_chunk", 1 ] ], [ [ "2x4", 1 ] ] ] }, - { - "result": "rifle_pipe_rifle", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 3 ], - "difficulty": 4, - "time": "30 m", - "reversible": true, - "autolearn": true, - "tools": [ - [ - [ "rifle_ball", -1 ], - [ "rifle_AP", -1 ], - [ "bp_rifle_ball", -1 ], - [ "bp_rifle_AP", -1 ], - [ "reloaded_rifle_ball", -1 ], - [ "reloaded_rifle_AP", -1 ], - [ "rifle_casing", -1 ] - ] - ], - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] - }, { "result": "shot_pipe_double", "type": "recipe",