From d106049049abc0b177734f252c1a344f015f3b45 Mon Sep 17 00:00:00 2001 From: Rail Runner Date: Sun, 1 Dec 2019 22:36:49 +0300 Subject: [PATCH 1/3] Update and migrate most Realguns content to core --- data/json/itemgroups/guns.json | 11 +- data/json/itemgroups/item_groups.json | 2 + data/json/itemgroups/magazines.json | 2 + data/json/items/gun/22.json | 38 ++++++ data/json/items/gun/38.json | 22 ++++ data/json/items/gun/38super.json | 38 ++++++ data/json/items/gun/410shot.json | 11 ++ data/json/items/gun/454.json | 13 +- data/json/items/gun/45colt.json | 57 ++++++++ data/json/items/gunmod/underbarrel.json | 15 +++ data/json/items/magazine/38.json | 15 +++ data/json/items/magazine/38super.json | 18 ++- data/json/items/magazine/454.json | 4 +- data/mods/realguns/gun.json | 164 ------------------------ data/mods/realguns/gunmod.json | 20 --- data/mods/realguns/item_groups.json | 36 +----- data/mods/realguns/magazine.json | 28 ---- data/mods/realguns/migration.json | 10 ++ 18 files changed, 254 insertions(+), 250 deletions(-) delete mode 100644 data/mods/realguns/gunmod.json delete mode 100644 data/mods/realguns/magazine.json diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index ba3d4262cda3a..2f9f6d34094e3 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -15,6 +15,7 @@ { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 }, { "item": "sw_610", "prob": 20, "charges-min": 0, "charges-max": 6 }, { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 7 }, + { "item": "model_10_revolver", "prob": 20, "charges-min": 0, "charges-max": 6 }, { "item": "taurus_spectrum", "prob": 15, "charges-min": 0, "charges-max": 6 }, { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 15 }, { "item": "p320_357sig", "prob": 10, "charges-min": 0, "charges-max": 14 }, @@ -42,8 +43,9 @@ "id": "guns_pistol_rare", "//": "Less common pistols including those only used by police/paramilitary forces.", "items": [ + { "item": "bond_410", "prob": 20, "charges-min": 0, "charges-max": 2 }, { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 }, - { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 10 }, + { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 }, { "item": "fn57", "prob": 80, "charges-min": 0, "charges-max": 20 }, { "item": "l_enforcer_45", "prob": 25, "charges-min": 0, "charges-max": 6 }, { "item": "l_lookout_9mm", "prob": 20, "charges-min": 0, "charges-max": 7 }, @@ -81,6 +83,7 @@ "id": "guns_pistol_obscure", "//": "Imported or otherwise very obscure pistols.", "items": [ + { "item": "af2011a1_38super", "prob": 100, "charges-min": 0, "charges-max": 16 }, { "item": "bfr", "prob": 100, "charges-min": 0, "charges-max": 5 }, { "item": "cop_38", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 }, @@ -88,6 +91,7 @@ { "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "pistol_flintlock", "prob": 150 }, { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 }, + { "item": "raging_judge", "prob": 100, "charges-min": 0, "charges-max": 5 }, { "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 }, { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 }, { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 }, @@ -193,6 +197,7 @@ "//": "Less common rifles including those only used by police/paramilitary forces.", "items": [ { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 }, + { "item": "colt_lightning", "prob": 15, "charges-min": 0, "charges-max": 10 }, { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 20 }, { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 }, { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 }, @@ -208,6 +213,7 @@ { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 }, { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 }, + { "item": "m6_asw", "prob": 15, "charges-min": 0, "charges-max": 1 }, { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 }, { "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 }, @@ -299,6 +305,7 @@ { "item": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 5 }, { "item": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 10 }, { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 }, + { "item": "shotgun_410", "prob": 30, "charges-min": 0, "charges-max": 1 }, { "item": "shotgun_d", "prob": 30, "charges-min": 0, "charges-max": 2 }, { "item": "shotgun_s", "prob": 30 } ] @@ -556,9 +563,11 @@ "items": [ { "group": "guns_improvised", "prob": 200 }, { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 }, + { "item": "m6_asw", "prob": 5, "charges-min": 0, "charges-max": 1 }, { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 }, { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 }, { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 }, + { "item": "shotgun_410", "prob": 10, "charges-min": 0, "charges-max": 1 }, { "item": "shotgun_s", "prob": 10 }, { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 }, { "item": "sten", "prob": 20, "charges-min": 0, "charges-max": 32 }, diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index c66c5a9348c15..0804b2f15621e 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -5236,6 +5236,7 @@ [ "3006_incendiary", 1 ], [ "762_51", 6 ], [ "762_51_incendiary", 6 ], + [ "m6_asw", 1 ], [ "saiga_12", 3 ], [ "rm20", 1 ], [ "hk_mp5", 12 ], @@ -5557,6 +5558,7 @@ [ "helmet_liner", 10 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "plut_cell", 10 ], + [ "m6_asw", 1 ], [ "m249", 1 ], [ "m240", 1 ], [ "rm614_lmg", 1 ], diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index f790786bda6a4..e8956817105a6 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -104,6 +104,7 @@ "items": [ [ "38_speedloader", 8 ], [ "38_speedloader5", 6 ], + [ "38_speedloader6", 7 ], [ "40_speedloader6", 10 ], [ "glock17_17", 14 ], [ "glock17_22", 6 ], @@ -342,6 +343,7 @@ "items": [ [ "762x39_clip", 10 ], [ "762R_clip", 10 ], + [ "af2011a1mag", 10 ], [ "ak74mag", 10 ], [ "makarovmag", 10 ], [ "ppshmag", 10 ], diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index dddea2ae55977..a07001d59cfaf 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -40,6 +40,44 @@ "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], "magazines": [ [ "22", [ "a180mag" ] ] ] }, + { + "id": "m6_asw", + "looks_like": "ar15", + "type": "GUN", + "reload_noise_volume": 10, + "name": "Chiappa M6 Survival Gun", + "description": "A lightweight combination rifle, combining a .22 LR rimfire barrel with 12 gauge shotgun barrel, and designed to fold for compact storage.", + "weight": "2631 g", + "volume": "1500 ml", + "price": 72900, + "to_hit": -1, + "bashing": 6, + "material": "steel", + "symbol": "(", + "color": "brown", + "ammo": "22", + "skill": "rifle", + "ranged_damage": 4, + "dispersion": 160, + "durability": 7, + "blackpowder_tolerance": 80, + "loudness": 25, + "clip_size": 1, + "barrel_length": 1, + "built_in_mods": [ "M6_shotgun" ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "barrel", 1 ], + [ "muzzle", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEEDS_UNFOLD" ] + }, { "id": "marlin_9a", "looks_like": "ar15", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index b8e643ce9e539..e7c09fd00c44e 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -66,6 +66,28 @@ "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ] }, + { + "id": "model_10_revolver", + "copy-from": "pistol_revolver", + "looks_like": "sw_619", + "type": "GUN", + "name": "S&W Model 10", + "name_plural": "S&W Model 10", + "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century. It has a swing-out cylinder for ease of reloading.", + "weight": "907 g", + "volume": "500 ml", + "price": 42400, + "to_hit": -2, + "bashing": 9, + "material": [ "steel", "wood" ], + "color": "dark_gray", + "ammo": "38", + "dispersion": 480, + "durability": 8, + "blackpowder_tolerance": 56, + "clip_size": 6, + "magazines": [ [ "38", [ "38_speedloader6" ] ] ] + }, { "id": "rifle_38", "copy-from": "gun_base", diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index 9331cee1c66ef..61d8c08b3a157 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -1,4 +1,42 @@ [ + { + "id": "af2011a1_38super", + "copy-from": "pistol_base", + "looks_like": "glock_17", + "type": "GUN", + "name": "AF2011A1 .38 Super", + "name_plural": "AF2011A1 .38 Super", + "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.", + "weight": "1710 g", + "volume": "1 L", + "price": 479900, + "to_hit": -2, + "bashing": 12, + "material": "steel", + "color": "light_gray", + "ammo": "38super", + "dispersion": 520, + "durability": 7, + "min_cycle_recoil": 225, + "blackpowder_tolerance": 48, + "modes": [ [ "DEFAULT", "double", 2 ] ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "magazine", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "stock", 1 ], + [ "underbarrel", 1 ] + ], + "magazine_well": 2, + "magazines": [ [ "38super", [ "af2011a1mag" ] ] ] + }, { "id": "m1911a1_38super", "copy-from": "pistol_base", diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index e9193a9f89732..c9ed0c8127ebf 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -19,5 +19,16 @@ "ammo": "410shot", "magazines": [ [ "410shot", [ "saiga410mag_10rd", "saiga410mag_30rd" ] ] ], "flags": [ "NEVER_JAMS" ] + }, + { + "id": "shotgun_410", + "copy-from": "shotgun_s", + "looks_like": "remington_870", + "type": "GUN", + "name": "Winchester M37 .410", + "description": "A single-shot break-action shotgun, chambered in .410 bore. Designed as a lower-recoil alternative to 12 gauge shotguns, it is light and easy to manufacture.", + "weight": "2721 g", + "blackpowder_tolerance": 80, + "ammo": "410shot" } ] diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index 3ba84f2375fed..6ae2c40fabafd 100644 --- a/data/json/items/gun/454.json +++ b/data/json/items/gun/454.json @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": [ "454", "410shot", "45colt" ], + "ammo": [ "454", "45colt" ], "dispersion": 280, "durability": 8, "blackpowder_tolerance": 56, @@ -30,5 +30,16 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ] + }, + { + "id": "raging_judge", + "copy-from": "raging_bull", + "looks_like": "sw_619", + "type": "GUN", + "name": "Taurus Raging Judge Magnum", + "name_plural": "Taurus Raging Judge Magnum", + "description": "The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 Casull. It can fire .410 shotshells and .45 Colt cartridges as well.", + "weight": "2041 g", + "ammo": [ "454", "45colt", "410shot" ] } ] diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 75c7f9a09d850..27ca677714978 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -1,4 +1,61 @@ [ + { + "id": "bond_410", + "looks_like": "glock_17", + "type": "GUN", + "reload_noise_volume": 10, + "name": "Bond Arms Derringer", + "description": "The Bond Arms Derringer is a series of multi-barrel compact pistols. Most commonly chambered for .45 Colt, with chambers long enough to accept .410 shotgun shells.", + "weight": "567 g", + "volume": "500 ml", + "price": 41500, + "to_hit": -1, + "bashing": 2, + "material": [ "steel", "wood" ], + "symbol": "(", + "color": "brown", + "ammo": [ "45colt", "410shot" ], + "skill": "pistol", + "dispersion": 520, + "durability": 6, + "clip_size": 2, + "blackpowder_tolerance": 80, + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 2 ], + [ "sights mount", 1 ], + [ "stock mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ] + }, + { + "id": "colt_lightning", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": "Colt Lightning .45 Carbine", + "description": "A modern reproduction of a Colt pump-action rifle. Originally chambered in .44-40, modern versions most commonly use .45 Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.", + "weight": "2722 g", + "volume": "2500 ml", + "price": 132000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "wood" ], + "color": "brown", + "ammo": "45colt", + "ranged_damage": 5, + "dispersion": 180, + "durability": 7, + "clip_size": 10, + "blackpowder_tolerance": 56, + "reload_noise": "chuk chuk.", + "flags": [ "RELOAD_ONE" ] + }, { "id": "colt_saa", "copy-from": "pistol_revolver", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index 0407133abfdec..b2d1a4e91fdba 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -294,6 +294,21 @@ "description": "The M320 Grenade Launcher Module offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. It can be either attached to a rifle or combined with a buttstock for stand alone use. This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] }, + { + "id": "M6_shotgun", + "type": "GUNMOD", + "name": "M6 Survival Gun shotgun", + "description": "The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's irremovable.", + "volume": 0, + "price": 0, + "material": [ "steel" ], + "symbol": ":", + "color": "light_red", + "location": "underbarrel", + "mod_targets": [ "rifle" ], + "gun_data": { "ammo": "shot", "skill": "shotgun", "range": 1, "dispersion": 320, "durability": 10, "clip_size": 1 }, + "flags": [ "RELOAD_EJECT" ] + }, { "id": "makeshift_bayonet", "copy-from": "spike", diff --git a/data/json/items/magazine/38.json b/data/json/items/magazine/38.json index 6105f9b878c53..8df9e34f9862e 100644 --- a/data/json/items/magazine/38.json +++ b/data/json/items/magazine/38.json @@ -28,5 +28,20 @@ "ammo_type": [ "357mag", "38" ], "capacity": 5, "flags": [ "SPEEDLOADER" ] + }, + { + "id": "38_speedloader6", + "type": "MAGAZINE", + "name": ".38/.357 6-round speedloader", + "description": "This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.", + "weight": "70 g", + "volume": "250 ml", + "price": 900, + "material": "steel", + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "357mag", "38" ], + "capacity": 6, + "flags": [ "SPEEDLOADER" ] } ] diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json index 2de2d7f4bd04d..0002acacf400d 100644 --- a/data/json/items/magazine/38super.json +++ b/data/json/items/magazine/38super.json @@ -1,4 +1,20 @@ [ + { + "id": "af2011a1mag", + "type": "MAGAZINE", + "name": "AF2011A1 magazine", + "description": "Two .38 Super 8-round box magazines attached to a single base plate, holding up to 16 rounds in total, used by AF2011A1 double-barrel pistol.", + "weight": "140 g", + "volume": "500 ml", + "price": 10000, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": "38super", + "capacity": 16, + "reliability": 7, + "flags": [ "MAG_COMPACT" ] + }, { "id": "m1911mag_10rd_38super", "type": "MAGAZINE", @@ -11,7 +27,7 @@ "symbol": "#", "color": "light_gray", "ammo_type": "38super", - "capacity": 10, + "capacity": 9, "reliability": 8, "flags": [ "MAG_COMPACT" ] } diff --git a/data/json/items/magazine/454.json b/data/json/items/magazine/454.json index 6464ba7dae9ce..ebae15fa76493 100644 --- a/data/json/items/magazine/454.json +++ b/data/json/items/magazine/454.json @@ -3,14 +3,14 @@ "id": "454_speedloader5", "type": "MAGAZINE", "name": ".454 5-round speedloader", - "description": "This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a compatible revolver.", + "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.", "weight": "108 g", "volume": "250 ml", "price": 2200, "material": "steel", "symbol": "#", "color": "light_gray", - "ammo_type": [ "454", "45colt" ], + "ammo_type": [ "454", "45colt", "410shot" ], "capacity": 5, "flags": [ "SPEEDLOADER" ] } diff --git a/data/mods/realguns/gun.json b/data/mods/realguns/gun.json index fd3e5cefd9e2a..259f5627aceeb 100644 --- a/data/mods/realguns/gun.json +++ b/data/mods/realguns/gun.json @@ -1,128 +1,4 @@ [ - { - "id": "model_10_revolver", - "copy-from": "pistol_revolver", - "type": "GUN", - "name": "Model 10 revolver", - "name_plural": "Model 10 revolver", - "description": "A six-shot revolver. It has a swing-out cylinder for ease of reloading.", - "weight": 975, - "volume": 2, - "price": 42400, - "to_hit": -2, - "bashing": 9, - "material": [ "steel", "wood" ], - "color": "dark_gray", - "ammo": "38", - "dispersion": 360, - "durability": 8, - "blackpowder_tolerance": 56, - "clip_size": 6, - "magazines": [ [ "38", [ "38_speedloader" ] ] ] - }, - { - "id": "m6_asw", - "type": "GUN", - "reload_noise_volume": 10, - "name": "M6 Aircrew Survival Weapon", - "name_plural": "M6 Aircrew Survival Weapons", - "description": "A lightweight combination rifle, combining a .22 rimfire barrel with .410 shotgun barrel, and designed to fold for compact storage. Produced for military aircraft pilots who might be stranded after a crash, later produced commercially by various companies.", - "weight": 2140, - "volume": 7, - "price": 59500, - "to_hit": -1, - "bashing": 6, - "material": "steel", - "symbol": "(", - "color": "brown", - "ammo": "22", - "skill": "rifle", - "ranged_damage": 1, - "dispersion": 160, - "durability": 7, - "loudness": 25, - "clip_size": 1, - "reload": 100, - "barrel_length": 2, - "built_in_mods": [ "M6_shotgun" ], - "valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEEDS_UNFOLD", "COLLAPSIBLE_STOCK" ] - }, - { - "id": "colt_lightning", - "copy-from": "rifle_manual", - "type": "GUN", - "name": "Colt Lightning .45", - "name_plural": "Colt Lightning .45", - "//": "Reproduction as Colt did not make these in .45 Colt, price based off of MSRP of Uberti Lightning.", - "description": "A modern reproduction of a Colt pump-action rifle. Originally chambered in .44-40, modern versions most commonly use .45 Long Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.", - "weight": 2722, - "volume": 10, - "price": 132000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "wood" ], - "color": "brown", - "ammo": "45colt", - "ranged_damage": 5, - "dispersion": 90, - "durability": 7, - "clip_size": 10, - "reload_noise": "chuk chuk.", - "reload_noise_volume": 10, - "flags": [ "RELOAD_ONE" ] - }, - { - "id": "bond_410", - "type": "GUN", - "reload_noise_volume": 10, - "name": "Bond Arms Derringer", - "name_plural": "Bond Arms Derringers", - "description": "The Bond Arms Derringer is a series of double-barrel, compact pistols. Most commonly chambered for .45 Long Colt, with chambers long enough to accept .410 shotgun shells.", - "weight": 566, - "volume": 2, - "price": 41500, - "to_hit": -1, - "bashing": 2, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": "410shot", - "skill": "pistol", - "dispersion": 520, - "durability": 6, - "clip_size": 2, - "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ] - }, - { - "id": "shotgun_410", - "copy-from": "shotgun_s", - "type": "GUN", - "name": ".410 youth shotgun", - "description": "An old break-action shotgun, chambered in .410 bore. Designed as a lower-recoil alternative to 12 gauge, it is light and simple in manufacture.", - "weight": 2267, - "volume": 8, - "price": 20000, - "to_hit": -1, - "bashing": 10, - "material": [ "steel", "wood" ], - "ammo": "410shot", - "dispersion": 405, - "durability": 9, - "clip_size": 1, - "barrel_length": 4, - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "barrel", 1 ], - [ "bore", 1 ], - [ "sling", 1 ], - [ "muzzle", 1 ], - [ "sights", 1 ], - [ "stock", 1 ] - ], - "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ] - }, { "id": "410_pipe_shotgun", "copy-from": "shotgun_base", @@ -143,45 +19,5 @@ "barrel_length": 4, "valid_mod_locations": [ [ "accessories", 2 ], [ "sling", 1 ], [ "stock", 1 ], [ "barrel", 1 ] ], "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ] - }, - { - "id": "af2011a1_38super", - "copy-from": "pistol_base", - "type": "GUN", - "name": "AF2011A1 .38 Super", - "description": "A double-barrel semi-automatic pistol. It looks like two M1911s melded together.", - "weight": 1710, - "volume": 4, - "price": 470000, - "to_hit": -2, - "bashing": 12, - "material": "steel", - "color": "light_gray", - "ammo": "38super", - "dispersion": 520, - "durability": 7, - "modes": [ [ "DEFAULT", "multi", 2 ] ], - "valid_mod_locations": [ [ "brass catcher", 1 ], [ "grip", 1 ] ], - "magazine_well": 2, - "magazines": [ [ "38super", [ "af2011a1mag" ] ] ] - }, - { - "id": "m1991a1_38super", - "copy-from": "m1911", - "type": "GUN", - "name": "M1991A1 .38 Super", - "description": "A modern M1911, chambered for the .38 Super cartridge. It can achieve good accuracy.", - "ammo": "38super", - "magazines": [ [ "38_super", [ "m1991_38smag" ] ] ] - }, - { - "id": "raging_judge", - "copy-from": "raging_bull", - "type": "GUN", - "name": "Taurus Raging Judge Magnum", - "name_plural": "Taurus Raging Judge Magnum", - "description": "The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 Casull. It has the ability to fire .410 shotshells and .45 Long Colt cartridges.", - "weight": 2268, - "dispersion": 480 } ] diff --git a/data/mods/realguns/gunmod.json b/data/mods/realguns/gunmod.json deleted file mode 100644 index ddf15b33e6cc5..0000000000000 --- a/data/mods/realguns/gunmod.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "id": "M6_shotgun", - "type": "GUNMOD", - "name": "M6 ASW shotgun", - "description": "The integrated .410 shotgun of the M6 Aircrew Survival Weapon. It's irremovable.", - "weight": 0, - "volume": 0, - "price": 0, - "to_hit": -1, - "material": [ "steel" ], - "symbol": ":", - "color": "light_red", - "location": "underbarrel", - "mod_targets": [ "rifle" ], - "gun_data": { "ammo": "410shot", "skill": "shotgun", "range": 1, "dispersion": 320, "durability": 10, "clip_size": 1 }, - "dispersion_modifier": 15, - "flags": [ "RELOAD_ONE", "IRREMOVABLE", "TRADER_AVOID" ] - } -] diff --git a/data/mods/realguns/item_groups.json b/data/mods/realguns/item_groups.json index f7748be977160..a29979179b638 100644 --- a/data/mods/realguns/item_groups.json +++ b/data/mods/realguns/item_groups.json @@ -2,48 +2,18 @@ { "id": "spider", "type": "item_group", - "items": [ [ "410shot", 6 ], [ "m6_asw", 1 ] ] - }, - { - "id": "helicopter", - "type": "item_group", - "items": [ [ "m6_asw", 1 ] ] - }, - { - "id": "guns_pistol_common", - "type": "item_group", - "items": [ [ "model_10_revolver", 20 ] ] - }, - { - "id": "guns_pistol_rare", - "type": "item_group", - "items": [ [ "bond_410", 20 ] ] + "items": [ [ "410shot", 6 ] ] }, { "id": "guns_pistol_obscure", "type": "item_group", - "items": [ [ "af2011a1_38super", 100 ], [ "m1991a1_38super", 150 ] ] - }, - { - "id": "guns_rifle_rare", - "type": "item_group", - "items": [ [ "colt_lightning", 15 ], [ "m6_asw", 15 ] ] - }, - { - "id": "guns_shotgun_common", - "type": "item_group", - "items": [ [ "shotgun_410", 30 ] ] + "items": [ [ "m1991a1_38super", 150 ] ] }, { "id": "guns_shotgun_improvised", "type": "item_group", "items": [ [ "410_pipe_shotgun", 70 ] ] }, - { - "id": "guns_survival", - "type": "item_group", - "items": [ [ "m6_asw", 5 ], [ "shotgun_410", 10 ] ] - }, { "id": "museum_guns", "type": "item_group", @@ -53,6 +23,6 @@ { "id": "mags_obscure", "type": "item_group", - "items": [ [ "m1991_38smag", 10 ], [ "af2011a1mag", 10 ] ] + "items": [ [ "m1991_38smag", 10 ] ] } ] diff --git a/data/mods/realguns/magazine.json b/data/mods/realguns/magazine.json deleted file mode 100644 index 11e37a1c3e536..0000000000000 --- a/data/mods/realguns/magazine.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "id": "af2011a1mag", - "type": "MAGAZINE", - "name": "AF2011A1 magazine", - "//": "Provisional", - "description": "Two magazines attached to a common base. Unique to the AF2011A1.", - "weight": 140, - "volume": 2, - "price": 10000, - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": "38super", - "capacity": 16, - "reliability": 7, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "m1991_38smag", - "copy-from": "m1911mag", - "type": "MAGAZINE", - "name": "M1991A1 .38 Super magazine", - "description": "A 9-round magazine for the M1991A1 .38 Super pistol.", - "ammo_type": "38super", - "capacity": 9 - } -] diff --git a/data/mods/realguns/migration.json b/data/mods/realguns/migration.json index 834b9207cf732..54c4a36d0564c 100644 --- a/data/mods/realguns/migration.json +++ b/data/mods/realguns/migration.json @@ -88,5 +88,15 @@ "id": "saiga30mag_410", "type": "MIGRATION", "replace": "saiga410mag_30rd" + }, + { + "id": "m1991_38smag", + "type": "MIGRATION", + "replace": "m1911mag_10rd_38super" + }, + { + "id": "m1991a1_38super", + "type": "MIGRATION", + "replace": "m1911a1_38super" } ] From 0e8b00a51c0d0964e177ada1e38e5d2e23749d90 Mon Sep 17 00:00:00 2001 From: Rail Runner Date: Fri, 6 Dec 2019 12:45:46 +0300 Subject: [PATCH 2/3] Move M6 ASW back to mod --- data/json/itemgroups/guns.json | 2 -- data/json/itemgroups/item_groups.json | 2 -- data/json/items/gun/22.json | 38 --------------------------- data/mods/realguns/gun.json | 27 +++++++++++++++++++ data/mods/realguns/item_groups.json | 17 +++++++++++- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 2f9f6d34094e3..387a493991a70 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -213,7 +213,6 @@ { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 }, { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 }, - { "item": "m6_asw", "prob": 15, "charges-min": 0, "charges-max": 1 }, { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 }, { "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 }, @@ -563,7 +562,6 @@ "items": [ { "group": "guns_improvised", "prob": 200 }, { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 }, - { "item": "m6_asw", "prob": 5, "charges-min": 0, "charges-max": 1 }, { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 }, { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 }, { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 }, diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 0804b2f15621e..c66c5a9348c15 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -5236,7 +5236,6 @@ [ "3006_incendiary", 1 ], [ "762_51", 6 ], [ "762_51_incendiary", 6 ], - [ "m6_asw", 1 ], [ "saiga_12", 3 ], [ "rm20", 1 ], [ "hk_mp5", 12 ], @@ -5558,7 +5557,6 @@ [ "helmet_liner", 10 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "plut_cell", 10 ], - [ "m6_asw", 1 ], [ "m249", 1 ], [ "m240", 1 ], [ "rm614_lmg", 1 ], diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index a07001d59cfaf..dddea2ae55977 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -40,44 +40,6 @@ "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], "magazines": [ [ "22", [ "a180mag" ] ] ] }, - { - "id": "m6_asw", - "looks_like": "ar15", - "type": "GUN", - "reload_noise_volume": 10, - "name": "Chiappa M6 Survival Gun", - "description": "A lightweight combination rifle, combining a .22 LR rimfire barrel with 12 gauge shotgun barrel, and designed to fold for compact storage.", - "weight": "2631 g", - "volume": "1500 ml", - "price": 72900, - "to_hit": -1, - "bashing": 6, - "material": "steel", - "symbol": "(", - "color": "brown", - "ammo": "22", - "skill": "rifle", - "ranged_damage": 4, - "dispersion": 160, - "durability": 7, - "blackpowder_tolerance": 80, - "loudness": 25, - "clip_size": 1, - "barrel_length": 1, - "built_in_mods": [ "M6_shotgun" ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "barrel", 1 ], - [ "muzzle", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEEDS_UNFOLD" ] - }, { "id": "marlin_9a", "looks_like": "ar15", diff --git a/data/mods/realguns/gun.json b/data/mods/realguns/gun.json index 259f5627aceeb..c620736b803df 100644 --- a/data/mods/realguns/gun.json +++ b/data/mods/realguns/gun.json @@ -1,4 +1,31 @@ [ + { + "id": "m6_asw", + "type": "GUN", + "reload_noise_volume": 10, + "name": "M6 Aircrew Survival Weapon", + "description": "A lightweight combination rifle, combining a .22 rimfire barrel with .410 shotgun barrel, and designed to fold for compact storage. Produced for military aircraft pilots who might be stranded after a crash, later produced commercially by various companies.", + "weight": 2140, + "volume": 7, + "price": 59500, + "to_hit": -1, + "bashing": 6, + "material": "steel", + "symbol": "(", + "color": "brown", + "ammo": "22", + "skill": "rifle", + "ranged_damage": 1, + "dispersion": 160, + "durability": 7, + "loudness": 25, + "clip_size": 1, + "reload": 100, + "barrel_length": 2, + "built_in_mods": [ "M6_shotgun" ], + "valid_mod_locations": [ [ "accessories", 2 ], [ "muzzle", 1 ], [ "sling", 1 ], [ "underbarrel", 1 ] ], + "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEEDS_UNFOLD", "COLLAPSIBLE_STOCK" ] + }, { "id": "410_pipe_shotgun", "copy-from": "shotgun_base", diff --git a/data/mods/realguns/item_groups.json b/data/mods/realguns/item_groups.json index a29979179b638..3b0b4667fe50d 100644 --- a/data/mods/realguns/item_groups.json +++ b/data/mods/realguns/item_groups.json @@ -2,18 +2,33 @@ { "id": "spider", "type": "item_group", - "items": [ [ "410shot", 6 ] ] + "items": [ [ "410shot", 6 ], [ "m6_asw", 1 ] ] + }, + { + "id": "helicopter", + "type": "item_group", + "items": [ [ "m6_asw", 1 ] ] }, { "id": "guns_pistol_obscure", "type": "item_group", "items": [ [ "m1991a1_38super", 150 ] ] }, + { + "id": "guns_rifle_rare", + "type": "item_group", + "items": [ [ "m6_asw", 15 ] ] + }, { "id": "guns_shotgun_improvised", "type": "item_group", "items": [ [ "410_pipe_shotgun", 70 ] ] }, + { + "id": "guns_survival", + "type": "item_group", + "items": [ [ "m6_asw", 5 ] ] + }, { "id": "museum_guns", "type": "item_group", From d69b0cceb967204104bbdeafa1f689624c9b8ddf Mon Sep 17 00:00:00 2001 From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> Date: Sat, 7 Dec 2019 13:45:23 +0300 Subject: [PATCH 3/3] Apply suggestions from code review Co-Authored-By: Tonkatsu --- data/json/itemgroups/guns.json | 4 ++-- data/json/itemgroups/magazines.json | 2 +- data/json/items/gun/45colt.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 387a493991a70..6116beb69403b 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -83,7 +83,7 @@ "id": "guns_pistol_obscure", "//": "Imported or otherwise very obscure pistols.", "items": [ - { "item": "af2011a1_38super", "prob": 100, "charges-min": 0, "charges-max": 16 }, + { "item": "af2011a1_38super", "prob": 1, "charges-min": 0, "charges-max": 16 }, { "item": "bfr", "prob": 100, "charges-min": 0, "charges-max": 5 }, { "item": "cop_38", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 }, @@ -91,7 +91,7 @@ { "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "pistol_flintlock", "prob": 150 }, { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 }, - { "item": "raging_judge", "prob": 100, "charges-min": 0, "charges-max": 5 }, + { "item": "raging_judge", "prob": 20, "charges-min": 0, "charges-max": 5 }, { "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 }, { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 }, { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 }, diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index e8956817105a6..53101cdeaa418 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -343,7 +343,7 @@ "items": [ [ "762x39_clip", 10 ], [ "762R_clip", 10 ], - [ "af2011a1mag", 10 ], + [ "af2011a1mag", 1 ], [ "ak74mag", 10 ], [ "makarovmag", 10 ], [ "ppshmag", 10 ], diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 27ca677714978..98626235ae7f3 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -53,7 +53,7 @@ "durability": 7, "clip_size": 10, "blackpowder_tolerance": 56, - "reload_noise": "chuk chuk.", + "reload_noise": "chik chik.", "flags": [ "RELOAD_ONE" ] }, {