From 6a5409d9765b439becb6358512021664a2b38b41 Mon Sep 17 00:00:00 2001 From: Holli Date: Mon, 24 Mar 2025 20:57:11 -0600 Subject: [PATCH 1/2] .22 LR --- data/json/items/classes/gun.json | 89 ++++ data/json/items/gun/22.json | 680 ++++++++++--------------------- 2 files changed, 314 insertions(+), 455 deletions(-) diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json index 1f4e7ec4715c7..b1fdd41aa0c60 100644 --- a/data/json/items/classes/gun.json +++ b/data/json/items/classes/gun.json @@ -287,5 +287,94 @@ "type": "GUN", "name": { "str": "base SMG", "//~": "NO_I18N" }, "skill": "smg" + }, + { + "abstract": "gun_base_handgun", + "type": "GUN", + "color": "light_gray", + "symbol": "⨽", + "weapon_category": [ "AUTOMATIC_PISTOLS" ], + "melee_damage": { "bash": 5 }, + "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" }, + "flags": [ "ALLOWS_BODY_BLOCK" ], + "name": { "str": "base gun", "//~": "NO_I18N" }, + "skill": "pistol", + "sight_dispersion": 60, + "durability": 8, + "handling": 10, + "reload": 150, + "reload_noise_volume": 10 + }, + { + "abstract": "gun_base_22_semi_pistol", + "copy-from": "gun_base_handgun", + "type": "GUN", + "price_postapoc": "6 USD", + "name": { "str": "base gun", "//~": "NO_I18N" }, + "ammo": [ "22" ], + "min_cycle_recoil": 140, + "faults": [ + "fault_gun_blackpowder", + "fault_gun_dirt", + "fault_gun_chamber_spent", + "fault_fail_to_feed", + "fault_stovepipe", + "fault_double_feed" + ] + }, + { + "abstract": "gun_base_22_manual_pistol", + "copy-from": "gun_base_handgun", + "type": "GUN", + "price_postapoc": "4 USD", + "name": { "str": "base gun", "//~": "NO_I18N" }, + "flags": [ "RELOAD_ONE", "NO_TURRET", "EASY_CLEAN", "RELOAD_EJECT" ], + "ammo": [ "22" ], + "blackpowder_tolerance": 32, + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] + }, + { + "abstract": "gun_base_rifle", + "type": "GUN", + "color": "light_gray", + "symbol": "⨽", + "weapon_category": [ "AUTOMATIC_RIFLES" ], + "melee_damage": { "bash": 10 }, + "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "neutral" }, + "name": { "str": "base gun", "//~": "NO_I18N" }, + "skill": "rifle", + "sight_dispersion": 40, + "durability": 8, + "handling": 20, + "reload": 150, + "reload_noise_volume": 10 + }, + { + "abstract": "gun_base_22_semi_rifle", + "copy-from": "gun_base_rifle", + "type": "GUN", + "price_postapoc": "10 USD", + "name": { "str": "base gun", "//~": "NO_I18N" }, + "ammo": [ "22" ], + "min_cycle_recoil": 140, + "faults": [ + "fault_gun_blackpowder", + "fault_gun_dirt", + "fault_gun_chamber_spent", + "fault_fail_to_feed", + "fault_stovepipe", + "fault_double_feed" + ] + }, + { + "abstract": "gun_base_22_manual_rifle", + "copy-from": "gun_base_rifle", + "type": "GUN", + "price_postapoc": "8 USD", + "name": { "str": "base gun", "//~": "NO_I18N" }, + "flags": [ "RELOAD_ONE", "NO_TURRET", "EASY_CLEAN" ], + "ammo": [ "22" ], + "blackpowder_tolerance": 32, + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ] } ] diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 90ca590eb3fe2..3cced311a3b26 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -1,11 +1,18 @@ [ { - "id": "marlin_9a", - "looks_like": "ar15", "type": "GUN", - "reload_noise_volume": 10, + "id": "marlin_9a", + "copy-from": "gun_base_22_manual_rifle", "name": { "str": "small game rifle" }, + "looks_like": "ar15", "description": "A venerable .22 caliber lever-action rifle, with a 19-round tube magazine and a classic design that dates back over a century. Generally used for the hunting of small game like rabbits, the strict taxonomic classification of zombies as 'small game' is debatable, but this decades-old weapon can still be counted upon to help manage the undead population.", + "ascii_picture": "marlin_39a", + "weight": "2948 g", + "volume": "2180 ml", + "longest_side": "1029 mm", + "barrel_length": "609 mm", + "price": "230 USD", + "material": [ "steel", "wood" ], "variant_type": "gun", "variants": [ { @@ -14,56 +21,35 @@ "description": "The oldest and longest-produced shoulder firearm in the world. Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil." } ], - "ascii_picture": "marlin_39a", - "weight": "2948 g", - "volume": "2180 ml", - "longest_side": "1029 mm", - "barrel_length": "609 mm", - "price": "230 USD", - "price_postapoc": "20 USD", - "to_hit": -1, - "material": [ "iron", "wood" ], - "symbol": "(", - "color": "brown", - "range": 7, - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "ammo_restriction": { "22": 19 }, + "allowed_speedloaders": [ "marlin_tubeloader" ] + } + ], "ranged_damage": { "damage_type": "bullet", "amount": 5 }, + "range": 7, "dispersion": 90, - "durability": 8, - "blackpowder_tolerance": 56, "clip_size": 19, "valid_mod_locations": [ - [ "barrel", 1 ], [ "brass catcher", 1 ], - [ "grip", 1 ], [ "mechanism", 2 ], - [ "muzzle", 1 ], [ "rail mount", 1 ], - [ "sights", 1 ], + [ "sights mount", 1 ], [ "sling", 1 ], [ "stock mount", 1 ], [ "stock accessory", 2 ], [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_ONE", "NO_TURRET" ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE", - "rigid": true, - "ammo_restriction": { "22": 19 }, - "allowed_speedloaders": [ "marlin_tubeloader" ] - } - ], - "melee_damage": { "bash": 12 } + ] }, { - "id": "rifle_22", - "looks_like": "ar15", "type": "GUN", - "reload_noise_volume": 10, + "id": "rifle_22", + "copy-from": "gun_base_22_manual_rifle", "name": { "str": ".22 pipe rifle" }, + "looks_like": "ar15", "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "ascii_picture": "sm_pipe_gun", "weight": "1953 g", @@ -71,82 +57,39 @@ "longest_side": "1000 mm", "barrel_length": "610 mm", "price": "100 USD", - "price_postapoc": "5 USD", - "to_hit": -1, + "price_postapoc": "2 USD", "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 1 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 550, "durability": 6, - "blackpowder_tolerance": 60, - "loudness": 25, "clip_size": 1, "reload": 200, "barrel_volume": "360 ml", - "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 } } ], - "melee_damage": { "bash": 10 } + "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ] ] }, { - "id": "ruger_1022", - "looks_like": "ar15", "type": "GUN", - "reload_noise_volume": 10, + "id": "ruger_1022", + "copy-from": "gun_base_22_semi_rifle", "name": { "str": "varmint rifle" }, + "looks_like": "ar15", "description": "A lightweight and modular pistol caliber hunting carbine, firing the low power .22 LR cartridge. Before the Cataclysm, a mix of high customizability, cheap ammunition, and low recoil made this a very popular varmint rifle among civilian shooters.", - "variant_type": "gun", - "variants": [ - { - "id": "ruger_1022", - "name": { "str": "Ruger 10/22 rifle" }, - "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing." - } - ], "ascii_picture": "ruger1022", "weight": "2270 g", "volume": "2120 ml", "longest_side": "942 mm", "barrel_length": "406 mm", + "barrel_volume": "500 ml", "price": "270 USD", - "price_postapoc": "7 USD 50 cent", - "to_hit": -1, "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "range": 6, - "//range": "It is a blowback action, like most non-target, sporting rifles of this caliber.", - "ammo": [ "22" ], - "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 4 }, - "dispersion": 110, - "durability": 8, - "min_cycle_recoil": 39, - "barrel_volume": "500 ml", - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock mount", 1 ], - [ "stock accessory", 2 ], - [ "underbarrel mount", 1 ] - ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" + "variant_type": "gun", + "variants": [ + { + "id": "ruger_1022", + "name": { "str": "Ruger 10/22 rifle" }, + "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing." + } ], "pocket_data": [ { @@ -164,7 +107,19 @@ ] } ], - "melee_damage": { "bash": 12 } + "ranged_damage": { "damage_type": "bullet", "amount": 4 }, + "range": 6, + "dispersion": 110, + "valid_mod_locations": [ + [ "brass catcher", 1 ], + [ "mechanism", 2 ], + [ "rail mount", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "stock accessory", 2 ], + [ "underbarrel mount", 1 ] + ] }, { "id": "ruger_1022_auto", @@ -180,16 +135,21 @@ "description": "A Ruger 10/22 modified post-Cataclysm to selective fire. While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto." } ], - "price_postapoc": "10 USD", + "price_postapoc": "15 USD", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ] }, { - "id": "ruger_lcr_22", - "looks_like": "sw_619", - "copy-from": "ruger_lcr_38", "type": "GUN", + "id": "ruger_lcr_22", + "copy-from": "gun_base_22_manual_pistol", "name": { "str": ".22 caliber revolver" }, + "looks_like": "sw_619", "description": "A comparatively dainty revolver, chambered for 8 tiny rounds of .22 LR.", + "weight": "422 g", + "volume": "301 ml", + "longest_side": "192 mm", + "barrel_length": "73 mm", + "//": "47.498mm + 25.4mm max OAL for 22LR. Revolvers just built different.", "variant_type": "gun", "variants": [ { @@ -198,12 +158,6 @@ "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame." } ], - "weight": "422 g", - "ammo": [ "22" ], - "longest_side": "192 mm", - "barrel_length": "73 mm", - "//": "47.498mm + 25.4mm max OAL for 22LR. Revolvers just built different.", - "clip_size": 8, "pocket_data": [ { "pocket_type": "MAGAZINE", @@ -211,16 +165,24 @@ "ammo_restriction": { "22": 8 }, "allowed_speedloaders": [ "22_speedloader8" ] } - ] + ], + "clip_size": 8 }, { - "id": "sig_mosquito", - "looks_like": "glock_17", "type": "GUN", - "reload_noise_volume": 10, + "id": "sig_mosquito", + "copy-from": "gun_base_22_semi_pistol", "name": { "str": "firefly training pistol" }, + "looks_like": "glock_17", "//": "Was the sig mosquito, has been renamed to the more common GSG firefly", "description": "A medium sized, .22 caliber semi-automatic pistol, for training with a pistol similar to more powerful pistols. Built from aluminum and polymer components, the weapon is lightweight and concealable, but its chambering is not very powerful.", + "ascii_picture": "sig_mosquito", + "weight": "720 g", + "volume": "467 ml", + "longest_side": "214 mm", + "barrel_length": "99 mm", + "price": "360 USD", + "material": [ "aluminum", "steel", "plastic" ], "variant_type": "gun", "variants": [ { @@ -229,53 +191,24 @@ "description": "The GSG firefly is a .22 semi-automatic handgun. While the GSG Firefly started off as the SIG Mosquito, after the Mosquito ceased production, German Sport Guns picked it up and renamed it to the Firefly." } ], - "ascii_picture": "sig_mosquito", - "weight": "720 g", - "volume": "467 ml", - "longest_side": "214 mm", - "barrel_length": "99 mm", - "price": "360 USD", - "price_postapoc": "7 USD 50 cent", - "material": [ "aluminum", "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "22" ], - "skill": "pistol", + "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mosquitomag" ] } ], "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 480, - "durability": 7, - "min_cycle_recoil": 39, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], - "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mosquitomag" ] } ], - "melee_damage": { "bash": 9 } + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ] }, { - "id": "walther_p22", - "copy-from": "pistol_base", - "looks_like": "glock_17", "type": "GUN", + "id": "walther_p22", + "copy-from": "gun_base_22_semi_pistol", "name": { "str": "Walther training pistol" }, + "looks_like": "glock_17", "description": "A dainty training pistol offered by the Walther Arms company, making use of the .22 LR cartridge, for training on a pistol very similar to more powerful pistols.", + "weight": "480 g", + "volume": "290 ml", + "longest_side": "183 mm", + "barrel_length": "87 mm", + "price": "85 USD", + "material": [ "plastic", "zinc", "steel" ], "variant_type": "gun", "variants": [ { @@ -284,30 +217,23 @@ "description": "The Walther P22 is a blowback operated semi-automatic pistol intended for training with a platform very similar to more defensive handguns. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components (other than the barrel) being made of die-cast zinc alloy." } ], - "weight": "480 g", - "volume": "290 ml", - "longest_side": "183 mm", - "barrel_length": "87 mm", - "price": "85 USD", - "price_postapoc": "7 USD 50 cent", - "to_hit": -3, - "material": [ "plastic", "zinc", "steel" ], - "color": "dark_gray", - "ammo": [ "22" ], - "dispersion": 480, - "durability": 7, - "min_cycle_recoil": 39, - "weapon_category": [ "AUTOMATIC_PISTOLS" ], "pocket_data": [ { "magazine_well": "126 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "wp22mag" ] } ], - "melee_damage": { "bash": 4 } + "dispersion": 480, + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ] }, { - "id": "cp33", - "copy-from": "pistol_base", - "looks_like": "modular_ar_pistol", "type": "GUN", + "id": "cp33", + "copy-from": "gun_base_22_semi_pistol", "name": { "str": "high capacity handgun" }, + "looks_like": "modular_ar_pistol", "description": "A large capacity handgun, chambered in .22 and feeding from quad stack magazines. Used both recreationally and in competition.", + "weight": "669 g", + "volume": "525 ml", + "longest_side": "273 mm", + "barrel_length": "140 mm", + "price": "495 USD", + "material": [ "steel", "plastic", "aluminum" ], "variant_type": "gun", "variants": [ { @@ -316,21 +242,6 @@ "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension. While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands." } ], - "weight": "669 g", - "volume": "525 ml", - "price": "495 USD", - "price_postapoc": "10 USD", - "longest_side": "273 mm", - "barrel_length": "140 mm", - "material": [ "steel", "plastic", "aluminum" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "dispersion": 480, - "durability": 6, - "min_cycle_recoil": 100, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], "pocket_data": [ { "rigid": false, @@ -339,16 +250,23 @@ "item_restriction": [ "cp33_mag", "cp33_mag_50" ] } ], - "melee_damage": { "bash": 7 } + "dispersion": 480, + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ] }, { + "type": "GUN", "id": "ruger_mk4", "//": "Stats are from the 5.5 inch target version https://ruger.com/products/markIVTarget/specSheets/40101.html", - "copy-from": "pistol_base", - "looks_like": "glock_17", - "type": "GUN", + "copy-from": "gun_base_22_semi_pistol", "name": { "str": "Ruger target pistol" }, + "looks_like": "glock_17", "description": "A light and handy .22 LR handgun from Ruger, this handgun is one of the most popular .22 handguns ever created.", + "weight": "1001 g", + "volume": "392 ml", + "longest_side": "266 mm", + "barrel_length": "140 mm", + "price": "679 USD", + "material": [ "steel", "plastic", "aluminum" ], "variant_type": "gun", "variants": [ { @@ -370,35 +288,26 @@ "weight": 135 } ], - "weight": "1001 g", - "volume": "392 ml", - "price": "679 USD", - "price_postapoc": "10 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, - "longest_side": "266 mm", - "barrel_length": "140 mm", - "material": [ "steel", "plastic", "aluminum" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "dispersion": 400, - "durability": 8, - "min_cycle_recoil": 100, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], "pocket_data": [ { "rigid": false, "magazine_well": "96 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger_mk4_mag" ] } ], - "melee_damage": { "bash": 8 } + "dispersion": 400, + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ] }, { - "id": "ruger_charger", - "looks_like": "modular_ar_pistol", "type": "GUN", + "id": "ruger_charger", "//": "Stats are from https://ruger.com/products/22Charger/specSheets/4923.html", - "reload_noise_volume": 10, + "copy-from": "gun_base_22_semi_pistol", "name": { "str": "varmint pistol" }, + "looks_like": "modular_ar_pistol", "description": "Essentially a varmint rifle with no stock and a shorter barrel, this gun loses out on a bit of energy with its shorter barrel and is a bit more uncomfortable to hold, but a fair bit lighter. Includes a bipod.", + "weight": "1418 g", + "volume": "1358 ml", + "longest_side": "509 mm", + "barrel_length": "254 mm", + "price": "399 USD", + "material": [ "steel", "plastic" ], "variant_type": "gun", "variants": [ { @@ -407,46 +316,6 @@ "description": "This gun is essentially a shortened 10/22, feeding from the same magazines. While it does feature a shorter barrel and a lack of a stock, it is a fair bit lighter, and comes included with a bipod to more steadily plink away at the undead." } ], - "ascii_picture": "ruger1022", - "weight": "1418 g", - "volume": "1358 ml", - "longest_side": "509 mm", - "barrel_length": "254 mm", - "price": "399 USD", - "price_postapoc": "4 USD", - "to_hit": -1, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "brown", - "range": 3, - "ammo": [ "22" ], - "skill": "pistol", - "ranged_damage": { "damage_type": "bullet", "amount": 1 }, - "dispersion": 140, - "durability": 8, - "min_cycle_recoil": 39, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock mount", 1 ], - [ "stock accessory", 2 ], - [ "underbarrel mount", 1 ] - ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "built_in_mods": [ "bipod" ], "pocket_data": [ { "magazine_well": "34 ml", @@ -463,7 +332,20 @@ ] } ], - "melee_damage": { "bash": 12 } + "ranged_damage": { "damage_type": "bullet", "amount": 1 }, + "range": 3, + "dispersion": 140, + "built_in_mods": [ "bipod" ], + "valid_mod_locations": [ + [ "brass catcher", 1 ], + [ "mechanism", 2 ], + [ "rail mount", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock mount", 1 ], + [ "stock accessory", 2 ], + [ "underbarrel mount", 1 ] + ] }, { "id": "ruger_charger_auto", @@ -479,16 +361,22 @@ "description": "A Ruger 22 Charger modified post-Cataclysm to selective fire. While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto even with the lack of a stock." } ], - "price_postapoc": "10 USD", + "price_postapoc": "15 USD", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ] }, { - "id": "rossi_gallery", - "looks_like": "ar15", "type": "GUN", - "reload_noise_volume": 10, + "id": "rossi_gallery", + "copy-from": "gun_base_22_manual_rifle", "name": { "str": "pump action varmint rifle" }, + "looks_like": "ar15", "description": "A lightweight, wood framed pump action rifle, holding 15 rounds of .22 with an 18 inch barrel. While pump actions tend to be largely shotguns, they can be made in calibers such as .22 LR.", + "weight": "2344 g", + "volume": "2054 ml", + "longest_side": "913 mm", + "barrel_length": "457 mm", + "price": "394 USD", + "material": [ "steel", "wood", "aluminum" ], "variant_type": "gun", "variants": [ { @@ -497,67 +385,37 @@ "description": "A modern take on the Winchester 1890, the Rossi Gallery is a .22 LR rifle, notably using a pump action. Much like a pump action shotgun, the magazine tube is below its 18 inch barrel and can hold 15 rounds. While pump actions are quite often associated with shotguns, the mechanism can be applied to rifles as well, though in practice it's limited to .22 LR." } ], - "weight": "2344 g", - "volume": "2054 ml", - "longest_side": "913 mm", - "barrel_length": "457 mm", - "price": "394 USD", - "price_postapoc": "10 USD", - "to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "uneven" }, - "material": [ "steel", "wood", "aluminum" ], - "symbol": "(", - "color": "brown", - "range": 7, - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "range": 7, "dispersion": 140, - "durability": 8, - "blackpowder_tolerance": 56, "clip_size": 15, "valid_mod_locations": [ [ "brass catcher", 1 ], - [ "grip", 1 ], + [ "grip mount", 1 ], [ "mechanism", 2 ], [ "rail mount", 1 ], - [ "sights", 1 ], + [ "sights mount", 1 ], [ "sling", 1 ], [ "stock mount", 1 ], [ "stock accessory", 2 ], [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_ONE", "NO_TURRET" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], - "melee_damage": { "bash": 12 } + ] }, { - "id": "rough_rider_pistol", - "copy-from": "pistol_revolver", "type": "GUN", + "id": "rough_rider_pistol", + "copy-from": "gun_base_22_manual_pistol", "name": { "str": ".22 six-shooter" }, "description": "A revolver chambered in .22 LR, with 6 shots and a 6.5 inch barrel.", "ascii_picture": "redhawk", "weight": "947 g", "volume": "442 ml", "longest_side": "318 mm", - "//2": "barrel length (165mm) + cylinder length (25mm)", + "//": "barrel length (165mm) + cylinder length (25mm)", "barrel_length": "190 mm", "price": "165 USD 99 cent", - "price_postapoc": "10 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, "material": [ "steel" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "dispersion": 380, - "durability": 8, - "reload": 250, - "blackpowder_tolerance": 56, - "clip_size": 6, - "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 6 } } ], - "melee_damage": { "bash": 5 }, "variant_type": "gun", "variants": [ { @@ -565,37 +423,25 @@ "name": { "str": "Heritage Rough Rider 6.5\"", "str_pl": "Heritage Rough Riders 6.5\"" }, "description": "A cheap, single action revolver chambered in .22 LR. While it makes for a handy plinking gun, the single action mechanism, size of the firearm, combined with the lack of a swing out cylinder makes for a less than ideal zombie fighting handgun." } - ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 6 } } ], + "dispersion": 380, + "reload": 250, + "clip_size": 6, + "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ] }, { "id": "rough_rider_pistol_9", - "copy-from": "pistol_revolver", + "copy-from": "rough_rider_pistol", "type": "GUN", "name": { "str": "large .22 six-shooter" }, "description": "A revolver chambered in .22 LR, with 6 shots and a 9 inch barrel.", - "ascii_picture": "redhawk", "weight": "1046 g", "volume": "456 ml", "longest_side": "386 mm", "//2": "barrel length (229mm) + cylinder length (25mm)", "barrel_length": "254 mm", "price": "288 USD 99 cent", - "price_postapoc": "7 USD 50 cent", - "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "clumsy" }, - "material": [ "steel" ], - "symbol": "(", - "color": "light_gray", - "range": 2, - "ammo": [ "22" ], - "ranged_damage": { "damage_type": "bullet", "amount": 1 }, - "dispersion": 340, - "durability": 8, - "reload": 250, - "blackpowder_tolerance": 56, - "clip_size": 6, - "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 6 } } ], - "melee_damage": { "bash": 5 }, "variant_type": "gun", "variants": [ { @@ -603,15 +449,18 @@ "name": { "str": "Heritage Rough Rider 9\"", "str_pl": "Heritage Rough Riders 9\"" }, "description": "A cheap, single action revolver chambered in .22 LR. While it makes for a handy plinking gun, the single action mechanism, size of the firearm, combined with the lack of a swing out cylinder makes for a less than ideal zombie fighting handgun, even with the slightly increased performance from the longer barrel." } - ] + ], + "ranged_damage": { "damage_type": "bullet", "amount": 1 }, + "range": 2, + "dispersion": 340 }, { - "id": "1911_22", - "copy-from": "pistol_base", "type": "GUN", + "id": "1911_22", + "copy-from": "gun_base_22_semi_pistol", + "name": { "str": ".22 1911 pistol" }, "looks_like": "1911", "//": "Based on https://www.browning.com/products/firearms/pistols/1911-22/1911-22-a1.html", - "name": { "str": ".22 1911 pistol" }, "description": "A 1911 in .22 LR, with a 4 1/4\" barrel, and feeding from 10 round magazines.", "ascii_picture": "m1911", "weight": "425 g", @@ -619,29 +468,7 @@ "longest_side": "212 mm", "barrel_length": "108 mm", "price": "749 USD 99 cent", - "price_postapoc": "10 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "steel" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, - "dispersion": 320, - "durability": 8, - "min_cycle_recoil": 39, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], - "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "pocket_data": [ { "magazine_well": "40 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "1911_22_mag" ] } ], - "melee_damage": { "bash": 5 }, "variant_type": "gun", "variants": [ { @@ -649,15 +476,27 @@ "name": { "str": "1911-22" }, "description": "A 1911 handgun with \"1911-22\" stamped on the slide. While .22 LR 1911s were first devised as a training aid for US soldiers, it found large civilian use from concealed carry to plinking thanks to the readily available ammunition and familiar platform." } - ] + ], + "pocket_data": [ { "magazine_well": "40 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "1911_22_mag" ] } ], + "ranged_damage": { "damage_type": "bullet", "amount": -1 }, + "dispersion": 320, + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ] }, { - "id": "rio_bravo", - "looks_like": "marlin_9a", "type": "GUN", - "reload_noise_volume": 10, + "id": "rio_bravo", + "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/313-rio-bravo-wood-matte-black-22-lr-18-in", + "copy-from": "gun_base_22_manual_rifle", "name": { "str": "small game lever-action rifle" }, + "looks_like": "marlin_9a", "description": "A .22 Long Rifle lever-action rifle, which holds 15 rounds of ammo. While quite useful against small game, its effectiveness isn't as great against the undead.", + "ascii_picture": "marlin_39a", + "weight": "2345 g", + "volume": "2101 ml", + "longest_side": "931 mm", + "barrel_length": "457 mm", + "price": "404 USD 99 cent", + "material": [ "steel", "wood", "aluminum" ], "variant_type": "gun", "variants": [ { @@ -666,25 +505,10 @@ "description": "A modern .22 LR lever-action rifle, the Rio Bravo features an 18\" barrel with 15 rounds of ammo in its tube magazine, which is loaded from the front of the rifle. The mechanical origins date back decades, being based off of Rossi's R92 series of rifles which themselves were based off of the Winchester 1892." } ], - "//": "Stats from https://rossiusa.com/rifles/lever-action-rifles/313-rio-bravo-wood-matte-black-22-lr-18-in", - "ascii_picture": "marlin_39a", - "weight": "2345 g", - "volume": "2101 ml", - "longest_side": "931 mm", - "barrel_length": "457 mm", - "price": "404 USD 99 cent", - "price_postapoc": "10 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, - "material": [ "steel", "wood", "aluminum" ], - "symbol": "(", - "color": "brown", - "range": 5, - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "range": 5, "dispersion": 110, - "durability": 8, - "blackpowder_tolerance": 56, "clip_size": 15, "valid_mod_locations": [ [ "brass catcher", 1 ], @@ -696,19 +520,23 @@ [ "stock mount", 1 ], [ "stock accessory", 2 ], [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_ONE", "NO_TURRET" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ], - "melee_damage": { "bash": 9 } + ] }, { - "id": "henry_golden_boy", - "looks_like": "marlin_9a", "type": "GUN", - "reload_noise_volume": 10, + "id": "henry_golden_boy", + "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", + "copy-from": "gun_base_22_manual_rifle", "name": { "str": "small game lever-action rifle" }, + "looks_like": "marlin_9a", "description": "A .22 Long Rifle lever-action rifle, which holds 16 rounds of ammo. While quite useful against small game, its effectiveness isn't as great against the undead.", + "ascii_picture": "marlin_39a", + "weight": "3062 g", + "volume": "2116 ml", + "longest_side": "979 mm", + "barrel_length": "580 mm", + "price": "648 USD", + "material": [ "steel", "wood", "aluminum", "brass" ], "variant_type": "gun", "variants": [ { @@ -717,25 +545,10 @@ "description": "A modern .22 LR lever-action rifle, the Henry Golden Boy features an 20\" octagonal barrel with 16 rounds of ammo in its tube magazine, which is loaded from the front of the rifle. It fairly resembles the original Henry Model 1860 with its brass colored receiver, though with wooden furniture at the front, and without a doubt using modern manufacturing." } ], - "//": "Stats from https://www.henryusa.com/rifles/golden-boy/", - "ascii_picture": "marlin_39a", - "weight": "3062 g", - "volume": "2116 ml", - "longest_side": "979 mm", - "barrel_length": "580 mm", - "price": "648 USD", - "price_postapoc": "11 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "uneven" }, - "material": [ "steel", "wood", "aluminum", "brass" ], - "symbol": "(", - "color": "brown", - "range": 6, - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 16 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "range": 6, "dispersion": 100, - "durability": 8, - "blackpowder_tolerance": 56, "clip_size": 16, "valid_mod_locations": [ [ "brass catcher", 1 ], @@ -747,19 +560,22 @@ [ "stock mount", 1 ], [ "stock accessory", 2 ], [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_ONE", "NO_TURRET" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 16 } } ], - "melee_damage": { "bash": 12 } + ] }, { - "id": "marlin60", - "looks_like": "ruger1022", "type": "GUN", - "reload_noise_volume": 10, + "id": "marlin60", + "copy-from": "gun_base_22_semi_rifle", "name": { "str": "tube fed varmint rifle" }, + "looks_like": "ruger1022", "description": "A lightweight and modular pistol caliber hunting carbine, firing the low power .22 LR cartridge. Before the Cataclysm, a mix of high customizability, cheap ammunition, and low recoil made this a very popular varmint rifle among civilian shooters.", + "ascii_picture": "ruger1022", + "weight": "2500 g", + "volume": "2100 ml", + "longest_side": "953 mm", + "barrel_length": "483 mm", + "price": "250 USD", + "material": [ "steel", "wood" ], "variant_type": "gun", "variants": [ { @@ -768,46 +584,27 @@ "description": "The Model 60 is a semi-automatic rifle chambered in .22 LR, and looks awfully familiar to a 10/22. However, instead of a detachable magazine, it features a tubular magazine below the barrel. While out of production, a large number of them have been made since the 60s, making it a very commonplace rifle." } ], - "ascii_picture": "ruger1022", - "weight": "2500 g", - "volume": "2100 ml", - "longest_side": "953 mm", - "barrel_length": "483 mm", - "price": "250 USD", - "price_postapoc": "7 USD", - "to_hit": { "grip": "none", "length": "short", "surface": "point", "balance": "good" }, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "range": 6, - "ammo": [ "22" ], - "skill": "rifle", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 14 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, + "range": 6, "dispersion": 110, - "durability": 8, - "min_cycle_recoil": 39, "clip_size": 14, "valid_mod_locations": [ - [ "barrel", 1 ], [ "brass catcher", 1 ], - [ "grip", 1 ], + [ "grip mount", 1 ], [ "mechanism", 2 ], - [ "muzzle", 1 ], [ "rail mount", 1 ], - [ "sights", 1 ], + [ "sights mount", 1 ], [ "sling", 1 ], [ "stock mount", 1 ], [ "stock accessory", 2 ], [ "underbarrel mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent", "fault_stovepipe", "fault_double_feed" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 14 } } ], - "melee_damage": { "bash": 12 } + ] }, { - "id": "sw617", - "copy-from": "pistol_revolver", "type": "GUN", + "id": "sw617", + "copy-from": "gun_base_22_manual_pistol", "name": { "str": "high capacity revolver" }, "description": "A revolver chambered in .22 LR, with 10 shots and a 6 inch barrel.", "ascii_picture": "redhawk", @@ -817,20 +614,7 @@ "//": "barrel length (153mm) + cylinder length (25mm)", "barrel_length": "178 mm", "price": "979 USD", - "price_postapoc": "7 USD 50 cent", - "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "steel" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "dispersion": 300, - "durability": 8, - "reload": 150, - "blackpowder_tolerance": 56, - "clip_size": 10, - "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ], - "melee_damage": { "bash": 5 }, "variant_type": "gun", "variants": [ { @@ -838,15 +622,19 @@ "name": { "str": "S&W 617" }, "description": "The S&W 617 is a fine revolver, chambered in .22 LR. However, instead of more common 6 rounds revolvers come in, this revolver has a 10 round capacity cylinder. While still a revolver, and to boot a revolver in .22 LR, 10 is still bigger than 6." } - ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ], + "dispersion": 300, + "clip_size": 10, + "valid_mod_locations": [ [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock", 1 ] ] }, { - "id": "sr22", - "copy-from": "pistol_base", "type": "GUN", - "looks_like": "1911", + "id": "sr22", "//": "Based on https://ruger.com/products/sr22Pistol/specSheets/3600.html", + "copy-from": "gun_base_22_semi_pistol", "name": { "str": ".22 plinking handgun" }, + "looks_like": "1911", "description": "A small handgun with a short barrel. Feeds from 10 round magazines.", "ascii_picture": "m1911", "weight": "496 g", @@ -854,29 +642,7 @@ "longest_side": "205 mm", "barrel_length": "89 mm", "price": "559 USD", - "price_postapoc": "10 USD", - "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "steel" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "22" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, - "dispersion": 320, - "durability": 8, - "min_cycle_recoil": 39, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], - "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock_mount", 1 ] ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "pocket_data": [ { "magazine_well": "40 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "sr22_mag" ] } ], - "melee_damage": { "bash": 5 }, "variant_type": "gun", "variants": [ { @@ -884,6 +650,10 @@ "name": { "str": "Ruger SR22" }, "description": "A very popular handgun, the SR22 is a more conventional pistol than Ruger's other famous .22 LR handguns, the Ruger Standards. While .22 LR is still capable of killing, the very short barrel brings that into question." } - ] + ], + "pocket_data": [ { "magazine_well": "40 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "sr22_mag" ] } ], + "ranged_damage": { "damage_type": "bullet", "amount": -1 }, + "dispersion": 320, + "valid_mod_locations": [ [ "brass catcher", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock_mount", 1 ] ] } ] From 394f4fca82e14171be795133cc5df24707169177 Mon Sep 17 00:00:00 2001 From: Holli Date: Tue, 25 Mar 2025 09:13:15 -0600 Subject: [PATCH 2/2] Add flag to model 60 --- data/json/items/gun/22.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 3cced311a3b26..739de6dda4caf 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -584,6 +584,7 @@ "description": "The Model 60 is a semi-automatic rifle chambered in .22 LR, and looks awfully familiar to a 10/22. However, instead of a detachable magazine, it features a tubular magazine below the barrel. While out of production, a large number of them have been made since the 60s, making it a very commonplace rifle." } ], + "flags": [ "RELOAD_ONE" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 14 } } ], "ranged_damage": { "damage_type": "bullet", "amount": 3 }, "range": 6,