From e565014966a1cfe6f5a86ef8a05561a7eabccedc Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Tue, 23 May 2023 16:23:35 +0200 Subject: [PATCH] New guns, calibres, and conversion kits, fixed PR. (#64934) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adds the files in the items/ammo folder. * adds the files in the items/armour folder. * adds the files in the items/book folder. * adds the files in the items/container folder. * adds the files in the items/generic folder. * adds the files in the items/gun folder. * adds the files in the items/gunmod folder. * adds the files in the items/magazine folder. * adds asorted files in the items folder. * adds the conversions folder in the itemgroups/Weapons_Mods_Ammo folder. * adds files in the itemgroups/Weapons_Mods_Ammo/arsenal folder. * adds the files in the itemgroups/Weapons_Mods_Ammo folder. * adds files in the itemgroups folder. * adds files in the itemgroups/SUS folder. * adds files in the uncraft/ammo folder. * adds files in the requirements folder. * adds files in the recipes folder. * adds files in the json folder. * adds files in the mods/Generic_Guns folder. * last tweeks. * fixes a typo in the disc for the AI .308 10-round magazine. * general damage tweeks. * fixes merge errors. * fixes merge errors. * starts fixing bugs. * fixes bugs. * hooks up the ammo with the new barrel length system. still needs to add the barrel lengths to the guns themselves. * adds the barrel lengths to the .223 guns. * Update data/json/items/ammo/338lapua.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/450bushmaster.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/50_beowulf.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/338lapua.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Adds a 20-inch conversion .223 kit for AR-15 rifles, representing those found on M16s. also adds in all the barrel-lengths for weapons in .300, .308, .30-06, and 12.3ln. * Commits suggested changes. * fixes the, "last," bug. I hope. please God. * Does a broad stroke to get gun migrations underway. Hope this doesn’t break… everything . * fixes pointed out bugges. * actualy fixes the shotgun bug. * lints, lints, lints, and lints some more. * Fixes the solitary erroneous file. * fixes more bugs. * retrigger checks * tweeks and bug fixes, makes the long version of the ar15 upper findable on guns and usable in crafts/ weapon mods. * Adds/ fixes gun entries in generic guns. * adds the last gun to generic guns. * look at that, more bug fixes. * adds more values for .223 barrel lengths and removes ranged damage entries from the conversions. they were causing errors, and the new barrel length system should make them unneeded anyhow. * Adds name plural forms for the conversion kits which need them. * Gives the prepped patriot a leg bag for storage. * adds no turret flags to all the guns which need it. * fixes a tiny bug. * the M231 wasn't lacking an ammo entry. No. I didn't forget that. this commit doesn't add that entry. * retrigger checks * retrigger checks * Update data/json/items/magazine/762.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Removes the redundant ranged damage entry. * fixes blacklist errors and adds the post-2000 guns (i.e. all the guns) to the classic zombies blacklist. --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: Dillon Matchett --- data/json/ascii_art/gun_ascii.json | 2 +- data/json/effect_on_condition.json | 2 +- .../furniture-graves.json | 4 +- .../itemgroups/Clothing_Gear/clothing.json | 36 +- data/json/itemgroups/SUS/gunstore.json | 2 + data/json/itemgroups/SUS/lodge.json | 2 +- .../itemgroups/Weapons_Mods_Ammo/ammo.json | 64 +- .../Weapons_Mods_Ammo/arsenal/223.json | 4 +- .../Weapons_Mods_Ammo/arsenal/300_sniper.json | 4 +- .../Weapons_Mods_Ammo/arsenal/300blk.json | 2 +- .../arsenal/338lapua_sniper.json | 52 ++ .../arsenal/collections.json | 5 +- .../nested_conversion_gunmods.json | 353 +++++++++++ .../conversions/nested_conversion_guns.json | 242 ++++++++ .../itemgroups/Weapons_Mods_Ammo/guns.json | 93 ++- .../Weapons_Mods_Ammo/magazines.json | 26 +- .../Weapons_Mods_Ammo/nested_ammo.json | 53 ++ .../Weapons_Mods_Ammo/nested_guns.json | 177 +++++- data/json/itemgroups/defense_mode.json | 2 +- data/json/itemgroups/military.json | 54 +- data/json/items/ammo/223.json | 45 +- data/json/items/ammo/300.json | 57 +- data/json/items/ammo/3006.json | 57 +- data/json/items/ammo/300blk.json | 37 +- data/json/items/ammo/308.json | 51 +- data/json/items/ammo/338lapua.json | 117 ++++ data/json/items/ammo/450bushmaster.json | 129 ++++ data/json/items/ammo/50_beowulf.json | 147 +++++ data/json/items/ammo/762.json | 33 +- data/json/items/ammo/8x40mm.json | 2 +- data/json/items/ammo/exodii.json | 1 + data/json/items/ammo_types.json | 18 + data/json/items/armor/ammo_pouch.json | 18 + data/json/items/armor/bandolier.json | 6 + data/json/items/armor/hats.json | 15 + data/json/items/armor/storage.json | 6 + data/json/items/armor/undergarment.json | 30 + data/json/items/book/rifle.json | 39 +- data/json/items/containers/conversions.json | 132 ++++ data/json/items/generic/casing.json | 30 + data/json/items/gun/223.json | 576 ++++++++++++++++-- data/json/items/gun/300.json | 53 ++ data/json/items/gun/3006.json | 53 +- data/json/items/gun/300BLK.json | 7 - data/json/items/gun/308.json | 24 +- data/json/items/gun/338lapua.json | 176 ++++++ data/json/items/gun/450bushmaster.json | 38 ++ data/json/items/gun/762.json | 55 +- data/json/items/gun/8x40mm.json | 28 +- data/json/items/gun/converted.json | 229 +++++++ data/json/items/gun/exodii.json | 2 + data/json/items/gun/obsolete.json | 264 ++++++++ data/json/items/gun/shot.json | 5 + data/json/items/gunmod/conversions.json | 547 ++++++++++++++++- data/json/items/gunmod/mechanism.json | 40 +- data/json/items/magazine/300.json | 18 + data/json/items/magazine/308.json | 17 + data/json/items/magazine/338lapua.json | 53 ++ data/json/items/magazine/450bushmaster.json | 36 ++ data/json/items/magazine/50beowulf.json | 75 +++ data/json/items/magazine/762.json | 103 ++++ .../mapgen/military/mil_base/mil_base_z0.json | 14 +- data/json/monsterdrops/feral_humans.json | 2 +- data/json/monsterdrops/zombie_survivor.json | 2 +- data/json/monsters/defense_bot.json | 2 +- data/json/npcs/NC_ARMY.json | 2 +- data/json/npcs/NC_ARSONIST.json | 2 +- data/json/npcs/NC_JUNK_SHOPKEEP.json | 2 +- data/json/npcs/NC_OPS.json | 2 +- data/json/npcs/NC_SOLDIER.json | 4 +- .../NPC_Old_Guard_FOB_quartermaster.json | 2 +- .../surface_staff/Smokes/NPC_Smokes.json | 2 +- .../NPC_scavenger_mercenary.json | 4 +- .../robofac/NPC_robofac_generic_security.json | 9 +- .../NC_ANCILLA_GRUNT.json | 4 +- data/json/npcs/scrap_trader/scrap_trader.json | 2 +- data/json/obsoletion/migration_items.json | 7 +- data/json/professions.json | 177 +++++- data/json/recipes/ammo/rifle.json | 338 ++++++++++ data/json/recipes/other/bots.json | 2 +- data/json/recipes/recipe_deconstruction.json | 4 +- data/json/recipes/weapon/magazines.json | 195 +++++- data/json/recipes/weapon/mods.json | 43 +- data/json/requirements/ammo.json | 16 + data/json/uncraft/ammo/338lapua.json | 45 ++ data/json/uncraft/ammo/450bushmaster.json | 24 + data/json/uncraft/ammo/50beowulf.json | 24 + data/json/vehicles/helicopters.json | 60 +- data/mods/Aftershock/mobs/robots.json | 2 +- .../Aftershock/recipes/deconstruction.json | 2 +- data/mods/Aftershock/recipes/recipes.json | 2 +- .../Generic_Guns/ammo/gg_ammo_migration.json | 21 + .../ammo/gg_casings_migration.json | 3 + .../firearms/gg_firearms_migration.json | 42 +- .../magazines/gg_magazines_migration.json | 18 + .../Military_Professions/npc/NC_ARMY.json | 2 +- .../mods/Military_Professions/npc/NC_OPS.json | 2 +- data/mods/Military_Professions/prof/army.json | 8 +- data/mods/No_Hope/Mapgen/mil_base_z0.json | 14 +- data/mods/No_Hope/monsters.json | 2 +- data/mods/Standard_Combat_Tests/modinfo.json | 2 +- data/mods/TEST_DATA/mapgen-test.json | 4 +- .../Xedra_Evolved/items/inventor/gun.json | 2 +- .../classic_zombies/items/blacklists.json | 73 ++- data/mods/classic_zombies/items/guns.json | 16 +- .../bionic_professions.json | 4 +- doc/GAME_BALANCE.md | 2 +- 107 files changed, 5450 insertions(+), 309 deletions(-) create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json create mode 100644 data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json create mode 100644 data/json/items/ammo/338lapua.json create mode 100644 data/json/items/ammo/450bushmaster.json create mode 100644 data/json/items/ammo/50_beowulf.json create mode 100644 data/json/items/containers/conversions.json create mode 100644 data/json/items/gun/338lapua.json create mode 100644 data/json/items/gun/450bushmaster.json create mode 100644 data/json/items/gun/converted.json create mode 100644 data/json/items/gun/obsolete.json create mode 100644 data/json/items/magazine/338lapua.json create mode 100644 data/json/items/magazine/450bushmaster.json create mode 100644 data/json/items/magazine/50beowulf.json create mode 100644 data/json/uncraft/ammo/338lapua.json create mode 100644 data/json/uncraft/ammo/450bushmaster.json create mode 100644 data/json/uncraft/ammo/50beowulf.json diff --git a/data/json/ascii_art/gun_ascii.json b/data/json/ascii_art/gun_ascii.json index 48865fe8f2521..e4fc5e853ce86 100644 --- a/data/json/ascii_art/gun_ascii.json +++ b/data/json/ascii_art/gun_ascii.json @@ -1428,7 +1428,7 @@ }, { "type": "ascii_art", - "id": "m4a1", + "id": "modular_m4a1", "picture": [ " ", " ", diff --git a/data/json/effect_on_condition.json b/data/json/effect_on_condition.json index 63041ee47eff5..1e03fdd0283a1 100644 --- a/data/json/effect_on_condition.json +++ b/data/json/effect_on_condition.json @@ -124,7 +124,7 @@ "type": "effect_on_condition", "id": "get_m4_carbine", "global": true, - "effect": { "u_spawn_item": "m4_carbine" } + "effect": { "u_spawn_item": "modular_m4_carbine" } }, { "type": "effect_on_condition", diff --git a/data/json/furniture_and_terrain/furniture-graves.json b/data/json/furniture_and_terrain/furniture-graves.json index 387b1d3fe60bf..1269a1b717b08 100644 --- a/data/json/furniture_and_terrain/furniture-graves.json +++ b/data/json/furniture_and_terrain/furniture-graves.json @@ -109,7 +109,7 @@ "flags": [ "EASY_DECONSTRUCT", "TRANSPARENT", "MOUNTABLE" ], "deconstruct": { "items": [ - { "item": "m4_carbine", "count": 1, "charges": 0, "variant": "m4a1" }, + { "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" }, { "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] }, { "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] } ] @@ -120,7 +120,7 @@ "sound": "thump.", "sound_fail": "whack.", "items": [ - { "item": "m4_carbine", "count": 1, "charges": 0, "variant": "m4a1" }, + { "item": "modular_m4_carbine", "count": 1, "charges": 0, "variant": "modular_m4a1" }, { "item": "helmet_army", "count": 1, "damage": [ 0, 3 ] }, { "item": "boots_combat", "count": [ 0, 1 ], "damage": [ 0, 3 ] } ] diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 78b67afe68a93..7979fc68e8b05 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1469,6 +1469,8 @@ [ "collarpin", 10 ], [ "undershirt", 70 ], [ "boxer_shorts", 50 ], + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, [ "briefs", 40 ], [ "boxer_briefs", 45 ], [ "swim_briefs", 10 ], @@ -1479,6 +1481,8 @@ [ "bikini_bottom_short", 5 ], [ "panties", 70 ], [ "boy_shorts", 25 ], + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" }, [ "gown", 1 ], [ "long_glove_white", 1 ], [ "veil_wedding", 1 ], @@ -1521,6 +1525,8 @@ [ "tophat", 10 ], [ "bowhat", 10 ], [ "cowboy_hat", 10 ], + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 2 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" }, [ "bullwhip", 1 ], [ "10gal_hat", 3 ], [ "glasses_monocle", 2 ], @@ -1920,6 +1926,8 @@ [ "tophat", 50 ], [ "bowhat", 50 ], [ "cowboy_hat", 100 ], + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 5 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 150, "event": "independence_day" }, [ "10gal_hat", 10 ], [ "kufi", 10 ], [ "kippah", 30 ], @@ -2085,6 +2093,8 @@ "items": [ [ "panties", 70 ], [ "boy_shorts", 50 ], + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" }, [ "bikini_bottom", 5 ], [ "bikini_bottom_short", 1 ], { "item": "bikini_bottom", "variant": "flag_bikini_bottom", "prob": 70, "event": "independence_day" } @@ -2100,6 +2110,8 @@ "id": "male_underwear_bottom", "items": [ [ "boxer_shorts", 70 ], + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, [ "briefs", 30 ], [ "boxer_briefs", 50 ], [ "long_underpants", 20 ], @@ -2127,6 +2139,8 @@ { "item": "tophat", "prob": 5 }, { "item": "bowhat", "prob": 10 }, { "item": "cowboy_hat", "prob": 10 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 1 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" }, { "item": "boots_western", "prob": 8 }, { "item": "glasses_monocle", "prob": 2 }, { "item": "pants_leather", "prob": 60 }, @@ -2144,6 +2158,8 @@ { "item": "bra", "prob": 30 }, { "item": "undershirt", "prob": 30 }, { "item": "boxer_shorts", "prob": 30 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 2 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, { "item": "briefs", "prob": 15 }, { "item": "boxer_briefs", "prob": 20 }, { "item": "swim_briefs", "prob": 10 }, @@ -2154,6 +2170,8 @@ { "item": "bikini_bottom_short", "prob": 5 }, { "item": "panties", "prob": 30 }, { "item": "boy_shorts", "prob": 25 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" }, { "item": "sweatshirt", "prob": 75 }, { "item": "sweater", "prob": 75 }, { "item": "turtleneck", "prob": 25 }, @@ -3424,6 +3442,8 @@ [ "bra", 30 ], [ "undershirt", 30 ], [ "boxer_shorts", 30 ], + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 2 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, [ "briefs", 15 ], [ "boxer_briefs", 20 ], [ "swim_briefs", 10 ], @@ -3434,6 +3454,8 @@ [ "bikini_bottom_short", 5 ], [ "panties", 30 ], [ "boy_shorts", 25 ], + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" }, [ "sweatshirt", 75 ], [ "sweater", 75 ], [ "turtleneck", 40 ], @@ -3565,8 +3587,12 @@ "items": [ [ "bandana", 25 ], [ "boxer_shorts", 25 ], + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, [ "boxer_briefs", 25 ], [ "boy_shorts", 25 ], + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 70, "event": "independence_day" }, [ "bra", 25 ], [ "socks", 45 ], [ "socks_ankle", 30 ], @@ -3644,6 +3670,8 @@ { "item": "fedora", "prob": 40 }, { "item": "hat_newsboy", "prob": 5 }, { "item": "cowboy_hat", "prob": 20 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 2 }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat", "prob": 70, "event": "independence_day" }, { "item": "straw_fedora", "prob": 5 }, { "item": "hat_golf", "prob": 15 }, { "item": "straw_hat", "prob": 15 }, @@ -3777,6 +3805,8 @@ { "item": "bikini_bottom", "prob": 30 }, { "item": "bikini_bottom_short", "prob": 10 }, { "item": "boy_shorts", "prob": 30 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 2 }, + { "item": "boy_shorts", "variant": "flag_boy_shorts", "prob": 100, "event": "independence_day" }, { "item": "bra", "prob": 60 }, { "item": "panties", "prob": 70 }, { "item": "bikini_top", "prob": 30 }, @@ -3803,6 +3833,8 @@ "items": [ { "item": "boxer_briefs", "prob": 30 }, { "item": "boxer_shorts", "prob": 50 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 5 }, + { "item": "boxer_shorts", "variant": "flag_boxer_shorts", "prob": 100, "event": "independence_day" }, { "item": "briefs", "prob": 50 }, { "item": "trunks", "prob": 10 }, { "item": "swim_briefs", "prob": 5 }, @@ -3941,8 +3973,10 @@ { "item": "ammo_satchel", "prob": 10 }, { "item": "ammo_pouch", "prob": 10 }, { "item": "chestrig", "prob": 20 }, + { "item": "chestrig", "variant": "flag_chestrig", "prob": 2 }, { "item": "dive_bag", "prob": 50 }, - { "item": "petpack", "prob": 50 } + { "item": "petpack", "prob": 50 }, + { "item": "chestrig", "variant": "flag_chestrig", "prob": 70, "event": "independence_day" } ], "prob": 30 }, diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json index b81d4ca6f64a0..e00ccff4dd521 100644 --- a/data/json/itemgroups/SUS/gunstore.json +++ b/data/json/itemgroups/SUS/gunstore.json @@ -48,6 +48,7 @@ { "group": "guns_common_display", "prob": 80 }, { "group": "mags_common_gunstore", "prob": 80 }, { "group": "gunmod_common", "prob": 15 }, + { "group": "conversion_kits", "prob": 15 }, { "group": "book_gunmags", "prob": 60 }, { "group": "SUS_gunstore_gear", "prob": 60 }, { "group": "ammo_parts", "prob": 80 }, @@ -78,6 +79,7 @@ { "group": "guns_common_display", "prob": 5, "damage": [ 0, 2 ] }, { "group": "mags_common", "prob": 10, "damage": [ 0, 2 ] }, { "group": "gunmod_common", "prob": 5, "damage": [ 0, 2 ] }, + { "group": "conversion_kits", "prob": 5, "damage": [ 0, 2 ] }, { "group": "book_gunmags", "prob": 10, "damage": [ 0, 2 ] }, { "group": "ammo_parts", "prob": 10, "damage": [ 0, 2 ] }, { "group": "SUS_gunstore_gear", "prob": 10, "damage": [ 0, 2 ] }, diff --git a/data/json/itemgroups/SUS/lodge.json b/data/json/itemgroups/SUS/lodge.json index 216674913d55d..efb0e88f66e0c 100644 --- a/data/json/itemgroups/SUS/lodge.json +++ b/data/json/itemgroups/SUS/lodge.json @@ -21,7 +21,7 @@ "//": "items found in a rifle hunting space", "subtype": "collection", "entries": [ - { "item": "ar15", "prob": 150, "charges-min": 0, "charges-max": 30 }, + { "item": "modular_ar15", "prob": 150, "charges-min": 0, "charges-max": 30 }, { "item": "marlin_9a", "prob": 20, "charges-min": 0, "charges-max": 19 }, { "item": "remington700_270", "prob": 10, "charges-min": 0, "charges-max": 4 }, { "item": "remington_700", "prob": 40, "charges-min": 0, "charges-max": 4 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json index a332e2aef8004..d0fa1bd3b7c9b 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json @@ -318,7 +318,13 @@ { "item": "762_m87", "prob": 25 }, { "item": "8mm_civilian", "prob": 15 }, { "item": "300blk", "prob": 15 }, - { "item": "300blk_ss", "prob": 10 } + { "item": "300blk_ss", "prob": 10 }, + { "item": "50beowulf_xtp", "prob": 15 }, + { "item": "50beowulf_penetrator", "prob": 10 }, + { "item": "450_ftx", "prob": 20 }, + { "item": "450_penetrator", "prob": 15 }, + { "item": "338lapua_hpbt", "prob": 15 }, + { "item": "338lapua_fmjbt", "prob": 5 } ] }, { @@ -342,7 +348,13 @@ { "item": "300blk", "prob": 20 }, { "item": "762_54R", "prob": 35 }, { "item": "762_m43", "prob": 20 }, - { "item": "300blk_ss", "prob": 15 } + { "item": "300blk_ss", "prob": 15 }, + { "item": "50beowulf_xtp", "prob": 15 }, + { "item": "50beowulf_penetrator", "prob": 10 }, + { "item": "450_ftx", "prob": 20 }, + { "item": "450_penetrator", "prob": 15 }, + { "item": "338lapua_hpbt", "prob": 15 }, + { "item": "338lapua_fmjbt", "prob": 15 } ] }, { @@ -361,7 +373,12 @@ { "item": "300_winmag", "prob": 25 }, { "item": "4570_sp", "prob": 25 }, { "item": "4570_pen", "prob": 25 }, - { "item": "4570_low", "prob": 25 } + { "item": "4570_low", "prob": 25 }, + { "item": "50beowulf_xtp", "prob": 15 }, + { "item": "50beowulf_penetrator", "prob": 10 }, + { "item": "450_ftx", "prob": 25 }, + { "item": "450_penetrator", "prob": 15 }, + { "item": "338lapua_hpbt", "prob": 15 } ] }, { @@ -391,7 +408,9 @@ { "item": "8mm_inc", "prob": 20 }, { "item": "8mm_jhp", "prob": 10 }, { "item": "300blk", "prob": 15 }, - { "item": "300blk_ss", "prob": 10 } + { "item": "300blk_ss", "prob": 10 }, + { "item": "338lapua_fmjbt", "prob": 15 }, + { "item": "338lapua_api", "prob": 15 } ] }, { @@ -433,10 +452,15 @@ { "item": "reloaded_762_51_incendiary", "prob": 5 }, { "item": "reloaded_762_54R", "prob": 40 }, { "item": "reloaded_762_m43", "prob": 20 }, + { "item": "reloaded_300blk", "prob": 10 }, + { "item": "reloaded_50beowulf_xtp", "prob": 10 }, + { "item": "reloaded_50beowulf_penetrator", "prob": 5 }, + { "item": "reloaded_450_ftx", "prob": 10 }, + { "item": "reloaded_450_penetrator", "prob": 5 }, + { "item": "reloaded_338lapua_hpbt", "prob": 5 }, { "item": "reloaded_303", "prob": 20 }, { "item": "reloaded_303sp", "prob": 5 }, - { "item": "reloaded_303fmj", "prob": 5 }, - { "item": "reloaded_300blk", "prob": 10 } + { "item": "reloaded_303fmj", "prob": 5 } ] }, { @@ -739,6 +763,9 @@ { "item": "50_casing", "prob": 60 }, { "item": "500_casing", "prob": 60 }, { "item": "545_casing", "prob": 60 }, + { "item": "50beowulf_casing", "prob": 45 }, + { "item": "450_casing", "prob": 45 }, + { "item": "338lapua_casing", "prob": 45 }, { "item": "57mm_casing", "prob": 60 }, { "item": "700nx_casing", "prob": 40 }, { "item": "762_casing", "prob": 80 }, @@ -754,18 +781,17 @@ }, { "id": "ammo_casings_milspec", - "//": "Casings for setpieces implying military shootouts by CQB folks. Weirdness thrown in to account for trying to kill XEDRA/Extradimensionals. No vehicular only stuff.", + "//": "Casings for setpieces implying military shootouts", "type": "item_group", "subtype": "distribution", "entries": [ { "item": "9mm_casing", "prob": 50, "count": [ 1, 8 ] }, - { "item": "46mm_casing", "prob": 10, "count": [ 1, 50 ] }, - { "item": "40x46mm_m118_casing", "prob": 5, "count": [ 1, 2 ] }, + { "item": "46mm_casing", "prob": 10, "count": [ 1, 8 ] }, { "item": "223_casing", "prob": 300, "count": [ 1, 30 ] }, - { "group": "nested_casing_223", "prob": 75, "count": [ 1, 100 ] }, + { "item": "3006_casing", "prob": 50, "count": [ 1, 3 ] }, { "item": "762_51_casing", "prob": 25, "count": [ 1, 30 ] }, - { "group": "nested_casing_308", "prob": 15, "count": [ 1, 50 ] }, - { "item": "50_casing", "prob": 5, "count": [ 1, 3 ] }, + { "item": "762_casing", "prob": 25, "count": [ 1, 30 ] }, + { "item": "50_casing", "prob": 25, "count": [ 1, 3 ] }, { "item": "shot_hull", "prob": 50, "count": [ 1, 3 ] } ] }, @@ -804,20 +830,6 @@ [ "30carbine_casing", 40 ] ] }, - { - "id": "nested_casing_223", - "type": "item_group", - "//": "SAW casing and linkage.", - "subtype": "collection", - "entries": [ { "item": "ammolink223" }, { "item": "223_casing" } ] - }, - { - "id": "nested_casing_308", - "type": "item_group", - "//": "GPMG casings and linkage.", - "subtype": "collection", - "entries": [ { "item": "ammolink308" }, { "item": "762_51_casing" } ] - }, { "id": "ammo_casings_bulk", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json index 074c108a20e72..c705e0a27a419 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json @@ -36,13 +36,13 @@ "id": "nested_m4_carbine_no_ammo", "type": "item_group", "subtype": "collection", - "items": [ { "item": "m4_carbine" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] + "items": [ { "item": "modular_m4_carbine" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] }, { "id": "nested_m27_assault_rifle_no_ammo", "type": "item_group", "subtype": "collection", - "items": [ { "item": "m27_assault_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] + "items": [ { "item": "modular_m27_assault_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] }, { "id": "stanag_mags", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json index 06eff5e33e3ee..1ace38ad315f9 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json @@ -35,13 +35,13 @@ "type": "item_group", "id": "ammo_can_300_full", "container-item": "ammunition_can_30", - "items": [ { "group": "ammo_box_308", "count": 15 } ] + "items": [ { "group": "ammo_box_300", "count": 15 } ] }, { "type": "item_group", "id": "ammo_can_300_part", "container-item": "ammunition_can_30", - "items": [ { "group": "ammo_box_308", "count": [ 1, 5 ] } ] + "items": [ { "group": "ammo_box_300", "count": [ 1, 5 ] } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json index bd88b03085358..49e3d3a7a61e0 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json @@ -35,7 +35,7 @@ "id": "nested_m4blk_carbine_no_ammo", "type": "item_group", "subtype": "collection", - "items": [ { "item": "m16_auto_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] + "items": [ { "item": "modular_m16_auto_rifle" }, { "group": "stanag_mags", "count": [ 1, 3 ] } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json new file mode 100644 index 0000000000000..d2d3cf2a68bae --- /dev/null +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json @@ -0,0 +1,52 @@ +[ + { + "type": "item_group", + "id": "milspec_arsenal_338lapua_sniper_gun&mags&cans", + "subtype": "collection", + "items": [ { "group": "milspec_arsenal_338lapua_sniper_gun&ammo" }, { "item": "ammunition_can_50", "count": [ 1, 4 ] } ] + }, + { + "type": "item_group", + "id": "milspec_arsenal_338lapua_sniper_gun&ammo", + "subtype": "collection", + "items": [ + { "group": "milspec_arsenal_338lapua_sniper_gun&mags" }, + { "group": "ammo_can_338lapua_full", "prob": 30 }, + { "group": "ammo_can_338lapua_part", "prob": 80, "count": [ 1, 2 ] } + ] + }, + { + "type": "item_group", + "id": "milspec_arsenal_338lapua_sniper_gun&mags", + "subtype": "collection", + "items": [ + { "group": "nested_tac338_no_ammo", "count": [ 1, 2 ] }, + { "group": "nested_tac338_no_ammo", "count": [ 1, 2 ], "prob": 40 }, + { "group": "nested_tac338_no_ammo", "count": [ 1, 2 ], "prob": 10 } + ] + }, + { + "id": "nested_tac338_no_ammo", + "type": "item_group", + "subtype": "collection", + "items": [ { "item": "tac338" }, { "item": "ai_338mag", "count": [ 1, 3 ] } ] + }, + { + "type": "item_group", + "id": "ammo_can_338lapua_full", + "container-item": "ammunition_can_50", + "items": [ { "group": "ammo_box_338lapua", "count": 15 } ] + }, + { + "type": "item_group", + "id": "ammo_can_338lapua_part", + "container-item": "ammunition_can_50", + "items": [ { "group": "ammo_box_338lapua", "count": [ 1, 5 ] } ] + }, + { + "type": "item_group", + "id": "ammo_box_338lapua", + "container-item": "ammunition_box_223", + "items": [ { "item": "338lapua_fmjbt", "count": 1, "charges-min": 10, "charges-max": 10 } ] + } +] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json index 1bd00fcf4e047..1056e19db1124 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json @@ -2,7 +2,7 @@ { "type": "item_group", "id": "milspec_arsenal_weapon&ammo_collection", - "//": "This file provide some milspec loot groups for using in military armament rooms - part is deployed and ready to use (or already used), and part is store the ammo. This was made to make some consistency and order in arsenals.", + "//": "This file provides some milspec loot groups for use in military armament rooms - part is deployed and ready to use (or already used), and part is stored. This was made to make some consistency and order in arsenals.", "//2": "the list of armament picked from . If you have a better source you're welcome.", "//3": "i tried to make them flexible enough, so each part can be reused, without making 10 different copies for each using", "//4": "each file contains (in basic): an ammo can with weapon of one caliber, a gun with its mags, a group of these guns, the group of few gun groups (gun&mags), gun&mags + ammo (gun&ammo), and gun&ammo + empty cans (gun&mags&cans). Then each of them can be united in group of similar weapons, so we can generate, for example, group from only guns, only ammo or, as the very first idea, the 'deployed' group with a bit of ammo and a few guns of same caliber.", @@ -46,6 +46,7 @@ { "group": "milspec_arsenal_223_mg_gun&mags&cans", "prob": 260 }, { "group": "milspec_arsenal_300blk_gun&mags&cans", "prob": 100 }, { "group": "milspec_arsenal_300_sniper_gun&mags&cans", "prob": 95 }, + { "group": "milspec_arsenal_338lapua_sniper_gun&mags&cans", "prob": 60 }, { "group": "milspec_arsenal_308_sniper_gun&mags&cans", "prob": 95 }, { "group": "milspec_arsenal_308_mg_gun&mags&cans", "prob": 192 } ] @@ -83,6 +84,7 @@ { "group": "ammo_can_belt223_any_full", "count": [ 3, 6 ], "prob": 260 }, { "group": "ammo_can_300blk_full", "count": [ 3, 6 ], "prob": 100 }, { "group": "ammo_can_300_full", "count": [ 3, 6 ], "prob": 95 }, + { "group": "ammo_can_338lapua_full", "count": [ 3, 6 ], "prob": 60 }, { "group": "ammo_can_308_full", "count": [ 3, 6 ], "prob": 95 }, { "group": "ammo_can_belt308_full", "count": [ 3, 6 ], "prob": 192 }, { "group": "ammo_can_50bmg_full", "count": [ 3, 6 ], "prob": 30 }, @@ -116,6 +118,7 @@ { "group": "milspec_arsenal_223_mg_gun&mags", "count": [ 1, 2 ], "prob": 260 }, { "group": "milspec_arsenal_300blk_gun&mags", "count": [ 1, 2 ], "prob": 100 }, { "group": "milspec_arsenal_300_sniper_gun&mags", "count": [ 1, 2 ], "prob": 95 }, + { "group": "milspec_arsenal_338lapua_sniper_gun&mags", "count": [ 1, 2 ], "prob": 60 }, { "group": "milspec_arsenal_308_sniper_gun&mags", "count": [ 1, 2 ], "prob": 95 }, { "group": "milspec_arsenal_308_mg_gun&mags", "count": [ 1, 2 ], "prob": 192 }, { "group": "milspec_arsenal_50bmg_sniper_gun&mags", "count": [ 1, 2 ], "prob": 30 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json new file mode 100644 index 0000000000000..257bc20212d14 --- /dev/null +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json @@ -0,0 +1,353 @@ +[ + { + "type": "item_group", + "id": "nested_retool_extras", + "//": "Miscellaneous items assigned to spawn within conversion kits, including some tools and the instructions.", + "subtype": "collection", + "entries": [ { "item": "retool_instructions" }, { "item": "bubblewrap" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_ar15kit_long", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_huge", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_223rem_extended" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_ar15kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_223rem" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_ar15kit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_223rem_medium" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_ar15kit_short", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_223rem_short" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_300blk_ar15kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_300blk" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_300blk_ar15kit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_300blk_medium" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_300blk_ar15kit_short", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr_micro", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_300blk_short" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_50beowulf_ar15kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ + { "item": "retool_ar15_50beowulf" }, + { "item": "50beowulf_ar15mag", "charges": 0 }, + { "group": "nested_retool_extras" } + ] + }, + { + "type": "item_group", + "id": "boxed_50beowulf_ar15kit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ + { "item": "retool_ar15_50beowulf_medium" }, + { "item": "50beowulf_ar15mag", "charges": 0 }, + { "group": "nested_retool_extras" } + ] + }, + { + "type": "item_group", + "id": "boxed_50beowulf_ar15kit_short", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr_micro", + "on_overflow": "spill", + "entries": [ + { "item": "retool_ar15_50beowulf_short" }, + { "item": "50beowulf_ar15mag", "charges": 0 }, + { "group": "nested_retool_extras" } + ] + }, + { + "type": "item_group", + "id": "boxed_450bushmaster_ar15kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_450" }, { "item": "450_ar15mag", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_450bushmaster_ar15kit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_450_medium" }, { "item": "450_ar15mag", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_450bushmaster_ar15kit_short", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr_micro", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_450_short" }, { "item": "450_ar15mag", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_762_ar15kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_ar15_762" }, { "item": "762_ar15mag_30rd", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_mdrxkit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_mdrx_223rem" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_mdrxkit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool", + "entries": [ { "item": "retool_mdrx_223rem_medium" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_mdrxkit_short", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_sbr", + "entries": [ { "item": "retool_mdrx_223rem_short" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_300blk_mdrxkit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_mdrx_300blk" }, { "item": "stanag30", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_308win_mdrxkit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_large", + "on_overflow": "spill", + "entries": [ { "item": "retool_mdrx_308win" }, { "item": "ar10mag_20rd", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_308win_mdrxkit_medium", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool", + "on_overflow": "spill", + "entries": [ + { "item": "retool_mdrx_308win_medium" }, + { "item": "ar10mag_20rd", "charges": 0 }, + { "group": "nested_retool_extras" } + ] + }, + { + "type": "item_group", + "id": "boxed_300win_axmckit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_huge", + "on_overflow": "spill", + "entries": [ { "item": "retool_axmc_300win" }, { "item": "ai_338mag_10", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_308win_axmckit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool_huge", + "on_overflow": "spill", + "entries": [ { "item": "retool_axmc_308win" }, { "item": "ai_308mag_10", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_223rem_cz600kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool", + "on_overflow": "spill", + "entries": [ { "item": "retool_cz600_223rem" }, { "item": "stanag10", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "id": "boxed_762_cz600kit", + "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", + "subtype": "collection", + "container-item": "box_retool", + "entries": [ { "item": "retool_cz600_762" }, { "item": "bren2_762mag10", "charges": 0 }, { "group": "nested_retool_extras" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15kits", + "//": "An item group for a specific weapon platform’s possible conversion kits .", + "entries": [ + { + "distribution": [ + { "group": "boxed_223rem_ar15kit_long", "prob": 25 }, + { "group": "boxed_223rem_ar15kit", "prob": 30 }, + { "group": "boxed_223rem_ar15kit_medium", "prob": 25 }, + { "group": "boxed_223rem_ar15kit_short", "prob": 15 }, + { "group": "boxed_300blk_ar15kit", "prob": 25 }, + { "group": "boxed_300blk_ar15kit_medium", "prob": 20 }, + { "group": "boxed_300blk_ar15kit_short", "prob": 15 }, + { "group": "boxed_50beowulf_ar15kit", "prob": 20 }, + { "group": "boxed_50beowulf_ar15kit_medium", "prob": 15 }, + { "group": "boxed_50beowulf_ar15kit_short", "prob": 10 }, + { "group": "boxed_450bushmaster_ar15kit", "prob": 20 }, + { "group": "boxed_450bushmaster_ar15kit_medium", "prob": 15 }, + { "group": "boxed_450bushmaster_ar15kit_short", "prob": 10 }, + { "group": "boxed_762_ar15kit", "prob": 30 } + ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_mdrxkits", + "//": "An item group for a specific weapon platform’s possible conversion kits .", + "entries": [ + { + "distribution": [ + { "group": "boxed_223rem_mdrxkit", "prob": 30 }, + { "group": "boxed_223rem_mdrxkit_medium", "prob": 25 }, + { "group": "boxed_223rem_mdrxkit_short", "prob": 15 }, + { "group": "boxed_300blk_mdrxkit", "prob": 10 }, + { "group": "boxed_308win_mdrxkit", "prob": 25 }, + { "group": "boxed_308win_mdrxkit_medium", "prob": 20 } + ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_axmckits", + "//": "An item group for a specific weapon platform’s possible conversion kits .", + "entries": [ + { + "distribution": [ { "group": "boxed_300win_axmckit", "prob": 30 }, { "group": "boxed_308win_axmckit", "prob": 30 } ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_cz600kits", + "//": "An item group for a specific weapon platform’s possible conversion kits .", + "entries": [ + { + "distribution": [ { "group": "boxed_223rem_cz600kit", "prob": 30 }, { "group": "boxed_762_cz600kit", "prob": 25 } ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_ar15_with_kits", + "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", + "entries": [ { "group": "boxed_ar15kits" }, { "item": "modular_ar15", "charges-min": 0, "charges-max": 0 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_mdrx_with_kits", + "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", + "entries": [ { "group": "boxed_mdrxkits" }, { "item": "mdrx", "charges-min": 0, "charges-max": 0 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_axmc_with_kits", + "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", + "entries": [ { "group": "boxed_axmckits" }, { "item": "axmc", "charges-min": 0, "charges-max": 0 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_cz600_with_kits", + "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", + "entries": [ { "group": "boxed_cz600kits" }, { "item": "cz600", "charges-min": 0, "charges-max": 0 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "conversion_kits", + "//": "An item group for a randomly selected conversion kit to spawn, regardless of type. Intended for use in gun stores and other sensible locations.", + "entries": [ + { + "distribution": [ + { "group": "boxed_ar15kits", "prob": 30 }, + { "group": "boxed_mdrxkits", "prob": 15 }, + { "group": "boxed_axmckits", "prob": 5 }, + { "group": "boxed_cz600kits", "prob": 15 } + ], + "prob": 100 + } + ] + } +] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json new file mode 100644 index 0000000000000..4afacc471294b --- /dev/null +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json @@ -0,0 +1,242 @@ +[ + { + "id": "nested_ar15_retool_223rem", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "ar15_223long", "charges-min": 0, "charges-max": 30, "prob": 8 }, + { "item": "ar15_223medium", "charges-min": 0, "charges-max": 30, "prob": 8 }, + { "item": "ar15_223short", "charges-min": 0, "charges-max": 30, "prob": 6 } + ], + "prob": 100 + }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_ar15_retool_300blk", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "ar15_300", "charges-min": 0, "charges-max": 30, "prob": 10 }, + { "item": "ar15_300medium", "charges-min": 0, "charges-max": 30, "prob": 8 }, + { "item": "ar15_300short", "charges-min": 0, "charges-max": 30, "prob": 6 } + ], + "prob": 100 + }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_300BLK" } + ] + }, + { + "id": "nested_ar15_retool_50beowulf", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "ar15_50", "charges-min": 0, "charges-max": 10, "prob": 10 }, + { "item": "ar15_50medium", "charges-min": 0, "charges-max": 10, "prob": 8 }, + { "item": "ar15_50short", "charges-min": 0, "charges-max": 10, "prob": 6 } + ], + "prob": 100 + }, + { "item": "50beowulf_ar15mag" }, + { "item": "50beowulf_ar15mag", "prob": 50 }, + { "group": "on_hand_50beowulf" } + ] + }, + { + "id": "nested_ar15_retool_450bushmaster", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "ar15_450", "charges-min": 0, "charges-max": 4, "prob": 10 }, + { "item": "ar15_450medium", "charges-min": 0, "charges-max": 4, "prob": 8 }, + { "item": "ar15_450short", "charges-min": 0, "charges-max": 4, "prob": 6 } + ], + "prob": 100 + }, + { "item": "450_ar15mag" }, + { "item": "450_ar15mag", "prob": 50 }, + { "group": "on_hand_450" } + ] + }, + { + "id": "nested_ar15_retool_762", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "ar15_762", "charges-min": 0, "charges-max": 30 }, + { "item": "762_ar15mag_30rd" }, + { "item": "762_ar15mag_30rd", "prob": 50 }, + { "group": "on_hand_762" } + ] + }, + { + "id": "nested_mdrx_retool_223rem", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "mdrx_223", "charges-min": 0, "charges-max": 30, "prob": 10 }, + { "item": "mdrx_223short", "charges-min": 0, "charges-max": 30, "prob": 8 } + ], + "prob": 100 + }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_mdrx_retool_300blk", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "mdrx_300", "charges-min": 0, "charges-max": 30 }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_300BLK" } + ] + }, + { + "id": "nested_mdrx_retool_308win", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ + { "item": "mdrx_308", "charges-min": 0, "charges-max": 20, "prob": 10 }, + { "item": "mdrx_308medium", "charges-min": 0, "charges-max": 20, "prob": 8 } + ], + "prob": 100 + }, + { "item": "ar10mag_20rd" }, + { "item": "ar10mag_20rd", "prob": 50 }, + { "group": "on_hand_308" } + ] + }, + { + "id": "nested_axmc_retool_308win", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "axmc_308", "charges-min": 0, "charges-max": 10 }, + { "item": "ai_308mag_10" }, + { "item": "ai_308mag_10", "prob": 50 }, + { "group": "on_hand_308" } + ] + }, + { + "id": "nested_axmc_retool_300win", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "axmc_300", "charges-min": 0, "charges-max": 10 }, + { "item": "ai_338mag_10" }, + { "item": "ai_338mag_10", "prob": 50 }, + { "group": "on_hand_300" } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_converted_ar15", + "//": "An item group for a random, personally-converted weapon to spawn.", + "entries": [ + { + "distribution": [ + { "group": "nested_ar15_retool_223rem", "prob": 30 }, + { "group": "nested_ar15_retool_300blk", "prob": 20 }, + { "group": "nested_ar15_retool_50beowulf", "prob": 15 }, + { "group": "nested_ar15_retool_450bushmaster", "prob": 15 }, + { "group": "nested_ar15_retool_762", "prob": 25 } + ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_converted_mdrx", + "//": "An item group for a random, personally-converted weapon to spawn.", + "entries": [ + { + "distribution": [ + { "group": "nested_mdrx_retool_223rem", "prob": 30 }, + { "group": "nested_mdrx_retool_300blk", "prob": 20 }, + { "group": "nested_mdrx_retool_308win", "prob": 15 } + ], + "prob": 100 + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "nested_converted_axmc", + "//": "An item group for a random, personally-converted weapon to spawn.", + "entries": [ + { + "distribution": [ { "group": "nested_axmc_retool_300win", "prob": 20 }, { "group": "nested_axmc_retool_308win", "prob": 20 } ], + "prob": 100 + } + ] + }, + { + "id": "nested_converted_cz600", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "An item group for a random, personally-converted weapon to spawn.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "cz600_762", "charges-min": 0, "charges-max": 10 }, + { "item": "bren2_762mag10" }, + { "item": "bren2_762mag10", "prob": 50 }, + { "group": "on_hand_308" } + ] + } +] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index e858b89a297e7..b5727f2daa686 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -452,6 +452,8 @@ "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ { "group": "nested_browning_blr", "prob": 1 }, + { "group": "nested_ruger_pr", "prob": 1 }, + { "group": "nested_ruger_arr", "prob": 1 }, { "group": "nested_ar_pistol", "prob": 1 }, { "group": "nested_garand", "prob": 1 }, { "group": "nested_ar10", "prob": 1 }, @@ -463,6 +465,7 @@ { "group": "nested_mosin44", "prob": 1 }, { "group": "nested_mosin91_30", "prob": 1 }, { "group": "nested_remington700_270", "prob": 1 }, + { "group": "nested_ruger_m77", "prob": 1 }, { "group": "nested_remington_700", "prob": 4 }, { "group": "nested_ruger_1022", "prob": 7 }, { "group": "nested_ruger_mini", "prob": 1 }, @@ -474,7 +477,14 @@ { "group": "nested_aksemi", "prob": 2 }, { "group": "nested_m1carbine", "prob": 1 }, { "group": "nested_ak556", "prob": 2 }, - { "group": "nested_zpapm90", "prob": 1 } + { "group": "nested_bren2_762", "prob": 1 }, + { "group": "nested_bren2_556", "prob": 1 }, + { "group": "nested_mdrx", "prob": 1 }, + { "group": "nested_cz600", "prob": 1 }, + { "group": "nested_zpapm90", "prob": 1 }, + { "group": "nested_converted_ar15", "prob": 6 }, + { "group": "nested_converted_mdrx", "prob": 1 }, + { "group": "nested_converted_cz600", "prob": 1 } ] }, { @@ -484,10 +494,11 @@ "//2": "This is for worn items so ammo should be handled elsewhere so that mods can be added directly.", "items": [ { "item": "browning_blr", "prob": 1, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_pr", "prob": 1, "charges-min": 0, "charges-max": 5 }, { "item": "ar_pistol", "prob": 1, "charges-min": 0, "charges-max": 30 }, { "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 }, { "item": "ar10", "prob": 1, "charges-min": 0, "charges-max": 20 }, - { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 }, + { "item": "modular_ar15", "prob": 15, "charges-min": 0, "charges-max": 30 }, { "item": "cx4", "prob": 1, "charges-min": 0, "charges-max": 15 }, { "item": "ksub2000", "prob": 1, "charges-min": 0, "charges-max": 15 }, { "item": "m1a", "prob": 1, "charges-min": 0, "charges-max": 5 }, @@ -495,6 +506,8 @@ { "item": "mosin44", "variant": "mosin44", "prob": 1, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30", "variant": "mosin91_30", "prob": 1, "charges-min": 0, "charges-max": 5 }, { "item": "remington700_270", "prob": 1, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_m77", "prob": 1, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_arr", "prob": 1, "charges-min": 0, "charges-max": 3 }, { "item": "remington_700", "prob": 4, "charges-min": 0, "charges-max": 4 }, { "item": "ruger_1022", "prob": 7, "charges-min": 0, "charges-max": 10 }, { "item": "ruger_mini", "prob": 1, "charges-min": 0, "charges-max": 5 }, @@ -507,6 +520,10 @@ { "item": "mk47", "prob": 1, "charges-min": 0, "charges-max": 30 }, { "item": "m1carbine", "prob": 1, "charges-min": 0, "charges-max": 15 }, { "item": "ak556", "prob": 2, "charges-min": 0, "charges-max": 30 }, + { "item": "bren2_762", "prob": 1, "charges-min": 0, "charges-max": 30 }, + { "item": "bren2_556", "prob": 1, "charges-min": 0, "charges-max": 30 }, + { "item": "mdrx", "prob": 1, "charges-min": 0, "charges-max": 30 }, + { "item": "cz600", "prob": 1, "charges-min": 0, "charges-max": 10 }, { "item": "ak556", "variant": "zpapm90", "prob": 1, "charges-min": 0, "charges-max": 30 } ] }, @@ -517,10 +534,12 @@ "//": "Empty rifles commonly found in gun stores.", "items": [ { "item": "ar10", "prob": 35, "charges-min": 0, "charges-max": 0 }, - { "item": "ar15", "prob": 45, "charges-min": 0, "charges-max": 0 }, + { "item": "modular_ar15", "prob": 45, "charges-min": 0, "charges-max": 0 }, { "item": "cx4", "prob": 30, "charges-min": 0, "charges-max": 0 }, { "item": "ksub2000", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "remington700_270", "prob": 25, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_m77", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_arr", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "remington_700", "prob": 45, "charges-min": 0, "charges-max": 0 }, { "item": "ruger_1022", "prob": 65, "charges-min": 0, "charges-max": 0 }, { "item": "ruger_mini", "prob": 45, "charges-min": 0, "charges-max": 0 }, @@ -534,8 +553,16 @@ { "item": "fn_ps90", "prob": 5, "charges-min": 0, "charges-max": 0 }, { "item": "aksemi", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "mk47", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "mdrx", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "cz600", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "ak556", "prob": 15, "charges-min": 0, "charges-max": 0 }, - { "item": "ak556", "variant": "zpapm90", "prob": 10, "charges-min": 0, "charges-max": 0 } + { "item": "bren2_762", "prob": 6, "charges-min": 0, "charges-max": 0 }, + { "item": "bren2_556", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "ak556", "variant": "zpapm90", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "savage112", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "group": "nested_ar15_with_kits", "prob": 15 }, + { "group": "nested_mdrx_with_kits", "prob": 10 }, + { "group": "nested_cz600_with_kits", "prob": 10 } ] }, { @@ -559,6 +586,8 @@ { "group": "nested_mk3", "prob": 10 }, { "group": "nested_number4", "prob": 10 }, { "group": "nested_m1918", "prob": 30 }, + { "group": "nested_805_bren", "prob": 15 }, + { "group": "nested_mdrx", "prob": 30 }, { "group": "nested_mosin44_ebr", "prob": 10 }, { "group": "nested_psl", "prob": 5 }, { "group": "nested_mosin91_30_ebr", "prob": 20 }, @@ -567,9 +596,12 @@ { "group": "nested_sharps", "prob": 15 }, { "group": "nested_weatherby_5", "prob": 15 }, { "group": "nested_hk417_13", "prob": 40 }, - { "group": "nested_ar15_retool_300blk", "prob": 15 }, { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 }, - { "group": "nested_hk_usc45", "prob": 20 } + { "group": "nested_hk_usc45", "prob": 20 }, + { "group": "nested_savage112", "prob": 15 }, + { "group": "nested_mrad_smr", "prob": 6 }, + { "group": "nested_axmc", "prob": 6 }, + { "group": "nested_converted_axmc", "prob": 3 } ] }, { @@ -593,17 +625,23 @@ "charges": [ 0, 0 ] }, { "item": "iwi_tavor_x95_300blk", "prob": 15 }, - { "item": "ar15_retool_300blk", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "1895sbl", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "marlin_9a", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "mosin44", "variant": "mosin44", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "mosin91_30", "variant": "mosin91_30", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "browning_blr", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_pr", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "garand", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "carbine_flintlock", "prob": 1, "charges-min": 0, "charges-max": 0 }, { "item": "rifle_flintlock", "prob": 1, "charges-min": 0, "charges-max": 0 }, { "item": "win70", "prob": 10, "charges-min": 0, "charges-max": 0 }, - { "item": "m1carbine", "prob": 10, "charges-min": 0, "charges-max": 0 } + { "item": "mdrx", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "m1carbine", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "mrad_smr", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "axmc", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "group": "nested_ar15_with_kits", "prob": 15 }, + { "group": "nested_mdrx_with_kits", "prob": 10 }, + { "group": "nested_axmc_with_kits", "prob": 10 } ] }, { @@ -613,14 +651,20 @@ "//": "Empty civilian hunting rifles found within hunting supply stores and other related locations.", "items": [ { "item": "remington700_270", "prob": 30, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_m77", "prob": 25, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_arr", "prob": 25, "charges-min": 0, "charges-max": 0 }, { "item": "remington_700", "prob": 40, "charges-min": 0, "charges-max": 0 }, { "item": "ruger_1022", "prob": 50, "charges-min": 0, "charges-max": 0 }, + { "item": "ruger_pr", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "weatherby_5", "prob": 8, "charges-min": 0, "charges-max": 0 }, { "item": "savage_111f", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "savage112", "prob": 5, "charges-min": 0, "charges-max": 0 }, { "item": "1895sbl", "prob": 10, "charges-min": 0, "charges-max": 0 }, { "item": "browning_blr", "prob": 10, "charges-min": 0, "charges-max": 0 }, - { "item": "ar10", "prob": 10, "charges-min": 0, "charges-max": 0 } + { "item": "ar10", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "ar15_50", "prob": 10, "charges-min": 0, "charges-max": 0 }, + { "item": "ar15_450", "prob": 12, "charges-min": 0, "charges-max": 0 } ] }, { @@ -635,6 +679,7 @@ { "group": "nested_m134", "prob": 10 }, { "group": "nested_m14ebr", "prob": 10 }, { "group": "nested_tac50", "prob": 5 }, + { "group": "nested_tac338", "prob": 5 }, { "group": "nested_m2010", "prob": 20 }, { "group": "nested_m240", "prob": 15 }, { "group": "nested_m249", "prob": 25 }, @@ -713,10 +758,10 @@ { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 0 }, { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 0 }, { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 0 }, - { "item": "m4_carbine", "variant": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 0 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 45, "charges-min": 0, "charges-max": 0 }, { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "arx160", "prob": 10 }, - { "item": "m16_auto_rifle", "variant": "acr", "prob": 25, "charges-min": 0, "charges-max": 0 }, + { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "prob": 25, "charges-min": 0, "charges-max": 0 }, { "item": "fs2000", "prob": 6, "charges-min": 0, "charges-max": 0 }, { "item": "acr_300blk", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "hk417_13", "prob": 40, "charges-min": 0, "charges-max": 0 }, @@ -742,6 +787,7 @@ { "group": "nested_mossberg_500_security", "prob": 17 }, { "group": "nested_remington_870_express", "prob": 18 }, { "group": "nested_browning_a5", "prob": 14 }, + { "group": "nested_ithaca37", "prob": 6 }, { "group": "nested_remington_1100", "prob": 17 }, { "group": "nested_mossberg_930", "prob": 15 }, { "group": "nested_shotgun_410", "prob": 30 }, @@ -760,6 +806,7 @@ { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 6 }, { "item": "remington_870_express", "prob": 18, "charges-min": 0, "charges-max": 6 }, { "item": "remington_870", "variant": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 5 }, + { "item": "remington_870", "variant": "ithaca37", "prob": 6, "charges-min": 0, "charges-max": 5 }, { "item": "remington_870", "variant": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 5 }, { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 }, { "item": "shotgun_410", "prob": 30, "charges-min": 0, "charges-max": 1 }, @@ -778,6 +825,7 @@ { "item": "mossberg_500", "variant": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 0 }, { "item": "remington_870_express", "prob": 18, "charges-min": 0, "charges-max": 0 }, { "item": "remington_870", "variant": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 0 }, + { "item": "remington_870", "variant": "ithaca37", "prob": 6, "charges-min": 0, "charges-max": 0 }, { "item": "remington_870", "variant": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 0 }, { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 0 }, { "item": "shotgun_410", "prob": 30, "charges-min": 0, "charges-max": 0 }, @@ -1065,7 +1113,7 @@ "type": "item_group", "id": "longguns_cop", "items": [ - { "item": "ar15", "prob": 20, "charges": [ 0, 30 ], "contents-item": "shoulder_strap" }, + { "item": "modular_ar15", "prob": 20, "charges": [ 0, 30 ], "contents-item": "shoulder_strap" }, { "item": "mossberg_500", "prob": 10, "charges": [ 0, 6 ], "contents-item": "shoulder_strap" }, { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ], "contents-item": "shoulder_strap" }, { "item": "remington_870", "prob": 10, "charges": [ 0, 5 ], "contents-item": "shoulder_strap" } @@ -1088,7 +1136,10 @@ "//": "gun plus potential expended magazines", "items": [ { - "collection": [ { "item": "ar15", "prob": 100, "charges": [ 0, 30 ], "contents-item": "shoulder_strap" }, { "group": "field_ar15" } ], + "collection": [ + { "item": "modular_ar15", "prob": 100, "charges": [ 0, 30 ], "contents-item": "shoulder_strap" }, + { "group": "field_ar15" } + ], "prob": 20 }, { @@ -1190,7 +1241,7 @@ "items": [ { "collection": [ - { "item": "ar15", "prob": 100, "charges": [ 0, 30 ], "contents-item": "shoulder_strap_front" }, + { "item": "modular_ar15", "prob": 100, "charges": [ 0, 30 ], "contents-item": "shoulder_strap_front" }, { "group": "field_ar15" } ], "prob": 20 @@ -1200,7 +1251,7 @@ { "type": "item_group", "id": "longguns_operator", - "items": [ { "item": "ar15", "prob": 20, "charges": [ 0, 30 ], "contents-item": "shoulder_strap_front" } ] + "items": [ { "item": "modular_ar15", "prob": 20, "charges": [ 0, 30 ], "contents-item": "shoulder_strap_front" } ] }, { "type": "item_group", @@ -1275,8 +1326,9 @@ { "item": "hk_mp5k", "prob": 10, "charges-min": 0, "charges-max": 30 }, { "item": "hk_mp5sd", "prob": 5, "charges-min": 0, "charges-max": 30 }, { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 }, - { "item": "m4_carbine", "variant": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 }, { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 }, + { "item": "axmc", "prob": 10, "charges-min": 0, "charges-max": 10 }, { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 } ] }, @@ -1286,10 +1338,12 @@ "//": "Guns typically carried by survivors, either improvised or thematically appropriate.", "items": [ { "group": "guns_improvised", "prob": 50 }, - { "item": "ar15", "prob": 13, "charges-min": 0, "charges-max": 30 }, + { "item": "modular_ar15", "prob": 13, "charges-min": 0, "charges-max": 30 }, { "item": "ar_pistol", "prob": 2, "charges-min": 0, "charges-max": 30 }, { "item": "mossberg_500", "prob": 10, "charges-min": 0, "charges-max": 6 }, { "item": "remington_870", "prob": 11, "charges-min": 0, "charges-max": 5 }, + { "item": "remington_870", "variant": "ithaca37", "prob": 4, "charges-min": 0, "charges-max": 5 }, + { "item": "cz600", "prob": 5, "charges-min": 0, "charges-max": 10 }, { "item": "ruger_1022", "prob": 7, "charges-min": 0, "charges-max": 10 }, { "item": "shotgun_410", "prob": 1, "charges-min": 0, "charges-max": 1 }, { "item": "shotgun_s", "prob": 10 }, @@ -1298,7 +1352,12 @@ { "item": "aksemi", "prob": 2, "charges-min": 0, "charges-max": 30 }, { "item": "mosin44", "variant": "mosin44", "prob": 2, "charges-min": 0, "charges-max": 5 }, { "item": "remington700_270", "prob": 1, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_m77", "prob": 1, "charges-min": 0, "charges-max": 4 }, + { "item": "ruger_arr", "prob": 1, "charges-min": 0, "charges-max": 3 }, { "item": "remington_700", "prob": 4, "charges-min": 0, "charges-max": 4 }, + { "item": "bren2_762", "prob": 1, "charges-min": 0, "charges-max": 30 }, + { "item": "bren2_556", "prob": 2, "charges-min": 0, "charges-max": 30 }, + { "item": "mdrx", "prob": 2, "charges-min": 0, "charges-max": 30 }, { "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 }, { "item": "mk47", "prob": 1, "charges-min": 0, "charges-max": 30 }, { "item": "ak556", "prob": 2, "charges-min": 0, "charges-max": 30 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 28ccd17826e11..ded1ce18883ae 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -20,6 +20,8 @@ [ "hk46bigmag", 5 ], [ "m107a1mag", 50 ], [ "tac50mag", 20 ], + [ "ai_338mag", 10 ], + [ "ai_338mag_10", 10 ], [ "m2010mag", 10 ], [ "scarhmag", 50 ], [ "scarhbigmag", 20 ], @@ -111,6 +113,8 @@ { "item": "usp45mag", "prob": 10, "charges": [ 0, 12 ] }, { "item": "usp9mag", "prob": 10, "charges": [ 0, 15 ] }, { "item": "as50mag", "prob": 2, "charges": [ 0, 10 ] }, + { "item": "ai_338mag", "prob": 5, "charges": [ 0, 5 ] }, + { "item": "ai_338mag_10", "prob": 10, "charges": [ 0, 10 ] }, { "item": "hk417mag_20rd", "prob": 20, "charges": [ 0, 20 ] } ] }, @@ -324,6 +328,8 @@ "//": "Factory specification rifle magazines commonly owned by citizens.", "items": [ { "item": "blrmag", "prob": 5, "charges": [ 0, 4 ] }, + { "item": "ruger_pr_mag", "prob": 5, "charges": [ 0, 5 ] }, + { "item": "ruger_arr_mag", "prob": 12, "charges": [ 0, 3 ] }, { "item": "m14mag", "prob": 40, "charges": [ 0, 20 ] }, { "item": "m14smallmag", "prob": 40, "charges": [ 0, 5 ] }, [ "marlin_tubeloader", 5 ], @@ -343,7 +349,9 @@ { "item": "ar10mag_20rd", "prob": 30, "charges": [ 0, 20 ] }, { "item": "akmag30", "prob": 25, "charges": [ 0, 30 ] }, { "item": "zpap85mag", "prob": 25, "charges": [ 0, 30 ] }, - { "item": "papm77mag_10rd", "prob": 25, "charges": [ 0, 10 ] } + { "item": "papm77mag_10rd", "prob": 25, "charges": [ 0, 10 ] }, + { "item": "bren2_762mag30", "prob": 10, "charges": [ 0, 30 ] }, + { "item": "bren2_762mag10", "prob": 10, "charges": [ 0, 10 ] } ] }, { @@ -352,6 +360,8 @@ "//": "Factory specification rifle magazines commonly owned by citizens.", "items": [ { "item": "blrmag", "prob": 5 }, + { "item": "ruger_pr_mag", "prob": 5 }, + { "item": "ruger_arr_mag", "prob": 12 }, { "item": "m14mag", "prob": 40 }, { "item": "m14smallmag", "prob": 40 }, [ "marlin_tubeloader", 5 ], @@ -377,7 +387,9 @@ { "item": "m1carbinemag", "prob": 15 }, { "item": "zpap85mag", "prob": 5 }, { "item": "papm77mag_10rd", "prob": 5 }, - { "item": "papm77mag", "prob": 5 } + { "item": "papm77mag", "prob": 5 }, + { "item": "bren2_762mag30", "prob": 5 }, + { "item": "bren2_762mag10", "prob": 5 } ] }, { @@ -419,6 +431,10 @@ [ "usc10mag", 5 ], [ "usc15mag", 7 ], [ "usc20mag", 20 ], + [ "mrad_338lapua_mag", 5 ], + [ "ai_338mag", 15 ], + [ "ai_338mag_10", 10 ], + [ "ai_308mag_10", 15 ], [ "m1carbinebigmag", 30 ] ] }, @@ -430,7 +446,11 @@ { "item": "ruger1022mag", "prob": 40, "charges": [ 0, 0 ] }, { "item": "ruger1022bigmag", "prob": 30, "charges": [ 0, 0 ] }, { "item": "blrmag", "prob": 20, "charges": [ 0, 0 ] }, - { "item": "ar10mag_20rd", "prob": 30, "charges": [ 0, 0 ] } + { "item": "ruger_pr_mag", "prob": 20, "charges": [ 0, 0 ] }, + { "item": "ruger_arr_mag", "prob": 25, "charges": [ 0, 0 ] }, + { "item": "ar10mag_20rd", "prob": 30, "charges": [ 0, 0 ] }, + { "item": "50beowulf_ar15mag", "prob": 10, "charges": [ 0, 0 ] }, + { "item": "450_ar15mag", "prob": 10, "charges": [ 0, 0 ] } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json index bc21287d45710..c64b238629209 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json @@ -564,6 +564,59 @@ { "item": "20x66_slug", "prob": 30, "charges": [ 44, 80 ] } ] }, + { + "id": "on_hand_50beowulf", + "type": "item_group", + "//": "a collection of ammo that would be found with a loaded gun.", + "subtype": "distribution", + "entries": [ + { "item": "50beowulf_xtp", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "50beowulf_penetrator", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "50beowulf_xtp", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "50beowulf_penetrator", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "50beowulf_xtp", "prob": 30, "charges": [ 44, 80 ] }, + { "item": "50beowulf_penetrator", "prob": 30, "charges": [ 44, 80 ] } + ] + }, + { + "id": "on_hand_450", + "type": "item_group", + "//": "a collection of ammo that would be found with a loaded gun.", + "subtype": "distribution", + "entries": [ + { "item": "450_ftx", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "450_penetrator", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "450_ftx", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "450_penetrator", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "450_ftx", "prob": 30, "charges": [ 44, 80 ] }, + { "item": "450_penetrator", "prob": 30, "charges": [ 44, 80 ] } + ] + }, + { + "id": "on_hand_338lapua", + "type": "item_group", + "//": "a collection of ammo that would be found with a loaded gun.", + "subtype": "distribution", + "entries": [ + { "item": "338lapua_hpbt", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "338lapua_hpbt", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "338lapua_hpbt", "prob": 30, "charges": [ 44, 80 ] } + ] + }, + { + "id": "on_hand_military_338lapua", + "type": "item_group", + "//": "a collection of ammo that would be found with a loaded military gun.", + "subtype": "distribution", + "entries": [ + { "item": "338lapua_fmjbt", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "338lapua_api", "prob": 100, "charges": [ 1, 20 ] }, + { "item": "338lapua_fmjbt", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "338lapua_api", "prob": 75, "charges": [ 22, 40 ] }, + { "item": "338lapua_hpbt", "prob": 30, "charges": [ 44, 80 ] }, + { "item": "338lapua_api", "prob": 30, "charges": [ 44, 80 ] } + ] + }, { "id": "on_hand_303", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 07a65fee485a6..264e58d252473 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1273,7 +1273,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "garand", "charges-min": 0, "charges-max": 20 }, + { "item": "ar10", "charges-min": 0, "charges-max": 20 }, { "item": "ar10mag_20rd" }, { "item": "ar10mag_20rd", "prob": 50 }, { "group": "on_hand_308" } @@ -1286,7 +1286,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "ar15", "charges-min": 0, "charges-max": 30 }, + { "item": "modular_ar15", "charges-min": 0, "charges-max": 30 }, { "item": "stanag10" }, { "item": "stanag10", "prob": 50 }, { "group": "on_hand_223" } @@ -1455,7 +1455,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "m16_auto_rifle", "variant": "acr", "charges-min": 0, "charges-max": 30 }, + { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "charges-min": 0, "charges-max": 30 }, { "item": "stanag10" }, { "item": "stanag10", "prob": 50 }, { "group": "on_hand_223" } @@ -1565,7 +1565,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "charges-min": 0, "charges-max": 30 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "charges-min": 0, "charges-max": 30 }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 }, { "group": "on_hand_223" } @@ -1681,19 +1681,6 @@ { "group": "on_hand_308" } ] }, - { - "id": "nested_ar15_retool_300blk", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "subtype": "collection", - "ammo": 100, - "entries": [ - { "item": "ar15_retool_300blk", "charges-min": 0, "charges-max": 30 }, - { "item": "stanag30" }, - { "item": "stanag30", "prob": 50 }, - { "group": "on_hand_300BLK" } - ] - }, { "id": "nested_iwi_tavor_x95_300blk", "type": "item_group", @@ -1714,7 +1701,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "m27_assault_rifle", "variant": "h&k416a5", "charges-min": 0, "charges-max": 30 }, + { "item": "modular_m27_assault_rifle", "variant": "modular_h&k416a5", "charges-min": 0, "charges-max": 30 }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 }, { "group": "on_hand_223" } @@ -1727,7 +1714,7 @@ "subtype": "collection", "ammo": 100, "entries": [ - { "item": "m27_assault_rifle", "variant": "m27iar", "charges-min": 0, "charges-max": 30 }, + { "item": "modular_m27_assault_rifle", "variant": "modular_m27iar", "charges-min": 0, "charges-max": 30 }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 }, { "group": "on_hand_223" } @@ -2430,6 +2417,158 @@ { "group": "on_hand_308" } ] }, + { + "id": "nested_ruger_m77", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ { "item": "ruger_m77", "charges-min": 0, "charges-max": 4 }, { "group": "on_hand_3006" } ] + }, + { + "id": "nested_ruger_pr", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "ruger_pr", "charges-min": 0, "charges-max": 5 }, + { "item": "ruger_pr_mag" }, + { "item": "ruger_pr_mag", "prob": 50 }, + { "group": "on_hand_300" } + ] + }, + { + "id": "nested_bren2_762", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "bren2_762", "variant": "bren2_762", "charges-min": 0, "charges-max": 30 }, + { "item": "bren2_762mag30" }, + { "item": "bren2_762mag30", "prob": 50 }, + { "group": "on_hand_762" } + ] + }, + { + "id": "nested_805_bren", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "bren2_762", "variant": "805_bren", "charges-min": 0, "charges-max": 30 }, + { "item": "bren2_762mag30" }, + { "item": "bren2_762mag30", "prob": 50 }, + { "group": "on_hand_762" } + ] + }, + { + "id": "nested_bren2_556", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "bren2_556", "variant": "bren2_556", "charges-min": 0, "charges-max": 30 }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_mdrx", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "mdrx", "charges-min": 0, "charges-max": 30 }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_tac338", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "tac338", "charges-min": 0, "charges-max": 5 }, + { "item": "ai_338mag" }, + { "item": "ai_338mag", "prob": 50 }, + { "group": "on_hand_military_338lapua" } + ] + }, + { + "id": "nested_savage112", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "savage112", "charges-min": 0, "charges-max": 1, "contents-item": [ "rifle_scope" ] }, + { "group": "on_hand_338lapua" } + ] + }, + { + "id": "nested_mrad_smr", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "mrad_smr", "charges-min": 0, "charges-max": 10 }, + { "item": "mrad_338lapua_mag" }, + { "item": "mrad_338lapua_mag", "prob": 50 }, + { "group": "on_hand_338lapua" } + ] + }, + { + "id": "nested_axmc", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "axmc", "charges-min": 0, "charges-max": 10 }, + { "item": "ai_338mag_10" }, + { "item": "ai_338mag_10", "prob": 50 }, + { "group": "on_hand_338lapua" } + ] + }, + { + "id": "nested_ithaca37", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ { "item": "remington_870", "variant": "ithaca37", "charges-min": 0, "charges-max": 5 }, { "group": "on_hand_shot" } ] + }, + { + "id": "nested_cz600", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "cz600", "charges-min": 0, "charges-max": 10 }, + { "item": "stanag10" }, + { "item": "stanag10", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_ruger_arr", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "ruger_arr", "charges-min": 0, "charges-max": 3 }, + { "item": "ruger_arr_mag" }, + { "item": "ruger_arr_mag", "prob": 50 }, + { "group": "on_hand_450" } + ] + }, { "id": "nested_mk3", "type": "item_group", diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json index fdb046a195ad0..80fa91a4ac122 100644 --- a/data/json/itemgroups/defense_mode.json +++ b/data/json/itemgroups/defense_mode.json @@ -35,7 +35,7 @@ { "item": "remington_870" }, { "item": "browning_blr" }, { "item": "ak47" }, - { "item": "m4_carbine", "variant": "m4a1" }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1" }, { "item": "savage_111f" }, { "item": "hk_g3" }, { "item": "hk_g80" }, diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index b0e2431f22815..45e1ec42bfda0 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -4,16 +4,16 @@ "id": "military_standard_assault_rifles", "subtype": "distribution", "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "prob": 88, "charges": [ 0, 30 ] }, - { "item": "m27_assault_rifle", "variant": "m27iar", "prob": 10, "charges": [ 0, 30 ] }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 88, "charges": [ 0, 30 ] }, + { "item": "modular_m27_assault_rifle", "variant": "modular_m27iar", "prob": 10, "charges": [ 0, 30 ] }, { - "item": "m27_assault_rifle", - "variant": "m38dmr", + "item": "modular_m27_assault_rifle", + "variant": "modular_m38dmr", "contents-group": "m38dmr_mods", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "m16a4", "prob": 2, "charges": [ 0, 30 ] } + { "item": "modular_m16a4", "prob": 2, "charges": [ 0, 30 ] } ] }, { @@ -21,22 +21,28 @@ "id": "military_standard_assault_rifles_sighted", "subtype": "distribution", "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "prob": 88, "charges": [ 0, 30 ], "contents-item": "acog_scope" }, { - "item": "m27_assault_rifle", - "variant": "m27iar", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", + "prob": 88, + "charges": [ 0, 30 ], + "contents-item": "acog_scope" + }, + { + "item": "modular_m27_assault_rifle", + "variant": "modular_m27iar", "prob": 10, "charges": [ 0, 30 ], "contents-item": "acog_scope" }, - { "item": "m16a4", "prob": 2, "charges": [ 0, 30 ], "contents-item": "acog_scope" } + { "item": "modular_m16a4", "prob": 2, "charges": [ 0, 30 ], "contents-item": "acog_scope" } ] }, { "type": "item_group", "id": "military_grenadier_assault_rifles", "subtype": "distribution", - "entries": [ { "item": "m4_carbine", "contents-group": "military_grenadier_mods", "prob": 100, "charges": [ 0, 30 ] } ] + "entries": [ { "item": "modular_m4_carbine", "contents-group": "military_grenadier_mods", "prob": 100, "charges": [ 0, 30 ] } ] }, { "id": "armor_plates", @@ -636,15 +642,15 @@ { "item": "20x66_flechette", "prob": 3 }, { "item": "m9", "variant": "m9", "prob": 6 }, { "item": "usp_45", "prob": 6 }, - { "item": "m4_carbine", "variant": "m4a1", "prob": 7 }, - { "item": "m4_carbine", "variant": "m4_cqbr", "prob": 1 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 7 }, + { "item": "m4_cqbr", "prob": 1 }, { "item": "m231pfw", "prob": 1 }, - { "item": "m16a4", "prob": 5 }, - { "item": "m16_auto_rifle", "variant": "m16a3", "prob": 1 }, + { "item": "modular_m16a4", "prob": 5 }, + { "item": "modular_m16_auto_rifle", "variant": "modular_m16a3", "prob": 1 }, { "item": "colt_ro635", "prob": 1 }, { "item": "p226_9mm", "prob": 1 }, { "item": "sp2022", "prob": 1 }, - { "item": "m27_assault_rifle", "variant": "h&k416a5", "prob": 7 }, + { "item": "modular_m27_assault_rifle", "variant": "modular_h&k416a5", "prob": 7 }, { "item": "mossberg_930", "variant": "m1014", "prob": 2 }, { "item": "m26_mass_standalone", "prob": 1 }, { "item": "scar_l", "prob": 6 }, @@ -652,8 +658,8 @@ { "item": "sig_mcx_rattler_sbr", "prob": 1 }, { "item": "m249", "prob": 1 }, { "item": "m240", "prob": 1 }, - { "item": "m27_assault_rifle", "variant": "m27iar", "prob": 1 }, - { "item": "m27_assault_rifle", "variant": "m38dmr", "contents-group": "m38dmr_mods", "prob": 1 }, + { "item": "modular_m27_assault_rifle", "variant": "modular_m27iar", "prob": 1 }, + { "item": "modular_m27_assault_rifle", "variant": "modular_m38dmr", "contents-group": "m38dmr_mods", "prob": 1 }, { "item": "plasma_gun", "prob": 1 }, { "item": "m320", "prob": 5 }, { "item": "m320_mod", "prob": 10 }, @@ -851,8 +857,13 @@ { "item": "rm451_flamethrower", "prob": 10, "charges": [ 0, 2000 ] }, { "item": "m249", "prob": 30, "charges": [ 0, 30 ] }, { "item": "m240", "prob": 20, "charges": [ 0, 200 ] }, - { "item": "m27_assault_rifle", "variant": "m27iar", "prob": 30, "charges": [ 0, 30 ] }, - { "item": "m27_assault_rifle", "variant": "m38dmr", "contents-group": "m38dmr_mods", "charges": [ 0, 30 ] }, + { "item": "modular_m27_assault_rifle", "variant": "modular_m27iar", "prob": 30, "charges": [ 0, 30 ] }, + { + "item": "modular_m27_assault_rifle", + "variant": "modular_m38dmr", + "contents-group": "m38dmr_mods", + "charges": [ 0, 30 ] + }, { "item": "m2browning", "prob": 15, "charges": [ 0, 100 ] }, { "item": "mark19", "prob": 15, "charges": [ 0, 50 ] }, { "item": "556", "prob": 30, "charges": [ 1, 30 ] }, @@ -893,7 +904,10 @@ { "item": "20x66_frag", "prob": 2, "charges": [ 1, 5 ] }, { "item": "20x66_flare", "prob": 4, "charges": [ 1, 10 ] }, { "item": "20x66_inc", "prob": 2, "charges": [ 1, 10 ] }, - { "item": "bt_apc9k", "prob": 1, "charges": [ 0, 15 ] } + { "item": "bt_apc9k", "prob": 1, "charges": [ 0, 15 ] }, + { "item": "tac338", "prob": 8, "charges": [ 0, 5 ] }, + { "item": "338lapua_fmjbt", "prob": 12, "charges": [ 1, 25 ] }, + { "item": "338lapua_api", "prob": 4, "charges": [ 1, 10 ] } ] }, { diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json index 41f83e46acc01..1af688e514c3a 100644 --- a/data/json/items/ammo/223.json +++ b/data/json/items/ammo/223.json @@ -18,7 +18,50 @@ "ammo_type": "223", "casing": "223_casing", "range": 36, - "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 }, + "damage": { + "damage_type": "bullet", + "amount": 39, + "armor_penetration": 2, + "barrels": [ + { "barrel_length": "28 mm", "amount": 13 }, + { "barrel_length": "30 mm", "amount": 14 }, + { "barrel_length": "35 mm", "amount": 15 }, + { "barrel_length": "39 mm", "amount": 16 }, + { "barrel_length": "43 mm", "amount": 17 }, + { "barrel_length": "47 mm", "amount": 18 }, + { "barrel_length": "52 mm", "amount": 19 }, + { "barrel_length": "57 mm", "amount": 20 }, + { "barrel_length": "65 mm", "amount": 21 }, + { "barrel_length": "71 mm", "amount": 22 }, + { "barrel_length": "77 mm", "amount": 23 }, + { "barrel_length": "84 mm", "amount": 24 }, + { "barrel_length": "92 mm", "amount": 25 }, + { "barrel_length": "101 mm", "amount": 26 }, + { "barrel_length": "110 mm", "amount": 27 }, + { "barrel_length": "120 mm", "amount": 28 }, + { "barrel_length": "131 mm", "amount": 29 }, + { "barrel_length": "144 mm", "amount": 30 }, + { "barrel_length": "157 mm", "amount": 31 }, + { "barrel_length": "172 mm", "amount": 32 }, + { "barrel_length": "189 mm", "amount": 33 }, + { "barrel_length": "208 mm", "amount": 34 }, + { "barrel_length": "229 mm", "amount": 35 }, + { "barrel_length": "252 mm", "amount": 36 }, + { "barrel_length": "288 mm", "amount": 37 }, + { "barrel_length": "319 mm", "amount": 38 }, + { "barrel_length": "354 mm", "amount": 39 }, + { "barrel_length": "395 mm", "amount": 40 }, + { "barrel_length": "441 mm", "amount": 41 }, + { "barrel_length": "494 mm", "amount": 42 }, + { "barrel_length": "557 mm", "amount": 43 }, + { "barrel_length": "629 mm", "amount": 44 }, + { "barrel_length": "715 mm", "amount": 45 }, + { "barrel_length": "816 mm", "amount": 46 }, + { "barrel_length": "937 mm", "amount": 47 }, + { "barrel_length": "1105 mm", "amount": 48 }, + { "barrel_length": "1232 mm", "amount": 49 } + ] + }, "dispersion": 30, "recoil": 1500, "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json index 74bb17cd6f35b..27effc0d29892 100644 --- a/data/json/items/ammo/300.json +++ b/data/json/items/ammo/300.json @@ -18,7 +18,62 @@ "ammo_type": "300", "casing": "300_casing", "range": 65, - "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 }, + "damage": { + "damage_type": "bullet", + "amount": 59, + "armor_penetration": 8, + "barrels": [ + { "barrel_length": "27 mm", "amount": 17 }, + { "barrel_length": "30 mm", "amount": 18 }, + { "barrel_length": "33 mm", "amount": 19 }, + { "barrel_length": "37 mm", "amount": 21 }, + { "barrel_length": "41 mm", "amount": 22 }, + { "barrel_length": "45 mm", "amount": 24 }, + { "barrel_length": "50 mm", "amount": 25 }, + { "barrel_length": "54 mm", "amount": 26 }, + { "barrel_length": "56 mm", "amount": 27 }, + { "barrel_length": "61 mm", "amount": 28 }, + { "barrel_length": "66 mm", "amount": 30 }, + { "barrel_length": "71 mm", "amount": 31 }, + { "barrel_length": "77 mm", "amount": 32 }, + { "barrel_length": "83 mm", "amount": 34 }, + { "barrel_length": "89 mm", "amount": 35 }, + { "barrel_length": "96 mm", "amount": 37 }, + { "barrel_length": "103 mm", "amount": 38 }, + { "barrel_length": "110 mm", "amount": 39 }, + { "barrel_length": "118 mm", "amount": 41 }, + { "barrel_length": "126 mm", "amount": 42 }, + { "barrel_length": "135 mm", "amount": 43 }, + { "barrel_length": "145 mm", "amount": 45 }, + { "barrel_length": "155 mm", "amount": 46 }, + { "barrel_length": "166 mm", "amount": 47 }, + { "barrel_length": "177 mm", "amount": 49 }, + { "barrel_length": "190 mm", "amount": 50 }, + { "barrel_length": "203 mm", "amount": 51 }, + { "barrel_length": "218 mm", "amount": 53 }, + { "barrel_length": "233 mm", "amount": 54 }, + { "barrel_length": "250 mm", "amount": 55 }, + { "barrel_length": "269 mm", "amount": 57 }, + { "barrel_length": "289 mm", "amount": 58 }, + { "barrel_length": "310 mm", "amount": 59 }, + { "barrel_length": "334 mm", "amount": 61 }, + { "barrel_length": "360 mm", "amount": 62 }, + { "barrel_length": "388 mm", "amount": 63 }, + { "barrel_length": "419 mm", "amount": 65 }, + { "barrel_length": "453 mm", "amount": 66 }, + { "barrel_length": "490 mm", "amount": 68 }, + { "barrel_length": "532 mm", "amount": 69 }, + { "barrel_length": "578 mm", "amount": 70 }, + { "barrel_length": "629 mm", "amount": 72 }, + { "barrel_length": "687 mm", "amount": 73 }, + { "barrel_length": "751 mm", "amount": 74 }, + { "barrel_length": "823 mm", "amount": 76 }, + { "barrel_length": "905 mm", "amount": 77 }, + { "barrel_length": "998 mm", "amount": 78 }, + { "barrel_length": "1169 mm", "amount": 80 }, + { "barrel_length": "1217 mm", "amount": 81 } + ] + }, "dispersion": 15, "recoil": 5300, "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index 07923b9a5a490..ea095ed405ee4 100644 --- a/data/json/items/ammo/3006.json +++ b/data/json/items/ammo/3006.json @@ -18,7 +18,60 @@ "ammo_type": "3006", "casing": "3006_casing", "range": 61, - "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 10 }, + "damage": { + "damage_type": "bullet", + "amount": 49, + "armor_penetration": 10, + "barrels": [ + { "barrel_length": "27 mm", "amount": 14 }, + { "barrel_length": "30 mm", "amount": 15 }, + { "barrel_length": "32 mm", "amount": 16 }, + { "barrel_length": "35 mm", "amount": 17 }, + { "barrel_length": "41 mm", "amount": 18 }, + { "barrel_length": "44 mm", "amount": 19 }, + { "barrel_length": "48 mm", "amount": 20 }, + { "barrel_length": "52 mm", "amount": 21 }, + { "barrel_length": "55 mm", "amount": 22 }, + { "barrel_length": "60 mm", "amount": 23 }, + { "barrel_length": "64 mm", "amount": 24 }, + { "barrel_length": "69 mm", "amount": 25 }, + { "barrel_length": "73 mm", "amount": 26 }, + { "barrel_length": "78 mm", "amount": 27 }, + { "barrel_length": "84 mm", "amount": 28 }, + { "barrel_length": "89 mm", "amount": 29 }, + { "barrel_length": "95 mm", "amount": 30 }, + { "barrel_length": "101 mm", "amount": 31 }, + { "barrel_length": "107 mm", "amount": 32 }, + { "barrel_length": "114 mm", "amount": 33 }, + { "barrel_length": "121 mm", "amount": 34 }, + { "barrel_length": "129 mm", "amount": 35 }, + { "barrel_length": "137 mm", "amount": 36 }, + { "barrel_length": "145 mm", "amount": 37 }, + { "barrel_length": "154 mm", "amount": 38 }, + { "barrel_length": "164 mm", "amount": 39 }, + { "barrel_length": "174 mm", "amount": 40 }, + { "barrel_length": "184 mm", "amount": 41 }, + { "barrel_length": "196 mm", "amount": 42 }, + { "barrel_length": "208 mm", "amount": 43 }, + { "barrel_length": "221 mm", "amount": 44 }, + { "barrel_length": "235 mm", "amount": 45 }, + { "barrel_length": "250 mm", "amount": 46 }, + { "barrel_length": "266 mm", "amount": 47 }, + { "barrel_length": "283 mm", "amount": 48 }, + { "barrel_length": "301 mm", "amount": 49 }, + { "barrel_length": "321 mm", "amount": 50 }, + { "barrel_length": "342 mm", "amount": 51 }, + { "barrel_length": "365 mm", "amount": 52 }, + { "barrel_length": "390 mm", "amount": 53 }, + { "barrel_length": "417 mm", "amount": 54 }, + { "barrel_length": "447 mm", "amount": 55 }, + { "barrel_length": "479 mm", "amount": 56 }, + { "barrel_length": "513 mm", "amount": 57 }, + { "barrel_length": "551 mm", "amount": 58 }, + { "barrel_length": "593 mm", "amount": 59 }, + { "barrel_length": "639 mm", "amount": 60 } + ] + }, "dispersion": 20, "recoil": 3800, "effects": [ "COOKOFF" ] @@ -71,7 +124,7 @@ }, { "id": "bp_3006fmj", - "copy-from": "3006fmj", + "copy-from": "bp_3006", "type": "AMMO", "name": { "str_sp": ".30-06 Springfield M2 AP, black powder" }, "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet. It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.", diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json index d7c79e67e9044..6aa933e61f3f8 100644 --- a/data/json/items/ammo/300blk.json +++ b/data/json/items/ammo/300blk.json @@ -18,7 +18,42 @@ "ammo_type": "300blk", "casing": "300blk_casing", "range": 45, - "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 5 }, + "damage": { + "damage_type": "bullet", + "amount": 40, + "armor_penetration": 5, + "barrels": [ + { "barrel_length": "27 mm", "amount": 17 }, + { "barrel_length": "30 mm", "amount": 18 }, + { "barrel_length": "32 mm", "amount": 19 }, + { "barrel_length": "36 mm", "amount": 20 }, + { "barrel_length": "40 mm", "amount": 21 }, + { "barrel_length": "43 mm", "amount": 22 }, + { "barrel_length": "49 mm", "amount": 23 }, + { "barrel_length": "52 mm", "amount": 24 }, + { "barrel_length": "58 mm", "amount": 25 }, + { "barrel_length": "65 mm", "amount": 26 }, + { "barrel_length": "71 mm", "amount": 27 }, + { "barrel_length": "79 mm", "amount": 28 }, + { "barrel_length": "89 mm", "amount": 29 }, + { "barrel_length": "96 mm", "amount": 30 }, + { "barrel_length": "108 mm", "amount": 31 }, + { "barrel_length": "121 mm", "amount": 32 }, + { "barrel_length": "132 mm", "amount": 33 }, + { "barrel_length": "149 mm", "amount": 34 }, + { "barrel_length": "170 mm", "amount": 35 }, + { "barrel_length": "186 mm", "amount": 36 }, + { "barrel_length": "212 mm", "amount": 37 }, + { "barrel_length": "233 mm", "amount": 38 }, + { "barrel_length": "269 mm", "amount": 39 }, + { "barrel_length": "312 mm", "amount": 40 }, + { "barrel_length": "346 mm", "amount": 41 }, + { "barrel_length": "406 mm", "amount": 42 }, + { "barrel_length": "481 mm", "amount": 43 }, + { "barrel_length": "541 mm", "amount": 44 }, + { "barrel_length": "650 mm", "amount": 45 } + ] + }, "dispersion": 30, "recoil": 2000, "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json index fa4e6b37271f7..565153d351f48 100644 --- a/data/json/items/ammo/308.json +++ b/data/json/items/ammo/308.json @@ -18,7 +18,56 @@ "ammo_type": "308", "casing": "308_casing", "range": 65, - "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 2 }, + "damage": { + "damage_type": "bullet", + "amount": 54, + "armor_penetration": 2, + "barrels": [ + { "barrel_length": "26 mm", "amount": 19 }, + { "barrel_length": "29 mm", "amount": 20 }, + { "barrel_length": "30 mm", "amount": 21 }, + { "barrel_length": "33 mm", "amount": 22 }, + { "barrel_length": "36 mm", "amount": 23 }, + { "barrel_length": "39 mm", "amount": 24 }, + { "barrel_length": "43 mm", "amount": 26 }, + { "barrel_length": "47 mm", "amount": 27 }, + { "barrel_length": "51 mm", "amount": 28 }, + { "barrel_length": "56 mm", "amount": 29 }, + { "barrel_length": "60 mm", "amount": 31 }, + { "barrel_length": "65 mm", "amount": 32 }, + { "barrel_length": "71 mm", "amount": 33 }, + { "barrel_length": "77 mm", "amount": 34 }, + { "barrel_length": "83 mm", "amount": 36 }, + { "barrel_length": "90 mm", "amount": 37 }, + { "barrel_length": "98 mm", "amount": 38 }, + { "barrel_length": "106 mm", "amount": 39 }, + { "barrel_length": "115 mm", "amount": 40 }, + { "barrel_length": "124 mm", "amount": 42 }, + { "barrel_length": "135 mm", "amount": 43 }, + { "barrel_length": "146 mm", "amount": 44 }, + { "barrel_length": "159 mm", "amount": 45 }, + { "barrel_length": "173 mm", "amount": 47 }, + { "barrel_length": "188 mm", "amount": 48 }, + { "barrel_length": "205 mm", "amount": 49 }, + { "barrel_length": "223 mm", "amount": 50 }, + { "barrel_length": "244 mm", "amount": 52 }, + { "barrel_length": "267 mm", "amount": 53 }, + { "barrel_length": "293 mm", "amount": 54 }, + { "barrel_length": "322 mm", "amount": 55 }, + { "barrel_length": "354 mm", "amount": 57 }, + { "barrel_length": "391 mm", "amount": 58 }, + { "barrel_length": "432 mm", "amount": 59 }, + { "barrel_length": "480 mm", "amount": 60 }, + { "barrel_length": "534 mm", "amount": 62 }, + { "barrel_length": "596 mm", "amount": 63 }, + { "barrel_length": "668 mm", "amount": 64 }, + { "barrel_length": "752 mm", "amount": 65 }, + { "barrel_length": "850 mm", "amount": 67 }, + { "barrel_length": "966 mm", "amount": 68 }, + { "barrel_length": "1156 mm", "amount": 69 }, + { "barrel_length": "1230 mm", "amount": 70 } + ] + }, "dispersion": 15, "recoil": 3000, "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/338lapua.json b/data/json/items/ammo/338lapua.json new file mode 100644 index 0000000000000..0773064dee3d8 --- /dev/null +++ b/data/json/items/ammo/338lapua.json @@ -0,0 +1,117 @@ +[ + { + "id": "338lapua_hpbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua HPBT" }, + "description": ".338 Lapua ammunition, loaded with a 300-grain hollow-point boat-tailed bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. With burgeoning interest amongst military, law enforcement, and civilian circles before the Cataclysm, the .338 cartridge filled the gap between lighter infantry munitions and anti-material rounds, although its potential utility as a hunting cartridge was somewhat diminished due to its high cost.", + "weight": "47 g", + "volume": "327 ml", + "longest_side": "94 mm", + "price": 685, + "price_postapoc": 900, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "material": [ "brass", "powder" ], + "symbol": "=", + "color": "yellow", + "count": 20, + "stack_size": 20, + "ammo_type": "338lapua", + "casing": "338lapua_casing", + "range": 125, + "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 20 }, + "dispersion": 5, + "recoil": 5300, + "effects": [ "COOKOFF", "NEVER_MISFIRES" ] + }, + { + "id": "338lapua_fmjbt", + "copy-from": "338lapua_hpbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua AP485" }, + "description": ".338 Lapua ammunition, loaded with a 248-grain armor-piercing bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a highly penetrative full-metal jacketed bullet, which comes at the cost of negligible expansion once the round thunders into, and likely straight through the target.", + "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } } + }, + { + "id": "338lapua_api", + "copy-from": "338lapua_fmjbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua API526" }, + "description": ".338 Lapua ammunition, loaded with a 256-grain armor-piercing incendiary bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a tungsten carbide penetrator as well as an extra dose of nastiness in the form of an incendiary loading, which serves to highlight the point of impact and possibly set flammable materials alight.", + "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }, + "extend": { "effects": [ "INCENDIARY" ] } + }, + { + "id": "bp_338lapua_hpbt", + "copy-from": "338lapua_hpbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua HPBT, black powder" }, + "description": ".338 Lapua ammunition, loaded with a 300-grain hollow-point boat-tailed bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. With burgeoning interest amongst military, law enforcement, and civilian circles before the Cataclysm, the .338 cartridge filled the gap between lighter infantry munitions and anti-material rounds, although its potential utility as a hunting cartridge was somewhat diminished due to its high cost. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocities, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_338lapua_fmjbt", + "copy-from": "338lapua_fmjbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua AP485, black powder" }, + "description": ".338 Lapua ammunition, loaded with a 248-grain armor-piercing bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a highly penetrative full-metal jacketed bullet, which comes at the cost of negligible expansion once the round thunders into, and likely straight through, the target. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocities, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_338lapua_api", + "copy-from": "338lapua_api", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua API526, black powder" }, + "description": ".338 Lapua ammunition, loaded with a 256-grain armor-piercing incendiary bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a tungsten carbide penetrator as well as an extra dose of nastiness in the form of an incendiary loading, which serves to highlight the point of impact and possibly set flammable materials alight. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocities, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] } + }, + { + "id": "reloaded_338lapua_hpbt", + "copy-from": "338lapua_hpbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua HPBT, reloaded" }, + "description": ".338 Lapua ammunition, loaded with a 300-grain hollow-point boat-tailed bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. With burgeoning interest amongst military, law enforcement, and civilian circles before the Cataclysm, the .338 cartridge filled the gap between lighter infantry munitions and anti-material rounds, although its potential utility as a hunting cartridge was somewhat diminished due to its high cost. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_338lapua_fmjbt", + "copy-from": "338lapua_fmjbt", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua AP485, reloaded" }, + "description": ".338 Lapua ammunition, loaded with a 248-grain armor-piercing bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a highly penetrative full-metal jacketed bullet, which comes at the cost of negligible expansion once the round thunders into, and likely straight through, the target. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_338lapua_api", + "copy-from": "338lapua_api", + "type": "AMMO", + "name": { "str_sp": ".338 Lapua API526, reloaded" }, + "description": ".338 Lapua ammunition, loaded with a 256-grain armor-piercing incendiary bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a tungsten carbide penetrator as well as an extra dose of nastiness in the form of an incendiary loading, which serves to highlight the point of impact and possibly set flammable materials alight. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + } +] diff --git a/data/json/items/ammo/450bushmaster.json b/data/json/items/ammo/450bushmaster.json new file mode 100644 index 0000000000000..9ac4b6a49d058 --- /dev/null +++ b/data/json/items/ammo/450bushmaster.json @@ -0,0 +1,129 @@ +[ + { + "id": "450_ftx", + "type": "AMMO", + "name": { "str_sp": ".450 Bushmaster FTX" }, + "description": ".450 Bushmaster ammunition, loaded with a plastic-capped 250-grain Flex Tip bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge possesses a plastic-tipped projectile, which acts as an improved hollow point bullet with uniform and devastating expansion within wound cavities.", + "weight": "16 g", + "volume": "145 ml", + "longest_side": "58 mm", + "price": 241, + "price_postapoc": 500, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "material": [ "brass", "powder" ], + "symbol": "=", + "color": "yellow", + "count": 20, + "stack_size": 20, + "ammo_type": "450", + "casing": "450_casing", + "range": 23, + "damage": { + "damage_type": "bullet", + "amount": 56, + "armor_penetration": 7, + "barrels": [ + { "barrel_length": "26 mm", "amount": 22 }, + { "barrel_length": "28 mm", "amount": 23 }, + { "barrel_length": "30 mm", "amount": 24 }, + { "barrel_length": "32 mm", "amount": 25 }, + { "barrel_length": "35 mm", "amount": 26 }, + { "barrel_length": "37 mm", "amount": 27 }, + { "barrel_length": "40 mm", "amount": 28 }, + { "barrel_length": "43 mm", "amount": 29 }, + { "barrel_length": "46 mm", "amount": 30 }, + { "barrel_length": "49 mm", "amount": 31 }, + { "barrel_length": "53 mm", "amount": 32 }, + { "barrel_length": "56 mm", "amount": 33 }, + { "barrel_length": "61 mm", "amount": 34 }, + { "barrel_length": "65 mm", "amount": 35 }, + { "barrel_length": "68 mm", "amount": 36 }, + { "barrel_length": "74 mm", "amount": 37 }, + { "barrel_length": "78 mm", "amount": 38 }, + { "barrel_length": "85 mm", "amount": 39 }, + { "barrel_length": "90 mm", "amount": 40 }, + { "barrel_length": "98 mm", "amount": 41 }, + { "barrel_length": "104 mm", "amount": 42 }, + { "barrel_length": "113 mm", "amount": 43 }, + { "barrel_length": "120 mm", "amount": 44 }, + { "barrel_length": "131 mm", "amount": 45 }, + { "barrel_length": "139 mm", "amount": 46 }, + { "barrel_length": "152 mm", "amount": 47 }, + { "barrel_length": "162 mm", "amount": 48 }, + { "barrel_length": "178 mm", "amount": 49 }, + { "barrel_length": "190 mm", "amount": 50 }, + { "barrel_length": "203 mm", "amount": 51 }, + { "barrel_length": "224 mm", "amount": 52 }, + { "barrel_length": "240 mm", "amount": 53 }, + { "barrel_length": "266 mm", "amount": 54 }, + { "barrel_length": "286 mm", "amount": 55 }, + { "barrel_length": "319 mm", "amount": 56 }, + { "barrel_length": "344 mm", "amount": 57 } + ] + }, + "dispersion": 25, + "recoil": 2500, + "effects": [ "COOKOFF", "NEVER_MISFIRES" ] + }, + { + "id": "450_penetrator", + "copy-from": "450_ftx", + "type": "AMMO", + "name": { "str_sp": ".450 Bushmaster Xtreme Hunter" }, + "description": ".450 Bushmaster ammunition, loaded with a solid-copper 220-grain penetrator bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge is loaded with a solid-copper projectile: excellent at punching through thick barriers and delivering massive amounts of energy to anything unfortunate enough to be hit.", + "price": 529, + "price_postapoc": 650, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 6, "armor_penetration": 7 }, "recoil": 300 } + }, + { + "id": "bp_450_ftx", + "copy-from": "450_ftx", + "type": "AMMO", + "name": { "str_sp": ".450 Bushmaster FTX, black powder" }, + "description": ".450 Bushmaster ammunition, loaded with a plastic-capped 250-grain Flex Tip bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge possesses a plastic-tipped projectile, which acts as an improved hollow point bullet with uniform and devastating expansion within wound cavities. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_450_penetrator", + "copy-from": "450_penetrator", + "type": "AMMO", + "name": { "str_sp": ".450 Bushmaster Xtreme Hunter, black powder" }, + "description": ".450 Bushmaster ammunition, loaded with a solid-copper 220-grain penetrator bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge is loaded with a solid-copper projectile: excellent at punching through thick barriers and delivering massive amounts of energy to anything unfortunate enough to be hit. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_450_ftx", + "copy-from": "450_ftx", + "type": "AMMO", + "name": { "str_sp": ".450 Bushmaster FTX, reloaded" }, + "description": ".450 Bushmaster ammunition, loaded with a plastic-capped 250-grain Flex Tip bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge possesses a plastic-tipped projectile, which acts as an improved hollow point bullet with uniform and devastating expansion within wound cavities. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_450_penetrator", + "copy-from": "50beowulf_penetrator", + "type": "AMMO", + "name": { "str_sp": ".450 Xtreme Hunter, reloaded" }, + "description": ".450 Bushmaster ammunition, loaded with a solid-copper 220-grain penetrator bullet. Born from discontent with the .223 Remington’s weak stopping potential, the .450 Bushmaster round was crafted in line with the so-called 'Thumper' concept: an envisioned need for a large-bore, semi-automatic sporting cartridge capable of downing game in one shot. Along with its elder sibling, the .50-caliber Beowulf cartridge, the .450 Bushmaster is one of a number of such high-caliber rounds and is compatible with appropriately converted AR-15-platform rifles. This particular cartridge is loaded with a solid-copper projectile: excellent at punching through thick barriers and delivering massive amounts of energy to anything unfortunate enough to be hit. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + } +] diff --git a/data/json/items/ammo/50_beowulf.json b/data/json/items/ammo/50_beowulf.json new file mode 100644 index 0000000000000..fb2077223283b --- /dev/null +++ b/data/json/items/ammo/50_beowulf.json @@ -0,0 +1,147 @@ +[ + { + "id": "50beowulf_xtp", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf XTP" }, + "description": ".50-caliber Beowulf ammunition, loaded with a copper-jacketed 350-grain eXtreme Terminal Performance bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a hunting round before the Cataclysm. This particular version of the cartridge is coated in a layer of polymer, encouraging commendable terminal ballistics, penetrative capabilities, and overall expansion from its 12.7x42mm projectile.", + "weight": "22 g", + "volume": "231 ml", + "longest_side": "54 mm", + "price": 224, + "price_postapoc": 500, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "material": [ "brass", "powder" ], + "symbol": "=", + "color": "yellow", + "count": 20, + "stack_size": 20, + "ammo_type": "50beowulf", + "casing": "50beowulf_casing", + "range": 23, + "damage": { + "damage_type": "bullet", + "amount": 54, + "armor_penetration": 8, + "barrels": [ + { "barrel_length": "28 mm", "amount": 19 }, + { "barrel_length": "30 mm", "amount": 20 }, + { "barrel_length": "33 mm", "amount": 21 }, + { "barrel_length": "36 mm", "amount": 22 }, + { "barrel_length": "38 mm", "amount": 23 }, + { "barrel_length": "43 mm", "amount": 24 }, + { "barrel_length": "45 mm", "amount": 25 }, + { "barrel_length": "47 mm", "amount": 26 }, + { "barrel_length": "52 mm", "amount": 27 }, + { "barrel_length": "55 mm", "amount": 28 }, + { "barrel_length": "61 mm", "amount": 29 }, + { "barrel_length": "64 mm", "amount": 30 }, + { "barrel_length": "67 mm", "amount": 31 }, + { "barrel_length": "73 mm", "amount": 32 }, + { "barrel_length": "77 mm", "amount": 33 }, + { "barrel_length": "85 mm", "amount": 34 }, + { "barrel_length": "89 mm", "amount": 35 }, + { "barrel_length": "93 mm", "amount": 36 }, + { "barrel_length": "102 mm", "amount": 37 }, + { "barrel_length": "107 mm", "amount": 38 }, + { "barrel_length": "117 mm", "amount": 39 }, + { "barrel_length": "123 mm", "amount": 40 }, + { "barrel_length": "129 mm", "amount": 41 }, + { "barrel_length": "142 mm", "amount": 42 }, + { "barrel_length": "148 mm", "amount": 43 }, + { "barrel_length": "156 mm", "amount": 44 }, + { "barrel_length": "171 mm", "amount": 45 }, + { "barrel_length": "180 mm", "amount": 46 }, + { "barrel_length": "198 mm", "amount": 47 }, + { "barrel_length": "208 mm", "amount": 48 }, + { "barrel_length": "218 mm", "amount": 49 }, + { "barrel_length": "241 mm", "amount": 50 }, + { "barrel_length": "253 mm", "amount": 51 }, + { "barrel_length": "280 mm", "amount": 52 }, + { "barrel_length": "295 mm", "amount": 53 }, + { "barrel_length": "311 mm", "amount": 54 }, + { "barrel_length": "345 mm", "amount": 55 }, + { "barrel_length": "364 mm", "amount": 56 }, + { "barrel_length": "405 mm", "amount": 57 }, + { "barrel_length": "428 mm", "amount": 58 }, + { "barrel_length": "452 mm", "amount": 59 }, + { "barrel_length": "506 mm", "amount": 60 }, + { "barrel_length": "536 mm", "amount": 61 }, + { "barrel_length": "568 mm", "amount": 62 }, + { "barrel_length": "640 mm", "amount": 63 }, + { "barrel_length": "679 mm", "amount": 64 }, + { "barrel_length": "768 mm", "amount": 65 }, + { "barrel_length": "818 mm", "amount": 66 }, + { "barrel_length": "872 mm", "amount": 67 }, + { "barrel_length": "993 mm", "amount": 68 }, + { "barrel_length": "1062 mm", "amount": 69 }, + { "barrel_length": "1217 mm", "amount": 70 }, + { "barrel_length": "1231 mm", "amount": 71 } + ] + }, + "dispersion": 25, + "recoil": 2500, + "effects": [ "COOKOFF", "NEVER_MISFIRES" ] + }, + { + "id": "50beowulf_penetrator", + "copy-from": "50beowulf_xtp", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf Xtreme Penetrator" }, + "description": ".50-caliber Beowulf ammunition, loaded with a solid-copper 420-grain Xtreme Penetrator bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a hunting round before the Cataclysm. With a blunt nose construction for better initial energy transfer, this 12.7mm-wide bullet’s solid copper design allows it to punch through entry barriers while resulting in a larger wound column.", + "weight": "26 g", + "price": 439, + "price_postapoc": 650, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 7 }, "recoil": 300 } + }, + { + "id": "bp_50beowulf_xtp", + "copy-from": "50beowulf_xtp", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf XTP, black powder" }, + "description": ".50-caliber Beowulf ammunition, loaded with a copper-jacketed 350-grain eXtreme Terminal Performance bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a sporting round before the Cataclysm. This particular version of the cartridge is coated in a layer of polymer, encouraging commendable terminal ballistics, penetrative capabilities, and overall expansion from its 12.7x42mm projectile. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_50beowulf_penetrator", + "copy-from": "50beowulf_penetrator", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf Xtreme Penetrator, black powder" }, + "description": ".50-caliber Beowulf ammunition, loaded with a solid-copper 420-grain Xtreme Penetrator bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a hunting round before the Cataclysm. With a blunt nose construction for better initial energy transfer, its 12.7mm-wide bullet’s solid copper design allows it to punch through entry barriers while resulting in a larger wound column. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder: expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 }, + "recoil": 0.7, + "dispersion": 1.2 + }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_50beowulf_xtp", + "copy-from": "50beowulf_xtp", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf XTP, reloaded" }, + "description": ".50-caliber Beowulf ammunition, loaded with a copper-jacketed 350-grain eXtreme Terminal Performance bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a hunting round before the Cataclysm. This particular version of the cartridge is coated in a layer of polymer, encouraging commendable terminal ballistics, penetrative capabilities, and overall expansion from its 12.7x42mm projectile. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_50beowulf_penetrator", + "copy-from": "50beowulf_penetrator", + "type": "AMMO", + "name": { "str_sp": ".50 Beowulf Xtreme Penetrator, reloaded" }, + "description": ".50-caliber Beowulf ammunition, loaded with a solid-copper 420-grain Xtreme Penetrator bullet. Developed in 2001 as a powerful short- to medium-range chambering for AR-15 style rifles, this stout cartridge had gained some popularity as a hunting round before the Cataclysm. With a blunt nose construction for better initial energy transfer, its 12.7mm-wide bullet’s solid copper design allows it to punch through entry barriers while resulting in a larger wound column. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + } +] diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json index 4a79fd330fb02..1faa536107967 100644 --- a/data/json/items/ammo/762.json +++ b/data/json/items/ammo/762.json @@ -18,7 +18,38 @@ "ammo_type": "762", "casing": "762_casing", "range": 30, - "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 8 }, + "damage": { + "damage_type": "bullet", + "amount": 44, + "armor_penetration": 8, + "barrels": [ + { "barrel_length": "29 mm", "amount": 16 }, + { "barrel_length": "34 mm", "amount": 18 }, + { "barrel_length": "39 mm", "amount": 19 }, + { "barrel_length": "46 mm", "amount": 21 }, + { "barrel_length": "52 mm", "amount": 22 }, + { "barrel_length": "57 mm", "amount": 23 }, + { "barrel_length": "64 mm", "amount": 25 }, + { "barrel_length": "71 mm", "amount": 26 }, + { "barrel_length": "79 mm", "amount": 27 }, + { "barrel_length": "87 mm", "amount": 28 }, + { "barrel_length": "97 mm", "amount": 29 }, + { "barrel_length": "107 mm", "amount": 30 }, + { "barrel_length": "119 mm", "amount": 31 }, + { "barrel_length": "132 mm", "amount": 32 }, + { "barrel_length": "146 mm", "amount": 34 }, + { "barrel_length": "162 mm", "amount": 35 }, + { "barrel_length": "181 mm", "amount": 36 }, + { "barrel_length": "201 mm", "amount": 37 }, + { "barrel_length": "224 mm", "amount": 38 }, + { "barrel_length": "250 mm", "amount": 39 }, + { "barrel_length": "280 mm", "amount": 40 }, + { "barrel_length": "313 mm", "amount": 42 }, + { "barrel_length": "352 mm", "amount": 43 }, + { "barrel_length": "396 mm", "amount": 44 }, + { "barrel_length": "474 mm", "amount": 45 } + ] + }, "dispersion": 35, "recoil": 2036, "effects": [ "COOKOFF", "NEVER_MISFIRES" ] diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json index 6fc5560876e06..7c4c61900d638 100644 --- a/data/json/items/ammo/8x40mm.json +++ b/data/json/items/ammo/8x40mm.json @@ -27,7 +27,7 @@ "stack_size": 40, "ammo_type": "8x40mm", "range": 42, - "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 }, + "damage": { "damage_type": "bullet", "amount": 46, "armor_penetration": 18 }, "dispersion": 75, "recoil": 2200, "effects": [ "NEVER_MISFIRES" ] diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index b73ba31f3d079..144cb08c21489 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -6,6 +6,7 @@ "name": { "str": "12.3ln round" }, "description": "In some alternate universe, the 12.3ln cartridge was introduced in Romania in the wake of the second Carpathian conflict. The PA md. 71 rifle using this ammunition rapidly gained popularity in the Eastern Union, and from there, the world. Due to this, the 12.3ln rapidly became the standard combat round in the Eurasian sphere, making it easy for the Exodii to stockpile it in large quantities when they visited that version of Earth. It looks and feels quite similar to a .30-06 Springfield cartridge, but with a slightly sharper taper.", "ammo_type": "123ln", + "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 10 }, "casing": "123ln_casing" }, { diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index 260de55bd4005..937cb4a62135e 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -23,6 +23,24 @@ "name": ".45-70", "default": "4570_sp" }, + { + "type": "ammunition_type", + "id": "50beowulf", + "name": "12.7x42mm", + "default": "50beowulf_xtp" + }, + { + "type": "ammunition_type", + "id": "450", + "name": ".450 Bushmaster", + "default": "450_ftx" + }, + { + "type": "ammunition_type", + "id": "338lapua", + "name": ".338 Lapua", + "default": "338lapua_hpbt" + }, { "type": "ammunition_type", "id": "nail", diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index cab372df58a88..c8e8fd3d18cdc 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -44,6 +44,9 @@ "545x39": 60, "223": 60, "3006": 60, + "50beowulf": 60, + "450": 60, + "338lapua": 60, "303": 60, "270win": 60, "308": 60, @@ -132,6 +135,21 @@ "type": "ARMOR", "name": { "str_sp": "chest rig" }, "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines in its pouches.", + "variant_type": "generic", + "variants": [ + { + "id": "generic_chestrig", + "name": { "str_sp": "chest rig" }, + "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines in its pouches.", + "weight": 30 + }, + { + "id": "flag_chestrig", + "name": { "str_sp": "patriot’s chest rig" }, + "description": "An American flag is proudly embroidered across the front of each pouch, with a tiny, eagle-winged .50-caliber bullet crowning each banner.", + "append": true + } + ], "weight": "425 g", "volume": "500 ml", "price": 3900, diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index 139cd44fb3322..7980ee79edf76 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -73,6 +73,9 @@ "762R": 16, "8x40mm": 16, "4570": 16, + "50beowulf": 16, + "450": 16, + "338lapua": 16, "50": 16, "700nx": 16 }, @@ -197,6 +200,9 @@ "762R": 4, "8x40mm": 4, "4570": 4, + "50beowulf": 4, + "450": 4, + "338lapua": 4, "50": 4, "700nx": 4 }, diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json index 78149b3cac8f8..2fcfd6d3e8c80 100644 --- a/data/json/items/armor/hats.json +++ b/data/json/items/armor/hats.json @@ -165,6 +165,21 @@ "type": "ARMOR", "name": { "str": "cowboy hat" }, "description": "Whether yer hunting varmints, fixing up the ranch, or heading into the sunset, this is the hat for the job.", + "variant_type": "generic", + "variants": [ + { + "id": "generic_cowboy_hat", + "name": { "str": "cowboy hat" }, + "description": "Whether yer hunting varmints, fixing up the ranch, or heading into the sunset, this is the hat for the job.", + "weight": 30 + }, + { + "id": "flag_cowboy_hat", + "name": { "str_sp": "American cowboy hat" }, + "description": "This hat has traded its original classic looks for a red, white, and blue pattern with a band of golden stars embossed about its lip; suitable headwear for only the most serious of patriots.", + "append": true + } + ], "weight": "390 g", "volume": "2 L", "price": 9500, diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index fd8ee57c801b5..a640445432a22 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -1375,6 +1375,12 @@ "description": "A jet-black bag that can be worn on the thighs and hips using adjustable buckled straps, with skulls and spikes all over it. Perfect for a rider of the apocalypse.", "symbol": "S", "weight": 2 + }, + { + "id": "flag_leg_bag", + "name": { "str": "founders' leg bag" }, + "description": "A garishly colored red, white, and blue bag that can be worn on the thighs and hips using adjustable buckled straps, with the stylized depiction of George Washington’s face gazing sternly from the side. Perfect for carrying the dreams of the founding fathers wherever you go.", + "weight": 50 } ] }, diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json index 5046f7dd7d766..faa5e9393e7e8 100644 --- a/data/json/items/armor/undergarment.json +++ b/data/json/items/armor/undergarment.json @@ -202,6 +202,21 @@ "type": "ARMOR", "name": { "str_sp": "boxer shorts" }, "description": "Men's boxer shorts. More fashionable than briefs and just as comfortable.", + "variant_type": "generic", + "variants": [ + { + "id": "generic_boxer_shorts", + "name": { "str_sp": "boxer shorts" }, + "description": "Men's boxer shorts. More fashionable than briefs and just as comfortable.", + "weight": 30 + }, + { + "id": "flag_boxer_shorts", + "name": { "str_sp": "star-spangled boxer shorts" }, + "description": "This pair has been printed with the pattern of an American flag, with stars and miniature eagles embroidered at strategic positions.", + "append": true + } + ], "weight": "42 g", "volume": "250 ml", "price": 1000, @@ -243,6 +258,21 @@ "type": "ARMOR", "name": { "str_sp": "boy shorts" }, "description": "Female underwear similar to men's boxer shorts, but much more close-fitting.", + "variant_type": "generic", + "variants": [ + { + "id": "generic_boy_shorts", + "name": { "str_sp": "boy shorts" }, + "description": "Female underwear similar to men's boxer shorts, but much more close-fitting.", + "weight": 30 + }, + { + "id": "flag_boy_shorts", + "name": { "str_sp": "star-spangled boy shorts" }, + "description": "This pair has been printed with the pattern of an American flag, with stars and miniature eagles embroidered at strategic positions.", + "append": true + } + ], "weight": "42 g", "volume": "250 ml", "price": 1000, diff --git a/data/json/items/book/rifle.json b/data/json/items/book/rifle.json index adfc5eeb835b7..96ece9aba07e6 100644 --- a/data/json/items/book/rifle.json +++ b/data/json/items/book/rifle.json @@ -15,13 +15,13 @@ { "id": "mag_rifle_1", "name": { "str": "American Rifleman", "str_pl": "issues of American Rifleman" }, - "description": "A monthly shooting and firearms publication, with lot of articles and comments.", + "description": "A monthly shooting and firearms publication, with a lot of articles and comments.", "weight": 1 }, { "id": "mag_rifle_2", "name": { "str": "Shooting Stars", "str_pl": "issues of Shooting Stars" }, - "description": "Annual magazine for marksmen, with lots of articles and papers, as well as reviews of new rifles, optics, and mods.", + "description": "An annual magazine for marksmen, with lots of articles and papers, as well as reviews of new rifles, optics, and mods.", "weight": 1 }, { @@ -71,14 +71,14 @@ "str": "Precision Rifle Marksmanship: The Fundamentals", "str_pl": "copies of Precision Rifle Marksmanship: The Fundamentals" }, - "description": "A small book about using the rifle as a marksman tool. There is plenty of info, but it is too general, and the author talks more about his experience as a sniper instead of sniping itself.", + "description": "A small book about the use of a rifle as a marksman's tool. There is plenty of information, but it is too general, and the author talks more about his experience as a sniper than sniping itself.", "//": "978-1951115104", "weight": 1 }, { "id": "manual_rifle_3", "name": { "str": "Precision Long Range Shooting And Hunting", "str_pl": "copies of Precision Long Range Shooting And Hunting" }, - "description": "The basics of long-range shooting in fairly simple language.", + "description": "A book about the basics of long-range shooting, written in fairly simple language.", "//": "978-1979598699", "weight": 1 }, @@ -92,14 +92,14 @@ { "id": "manual_rifle_5", "name": { "str": "How to Shoot", "str_pl": "copies of How to Shoot" }, - "description": "Reprint of a 1917 book about rifle shooting and maintenance. It is surprisingly detailed, and contains lots of information, even if the language is fairly old-fashioned.", + "description": "A reprint of a 1917 book about rifle shooting and maintenance. It is surprisingly detailed, and contains lots of information, even if the language is fairly old-fashioned.", "//": "978-0267853731", "weight": 1 }, { "id": "manual_rifle_6", "name": { "str": "Rifle Shooting for Beginners", "str_pl": "copies of Rifle Shooting for Beginners" }, - "description": "A guide to shooting sports that explains the basics of equipment usage, judging distance, aiming, breathing, movement, and trigger discipline alongside a lot of another essential info.", + "description": "A guide to shooting sports that explains the basics of equipment usage, judging distance, aiming, breathing, movement, and trigger discipline alongside a lot of other essential info.", "//": "979-8355590895", "weight": 1 }, @@ -109,7 +109,7 @@ "str": "Great Hunting Rifles: Victorian to the Present", "str_pl": "copies of Great Hunting Rifles: Victorian to the Present" }, - "description": "A history of some of the most exquisite rifles made in the twentieth century, with lots of love and details.", + "description": "A history of some of the most exquisite rifles made in the twentieth century, written with a lot of love and attention to detail.", "//": "978-1510731691", "weight": 1 }, @@ -119,7 +119,7 @@ "str": "FM 3-22.9: Rifle Marksmanship M16-/M4- Series", "str_pl": "copies of FM 3-22.9: Rifle Marksmanship M16-/M4- Series" }, - "description": "Official U.S. Army manual which provides guidance for training with the 5.56-millimeter M16-series rifle and M4 carbine.", + "description": "An official U.S. Army manual that provides guidance for the planning and execution of training with the 5.56mm M16-series rifle and M4 carbine.", "weight": 1 }, { @@ -134,7 +134,7 @@ { "id": "manual_gun_10", "name": { "str": "Adaptive Rifle", "str_pl": "copies of Adaptive Rifle" }, - "description": "Different training methods for carbine users from world champion shooters, aimed toward civilians, law enforcement, and military shooters.", + "description": "A book containing different training methods for carbine users from world champion shooters, aimed toward civilians, law enforcement, and military shooters.", "//": "979-8360280453", "weight": 1 }, @@ -155,7 +155,7 @@ { "id": "manual_gun_13", "name": { "str": "The Gun", "str_pl": "copies of The Gun" }, - "description": "A giant, 500 page history of the AK-47 - the most popular firearm in the world - and the information around it: the mechanic of the weapon, the usage, maintenance, modification, and its impact on global conflict.", + "description": "A giant, 500-page history about the AK-47—the most popular firearm in the world—and the information around it: the mechanics of the weapon, its usage, maintenance, modifications, and its impact on global conflicts.", "//": "978-0743270762", "weight": 1 } @@ -172,5 +172,24 @@ "max_level": 3, "intelligence": 4, "time": "18 m" + }, + { + "id": "retool_instructions", + "type": "BOOK", + "category": "manuals", + "name": { "str": "retool instructions", "str_pl": "copies of retool instructions" }, + "description": "This is a small booklet, containing several diagrams and clearly worded instructions for assisting one in assembling, installing, and using their newly purchased weapon conversion kit. The flyer’s rear is covered in neatly printed rows of advertisements, displaying other products by the same manufacturer. All in all, it, strangely enough, brings to mind nostalgic images of the instructions for assembling Legos—a very angry, explosive Lego construct that goes boom.", + "weight": "25 g", + "volume": "100 ml", + "price": 150, + "price_postapoc": 350, + "material": [ "paper" ], + "symbol": "?", + "looks_like": "mag_guns", + "color": "pink", + "skill": "rifle", + "max_level": 1, + "intelligence": 5, + "time": "8 m" } ] diff --git a/data/json/items/containers/conversions.json b/data/json/items/containers/conversions.json new file mode 100644 index 0000000000000..bc8ec020b87eb --- /dev/null +++ b/data/json/items/containers/conversions.json @@ -0,0 +1,132 @@ +[ + { + "id": "box_retool_huge", + "type": "GENERIC", + "category": "container", + "looks_like": "box_small", + "name": { "str": "marksmen’s conversion kit" }, + "description": "This is an expansive cardboard box, stamped with manufacturer markings and emblazoned with the stylized image of an assembled high-caliber rifle. Containing appropriate retool components for a larger than typical given weapon platform, including big-bore upper receiver assemblies, quick-swap sniper barrels, and assorted extras (such as magazines), its contents could be used to rechamber a compatible rifle.", + "weight": "600 g", + "volume": "11360 ml", + "longest_side": "71 cm", + "price": 15, + "price_postapoc": 15, + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "//": "External dimensions, (10x16x71)", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "7728 ml", + "max_contains_weight": "35 kg", + "max_item_length": "69 cm" + } + ] + }, + { + "id": "box_retool_large", + "type": "GENERIC", + "category": "container", + "looks_like": "box_small", + "name": { "str": "large rifle conversion kit" }, + "description": "This is a large cardboard box, stamped with manufacturer markings and emblazoned with the stylized image of a large, assembled rifle. Containing appropriate retool components for a given weapon platform, including high-caliber upper receiver assemblies, quick-swap marksman barrels, and assorted extras (such as magazines), its contents could be used to rechamber a compatible rifle.", + "weight": "500 g", + "volume": "8960 ml", + "longest_side": "56 cm", + "price": 15, + "price_postapoc": 15, + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "//": "External dimensions, (10x16x56)", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "6272 ml", + "max_contains_weight": "30 kg", + "max_item_length": "54 cm" + } + ] + }, + { + "id": "box_retool", + "type": "GENERIC", + "category": "container", + "name": { "str": "standard rifle conversion kit" }, + "looks_like": "box_small", + "description": "This is a sturdy cardboard box, stamped with manufacturer markings and emblazoned with the stylized image of an assembled rifle.  Containing appropriate retool components for an average weapon platform, including upper receiver assemblies, swappable barrels, and assorted extras (such as magazines), its contents could be used to rechamber a compatible rifle.", + "weight": "400 g", + "volume": "6880 ml", + "longest_side": "43 cm", + "price": 15, + "price_postapoc": 15, + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "//": "External dimensions, (10x16x43)", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "4592 ml", + "max_contains_weight": "25 kg", + "max_item_length": "41 cm" + } + ] + }, + { + "id": "box_retool_sbr", + "type": "GENERIC", + "category": "container", + "name": { "str": "SBR conversion kit" }, + "looks_like": "box_small", + "description": "This is a modestly proportioned cardboard box, stamped with manufacturer markings and emblazoned with the stylized image of an assembled, short-barreled rifle. Containing appropriate retool components for a given weapon platform, including compact upper receiver assemblies, short quick-swap barrels, and assorted extras (such as magazines), its contents could be used to rechamber a compatible rifle.", + "weight": "350 g", + "volume": "5920 ml", + "longest_side": "37 cm", + "price": 15, + "price_postapoc": 15, + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "//": "External dimensions, (10x16x37)", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "3920 ml", + "max_contains_weight": "20 kg", + "max_item_length": "35 cm" + } + ] + }, + { + "id": "box_retool_sbr_micro", + "type": "GENERIC", + "category": "container", + "name": { "str": "micro-carbine conversion kit" }, + "looks_like": "box_small", + "description": "This is a relatively small cardboard box, stamped with manufacturer markings and emblazoned with the stylized image of an assembled, extremely compact carbine. Containing appropriate retool components for a given weapon platform, including adorably small upper receiver assemblies, pistol-length swappable barrels, and assorted extras (such as magazines), its contents could be used to rechamber a compatible rifle.", + "weight": "280 g", + "volume": "4320 ml", + "longest_side": "27 cm", + "price": 15, + "price_postapoc": 15, + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "//": "External dimensions, (10x16x27)", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "2800 ml", + "max_contains_weight": "15 kg", + "max_item_length": "25 cm" + } + ] + } +] diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index a45d27b9edae0..095dfe0df4ea1 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -305,6 +305,26 @@ "weight": "4 g", "volume": "10ml" }, + { + "id": "50beowulf_casing", + "copy-from": "casing", + "looks_like": "223_casing", + "type": "GENERIC", + "name": { "str": ".50 Beowulf casing" }, + "description": "An empty casing from a .50 Beowulf round.", + "weight": "4 g", + "volume": "10ml" + }, + { + "id": "450_casing", + "copy-from": "casing", + "looks_like": "223_casing", + "type": "GENERIC", + "name": { "str": ".450 Bushmaster casing" }, + "description": "An empty casing from a .450 Bushmaster round.", + "weight": "4 g", + "volume": "10ml" + }, { "id": "46mm_casing", "copy-from": "casing", @@ -345,6 +365,16 @@ "weight": "18 g", "volume": "12ml" }, + { + "id": "338lapua_casing", + "copy-from": "casing", + "looks_like": "223_casing", + "type": "GENERIC", + "name": { "str": ".338 Lapua casing" }, + "description": "An empty casing from a .338 Lapua round. These are rare, so you might want to hold onto them.", + "weight": "18 g", + "volume": "12ml" + }, { "id": "545_casing", "copy-from": "casing", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 380f2ba3d1f3e..28448810b6ee0 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -1,24 +1,37 @@ [ { - "id": "ar15", - "copy-from": "rifle_semi", + "id": "modular_ar15", "type": "GUN", "name": { "str": "AR-15" }, "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles", "description": "This ubiquitous rifle is the forefather of the M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi-automatic civilian version.", - "weight": "3170 g", - "volume": "3100 ml", - "longest_side": "930 mm", + "weight": "902 g", + "volume": "1550 ml", + "longest_side": "520 mm", + "//2": "Numbers for weight, volume, and length calculations are based upon an AR-15’s complete lower receiver. The difference will be made up for with integrated stats from the installable modular upper receivers.", "price": 125000, "price_postapoc": 4000, "to_hit": -1, - "material": [ "steel", "plastic" ], + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], "symbol": "(", - "color": "dark_gray", - "ammo": [ "223" ], + "color": "black", + "ammo": [ "NULL" ], "dispersion": 150, "durability": 7, + "default_mods": [ "retool_ar15_223rem" ], "min_cycle_recoil": 1350, + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//3": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", @@ -40,6 +53,16 @@ "stanag100", "stanag100drum", "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", "survivor223mag" ] } @@ -56,6 +79,7 @@ "weight": "2267 g", "volume": "1758 ml", "longest_side": "584 mm", + "barrel_length": "191 mm", "price": 91400, "price_postapoc": 3500, "to_hit": -2, @@ -65,7 +89,6 @@ "ammo": [ "223" ], "skill": "pistol", "range": -6, - "ranged_damage": { "damage_type": "bullet", "amount": -9 }, "dispersion": 380, "durability": 6, "min_cycle_recoil": 1350, @@ -119,6 +142,7 @@ "weight": "3610 g", "volume": "3429 ml", "longest_side": "759 mm", + "barrel_length": "488 mm", "price": 2800000, "price_postapoc": 2500, "to_hit": -1, @@ -126,7 +150,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "223" ], - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 180, "durability": 8, "min_cycle_recoil": 1350, @@ -157,6 +180,7 @@ "weight": "3319 g", "volume": "7986 ml", "longest_side": "740 mm", + "barrel_length": "442 mm", "price": 125000, "price_postapoc": 2000, "to_hit": -1, @@ -164,7 +188,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "223" ], - "ranged_damage": { "damage_type": "stab", "amount": -2 }, "dispersion": 150, "durability": 9, "min_cycle_recoil": 1350, @@ -183,47 +206,59 @@ }, { "//": "Groups all 'H&K416' related rifles together. Used M27 due to it being the most popular of the three in the US.", - "id": "m27_assault_rifle", - "copy-from": "rifle_auto", + "id": "modular_m27_assault_rifle", "looks_like": "ar15", "type": "GUN", "name": { "str": "M27 assault rifle" }, "description": "Designed to replace the M4 Carbine, the M27 assault rifle features most of the former's strengths, while being considerably more durable. It is chambered in 5.56x45mm and accepts STANAG magazines.", - "weight": "3490 g", - "volume": "4957 ml", - "longest_side": "798 mm", + "weight": "1222 g", + "volume": "3407 ml", + "longest_side": "388 mm", + "//2": "Numbers for weight, volume, and length calculations are based upon an AR-15’s complete lower receiver. The difference will be made up for with integrated stats from the installable modular upper receivers.", "price": 540000, "price_postapoc": 2250, "variant_type": "gun", "variants": [ { - "id": "h&k416a5", + "id": "modular_h&k416a5", "name": { "str": "H&K416 A5" }, "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable." }, { - "id": "m27iar", + "id": "modular_m27iar", "name": { "str": "M27 IAR" }, "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", "ascii_picture": "m27_iar", "weight": 1 }, { - "id": "m38dmr", + "id": "modular_m38dmr", "name": { "str": "M38 DMR" }, "description": "The M38 Designated Marksman Rifle is an M27 IAR, itself derived from a H&K416, selected for accuracy, and outfitted with a variable power scope and a QDSS suppressor." } ], "to_hit": -1, - "material": [ "steel", "plastic" ], + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": [ "223" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, + "ammo": [ "NULL" ], "dispersion": 180, "durability": 8, "min_cycle_recoil": 1350, + "default_mods": [ "retool_ar15_223rem" ], "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//3": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", @@ -245,20 +280,69 @@ "stanag100", "stanag100drum", "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", "survivor223mag" ] } - ], - "melee_damage": { "bash": 12 } + ] }, { "id": "scar_l", - "copy-from": "m27_assault_rifle", "type": "GUN", "name": { "str": "FN SCAR-L" }, "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.", "ascii_picture": "scar-L", - "default_mods": [ "high_end_folding_stock" ] + "weight": "3490 g", + "volume": "4957 ml", + "longest_side": "798 mm", + "barrel_length": "355 mm", + "price": 540000, + "price_postapoc": 2250, + "to_hit": -1, + "skill": "rifle", + "symbol": "(", + "color": "dark_gray", + "ammo": [ "223" ], + "dispersion": 180, + "durability": 8, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "default_mods": [ "high_end_folding_stock" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } }, { "id": "hk_g36", @@ -270,6 +354,7 @@ "weight": "3630 g", "volume": "4640 ml", "longest_side": "1004 mm", + "barrel_length": "480 mm", "price": 210000, "price_postapoc": 6000, "variant_type": "gun", @@ -304,6 +389,7 @@ "weight": "7500 g", "volume": "10610 ml", "longest_side": "1035 mm", + "barrel_length": "533 mm", "price": 750000, "price_postapoc": 8000, "to_hit": -1, @@ -367,43 +453,130 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ] ] }, { - "id": "m4_carbine", - "copy-from": "rifle_auto", + "id": "modular_m4_carbine", "looks_like": "ar15", "type": "GUN", "name": { "str": "M4 carbine" }, "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained. It is chambered in 5.56x45mm and accepts STANAG magazines.", - "ascii_picture": "m4a1", - "weight": "2880 g", - "volume": "3310 ml", - "longest_side": "758 mm", + "ascii_picture": "modular_m4a1", + "weight": "880 g", + "volume": "1760 ml", + "longest_side": "470 mm", + "//": "The volume, weight, and overall length of an average AR-15’s complete upper receiver module have been deducted and will be made up for by the installable upper assemblies.", "price": 240000, "price_postapoc": 5000, "variant_type": "gun", "variants": [ { - "id": "m4a1", + "id": "modular_m4a1", "name": { "str": "M4A1" }, "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.", - "ascii_picture": "m4a1", + "ascii_picture": "modular_m4a1", "weight": 1 - }, + } + ], + "to_hit": -1, + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "NULL" ], + "dispersion": 180, + "durability": 6, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "default_mods": [ "retool_ar15_223rem_medium" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "id": "m4_cqbr", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "special duty carbine" }, + "description": "A rugged military carbine that has been outfitted with various accessories, such as an adjustable buttstock, suppressor, and shortened barrel, to improve its close-quarter battle effectiveness. Most commonly deployed with special forces units and marines before the Cataclysm, its handy size lends itself well to room clearing and fighting within tight spaces.", + "weight": "1316 g", + "volume": "1650 ml", + "longest_side": "486 mm", + "//": "The volume, weight, and overall length of an average AR-15’s complete upper receiver module have been deducted and will be made up for by the installable upper assemblies.", + "price": 240000, + "price_postapoc": 5000, + "variant_type": "gun", + "variants": [ { "id": "m4_cqbr", "name": { "str": "Mk 18 CQBR" }, - "description": "This is a shorter M4 carbine with a 10.3 inch barrel, intended for confined spaces and close quarters battle situations." + "description": "This is a shorter M4 carbine with a 10.3 inch barrel, intended for confined spaces and close quarters battle situations.", + "weight": 1 } ], "to_hit": -1, - "material": [ "steel", "plastic" ], + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": [ "223" ], - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, + "ammo": [ "NULL" ], "dispersion": 180, "durability": 6, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "default_mods": [ "pistol_grip", "retool_ar15_223rem_short", "suppressor", "adjustable_stock" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", @@ -425,6 +598,16 @@ "stanag100", "stanag100drum", "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", "survivor223mag" ] } @@ -432,35 +615,48 @@ "melee_damage": { "bash": 12 } }, { - "id": "m16a4", - "copy-from": "rifle_semi", + "id": "modular_m16a4", "looks_like": "ar15", "type": "GUN", "name": { "str": "M16 burst rifle" }, "description": "The M16 is a common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It fires in three round bursts, ensuring the rifle is more accurate, but at the cost of being slower than other assault rifles. It is chambered in 5.56x45mm rounds, and accepts STANAG magazines.", - "weight": "3260 g", - "volume": "5030 ml", - "longest_side": "1003 mm", + "weight": "992 g", + "volume": "3480 ml", + "longest_side": "495 mm", + "//": "The volume, weight, and overall length of an average AR-15’s complete upper receiver module with a 20-inch barrel have been deducted and will be made up for by the installable upper assemblies.", "price": 240000, "price_postapoc": 5000, "variant_type": "gun", "variants": [ { - "id": "m16a4", + "id": "modular_m16a4", "name": { "str": "M16A4" }, "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil.", "weight": 1 } ], "to_hit": -1, - "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": [ "223" ], + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], + "ammo": [ "NULL" ], + "default_mods": [ "retool_ar15_223rem_extended" ], "dispersion": 150, "durability": 7, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", @@ -482,6 +678,16 @@ "stanag100", "stanag100drum", "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", "survivor223mag" ] } @@ -490,36 +696,38 @@ }, { "//": "Figured having 'm16' in the name would make it more understandable, seeing as I named 2 of the .223 rifle groups/names after it. ACR is grouped with it due to similar length.", - "id": "m16_auto_rifle", - "copy-from": "m16a4", + "id": "modular_m16_auto_rifle", + "copy-from": "modular_m16a4", "type": "GUN", "name": { "str": "M16 auto rifle" }, "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. Unlike its more common brother, the M16 burst rifle, this one has full-auto capabilities. It is chambered in 5.56x45mm and accepts STANAG magazines.", "variant_type": "gun", "variants": [ { - "id": "m16a3", + "id": "modular_m16a3", "name": { "str": "M16A3" }, "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil. This one is a relatively rare M16A3, with full auto capability.", "weight": 1 }, { - "id": "acr", + "id": "modular_acr", "name": { "str": "Remington ACR" }, "description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines." } ], - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ] + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow." }, { "id": "m231pfw", - "copy-from": "m16a4", "type": "GUN", "name": { "str": "M16 firing port gun" }, "description": "The M16 firing port gun is an M16 rifle modified to fire with an open-bolt design at ludicrous speeds, without sights. It has a threaded handguard to screw into an armored vehicle's firing ports. It is chambered in 5.56x45mm and accepts STANAG magazines.", "weight": "3330 g", "volume": "2400 ml", "longest_side": "727 mm", + "barrel_length": "396 mm", "price": 3450000, "price_postapoc": 3500, "variant_type": "gun", @@ -530,8 +738,16 @@ "description": "The M231 PFW is an adaptation of the M16 assault rifle, designed to be used in the firing ports of the M2 Bradley Infantry Fighting Vehicle. It does not have a buttstock or front sight post, and the smooth front hand guard does nothing to protect you from the potentially scorching hot barrel collar, making it slightly less than ergonomic. You could screw it into a firing port if you were so inclined. The fire selector says only 'SAFE' and 'AUTO'. You can't help but wonder which one is preferable." } ], + "to_hit": -1, + "symbol": "(", + "color": "dark_gray", + "skill": "rifle", + "material": [ "aluminum", "steel", "plastic" ], + "ammo": [ "223" ], "dispersion": 350, "sight_dispersion": 500, + "durability": 7, + "min_cycle_recoil": 1350, "valid_mod_locations": [ [ "barrel", 1 ], [ "bore", 1 ], @@ -545,7 +761,33 @@ [ "underbarrel mount", 1 ] ], "//": "This weapon has an extremely high rate of fire, due to the open bolt design. This is based on a cyclic rate of fire of 1150 RPM, which is close to 19 rounds per second. 6 rounds is comparable to to other weapons with similar rates, such as the MAC-11.", - "modes": [ [ "DEFAULT", "auto", 6 ] ] + "modes": [ [ "DEFAULT", "auto", 6 ] ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } }, { "id": "oa93", @@ -557,6 +799,7 @@ "weight": "2023 g", "volume": "2135 ml", "longest_side": "456 mm", + "barrel_length": "165 mm", "price": 125000, "price_postapoc": 5500, "to_hit": -2, @@ -566,7 +809,6 @@ "ammo": [ "223" ], "skill": "pistol", "range": -6, - "ranged_damage": { "damage_type": "bullet", "amount": -11 }, "dispersion": 380, "durability": 6, "min_cycle_recoil": 1350, @@ -621,6 +863,7 @@ "weight": "3180 g", "volume": "2900 ml", "longest_side": "977 mm", + "barrel_length": "406 mm", "price": 92100, "price_postapoc": 3750, "to_hit": -1, @@ -628,7 +871,6 @@ "symbol": "(", "color": "brown", "ammo": [ "223" ], - "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 100, "durability": 8, "min_cycle_recoil": 1350, @@ -665,6 +907,7 @@ "weight": "3200 g", "volume": "2950 ml", "longest_side": "741 mm", + "barrel_length": "348 mm", "price": 320000, "price_postapoc": 6000, "variant_type": "gun", @@ -723,6 +966,7 @@ "weight": "3500 g", "volume": "3520 ml", "longest_side": "715 mm", + "barrel_length": "508 mm", "price": 490000, "price_postapoc": 6000, "variant_type": "gun", @@ -781,6 +1025,7 @@ "weight": "3402 g", "volume": "2167 ml", "longest_side": "99 cm", + "barrel_length": "465 mm", "price": 79500, "price_postapoc": 3000, "to_hit": -1, @@ -826,6 +1071,7 @@ "weight": "2563 g", "volume": "1286 ml", "longest_side": "48 cm", + "barrel_length": "254 mm", "price": 72500, "price_postapoc": 2500, "to_hit": -5, @@ -833,7 +1079,6 @@ "color": "brown", "ammo": [ "223" ], "dispersion": 240, - "ranged_damage": { "damage_type": "bullet", "amount": -5 }, "durability": 7, "min_cycle_recoil": 1350, "valid_mod_locations": [ @@ -851,5 +1096,222 @@ ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "zpap85mag" ] } ], "melee_damage": { "bash": 8 } + }, + { + "id": "mdrx", + "copy-from": "rifle_semi", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "variant_type": "gun", + "variants": [ + { + "id": "mdrx", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout.", + "weight": 1 + } + ], + "weight": "3080 g", + "volume": "3421 ml", + "longest_side": "402 mm", + "//": "The length and weight number is assigned to, roughly, represent an MDRX without a protruding barrel. the difference will be made up for with the installable conversion kits.", + "price": 173900, + "price_postapoc": 5000, + "to_hit": -1, + "material": [ "aluminum", "steel", "plastic" ], + "symbol": "(", + "color": "black", + "ammo": [ "NULL" ], + "dispersion": 150, + "durability": 8, + "default_mods": [ "retool_mdrx_223rem_medium" ], + "min_cycle_recoil": 1250, + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "rail", 2 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "underbarrel", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "ar10mag_20rd", + "ar10_makeshiftmag", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 10 } + }, + { + "id": "bren2_556", + "copy-from": "rifle_semi", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Bren 5.56x45mm carbine" }, + "description": "A semi-automatic clone of the Czech Republic’s standard infantry carbine, sold for civilian sport shooting and recreational use, this modular rifle makes use of the 7.62x39mm Soviet cartridge and uses proprietary magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "bren2_556", + "name": { "str": "CZ Bren 2" }, + "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former’s features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table. Chambered for the 5.56x45mm NATO cartridge, this particular weapon possesses a 16.5-inch barrel and is a civilian MS, 'modular semi-automatic,' model. Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles.", + "weight": 1 + } + ], + "weight": "3450 g", + "volume": "4200 ml", + "longest_side": "91 cm", + "barrel_length": "419 mm", + "price": 225900, + "price_postapoc": 3500, + "to_hit": -1, + "material": [ "steel", "aluminum", "plastic" ], + "color": "black", + "ammo": [ "223" ], + "dispersion": 140, + "durability": 8, + "default_mods": [ "folding_stock", "muzzle_brake" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "id": "cz600", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "bolt-action trail carbine" }, + "description": "Compact, svelte, and lightweight, this Leen bolt-action rifle packs the same features of larger sporting weapons into a backpack-sized package. Possessing an adjustable buttstock, a detachable magazine-based system, and a quick-swap barrel that can be exchanged to accommodate the firing of .223 Remington or 7.62x39mm Soviet ammunition, the weapon is a commendable backpacker or prepper rifle.", + "variant_type": "gun", + "variants": [ + { + "id": "cz600", + "name": { "str": "CZ 600 TRAIL" }, + "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum. Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers.", + "weight": 1 + } + ], + "weight": "2800 g", + "volume": "2500 ml", + "longest_side": "384 mm", + "//": "The size calculations are taken from a CZ 600 with a half-extended buttstock, sitting at 790 mm, between the minimum and maximum of 690 and 890 mm. In addition, the length of a 16-inch barrel has been deducted and will be made up for by the installable barrel assemblies.", + "price": 115500, + "price_postapoc": 4000, + "to_hit": -1, + "material": [ "aluminum", "steel", "plastic" ], + "symbol": "(", + "color": "black", + "ammo": [ "NULL" ], + "dispersion": 150, + "durability": 8, + "built_in_mods": [ "adjustable_stock" ], + "default_mods": [ "retool_cz600_223rem" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "rail", 2 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "bren2_762mag10", + "bren2_762mag30", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 10 } } ] diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 8934a7408553f..fb3284097cfff 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -10,6 +10,7 @@ "weight": "5443 g", "volume": "6182 ml", "longest_side": "1187 mm", + "barrel_length": "610 mm", "price": 1701000, "price_postapoc": 3750, "to_hit": -1, @@ -33,6 +34,7 @@ "weight": "3730 g", "volume": "3761 ml", "longest_side": "1183 mm", + "barrel_length": "660 mm", "price": 259500, "price_postapoc": 5500, "to_hit": -1, @@ -71,6 +73,7 @@ "weight": "3520 g", "volume": "3205 ml", "longest_side": "1198 mm", + "barrel_length": "610 mm", "price": 46000, "price_postapoc": 3250, "to_hit": -1, @@ -98,5 +101,55 @@ ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "300": 3 } } ], "melee_damage": { "bash": 12 } + }, + { + "id": "ruger_pr", + "looks_like": "ar15", + "copy-from": "rifle_manual", + "type": "GUN", + "name": "Ruger Precision Rifle", + "//": "No generic variant for this rifle, as the brand name is already pretty generic in and of itself.", + "description": "Originally introduced to the Ruger gun corporation’s family of high-end marksman rifles in 2015, the Ruger Precision Rifle is a modern and highly modular long-range bolt-action weapon. By incorporating a unique in-line recoil path that manages recoil from the rear of the receiver to the buttstock, as opposed to traditional bedding, the rifle offers maximal accuracy potential, while the arm's additional bells and whistles, an incorporated marksman’s trigger, muzzle brake, and this particular rifle's powerhouse chambering of .300 Win Mag, help to make the most from any long-range engagement.", + "weight": "6890 g", + "volume": "9800 ml", + "longest_side": "1245 mm", + "barrel_length": "660 mm", + "price": 253900, + "price_postapoc": 5500, + "to_hit": -2, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": "-", + "color": "black", + "ammo": [ "300" ], + "dispersion": 70, + "durability": 8, + "default_mods": [ "match_trigger", "high_end_folding_stock", "muzzle_brake" ], + "barrel_volume": "456 ml", + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "pocket_data": [ + { + "magazine_well": "300 ml", + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ruger_pr_mag" ] + } + ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index d8f5af58add1e..5ed6ad1e9e9e0 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -9,6 +9,7 @@ "weight": "3290 g", "volume": "3610 ml", "longest_side": "1106 mm", + "barrel_length": "559 mm", "price": 85000, "price_postapoc": 3000, "to_hit": -1, @@ -17,7 +18,6 @@ "color": "brown", "ammo": [ "3006" ], "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 90, "durability": 7, "blackpowder_tolerance": 24, @@ -51,6 +51,7 @@ "weight": "4280 g", "volume": "3160 ml", "longest_side": "1107 mm", + "barrel_length": "610 mm", "price": 90000, "price_postapoc": 3500, "to_hit": -1, @@ -90,6 +91,7 @@ "weight": "3910 g", "volume": "2840 ml", "longest_side": "1102 mm", + "barrel_length": "610 mm", "price": 80000, "price_postapoc": 3250, "to_hit": -1, @@ -131,6 +133,7 @@ "weight": "8820 g", "volume": "4450 ml", "longest_side": "1216 mm", + "barrel_length": "610 mm", "price": 350000, "price_postapoc": 4000, "to_hit": -1, @@ -173,6 +176,7 @@ "weight": "3350 g", "volume": "3190 ml", "longest_side": "1141 mm", + "barrel_length": "635 mm", "price": 87000, "price_postapoc": 3500, "to_hit": -1, @@ -187,5 +191,52 @@ "flags": [ "RELOAD_ONE", "NEVER_JAMS" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ], "melee_damage": { "bash": 12 } + }, + { + "id": "ruger_m77", + "looks_like": "ar15", + "copy-from": "rifle_manual", + "type": "GUN", + "name": { "str": "Ruger Guide rifle" }, + "description": "This is a popular and sturdy long-range rifle that has been in production by the Ruger gun company for several decades. Using a bolt-action feed system, the rifle features a four round capacity of .30-06 cartridges and has the capability to dispatch said rounds with a level of accuracy that would make comparable hunting rifles blush.", + "variant_type": "gun", + "variants": [ + { + "id": "ruger_m77", + "name": "Ruger M77 Hawkeye", + "description": "A popular bolt-action hunting rifle first introduced in 2006, the Ruger M77 was originally intended to be a modernized Mauser 98-style long gun. To this end, the weapon features a Mauser-type fixed blade extractor and an angled large screw that tightly beds the action into the stock. This particular rifle is a variant with additional features, a smoother trigger, and a recontoured buttstock.", + "weight": 1 + } + ], + "weight": "3670 g", + "volume": "3350 ml", + "longest_side": "1040mm", + "barrel_length": "508 mm", + "price": 161900, + "price_postapoc": 4500, + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "brown", + "ammo": "3006", + "dispersion": 75, + "durability": 8, + "clip_size": 4, + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": "RELOAD_ONE", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index fa77333fb1b97..2595c6cc94c2e 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -109,13 +109,6 @@ ], "melee_damage": { "bash": 12 } }, - { - "id": "ar15_retool_300blk", - "copy-from": "ar15", - "type": "GUN", - "name": { "str": "AR-15" }, - "default_mods": [ "retool_ar15_300blk" ] - }, { "id": "sig_mcx_rattler_sbr", "copy-from": "rifle_semi", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 86f9e8030be24..9d377cf1b8096 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -9,6 +9,7 @@ "weight": "4250 g", "volume": "4511 ml", "longest_side": "1090 mm", + "barrel_length": "533 mm", "price": 350000, "price_postapoc": 5500, "to_hit": -1, @@ -16,7 +17,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 150, "durability": 8, "min_cycle_recoil": 2700, @@ -35,6 +35,7 @@ "weight": "4380 g", "volume": "3724 ml", "longest_side": "1025 mm", + "barrel_length": "450 mm", "price": 205000, "price_postapoc": 6000, "to_hit": -1, @@ -42,7 +43,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 150, "min_cycle_recoil": 2700, "durability": 8, @@ -60,6 +60,7 @@ "weight": "19770 g", "volume": "8300 ml", "longest_side": "800 mm", + "barrel_length": "559 mm", "price": 5500000, "price_postapoc": 10000, "to_hit": -4, @@ -68,7 +69,6 @@ "color": "dark_gray", "ammo": [ "308" ], "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 200, "durability": 9, "blackpowder_tolerance": 96, @@ -119,6 +119,7 @@ "weight": "4230 g", "volume": "3970 ml", "longest_side": "1126 mm", + "barrel_length": "559 mm", "price": 130000, "price_postapoc": 3500, "to_hit": -1, @@ -126,7 +127,6 @@ "symbol": "(", "color": "brown", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 110, "durability": 8, "min_cycle_recoil": 2700, @@ -158,6 +158,7 @@ "weight": "12500 g", "volume": "11780 ml", "longest_side": "1260 mm", + "barrel_length": "551 mm", "price": 1000000, "price_postapoc": 7500, "to_hit": -1, @@ -197,6 +198,7 @@ "weight": "10500 g", "volume": "10900 ml", "longest_side": "1105 mm", + "barrel_length": "559 mm", "price": 1000000, "price_postapoc": 7500, "to_hit": -1, @@ -204,7 +206,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 180, "durability": 7, "min_cycle_recoil": 2700, @@ -245,6 +246,7 @@ "weight": "3630 g", "volume": "2875 ml", "longest_side": "1041 mm", + "barrel_length": "559 mm", "price": 53000, "price_postapoc": 4250, "to_hit": -1, @@ -263,7 +265,7 @@ }, { "id": "scar_h", - "copy-from": "m27_assault_rifle", + "copy-from": "scar_l", "looks_like": "ar15", "type": "GUN", "name": { "str_sp": "FN SCAR-H" }, @@ -272,8 +274,8 @@ "weight": "3630 g", "volume": "5427 ml", "longest_side": "906 mm", + "barrel_length": "406 mm", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -3 }, "min_cycle_recoil": 2700, "default_mods": [ "high_end_folding_stock" ], "pocket_data": [ @@ -293,6 +295,7 @@ "weight": "4990 g", "volume": "4084 ml", "longest_side": "992 mm", + "barrel_length": "610 mm", "price": 350000, "price_postapoc": 4500, "to_hit": -1, @@ -333,6 +336,7 @@ "weight": "4220 g", "volume": "4000 ml", "longest_side": "914 mm", + "barrel_length": "330 mm", "price": 320000, "price_postapoc": 6000, "to_hit": -1, @@ -340,7 +344,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -4 }, "dispersion": 180, "durability": 8, "min_cycle_recoil": 2700, @@ -359,6 +362,7 @@ "weight": "3800 g", "volume": "4000 ml", "longest_side": "1028 mm", + "barrel_length": "414 mm", "price": 320000, "price_postapoc": 6000, "to_hit": -1, @@ -366,7 +370,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 120, "durability": 8, "min_cycle_recoil": 2700, @@ -393,6 +396,7 @@ "weight": "3402 g", "volume": "2167 ml", "longest_side": "87 cm", + "barrel_length": "500 mm", "price": 79500, "price_postapoc": 3000, "to_hit": -1, @@ -429,6 +433,7 @@ "weight": "3290 g", "volume": "4250 ml", "longest_side": "1050 mm", + "barrel_length": "528 mm", "price": 120000, "price_postapoc": 5500, "to_hit": -1, @@ -436,7 +441,6 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "308" ], - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, "dispersion": 150, "durability": 7, "min_cycle_recoil": 2700, diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json new file mode 100644 index 0000000000000..c329fbac9252d --- /dev/null +++ b/data/json/items/gun/338lapua.json @@ -0,0 +1,176 @@ +[ + { + "id": "tac338", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": ".338 bolt-action sniper rifle" }, + "description": "A high-precision bolt-action sniper rifle, in service with special operations members of the US Navy prior to the cataclysm. Firing the powerful .338 Lapua cartridge, the weapon feeds from detachable five round Accuracy International magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "tac338", + "name": { "str_sp": "McMillan Tac-338" }, + "description": "Chambering the .338 Lapua cartridge, the Tac-338 is a high-precision, bolt-action sniper rifle that, before the Cataclysm, complemented the arsenal of the US Navy Special Warfare unit. Providing Navy SEAL marksmen with the capability to land effective shots on targets at a typical range of 1600 meters, a valuable capability for the long-distance engagements prevalent during the US army’s war on terror, the rifle comes kitted with an adjustable cheek pad, butt hook, and muzzle break.", + "weight": 1 + } + ], + "weight": "5897 g", + "volume": "4000 ml", + "longest_side": "1295 mm", + "price": 642800, + "price_postapoc": 4000, + "to_hit": -1, + "material": [ "steel", "plastic" ], + "color": "black", + "ammo": [ "338lapua" ], + "dispersion": 50, + "durability": 10, + "blackpowder_tolerance": 24, + "default_mods": [ "cheek_pad", "butt_hook", "bipod", "rifle_scope", "muzzle_brake" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ai_338mag", "ai_338mag_10" ] } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "savage112", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "single-shot target rifle" }, + "description": "A bolt-action precision rifle with the potential for impressive accuracy, this particular weapon makes use of the powerful .338 Lapua cartridge and is decked in a handsome set of wooden furniture, providing the rifle with a classical mystique. Unfortunately, the weapon's single-round magazine and a lack of factory iron sights, which makes target acquisition an exercise in futility unless a gunsight is installed, make the rifle limited in its post-Cataclysm utility.", + "variant_type": "gun", + "variants": [ + { + "id": "savage112", + "name": { "str_sp": "Savage 112 Magnum Target" }, + "description": "A highly-accurate precision rifle chambered for the powerful .338 Lapua cartridge, the Savage 112 Magnum Target is a classically designed bolt-action rifle in both its fit and finish, with a heavy barrel, a hardwood stock, and an attached muzzle brake. Unfortunately for the weapon and its users, a traditional veneer, no matter how admittedly swanky, isn’t conducive to tactical effectiveness, as demonstrated by the 112 Magnum Target’s mighty magazine size of one entire cartridge and lack of any factory-attached sights.", + "weight": 1 + } + ], + "weight": "5470 g", + "volume": "3000 ml", + "longest_side": "1264 mm", + "price": 110900, + "price_postapoc": 800, + "to_hit": -1, + "material": [ "steel", "wood" ], + "color": "black", + "ammo": [ "338lapua" ], + "dispersion": 50, + "sight_dispersion": 1000, + "//": "Giant amount of sight-dispersion in order to simulate that the rifle doesn’t come with factory installed sights.", + "durability": 8, + "blackpowder_tolerance": 24, + "clip_size": 1, + "default_mods": [ "match_trigger", "muzzle_brake" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "stock mount", 1 ] + ], + "flags": [ "RELOAD_ONE", "RELOAD_EJECT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 1 } } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "mrad_smr", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Barrett precision rifle" }, + "description": "A box magazine-fed bolt-action precision rifle developed by the Barrett Arms Company, firing the .338 Lapua cartridge. A civilian copy of more versatile military weapons, this rifle is a remarkably well-crafted piece of anti-personnel engineering despite lacking the sheer modularity of its Marshal sister, and is still capable of engaging targets at extreme distances.", + "variant_type": "gun", + "variants": [ + { + "id": "mrad_smr", + "name": { "str_sp": "Barrett MRAD SMR" }, + "description": "Chambered for the .338 Lapua cartridge, the Barrett MRAD SMR is a civilian variant of the MK22 MRAD sniper rifle, which was in service with elements of the US army and is often regarded as one of the finest bolt-action sniper rifles ever developed. The primary differences that set this weapon apart from its Marshal sibling are the removal of the MRAD’s caliber conversion capabilities and the installation of a fixed buttstock. These changes have resulted in a lighter and slimmer rifle that, most importantly for the discerning pre-Cataclysmic precision shooter, didn’t require a second mortgage to purchase.", + "weight": 1 + } + ], + "weight": "6305 g", + "volume": "5500 ml", + "longest_side": "1204 mm", + "price": 406098, + "price_postapoc": 4000, + "to_hit": -1, + "material": [ "aluminum", "steel", "plastic" ], + "color": "black", + "ammo": [ "338lapua" ], + "dispersion": 50, + "durability": 10, + "blackpowder_tolerance": 24, + "built_in_mods": [ "cheek_pad" ], + "//": "Cheek pad required for holding the buttstock in place and keep it from folding.", + "default_mods": [ "match_trigger", "muzzle_brake" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ], + [ "stock accessory", 2 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mrad_338lapua_mag" ] } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "axmc", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "modular sniper rifle" }, + "description": "A weapon platform that prides itself on modularity and customizability, this highly accurate precision rifle may be configured with various caliber conversion kits that can allow it to fire either the .338 Lapua, .300 Win Mag, or .308 Winchester cartridges. The rifle's size prevents it from being a particularly mobile piece of equipment, but the weapon's folding buttstock aids in portability.", + "variant_type": "gun", + "variants": [ + { + "id": "axmc", + "name": { "str_sp": "Accuracy International AXMC" }, + "description": "Produced by the British precision rifle company Accuracy International, the AX Modular Caliber Weapon System is a highly-accurate combat sniper rifle offered to military, law enforcement, and civilian precision marksmen. The rifle is compatible with a wide range of aftermarket components, including caliber conversion kits, and is built upon a base aluminum chassis, into which the weapon's parts may be installed or removed at the user's discretion.", + "weight": 1 + } + ], + "weight": "5420 g", + "//": "Weight of gun plus muzzle break and empty 10-round magazine is 6.8 kg. Weights of these latter two have been deducted, as has the weight of a standard barrel.", + "volume": "6050 ml", + "longest_side": "564 mm", + "//2": "Length and volume calculations have been adjusted to represent just the base chassis, without an installed barrel.", + "price": 675000, + "price_postapoc": 4000, + "to_hit": -1, + "material": [ "aluminum", "steel", "plastic" ], + "color": "black", + "ammo": [ "NULL" ], + "dispersion": 50, + "durability": 10, + "blackpowder_tolerance": 24, + "default_mods": [ "match_trigger", "high_end_folding_stock", "retool_axmc_338lapua", "muzzle_brake" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "grip", 1 ], + [ "bore", 1 ], + [ "mechanism", 4 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET" ], + "//3": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.", + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ai_338mag", "ai_338mag_10", "ai_308mag_10" ] } ], + "melee_damage": { "bash": 12 } + } +] diff --git a/data/json/items/gun/450bushmaster.json b/data/json/items/gun/450bushmaster.json new file mode 100644 index 0000000000000..f64e8eba2fc36 --- /dev/null +++ b/data/json/items/gun/450bushmaster.json @@ -0,0 +1,38 @@ +[ + { + "id": "ruger_arr", + "copy-from": "rifle_manual", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Ruger American Ranch Rifle" }, + "description": "A compact, magazine-fed, bolt-action hunting rifle designed and manufactured with cost-effectiveness at the peak of concerns, the Ruger American Ranch Rifle series caters to shooters on a budget. Factory chambered for the powerful, though short-range, .450 Bushmaster cartridge, the weapon was able to stand toe-to-toe with all native North American game despite its minimalist design.", + "weight": "2495 g", + "volume": "2500 ml", + "longest_side": "914 mm", + "price": 66900, + "price_postapoc": 2000, + "to_hit": -1, + "material": [ "aluminum", "steel", "plastic" ], + "color": "brown", + "ammo": [ "450" ], + "dispersion": 120, + "durability": 8, + "flags": [ "NEVER_JAMS" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip", 1 ], + [ "rail", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger_arr_mag" ] } ], + "melee_damage": { "bash": 10 } + } +] diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 6419413ae06b5..331d63935229d 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -114,7 +114,7 @@ [ "stock accessory", 2 ], [ "underbarrel", 1 ] ], - "flags": [ "RELOAD_ONE", "NEVER_JAMS" ], + "flags": [ "RELOAD_ONE" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], "pocket_data": [ { @@ -303,5 +303,58 @@ "price": 170000, "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], "default_mods": [ "folding_stock", "rail_mount", "offset_sight_rail", "muzzle_brake" ] + }, + { + "id": "bren2_762", + "copy-from": "rifle_semi", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Bren 7.62mm carbine" }, + "description": "A semi-automatic clone of the Czech Republic’s standard infantry carbine, sold for civilian sport shooting and recreational use, this modular rifle makes use of the 7.62x39mm Soviet cartridge and uses proprietary magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "bren2_762", + "name": { "str": "CZ Bren 2" }, + "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former’s features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table. Chambered for the 7.62x39mm Soviet cartridge, this particular weapon possesses a compact 11-inch barrel and is a civilian MS, 'modular semi-automatic,' model. Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles.", + "weight": 1 + }, + { + "id": "805_bren", + "name": { "str": "CZ 805 Bren" }, + "description": "Strongly resembling the FN SCAR, with features and ergonomics inspired by the AR-18, this semi-automatic rifle is a civilian clone of the Czech Republic’s formerly standard infantry carbine and was produced by the same company. Discontinued in 2018, the rifle features an included muzzle break and adjustable folding buttstock, with this particular version being chambered in 7.62x39mm." + } + ], + "weight": "2870 g", + "volume": "4200 ml", + "longest_side": "76 cm", + "price": 215500, + "price_postapoc": 3000, + "to_hit": -1, + "material": [ "steel", "aluminum", "plastic" ], + "color": "black", + "ammo": [ "762" ], + "ranged_damage": { "damage_type": "bullet", "amount": -5 }, + "dispersion": 140, + "durability": 8, + "barrel_volume": "175 ml", + "default_mods": [ "folding_stock", "muzzle_brake" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "bren2_762mag30", "bren2_762mag10" ] } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index 08116a0d6b736..ef111c5727cf4 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -17,6 +17,8 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "8x40mm" ], + "ranged_damage": { "damage_type": "bullet", "amount": -16 }, + "//2": "Barrel length is estimated to be 6 inches.", "skill": "pistol", "dispersion": 175, "durability": 9, @@ -30,7 +32,7 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "250 ml", "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] } ], "melee_damage": { "bash": 12 } }, @@ -51,9 +53,10 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "8x40mm" ], + "ranged_damage": { "damage_type": "bullet", "amount": 6 }, + "//2": "Barrel length is estimated to be 24 inches.", "skill": "rifle", "range": 20, - "ranged_damage": { "damage_type": "bullet", "amount": 10 }, "dispersion": 10, "durability": 9, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 2 ] ], @@ -68,7 +71,7 @@ [ "sling", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] } ], "melee_damage": { "bash": 10 } }, @@ -89,6 +92,8 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "8x40mm" ], + "ranged_damage": { "damage_type": "bullet", "amount": -9 }, + "//2": "Barrel length is estimated to be 9-inches.", "skill": "smg", "dispersion": 120, "durability": 9, @@ -104,7 +109,7 @@ [ "stock accessory", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_25_mag", "8x40_10_mag" ] } ], "melee_damage": { "bash": 11 } }, @@ -142,7 +147,7 @@ [ "stock", 1 ], [ "stock accessory", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_500_mag", "8x40_250_mag" ] } ], "melee_damage": { "bash": 18 } }, @@ -163,7 +168,6 @@ "color": "dark_gray", "ammo": [ "8x40mm" ], "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 5 }, "dispersion": 50, "durability": 9, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], @@ -178,7 +182,7 @@ [ "stock accessory", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ], "melee_damage": { "bash": 12 } @@ -199,8 +203,9 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "8x40mm" ], + "ranged_damage": { "damage_type": "bullet", "amount": 4 }, + "//2": "Barrel length is estimated to be 21-inches.", "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 5 }, "dispersion": 70, "durability": 9, "reload": 200, @@ -217,7 +222,7 @@ [ "stock accessory", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_250_mag", "8x40_500_mag" ] } ], "melee_damage": { "bash": 12 } }, @@ -237,8 +242,9 @@ "symbol": "(", "color": "dark_gray", "ammo": [ "8x40mm" ], + "ranged_damage": { "damage_type": "bullet", "amount": 2 }, + "//2": "Barrel length is estimated to be 18-inches.", "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 10 }, "dispersion": 30, "durability": 9, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], @@ -254,7 +260,7 @@ [ "underbarrel", 1 ] ], "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "flags": [ "WATERPROOF_GUN" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] } ], "melee_damage": { "bash": 12 } diff --git a/data/json/items/gun/converted.json b/data/json/items/gun/converted.json new file mode 100644 index 0000000000000..419382f3be53b --- /dev/null +++ b/data/json/items/gun/converted.json @@ -0,0 +1,229 @@ +[ + { + "id": "ar15_223long", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_223rem_extended" ] + }, + { + "id": "ar15_223medium", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_223rem_medium" ] + }, + { + "id": "ar15_223short", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_223rem_short" ] + }, + { + "id": "ar15_300", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_300blk" ] + }, + { + "id": "ar15_300medium", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_300blk_medium" ] + }, + { + "id": "ar15_300short", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_300blk_short" ] + }, + { + "id": "ar15_50", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_50beowulf" ] + }, + { + "id": "ar15_50medium", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_50beowulf_medium" ] + }, + { + "id": "ar15_50short", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_50beowulf_short" ] + }, + { + "id": "ar15_450", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_450" ] + }, + { + "id": "ar15_450medium", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_450_medium" ] + }, + { + "id": "ar15_450short", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_450_short" ] + }, + { + "id": "ar15_762", + "copy-from": "modular_ar15", + "type": "GUN", + "name": { "str": "AR-15" }, + "default_mods": [ "retool_ar15_762" ] + }, + { + "id": "mdrx_223", + "copy-from": "mdrx", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "default_mods": [ "retool_mdrx_223rem" ], + "variant_type": "gun", + "variants": [ + { + "id": "mdrx_223", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout.", + "weight": 1 + } + ] + }, + { + "id": "mdrx_223short", + "copy-from": "mdrx", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "default_mods": [ "retool_mdrx_223rem_short" ], + "variant_type": "gun", + "variants": [ + { + "id": "mdrx_223short", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or 3.00 AAC Blackout.", + "weight": 1 + } + ] + }, + { + "id": "mdrx_300", + "copy-from": "mdrx", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "default_mods": [ "retool_mdrx_300blk" ], + "variant_type": "gun", + "variants": [ + { + "id": "mdrx_300", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout.", + "weight": 1 + } + ] + }, + { + "id": "mdrx_308", + "copy-from": "mdrx", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "default_mods": [ "retool_mdrx_308win" ], + "variant_type": "gun", + "variants": [ + { + "id": "mdrx_308", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout.", + "weight": 1 + } + ] + }, + { + "id": "mdrx_308medium", + "copy-from": "mdrx", + "type": "GUN", + "name": { "str": "Desert Tech bullpup carbine" }, + "description": "Produced by the Desert Tech gun company, this is a highly modular, semi-automatic rifle of remarkably modest dimensions. The weapon is notable for the simplicity of converting it to fire a wide number of different cartridges, with retool kits for .223 Remington, .308 Winchester, and .300 AAC Blackout being available.", + "default_mods": [ "retool_mdrx_308win_medium" ], + "variant_type": "gun", + "variants": [ + { + "id": "mdrx_308medium", + "name": { "str": "Desert Tech MDRX" }, + "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle’s most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout.", + "weight": 1 + } + ] + }, + { + "id": "axmc_300", + "copy-from": "axmc", + "type": "GUN", + "name": { "str": "modular sniper rifle" }, + "description": "A weapon platform that prides itself on modularity and customizability, this highly accurate precision rifle may be configured with various caliber conversion kits that can allow it to fire either the .338 Lapua, .300 Win Mag, or .308 Winchester cartridges. The rifle's size prevents it from being a particularly mobile piece of equipment, but the weapon's folding buttstock aids in portability.", + "default_mods": [ "retool_axmc_300win" ], + "variant_type": "gun", + "variants": [ + { + "id": "axmc_300", + "name": { "str_sp": "Accuracy International AXMC" }, + "description": "Produced by the British precision rifle company Accuracy International, the AX Modular Caliber Weapon System is a highly-accurate combat sniper rifle offered to military, law enforcement, and civilian precision marksmen. The rifle is compatible with a wide range of aftermarket components, including caliber conversion kits, and is built upon a base aluminum chassis, into which the weapon's parts may be installed or removed at the user's discretion.", + "weight": 1 + } + ] + }, + { + "id": "axmc_308", + "copy-from": "axmc", + "type": "GUN", + "name": { "str": "modular sniper rifle" }, + "description": "A weapon platform that prides itself on modularity and customizability, this highly accurate precision rifle may be configured with various caliber conversion kits that can allow it to fire either the .338 Lapua, .300 Win Mag, or .308 Winchester cartridges. The rifle's size prevents it from being a particularly mobile piece of equipment, but the weapon's folding buttstock aids in portability.", + "default_mods": [ "retool_axmc_308win" ], + "variant_type": "gun", + "variants": [ + { + "id": "axmc_308", + "name": { "str_sp": "Accuracy International AXMC" }, + "description": "Produced by the British precision rifle company Accuracy International, the AX Modular Caliber Weapon System is a highly-accurate combat sniper rifle offered to military, law enforcement, and civilian precision marksmen. The rifle is compatible with a wide range of aftermarket components, including caliber conversion kits, and is built upon a base aluminum chassis, into which the weapon's parts may be installed or removed at the user's discretion.", + "weight": 1 + } + ] + }, + { + "id": "cz600_762", + "copy-from": "cz600", + "type": "GUN", + "name": { "str": "bolt-action trail carbine" }, + "description": "Compact, svelte, and lightweight, this Leen bolt-action rifle packs the same features of larger sporting weapons into a backpack-sized package. Possessing an adjustable buttstock, a detachable magazine-based system, and a quick-swap barrel that can be exchanged to accommodate the firing of .223 Remington or 7.62x39mm Soviet ammunition, the weapon is a commendable backpacker or prepper rifle.", + "default_mods": [ "retool_cz600_762" ], + "variant_type": "gun", + "variants": [ + { + "id": "cz600_762", + "name": { "str": "CZ 600 Trail" }, + "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum. Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers.", + "weight": 1 + } + ] + } +] diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 67322abac7105..f8ad5117beffb 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -10,6 +10,7 @@ "volume": "2800 ml", "//": "barrel should be a bit shorter than the pamd71z as it's less accurate", "longest_side": "1000 mm", + "barrel_length": "508 mm", "price": 350000, "price_postapoc": 4000, "variant_type": "gun", @@ -45,6 +46,7 @@ "volume": "3 L", "//": "around the length of other long 30-06 rifles and heavier AR's", "longest_side": "1100 mm", + "barrel_length": "610 mm", "price": 80000, "price_postapoc": 3250, "variant_type": "gun", diff --git a/data/json/items/gun/obsolete.json b/data/json/items/gun/obsolete.json new file mode 100644 index 0000000000000..87c4afa16852e --- /dev/null +++ b/data/json/items/gun/obsolete.json @@ -0,0 +1,264 @@ +[ + { + "id": "ar15", + "copy-from": "rifle_semi", + "type": "GUN", + "name": { "str": "AR-15" }, + "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles", + "description": "This ubiquitous rifle is the forefather of the M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi-automatic civilian version.", + "weight": "3170 g", + "volume": "3100 ml", + "longest_side": "930 mm", + "price": 125000, + "price_postapoc": 4000, + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "223" ], + "dispersion": 150, + "durability": 7, + "flags": [ "OBSOLETE" ], + "min_cycle_recoil": 1350, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "//": "Groups all 'H&K416' related rifles together. Used M27 due to it being the most popular of the three in the US.", + "id": "m27_assault_rifle", + "copy-from": "rifle_auto", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "M27 assault rifle" }, + "description": "Designed to replace the M4 Carbine, the M27 assault rifle features most of the former's strengths, while being considerably more durable. It is chambered in 5.56x45mm and accepts STANAG magazines.", + "weight": "3490 g", + "volume": "4957 ml", + "longest_side": "798 mm", + "price": 540000, + "price_postapoc": 2250, + "variant_type": "gun", + "variants": [ + { + "id": "h&k416a5", + "name": { "str": "H&K416 A5" }, + "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable." + }, + { + "id": "m27iar", + "name": { "str": "M27 IAR" }, + "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", + "ascii_picture": "m27_iar", + "weight": 1 + }, + { + "id": "m38dmr", + "name": { "str": "M38 DMR" }, + "description": "The M38 Designated Marksman Rifle is an M27 IAR, itself derived from a H&K416, selected for accuracy, and outfitted with a variable power scope and a QDSS suppressor." + } + ], + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "223" ], + "ranged_damage": { "damage_type": "bullet", "amount": -1 }, + "dispersion": 180, + "durability": 8, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "flags": [ "OBSOLETE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "id": "m4_carbine", + "copy-from": "rifle_auto", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "M4 carbine" }, + "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained. It is chambered in 5.56x45mm and accepts STANAG magazines.", + "ascii_picture": "modular_m4a1", + "weight": "2880 g", + "volume": "3310 ml", + "longest_side": "758 mm", + "price": 240000, + "price_postapoc": 5000, + "variant_type": "gun", + "variants": [ + { + "id": "m4a1", + "name": { "str": "M4A1" }, + "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.", + "ascii_picture": "modular_m4a1", + "weight": 1 + } + ], + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "223" ], + "ranged_damage": { "damage_type": "bullet", "amount": -2 }, + "dispersion": 180, + "durability": 6, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "flags": [ "OBSOLETE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "id": "m16a4", + "copy-from": "rifle_semi", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "M16 burst rifle" }, + "description": "The M16 is a common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It fires in three round bursts, ensuring the rifle is more accurate, but at the cost of being slower than other assault rifles. It is chambered in 5.56x45mm rounds, and accepts STANAG magazines.", + "weight": "3260 g", + "volume": "5030 ml", + "longest_side": "1003 mm", + "price": 240000, + "price_postapoc": 5000, + "variant_type": "gun", + "variants": [ + { + "id": "m16a4", + "name": { "str": "M16A4" }, + "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil.", + "weight": 1 + } + ], + "to_hit": -1, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "223" ], + "dispersion": 150, + "durability": 7, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ], + "flags": [ "OBSOLETE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "melee_damage": { "bash": 12 } + }, + { + "//": "Figured having 'm16' in the name would make it more understandable, seeing as I named 2 of the .223 rifle groups/names after it. ACR is grouped with it due to similar length.", + "id": "m16_auto_rifle", + "copy-from": "m16a4", + "type": "GUN", + "name": { "str": "M16 auto rifle" }, + "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. Unlike its more common brother, the M16 burst rifle, this one has full-auto capabilities. It is chambered in 5.56x45mm and accepts STANAG magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "m16a3", + "name": { "str": "M16A3" }, + "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil. This one is a relatively rare M16A3, with full auto capability.", + "weight": 1 + }, + { + "id": "acr", + "name": { "str": "Remington ACR" }, + "description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines." + } + ], + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], + "flags": [ "OBSOLETE" ] + } +] diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index ec752d8f293a0..4528fc0700788 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -387,6 +387,11 @@ "id": "browning_a5", "name": { "str": "Browning Auto 5" }, "description": "This humble looking shotgun was the earliest successful semi-automatic shotgun, and the second most successful in U.S. history, with over 2.7 million made between 1902 and 1998. The recoil tuning mechanism under the handguard and long dwell time of the action make for pleasant shooting." + }, + { + "id": "ithaca37", + "name": { "str": "Ithaca M37 Featherlight" }, + "description": "A seasoned veteran of America’s sporting culture, the Ithaca M37 is the oldest pump-action shotgun still in active production. The M37 has served hunters and officers for over eight decades, featuring a bottom-feeding and ejecting design that keeps the action sealed from the elements. An heirloom that retains its utility all the way from pre-Cataclysm hunting expeditions up into the depths of alien environments, it would be wise to keep it handy, for close encounters." } ], "ascii_picture": "remington870", diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index f0b1142e7fb48..08b4420fe702a 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -1,25 +1,556 @@ [ + { + "id": "retool_ar15_223rem_extended", + "copy-from": "retool_ar15_223rem", + "type": "GUNMOD", + "name": { "str": "extended .223 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 20-inch barrel chambered for .223 Remington ammunition, commonly installed on full-length M16 rifles.", + "longest_side": "584 mm", + "integral_longest_side": "508 mm" + }, + { + "id": "retool_ar15_223rem", + "type": "GUNMOD", + "name": { "str": ".223 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers allow compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a standard 16-inch barrel chambered for .223 Remington ammunition.", + "weight": "2268 g", + "volume": "1550 ml", + "longest_side": "480 mm", + "integral_volume": "1550 ml", + "integral_weight": "2268 g", + "integral_longest_side": "41 cm", + "price": 25999, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "m4_cqbr", + "modular_m4_carbine", + "modular_m16a4", + "modular_m16_auto_rifle", + "modular_m27_assault_rifle" + ], + "install_time": "5 m", + "ammo_modifier": [ "223" ], + "min_skills": [ [ "weapon", 2 ] ], + "add_mod": [ [ "brass catcher", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] + }, + { + "id": "retool_ar15_223rem_medium", + "copy-from": "retool_ar15_223rem", + "type": "GUNMOD", + "name": { "str": "mid-length .223 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 14.5-inch barrel chambered for .223 Remington ammunition, commonly installed on standard-issue M4 carbines.", + "longest_side": "445 mm", + "integral_longest_side": "368 mm" + }, + { + "id": "retool_ar15_223rem_short", + "copy-from": "retool_ar15_223rem", + "type": "GUNMOD", + "name": { "str": "CQB .223 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 10.3-inch barrel chambered for .223 Remington ammunition, commonly installed on special-purpose carbines, including those used by US SOCOM forces.", + "weight": "1360 g", + "longest_side": "337 mm", + "integral_weight": "1360 g", + "integral_longest_side": "261 mm", + "price": 26999 + }, { "id": "retool_ar15_300blk", "type": "GUNMOD", - "name": { "str": ".300 AAC Blackout AR-15 conversion kit" }, - "description": "A complete AR-15 upper assembly with a .300 AAC Blackout barrel.", + "name": { "str": ".300BLK upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a specialized 16-inch barrel chambered for .300 AAC Blackout ammunition. Fortunately, standard STANAG magazines are still compatible.", + "weight": "2608 g", + "volume": "1550 ml", + "longest_side": "480 mm", + "integral_volume": "1550 ml", + "integral_weight": "2608 g", + "integral_longest_side": "41 cm", + "price": 25999, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "m4_cqbr", + "modular_m4_carbine", + "modular_m16a4", + "modular_m16_auto_rifle", + "modular_m27_assault_rifle" + ], + "install_time": "5 m", + "ammo_modifier": [ "300blk" ], + "min_skills": [ [ "weapon", 2 ] ], + "add_mod": [ [ "brass catcher", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] + }, + { + "id": "retool_ar15_300blk_medium", + "copy-from": "retool_ar15_300blk", + "type": "GUNMOD", + "name": { "str": "mid-length .300BLK upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a specialized 10.5-inch barrel chambered for .300 AAC Blackout ammunition. Fortunately, standard STANAG magazines are still compatible.", + "weight": "1814 g", + "longest_side": "342 mm", + "integral_weight": "1814 g", + "integral_longest_side": "266 mm" + }, + { + "id": "retool_ar15_300blk_short", + "copy-from": "retool_ar15_300blk", + "type": "GUNMOD", + "name": { "str": "CQB .300BLK upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a specialized 7.5-inch barrel chambered for .300 AAC Blackout ammunition. Fortunately, standard STANAG magazines are still compatible.", + "weight": "1590 g", + "longest_side": "240 mm", + "integral_weight": "1590 g", + "integral_longest_side": "190 mm" + }, + { + "id": "retool_ar15_50beowulf", + "type": "GUNMOD", + "name": { "str": "12.7x42mm upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a big-bore 18-inch barrel chambered for .50 Beowulf rounds. Specialized or modified STANAG-style magazines are required to properly feed the much larger cartridges.", + "weight": "1474 g", + "volume": "1550 ml", + "longest_side": "533 mm", + "integral_volume": "1550 ml", + "integral_weight": "1474 g", + "integral_longest_side": "457 mm", + "price": 10199, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "m4_cqbr", + "modular_m4_carbine", + "modular_m16a4", + "modular_m16_auto_rifle", + "modular_m27_assault_rifle" + ], + "install_time": "5 m", + "dispersion_modifier": 15, + "ammo_modifier": [ "50beowulf" ], + "min_skills": [ [ "weapon", 2 ] ], + "add_mod": [ [ "brass catcher", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] + }, + { + "id": "retool_ar15_50beowulf_medium", + "copy-from": "retool_ar15_50beowulf", + "type": "GUNMOD", + "name": { "str": "mid-length 12.7x42mm upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a big-bore 16-inch barrel chambered for .50 Beowulf rounds. Specialized or modified STANAG-style magazines are required to properly feed the much larger cartridges.", + "weight": "1361 g", + "longest_side": "480 mm", + "integral_weight": "1361 g", + "integral_longest_side": "41 cm", + "price": 12299 + }, + { + "id": "retool_ar15_50beowulf_short", + "copy-from": "retool_ar15_50beowulf", + "type": "GUNMOD", + "name": { "str": "CQB 12.7x42mm upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a big-bore 7.5-inch barrel chambered for .50 Beowulf rounds. Specialized or modified STANAG-style magazines are required to properly feed the much larger cartridges.", + "weight": "454 g", + "longest_side": "240 mm", + "integral_weight": "454 g", + "integral_longest_side": "190 mm", + "price": 10999 + }, + { + "id": "retool_ar15_450", + "type": "GUNMOD", + "name": { "str": ".450 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a high-caliber 18-inch barrel chambered for .450 Bushmaster cartridges. Special-purpose low-capacity magazines are required to feed the large rounds, but the upper turns any AR-15 into a short-range powerhouse.", + "weight": "2722 g", + "volume": "1550 ml", + "longest_side": "533 mm", + "integral_volume": "1550 ml", + "integral_weight": "2722 g", + "integral_longest_side": "457 mm", + "price": 27999, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "m4_cqbr", + "modular_m4_carbine", + "modular_m16a4", + "modular_m16_auto_rifle", + "modular_m27_assault_rifle" + ], + "install_time": "5 m", + "dispersion_modifier": 15, + "ammo_modifier": [ "450" ], + "min_skills": [ [ "weapon", 2 ] ], + "add_mod": [ [ "brass catcher", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] + }, + { + "id": "retool_ar15_450_medium", + "copy-from": "retool_ar15_450", + "type": "GUNMOD", + "name": { "str": "mid-length .450 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a high-caliber 10.5-inch barrel chambered for .450 Bushmaster cartridges. Special-purpose low-capacity magazines are required to feed the large rounds, but the upper turns any AR-15 into a short-range powerhouse.", + "weight": "794 g", + "longest_side": "342 mm", + "integral_weight": "794 g", + "integral_longest_side": "266 mm", + "price": 14299 + }, + { + "id": "retool_ar15_450_short", + "copy-from": "retool_ar15_450", + "type": "GUNMOD", + "name": { "str": "CQB .450 upper receiver" }, + "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit furnishing a weapon with a high-caliber 7.5-inch barrel chambered for .450 Bushmaster cartridges. Special-purpose low-capacity magazines are required to feed the large rounds, but the upper turns any AR-15 into a short-range powerhouse.", + "weight": "680 g", + "longest_side": "240 mm", + "integral_weight": "680 g", + "integral_longest_side": "190 mm", + "price": 10699 + }, + { + "id": "retool_ar15_762", + "type": "GUNMOD", + "name": { "str": "7.62x39mm upper receiver" }, + "description": "This is a complete upper receiver assembly containing a 16-inch barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle’s lower frame. Swappable uppers allow compatible firearms to be retooled for different cartridges and barrel lengths, with this kit bringing to life the dreams of users wishing to feed capitalism’s rifle with communist lead. Necessitating a proprietary magazine to cycle the hefty munitions, you’re honestly unsure if this constitutes a brilliant idea, a bastard, or just a paradox.", + "weight": "2268 g", + "volume": "1550 ml", + "longest_side": "480 mm", + "integral_volume": "1550 ml", + "integral_weight": "2268 g", + "integral_longest_side": "41 cm", + "price": 36999, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "m4_cqbr", + "modular_m4_carbine", + "modular_m16a4", + "modular_m16_auto_rifle", + "modular_m27_assault_rifle" + ], + "install_time": "5 m", + "ammo_modifier": [ "762" ], + "min_skills": [ [ "weapon", 2 ] ], + "add_mod": [ [ "brass catcher", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] + }, + { + "id": "retool_mdrx_223rem", + "type": "GUNMOD", + "name": { "str": "MDRX .223 extended-assembly", "str_pl": "MDRX .223 extended-assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach barrel installable within the chassis of a Desert Tec MDRX rifle. Bored for .223-caliber munitions and requiring STANAG magazines for feeding, the assembly makes the most from the weapon’s bullpup design with a 20-inch barrel configuration, coaxing increased terminal performance from fired rounds.", "weight": "1000 g", "volume": "500 ml", + "longest_side": "508 mm", "integral_volume": "0 ml", - "integral_weight": "0 g", - "price": 50000, + "integral_weight": "1000 g", + "integral_longest_side": "304 mm", + "price": 78000, "price_postapoc": 1000, - "material": [ "steel" ], + "material": [ "steel", "aluminum", "plastic" ], "symbol": ":", "color": "green", "location": "bore", - "mod_targets": [ "ar15", "m4_carbine", "m16a4", "m16_auto_rifle", "m27_assault_rifle" ], - "install_time": "1 m", + "mod_targets": [ "mdrx", "mdrx_223", "mdrx_223short", "mdrx_300", "mdrx_308", "mdrx_308medium" ], + "install_time": "5 m", + "ammo_modifier": [ "223" ], + "//": "Stats taken from the ported barrel to provide a compensated effect.", + "dispersion_modifier": 15, + "handling_modifier": 4, + "loudness_modifier": 8, + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_mdrx_223rem_medium", + "copy-from": "retool_mdrx_223rem", + "type": "GUNMOD", + "name": { "str": "MDRX .223 standard-assembly", "str_pl": "MDRX .223 standard-assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach barrel installable within the chassis of a Desert Tec MDRX rifle. Bored for .223-caliber munitions, the assembly requires STANAG magazines for feeding.", + "weight": "840 g", + "longest_side": "406 mm", + "integral_weight": "840 g", + "integral_longest_side": "203 mm", + "price": 73000 + }, + { + "id": "retool_mdrx_223rem_short", + "copy-from": "retool_mdrx_223rem", + "type": "GUNMOD", + "name": { "str": "MDRX .223 MICRON assembly", "str_pl": "MDRX .223 MICRON assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach barrel installable within the chassis of a Desert Tec MDRX rifle. Bored for .223-caliber munitions and requiring STANAG magazines for feeding, the assembly renders the MDRX into a compact CQB carbine, with an 11.5-inch barrel recessed into the weapon’s bullpup layout.", + "weight": "680 g", + "longest_side": "292 mm", + "integral_weight": "680 g", + "integral_longest_side": "89 mm" + }, + { + "id": "retool_mdrx_300blk", + "type": "GUNMOD", + "name": { "str": "MDRX .300BLK standard-assembly", "str_pl": "MDRX .300BLK standard-assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach barrel installable within the chassis of a Desert Tec MDRX rifle. Bored for .300 AAC Blackout munitions and requiring STANAG magazines for feeding, the assembly makes the most from the weapon’s bullpup design with a 20-inch configuration, coaxing increased terminal performance from fired rounds.", + "weight": "840 g", + "volume": "500 ml", + "longest_side": "508 mm", + "integral_volume": "0 ml", + "integral_weight": "840 g", + "integral_longest_side": "304 mm", + "price": 86000, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "mdrx", "mdrx_223", "mdrx_223short", "mdrx_300", "mdrx_308", "mdrx_308medium" ], + "install_time": "5 m", "ammo_modifier": [ "300blk" ], "magazine_adaptor": [ [ "300blk", [ "stanag30", "stanag50", "survivor223mag" ] ] ], + "//": "Stats taken from the ported barrel to provide a compensated effect.", + "dispersion_modifier": 15, + "handling_modifier": 4, + "loudness_modifier": 8, + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_mdrx_308win", + "type": "GUNMOD", + "name": { "str": "MDRX .308 extended-assembly", "str_pl": "MDRX .308 extended-assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach, 20-inch barrel installable within the chassis of a Desert Tec MDRX rifle. chambered for long-range .308 Winchester munitions and requiring AR-10 magazines for feeding, the assembly essentially retools the weapon into a designated marksman’s rifle.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "508 mm", + "integral_volume": "0 ml", + "integral_weight": "1000 g", + "integral_longest_side": "304 mm", + "price": 98000, + "price_postapoc": 1000, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "mdrx", "mdrx_223", "mdrx_223short", "mdrx_300", "mdrx_308", "mdrx_308medium" ], + "install_time": "5 m", + "ammo_modifier": [ "308" ], + "magazine_adaptor": [ [ "308", [ "ar10mag_20rd", "ar10_makeshiftmag" ] ] ], + "//": "Stats taken from the ported barrel to provide a compensated effect.", + "dispersion_modifier": 15, + "handling_modifier": 4, + "loudness_modifier": 8, + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_mdrx_308win_medium", + "copy-from": "retool_mdrx_223rem", + "type": "GUNMOD", + "name": { "str": "MDRX .308 standard-assembly", "str_pl": "MDRX .308 standard-assemblies" }, + "description": "Crowned with a proprietary gas compensator and complemented by a compatible bolt assembly, this is a quick-detach, 16-inch barrel installable within the chassis of a Desert Tec MDRX rifle. Chambered for long-range .308 Winchester munitions and requiring AR-10 magazines for feeding, the assembly essentially retools the weapon into a designated marksman’s rifle.", + "weight": "840 g", + "longest_side": "406 mm", + "integral_weight": "840 g", + "integral_longest_side": "203 mm", + "price": 96000 + }, + { + "id": "retool_axmc_338lapua", + "type": "GUNMOD", + "name": { "str": "AXMC .338 barrel-assembly", "str_pl": "AXMC .338 barrel-assemblies" }, + "description": "This is a specialized 27-inch .338-caliber barrel and bolt face that is installable within the main chassis of an Accuracy International AXMC rifle, converting it to fire the .338 Lapua cartridge.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "686 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "686 mm", + "price": 82500, + "price_postapoc": 1000, + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "axmc", "axmc_300", "axmc_308" ], + "install_time": "2 m", + "ammo_modifier": [ "338lapua" ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_axmc_300win", + "type": "GUNMOD", + "name": { "str": "AXMC .300 barrel-assembly", "str_pl": "AXMC .300 barrel-assemblies" }, + "description": "This is a specialized 24-inch .300-caliber barrel and bolt face that is installable within the main chassis of an Accuracy International AXMC rifle, converting it to fire the .300 Winchester Magnum cartridge.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "610 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "610 mm", + "price": 82500, + "price_postapoc": 1000, + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "axmc", "axmc_300", "axmc_308" ], + "install_time": "2 m", + "ammo_modifier": [ "300" ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_axmc_308win", + "type": "GUNMOD", + "name": { "str": "AXMC .308 barrel-assembly", "str_pl": "AXMC .308 barrel-assemblies" }, + "description": "This is a specialized 24-inch .308-caliber barrel and bolt face that is installable within the main chassis of an Accuracy International AXMC rifle, converting it to fire the .308 Winchester cartridge.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "610 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "610 mm", + "price": 82500, + "price_postapoc": 1000, + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "axmc", "axmc_300", "axmc_308" ], + "install_time": "2 m", + "ammo_modifier": [ "308" ], + "magazine_adaptor": [ [ "308", [ "ai_308mag_10" ] ] ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_cz600_223rem", + "type": "GUNMOD", + "name": { "str": "CZ .223 barrel-assembly", "str_pl": "CZ .223 barrel-assemblies" }, + "description": "This is a quick-detach .223-caliber barrel assembly and bolt-head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is capable of feeding ammunition from standard STANAG-style magazines.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "406 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "406 mm", + "//": "Couldn’t find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", + "price": 25000, + "price_postapoc": 1000, + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "cz600", "cz600_762" ], + "install_time": "2 m", + "ammo_modifier": [ "223" ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_cz600_762", + "type": "GUNMOD", + "name": { "str": "CZ 7.62x39mm barrel-assembly", "str_pl": "CZ 7.62x39mm barrel-assemblies" }, + "description": "This is a quick-detach 7.62mm barrel assembly and bolt head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is rendered compatible with 7.62x39mm CZ Bren 2 magazines.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "406 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "406 mm", + "//": "Couldn’t find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", + "price": 25000, + "price_postapoc": 1000, + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "cz600", "cz600_762" ], + "install_time": "2 m", + "ammo_modifier": [ "762" ], "min_skills": [ [ "weapon", 1 ] ], - "flags": [ "IRREMOVABLE" ] + "add_mod": [ [ "muzzle", 1 ] ] }, { "id": "staff_sling_grenade_cradle", diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 4449db09df44b..ce42778d9d11b 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -10,7 +10,7 @@ "integral_weight": "0 g", "price": 1500, "price_postapoc": 500, - "material": [ "steel", "superalloy" ], + "material": [ "steel" ], "symbol": ":", "color": "dark_gray", "location": "mechanism", @@ -34,7 +34,24 @@ "symbol": ":", "color": "red", "location": "mechanism", - "mod_targets": [ "ar15", "ar15_retool_300blk", "ar_pistol", "oa93" ], + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "ar_pistol", + "oa93" + ], "//": "Install time short since it drops in, hinging open the AR being all the 'skill' necessary. Precision drop marginal since it'd change how semi and FA trigger pulls feel.", "install_time": "5 m", "dispersion_modifier": 10, @@ -56,7 +73,24 @@ "symbol": ":", "color": "red", "location": "mechanism", - "mod_targets": [ "ar15", "ar15_retool_300blk", "ar_pistol", "oa93" ], + "mod_targets": [ + "ar15_223long", + "modular_ar15", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "ar_pistol", + "oa93" + ], "//": "Sort of long install time. Gotta grind down the carrier trip to SP1-ish length. Unfortunately, since you're sort of guessing how long that is, the AR's timing with this installed will be borked.(disco might be disengaged at non-ideal times).", "install_time": "25 m", "dispersion_modifier": 40, diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json index a57d6ce6d1bf2..7d457f23fc216 100644 --- a/data/json/items/magazine/300.json +++ b/data/json/items/magazine/300.json @@ -15,5 +15,23 @@ "ammo_type": [ "300" ], "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "300": 5 } } ] + }, + { + "id": "ruger_pr_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "Ruger Precision Rifle 5-round magazine" }, + "description": "A single-stack, 5-round, detachable magazine compatible with the Ruger Precision Rifle. Holding five rounds of.300 Winchester Magnum, the magazine is styled along the lines of Accuracy International’s magnum magazines, the latter of which has become the gold standard for precision weapon magazines.", + "weight": "78 g", + "volume": "250 ml", + "longest_side": "98 mm", + "price": 9099, + "price_postapoc": 100, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "300" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "300": 5 } } ] } ] diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json index 9eb3e2b686922..d46f4185b3ec6 100644 --- a/data/json/items/magazine/308.json +++ b/data/json/items/magazine/308.json @@ -300,5 +300,22 @@ "price_postapoc": 50, "name": { "str": "AR-10 5-round makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the AR-10 rifle." + }, + { + "id": "ai_308mag_10", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AI .308 10-round magazine" }, + "description": "A single-stack, 10-round steel box magazine, produced by the British precision rifle company, Accuracy International. Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with the .308 Winchester cartridge.", + "weight": "110 g", + "volume": "250 ml", + "price": 9253, + "price_postapoc": 100, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "308" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 10 } } ] } ] diff --git a/data/json/items/magazine/338lapua.json b/data/json/items/magazine/338lapua.json new file mode 100644 index 0000000000000..1222ab9a5d5a2 --- /dev/null +++ b/data/json/items/magazine/338lapua.json @@ -0,0 +1,53 @@ +[ + { + "id": "ai_338mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AI .338 Lapua 5-round magazine" }, + "description": "A single-stack, 5-round steel box magazine, produced by the British precision rifle company, Accuracy International. Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with both the .338 Lapua and .300 Winchester Magnum cartridges.", + "weight": "78 g", + "volume": "250 ml", + "price": 10614, + "price_postapoc": 150, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "338lapua", "300" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 5, "300": 5 } } ] + }, + { + "id": "ai_338mag_10", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AI .338 Lapua 10-round magazine" }, + "description": "A single-stack, 10-round steel box magazine, produced by the British precision rifle company, Accuracy International. Magazines such as this one have been regarded as the gold standard for marksman rifle magazines, with this particular one being compatible with both the .338 Lapua and .300 Winchester Magnum cartridges.", + "weight": "160 g", + "volume": "400 ml", + "price": 16856, + "price_postapoc": 150, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "338lapua", "300" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 10, "300": 10 } } ] + }, + { + "id": "mrad_338lapua_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "Barrett .338 Lapua 10-round magazine" }, + "description": "A standard 10-round box magazine which can hold up to 10 .338 Lapua rounds, and is compatible with appropriately chambered Barrett rifles.", + "weight": "200 g", + "volume": "400 ml", + "price": 8000, + "price_postapoc": 250, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "338lapua" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 10 } } ] + } +] diff --git a/data/json/items/magazine/450bushmaster.json b/data/json/items/magazine/450bushmaster.json new file mode 100644 index 0000000000000..7f32ea074fbf6 --- /dev/null +++ b/data/json/items/magazine/450bushmaster.json @@ -0,0 +1,36 @@ +[ + { + "id": "450_ar15mag", + "type": "MAGAZINE", + "name": { "str": ".450 Bushmaster 4-round conversion magazine" }, + "description": "An aluminum box magazine containing a single four round stack of .450 Bushmaster cartridges, engineered to fit and feed appropriately converted AR-platform rifles.", + "weight": "226 g", + "volume": "290 ml", + "longest_side": "190 mm", + "price": 2999, + "price_postapoc": 250, + "material": [ "aluminum" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "450" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "450": 4 } } ] + }, + { + "id": "ruger_arr_mag", + "type": "MAGAZINE", + "name": { "str": "Ruger American Rifle 3-round magazine" }, + "description": "A detachable polymer box magazine, capable of containing three rounds of .450 Bushmaster and compatible with appropriately chambered American Ranch Rifles.", + "weight": "78 g", + "volume": "220 ml", + "longest_side": "100 mm", + "price": 2999, + "price_postapoc": 150, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "450" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "450": 3 } } ] + } +] diff --git a/data/json/items/magazine/50beowulf.json b/data/json/items/magazine/50beowulf.json new file mode 100644 index 0000000000000..7373018083c7b --- /dev/null +++ b/data/json/items/magazine/50beowulf.json @@ -0,0 +1,75 @@ +[ + { + "id": "stanag20_beowulf", + "copy-from": "stanag20", + "type": "MAGAZINE", + "name": { "str": "retooled STANAG 20-round magazine" }, + "description": "This 20-round box magazine is compatible with STANAG rifles and has been modified to hold a single-stack, seven round column of .50-caliber Beowulf ammo. The front lip of the magazine has been beveled to allow for reliable feeding of the Beowulf rounds into a properly converted weapon’s chamber, and, happily, this modification hasn’t interfered with the magazine's ability to hold standard ammunition.", + "ammo_type": [ "50beowulf", "223", "300blk" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "allowed_speedloaders": [ "clip223_10rd" ], + "ammo_restriction": { "50beowulf": 7, "223": 20, "300blk": 20 } + } + ] + }, + { + "id": "stanag20ranger_beowulf", + "copy-from": "stanag20ranger", + "type": "MAGAZINE", + "name": { + "str": "retooled STANAG 20-round magazine with ranger plate", + "str_pl": "retooled STANAG 20-round magazines with ranger plates" + }, + "description": "This 20-round box magazine is compatible with STANAG rifles and has been modified to hold a single-stack, seven round column of .50-caliber Beowulf ammo. The front lip of the magazine has been beveled to allow for reliable feeding of the Beowulf rounds into a properly converted weapon’s chamber, and, happily, this modification hasn’t interfered with the magazine's ability to hold standard ammunition. The bottom has been modified with a ranger plate attachment to allow it to clip to carabiners.", + "ammo_type": [ "50beowulf", "223", "300blk" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50beowulf": 7, "223": 30, "300blk": 30 } } ] + }, + { + "id": "stanag30_beowulf", + "copy-from": "stanag30", + "type": "MAGAZINE", + "name": { "str": "retooled STANAG 30-round magazine" }, + "description": "This 30-round box magazine is compatible with STANAG rifles and has been modified to hold a single-stack, 10-round column of .50-caliber Beowulf ammo. The front lip of the magazine has been beveled to allow for reliable feeding of the Beowulf rounds into a properly converted weapon’s chamber, and, happily, this modification hasn’t interfered with the magazine's ability to hold standard ammunition.", + "ammo_type": [ "50beowulf", "223", "300blk" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "allowed_speedloaders": [ "clip223_10rd" ], + "ammo_restriction": { "50beowulf": 10, "223": 30, "300blk": 30 } + } + ] + }, + { + "id": "stanag30ranger_beowulf", + "copy-from": "stanag30ranger", + "type": "MAGAZINE", + "name": { + "str": "retooled STANAG 30-round magazine with ranger plate", + "str_pl": "retooled STANAG 30-round magazines with ranger plates" + }, + "description": "This 30-round box magazine is compatible with STANAG rifles and has been modified to hold a single-stack, 10-round column of .50-caliber Beowulf ammo. The front lip of the magazine has been beveled to allow for reliable feeding of the Beowulf rounds into a properly converted weapon’s chamber, and, happily, this modification hasn’t interfered with the magazine's ability to hold standard ammunition. The bottom has been modified with a ranger plate attachment to allow it to clip to carabiners.", + "ammo_type": [ "50beowulf", "223", "300blk" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50beowulf": 10, "223": 30, "300blk": 30 } } ] + }, + { + "id": "50beowulf_ar15mag", + "type": "MAGAZINE", + "name": { "str": ".50 Beowulf 10-round conversion magazine" }, + "description": "A detachable 10-round box magazine, nearly identical in size and shape to standard 30-round STANAG magazines, and able to be inserted into the same compatible rifles. The magazine has been engineered to feed a single-stack column of.50 Beowulf ammunition into the chamber of an appropriately converted AR-style firearm.", + "weight": "226 g", + "volume": "290 ml", + "longest_side": "190 mm", + "price": 2999, + "price_postapoc": 250, + "material": [ "aluminum" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "50beowulf" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50beowulf": 10 } } ] + } +] diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json index 7011d5e03de71..87f1fbc4f006d 100644 --- a/data/json/items/magazine/762.json +++ b/data/json/items/magazine/762.json @@ -136,5 +136,108 @@ "ammo_type": [ "762" ], "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ] + }, + { + "id": "bren2_762mag30", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "Bren 2 30-round magazine" }, + "description": "A proprietary polymer box magazine, capable of containing 30 7.62x39mm rounds and compatible with the Czech Bren 2 carbine. Unlike conventional 7.62x39mm magazines, this one is inserted straight up into the magazine well rather than rocked in, in order to facilitate a bolt-hold open mechanism.", + "weight": "190 g", + "volume": "370 ml", + "price": 3199, + "price_postapoc": 250, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ] + }, + { + "id": "bren2_762mag10", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "Bren 2 10-round magazine" }, + "description": "A proprietary polymer box magazine, capable of containing 10 7.62x39mm rounds and compatible with the Czech Bren 2 carbine. Unlike conventional 7.62x39mm magazines, this one is inserted straight up into the magazine well rather than rocked in, in order to facilitate a bolt-hold open mechanism.", + "weight": "130 g", + "volume": "151 ml", + "price": 2250, + "price_postapoc": 100, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 10 } } ] + }, + { + "id": "762_ar15mag_5rd", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "7.62mm 5-round conversion magazine" }, + "description": "Engineered to allow the tapered 7.62x39mm cartridge to reliably cycle into the chamber of an appropriately converted firearm, this compact 5-round steel box magazine is compatible with AR-15-style rifles.", + "weight": "210 g", + "volume": "228 ml", + "longest_side": "101 mm", + "price": 3000, + "price_postapoc": 40, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 5 } } ] + }, + { + "id": "762_ar15mag_10rd", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "7.62mm 10-round conversion magazine" }, + "description": "Engineered to allow the tapered 7.62x39mm cartridge to reliably cycle into the chamber of an appropriately converted firearm, this compact 10-round steel box magazine is compatible with AR-15-style rifles.", + "weight": "130 g", + "volume": "151 ml", + "price": 3000, + "price_postapoc": 60, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 10 } } ] + }, + { + "id": "762_ar15mag_20rd", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "7.62mm 20-round conversion magazine" }, + "description": "Engineered to allow the tapered 7.62x39mm cartridge to reliably cycle into the chamber of an appropriately converted firearm, this 20-round steel box magazine is compatible with AR-15-style rifles.", + "weight": "283 g", + "volume": "265 ml", + "price": 3000, + "price_postapoc": 100, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 20 } } ] + }, + { + "id": "762_ar15mag_30rd", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "7.62mm 30-round conversion magazine" }, + "description": " Engineered to allow the tapered 7.62x39mm cartridge to reliably cycle into the chamber of an appropriately converted firearm and possessing a dramatic curve that looks laughably goofy, this 30-round steel box magazine is compatible with AR-15-style rifles.", + "weight": "326 g", + "volume": "379 ml", + "price": 3000, + "price_postapoc": 120, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ] } ] diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index eb90e6bcf6568..5f0a926e0876e 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -761,8 +761,8 @@ { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 }, { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, @@ -770,21 +770,21 @@ "repeat": 30 }, { - "item": "m27_assault_rifle", - "variant": "m27iar", + "item": "modular_m27_assault_rifle", + "variant": "modular_m27iar", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 8 }, - { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, + { "item": "modular_m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 }, { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 }, { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "x": 16, "y": [ 9, 11 ], "magazine": 100, diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index 4e691891bc387..5ab416d4c5f75 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -640,7 +640,7 @@ "magazine": 100, "ammo": 10, "id": "feral_autogun", - "items": [ [ "m4_carbine", 500 ], [ "ar15", 500 ] ] + "items": [ [ "modular_m4_carbine", 500 ], [ "modular_ar15", 500 ] ] }, { "type": "item_group", diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index dadd2cf0081e7..87c88f638935c 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -260,7 +260,7 @@ ], "prob": 200 }, - { "item": "ar15", "prob": 5, "charges": [ 0, 30 ] }, + { "item": "modular_ar15", "prob": 5, "charges": [ 0, 30 ] }, { "item": "mossberg_500", "prob": 5, "charges": [ 0, 6 ] }, { "item": "remington_870", "prob": 5, "charges": [ 0, 5 ] }, { "item": "ruger_1022", "prob": 15, "charges": [ 0, 10 ] }, diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json index ded6c0e4b8edf..88ed1fcdce260 100644 --- a/data/json/monsters/defense_bot.json +++ b/data/json/monsters/defense_bot.json @@ -104,7 +104,7 @@ "type": "gun", "cooldown": 1, "move_cost": 150, - "gun_type": "m16a4", + "gun_type": "modular_m16a4", "ammo_type": "556", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, diff --git a/data/json/npcs/NC_ARMY.json b/data/json/npcs/NC_ARMY.json index dbb271cea2ec5..82961b7cf3754 100644 --- a/data/json/npcs/NC_ARMY.json +++ b/data/json/npcs/NC_ARMY.json @@ -162,7 +162,7 @@ "id": "NC_ARMY_rifle", "subtype": "distribution", "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "prob": 50 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 50 }, { "item": "m14ebr", "prob": 35 }, { "item": "m249", "prob": 20 } ] diff --git a/data/json/npcs/NC_ARSONIST.json b/data/json/npcs/NC_ARSONIST.json index 878cf176a1d43..280df04b6297a 100644 --- a/data/json/npcs/NC_ARSONIST.json +++ b/data/json/npcs/NC_ARSONIST.json @@ -195,7 +195,7 @@ "id": "NC_ARSONIST_rifle", "subtype": "distribution", "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "prob": 35 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 35 }, { "item": "m1a", "prob": 35 }, { "item": "ak47", "prob": 35 } ] diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index fffe8515c35ae..1db0caa0beaa3 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -122,7 +122,7 @@ { "item": "cx4", "prob": 1 }, { "item": "usp_45", "prob": 10 }, { "item": "m1911", "prob": 10 }, - { "item": "ar15", "prob": 10 }, + { "item": "modular_ar15", "prob": 10 }, { "item": "savage_111f", "prob": 5 }, { "item": "remington_700", "prob": 5 }, { "item": "ruger_1022", "prob": 10 }, diff --git a/data/json/npcs/NC_OPS.json b/data/json/npcs/NC_OPS.json index 8454756ae754b..661d704859d69 100644 --- a/data/json/npcs/NC_OPS.json +++ b/data/json/npcs/NC_OPS.json @@ -135,7 +135,7 @@ { "type": "item_group", "id": "NC_OPS_rifle", - "items": [ [ "m4_carbine", 50 ], [ "m14ebr", 35 ], [ "m249", 20 ], [ "m27_assault_rifle", 50 ], [ "M24", 35 ] ] + "items": [ [ "modular_m4_carbine", 50 ], [ "m14ebr", 35 ], [ "m249", 20 ], [ "modular_m27_assault_rifle", 50 ], [ "M24", 35 ] ] }, { "type": "item_group", diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index a0df6c5aa8c61..de9655de8e9a2 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -121,13 +121,13 @@ "type": "item_group", "id": "NC_SOLDIER_rifle", "subtype": "distribution", - "entries": [ { "item": "m4_carbine", "variant": "m4a1", "prob": 90 }, { "item": "m14ebr", "prob": 10 } ] + "entries": [ { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 90 }, { "item": "m14ebr", "prob": 10 } ] }, { "type": "item_group", "id": "NC_SOLDIER_weapon_random", "subtype": "distribution", - "entries": [ { "item": "m4_carbine", "variant": "m4a1", "prob": 35 } ] + "entries": [ { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 35 } ] }, { "type": "item_group", diff --git a/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json b/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json index 4947c456b3f27..a7e7e2f0ad016 100644 --- a/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json +++ b/data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json @@ -129,7 +129,7 @@ [ "cx4", 10 ], [ "usp_45", 10 ], [ "m1911", 10 ], - [ "ar15", 10 ], + [ "modular_ar15", 10 ], [ "savage_111f", 5 ], [ "remington_700", 5 ], [ "ruger_1022", 10 ], diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json b/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json index d56863c41d6cf..0bcb99091a705 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json @@ -213,7 +213,7 @@ [ "cx4", 1 ], [ "usp_45", 10 ], [ "m1911", 10 ], - [ "ar15", 10 ], + [ "modular_ar15", 10 ], [ "savage_111f", 5 ], [ "remington_700", 5 ], [ "ruger_1022", 10 ], diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json index a3c0bb067e674..7f3e953de8ab6 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json @@ -72,8 +72,8 @@ "subtype": "collection", "items": [ { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight", "suppressor" ] diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json index 297731ac7027e..95609e6711a12 100644 --- a/data/json/npcs/robofac/NPC_robofac_generic_security.json +++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json @@ -74,7 +74,14 @@ "type": "item_group", "id": "NC_robofac_security_weapon", "subtype": "collection", - "entries": [ { "item": "m27_assault_rifle", "variant": "m38dmr", "contents-group": "robofac_sec_weapon_mods", "charges": 30 } ] + "entries": [ + { + "item": "modular_m27_assault_rifle", + "variant": "modular_m38dmr", + "contents-group": "robofac_sec_weapon_mods", + "charges": 30 + } + ] }, { "type": "item_group", diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json b/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json index b6abae0969238..385f8f2d39429 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json @@ -59,8 +59,8 @@ "subtype": "collection", "items": [ { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "suppressor" ] diff --git a/data/json/npcs/scrap_trader/scrap_trader.json b/data/json/npcs/scrap_trader/scrap_trader.json index c9ba4b34e466a..29c2f779d60e9 100644 --- a/data/json/npcs/scrap_trader/scrap_trader.json +++ b/data/json/npcs/scrap_trader/scrap_trader.json @@ -110,7 +110,7 @@ { "item": "gold_ring" }, { "item": "tool_belt" }, { "item": "spearsling" }, - { "item": "ar15", "ammo-item": "223", "charges": 30, "container-item": "back_holster" } + { "item": "modular_ar15", "ammo-item": "223", "charges": 30, "container-item": "back_holster" } ] }, { diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json index 935b2a9773ad4..e38c67bb51b92 100644 --- a/data/json/obsoletion/migration_items.json +++ b/data/json/obsoletion/migration_items.json @@ -34,7 +34,7 @@ "replace": "scar_l" }, { - "id": "m27_assault_rifle", + "id": "modular_m27_assault_rifle", "from_variant": "scar_l", "type": "MIGRATION", "replace": "scar_l" @@ -144,6 +144,11 @@ "type": "MIGRATION", "replace": "paper" }, + { + "id": "ar15_retool_300blk", + "type": "MIGRATION", + "replace": "iwi_tavor_x95_300blk" + }, { "id": "army_top", "type": "MIGRATION", diff --git a/data/json/professions.json b/data/json/professions.json index c78e379fb54f6..71b097f37afb9 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -202,6 +202,37 @@ { "item": "m2010mag", "ammo-item": "300_winmag", "charges": 5 } ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "army_mags_tac338", + "entries": [ + { "item": "ai_338mag", "ammo-item": "338lapua_fmjbt", "charges": 5 }, + { "item": "ai_338mag", "ammo-item": "338lapua_fmjbt", "charges": 5 }, + { "item": "ai_338mag", "ammo-item": "338lapua_fmjbt", "charges": 5 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "mags_50beowulf_ar15", + "entries": [ + { "item": "50beowulf_ar15mag", "ammo-item": "50beowulf_xtp", "charges": 10 }, + { "item": "50beowulf_ar15mag", "ammo-item": "50beowulf_xtp", "charges": 10 }, + { "item": "50beowulf_ar15mag", "ammo-item": "50beowulf_xtp", "charges": 10 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "mags_ruger_arr", + "entries": [ + { "item": "ruger_arr_mag", "ammo-item": "450_ftx", "charges": 3 }, + { "item": "ruger_arr_mag", "ammo-item": "450_ftx", "charges": 3 }, + { "item": "ruger_arr_mag", "ammo-item": "450_ftx", "charges": 3 }, + { "item": "ruger_arr_mag", "ammo-item": "450_ftx", "charges": 3 } + ] + }, { "type": "item_group", "subtype": "collection", @@ -1091,7 +1122,7 @@ { "item": "m18", "ammo-item": "9mm", "container-item": "holster", "charges": 17 }, { "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17, "count": 2 }, { - "item": "m4_carbine", + "item": "m4_cqbr", "variant": "m4_cqbr", "ammo-item": "556", "charges": 30, @@ -1257,8 +1288,8 @@ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] @@ -1462,8 +1493,8 @@ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556_mk318", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] @@ -1474,6 +1505,57 @@ "female": [ "sports_bra", "boxer_shorts" ] } }, + { + "type": "profession", + "id": "seal_sniper", + "name": "Navy SEAL Marksmen", + "description": "Recruited into the ranks of the US Navy’s Special Warfare forces as a designated sniper, your training in precision marksmanship and maritime operations was extensive. As a proficient soldier and combative in all respects, you provided overwatch and long-range elimination services in the line of duty. Now, with naval command imploding and your spotter MIA, your skills with a rifle and covert operations are the only things standing between you and the Cataclysm.", + "points": 8, + "proficiencies": [ "prof_gunsmithing_basic", "prof_spotting", "prof_wound_care" ], + "skills": [ + { "level": 8, "name": "gun" }, + { "level": 8, "name": "rifle" }, + { "level": 4, "name": "melee" }, + { "level": 3, "name": "pistol" }, + { "level": 3, "name": "stabbing" }, + { "level": 3, "name": "dodge" }, + { "level": 4, "name": "firstaid" }, + { "level": 5, "name": "survival" }, + { "level": 3, "name": "throw" }, + { "level": 5, "name": "swimming" } + ], + "items": { + "both": { + "items": [ + "army_top", + "combat_shirt", + "tac_fullhelmet", + "mask_ski", + "gloves_liner", + "gloves_tactical", + "socks", + "diving_watch", + "load_bearing_vest", + "boots_combat", + "webbing_belt" + ], + "entries": [ + { "group": "charged_two_way_radio" }, + { "group": "charged_powered_earmuffs" }, + { "item": "pants_army", "variant": "mil_pants_navy" }, + { "item": "water_clean", "container-item": "canteen" }, + { "item": "legpouch_large", "contents-group": "army_mags_tac338" }, + { "item": "knife_combat", "container-item": "sheath" }, + { "item": "p226_9mm", "ammo-item": "9mm", "container-item": "holster", "charges": 15 }, + { "item": "p226mag_15rd_9x19mm", "ammo-item": "9mm", "charges": 15, "count": 2 }, + { "item": "tac338", "ammo-item": "338lapua_fmjbt", "charges": 5, "contents-item": [ "shoulder_strap" ] } + ] + }, + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boxer_shorts" ] + }, + "flags": [ "SCEN_ONLY" ] + }, { "type": "profession", "id": "seal", @@ -1521,7 +1603,7 @@ { "item": "p226_9mm", "ammo-item": "9mm", "container-item": "holster", "charges": 15 }, { "item": "p226mag_15rd_9x19mm", "ammo-item": "9mm", "charges": 15, "count": 2 }, { - "item": "m4_carbine", + "item": "m4_cqbr", "variant": "m4_cqbr", "ammo-item": "556", "charges": 30, @@ -1629,8 +1711,8 @@ "entries": [ { "item": "knife_combat", "container-item": "sheath" }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": "shoulder_strap" @@ -2475,6 +2557,45 @@ }, "missions": [ "MISSION_HUNTER" ] }, + { + "type": "profession", + "id": "conversion_hunter", + "name": "Big-Bore Hunter", + "description": "You always harbored a passion for hunting and a particular fondness for big-bore rifle calibers and affordable conversion kits. Whether it was their cost-effective nature or the simple, testosterone-amplifying notion that you could retool your rifle to belt out .50-caliber bullets, you preferred them for your hunting trips. Now, with your converted rifle in hand, you fancy that there isn't any game too large for you to take down.", + "points": 2, + "skills": [ { "level": 3, "name": "gun" }, { "level": 3, "name": "rifle" } ], + "items": { + "both": { + "items": [ + "army_top", + "knit_scarf", + "socks", + "boots_steel", + "pants_cargo", + "jacket_flannel", + "hat_hunting", + "wristwatch", + "back_holster" + ], + "entries": [ + { "group": "charged_smart_phone" }, + { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, + { + "item": "ar15_50", + "ammo-item": "50beowulf_xtp", + "charges": 10, + "contents-item": "shoulder_strap", + "custom-flags": [ "no_auto_equip" ] + }, + { "item": "chestrig", "contents-group": "mags_50beowulf_ar15" }, + { "item": "sheath", "contents-item": "knife_hunting" } + ] + }, + "male": [ "boxer_shorts" ], + "female": [ "sports_bra", "boxer_shorts" ] + }, + "missions": [ "MISSION_HUNTER" ] + }, { "type": "profession", "id": "construction_worker", @@ -2692,7 +2813,7 @@ { "item": "m9", "ammo-item": "9mm", "charges": 15, "container-item": "holster" }, { "item": "chestrig", "contents-group": "army_mags_m4" }, { "item": "lighter", "charges": 100 }, - { "item": "ar15", "ammo-item": "223", "charges": 30, "contents-item": [ "shoulder_strap" ] } + { "item": "modular_ar15", "ammo-item": "223", "charges": 30, "contents-item": [ "shoulder_strap" ] } ] }, "male": [ "boxer_shorts" ], @@ -3789,7 +3910,12 @@ { "item": "water_clean", "container-item": "canteen" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, - { "item": "m4_carbine", "variant": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" }, + { + "item": "modular_m4_carbine", + "variant": "modular_m4a1", + "ammo-item": "556", + "contents-item": "shoulder_strap" + }, { "group": "charged_two_way_radio" }, { "item": "chestrig", "contents-group": "army_mags_m4" } ] @@ -5133,8 +5259,8 @@ { "item": "stethoscope", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556_mk262", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] @@ -5402,7 +5528,7 @@ "type": "profession", "id": "patriot", "name": "Patriot", - "description": "You are a true American patriot, dressed in star-spangled clothing from head to toe. The government has fallen, but the spirit of the nation lives on within its people.", + "description": "You are a true American patriot, dressed with star-spangled clothing from head to toe. The government has fallen, but the nation lives on with its people.", "points": -1, "items": { "both": { @@ -5416,11 +5542,34 @@ } } }, + { + "type": "profession", + "id": "prepped_patriot", + "name": "Prepped Patriot", + "description": "Does the American dream still exist? Well, recent events have put that to the test. Does it still proudly live in your beating heart? Yes. Yes, it does. A patriot to the bitter end, you’ve readied yourself to go toe to toe with the Cataclysm that would seek to do harm to your darling USA. That is to say, you grabbed your gun… and nothing more. God bless America, soldier.", + "points": 1, + "skills": [ { "level": 1, "name": "gun" }, { "level": 1, "name": "rifle" } ], + "items": { + "both": { + "items": [ "american_flag", "slippers" ], + "entries": [ + { "group": "charged_smart_phone" }, + { "item": "mask_dust", "variant": "flag_mask_dust" }, + { "item": "chestrig", "variant": "flag_chestrig", "contents-group": "mags_ruger_arr" }, + { "item": "cowboy_hat", "variant": "flag_cowboy_hat" }, + { "item": "leg_bag", "variant": "flag_leg_bag" }, + { "item": "ruger_arr", "ammo-item": "450_ftx", "charges": 3, "contents-item": "shoulder_strap" } + ] + }, + "male": { "entries": [ { "item": "boxer_shorts", "variant": "flag_boxer_shorts" } ] }, + "female": { "entries": [ { "item": "boy_shorts", "variant": "flag_boy_shorts" } ] } + } + }, { "type": "profession", "id": "cowboy", "name": "Cowboy", - "description": "You liked to spend your days taking care of the horses and cows, searching the perimeter of the ranch in your steed and looking out for anything suspicious, that's why you managed to escape in time when shit hit the fan.", + "description": "You liked to spend your days taking care of the horses and cows, searching the perimeter of the ranch on your steed and looking out for anything suspicious, that's why you managed to escape in time when shit hit the fan.", "points": 4, "proficiencies": [ "prof_gunsmithing_basic" ], "skills": [ diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index 184876cc5e4c5..b070d3e5c48f8 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -1379,5 +1379,343 @@ "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "123ln_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 32 ] ], [ [ "copper", 2 ] ] ] + }, + { + "result": "reloaded_50beowulf_xtp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 5 ] ], + "//": "1720 mg gunpowder rounded to 17 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "50beowulf_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 17 ], [ "gunpowder_rifle", 17 ], [ "gunpowder_magnum_pistol", 17 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "reloaded_50beowulf_penetrator", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 7 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], + "//": "2120 mg gunpowder rounded to 21 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "50beowulf_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 21 ], [ "gunpowder_magnum_pistol", 21 ], [ "gunpowder_rifle", 21 ] ], + [ [ "copper", 6 ] ] + ] + }, + { + "result": "bp_50beowulf_xtp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "1720 mg gunpowder rounded to 17 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "50beowulf_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "chem_black_powder", 17 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "bp_50beowulf_penetrator", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "2120 mg gunpowder rounded to 21 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "50beowulf_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 21 ] ], [ [ "copper", 6 ] ] ] + }, + { + "result": "reloaded_450_ftx", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 5 ] ], + "//": "3730 mg gunpowder rounded to 37 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "450_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 37 ], [ "gunpowder_rifle", 37 ], [ "gunpowder_magnum_pistol", 37 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "reloaded_450_penetrator", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 7 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], + "//": "3430 mg gunpowder rounded to 34 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "450_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 34 ], [ "gunpowder_magnum_pistol", 34 ], [ "gunpowder_rifle", 34 ] ], + [ [ "copper", 6 ] ] + ] + }, + { + "result": "bp_450_ftx", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "3730 mg gunpowder rounded to 37 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "450_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "chem_black_powder", 37 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "bp_450_penetrator", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "3430 mg gunpowder rounded to 34 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "450_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 34 ] ], [ [ "copper", 6 ] ] ] + }, + { + "result": "reloaded_338lapua_hpbt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 5 ] ], + "//": "2644 mg gunpowder rounded to 26 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 26 ], [ "gunpowder_large_rifle", 26 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "reloaded_338lapua_fmjbt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], + "//": "2938 mg gunpowder rounded to 29 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 26 ], [ "gunpowder_large_rifle", 26 ] ], + [ [ "scrap", 1 ] ], + [ [ "copper", 6 ] ] + ] + }, + { + "result": "reloaded_338lapua_api", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], + "//": "2938 mg gunpowder rounded to 29 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 26 ], [ "gunpowder_large_rifle", 26 ] ], + [ [ "scrap", 1 ] ], + [ [ "copper", 3 ] ], + [ [ "incendiary", 6 ] ] + ] + }, + { + "result": "bp_338lapua_hpbt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "2644 mg gunpowder rounded to 26 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "chem_black_powder", 26 ] ], + [ [ "lead", 5 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "bp_338lapua_fmjbt", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "20 s", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "//": "2938 mg gunpowder rounded to 29 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "scrap", 1 ] ], + [ [ "copper", 6 ] ], + [ [ "chem_black_powder", 29 ] ] + ] + }, + { + "result": "bp_338lapua_api", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 7, + "skills_required": [ "gun", 6 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], + "//": "2938 mg gunpowder rounded to 29 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "chem_black_powder", 29 ] ], + [ [ "scrap", 1 ] ], + [ [ "copper", 3 ] ], + [ [ "incendiary", 6 ] ] + ] } ] diff --git a/data/json/recipes/other/bots.json b/data/json/recipes/other/bots.json index 8ff9c11997cfd..499970424a764 100644 --- a/data/json/recipes/other/bots.json +++ b/data/json/recipes/other/bots.json @@ -620,7 +620,7 @@ [ [ "gun_module", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "solar_cell", 2 ] ], - [ [ "m16a4", 1 ] ], + [ [ "modular_m16a4", 1 ] ], [ [ "canister_empty", 1 ] ] ] }, diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 03c9eee457b71..d7338c215bcbd 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1211,7 +1211,7 @@ [ [ "gun_module", 1 ] ], [ [ "power_supply", 4 ] ], [ [ "solar_cell", 2 ] ], - [ [ "m16a4", 1 ] ], + [ [ "modular_m16a4", 1 ] ], [ [ "canister_empty", 1 ] ] ] }, @@ -1716,7 +1716,7 @@ [ [ "gun_module", 3 ] ], [ [ "flamethrower", 1 ] ], [ [ "tazer", 1 ] ], - [ [ "m4_carbine", 1 ] ], + [ [ "modular_m4_carbine", 1 ] ], [ [ "pamd68", 1 ] ], [ [ "power_supply", 20 ] ], [ [ "amplifier", 5 ] ], diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 9655b1f69ee25..0d82110a4964d 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -121,12 +121,25 @@ "autolearn": true, "tools": [ [ - [ "m27_assault_rifle", -1 ], - [ "m16_auto_rifle", -1 ], - [ "m4_carbine", -1 ], - [ "ar15", -1 ], + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16_auto_rifle", -1 ], + [ "modular_m4_carbine", -1 ], + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], [ "m249", -1 ], - [ "m16a4", -1 ] + [ "modular_m16a4", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], @@ -411,5 +424,177 @@ "tools": [ [ [ "coilgun", -1 ] ], [ [ "nail", -1 ], [ "combatnail", -1 ] ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "scrap", 1 ] ], [ [ "duct_tape", 20 ] ] ] + }, + { + "result": "stanag20_beowulf", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MAGAZINES", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "rifle", 1 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 2 ] ], + "time": "5 m", + "tools": [ + [ + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], + [ "modular_m4_carbine", -1 ], + [ "m4_cqbr", -1 ], + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16a4", -1 ], + [ "modular_m16_auto_rifle", -1 ] + ], + [ + [ "retool_ar15_50beowulf", -1 ], + [ "retool_ar15_50beowulf_medium", -1 ], + [ "retool_ar15_50beowulf_short", -1 ] + ] + ], + "using": [ [ "50beowulf_casehead", 1 ] ], + "qualities": [ { "id": "FILE", "level": 2 }, { "id": "GRIND", "level": 1 } ], + "components": [ [ [ "stanag20", 1 ] ] ] + }, + { + "result": "stanag30_beowulf", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MAGAZINES", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "rifle", 1 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 2 ] ], + "time": "5 m", + "tools": [ + [ + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], + [ "modular_m4_carbine", -1 ], + [ "m4_cqbr", -1 ], + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16a4", -1 ], + [ "modular_m16_auto_rifle", -1 ] + ], + [ + [ "retool_ar15_50beowulf", -1 ], + [ "retool_ar15_50beowulf_medium", -1 ], + [ "retool_ar15_50beowulf_short", -1 ] + ] + ], + "using": [ [ "50beowulf_casehead", 1 ] ], + "qualities": [ { "id": "FILE", "level": 2 }, { "id": "GRIND", "level": 1 } ], + "components": [ [ [ "stanag30", 1 ] ] ] + }, + { + "result": "stanag20ranger_beowulf", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MAGAZINES", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "rifle", 1 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 2 ] ], + "time": "5 m", + "tools": [ + [ + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], + [ "modular_m4_carbine", -1 ], + [ "m4_cqbr", -1 ], + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16a4", -1 ], + [ "modular_m16_auto_rifle", -1 ] + ], + [ + [ "retool_ar15_50beowulf", -1 ], + [ "retool_ar15_50beowulf_medium", -1 ], + [ "retool_ar15_50beowulf_short", -1 ] + ] + ], + "using": [ [ "50beowulf_casehead", 1 ] ], + "qualities": [ { "id": "FILE", "level": 2 }, { "id": "GRIND", "level": 1 } ], + "components": [ [ [ "stanag20ranger", 1 ] ] ] + }, + { + "result": "stanag30ranger_beowulf", + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_MAGAZINES", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "rifle", 1 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 2 ] ], + "time": "5 m", + "tools": [ + [ + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], + [ "modular_m4_carbine", -1 ], + [ "m4_cqbr", -1 ], + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16a4", -1 ], + [ "modular_m16_auto_rifle", -1 ] + ], + [ + [ "retool_ar15_50beowulf", -1 ], + [ "retool_ar15_50beowulf_medium", -1 ], + [ "retool_ar15_50beowulf_short", -1 ] + ] + ], + "using": [ [ "50beowulf_casehead", 1 ] ], + "qualities": [ { "id": "FILE", "level": 2 }, { "id": "GRIND", "level": 1 } ], + "components": [ [ [ "stanag30ranger", 1 ] ] ] } ] diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index 4aedff4c0d651..56152231c6950 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -1016,14 +1016,26 @@ "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M_FINE", "level": 1 }, { "id": "DRILL", "level": 1 } ], "tools": [ [ - [ "ar15", -1 ], - [ "ar15_retool_300blk", -1 ], + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], [ "ar_pistol", -1 ], [ "oa93", -1 ], - [ "m27_assault_rifle", -1 ], - [ "m16_auto_rifle", -1 ], - [ "m4_carbine", -1 ], - [ "m16a4", -1 ] + [ "modular_m27_assault_rifle", -1 ], + [ "modular_m16_auto_rifle", -1 ], + [ "modular_m4_carbine", -1 ], + [ "modular_m16a4", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], @@ -1044,7 +1056,24 @@ "book_learn": [ [ "manual_rifle", 6 ], [ "textbook_anarch", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ - [ [ "ar15", -1 ], [ "ar15_retool_300blk", -1 ], [ "ar_pistol", -1 ], [ "oa93", -1 ] ], + [ + [ "ar15_223long", -1 ], + [ "modular_ar15", -1 ], + [ "ar15_223medium", -1 ], + [ "ar15_223short", -1 ], + [ "ar15_300", -1 ], + [ "ar15_300medium", -1 ], + [ "ar15_300short", -1 ], + [ "ar15_50", -1 ], + [ "ar15_50medium", -1 ], + [ "ar15_50short", -1 ], + [ "ar15_450", -1 ], + [ "ar15_450medium", -1 ], + [ "ar15_450short", -1 ], + [ "ar15_762", -1 ], + [ "ar_pistol", -1 ], + [ "oa93", -1 ] + ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ], "components": [ [ [ "sheet_metal_small", 2 ] ] ] diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index 23b26ee443f3b..326db512470aa 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -245,5 +245,21 @@ "type": "requirement", "//": "References needed for forge and crucible to recast your stabilized explosives", "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ] + }, + { + "id": "50beowulf_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .50 Beowulf or derivatives", + "tools": [ + [ + [ "50beowulf_casing", -1 ], + [ "50beowulf_xtp", -1 ], + [ "50beowulf_penetrator", -1 ], + [ "bp_50beowulf_xtp", -1 ], + [ "bp_50beowulf_penetrator", -1 ], + [ "reloaded_50beowulf_xtp", -1 ], + [ "reloaded_50beowulf_penetrator", -1 ] + ] + ] } ] diff --git a/data/json/uncraft/ammo/338lapua.json b/data/json/uncraft/ammo/338lapua.json new file mode 100644 index 0000000000000..e030987d877ad --- /dev/null +++ b/data/json/uncraft/ammo/338lapua.json @@ -0,0 +1,45 @@ +[ + { + "result": "338lapua_hpbt", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "copper", 3 ] ], + [ [ "lead", 5 ] ], + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder_large_rifle", 26 ] ] + ] + }, + { + "result": "338lapua_fmjbt", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "copper", 6 ] ], + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder_large_rifle", 29 ] ], + [ [ "scrap", 1 ] ] + ] + }, + { + "result": "338lapua_api", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "copper", 3 ] ], + [ [ "338lapua_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder_large_rifle", 29 ] ], + [ [ "scrap", 1 ] ], + [ [ "incendiary", 6 ] ] + ] + } +] diff --git a/data/json/uncraft/ammo/450bushmaster.json b/data/json/uncraft/ammo/450bushmaster.json new file mode 100644 index 0000000000000..38a873651dede --- /dev/null +++ b/data/json/uncraft/ammo/450bushmaster.json @@ -0,0 +1,24 @@ +[ + { + "result": "450_ftx", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "copper", 3 ] ], + [ [ "lead", 5 ] ], + [ [ "450_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 37 ] ] + ] + }, + { + "result": "450_penetrator", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ [ [ "copper", 6 ] ], [ [ "450_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_rifle", 34 ] ] ] + } +] diff --git a/data/json/uncraft/ammo/50beowulf.json b/data/json/uncraft/ammo/50beowulf.json new file mode 100644 index 0000000000000..a397253f43d51 --- /dev/null +++ b/data/json/uncraft/ammo/50beowulf.json @@ -0,0 +1,24 @@ +[ + { + "result": "50beowulf_xtp", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "copper", 3 ] ], + [ [ "lead", 5 ] ], + [ [ "50beowulf_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder_rifle", 17 ] ] + ] + }, + { + "result": "50beowulf_penetrator", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "5 s", + "qualities": [ { "id": "PULL", "level": 1 } ], + "components": [ [ [ "copper", 6 ] ], [ [ "50beowulf_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_rifle", 21 ] ] ] + } +] diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json index c970111c1aa5c..2e4dd3014ca84 100644 --- a/data/json/vehicles/helicopters.json +++ b/data/json/vehicles/helicopters.json @@ -1036,7 +1036,15 @@ { "x": -9, "y": -1, "chance": 7, "items": [ "rucksack" ] }, { "x": -8, "y": -1, "chance": 5, "items": [ "m9" ] }, { "x": -7, "y": -2, "chance": 5, "items": [ "223" ] }, - { "x": -7, "y": -2, "chance": 5, "magazine": 90, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -7, + "y": -2, + "chance": 5, + "magazine": 90, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -7, "y": -2, "chance": 7, "items": [ "EMPbomb" ] }, { "x": -7, "y": -2, "chance": 15, "items": [ "mask_gas" ] }, { "x": -7, "y": -2, "chance": 7, "items": [ "flashlight" ], "ammo": 100 }, @@ -1227,7 +1235,15 @@ { "x": -9, "y": -1, "chance": 7, "items": [ "rucksack" ] }, { "x": -8, "y": -1, "chance": 5, "items": [ "m9" ] }, { "x": -7, "y": -2, "chance": 5, "items": [ "223" ] }, - { "x": -7, "y": -2, "chance": 5, "magazine": 90, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -7, + "y": -2, + "chance": 5, + "magazine": 90, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -7, "y": -2, "chance": 7, "items": [ "EMPbomb" ] }, { "x": -7, "y": -2, "chance": 15, "items": [ "mask_gas" ] }, { "x": -7, "y": -2, "chance": 7, "items": [ "flashlight" ], "ammo": 100 }, @@ -1398,7 +1414,15 @@ { "x": -9, "y": -1, "chance": 7, "items": [ "rucksack" ] }, { "x": -8, "y": -1, "chance": 5, "items": [ "m9" ] }, { "x": -7, "y": -2, "chance": 5, "items": [ "223" ] }, - { "x": -7, "y": -2, "chance": 5, "magazine": 90, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -7, + "y": -2, + "chance": 5, + "magazine": 90, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -7, "y": -2, "chance": 7, "items": [ "EMPbomb" ] }, { "x": -7, "y": -2, "chance": 15, "items": [ "mask_gas" ] }, { "x": -7, "y": -2, "chance": 7, "items": [ "flashlight" ], "ammo": 100 }, @@ -1515,7 +1539,15 @@ { "x": -6, "y": 1, "chance": 7, "ammo": 70, "items": [ "stanag30" ] }, { "x": -6, "y": 1, "chance": 10, "items": [ "helmet_army" ] }, { "x": -6, "y": 1, "chance": 15, "items": [ "gasfilter_m" ] }, - { "x": -6, "y": 1, "chance": 100, "magazine": 70, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -6, + "y": 1, + "chance": 100, + "magazine": 70, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -5, "y": 0, "chance": 3, "items": [ "cig_butt" ] }, { "x": -5, "y": 0, "chance": 5, "items": [ "cig" ] }, { "x": -5, "y": 2, "chance": 7, "ammo": 70, "items": [ "stanag30" ] }, @@ -1623,7 +1655,15 @@ { "x": -6, "y": 1, "chance": 7, "ammo": 70, "items": [ "stanag30" ] }, { "x": -6, "y": 1, "chance": 10, "items": [ "helmet_army" ] }, { "x": -6, "y": 1, "chance": 15, "items": [ "gasfilter_m" ] }, - { "x": -6, "y": 1, "chance": 3, "magazine": 70, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -6, + "y": 1, + "chance": 3, + "magazine": 70, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -5, "y": 0, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -5, "y": 0, "chance": 3, "items": [ "cig_butt" ] }, { "x": -5, "y": 0, "chance": 5, "items": [ "cig" ] }, @@ -1729,7 +1769,15 @@ { "x": -6, "y": 1, "chance": 7, "ammo": 70, "items": [ "stanag30" ] }, { "x": -6, "y": 1, "chance": 10, "items": [ "helmet_army" ] }, { "x": -6, "y": 1, "chance": 15, "items": [ "gasfilter_m" ] }, - { "x": -6, "y": 1, "chance": 3, "magazine": 70, "ammo": 70, "items": "m4_carbine", "variant": "m4a1" }, + { + "x": -6, + "y": 1, + "chance": 3, + "magazine": 70, + "ammo": 70, + "items": "modular_m4_carbine", + "variant": "modular_m4a1" + }, { "x": -5, "y": 0, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -5, "y": 0, "chance": 3, "items": [ "cig_butt" ] }, { "x": -5, "y": 0, "chance": 5, "items": [ "cig" ] }, diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index 62160039f83cb..40b823d786b16 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -470,7 +470,7 @@ "type": "gun", "cooldown": 2, "move_cost": 150, - "gun_type": "m16_auto_rifle", + "gun_type": "modular_m16_auto_rifle", "ammo_type": "556", "fake_skills": [ [ "gun", 5 ], [ "rifle", 5 ] ], "fake_dex": 10, diff --git a/data/mods/Aftershock/recipes/deconstruction.json b/data/mods/Aftershock/recipes/deconstruction.json index cd0dd09371f93..b38c83982e977 100644 --- a/data/mods/Aftershock/recipes/deconstruction.json +++ b/data/mods/Aftershock/recipes/deconstruction.json @@ -41,7 +41,7 @@ [ [ "gun_module", 3 ] ], [ [ "flamethrower", 1 ] ], [ [ "tazer", 1 ] ], - [ [ "m4_carbine", 1 ] ], + [ [ "modular_m4_carbine", 1 ] ], [ [ "power_supply", 20 ] ], [ [ "storage_battery", 1 ] ], [ [ "plut_cell", 4 ] ], diff --git a/data/mods/Aftershock/recipes/recipes.json b/data/mods/Aftershock/recipes/recipes.json index ad80cd1825474..dc383da2e59d4 100644 --- a/data/mods/Aftershock/recipes/recipes.json +++ b/data/mods/Aftershock/recipes/recipes.json @@ -227,7 +227,7 @@ [ [ "gun_module", 3 ] ], [ [ "flamethrower", 1 ] ], [ [ "tazer", 1 ] ], - [ [ "m4_carbine", 1 ] ], + [ [ "modular_m4_carbine", 1 ] ], [ [ "power_supply", 20 ] ], [ [ "storage_battery", 1 ] ], [ [ "plut_cell", 4 ] ], diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 1cecf23b91190..322fd66eea89e 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -185,6 +185,9 @@ "270win_jsp", "300_winmag", "3006", + "50beowulf_xtp", + "450_ftx", + "338lapua_hpbt", "300blk", "300blk_ss", "303_bthp", @@ -224,6 +227,9 @@ "reloaded_270win_jsp", "reloaded_300_winmag", "reloaded_3006", + "reloaded_50beowulf_xtp", + "reloaded_450_ftx", + "reloaded_338lapua_hpbt", "reloaded_300blk", "reloaded_308", "reloaded_4570_bp", @@ -245,6 +251,9 @@ "bp_270win_jsp", "bp_300_winmag", "bp_3006", + "bp_50beowulf_xtp", + "bp_450_ftx", + "bp_338lapua_hpbt", "bp_300blk", "bp_308", "bp_545", @@ -261,6 +270,10 @@ "id": [ "3006_incendiary", "3006fmj", + "50beowulf_penetrator", + "450_penetrator", + "338lapua_fmjbt", + "338lapua_api", "303_fmjbt", "4570_pen", "545_ap", @@ -284,6 +297,10 @@ "id": [ "reloaded_3006_incendiary", "reloaded_3006fmj", + "reloaded_50beowulf_penetrator", + "reloaded_450_penetrator", + "reloaded_338lapua_fmjbt", + "reloaded_338lapua_api", "reloaded_303fmj", "reloaded_4570_pen", "reloaded_545_ap", @@ -300,6 +317,10 @@ "id": [ "bp_3006_incendiary", "bp_3006fmj", + "bp_50beowulf_penetrator", + "bp_450_penetrator", + "bp_338lapua_fmjbt", + "bp_338lapua_api", "bp_303fmj", "bp_545_ap", "bp_556", diff --git a/data/mods/Generic_Guns/ammo/gg_casings_migration.json b/data/mods/Generic_Guns/ammo/gg_casings_migration.json index e9a8562c7ed74..9c791bc5b29c4 100644 --- a/data/mods/Generic_Guns/ammo/gg_casings_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_casings_migration.json @@ -47,6 +47,9 @@ "3006_casing", "308_casing", "4570_casing", + "50beowulf_casing", + "450_casing", + "338lapua_casing", "545_casing", "762_51_casing", "762_casing", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 934ab9943e8b4..1aedb34d5e93b 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -204,10 +204,15 @@ "m1918", "acr_300blk", "hk417_13", + "modular_m16a4", "m16a4", "nato_assault_rifle", + "modular_m4_carbine", "m4_carbine", + "m4_cqbr", + "modular_m27_assault_rifle", "m27_assault_rifle", + "modular_m16_auto_rifle", "m16_auto_rifle", "m231pfw", "scar_h", @@ -252,7 +257,18 @@ "boreal_mosin", "rm11b_sniper_rifle", "remington700_270", + "ruger_m77", + "ruger_arr", + "ruger_pr", + "cz600", + "cz600_762", + "axmc", + "axmc_300", + "axmc_308", "m2010", + "savage112", + "mrad_smr", + "tac338", "weatherby_5", "win70", "browning_blr", @@ -277,28 +293,52 @@ "1895sbl", "ak74", "vz58ts", + "ruger_m77", + "ruger_pr", "kord", "ak47", + "mdrx", + "mdrx_223", + "mdrx_223short", + "mdrx_300", + "mdrx_308", + "mdrx_308medium", "arx160", "l_bak_223", "mosin91_30", "m249_semi", "m60_semi", + "modular_ar15", "ar15", "oa93", + "ar15_223long", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", "ar_pistol", "rifle_223", "ruger_mini", "sig_assault_rifle", "steyr_aug", "iwi_tavor_x95_300blk", - "ar15_retool_300blk", "fn_fal", "m1a", "sks", "mosin44", "famas", "aksemi", + "bren2_762", + "805_bren", + "bren2_556", "fs2000", "robofac_gun", "psl", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 44dc4e542a2d6..52f2cc4077976 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -243,6 +243,19 @@ "stanag100", "stanag100drum", "stanag150", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", + "ruger_arr_mag", + "bren2_762mag30", + "bren2_762mag10", "g36mag_30rd", "g36mag_100rd", "blrmag", @@ -321,6 +334,11 @@ "pslmag5", "pslmag10", "762R_clip", + "ai_338mag", + "ai_338mag_10", + "ai_308mag_10", + "mrad_338lapua_mag", + "ruger_pr_mag", "borealmosin_clip", "robofac20" ], diff --git a/data/mods/Military_Professions/npc/NC_ARMY.json b/data/mods/Military_Professions/npc/NC_ARMY.json index dbb271cea2ec5..82961b7cf3754 100644 --- a/data/mods/Military_Professions/npc/NC_ARMY.json +++ b/data/mods/Military_Professions/npc/NC_ARMY.json @@ -162,7 +162,7 @@ "id": "NC_ARMY_rifle", "subtype": "distribution", "entries": [ - { "item": "m4_carbine", "variant": "m4a1", "prob": 50 }, + { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 50 }, { "item": "m14ebr", "prob": 35 }, { "item": "m249", "prob": 20 } ] diff --git a/data/mods/Military_Professions/npc/NC_OPS.json b/data/mods/Military_Professions/npc/NC_OPS.json index 8454756ae754b..661d704859d69 100644 --- a/data/mods/Military_Professions/npc/NC_OPS.json +++ b/data/mods/Military_Professions/npc/NC_OPS.json @@ -135,7 +135,7 @@ { "type": "item_group", "id": "NC_OPS_rifle", - "items": [ [ "m4_carbine", 50 ], [ "m14ebr", 35 ], [ "m249", 20 ], [ "m27_assault_rifle", 50 ], [ "M24", 35 ] ] + "items": [ [ "modular_m4_carbine", 50 ], [ "m14ebr", 35 ], [ "m249", 20 ], [ "modular_m27_assault_rifle", 50 ], [ "M24", 35 ] ] }, { "type": "item_group", diff --git a/data/mods/Military_Professions/prof/army.json b/data/mods/Military_Professions/prof/army.json index b3505f5e59704..0a36de44db6ae 100644 --- a/data/mods/Military_Professions/prof/army.json +++ b/data/mods/Military_Professions/prof/army.json @@ -25,8 +25,8 @@ ], "entries": [ { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope", "grip" ] @@ -136,8 +136,8 @@ ], "entries": [ { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight", "m203" ] diff --git a/data/mods/No_Hope/Mapgen/mil_base_z0.json b/data/mods/No_Hope/Mapgen/mil_base_z0.json index af0b2c13cf883..6f014933a80a2 100644 --- a/data/mods/No_Hope/Mapgen/mil_base_z0.json +++ b/data/mods/No_Hope/Mapgen/mil_base_z0.json @@ -753,8 +753,8 @@ { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 }, { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, @@ -762,21 +762,21 @@ "repeat": 30 }, { - "item": "m27_assault_rifle", - "variant": "m27iar", + "item": "modular_m27_assault_rifle", + "variant": "modular_m27iar", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 8 }, - { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, + { "item": "modular_m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 }, { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 }, { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "x": 16, "y": [ 9, 11 ], "magazine": 100, diff --git a/data/mods/No_Hope/monsters.json b/data/mods/No_Hope/monsters.json index 80891ec207c69..124b33e1a0d10 100644 --- a/data/mods/No_Hope/monsters.json +++ b/data/mods/No_Hope/monsters.json @@ -376,7 +376,7 @@ "type": "gun", "cooldown": 1, "move_cost": 150, - "gun_type": "m16a4", + "gun_type": "modular_m16a4", "ammo_type": "556", "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], "fake_dex": 12, diff --git a/data/mods/Standard_Combat_Tests/modinfo.json b/data/mods/Standard_Combat_Tests/modinfo.json index fe41cff3d62e8..9dcbd1b7797ce 100644 --- a/data/mods/Standard_Combat_Tests/modinfo.json +++ b/data/mods/Standard_Combat_Tests/modinfo.json @@ -103,7 +103,7 @@ { "item": "fire_ax", "x": 11, "y": 10, "chance": 100 }, { "item": "shillelagh", "x": 12, "y": 10, "chance": 100 }, { "item": "knife_combat", "x": 13, "y": 10, "chance": 100 }, - { "item": "ar15", "x": 14, "y": 10, "ammo": 100, "magazine": 100, "chance": 100 }, + { "item": "modular_ar15", "x": 14, "y": 10, "ammo": 100, "magazine": 100, "chance": 100 }, { "item": "stanag30", "x": 14, "y": 10, "ammo": 100, "chance": 100 } ] } diff --git a/data/mods/TEST_DATA/mapgen-test.json b/data/mods/TEST_DATA/mapgen-test.json index 4e4f14bb0838b..aada9a665231c 100644 --- a/data/mods/TEST_DATA/mapgen-test.json +++ b/data/mods/TEST_DATA/mapgen-test.json @@ -199,8 +199,8 @@ "place_loot": [ { "group": "cannedfood", "x": [ 13, 13 ], "y": [ 22, 23 ], "chance": 90 }, { - "item": "m4_carbine", - "variant": "m4a1", + "item": "modular_m4_carbine", + "variant": "modular_m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, diff --git a/data/mods/Xedra_Evolved/items/inventor/gun.json b/data/mods/Xedra_Evolved/items/inventor/gun.json index ef9352c27a266..4c2bea4dd16b4 100644 --- a/data/mods/Xedra_Evolved/items/inventor/gun.json +++ b/data/mods/Xedra_Evolved/items/inventor/gun.json @@ -211,7 +211,7 @@ }, { "id": "inventor_sniper", - "copy-from": "m27_assault_rifle", + "copy-from": "modular_m27_assault_rifle", "looks_like": "ar15", "type": "GUN", "name": { "str_sp": "\"Repeater\"" }, diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json index e1770c9ccac5b..edd73b31e46fc 100644 --- a/data/mods/classic_zombies/items/blacklists.json +++ b/data/mods/classic_zombies/items/blacklists.json @@ -39,12 +39,81 @@ "af2011a1_38super", "af2011a1mag", "alien_pod_resin", - "ar15_retool_300blk", "arm", "arx160", "as50", "as50mag", "atomic_coffee", + "ar15_223long", + "ar15_223medium", + "ar15_223short", + "ar15_300", + "ar15_300medium", + "ar15_300short", + "ar15_50", + "ar15_50medium", + "ar15_50short", + "ar15_450", + "ar15_450medium", + "ar15_450short", + "ar15_762", + "bren2_762", + "bren2_556", + "mdrx", + "mdrx_223", + "mdrx_223short", + "mdrx_300", + "mdrx_308", + "mdrx_308medium", + "ruger_arr", + "ruger_pr", + "cz600", + "cz600_762", + "axmc", + "axmc_300", + "axmc_308", + "savage112", + "mrad_smr", + "tac338", + "50beowulf_xtp", + "450_ftx", + "338lapua_hpbt", + "reloaded_50beowulf_xtp", + "reloaded_450_ftx", + "reloaded_338lapua_hpbt", + "bp_50beowulf_xtp", + "bp_450_ftx", + "bp_338lapua_hpbt", + "50beowulf_penetrator", + "450_penetrator", + "338lapua_fmjbt", + "338lapua_api", + "reloaded_50beowulf_penetrator", + "reloaded_450_penetrator", + "reloaded_338lapua_fmjbt", + "reloaded_338lapua_api", + "bp_50beowulf_penetrator", + "bp_450_penetrator", + "bp_338lapua_fmjbt", + "bp_338lapua_api", + "stanag20_beowulf", + "stanag20ranger_beowulf", + "stanag30_beowulf", + "stanag30ranger_beowulf", + "50beowulf_ar15mag", + "450_ar15mag", + "762_ar15mag_5rd", + "762_ar15mag_10rd", + "762_ar15mag_20rd", + "762_ar15mag_30rd", + "ruger_arr_mag", + "bren2_762mag30", + "bren2_762mag10", + "ai_338mag", + "ai_338mag_10", + "ai_308mag_10", + "mrad_338lapua_mag", + "ruger_pr_mag", "atomic_coffeepot", "atomic_lamp", "atomic_light", @@ -208,7 +277,7 @@ "m2010", "m2010mag", "m249_semi", - "m27_assault_rifle", + "modular_m27_assault_rifle", "m320", "marloss_berry", "marloss_gel", diff --git a/data/mods/classic_zombies/items/guns.json b/data/mods/classic_zombies/items/guns.json index 7d34d670112b8..d1137caf8406e 100644 --- a/data/mods/classic_zombies/items/guns.json +++ b/data/mods/classic_zombies/items/guns.json @@ -2,20 +2,20 @@ { "type": "GUN", "//": "The C7A1 is semi or full-auto with a 20 in. barrel, which it shares with the M16A3 it overrides.", - "id": "m16_auto_rifle", - "copy-from": "m16_auto_rifle", + "id": "modular_m16_auto_rifle", + "copy-from": "modular_m16_auto_rifle", "name": { "str": "C7 assault rifle" }, "description": "The C7A1 is the standard issue rifle for the Canadian military manufactured by Diemaco. It is a gas-operated, rotating bolt rifle known for its accuracy and controllable recoil.", "variant_type": "gun", "variants": [ { - "id": "m16a3", + "id": "modular_m16a3", "name": { "str": "C7" }, "description": "The standard issue rifle for the Canadian armed forces, featuring a 20 in. long barrel and full auto capabilities when fed from STANAG magazines.", "weight": 1 }, { - "id": "acr", + "id": "modular_acr", "name": { "str": "C7A1" }, "description": "This is the updated model of the C7 carbine, using a modified Weaver rail instead of a carrying handle/iron sight assembly to assist in mounting optics." } @@ -23,17 +23,17 @@ }, { "type": "GUN", - "id": "m4_carbine", - "copy-from": "m4_carbine", + "id": "modular_m4_carbine", + "copy-from": "modular_m4_carbine", "looks_like": "ar15", "name": { "str": "C8 carbine" }, "description": "A carbine variant of the C7A1, recently introduced by the Canadian armed forces. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained. It is chambered in 5.56x45mm and accepts STANAG magazines.", "variants": [ { - "id": "m4a1", + "id": "modular_m4a1", "name": { "str": "C8" }, "description": "The standard issue carbine for the Canadian armed forces, featuring a 14.5 in. long barrel and full auto capabilities when fed from STANAG magazines.", - "ascii_picture": "m4a1", + "ascii_picture": "modular_m4a1", "weight": 1 }, { diff --git a/data/mods/package_bionic_professions/bionic_professions.json b/data/mods/package_bionic_professions/bionic_professions.json index 91eb641e39c8c..68bd76b04338e 100644 --- a/data/mods/package_bionic_professions/bionic_professions.json +++ b/data/mods/package_bionic_professions/bionic_professions.json @@ -536,8 +536,8 @@ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "sheath", "contents-item": "knife_combat" }, { - "item": "m27_assault_rifle", - "variant": "h&k416a5", + "item": "modular_m27_assault_rifle", + "variant": "modular_h&k416a5", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope" ], diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md index 0ed3008059c8c..50a932b7608c1 100644 --- a/doc/GAME_BALANCE.md +++ b/doc/GAME_BALANCE.md @@ -405,7 +405,7 @@ For reference, each cartridge's bullet diameter, **Dia** and weight, **Proj. wt | 7 mm RemSA | 16.0 in | 55.7 | 3102.5 J | 19.124 | 2.648 | 2.8 in | 0.284 in | 150.0 gr | | .450 Bushmaster | 16.0 in | 55.9 | 3124.8 J | 14.666 | 15.23 | 2.3 in | 0.452 in | 250.0 gr | | .358 Win. | 16.0 in | 55.9 | 3124.8 J | 17.741 | 6.718 | 2.8 in | 0.358 in | 220.0 gr | -| 1.23 Ln(8 mm -06) (CDDA) | 16.0 in | 56.8 | 3226.2 J | 18.643 | 5.074 | 3.2 in | 0.323 in | 213.0 gr | +| 12.3 Ln(8 mm -06) (CDDA) | 16.0 in | 56.8 | 3226.2 J | 18.643 | 5.074 | 3.2 in | 0.323 in | 213.0 gr | | .45-70 Govt. | 16.0 in | 57.0 | 3249.0 J | 17.198 | 9.301 | 2.6 in | 0.458 in | 400.0 gr | | .300 RemSAUltra | 16.0 in | 57.7 | 3329.3 J | 20.241 | 1.541 | 2.8 in | 0.308 in | 180.0 gr | | .300 WSM | 16.0 in | 58.0 | 3364.0 J | 20.172 | 2.076 | 2.9 in | 0.308 in | 190.0 gr |