From 5c4f61d5a16b644b40dc3cf342730296a65834ec Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Fri, 20 Dec 2019 21:53:33 -0600 Subject: [PATCH 01/12] Rework generic guns --- data/mods/Generic_Guns/ammo/black_powder.json | 18 + data/mods/Generic_Guns/ammo/casings.json | 72 + .../Generic_Guns/ammo/gg_ammo_migration.json | 350 ++++ .../ammo/gg_casings_migration.json | 60 + data/mods/Generic_Guns/ammo/grenade.json | 75 + data/mods/Generic_Guns/ammo/pistol.json | 39 + .../mods/Generic_Guns/ammo/pistol_magnum.json | 39 + data/mods/Generic_Guns/ammo/pistol_tiny.json | 40 + data/mods/Generic_Guns/ammo/rifle.json | 39 + data/mods/Generic_Guns/ammo/rifle_huge.json | 39 + data/mods/Generic_Guns/ammo/rocket.json | 30 + data/mods/Generic_Guns/ammo/shot.json | 85 + .../Generic_Guns/firearms/black_powder.json | 29 + .../firearms/gg_firearms_blacklist.json | 6 + .../firearms/gg_firearms_migration.json | 333 ++++ data/mods/Generic_Guns/firearms/grenade.json | 45 + data/mods/Generic_Guns/firearms/pistol.json | 66 + .../Generic_Guns/firearms/pistol_magnum.json | 71 + .../Generic_Guns/firearms/pistol_tiny.json | 29 + data/mods/Generic_Guns/firearms/rifle.json | 56 + .../Generic_Guns/firearms/rifle_huge.json | 31 + data/mods/Generic_Guns/firearms/rocket.json | 21 + data/mods/Generic_Guns/firearms/shot.json | 36 + data/mods/Generic_Guns/gg_ammo_blacklist.json | 123 -- .../Generic_Guns/gg_ammo_hand_override.json | 134 -- data/mods/Generic_Guns/gg_ammo_override.json | 220 --- .../Generic_Guns/gg_ammunition_types.json | 71 +- .../Generic_Guns/gg_bandolier_override.json | 33 - data/mods/Generic_Guns/gg_guns.json | 68 - data/mods/Generic_Guns/gg_guns_blacklist.json | 137 -- data/mods/Generic_Guns/gg_guns_override.json | 293 --- .../mods/Generic_Guns/gg_itemgroups_ammo.json | 160 -- .../mods/Generic_Guns/gg_itemgroups_guns.json | 176 -- .../Generic_Guns/gg_magazines_blacklist.json | 99 - .../Generic_Guns/gg_magazines_override.json | 196 -- .../mods/Generic_Guns/gg_other_blacklist.json | 54 - .../Generic_Guns/gg_vehicle_override.json | 76 - .../gunmods/gg_gunmods_blacklist.json | 12 + .../gunmods/gg_gunmods_migration.json | 52 + data/mods/Generic_Guns/gunmods/gunmods.json | 50 + .../magazines/gg_magazines_migration.json | 224 +++ data/mods/Generic_Guns/magazines/grenade.json | 11 + data/mods/Generic_Guns/magazines/pistol.json | 26 + .../Generic_Guns/magazines/pistol_magnum.json | 10 + .../Generic_Guns/magazines/pistol_tiny.json | 10 + data/mods/Generic_Guns/magazines/rifle.json | 27 + .../Generic_Guns/magazines/rifle_huge.json | 19 + data/mods/Generic_Guns/magazines/shot.json | 21 + data/mods/Generic_Guns/modinfo.json | 6 +- .../Generic_Guns/recipes/recipe_obsolete.json | 1617 +++++++++++++++++ .../Generic_Guns/recipes/recipes_ammo.json | 108 ++ .../recipes/recipes_deconstruction.json | 180 ++ .../recipes/recipes_firearms.json | 139 ++ .../Generic_Guns/recipes/requirements.json | 60 + .../Generic_Guns/robots/inactive_bots.json | 76 + data/mods/Generic_Guns/robots/turrets.json | 34 + 56 files changed, 4340 insertions(+), 1791 deletions(-) create mode 100644 data/mods/Generic_Guns/ammo/black_powder.json create mode 100644 data/mods/Generic_Guns/ammo/casings.json create mode 100644 data/mods/Generic_Guns/ammo/gg_ammo_migration.json create mode 100644 data/mods/Generic_Guns/ammo/gg_casings_migration.json create mode 100644 data/mods/Generic_Guns/ammo/grenade.json create mode 100644 data/mods/Generic_Guns/ammo/pistol.json create mode 100644 data/mods/Generic_Guns/ammo/pistol_magnum.json create mode 100644 data/mods/Generic_Guns/ammo/pistol_tiny.json create mode 100644 data/mods/Generic_Guns/ammo/rifle.json create mode 100644 data/mods/Generic_Guns/ammo/rifle_huge.json create mode 100644 data/mods/Generic_Guns/ammo/rocket.json create mode 100644 data/mods/Generic_Guns/ammo/shot.json create mode 100644 data/mods/Generic_Guns/firearms/black_powder.json create mode 100644 data/mods/Generic_Guns/firearms/gg_firearms_blacklist.json create mode 100644 data/mods/Generic_Guns/firearms/gg_firearms_migration.json create mode 100644 data/mods/Generic_Guns/firearms/grenade.json create mode 100644 data/mods/Generic_Guns/firearms/pistol.json create mode 100644 data/mods/Generic_Guns/firearms/pistol_magnum.json create mode 100644 data/mods/Generic_Guns/firearms/pistol_tiny.json create mode 100644 data/mods/Generic_Guns/firearms/rifle.json create mode 100644 data/mods/Generic_Guns/firearms/rifle_huge.json create mode 100644 data/mods/Generic_Guns/firearms/rocket.json create mode 100644 data/mods/Generic_Guns/firearms/shot.json delete mode 100644 data/mods/Generic_Guns/gg_ammo_blacklist.json delete mode 100644 data/mods/Generic_Guns/gg_ammo_hand_override.json delete mode 100644 data/mods/Generic_Guns/gg_ammo_override.json delete mode 100644 data/mods/Generic_Guns/gg_bandolier_override.json delete mode 100644 data/mods/Generic_Guns/gg_guns.json delete mode 100644 data/mods/Generic_Guns/gg_guns_blacklist.json delete mode 100644 data/mods/Generic_Guns/gg_guns_override.json delete mode 100644 data/mods/Generic_Guns/gg_itemgroups_ammo.json delete mode 100644 data/mods/Generic_Guns/gg_itemgroups_guns.json delete mode 100644 data/mods/Generic_Guns/gg_magazines_blacklist.json delete mode 100644 data/mods/Generic_Guns/gg_magazines_override.json delete mode 100644 data/mods/Generic_Guns/gg_other_blacklist.json delete mode 100644 data/mods/Generic_Guns/gg_vehicle_override.json create mode 100644 data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json create mode 100644 data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json create mode 100644 data/mods/Generic_Guns/gunmods/gunmods.json create mode 100644 data/mods/Generic_Guns/magazines/gg_magazines_migration.json create mode 100644 data/mods/Generic_Guns/magazines/grenade.json create mode 100644 data/mods/Generic_Guns/magazines/pistol.json create mode 100644 data/mods/Generic_Guns/magazines/pistol_magnum.json create mode 100644 data/mods/Generic_Guns/magazines/pistol_tiny.json create mode 100644 data/mods/Generic_Guns/magazines/rifle.json create mode 100644 data/mods/Generic_Guns/magazines/rifle_huge.json create mode 100644 data/mods/Generic_Guns/magazines/shot.json create mode 100644 data/mods/Generic_Guns/recipes/recipe_obsolete.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_ammo.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_deconstruction.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_firearms.json create mode 100644 data/mods/Generic_Guns/recipes/requirements.json create mode 100644 data/mods/Generic_Guns/robots/inactive_bots.json create mode 100644 data/mods/Generic_Guns/robots/turrets.json diff --git a/data/mods/Generic_Guns/ammo/black_powder.json b/data/mods/Generic_Guns/ammo/black_powder.json new file mode 100644 index 0000000000000..59d7eef4e118f --- /dev/null +++ b/data/mods/Generic_Guns/ammo/black_powder.json @@ -0,0 +1,18 @@ +[ + { + "id": "black_powder_ball", + "type": "AMMO", + "copy-from": "flintlock_ammo", + "name": "paper cartridge", + "description": "A paper cartridge containing black powder and a lead ball. Historically used to reload muzzleloaders in a more reasonable time.", + "ammo_type": "ammo_black_powder" + }, + { + "id": "black_powder_shot", + "type": "AMMO", + "copy-from": "flintlock_shot", + "name": "paper shot cartridge", + "description": "A paper cartridge containing black powder and metallic shot. Historically used to reload muzzleloaders in a more reasonable time.", + "ammo_type": "ammo_black_powder" + } +] diff --git a/data/mods/Generic_Guns/ammo/casings.json b/data/mods/Generic_Guns/ammo/casings.json new file mode 100644 index 0000000000000..9eae2263358d1 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/casings.json @@ -0,0 +1,72 @@ +[ + { + "id": "pistol_tiny_casing", + "copy-from": "32_casing", + "type": "GENERIC", + "name": "tiny pistol casing", + "description": "An empty casing from a tiny pistol round." + }, + { + "id": "pistol_casing", + "copy-from": "9mm_casing", + "type": "GENERIC", + "name": "pistol casing", + "description": "An empty casing from a standard pistol round." + }, + { + "id": "pistol_magnum_casing", + "copy-from": "44_casing", + "type": "GENERIC", + "name": "magnum pistol casing", + "description": "An empty casing from a magnum pistol round." + }, + { + "id": "rifle_casing", + "copy-from": "308_casing", + "type": "GENERIC", + "name": "rifle casing", + "description": "An empty casing from a rifle round." + }, + { + "id": "rifle_huge_casing", + "copy-from": "50_casing", + "type": "GENERIC", + "name": "huge rifle casing", + "description": "An empty casing from a huge rifle round." + }, + { + "id": "shot_casing", + "copy-from": "shot_hull", + "type": "GENERIC", + "name": "shotshell hull", + "description": "A shotshell's casing, a plastic tube with a brass casehead, commonly referred to as a hull." + }, + { + "id": "grenade_casing", + "copy-from": "40x46mm_m199_casing", + "type": "GENERIC", + "name": "grenade casing", + "description": "A large casing from a grenade round." + }, + { + "id": "ammolinkrifle", + "copy-from": "ammolink", + "type": "GENERIC", + "name": "rifle belt linkage", + "use_action": { "type": "ammobelt", "belt": "rifle_belt" } + }, + { + "id": "ammolinkgrenade", + "copy-from": "ammolink", + "type": "GENERIC", + "name": "grenade belt linkage", + "use_action": { "type": "ammobelt", "belt": "grenade_belt" } + }, + { + "id": "ammolinkrifle_huge", + "copy-from": "ammolink", + "type": "GENERIC", + "name": "heavy machinegun belt linkage", + "use_action": { "type": "ammobelt", "belt": "rifle_huge_belt" } + } +] diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json new file mode 100644 index 0000000000000..c11ebed34e8f7 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -0,0 +1,350 @@ +[ + { + "id": [ "22_fmj", "32_acp" ], + "type": "MIGRATION", + "replace": "tiny_pistol_ball" + }, + { + "id": [ "bp_22_fmj", "bp_22_lr", "bp_32_acp", "reloaded_22_fmj", "reloaded_32_acp" ], + "type": "MIGRATION", + "replace": "reloaded_tiny_pistol_ball" + }, + { + "id": [ "22_cb", "22_lr", "22_ratshot" ], + "type": "MIGRATION", + "replace": "tiny_pistol_jhp" + }, + { + "id": [ "reloaded_22_lr", "bp_22_lr" ], + "type": "MIGRATION", + "replace": "reloaded_tiny_pistol_jhp" + }, + { + "id": [ + "10mm_fmj", + "357sig_fmj", + "38_fmj", + "380_FMJ", + "380_p", + "38super_fmj", + "40fmj", + "45_acp", + "46mm", + "57mm", + "5x50dart", + "762_25hot", + "762_25typeP", + "9mmfmj", + "9mmP", + "9mmP2", + "9x18mmfmj", + "9x18mmP2" + ], + "type": "MIGRATION", + "replace": "pistol_ball" + }, + { + "id": [ + "bp_10mm_fmj", + "bp_38_fmj", + "bp_380_FMJ", + "bp_40ball", + "bp_44ball", + "bp_45_acp", + "bp_46mm", + "bp_57mm", + "bp_9mmfmj", + "bp_9x18mmfmj", + "reloaded_10mm_fmj", + "reloaded_357sig_fmj", + "reloaded_38_fmj", + "reloaded_380_FMJ", + "reloaded_380_p", + "reloaded_38super_fmj", + "reloaded_40fmj", + "reloaded_45_acp", + "reloaded_46mm", + "reloaded_57mm", + "reloaded_5x50dart", + "reloaded_9mmfmj", + "reloaded_9mmP", + "reloaded_9mmP2", + "reloaded_9x18mmfmj", + "reloaded_9x18mmP2" + ], + "type": "MIGRATION", + "replace": "reloaded_pistol_ball" + }, + { + "id": [ + "357sig_jhp", + "38_special", + "38_super", + "380_JHP", + "40sw", + "45_jhp", + "45_super", + "45colt_jhp", + "5x50heavy", + "762_25", + "9mm", + "9x18mm" + ], + "type": "MIGRATION", + "replace": "pistol_jhp" + }, + { + "id": [ + "bp_38_special", + "bp_380_JHP", + "bp_40sw", + "bp_45_jhp", + "bp_762_25", + "bp_9mm", + "bp_9x18mm", + "reloaded_357sig_jhp", + "reloaded_38_special", + "reloaded_38_super", + "reloaded_380_JHP", + "reloaded_40sw", + "reloaded_45_jhp", + "reloaded_45_super", + "reloaded_45colt_jhp", + "reloaded_762_25", + "reloaded_9mm", + "reloaded_9x18mm" + ], + "type": "MIGRATION", + "replace": "reloaded_pistol_jhp" + }, + { + "id": [ "357mag_fmj", "44fmj", "460_fmj" ], + "type": "MIGRATION", + "replace": "pistol_magnum_ball" + }, + { + "id": [ "bp_357mag_fmj", "bp_460_fmj", "reloaded_357mag_fmj", "reloaded_44magnum", "reloaded_460_fmj" ], + "type": "MIGRATION", + "replace": "reloaded_pistol_magnum_ball" + }, + { + "id": [ "357mag_jhp", "44magnum", "454_Casull", "460_rowland", "500_Magnum" ], + "type": "MIGRATION", + "replace": "pistol_magnum_jhp" + }, + { + "id": [ + "bp_357mag_jhp", + "bp_44magnum", + "bp_454_Casull", + "bp_460_rowland", + "bp_500_Magnum", + "reloaded_357mag_jhp", + "reloaded_44fmj", + "reloaded_454_Casull", + "reloaded_460_rowland", + "reloaded_500_Magnum" + ], + "type": "MIGRATION", + "replace": "reloaded_pistol_magnum_jhp" + }, + { + "id": [ + "223", + "270win_jsp", + "300_winmag", + "3006", + "300blk", + "300blk_ss", + "308", + "4570_low", + "4570_sp", + "545", + "762_54R", + "762_m87", + "8mm_civilian", + "8mm_jhp" + ], + "type": "MIGRATION", + "replace": "rifle_ball" + }, + { + "id": [ + "8mm_bootleg", + "bp_223", + "bp_270win_jsp", + "bp_300_winmag", + "bp_3006", + "bp_300blk", + "bp_308", + "reloaded_223", + "reloaded_270win_jsp", + "reloaded_300_winmag", + "reloaded_3006", + "reloaded_300blk", + "reloaded_308", + "reloaded_4570_bp", + "reloaded_4570_low", + "reloaded_4570_sp", + "reloaded_545", + "reloaded_762_54R", + "reloaded_762_m87" + ], + "type": "MIGRATION", + "replace": "reloaded_rifle_ball" + }, + { + "id": [ + "3006_incendiary", + "3006fmj", + "4570_pen", + "545_ap", + "556", + "556_incendiary", + "762_51", + "762_51_incendiary", + "762_m43", + "8mm_caseless", + "8mm_fmj", + "8mm_hvp", + "8mm_inc" + ], + "type": "MIGRATION", + "replace": "rifle_AP" + }, + { + "id": [ + "bp_3006_incendiary", + "bp_3006fmj", + "bp_556", + "bp_556_incendiary", + "bp_762_51", + "bp_762_51_incendiary", + "reloaded_3006_incendiary", + "reloaded_3006fmj", + "reloaded_4570_pen", + "reloaded_545_ap", + "reloaded_556", + "reloaded_556_incendiary", + "reloaded_762_51", + "reloaded_762_51_incendiary", + "reloaded_762_m43" + ], + "type": "MIGRATION", + "replace": "reloaded_rifle_AP" + }, + { + "id": [ "50_incendiary", "50_mk211", "50bmg", "50match" ], + "type": "MIGRATION", + "replace": "rifle_huge_ball" + }, + { + "id": [ "reloaded_50_incendiary", "reloaded_50bmg" ], + "type": "MIGRATION", + "replace": "reloaded_rifle_huge_ball" + }, + { + "id": [ "50ss", "700nx" ], + "type": "MIGRATION", + "replace": "rifle_huge_AP" + }, + { + "id": [ "reloaded_50ss", "reloaded_700nx" ], + "type": "MIGRATION", + "replace": "reloaded_rifle_huge_AP" + }, + { + "id": [ "36navy", "44army" ], + "type": "MIGRATION", + "replace": "flintlock_ammo" + }, + { + "id": [ "40x46mm_m1006" ], + "type": "MIGRATION", + "replace": "grenade_ammo_beanbag" + }, + { + "id": [ "40mm_flare" ], + "type": "MIGRATION", + "replace": "grenade_ammo_flare" + }, + { + "id": [ "40x46mm_m433", "40x46mm_m651", "40x53mm_m430a1" ], + "type": "MIGRATION", + "replace": "grenade_ammo_hedp" + }, + { + "id": [ + "40x46mm_m576", + "40x46mm_buckshot_m118", + "40x46mm_buckshot_m199", + "40x46mm_flechette_m118", + "40x46mm_flechette_m199", + "40x53mm_m1001", + "40x53mm_flechette_m169", + "40x53mm_buckshot_m169" + ], + "type": "MIGRATION", + "replace": "grenade_ammo_shot" + }, + { + "id": [ "40x46mm_slug_m118", "40x46mm_slug_m199", "40x53mm_slug_m169" ], + "type": "MIGRATION", + "replace": "grenade_ammo_slug" + }, + { + "id": [ "40x46mm_m651" ], + "type": "MIGRATION", + "replace": "grenade_ammo_teargas" + }, + { + "id": [ "shot_00", "shot_paper_00" ], + "type": "MIGRATION", + "replace": "shot_buck" + }, + { + "id": [ "shot_beanbag" ], + "type": "MIGRATION", + "replace": "shot_bean" + }, + { + "id": [ "shot_bird", "shot_paper_bird" ], + "type": "MIGRATION", + "replace": "shot_fowl" + }, + { + "id": [ "shot_slug", "shot_paper_slug" ], + "type": "MIGRATION", + "replace": "shot_foster" + }, + { + "id": [ "shot_dragon", "shot_paper_dragon" ], + "type": "MIGRATION", + "replace": "shot_pyro" + }, + { + "id": [ "reloaded_shot_00" ], + "type": "MIGRATION", + "replace": "reloaded_shot_buck" + }, + { + "id": [ "reloaded_shot_bird" ], + "type": "MIGRATION", + "replace": "reloaded_shot_fowl" + }, + { + "id": [ "reloaded_shot_slug" ], + "type": "MIGRATION", + "replace": "reloaded_shot_foster" + }, + { + "id": [ "reloaded_shot_dragon" ], + "type": "MIGRATION", + "replace": "reloaded_shot_pyro" + }, + { + "id": [ "reloaded_shot_flechette" ], + "type": "MIGRATION", + "replace": "reloaded_shot_dart" + } +] diff --git a/data/mods/Generic_Guns/ammo/gg_casings_migration.json b/data/mods/Generic_Guns/ammo/gg_casings_migration.json new file mode 100644 index 0000000000000..2054e8cd19a15 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/gg_casings_migration.json @@ -0,0 +1,60 @@ +[ + { + "id": [ "40x46mm_m118_casing", "40x46mm_m199_casing", "40x53mm_m169_casing" ], + "type": "MIGRATION", + "replace": "grenade_casing" + }, + { + "id": [ "3006_casing", "357mag_casing", "44_casing", "454_casing", "460_casing", "46mm_casing", "500_casing" ], + "type": "MIGRATION", + "replace": "pistol_magnum_casing" + }, + { + "id": [ + "10mm_casing", + "357sig_casing", + "38_casing", + "380_casing", + "38super_casing", + "40_casing", + "45_casing", + "45colt_casing", + "57mm_casing", + "5x50_hull", + "762_25_casing", + "9mm_casing", + "9x18mm_casing" + ], + "type": "MIGRATION", + "replace": "pistol_casing" + }, + { + "id": [ "410shot_hull" ], + "type": "MIGRATION", + "replace": "shot_hull" + }, + { + "id": [ "22_casing", "223_casing", "32_casing" ], + "type": "MIGRATION", + "replace": "pistol_tiny_casing" + }, + { + "id": [ + "270win_casing", + "300blk_casing", + "4570_casing", + "545_casing", + "762_51_casing", + "762_casing", + "762R_casing", + "300_casing" + ], + "type": "MIGRATION", + "replace": "rifle_casing" + }, + { + "id": [ "50_casing", "700nx_casing" ], + "type": "MIGRATION", + "replace": "rifle_huge_casing" + } +] diff --git a/data/mods/Generic_Guns/ammo/grenade.json b/data/mods/Generic_Guns/ammo/grenade.json new file mode 100644 index 0000000000000..4f052c8482568 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/grenade.json @@ -0,0 +1,75 @@ +[ + { + "abstract": "grenade_ammo", + "copy-from": "40x46mm_grenade", + "type": "AMMO", + "name": "grenade cartridge", + "ammo_type": "ammo_grenade", + "casing": "grenade_casing" + }, + { + "id": "grenade_ammo_hedp", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "HEDP grenade cartridge", + "description": "A grenade cartridge with a 'High Explosive Dual Purpose' load and a high number of damaging fragments. Good for armored or soft targets.", + "extend": { "effects": [ "FRAG", "EXPLOSIVE" ] } + }, + { + "id": "grenade_ammo_beanbag", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "beanbag grenade cartridge", + "description": "A less-lethal beanbag grenade cartridge that delivers strong impact on target, causing major pain and disorientation. May still injure or kill.", + "damage": 20, + "extend": { "effects": [ "LARGE_BEANBAG" ] } + }, + { + "id": "grenade_ammo_flare", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "flare grenade cartridge", + "description": "A signal flare grenade cartridge. It will burn brightly for up to a minute, and will also leave a streak of smoke cover in its wake.", + "drop": "handflare_lit", + "extend": { "effects": [ "TRAIL", "NO_EMBED" ] } + }, + { + "id": "grenade_ammo_shot", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "buckshot grenade cartridge", + "description": "A grenade cartridge with a powerful buckshot load, designed to provide some defensive options when carrying a grenade launcher.", + "range": 12, + "damage": 85, + "recoil": 525, + "extend": { "effects": [ "SHOT" ] } + }, + { + "id": "grenade_ammo_smoke", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "smoke grenade cartridge", + "description": "A grenade cartridge grenade designed to provide smoke cover.", + "drop": "smokebomb_act", + "extend": { "effects": [ "TRAIL", "NO_EMBED" ] } + }, + { + "id": "grenade_ammo_teargas", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "teargas grenade cartridge", + "description": "A grenade cartridge with a teargas load. It will disburse a cloud of highly incapacitating gas.", + "drop": "gasbomb_act", + "extend": { "effects": [ "NO_EMBED" ] } + }, + { + "id": "grenade_ammo_slug", + "copy-from": "grenade_ammo", + "type": "AMMO", + "name": "slug grenade cartridge", + "description": "A grenade cartridge loaded with a massive bullet. Say goodbye to your shoulder, I guess.", + "damage": 130, + "recoil": 875, + "extend": { "effects": [ "LARGE_BEANBAG" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/pistol.json b/data/mods/Generic_Guns/ammo/pistol.json new file mode 100644 index 0000000000000..44f964f6e8fa0 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/pistol.json @@ -0,0 +1,39 @@ +[ + { + "id": "pistol_ball", + "type": "AMMO", + "copy-from": "40fmj", + "name": "pistol ammo, ball", + "name-plural": "pistol ammo, ball", + "ammo_type": "ammo_pistol", + "casing": "pistol_casing", + "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." + }, + { + "id": "pistol_jhp", + "type": "AMMO", + "copy-from": "pistol_ball", + "name": "pistol ammo, jhp", + "name-plural": "pistol ammo, jhp", + "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", + "relative": { "damage": 3, "pierce": -6 } + }, + { + "id": "reloaded_pistol_ball", + "type": "AMMO", + "copy-from": "pistol_ball", + "name": "pistol ammo, ball (reloaded)", + "name-plural": "pistol ammo, ball (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "reloaded_pistol_jhp", + "type": "AMMO", + "copy-from": "pistol_jhp", + "name": "pistol ammo, jhp (reloaded)", + "name-plural": "pistol ammo, jhp (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/pistol_magnum.json b/data/mods/Generic_Guns/ammo/pistol_magnum.json new file mode 100644 index 0000000000000..a6ecb2136c903 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/pistol_magnum.json @@ -0,0 +1,39 @@ +[ + { + "id": "pistol_magnum_ball", + "type": "AMMO", + "copy-from": "44fmj", + "name": "magnum pistol ammo, ball", + "name_plural": "magnum pistol ammo, ball", + "ammo_type": "ammo_pistol_magnum", + "casing": "pistol_magnum_casing", + "description": "Magnum pistol ammuniton, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." + }, + { + "id": "pistol_magnum_jhp", + "type": "AMMO", + "copy-from": "pistol_magnum_ball", + "name": "magnum pistol ammo, jhp", + "name-plural": "magnum pistol ammo, jhp", + "description": "Magnum pistol ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", + "relative": { "damage": 3, "pierce": -6 } + }, + { + "id": "reloaded_pistol_magnum_ball", + "type": "AMMO", + "copy-from": "pistol_magnum_ball", + "name": "magnum pistol ammo, ball (reloaded)", + "name-plural": "magnum pistol ammo, ball (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "reloaded_pistol_magnum_jhp", + "type": "AMMO", + "copy-from": "pistol_magnum_jhp", + "name": "magnum pistol ammo, jhp (reloaded)", + "name-plural": "magnum pistol ammo, jhp (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/pistol_tiny.json b/data/mods/Generic_Guns/ammo/pistol_tiny.json new file mode 100644 index 0000000000000..6ee5f377c8b6a --- /dev/null +++ b/data/mods/Generic_Guns/ammo/pistol_tiny.json @@ -0,0 +1,40 @@ +[ + { + "id": "tiny_pistol_ball", + "type": "AMMO", + "copy-from": "32_acp", + "name": "tiny pistol ammo, ball", + "name-plural": "tiny pistol ammo, ball", + "ammo_type": "ammo_pistol_tiny", + "casing": "pistol_tiny_casing", + "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century side-arms. Sold in great quantities preceding the riots. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.", + "relative": { "damage": -2, "pierce": 3 } + }, + { + "id": "tiny_pistol_jhp", + "type": "AMMO", + "copy-from": "tiny_pistol_ball", + "name": "tiny pistol ammo, jhp", + "name-plural": "tiny pistol ammo, jhp", + "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century side-arms. Sold in great quantities preceding the riots. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", + "relative": { "damage": 2, "pierce": -3 } + }, + { + "id": "reloaded_tiny_pistol_ball", + "type": "AMMO", + "copy-from": "tiny_pistol_ball", + "name": "tiny pistol ammo, ball (reloaded)", + "name-plural": "tiny pistol ammo, ball (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "reloaded_tiny_pistol_jhp", + "type": "AMMO", + "copy-from": "tiny_pistol_jhp", + "name": "tiny pistol ammo, jhp (reloaded)", + "name-plural": "tiny pistol ammo, jhp (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/rifle.json b/data/mods/Generic_Guns/ammo/rifle.json new file mode 100644 index 0000000000000..4dcdc0144cda7 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/rifle.json @@ -0,0 +1,39 @@ +[ + { + "id": "rifle_ball", + "type": "AMMO", + "copy-from": "762_51", + "name": "rifle ammo, ball", + "name-plural": "rifle ammo, ball", + "ammo_type": "ammo_rifle", + "casing": "rifle_casing", + "description": "Modern rifle ammunition, ubiquitous and affordable. It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." + }, + { + "id": "rifle_AP", + "type": "AMMO", + "copy-from": "rifle_ball", + "name": "rifle ammo, AP", + "name-plural": "rifle ammo, AP", + "description": "Modern rifle ammunition, ubiquitous and affordable. It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies. This 'armor piercing' variant features a mild steel penetrator for environmental friendliness, improved barrier penetration, and enhanced effect on armor.", + "relative": { "damage": -2, "pierce": 4 } + }, + { + "id": "reloaded_rifle_ball", + "type": "AMMO", + "copy-from": "rifle_ball", + "name": "rifle ammo, ball (reloaded)", + "name-plural": "rifle ammo, ball (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "reloaded_rifle_AP", + "type": "AMMO", + "copy-from": "rifle_AP", + "name": "rifle ammo, AP (reloaded)", + "name-plural": "rifle ammo, AP (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/rifle_huge.json b/data/mods/Generic_Guns/ammo/rifle_huge.json new file mode 100644 index 0000000000000..3ea8147042ed5 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/rifle_huge.json @@ -0,0 +1,39 @@ +[ + { + "id": "rifle_huge_ball", + "type": "AMMO", + "copy-from": "50bmg", + "name": "huge rifle ammo, ball", + "name-plural": "huge rifle ammo, ball", + "ammo_type": "ammo_rifle_huge", + "casing": "rifle_huge_casing", + "description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles. It's suitable for taking on light vehicles and other materiel, or hunting extremely large game. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." + }, + { + "id": "rifle_huge_AP", + "type": "AMMO", + "copy-from": "rifle_huge_ball", + "name": "huge rifle ammo, AP", + "name-plural": "huge rifle ammo, AP", + "description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles. It's suitable for taking on light vehicles and other materiel, or hunting extremely large game. These armor piercing munitions feature tungsten steel penetrators for use against light-skinned vehicles.", + "relative": { "damage": -10, "pierce": 20 } + }, + { + "id": "reloaded_rifle_huge_ball", + "type": "AMMO", + "copy-from": "rifle_huge_ball", + "name": "huge rifle ammo, ball (reloaded)", + "name-plural": "huge rifle ammo, ball (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "reloaded_rifle_huge_AP", + "type": "AMMO", + "copy-from": "rifle_huge_AP", + "name": "huge rifle ammo, AP (reloaded)", + "name-plural": "huge rifle ammo, AP (reloaded)", + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] } + } +] diff --git a/data/mods/Generic_Guns/ammo/rocket.json b/data/mods/Generic_Guns/ammo/rocket.json new file mode 100644 index 0000000000000..476e83efa728f --- /dev/null +++ b/data/mods/Generic_Guns/ammo/rocket.json @@ -0,0 +1,30 @@ +[ + { + "id": "rocket_he", + "type": "AMMO", + "copy-from": "84x246mm_he", + "name": "rocket, antipersonnel", + "name-plural": "rocket, antipersonnel", + "description": "A large anti-personnel rocket for a military rocket launcher. Designed to be highly effective against personnel.", + "material": [ "steel", "powder" ], + "volume": "1250 ml", + "weight": "3200 g", + "ammo_type": "ammo_rocket" + }, + { + "id": "rocket_hedp", + "type": "AMMO", + "copy-from": "84x246mm_hedp", + "name": "rocket, multipurpose", + "name-plural": "rocket, multipurpose", + "description": "An anti-tank rocket with a high explosive dual purpose warhead for a military rocket launcher. Designed to be highly effective against vehicles and structures, and retains some effectiveness against personnel." + }, + { + "id": "rocket_smoke", + "type": "AMMO", + "copy-from": "84x246mm_smoke", + "name": "rocket, smoke", + "name-plural": "rocket, smoke", + "description": "A rocket loaded with a smoke warhead for a military rocket launcher. Commonly used for signaling, target designation, and for screening troop movements." + } +] diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json new file mode 100644 index 0000000000000..aa82fb44c8f19 --- /dev/null +++ b/data/mods/Generic_Guns/ammo/shot.json @@ -0,0 +1,85 @@ +[ + { + "id": "shot_buck", + "copy-from": "shot_00", + "type": "AMMO", + "name": "shotshell, buckshot", + "name-plural": "shotshell, buckshot", + "ammo_type": "ammo_shot" + }, + { + "id": "shot_bean", + "copy-from": "shot_beanbag", + "type": "AMMO", + "name": "shotshell, beanbag", + "name-plural": "shotshell, beanbag", + "ammo_type": "ammo_shot" + }, + { + "id": "shot_fowl", + "copy-from": "shot_bird", + "type": "AMMO", + "name": "shotshell, birdshot", + "name-plural": "shotshell, birdshot", + "ammo_type": "ammo_shot" + }, + { + "id": "shot_foster", + "copy-from": "shot_slug", + "type": "AMMO", + "name": "shotshell, slug", + "name-plural": "shotshell, slug", + "ammo_type": "ammo_shot" + }, + { + "id": "shot_pyro", + "copy-from": "shot_dragon", + "type": "AMMO", + "name": "shotshell, pyrotechnical", + "name-plural": "shotshell, pyrotechnical", + "ammo_type": "ammo_shot" + }, + { + "id": "reloaded_shot_buck", + "copy-from": "reloaded_shot_00", + "name": "shotshell, buckshot (reloaded)", + "name-plural": "shotshell, buckshot (reloaded)", + "type": "AMMO", + "ammo_type": "ammo_shot" + }, + { + "id": "reloaded_shot_fowl", + "copy-from": "reloaded_shot_bird", + "name": "shotshell, birdshot (reloaded)", + "name-plural": "shotshell, birdshot (reloaded)", + "type": "AMMO", + "ammo_type": "ammo_shot" + }, + { + "id": "reloaded_shot_foster", + "copy-from": "reloaded_shot_slug", + "name": "shotshell, slug (reloaded)", + "name-plural": "shotshell, slug (reloaded)", + "type": "AMMO", + "ammo_type": "ammo_shot" + }, + { + "id": "reloaded_shot_pyro", + "copy-from": "reloaded_shot_dragon", + "name": "shotshell, pyrotechnical (reloaded)", + "name-plural": "shotshell, pyrotechnical (reloaded)", + "type": "AMMO", + "description": "A novelty shotgun shell filled with a simple pyrotechnical charge. The payload is light and won't wound very well, but the flash and sparks will certainly be impressive, in adddition to being an extreme fire hazard.", + "ammo_type": "ammo_shot" + }, + { + "id": "reloaded_shot_dart", + "copy-from": "reloaded_shot_flechette", + "name": "shotshell, flechette (reloaded)", + "name-plural": "shotshell, flechette (reloaded)", + "//": "intentionally reload only", + "type": "AMMO", + "description": "A shotgun shell filled with tiny steel darts, definitely not a factory loading. Flechettes won't pattern as well as normal shot, and they'll likely do less damage. However, they may fare better against armor than other shotgun loads.", + "ammo_type": "ammo_shot" + } +] diff --git a/data/mods/Generic_Guns/firearms/black_powder.json b/data/mods/Generic_Guns/firearms/black_powder.json new file mode 100644 index 0000000000000..6bad075a70f5a --- /dev/null +++ b/data/mods/Generic_Guns/firearms/black_powder.json @@ -0,0 +1,29 @@ +[ + { + "id": "black_powder_pistol", + "copy-from": "pistol_flintlock", + "type": "GUN", + "name": "antique pistol", + "ammo": "ammo_black_powder", + "description": "This antiquated single shot pistol would complete a pirate's outfit nicely. While its loading may be slow, it does not require brass casings to fire, and is theoretically sustainable. Range and accuracy are hampered by lack of rifling, but this old design is still plenty lethal.", + "clip_size": 1 + }, + { + "id": "black_powder_revolver", + "copy-from": "colt_army", + "type": "GUN", + "name": "antique revolver", + "ammo": "ammo_black_powder", + "description": "This is an old revolver designed during the period of westward expansion. Black powder paper cartridges must be loaded for each shot, which is a fairly lengthy process. Despite its age, this type of weapon would perform adequately against most two-legged threats.", + "clip_size": 6 + }, + { + "id": "black_powder_rifle", + "copy-from": "rifle_flintlock", + "type": "GUN", + "name": "antique musket", + "ammo": "ammo_black_powder", + "description": "An antique design, this smoothbore long arm would look more at home on a pre-1850's battlefield than in your hands in the cataclysm. Its loading may be slow, but it does not require brass casings to fire, and is theoretically sustainable to fire. Range and accuracy are hampered by lack of rifling, but this time-tested design is plenty lethal.", + "clip_size": 1 + } +] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_blacklist.json b/data/mods/Generic_Guns/firearms/gg_firearms_blacklist.json new file mode 100644 index 0000000000000..9396b72b06bb1 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/gg_firearms_blacklist.json @@ -0,0 +1,6 @@ +{ + "type": "ITEM_BLACKLIST", + "items": [ + "l_HFPack" + ] +} diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json new file mode 100644 index 0000000000000..6c44492bfb1bb --- /dev/null +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -0,0 +1,333 @@ +[ + { + "id": [ "pistol_flintlock" ], + "type": "MIGRATION", + "replace": "black_powder_pistol" + }, + { + "id": [ "colt_navy", "colt_army", "lemat_revolver" ], + "type": "MIGRATION", + "replace": "black_powder_revolver" + }, + { + "id": [ "rifle_flintlock", "carbine_flintlock", "carbine_flintlock_double" ], + "type": "MIGRATION", + "replace": "black_powder_rifle" + }, + { + "id": [ "launcher_simple", "m79" ], + "type": "MIGRATION", + "replace": "grenade_blooper" + }, + { + "id": [ "mark19" ], + "type": "MIGRATION", + "replace": "grenade_hmg" + }, + { + "id": [ "m320" ], + "type": "MIGRATION", + "replace": "grenade_pistol" + }, + { + "id": [ "mgl", "rm802", "triple_launcher_simple" ], + "type": "MIGRATION", + "replace": "grenade_revolver" + }, + { + "id": [ "colt_lightning" ], + "type": "MIGRATION", + "replace": "pistol_levergun" + }, + { + "id": [ + "skorpion_61", + "mac_11", + "mac_10", + "hk_mp7", + "needlepistol", + "hk_mp5k", + "briefcase_smg", + "l_mp_9mm", + "skorpion_82", + "tec9", + "glock_18c" + ], + "type": "MIGRATION", + "replace": "pistol_machine" + }, + { + "id": [ "deagle_44", "l_sp_45", "l_mp_45" ], + "type": "MIGRATION", + "replace": "pistol_magnum_automag" + }, + { + "id": [ "henry_big_boy", "bh_m89", "l_long_45" ], + "type": "MIGRATION", + "replace": "pistol_magnum_levergun" + }, + { + "id": [ "rifle_44" ], + "type": "MIGRATION", + "replace": "pistol_magnum_pipe" + }, + { + "id": [ "rm228", "l_bak_223", "ruger_redhawk", "sw629", "bfr", "l_enforcer_45", "sw_500", "raging_bull", "raging_judge" ], + "type": "MIGRATION", + "replace": "pistol_magnum_revolver" + }, + { + "id": [ + "p320_357sig", + "kp3at", + "fn1910", + "rugerlcp", + "hptcf380", + "taurus_spectrum", + "sig_40", + "hptjcp", + "m1911", + "m1911_MEU", + "walther_ppq_45", + "hptjhp", + "tokarev", + "rm103a_pistol", + "glock_19", + "l_sp_9mm", + "m9", + "usp_9mm", + "m17", + "hi_power_9mm", + "p226_357sig", + "glock_31", + "walther_p38", + "walther_ccp", + "makarov", + "af2011a1_38super", + "m1911a1_38super", + "glock_22", + "hi_power_40", + "walther_ppq_40", + "tommygun", + "usp_45", + "mk23", + "fn57", + "glock_17", + "kpf9", + "walther_ppq_9mm", + "hptc9", + "cz75" + ], + "type": "MIGRATION", + "replace": "pistol_medium" + }, + { + "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico" ], + "type": "MIGRATION", + "replace": "pistol_pcc" + }, + { + "id": [ + "2_shot_special", + "rifle_38", + "rifle_40", + "smg_40", + "surv_six_shooter", + "rifle_45", + "smg_45", + "surv_hand_cannon", + "rifle_9mm", + "smg_9mm" + ], + "type": "MIGRATION", + "replace": "pistol_pipe_smg" + }, + { + "id": [ + "cop_38", + "model_10_revolver", + "ruger_lcr_38", + "sw_610", + "sw_619", + "bond_410", + "colt_saa", + "l_lookout_9mm", + "rm99_pistol" + ], + "type": "MIGRATION", + "replace": "pistol_revolver" + }, + { + "id": [ "ppsh", "hk_mp5", "hk_mp5sd", "uzi", "TDI", "hk_ump45", "fn_p90", "needlegun", "rm2000_smg", "sten" ], + "type": "MIGRATION", + "replace": "pistol_smg" + }, + { + "id": [ "american_180", "rm360_carbine", "ruger_1022" ], + "type": "MIGRATION", + "replace": "pistol_tiny_rifle" + }, + { + "id": [ "marlin_9a", "kp32", "ruger_lcr_22", "sig_mosquito", "sw_22", "walther_p22", "sig_p230", "walther_ppk" ], + "type": "MIGRATION", + "replace": "pistol_tiny_target" + }, + { + "id": [ "moss_brownie", "rifle_22", "j22" ], + "type": "MIGRATION", + "replace": "pistol_tiny_zip" + }, + { + "id": [ + "h&k416a5", + "m1918", + "acr_300blk", + "hk417_13", + "acr", + "l_base_223", + "l_car_223", + "l_mbr_223", + "m4a1", + "m16a4", + "scar_l", + "scar_h", + "rm51_assault_rifle", + "an94", + "rm88_battle_rifle" + ], + "type": "MIGRATION", + "replace": "rifle_assault" + }, + { + "id": [ "m107a1", "as50", "tac50" ], + "type": "MIGRATION", + "replace": "rifle_huge_amr" + }, + { + "id": [ "m2browning_sawn", "bfg50", "trex_gun" ], + "type": "MIGRATION", + "replace": "rifle_huge_double" + }, + { + "id": [ "m2browning" ], + "type": "MIGRATION", + "replace": "rifle_huge_hmg" + }, + { + "id": [ "m134", "l_lmg_223", "m249", "m27iar", "m240", "m60", "rm614_lmg", "rm298" ], + "type": "MIGRATION", + "replace": "rifle_lmg" + }, + { + "id": [ "surv_carbine_223" ], + "type": "MIGRATION", + "replace": "rifle_pipe_carbine" + }, + { + "id": [ "rifle_3006", "rifle_223", "rifle_308" ], + "type": "MIGRATION", + "replace": "rifle_pipe_rifle" + }, + { + "id": [ + "survivor_special_700", + "m110a1", + "mosin44_ebr", + "mosin91_30_ebr", + "rm11b_sniper_rifle", + "l_dsr_223", + "remington700_270", + "m2010", + "weatherby_5", + "win70", + "browning_blr", + "remington_700", + "savage_111f", + "M24", + "sharps" + ], + "type": "MIGRATION", + "replace": "rifle_sniper" + }, + { + "id": [ + "hk_g36", + "garand", + "m1903", + "hk_g3", + "m14ebr", + "ar10", + "1895sbl", + "ak74", + "ak47", + "arx160", + "mosin91_30", + "ar15", + "ruger_mini", + "sig552", + "steyr_aug", + "iwi_tavor_x95_300blk", + "ar15_retool_300blk", + "fn_fal", + "m1a", + "sks", + "mosin44" + ], + "type": "MIGRATION", + "replace": "rifle_sporter" + }, + { + "id": [ "AT4" ], + "type": "MIGRATION", + "replace": "rocket_disposable" + }, + { + "id": [ "m202_flash", "m3_carlgustav" ], + "type": "MIGRATION", + "replace": "rocket_recoilless" + }, + { + "id": [ "shotgun_d", "shotgun_s", "winchester_1887", "pipe_shotgun","winchester_1897"], + "type": "MIGRATION", + "replace": "shot_double" + }, + { + "id": [ "pipe_double_shotgun", "revolver_shotgun", "ashot" ], + "type": "MIGRATION", + "replace": "shot_pipe_double" + }, + { + "id": [ + "saiga_410", + "rm120c", + "rm20", + "bigun", + "saiga_12", + "tavor_12", + "bigun", + "USAS_12" + ], + "type": "MIGRATION", + "replace": "shot_tactical" + }, + { + "id": [ + "shotgun_410", + "browning_a5", + "ksg", + "m1014", + "mossberg_500", + "mossberg_500_security", + "mossberg_590", + "mossberg_930", + "remington_870", + "remington_870_breacher", + "remington_870_express", + "remington_1100", + "streetsweeper", + "SPAS_12" + ], + "type": "MIGRATION", + "replace": "shot_pump" + } +] diff --git a/data/mods/Generic_Guns/firearms/grenade.json b/data/mods/Generic_Guns/firearms/grenade.json new file mode 100644 index 0000000000000..7eddd453e6c55 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/grenade.json @@ -0,0 +1,45 @@ +[ + { + "id": "grenade_blooper", + "copy-from": "m79", + "type": "GUN", + "name": "grenade launcher", + "ammo": "ammo_grenade", + "description": "An older single shot grenade launcher, looking something like a sawn off shotgun. Though it's mostly been replaced by underbarrel launchers, dedicated models like this have seen use by law enforcement and riot personnel. Still deadly against hard or soft targets, depending on what cartridges are available.", + "clip_size": 1 + }, + { + "id": "grenade_hmg", + "copy-from": "mark19", + "type": "GUN", + "name": "automatic grenade launcher", + "ammo": "ammo_grenade", + "description": "This large, clumsy looking launcher looks like the offspring of a machine gun and a mortar; its bore is huge, and its action just as massive. A huge belt of grenade cartridges loads into its tray, allowing several grenades to be launched in rapid succession. If one grenade fired from this isn't enough to solve your problems, surely a dozen more are. This must be mounted on a frame to be fired, and reloading is a bit slow.", + "magazines": [ [ "ammo_grenade", [ "grenade_belt" ] ] ] + }, + { + "id": "grenade_pistol", + "copy-from": "m320", + "type": "GUN", + "name": "grenade pistol", + "//": "more like granadepistole", + "ammo": "ammo_grenade", + "description": "A stubby single shot pistol with a large bore barrel, suitable for launching grenades or flares. This is a slightly more convenient way to transport a grenade launcher than mounted to one's rifle, a practice more common among special forces. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. This could be attached to a suitable rifle, if so desired.", + "clip_size": 1, + "use_action": { + "menu_text": "Deploy as attachment", + "type": "transform", + "target": "grenade_under", + "msg": "You make the launcher ready for attachment." + } + }, + { + "id": "grenade_revolver", + "copy-from": "mgl", + "type": "GUN", + "name": "revolver grenade launcher", + "ammo": "ammo_grenade", + "description": "Looking something like a large revolver from a cartoon this launcher is capable of firing six grenades in rapid succession. Its huge cylinder is wound by a clock spring, which hastens firing, but slows reloading, as it must be re-wound. Needless to say, six well placed shots is an incredible amount of firepower, depending on the cartridges loaded.", + "clip_size": 6 + } +] diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json new file mode 100644 index 0000000000000..52960fb265676 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -0,0 +1,66 @@ +[ + { + "id": "pistol_levergun", + "copy-from": "henry_big_boy", + "type": "GUN", + "name": "cowboy carbine", + "ammo": "ammo_pistol", + "description": "Since the early days of western expansion, when ammunition supply was infrequent, shooters sought to share ammo between their sidearms and long arms. This tube magazine lever action carbine allows the shooter to reduce the number of calibers carried and squeeze more power from their pistol ammunition.", + "clip_size": 10 + }, + { + "id": "pistol_machine", + "copy-from": "glock_18c", + "type": "GUN", + "name": "machine pistol", + "ammo": "ammo_pistol", + "description": "This pistol is a tiny machinegun you can stuff into a holster, with which you could dump its magazine at a blistering rate into any close range foes. Machine pistols mostly see use by vehicle crewmen or bodygaurds of VIPs. Due to its preposterous rate of fire it is difficult to control.", + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + }, + { + "id": "pistol_medium", + "copy-from": "glock_19", + "type": "GUN", + "name": "defensive pistol", + "ammo": "ammo_pistol", + "description": "A modern pistol fit for duty, military service, or personal defense, with a detachable box magazine and a reliable action. Though its chambering is capable of meeting FBI penetration minimums, the lack of a shoulder stock limits its utility.", + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + }, + { + "id": "pistol_pcc", + "copy-from": "cx4", + "type": "GUN", + "name": "survivalist carbine", + "ammo": "ammo_pistol", + "description": "These small carbines share ammunition and magazines with common pistols, offering a more controllable carbine than a normal rifle, while also reducing ammunition costs. Because of their compatibility, they pair well with duty pistols, allowing one to transition to a more stable weapon without carrying extra ammo or magazines.", + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + }, + { + "id": "pistol_revolver", + "copy-from": "ruger_lcr_38", + "type": "GUN", + "name": "police revolver", + "ammo": "ammo_pistol", + "description": "Revolvers like this, chambered for standard defensive calibers, were a favorite of police departments for nearly a century, up until the 1986 Miami shootout. Afterwards, the slow reloading and shooting of revolvers were considered liabilities; still, this model's accuracy and moderate recoil make for a serviceable sidearm, and there are no magazines for you to lose or damage.", + "clip_size": 6, + "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ] ] + }, + { + "id": "pistol_smg", + "copy-from": "hk_mp5", + "type": "GUN", + "name": "submachine gun", + "ammo": "ammo_pistol", + "description": "Chambered in common pistol ammunition, this compact long arm is perfect for trench raiders, vehicular crewmen, SWAT teams and special forces. Though not as accurate as a proper rifle, especially at longer ranges, it is very controllable in automatic fire. It feeds from detachable box magazines, which are easy to unload into close range targets.", + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + }, + { + "id": "pistol_pipe_smg", + "copy-from": "smg_9mm", + "type": "GUN", + "name": "survivor subgun", + "ammo": "ammo_pistol", + "description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies... right? Accepts standard pistol ammunition.", + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json new file mode 100644 index 0000000000000..dc0787caec12f --- /dev/null +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -0,0 +1,71 @@ +[ + { + "id": "pistol_magnum_automag", + "copy-from": "deagle_44", + "type": "GUN", + "name": "hand cannon", + "ammo": "ammo_pistol_magnum", + "description": "This large pistol is almost as heavy as a small carbine, and just about as powerful too. Chambered in hard hitting magnum calibers, it is suitable for hunting medium game, humans, or offsetting any of one's perceived deficiencies. Though tradtionally such magnums are revolvers, this one is a magazine fed semi-automatic.", + "magazines": [ [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + }, + { + "id": "pistol_magnum_levergun", + "copy-from": "henry_big_boy", + "type": "GUN", + "name": "magnum levergun", + "ammo": [ "ammo_pistol", "ammo_pistol_magnum" ], + "description": "A modern re-imagining of the classic western lever-action, this larger rifle accepts powerful magnum pistol ammunition as well as weaker pistol ammo. Carrying this along side a magnum pistol would allow one to reduce the number of calibers carried, and allow you to squeeze more power from ammuntion.", + "clip_size": 10 + }, + { + "id": "pistol_magnum_pipe_levergun", + "copy-from": "henry_big_boy", + "type": "GUN", + "name": "handmade magnum carbine", + "ammo": "ammo_pistol_magnum", + "description": "A crudely constructed carbine, chambered for magnum pistol ammo and standard pistol ammo. It feeds from detachable box magazines, and locks with a rudimentary lever action system. Its powerful cartridge and relative precision should serve well against zombies and medium game.", + "weight": "2114 g", + "volume": "2 L", + "price": 10000, + "bashing": 10, + "color": "brown", + "ranged_damage": 0, + "dispersion": 550, + "durability": 6, + "blackpowder_tolerance": 60, + "loudness": 25, + "barrel_length": 1, + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "muzzle", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "sights mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "magazines": [ [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + }, + { + "id": "pistol_magnum_pipe", + "copy-from": "ashot", + "type": "GUN", + "name": "pipe magnum", + "ammo": [ "ammo_pistol", "ammo_pistol_magnum" ], + "ranged_damage": -2, + "description": "A firearm made from a stout pipe, reinforced at the chamber. It holds a single a round of standard or magnum pistol ammunition, and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", + "dispersion": 440, + "reload": 110 + }, + { + "id": "pistol_magnum_revolver", + "copy-from": "sw629", + "type": "GUN", + "name": "hunting magnum", + "ammo": "ammo_pistol_magnum", + "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it. These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition. You could take medium to large game with this hefty piece.", + "clip_size": 6, + "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ], [ "ammo_pistol_magnum", [ "pistol_speedloader" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/firearms/pistol_tiny.json b/data/mods/Generic_Guns/firearms/pistol_tiny.json new file mode 100644 index 0000000000000..257b97c156607 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/pistol_tiny.json @@ -0,0 +1,29 @@ +[ + { + "id": "pistol_tiny_rifle", + "copy-from": "marlin_9a", + "type": "GUN", + "name": "plinker carbine", + "ammo": "ammo_pistol_tiny", + "description": "With near non-existent recoil and inexpensive ammunition, rifles like this one are popular introductory firearms. It has a built in magazine, capable of holding an impressive amount of its small cartridges. You could take small game with this, but anything bigger might not even notice.", + "clip_size": 19 + }, + { + "id": "pistol_tiny_target", + "copy-from": "sw_22", + "type": "GUN", + "name": "target pistol", + "ammo": "ammo_pistol_tiny", + "description": "This medium sized pistol fires cheap and plentiful plinking ammo, and is exceptionally popular for practice or target shooting. This pistol is unsuited for taking on anything but small game, as it is meant to poke holes in paper. Accepts box magazines.", + "magazines": [ [ "ammo_pistol_tiny", [ "pistol_tiny_mag" ] ] ] + }, + { + "id": "pistol_tiny_zip", + "copy-from": "moss_brownie", + "type": "GUN", + "name": "zip gun", + "ammo": "ammo_pistol_tiny", + "description": "A crude single shot firearm made from improvised or homemade components, chambered for tiny plinking plinking ammunition. Zip guns like these often turned up in the hands of criminals and insurgents. There's no extractor, so it might be slow to reload, and its construction leaves its longevity in question.", + "clip_size": 1 + } +] diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json new file mode 100644 index 0000000000000..3d8d0d2eb107a --- /dev/null +++ b/data/mods/Generic_Guns/firearms/rifle.json @@ -0,0 +1,56 @@ +[ + { + "id": "rifle_assault", + "copy-from": "ar10", + "type": "GUN", + "name": "service rifle", + "ammo": "ammo_rifle", + "description": "Borne from years of refinement . The products of decades of improvement, rifle such as this are handy, reliable, and adaptable. Short of large creatures and light vehicles, this should take care of most of your problems out to several hundred meters.", + "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + }, + { + "id": "rifle_lmg", + "copy-from": "m240", + "type": "GUN", + "name": "light machine gun", + "ammo": "ammo_rifle", + "description": "The light machine gun is a formidable implement for suppressive fire, an important part of squad tactics. Its belt feed allows for hundreds of rounds to be loaded, and its heavy components can withstand long bursts of fire. While perhaps not as precise as a service rifle, a light machinegun does allow for a considerable amount of energy to be sent down range. Slow to reload.", + "magazines": [ [ "ammo_rifle", [ "rifle_belt" ] ] ] + }, + { + "id": "rifle_pipe_rifle", + "copy-from": "rifle_308", + "type": "GUN", + "name": "pipe rifle", + "ammo": "ammo_rifle", + "description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", + "clip_size": 1 + }, + { + "id": "rifle_pipe_carbine", + "copy-from": "surv_carbine_223", + "type": "GUN", + "name": "survivor carbine", + "ammo": "ammo_rifle", + "description": "A crudely constructed carbine chambered for standard rifle ammo, fed from service rifle magazines. It locks with a rudimentary lever action system. The high pressures involved and questionable construction make for less than ideal durability and reliability, but this should still be a serviceable weapon, provided you can stay accurate with it.", + "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + }, + { + "id": "rifle_sniper", + "copy-from": "m2010", + "type": "GUN", + "name": "sniper rifle", + "ammo": "ammo_rifle", + "description": "Sniper rifles fill military, police and civilian needs for precise, accurate fire. Modern examples feature detachable magazines and various mounting interfaces for optics and supports. With care and practice, all should be quite capable of eliminating bipedal threats from very safe ranges. ", + "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + }, + { + "id": "rifle_sporter", + "copy-from": "ar10", + "type": "GUN", + "name": "sporter carbine", + "ammo": "ammo_rifle", + "description": "Though often mislabeled an asssault rifle, this common, cheap box-fed carbine isn't capable of automatic fire. While almost as effective as a proper rifle, the wider variety of components and varying levels of maintenance make these less reliable than their military brethren. These rifles are just as adequate for taking on anything smaller than large game, however.", + "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/firearms/rifle_huge.json b/data/mods/Generic_Guns/firearms/rifle_huge.json new file mode 100644 index 0000000000000..70e9fb38f09a9 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/rifle_huge.json @@ -0,0 +1,31 @@ +[ + { + "id": "rifle_huge_amr", + "copy-from": "m107a1", + "type": "GUN", + "name": "anti-materiel rifle", + "ammo": "ammo_rifle_huge", + "description": "Large, intimidating, and overbuilt, this hefty rifle fires huge projectiles with relative precision. Though it resembles a sniper rifle, this anti-material weapon is best suited for blinding tanks, shooting at aircraft, or destroying explosives. It feeds from comically oversized magazines.", + "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_amr_mag" ] ] ] + }, + { + "id": "rifle_huge_double", + "copy-from": "trex_gun", + "type": "GUN", + "name": "elephant rifle", + "ammo": "ammo_rifle_huge", + "description": "Elegantly engraved, with deep glossy blued steel and figured wood, this break-action double rifle is almost too nice to shoot. Your shoulder might beg you not to; the chambers are almost wide enough for two fingers and the recoil is monstruous. You could probably kill anything with this, especially if you were to fire both barrels at once.", + "modes": [ [ "DEFAULT", "single", 1 ], [ "DOUBLE", "double", 2 ] ], + "extend": { "flags": [ "RELOAD_ONE" ] }, + "clip_size": 2 + }, + { + "id": "rifle_huge_hmg", + "copy-from": "m2browning", + "type": "GUN", + "name": "heavy machine gun", + "ammo": "ammo_rifle_huge", + "description": "This large, ungainly belt-fed machine gun fires huge projectiles, originally intended for turn of the century anti-vehicular use. While no longer suitable for modern tanks or aircraft, thinner skinned vehicles or drones are just as susceptible, as are any other 'smaller' threats. Slow to reload, incredibly loud, and must be mounted to be fired.", + "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_belt" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/firearms/rocket.json b/data/mods/Generic_Guns/firearms/rocket.json new file mode 100644 index 0000000000000..576d83c7946e5 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/rocket.json @@ -0,0 +1,21 @@ +[ + { + "id": "rocket_disposable", + "copy-from": "AT4", + "type": "GUN", + "name": "disposable rocket launcher", + "ammo": "ammo_rocket", + "description": "Constructed of fiberglass, with crude plastic sights and a titanium barrel, this is a launcher for a single rocket. Though not as effective as other anti-armor weapons, the true value in this disposable rocket launcher is its portability and lack of dead weight once expended. Has a backblast, so make sure nothing you mind destroying is behind you.", + "clip_size": 1 + }, + { + "id": "rocket_recoilless", + "copy-from": "m3_carlgustav", + "type": "GUN", + "name": "recoilless rocket launcher", + "ammo": "ammo_rocket", + "description": "This heavy, gigantic rifled tube features a complex optical sight and can launch a wide variety of payloads, including rockets or laser guided missiles. Depending on the warhead loaded, such weapons are effective against older tanks, most vehicles, bunkers and personnel. These are meant to be operated by a two-man crew, so reloading might be a bit slow. Its recoilless design allows for superior range and damage, but it produces tremendous backblast, so make sure nothing you mind destroying is behind you.", + "clip_size": 1, + "default_mods": [ "acog_scope" ] + } +] diff --git a/data/mods/Generic_Guns/firearms/shot.json b/data/mods/Generic_Guns/firearms/shot.json new file mode 100644 index 0000000000000..81cbb2c0d11e1 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/shot.json @@ -0,0 +1,36 @@ +[ + { + "id": "shot_double", + "copy-from": "shotgun_d", + "type": "GUN", + "name": "double-barrel shotgun", + "ammo": "ammo_shot", + "description": "An old-fashioned double barreled shotgun, with a trigger for each barrel. Follow up shots are incredibly quick with this, but reloading is a bit slow. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds." + }, + { + "id": "shot_pipe_double", + "copy-from": "pipe_double_shotgun", + "type": "GUN", + "name": "double-barrel pipe shotgun", + "ammo": "ammo_shot", + "description": "A crudely handmade double barreled shotgun, with a trigger for each barrel. Follow up shots are incredibly quick with this, but reloading is slow, as there are no extractors or ejectors. Shotshells come in many varieties, and shotguns are suitable for anything from some large game to small birds." + }, + { + "id": "shot_pump", + "copy-from": "remington_870", + "type": "GUN", + "name": "sporting shotgun", + "ammo": "ammo_shot", + "description": "A tube magazine fed shotgun, a simple and long-popular design among law enforcement, civilians and in some military applications. Though reloading is slow and the recoil can be stout, shotgun ammo comes in many varieties and are suitable for anything from large game to small birds.", + "clip_size": 6 + }, + { + "id": "shot_tactical", + "copy-from": "saiga_12", + "type": "GUN", + "name": "tactical shotgun", + "ammo": "ammo_shot", + "description": "A detachable magazine fed shotgun, mostly oriented towards overly enthusiastic civilians. Featuring rails and a menancing black finish and furniture, this sort of shotgun doesn't really look like it has a sporting use. Though such systems tend to not work well overall, the box magazine feed reduces the lengthy reloading times associated with shotguns. These can be tuned to run somewhat reliably for competition use.", + "magazines": [ [ "ammo_shot", [ "shot_mag" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/gg_ammo_blacklist.json b/data/mods/Generic_Guns/gg_ammo_blacklist.json deleted file mode 100644 index e4aeb7c8a445d..0000000000000 --- a/data/mods/Generic_Guns/gg_ammo_blacklist.json +++ /dev/null @@ -1,123 +0,0 @@ -[ - { - "type": "ITEM_BLACKLIST", - "items": [ - "10mm_fmj", - "120mm_HEAT", - "12mm", - "20x66_beanbag", - "20x66_bootleg_flechette", - "20x66_bootleg_shot", - "20x66_bootleg_slug", - "20x66_exp", - "20x66_flare", - "20x66_flechette", - "20x66_frag", - "20x66_inc", - "20x66_shot", - "20x66_slug", - "22_cb", - "22_fmj", - "22_lr", - "22_ratshot", - "270win_jsp", - "3006", - "3006_incendiary", - "3006fmj", - "300_winmag", - "32_acp", - "357sig_fmj", - "357sig_jhp", - "36navy", - "38_fmj", - "38_special", - "38_super", - "40x46mm_m1006", - "40x46mm_m433", - "40x46mm_m576", - "40x46mm_m651", - "40x46mm_buckshot_m118", - "40x46mm_buckshot_m199", - "40x46mm_slug_m118", - "40x46mm_slug_m199", - "40x46mm_flechette_m118", - "40x46mm_flechette_m199", - "40x53mm_m1001", - "40x53mm_m430a1", - "40x53mm_buckshot_m169", - "40x53mm_slug_m169", - "40x53mm_flechette_m169", - "40fmj", - "40sw", - "44army", - "44fmj", - "454_Casull", - "45_acp", - "45_jhp", - "45_super", - "46mm", - "500_Magnum", - "545", - "545_ap", - "556", - "57mm", - "5x50dart", - "5x50heavy", - "66mm_HEAT", - "700nx", - "762_25", - "762_25hot", - "762_25typeP", - "762_51", - "762_54R", - "762_m43", - "762_m87", - "8mm_bootleg", - "8mm_caseless", - "8mm_civilian", - "8mm_fmj", - "8mm_hvp", - "8mm_inc", - "8mm_jhp", - "9mmP", - "9x18mm", - "9x18mmP2", - "9x18mmfmj", - "reloaded_10mm_fmj", - "reloaded_22_lr", - "reloaded_22_fmj", - "reloaded_270win_jsp", - "reloaded_3006", - "reloaded_3006_incendiary", - "reloaded_3006fmj", - "reloaded_300_winmag", - "reloaded_32_acp", - "reloaded_38_fmj", - "reloaded_38_special", - "reloaded_38_super", - "reloaded_40fmj", - "reloaded_40sw", - "reloaded_44fmj", - "reloaded_454_Casull", - "reloaded_45_acp", - "reloaded_45_jhp", - "reloaded_45_super", - "reloaded_46mm", - "reloaded_500_Magnum", - "reloaded_545", - "reloaded_545_ap", - "reloaded_556", - "reloaded_57mm", - "reloaded_5x50dart", - "reloaded_700nx", - "reloaded_762_51", - "reloaded_762_54R", - "reloaded_762_m43", - "reloaded_762_m87", - "reloaded_9mmP", - "reloaded_9x18mm", - "reloaded_9x18mmP2", - "reloaded_9x18mmfmj" - ] - } -] diff --git a/data/mods/Generic_Guns/gg_ammo_hand_override.json b/data/mods/Generic_Guns/gg_ammo_hand_override.json deleted file mode 100644 index 23c8cc2f65401..0000000000000 --- a/data/mods/Generic_Guns/gg_ammo_hand_override.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "id": "reloaded_223", - "copy-from": "reloaded_223", - "type": "AMMO", - "name": "reloaded light rifle ammo", - "name_plural": "reloaded light rifle ammo", - "description": "Hand-loaded ammunition for lighter rifles, designed for small game and humans.", - "count": 15 - }, - { - "id": "reloaded_308", - "copy-from": "reloaded_308", - "type": "AMMO", - "name": "reloaded rifle ammo", - "name_plural": "reloaded rifle ammo", - "description": "Hand-loaded ammunition for rifles, meant for taking down large game or humans.", - "count": 15 - }, - { - "id": "reloaded_9mm", - "copy-from": "reloaded_9mm", - "type": "AMMO", - "name": "reloaded pistol ammo", - "name_plural": "reloaded pistol ammo", - "description": "Hand-loaded ammunition for semiautomatic pistols as well as submachine guns.", - "count": 20, - "ammo_type": "9mm" - }, - { - "id": "reloaded_9mmP2", - "copy-from": "reloaded_9mmP2", - "type": "AMMO", - "name": "reloaded pistol ammo+", - "name_plural": "reloaded pistol ammo+", - "description": "Hand-loaded ammunition for pistols, packed with extra powder. It trades improved damage for increased recoil.", - "count": 12, - "ammo_type": "9mm" - }, - { - "id": "reloaded_9mmfmj", - "copy-from": "reloaded_9mmfmj", - "type": "AMMO", - "name": "reloaded pistol ammo, AP", - "name_plural": "reloaded pistol ammo, AP", - "description": "Hand-loaded armor-piercing ammunition for pistols. It trades improved penetration for slightly reduced damage.", - "count": 10, - "ammo_type": "9mm" - }, - { - "id": "reloaded_44magnum", - "copy-from": "reloaded_44magnum", - "type": "AMMO", - "name": "reloaded revolver ammo", - "name_plural": "reloaded revolver ammo", - "description": "Hand-loaded ammunition for large revolvers and magnum pistols.", - "count": 10, - "ammo_type": "44" - }, - { - "id": "reloaded_556_incendiary", - "copy-from": "reloaded_556_incendiary", - "type": "AMMO", - "name": "reloaded light rifle ammo, incendiary", - "name_plural": "reloaded light rifle ammo, incendiary", - "count": 10 - }, - { - "id": "reloaded_762_51_incendiary", - "copy-from": "reloaded_762_51_incendiary", - "type": "AMMO", - "name": "reloaded rifle ammo, incendiary", - "description": "Hand-loaded incendiary ammunition for rifles, designed to burn hotly upon impact, piercing armor and igniting flammable substances. This one has been hand-reloaded.", - "count": 10 - }, - { - "id": "reloaded_50bmg", - "copy-from": "reloaded_50bmg", - "type": "AMMO", - "name": "reloaded heavy rifle ammo", - "name_plural": "reloaded heavy rifle ammo", - "description": "Hand-loaded ammunition for heavy machineguns and special military hardware, intended for destroying vehicles or very large creatures.", - "count": 12, - "ammo_type": "50" - }, - { - "id": "reloaded_50ss", - "copy-from": "reloaded_50ss", - "type": "AMMO", - "name": "reloaded heavy rifle ammo, AP", - "name_plural": "reloaded heavy rifle ammo, AP", - "description": "Hand-loaded armor-piercing ammunition for heavy machineguns and other military hardware. It trades improved penetration for slightly reduced damage.", - "count": 8, - "ammo_type": "50" - }, - { - "id": "reloaded_50_incendiary", - "copy-from": "reloaded_50_incendiary", - "type": "AMMO", - "name": "reloaded heavy rifle ammo, incendiary", - "name_plural": "reloaded heavy rifle ammo, incendiary", - "description": "Hand-loaded ammunition for heavy machine guns and other military hardware, designed to burn hotly upon impact, piercing armor and igniting flammable substances.", - "count": 10, - "ammo_type": "50" - }, - { - "id": "reloaded_shot_00", - "copy-from": "shot_00", - "type": "AMMO", - "name": "00 shot", - "count": 10 - }, - { - "id": "reloaded_shot_bird", - "copy-from": "reloaded_shot_bird", - "type": "AMMO", - "name": "birdshot", - "count": 10 - }, - { - "id": "reloaded_shot_flechette", - "copy-from": "reloaded_shot_flechette", - "type": "AMMO", - "name": "flechette shell", - "count": 5 - }, - { - "id": "reloaded_shot_slug", - "copy-from": "reloaded_shot_slug", - "type": "AMMO", - "name": "00 shot", - "count": 10 - } -] diff --git a/data/mods/Generic_Guns/gg_ammo_override.json b/data/mods/Generic_Guns/gg_ammo_override.json deleted file mode 100644 index 6ab0ef0177a52..0000000000000 --- a/data/mods/Generic_Guns/gg_ammo_override.json +++ /dev/null @@ -1,220 +0,0 @@ -[ - { - "id": "84x246mm_he", - "type": "AMMO", - "copy-from": "84x246mm_he", - "name": "84x246mm HE rocket", - "description": "A 84x246mm High Explosive anti-personnel round for the recoilless rifle. Designed to be highly effective against personnel." - }, - { - "id": "84x246mm_hedp", - "type": "AMMO", - "copy-from": "84x246mm_hedp", - "name": "84x246mm HEDP rocket", - "description": "A 84x246mm High Explosive Dual Purpose anti-materiel round for the recoilless rifle. Designed to be highly effective against vehicles and structures." - }, - { - "id": "84x246mm_smoke", - "type": "AMMO", - "copy-from": "84x246mm_smoke", - "name": "84x246mm smoke rocket", - "description": "A 84x246mm smoke marker round for the recoilless rifle. Commonly used for signaling, target designation, and for screening troop movements." - }, - { - "id": "9mm_casing", - "copy-from": "9mm_casing", - "type": "GENERIC", - "name": "pistol ammo casing", - "description": "An empty casing from a pistol round." - }, - { - "id": "44_casing", - "copy-from": "44_casing", - "type": "GENERIC", - "name": "revolver ammo casing", - "description": "An empty casing from a revolver round." - }, - { - "id": "223_casing", - "copy-from": "223_casing", - "type": "GENERIC", - "name": "light rifle ammo casing", - "description": "An empty casing from a light rifle round." - }, - { - "id": "308_casing", - "copy-from": "308_casing", - "type": "GENERIC", - "name": "rifle casing", - "description": "An empty casing from a rifle round." - }, - { - "id": "762_51_casing", - "copy-from": "762_51_casing", - "type": "GENERIC", - "name": "rifle casing", - "description": "An empty casing from a rifle round." - }, - { - "id": "50_casing", - "copy-from": "50_casing", - "type": "GENERIC", - "name": "heavy rifle casing", - "description": "An empty casing from a heavy rifle round." - }, - { - "id": "ammolink308", - "copy-from": "ammolink308", - "type": "GENERIC", - "name": "belt ammo link", - "description": "A small metal linkage from a disintegrating ammo belt." - }, - { - "id": "9mm", - "copy-from": "9mm", - "type": "AMMO", - "name": "pistol ammo", - "name_plural": "pistol ammo", - "description": "Ammunition for semiautomatic pistols, as well as submachineguns and the occasional robot.", - "count": 20 - }, - { - "id": "9mmP2", - "copy-from": "9mmP2", - "type": "AMMO", - "name": "pistol ammo+", - "name_plural": "pistol ammo+", - "description": "High power ammunition for pistols, packed with extra powder. It trades improved damage for increased recoil.", - "count": 12 - }, - { - "id": "9mmfmj", - "copy-from": "9mmfmj", - "type": "AMMO", - "name": "pistol ammo, AP", - "name_plural": "AP pistol ammo", - "description": "Armor piercing ammunition for pistols. It trades improved penetration for slightly reduced damage.", - "count": 10 - }, - { - "id": "44magnum", - "copy-from": "44magnum", - "type": "AMMO", - "name": "revolver ammo", - "name_plural": "revolver ammo", - "description": "Powerful ammunition for large revolvers and magnum pistols.", - "count": 10 - }, - { - "id": "223", - "copy-from": "223", - "type": "AMMO", - "name": "light rifle ammo", - "name_plural": "light rifle ammo", - "description": "Low recoil ammunition for rifles, designed for small game and humans.", - "count": 15 - }, - { - "id": "556_incendiary", - "copy-from": "556_incendiary", - "type": "AMMO", - "name": "light rifle ammo, incendiary", - "name_plural": "light rifle ammo, incendiary", - "description": "Military ammunition for rifles, designed to burn hotly upon impact, piercing armor and igniting flammable substances.", - "count": 10 - }, - { - "id": "308", - "copy-from": "308", - "type": "AMMO", - "name": "rifle ammo", - "name_plural": "rifle ammo", - "description": "Powerful and accurate ammunition for rifles, meant for taking down large game or humans.", - "count": 15 - }, - { - "id": "762_51_incendiary", - "copy-from": "762_51_incendiary", - "type": "AMMO", - "name": "rifle ammo, incendiary", - "name_plural": "rifle ammo, incendiary", - "description": "Military ammo for rifles, designed to burn hotly upon impact, piercing armor and igniting flammable substances.", - "count": 10 - }, - { - "id": "50bmg", - "copy-from": "50bmg", - "type": "AMMO", - "name": "heavy rifle ammo", - "name_plural": "heavy rifle ammo", - "description": "Serious ammunition for heavy machineguns and special military hardware, intended for destroying vehicles or very large creatures.", - "count": 12 - }, - { - "id": "50ss", - "copy-from": "50ss", - "type": "AMMO", - "name": "heavy rifle ammo, AP", - "name_plural": "heavy rifle ammo, AP", - "description": "Armor piercing ammunition for heavy machineguns and other military hardware. It trades improved penetration for slightly reduced damage.", - "count": 8 - }, - { - "id": "50_incendiary", - "copy-from": "50_incendiary", - "type": "AMMO", - "name": "heavy rifle ammo, incendiary", - "name_plural": "heavy rifle ammo, incendiary", - "description": "Ammunition for heavy machine guns and other military hardware, designed to burn hotly upon impact, piercing armor and igniting flammable substances.", - "count": 10 - }, - { - "id": "shot_00", - "copy-from": "shot_00", - "type": "AMMO", - "name": "00 shot", - "count": 10 - }, - { - "id": "shot_beanbag", - "copy-from": "shot_beanbag", - "type": "AMMO", - "name": "shotgun beanbag", - "count": 5 - }, - { - "id": "shot_bird", - "copy-from": "shot_bird", - "type": "AMMO", - "name": "birdshot", - "count": 10 - }, - { - "id": "shot_flechette", - "copy-from": "shot_flechette", - "type": "AMMO", - "name": "flechette shell", - "count": 5 - }, - { - "id": "shot_he", - "copy-from": "shot_he", - "type": "AMMO", - "name": "explosive slug", - "count": 5 - }, - { - "id": "shot_scrap", - "copy-from": "shot_scrap", - "type": "AMMO", - "name": "makeshift shotgun shot", - "count": 10 - }, - { - "id": "shot_slug", - "copy-from": "shot_slug", - "type": "AMMO", - "name": "shotgun slug", - "count": 10 - } -] diff --git a/data/mods/Generic_Guns/gg_ammunition_types.json b/data/mods/Generic_Guns/gg_ammunition_types.json index a51c4772da791..4e3eacb0c72f8 100644 --- a/data/mods/Generic_Guns/gg_ammunition_types.json +++ b/data/mods/Generic_Guns/gg_ammunition_types.json @@ -1,32 +1,65 @@ [ { - "id": "44", - "name": "revolver ammo", - "default": "44magnum", - "type": "ammunition_type" + "type": "ammunition_type", + "id": "ammo_black_powder", + "//": "a combination flintlock and cap and ball type ammo. Just roll with it.", + "name": "standard pistol ammo", + "default": "black_powder_ball" }, { - "id": "9mm", - "name": "pistol ammo", - "default": "9mm", - "type": "ammunition_type" + "type": "ammunition_type", + "id": "ammo_pistol_tiny", + "//": "ammo smaller than .380ACP", + "name": "tiny pistol ammo", + "default": "tiny_pistol_jhp" }, { - "id": "223", - "name": "light rifle ammo", - "default": "223", - "type": "ammunition_type" + "type": "ammunition_type", + "id": "ammo_pistol", + "//": ".380 to .357sig", + "name": "standard pistol ammo", + "default": "pistol_ball" }, { - "id": "308", + "type": "ammunition_type", + "id": "ammo_pistol_magnum", + "//": ".357mag and up.", + "name": "magnum pistol ammo", + "default": "pistol_magnum_ball" + }, + { + "type": "ammunition_type", + "id": "ammo_rifle", + "//": "any rifle ammo less powerful than .375 H&H.", "name": "rifle ammo", - "default": "308", - "type": "ammunition_type" + "default": "rifle_ball" + }, + { + "type": "ammunition_type", + "id": "ammo_rifle_huge", + "//": "ammo from .375 H&H to .50BMG. Migrate anything stronger to as-yet unimplemented light cannon ammo", + "name": "huge rifle ammo", + "default": "rifle_huge_ball" + }, + { + "type": "ammunition_type", + "id": "ammo_grenade", + "//": "20mm or greater ammo containing explosive material, usually 40mm.", + "name": "grenade ammo", + "default": "grenade_ammo_hedp" + }, + { + "type": "ammunition_type", + "id": "ammo_rocket", + "//": "any rocket, missile, or rocket-like ordinance, like recoilless ammo", + "name": "rocket ammo", + "default": "rocket_hedp" }, { - "id": "50", - "name": "heavy rifle ammo", - "default": "50bmg", - "type": "ammunition_type" + "type": "ammunition_type", + "id": "ammo_shot", + "//": "any ammunition for smoothbore projectiles, typically using wads and plastic hulls.", + "name": "shotgun ammo", + "default": "shot_buck" } ] diff --git a/data/mods/Generic_Guns/gg_bandolier_override.json b/data/mods/Generic_Guns/gg_bandolier_override.json deleted file mode 100644 index 289b3e6524349..0000000000000 --- a/data/mods/Generic_Guns/gg_bandolier_override.json +++ /dev/null @@ -1,33 +0,0 @@ -[ - { - "id": "bandolier_pistol", - "copy-from": "bandolier_pistol", - "type": "ARMOR", - "name": "pistol bandolier", - "description": "An embroidered leather bandolier for keeping revolver and pistol cartridges close to hand. If this doesn't make you feel like a cowboy, nothing will.", - "use_action": { "type": "bandolier", "capacity": 18, "ammo": [ "44", "9mm" ] } - }, - { - "id": "bandolier_rifle", - "copy-from": "bandolier_rifle", - "type": "ARMOR", - "name": "rifle bandolier", - "description": "A leather bandolier for keeping rifle cartridges close to hand.", - "use_action": { "type": "bandolier", "capacity": 16, "ammo": [ "223", "308", "50" ] } - }, - { - "id": "bandolier_shotgun", - "copy-from": "bandolier_shotgun", - "type": "ARMOR", - "name": "shotgun bandolier", - "use_action": { "type": "bandolier", "capacity": 12, "ammo": [ "shot" ] } - }, - { - "id": "bandolier_wrist", - "copy-from": "bandolier_wrist", - "type": "ARMOR", - "name": "wrist bandolier", - "description": "A small fabric bandolier for rifle cartridges designed to be worn around the wrist.", - "use_action": { "type": "bandolier", "capacity": 4, "ammo": [ "223", "308", "50" ] } - } -] diff --git a/data/mods/Generic_Guns/gg_guns.json b/data/mods/Generic_Guns/gg_guns.json deleted file mode 100644 index c3408dc4117bb..0000000000000 --- a/data/mods/Generic_Guns/gg_guns.json +++ /dev/null @@ -1,68 +0,0 @@ -[ - { - "id": "pipe__gun_44", - "type": "GUN", - "reload_noise_volume": 10, - "name": "pipe gun: revolver ammo", - "name_plural": "pipe guns: revolver ammo", - "description": "A home-made breech-loading gun made from a metal pipe. It can hold a single revolver round.", - "weight": "1953 g", - "volume": "1750 ml", - "price": 10000, - "to_hit": -2, - "bashing": 10, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": "44", - "skill": "rifle", - "ranged_damage": -2, - "dispersion": 105, - "durability": 6, - "loudness": 150, - "clip_size": 1, - "reload": 350, - "valid_mod_locations": [ [ "muzzle", 1 ], [ "stock", 1 ] ], - "flags": [ "RELOAD_ONE", "RELOAD_EJECT" ] - }, - { - "id": "levergun_44", - "type": "GUN", - "reload_noise_volume": 10, - "name": "lever action carbine", - "description": "A rugged lever-action carbine reminiscent of the Wild West. It holds twelve revolver rounds in a tubular internal magazine.", - "weight": "3175 g", - "volume": "3 L", - "price": 85000, - "to_hit": 1, - "bashing": 12, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "brown", - "ammo": "44", - "skill": "rifle", - "ranged_damage": 4, - "dispersion": 75, - "durability": 7, - "loudness": 150, - "clip_size": 12, - "reload": 100, - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "barrel", 1 ], - [ "bore", 1 ], - [ "conversion", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "magazine", 2 ], - [ "mechanism", 4 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "flags": [ "RELOAD_ONE" ] - } -] diff --git a/data/mods/Generic_Guns/gg_guns_blacklist.json b/data/mods/Generic_Guns/gg_guns_blacklist.json deleted file mode 100644 index 609b3ca978243..0000000000000 --- a/data/mods/Generic_Guns/gg_guns_blacklist.json +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - "type": "ITEM_BLACKLIST", - "items": [ - "surv_hand_cannon", - "2_shot_special", - "american_180", - "acr", - "ak74", - "an94", - "ar15", - "arx160", - "ashot", - "bh_m89", - "briefcase_smg", - "browning_blr", - "colt_army", - "colt_navy", - "combination_gun", - "cop_38", - "doublespeargun", - "fn57", - "fn_fal", - "fn_p90", - "garand", - "glock_17", - "glock_22", - "h&k416a5", - "henry_big_boy", - "hk_g3", - "hk_g36", - "hk_g80", - "hk_mp7", - "hk_ump45", - "ksg", - "ksub2000", - "l_bak_223", - "l_base_223", - "l_car_223", - "l_dsr_223", - "l_enforcer_45", - "l_lmg_223", - "l_long_45", - "l_lookout_9mm", - "l_mbr_223", - "l_mp_45", - "l_mp_9mm", - "l_sp_45", - "l_sp_9mm", - "launcher_simple", - "LAW", - "LAW_Packed", - "lemat_revolver", - "m14ebr", - "m1903", - "m1911", - "m1918", - "m2010", - "m202_flash", - "M24", - "m27iar", - "m2browning_sawn", - "m320", - "m79", - "mac_10", - "makarov", - "mgl", - "mosin44", - "mosin44_ebr", - "mosin91_30", - "mosin91_30_ebr", - "moss_brownie", - "needlegun", - "needlepistol", - "p226_357sig", - "ppsh", - "m235tpa", - "mark19", - "marlin_9a", - "raging_bull", - "remington_700", - "remington_870", - "revolver_shotgun", - "rifle_22", - "rifle_3006", - "rm103a_pistol", - "rm11b_sniper_rifle", - "rm120c", - "rm13_armor", - "rm13_armor_on", - "rm20", - "rm2000_smg", - "rm228", - "rm298", - "rm360_carbine", - "rm451_flamethrower", - "rm51_assault_rifle", - "rm614_lmg", - "rm802", - "rm88_battle_rifle", - "rm99_pistol", - "ruger_1022", - "ruger_lcr_22", - "ruger_lcr_38", - "saiga_12", - "scar_l", - "sig552", - "sig_40", - "sig_mosquito", - "sig_p230", - "skorpion_61", - "skorpion_82", - "sks", - "sten", - "steyr_aug", - "surv_rocket_launcher", - "sw629", - "sw_22", - "sw_500", - "sw_610", - "sw_619", - "TANK", - "taurus_spectrum", - "TDI", - "tec9", - "tokarev", - "tommygun", - "triple_launcher_simple", - "usp_45", - "usp_9mm", - "uzi", - "walther_ppk", - "weatherby_5", - "win70" - ] - } -] diff --git a/data/mods/Generic_Guns/gg_guns_override.json b/data/mods/Generic_Guns/gg_guns_override.json deleted file mode 100644 index ff2973ba3be03..0000000000000 --- a/data/mods/Generic_Guns/gg_guns_override.json +++ /dev/null @@ -1,293 +0,0 @@ -[ - { - "id": "glock_19", - "copy-from": "glock_19", - "type": "GUN", - "name": "semiautomatic pistol", - "description": "A typical sidearm for the police, military, and licensed civilians. It holds 15 rounds of pistol ammo in a detachable magazine.", - "ammo": "9mm", - "magazine_well": 1, - "magazines": [ [ "9mm", [ "glockmag", "glockbigmag" ] ] ] - }, - { - "id": "m9", - "copy-from": "m9", - "type": "GUN", - "name": "holdout pistol", - "description": "A very small pistol meant to be concealed and fired at close range. It holds five rounds of pistol ammo.", - "ammo": "9mm", - "clip_size": 5, - "reload": 100, - "magazines": [ ] - }, - { - "id": "hk_mp5", - "copy-from": "hk_mp5", - "type": "GUN", - "name": "submachine gun", - "description": "A selective fire carbine favored by vehicle crews, special police, and criminals. It holds thirty rounds of pistol ammo in a detachable magazine.", - "ammo": "9mm", - "magazines": [ [ "9mm", [ "mp5mag", "mp5bigmag" ] ] ] - }, - { - "id": "calico", - "copy-from": "calico", - "type": "GUN", - "name": "advanced submachine gun", - "description": "An exotic submachinegun with a larger ammo capacity and higher rate of fire. It holds fifty rounds of pistol ammo in a detachable magazine.", - "ammo": "9mm", - "magazine_well": 1, - "magazines": [ [ "9mm", [ "calicomag" ] ] ] - }, - { - "id": "cx4", - "copy-from": "cx4", - "type": "GUN", - "name": "plinking carbine", - "description": "A cheap carbine made for target practice or varmint hunting. It uses detachable pistol magazines.", - "ammo": "9mm", - "magazine_well": 1, - "magazines": [ [ "9mm", [ "glockmag", "glockbigmag" ] ] ] - }, - { - "id": "ruger_redhawk", - "copy-from": "ruger_redhawk", - "type": "GUN", - "name": "revolver", - "description": "A refined and modernized version of the classic cowboy sidearm. Its cylinder holds six powerful revolver rounds.", - "ammo": "44" - }, - { - "id": "mossberg_500", - "copy-from": "mossberg_500", - "type": "GUN", - "name": "pump action shotgun", - "description": "A pump-action single-barreled shotgun. It holds six shells in an internal tubular magazine", - "clip_size": 6, - "reload": 100, - "magazines": [ [ "shot", [ "shot_speedloader6" ] ] ] - }, - { - "id": "m1014", - "copy-from": "m1014", - "type": "GUN", - "name": "combat shotgun", - "description": "A military issue shotgun that can be fired in short bursts. It holds eight shells in an internal magazine.", - "reload": 100 - }, - { - "id": "ruger_mini", - "copy-from": "ruger_mini", - "type": "GUN", - "name": "semiautomatic carbine", - "description": "A compact and lightweight carbine favored by hunters and the police. It holds ten rounds of light rifle ammo in a detachable magazine.", - "magazines": [ [ "223", [ "stanag10" ] ] ] - }, - { - "id": "m4a1", - "copy-from": "m4a1", - "type": "GUN", - "name": "assault rifle", - "description": "A lightweight assault rifle used by US military, it also has hundreds of commercial knockoffs for the civilian market. It uses detachable magazines of various capacities.", - "magazines": [ [ "223", [ "stanag10", "stanag30", "stanag50" ] ] ] - }, - { - "id": "ak47", - "copy-from": "ak47", - "type": "GUN", - "name": "foreign assault rifle", - "description": "A cheap but reliable assault rifle imported from overseas. It uses imported magazines which are incompatible with standard rifle magazines.", - "ammo": "308", - "magazines": [ [ "308", [ "akmmag", "akmbigmag" ] ] ] - }, - { - "id": "arx160", - "copy-from": "arx160", - "type": "GUN", - "name": "Beretta ARX-160", - "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world.", - "ammo": "308", - "magazines": [ [ "223", [ "stanag30", "stanag10", "stanag50" ] ], [ "308", [ "akmmag", "akmbigmag", "g3mag", "g3bigmag" ] ] ] - }, - { - "id": "m249", - "copy-from": "m249", - "type": "GUN", - "name": "light machine gun", - "description": "A portable lightweight machine gun built for laying down suppressive fire rather than placing accurate shots. It can be reloaded using both drum magazines and ammo belts.", - "magazines": [ [ "223", [ "stanag50", "belt223" ] ] ] - }, - { - "id": "m60", - "copy-from": "m60", - "type": "GUN", - "name": "general purpose machine gun", - "description": "A hefty machine gun meant to be fired from bipods or mounted to vehicles. Unlike the lighter version this can only be reloaded using ammo belts", - "ammo": "223", - "magazines": [ [ "223", [ "belt223" ] ] ] - }, - { - "id": "m134", - "copy-from": "m134", - "type": "GUN", - "name": "minigun", - "description": "Despite the name, this is a huge automatic weapon meant to be mounted on vehicles; it's only miniature compared to a cannon. It has six barrels that rotate to keep from overheating. It holds up to five hundred rounds of belted rifle ammo, and requires a UPS to power its electric motor.", - "clip_size": 500, - "reload": 200, - "magazines": [ ] - }, - { - "id": "savage_111f", - "copy-from": "savage_111f", - "type": "GUN", - "name": "bolt action rifle", - "description": "A solid bolt action rifle made for hunting large game, but also used by police and military snipers. It holds five rounds of rifle ammo in an internal magazine.", - "ammo": "308", - "clip_size": 5, - "reload": 100 - }, - { - "id": "m1a", - "copy-from": "m1a", - "type": "GUN", - "name": "service rifle", - "//": "fake gun between a garand and m14.", - "description": "An old semiautomatic rifle still used in military drills and parades. It holds ten rounds of rifle ammo in an internal magazine.", - "ammo": "308", - "clip_size": 10, - "reload": 100, - "magazines": [ ], - "flags": [ "RELOAD_ONE" ] - }, - { - "id": "scar_h", - "copy-from": "scar_h", - "type": "GUN", - "name": "battle rifle", - "description": "A highly modular, selective fire battle rifle used by the US military. It uses either compact 20-round or bulkier 30-round detachable magazines.", - "magazines": [ [ "308", [ "scarhmag", "scarhbigmag" ] ] ] - }, - { - "id": "m240", - "copy-from": "m240", - "type": "GUN", - "name": "medium machine gun", - "description": "A medium machine gun used by the US military, meant to be fired from bipods or mounted to vehicles. It uses ammo belts of up to 200-rounds.", - "magazines": [ [ "308", [ "belt308" ] ] ] - }, - { - "id": "m107a1", - "copy-from": "m107a1", - "type": "GUN", - "name": "antimateriel rifle", - "description": "A powerful bolt-action sniper rifle meant to destroy vehicles, equipment, and enemy combatants. It holds ten rounds of heavy rifle ammo in a detachable magazine.", - "ammo": "50", - "magazines": [ [ "50", [ "m107a1mag" ] ] ] - }, - { - "id": "m2browning", - "copy-from": "m2browning", - "type": "GUN", - "name": "heavy machine gun", - "description": "A heavy automatic weapon that must be mounted to a vehicle to fire. It holds two hundred rounds of military ammo in a large belt drum.", - "ammo": "50", - "magazines": [ [ "50", [ "belt50" ] ] ] - }, - { - "id": "rifle_9mm", - "copy-from": "rifle_9mm", - "type": "GUN", - "name": "pipe gun: pistol ammo", - "name_plural": "pipe rifles: pistol ammo", - "description": "A home-made gun. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", - "ammo": "9mm" - }, - { - "id": "surv_six_shooter", - "copy-from": "surv_six_shooter", - "type": "GUN", - "name": "survivor's six shooter", - "description": "A homemade 6 shot revolver. While it's not as good as the pre-Cataclysm manufactured weapons, it's a decent piece of work all things considered.", - "ammo": "44" - }, - { - "id": "rifle_308", - "copy-from": "rifle_308", - "type": "GUN", - "name": "pipe gun: rifle ammo", - "name_plural": "pipe guns: rifle ammo", - "description": "A homemade gun. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as a tube system for feeding and chambering more powerful rifle rounds." - }, - { - "id": "surv_carbine_223", - "copy-from": "surv_carbine_223", - "type": "GUN", - "name": "survivor's carbine", - "description": "A well designed homemade carbine using light rifle ammo. Fits a 10-round detachable magazine and with a shortened barrel, this is one of the better homemade weapons.", - "magazines": [ [ "223", [ "stanag10" ] ] ] - }, - { - "id": "emp_gun", - "copy-from": "emp_gun", - "type": "GUN", - "name": "EMP Projector", - "description": "A powerful electrolaser developed by paramilitary R&D not long before the Cataclysm. Especially effective against electronic targets. It charges off of UPS power stations." - }, - { - "id": "laser_cannon", - "copy-from": "laser_cannon", - "type": "GUN", - "name": "hand-held laser cannon", - "description": "This is a laser cannon stripped from the barrel of a laser turret; it has been modified to use UPS power for firing." - }, - { - "id": "laser_rifle", - "copy-from": "laser_rifle", - "type": "GUN", - "name": "laser rifle", - "description": "A state of the art laser rifle which runs on UPS power. It was developed by paramilitary R&D shortly before the Cataclysm. Initial performance rivaled the most advanced ballistic weapons of the day. Though the Cataclysm put that on the ash heap of history, this weapon can still do the same to your foes." - }, - { - "id": "v29", - "copy-from": "v29", - "type": "GUN", - "name": "laser pistol", - "description": "This pistol is larger than most traditional handguns, but displays no recoil whatsoever. It runs efficiently on UPS power." - }, - { - "id": "v29_cheap", - "copy-from": "v29_cheap", - "type": "GUN", - "name": "scrap laser pistol", - "description": "Based on its military and commercial cousin, this laser pistol is little more than duct tape and electronics, however it runs on standard UPS power." - }, - { - "id": "ftk93", - "copy-from": "ftk93", - "type": "GUN", - "name": "fusion rifle" - }, - { - "id": "plasma_rifle", - "copy-from": "plasma_rifle", - "type": "GUN", - "name": "plasma rifle", - "description": "Developed by a cutting edge weapons research team together with DARPA, this UPS-powered energy weapon heats hydrogen to create plasma and envelopes it with polymers to reduce blooming. While powerful, it suffers from short range. It accepts hydrogen canisters as ammunition." - }, - { - "id": "deagle_44", - "copy-from": "deagle_44", - "type": "GUN", - "name": "magnum pistol", - "description": "A powerful semi-automatic pistol which fires revolver rounds. Loads a detachable, 7-round magazine.", - "ammo": "44", - "magazines": [ [ "44", [ "deaglemag" ] ] ] - }, - { - "id": "m3_carlgustav", - "copy-from": "m3_carlgustav", - "type": "GUN", - "name": "recoilless rifle", - "description": "The recoilless rifle is a breech-loading 84 millimeter man-portable, reusable, multi-role recoilless rifle commonly used by the US military." - } -] diff --git a/data/mods/Generic_Guns/gg_itemgroups_ammo.json b/data/mods/Generic_Guns/gg_itemgroups_ammo.json deleted file mode 100644 index a583b7e40dfb3..0000000000000 --- a/data/mods/Generic_Guns/gg_itemgroups_ammo.json +++ /dev/null @@ -1,160 +0,0 @@ -[ - { - "id": "ammo_pistol_common", - "type": "item_group", - "items": [ [ "44magnum", 25 ], [ "9mm", 75 ] ] - }, - { - "id": "ammo_pistol_rare", - "type": "item_group", - "items": [ [ "9mmfmj", 40 ], [ "9mmP2", 60 ] ] - }, - { - "id": "ammo_pistol_milspec", - "type": "item_group", - "items": [ [ "9mmfmj", 100 ] ] - }, - { - "id": "ammo_pistol_obscure", - "type": "item_group", - "items": [ ] - }, - { - "id": "ammo_pistol_reloaded", - "type": "item_group", - "items": [ [ "reloaded_44magnum", 25 ], [ "reloaded_9mm", 45 ], [ "reloaded_9mmfmj", 10 ], [ "reloaded_9mmP2", 20 ] ] - }, - { - "id": "ammo_rifle_common", - "type": "item_group", - "items": [ [ "223", 100 ] ] - }, - { - "id": "ammo_rifle_rare", - "type": "item_group", - "items": [ [ "308", 70 ], [ "50bmg", 30 ] ] - }, - { - "id": "ammo_rifle_milspec", - "type": "item_group", - "items": [ [ "556_incendiary", 40 ], [ "762_51_incendiary", 25 ], [ "50bmg", 20 ], [ "50ss", 5 ], [ "50_incendiary", 10 ] ] - }, - { - "id": "ammo_rifle_obscure", - "type": "item_group", - "items": [ ] - }, - { - "id": "ammo_rifle_reloaded", - "type": "item_group", - "items": [ - [ "reloaded_223", 30 ], - [ "reloaded_308", 20 ], - [ "reloaded_556_incendiary", 15 ], - [ "reloaded_762_51_incendiary", 10 ], - [ "reloaded_50bmg", 15 ], - [ "reloaded_50ss", 5 ], - [ "reloaded_50_incendiary", 5 ] - ] - }, - { - "id": "ammo_shotgun_common", - "type": "item_group", - "items": [ [ "shot_00", 70 ], [ "shot_bird", 30 ] ] - }, - { - "id": "ammo_shotgun_rare", - "type": "item_group", - "items": [ [ "shot_slug", 70 ], [ "shot_beanbag", 30 ] ] - }, - { - "id": "ammo_shotgun_milspec", - "type": "item_group", - "items": [ [ "shot_flechette", 90 ], [ "shot_he", 10 ] ] - }, - { - "id": "ammo_shotgun_reloaded", - "type": "item_group", - "items": [ - [ "reloaded_shot_00", 45 ], - [ "reloaded_shot_bird", 15 ], - [ "reloaded_shot_flechette", 5 ], - [ "reloaded_shot_slug", 15 ], - [ "shot_scrap", 20 ] - ] - }, - { - "id": "ammo_common", - "type": "item_group", - "items": [ - { "group": "ammo_pistol_common", "prob": 50 }, - { "group": "ammo_smg_common", "prob": 10 }, - { "group": "ammo_rifle_common", "prob": 20 }, - { "group": "ammo_shotgun_common", "prob": 20 } - ] - }, - { - "id": "ammo_rare", - "type": "item_group", - "items": [ - { "group": "ammo_pistol_rare", "prob": 50 }, - { "group": "ammo_smg_rare", "prob": 10 }, - { "group": "ammo_rifle_rare", "prob": 20 }, - { "group": "ammo_shotgun_rare", "prob": 20 } - ] - }, - { - "id": "ammo_milspec", - "type": "item_group", - "items": [ - { "group": "ammo_pistol_milspec", "prob": 10 }, - { "group": "ammo_smg_milspec", "prob": 5 }, - { "group": "ammo_rifle_milspec", "prob": 70 }, - { "group": "ammo_shotgun_milspec", "prob": 15 } - ] - }, - { - "id": "ammo_obscure", - "type": "item_group", - "items": [ - { "group": "ammo_pistol_milspec", "prob": 25 }, - { "group": "ammo_smg_milspec", "prob": 25 }, - { "group": "ammo_rifle_milspec", "prob": 25 }, - { "group": "ammo_shotgun_milspec", "prob": 25 } - ] - }, - { - "id": "ammo_reloaded", - "type": "item_group", - "items": [ - { "group": "ammo_pistol_reloaded", "prob": 32 }, - { "group": "ammo_smg_reloaded", "prob": 8 }, - { "group": "ammo_rifle_reloaded", "prob": 38 }, - { "group": "ammo_shotgun_reloaded", "prob": 12 } - ] - }, - { - "id": "ammo_parts", - "type": "item_group", - "items": [ - [ "gunpowder", 320 ], - [ "incendiary", 20 ], - [ "lead", 160 ], - [ "shotgun_primer", 80 ], - [ "smpistol_primer", 80 ], - [ "smrifle_primer", 80 ], - [ "lgpistol_primer", 40 ], - [ "lgrifle_primer", 40 ] - ] - }, - { - "id": "ammo_cop", - "type": "item_group", - "items": [ [ "44magnum", 20 ], [ "9mm", 50 ], [ "shot_00", 15 ], [ "shot_beanbag", 15 ] ] - }, - { - "id": "ammo_swat", - "type": "item_group", - "items": [ { "group": "ammo_cop", "prob": 70 }, [ "223", 10 ], [ "shot_slug", 20 ] ] - } -] diff --git a/data/mods/Generic_Guns/gg_itemgroups_guns.json b/data/mods/Generic_Guns/gg_itemgroups_guns.json deleted file mode 100644 index b0004f0b0d523..0000000000000 --- a/data/mods/Generic_Guns/gg_itemgroups_guns.json +++ /dev/null @@ -1,176 +0,0 @@ -[ - { - "id": "guns_pistol_common", - "type": "item_group", - "items": [ [ "glock_19", 75 ], [ "m9", 20 ], [ "ruger_redhawk", 5 ] ] - }, - { - "id": "guns_pistol_rare", - "type": "item_group", - "items": [ [ "deagle_44", 35 ], [ "ruger_redhawk", 65 ] ] - }, - { - "id": "guns_pistol_milspec", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_pistol_obscure", - "type": "item_group", - "items": [ [ "pistol_flintlock", 50 ] ] - }, - { - "id": "guns_pistol_improvised", - "type": "item_group", - "items": [ [ "surv_six_shooter", 100 ] ] - }, - { - "id": "guns_smg_common", - "type": "item_group", - "items": [ [ "hk_mp5", 100 ] ] - }, - { - "id": "guns_smg_rare", - "type": "item_group", - "items": [ [ "calico", 100 ] ] - }, - { - "id": "guns_smg_milspec", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_smg_obscure", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_smg_improvised", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_rifle_common", - "type": "item_group", - "items": [ [ "savage_111f", 10 ], [ "cx4", 15 ], [ "m1a", 15 ], [ "ruger_mini", 60 ] ] - }, - { - "id": "guns_rifle_rare", - "type": "item_group", - "items": [ [ "m4a1", 75 ], [ "savage_111f", 25 ] ] - }, - { - "id": "guns_rifle_milspec", - "type": "item_group", - "items": [ [ "m107a1", 10 ], [ "m249", 35 ], [ "m60", 15 ], [ "m134", 5 ], [ "scar_h", 35 ] ] - }, - { - "id": "guns_rifle_obscure", - "type": "item_group", - "items": [ [ "ak47", 45 ], [ "carbine_flintlock", 20 ], [ "rifle_flintlock", 35 ] ] - }, - { - "id": "guns_rifle_improvised", - "type": "item_group", - "items": [ [ "rifle_3006", 15 ], [ "rifle_9mm", 30 ], [ "surv_carbine_223", 55 ] ] - }, - { - "id": "guns_shotgun_common", - "type": "item_group", - "items": [ [ "mossberg_500", 100 ] ] - }, - { - "id": "guns_shotgun_rare", - "type": "item_group", - "items": [ [ "m1014", 100 ] ] - }, - { - "id": "guns_shotgun_milspec", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_shotgun_obscure", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_shotgun_improvised", - "type": "item_group", - "items": [ [ "pipe_shotgun", 100 ] ] - }, - { - "id": "guns_launcher_grenade", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_launcher_rocket", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_launcher_milspec", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_launcher_improvised", - "type": "item_group", - "items": [ ] - }, - { - "id": "guns_common", - "type": "item_group", - "items": [ - { "group": "guns_pistol_common", "prob": 60 }, - { "group": "guns_rifle_common", "prob": 20 }, - { "group": "guns_smg_common", "prob": 5 }, - { "group": "guns_shotgun_common", "prob": 15 } - ] - }, - { - "id": "guns_rare", - "type": "item_group", - "items": [ - { "group": "guns_pistol_rare", "prob": 50 }, - { "group": "guns_smg_rare", "prob": 15 }, - { "group": "guns_rifle_rare", "prob": 20 }, - { "group": "guns_shotgun_rare", "prob": 15 } - ] - }, - { - "id": "guns_milspec", - "type": "item_group", - "items": [ - { "group": "guns_pistol_rare", "prob": 20 }, - { "group": "guns_smg_rare", "prob": 10 }, - { "group": "guns_rifle_milspec", "prob": 60 }, - { "group": "guns_shotgun_rare", "prob": 10 } - ] - }, - { - "id": "guns_improvised", - "type": "item_group", - "items": [ - { "group": "guns_pistol_improvised", "prob": 30 }, - { "group": "guns_rifle_improvised", "prob": 50 }, - { "group": "guns_shotgun_improvised", "prob": 20 } - ] - }, - { - "id": "guns_cop", - "type": "item_group", - "items": [ [ "cx4", 20 ], [ "glock_19", 40 ], [ "hk_mp5", 10 ], [ "m9", 17 ], [ "mossberg_500", 13 ] ] - }, - { - "id": "guns_swat", - "type": "item_group", - "items": [ { "group": "guns_cop", "prob": 70 }, [ "hk_ump45", 10 ], [ "m1014", 5 ], [ "m4a1", 15 ] ] - }, - { - "id": "guns_survival", - "type": "item_group", - "items": [ { "group": "guns_improvised", "prob": 70 }, [ "mossberg_500", 10 ], [ "ruger_redhawk", 20 ] ] - } -] diff --git a/data/mods/Generic_Guns/gg_magazines_blacklist.json b/data/mods/Generic_Guns/gg_magazines_blacklist.json deleted file mode 100644 index f30770f0104e3..0000000000000 --- a/data/mods/Generic_Guns/gg_magazines_blacklist.json +++ /dev/null @@ -1,99 +0,0 @@ -[ - { - "type": "ITEM_BLACKLIST", - "items": [ - "20x66_10_mag", - "20x66_20_mag", - "20x66_40_mag", - "22_speedloader8", - "223_speedloader5", - "3006_clip", - "360_200_mag", - "360_400_mag", - "38_speedloader", - "38_speedloader5", - "40_speedloader6", - "454_speedloader5", - "460_speedloader6", - "500_speedloader5", - "5x50_50_mag", - "5x50_100_mag", - "762R_clip", - "762x39_clip", - "8x40_100_mag", - "8x40_10_mag", - "8x40_250_mag", - "8x40_25_mag", - "8x40_500_mag", - "8x40_50_mag", - "8x40_speedloader5", - "9mm_speedloader7", - "a180mag", - "ak74mag", - "belt40mm", - "blrmag", - "falbigmag", - "falmag", - "fn57mag", - "fnp90mag", - "g3bigmag", - "g3mag", - "garandclip", - "glock_drum_50rd", - "glock_drum_100rd", - "glock40bigmag", - "glock17_17", - "glock17_22", - "glock40mag", - "hk46bigmag", - "hk46mag", - "hk_g80mag", - "lw12mag", - "lw21mag", - "lw223bigmag", - "lw223mag", - "m14mag", - "m14smallmag", - "m1911bigmag", - "m1911mag", - "m1918bigmag", - "m1918mag", - "m2010mag", - "m9bigmag", - "m9mag", - "mac10mag", - "makarovmag", - "marlin_tubeloader", - "mosquitomag", - "p226mag_15rd_357sig", - "ppkmag", - "ppshdrum", - "ppshmag", - "rpk74mag", - "ruger1022bigmag", - "ruger1022mag", - "saiga10mag", - "saiga30mag", - "shot_speedloader8", - "sig40mag", - "sigp230mag", - "skorpion61mag", - "skorpion82mag", - "stenmag", - "survivor223mag", - "survivor9mm_mag", - "sw22mag", - "taurus_spectrum_mag", - "tdi_mag", - "tec9mag", - "thompson_bigmag", - "thompson_drum", - "thompson_mag", - "tokarevmag", - "ump45mag", - "usp9mag", - "usp45mag", - "uzimag" - ] - } -] diff --git a/data/mods/Generic_Guns/gg_magazines_override.json b/data/mods/Generic_Guns/gg_magazines_override.json deleted file mode 100644 index f1d0016c922fe..0000000000000 --- a/data/mods/Generic_Guns/gg_magazines_override.json +++ /dev/null @@ -1,196 +0,0 @@ -[ - { - "id": "44_speedloader6", - "copy-from": "44_speedloader6", - "type": "MAGAZINE", - "name": "revolver speedloader", - "description": "Speedloader which holds 6 revolver rounds, for reloading a revolver quicker." - }, - { - "id": "akmmag", - "copy-from": "akmmag", - "type": "MAGAZINE", - "name": "imported rifle magazine", - "description": "An uncommon 30-round magazine made for imported automatic rifles.", - "ammo_type": "308", - "capacity": 30, - "reliability": 9, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "akmbigmag", - "copy-from": "akmbigmag", - "type": "MAGAZINE", - "name": "imported drum magazine", - "description": "An uncommon 40-round drum magazine for imported automatic rifles.", - "ammo_type": "308", - "capacity": 40, - "reliability": 8, - "reload_time": 120 - }, - { - "id": "belt223", - "copy-from": "belt223", - "type": "MAGAZINE", - "name": "ammo belt", - "description": "An belt of light rifle ammunition consisting of metal linkages which disintegrate upon firing.", - "default_ammo": "223", - "linkage": "ammolink308" - }, - { - "id": "belt308", - "copy-from": "belt308", - "type": "MAGAZINE", - "name": "ammo belt", - "description": "An ammo belt designed for heavier machineguns consisting of metal linkages which disintegrate upon firing.", - "default_ammo": "308", - "linkage": "ammolink308" - }, - { - "id": "belt50", - "copy-from": "belt50", - "type": "MAGAZINE", - "name": "ammo belt", - "description": "An ammo belt designed for mounted machineguns consisting of metal linkages which disintegrate upon firing.", - "default_ammo": "50bmg", - "linkage": "ammolink308" - }, - { - "id": "calicomag", - "copy-from": "calicomag", - "type": "MAGAZINE", - "name": "advanced SMG magazine", - "description": "A surprisingly compact 50-round magazine for use with the advanced SMG.", - "ammo_type": "9mm", - "capacity": 50, - "reliability": 7, - "reload_time": 160, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "glockbigmag", - "copy-from": "glockbigmag", - "type": "MAGAZINE", - "name": "extended pistol magazine", - "description": "An extended 30-round magazine for use with semi-automatic pistols.", - "ammo_type": "9mm", - "capacity": 30, - "reliability": 7, - "reload_time": 140, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "glockmag", - "copy-from": "glockmag", - "type": "MAGAZINE", - "name": "pistol magazine", - "description": "An factory issue 15-round magazine for use with semi-automatic pistols", - "ammo_type": "9mm", - "capacity": 15, - "reliability": 8, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "mp5bigmag", - "copy-from": "mp5bigmag", - "type": "MAGAZINE", - "name": "extended SMG magazine", - "description": "A 50-round drum magazine for use with submachineguns. Much greater capacity but less reliable than factory specification magazines.", - "ammo_type": "9mm", - "capacity": 50, - "reliability": 7, - "reload_time": 160, - "flags": [ "MAG_BULKY" ] - }, - { - "id": "mp5mag", - "copy-from": "mp5mag", - "type": "MAGAZINE", - "name": "submachinegun magazine", - "description": "A standard capacity 30-round magazine for use with submachineguns.", - "ammo_type": "9mm", - "capacity": 30, - "reliability": 9, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "scarhmag", - "copy-from": "scarhmag", - "type": "MAGAZINE", - "name": "battle rifle magazine", - "description": "A standard 20-round magazine for military issue battle rifles.", - "capacity": 20, - "reliability": 9, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "scarhbigmag", - "copy-from": "scarhbigmag", - "type": "MAGAZINE", - "name": "extended battle rifle magazine", - "description": "An extended 30-round magazine for military issue battle rifles.", - "capacity": 30, - "reliability": 8, - "reload_time": 120, - "flags": [ "MAG_BULKY" ] - }, - { - "id": "stanag10", - "copy-from": "stanag10", - "type": "MAGAZINE", - "name": "small light rifle magazine", - "description": "A compact 10-round magazine commonly usable with both semi-automatic and automatic rifles.", - "capacity": 10, - "reliability": 9, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "stanag30", - "copy-from": "stanag30", - "type": "MAGAZINE", - "name": "light rifle magazine", - "description": "A 30-round box magazines for use with automatic rifles.", - "capacity": 30, - "reliability": 8, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "stanag50", - "copy-from": "stanag50", - "type": "MAGAZINE", - "name": "light rifle drum magazine", - "description": "A 50-round magazine with a bulky green drum for use with automatic rifles and machine guns.", - "capacity": 50, - "reliability": 7, - "reload_time": 200, - "flags": [ "MAG_BULKY" ] - }, - { - "id": "m107a1mag", - "copy-from": "m107a1mag", - "type": "MAGAZINE", - "name": "antimateriel rifle magazine", - "description": "A 10-round magazine which holds heavy rifle ammo for use with an antimateriel rifle", - "ammo_type": "50", - "capacity": 10, - "reliability": 9, - "reload_time": 100, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "deaglemag", - "copy-from": "deaglemag", - "type": "MAGAZINE", - "name": "magnum pistol magazine", - "description": "A 7-round magazine which holds revolver ammo for use with a magnum pistol", - "ammo_type": "44", - "capacity": 7, - "flags": [ "MAG_COMPACT" ] - } -] diff --git a/data/mods/Generic_Guns/gg_other_blacklist.json b/data/mods/Generic_Guns/gg_other_blacklist.json deleted file mode 100644 index d6cc81040570f..0000000000000 --- a/data/mods/Generic_Guns/gg_other_blacklist.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "type": "ITEM_BLACKLIST", - "items": [ - "22_casing", - "22_casing_new", - "300_casing", - "3006_casing", - "32_casing", - "38_casing", - "38_casing", - "38_speedloader", - "40_casing", - "454_casing", - "45_casing", - "46mm_casing", - "500_casing", - "545_casing", - "57mm_casing", - "5x50_hull", - "700nx_casing", - "762R_casing", - "762_casing", - "762_25_casing", - "9x18mm_casing", - "ammolink223", - "ammolink40mm", - "ammolink50", - "ksg_aux_shotgun", - "l_car_223_kit", - "l_dsr_223_kit", - "l_lmg_223_kit", - "l_mbr_223_kit", - "lemat_revolver_shotgun", - "lwfeed", - "m203", - "m320_mod", - "masterkey", - "mn_classic_kit", - "mn_ebr_kit", - "pipe_launcher40mm", - "recipe_caseless", - "retool_22", - "retool_308", - "retool_45", - "retool_46", - "retool_57", - "retool_9mm", - "rm121aux", - "u_shotgun", - "ugl_buttstock" - ] - } -] diff --git a/data/mods/Generic_Guns/gg_vehicle_override.json b/data/mods/Generic_Guns/gg_vehicle_override.json deleted file mode 100644 index 6dd0374e21562..0000000000000 --- a/data/mods/Generic_Guns/gg_vehicle_override.json +++ /dev/null @@ -1,76 +0,0 @@ -[ - { - "id": "m240", - "type": "vehicle_part", - "copy-from": "turret", - "name": "mounted medium machine gun", - "item": "m240", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "size": 1000, - "folded_volume": 20, - "breaks_into": [ { "item": "m240", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ], [ "rifle", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }, - "flags": [ "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ] - }, - { - "id": "m60", - "type": "vehicle_part", - "copy-from": "turret", - "name": "mounted general purpose machine gun", - "item": "m60", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "size": 1000, - "folded_volume": 20, - "breaks_into": [ { "item": "m60", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ], [ "rifle", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }, - "flags": [ "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ] - }, - { - "id": "m249", - "type": "vehicle_part", - "copy-from": "turret", - "name": "mounted light machine gun", - "item": "m249", - "broken_symbol": "#", - "color": "cyan", - "broken_color": "cyan", - "size": 40, - "folded_volume": 14, - "breaks_into": [ { "item": "m249", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 4 ], [ "rifle", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }, - "flags": [ "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ] - }, - { - "id": "mounted_browning", - "type": "vehicle_part", - "copy-from": "turret", - "name": "mounted heavy machine gun", - "item": "m2browning", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "difficulty": 5, - "size": 1600, - "folded_volume": 20, - "breaks_into": [ { "item": "m2browning", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 5 ], [ "rifle", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } }, - "flags": [ "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ] - }, - { - "id": "mounted_m134", - "type": "vehicle_part", - "copy-from": "turret", - "name": "mounted minigun", - "item": "m134", - "broken_symbol": "#", - "color": "green", - "broken_color": "green", - "size": 2000, - "breaks_into": [ { "item": "m134", "prob": 50 } ], - "requirements": { "install": { "skills": [ [ "mechanics", 6 ], [ "rifle", 3 ] ] }, "removal": { "skills": [ [ "mechanics", 4 ] ] } } - } -] diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json new file mode 100644 index 0000000000000..a447ba53c40f7 --- /dev/null +++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json @@ -0,0 +1,12 @@ +{ + "type": "ITEM_BLACKLIST", + "items": [ + "lemat_revolver_shotgun", + "llink", + "dias", + "belt_clip", + "retool_ar15_300blk", + "ts12_aux_shotgun", + "ts12_aux_shotgun2" + ] +} diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json new file mode 100644 index 0000000000000..f97dc53baa9fc --- /dev/null +++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json @@ -0,0 +1,52 @@ +[ + { + "id": [ "m203", "m320_mod", "pipe_launcher40mm", "lead_glm", "pipe_launcher40mm" ], + "type": "MIGRATION", + "replace": "grenade_under" + }, + { + "id": [ "m320_mod_mod", "m203_mod" ], + "type": "MIGRATION", + "replace": "grenade_under_mod" + }, + { + "id": [ + "masterkey", + "rm121aux", + "u_shotgun", + "lead_u_shotgun", + "M6_shotgun", + "ts12_aux_shotgun", + "ksg_aux_shotgun", + "combination_gun_shotgun", + "combination_gun_shotgun_pipe" + ], + "type": "MIGRATION", + "replace": "shotgun_under" + }, + { + "id": [ "masterkey_mod", "rm121aux_mod", "u_shotgun_mod" ], + "type": "MIGRATION", + "replace": "shotgun_under_mod" + }, + { + "id": [ "lead_laser_sight" ], + "type": "MIGRATION", + "replace": "laser_sight" + }, + { + "id": [ "lead_grip" ], + "type": "MIGRATION", + "replace": "grip" + }, + { + "id": [ "lead_bipod" ], + "type": "MIGRATION", + "replace": "bipod" + }, + { + "id": [ "inter_bayonet" ], + "type": "MIGRATION", + "replace": "knife_combat" + } +] diff --git a/data/mods/Generic_Guns/gunmods/gunmods.json b/data/mods/Generic_Guns/gunmods/gunmods.json new file mode 100644 index 0000000000000..96f271ad96845 --- /dev/null +++ b/data/mods/Generic_Guns/gunmods/gunmods.json @@ -0,0 +1,50 @@ +[ + { + "id": "grenade_under", + "copy-from": "m320_mod", + "type": "GUNMOD", + "name": "underbarrel launcher", + "description": "A stubby single shot launcher with a large bore barrel, suitable for launching grenades or flares. This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. The launcher can be detached and its sights reattached to the could be disassembled and attached to a suitable rifle, if so desired.", + "gun_data": { "ammo": "ammo_grenade", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 }, + "use_action": { + "menu_text": "Deploy as stand-alone", + "type": "transform", + "target": "grenade_pistol", + "msg": "You make the launcher ready for detached use." + } + }, + { + "id": "grenade_under_mod", + "copy-from": "m320_mod_mod", + "type": "GUNMOD", + "name": "underbarrel launcher (modified)", + "name-plural": "underbarrel launcher (modified)", + "description": "A stubby single shot launcher for launching grenades or flares. This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights. In more recent years, variants were sold commercially to ostensibly launch flares. With the right cartridges, this would be devastating against hard or soft targets. A crude homemade bracket has been attached, allowing a wider variety of hosts.", + "gun_data": { "ammo": "ammo_grenade", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 }, + "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] + }, + { + "id": "shotgun_under", + "copy-from": "masterkey", + "type": "GUNMOD", + "name": "underbarrel shotgun", + "gun_data": { "ammo": "ammo_shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 } + }, + { + "id": "shotgun_under_mod", + "copy-from": "masterkey_mod", + "type": "GUNMOD", + "name": "modified underbarrel shotgun", + "gun_data": { "ammo": "ammo_shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 } + }, + { + "id": "arredondo_chute", + "copy-from": "arredondo_chute", + "type": "GUNMOD", + "name": "speedloader chute", + "description": "A metal ramp that is installed near a shotgun's feeding port to index speedloader tubes.", + "location": "loading port", + "acceptable_ammo": [ "ammo_shot" ], + "magazine_adaptor": [ [ "ammo_shot", [ "shot_speedloader" ] ] ] + } +] diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json new file mode 100644 index 0000000000000..d36eef181fca8 --- /dev/null +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -0,0 +1,224 @@ +[ + { + "id": [ "belt40mm" ], + "type": "MIGRATION", + "replace": "grenade_belt" + }, + { + "id": [ + "20x66_10_mag", + "20x66_20_mag", + "ppkmag", + "sigp230mag", + "p226mag_15rd_357sig", + "p320mag_14rd_357sig", + "kp3atmag", + "fn1910mag", + "rugerlcpmag", + "hptcf380mag_8rd", + "hptcf380mag_10rd", + "taurus_spectrum_mag", + "m1911mag_10rd_38super", + "glock40mag", + "sig40mag", + "bhp40mag", + "ppq40mag_10rd", + "ppq40mag_12rd", + "ppq40mag_14rd", + "hptjcpmag", + "m1911mag", + "usp45mag", + "ppq45mag", + "fn57mag", + "tokarevmag", + "glockmag", + "glock17_17", + "usp9mag", + "kpf9mag", + "p320mag_17rd_9x19mm", + "bhp9mag_13rd", + "bhp9mag_15rd", + "p38mag", + "ppq9mag_10rd", + "ppq9mag_15rd", + "ppq9mag_17rd", + "hptc9mag_8rd", + "hptc9mag_10rd", + "hptc9mag_15rd", + "cz75mag_12rd", + "cz75mag_20rd", + "ccpmag" + ], + "type": "MIGRATION", + "replace": "pistol_mag" + }, + { + "id": [ "deaglemag", "hptjhpmag", "lw12mag", "8x40_10_mag" ], + "type": "MIGRATION", + "replace": "pistol_magnum_mag" + }, + { + "id": [ "m9mag", "makarovmag" ], + "type": "MIGRATION", + "replace": "pistol_medium" + }, + { + "id": [ + "20x66_40_mag", + "skorpion61mag", + "mac11mag", + "glock40bigmag", + "smg_40_mag", + "m1911bigmag", + "mac10mag", + "smg_45_mag", + "tdi_mag", + "thompson_bigmag", + "thompson_drum", + "thompson_mag", + "thompson_makeshiftmag", + "ump45mag", + "ump45_makeshiftmag", + "hk46bigmag", + "hk46mag", + "fnp90mag", + "5x50_100_mag", + "5x50_50_mag", + "ppshdrum", + "ppshmag", + "calicomag", + "glockbigmag", + "glock17_22", + "glock_drum_50rd", + "glock_drum_100rd", + "lw21mag", + "m9bigmag", + "mp5bigmag", + "mp5mag", + "stenmag", + "survivor9mm_mag", + "tec9mag", + "uzimag", + "cz75mag_26rd", + "skorpion82mag" + ], + "type": "MIGRATION", + "replace": "pistol_smg_mag" + }, + { + "id": [ + "22_speedloader8", + "38_speedloader", + "38_speedloader5", + "40_speedloader6", + "44_speedloader6", + "454_speedloader5", + "460_speedloader6", + "500_speedloader5", + "8x40_speedloader5", + "9mm_speedloader7", + "marlin_tubeloader" + ], + "type": "MIGRATION", + "replace": "pistol_speedloader" + }, + { + "id": [ + "360_200_mag", + "360_400_mag", + "a180mag", + "mosquitomag", + "ruger1022bigmag", + "ruger1022mag", + "sw22mag", + "j22mag", + "wp22mag", + "kp32mag" + ], + "type": "MIGRATION", + "replace": "pistol_tiny_mag" + }, + { + "id": [ "belt223", "belt308" ], + "type": "MIGRATION", + "replace": "rifle_belt" + }, + { + "id": [ "m107a1mag", "as50mag", "tac50mag" ], + "type": "MIGRATION", + "replace": "rifle_huge_amr_mag" + }, + { + "id": [ "belt50" ], + "type": "MIGRATION", + "replace": "rifle_huge_belt" + }, + { + "id": [ + "lw223bigmag", + "lw223mag", + "stanag30", + "stanag50", + "blrmag", + "m1918bigmag", + "m1918mag", + "falbigmag", + "falmag", + "g3bigmag", + "g3mag", + "m14mag", + "scarhbigmag", + "scarhmag_30rd", + "scarhmag", + "hk417mag_20rd", + "ar10mag_20rd", + "ak74mag", + "rpk74mag", + "akmbigmag", + "akmmag", + "8x40_100_mag", + "8x40_250_mag", + "8x40_25_mag", + "8x40_500_mag", + "8x40_50_mag" + ], + "type": "MIGRATION", + "replace": "rifle_mag" + }, + { + "id": [ + "m2010mag", + "223_speedloader5", + "ruger5", + "stanag10", + "ruger30", + "survivor223mag", + "ruger_makeshiftmag", + "3006_clip", + "garandclip", + "fal_makeshiftmag", + "g3_makeshiftmag", + "m14smallmag", + "m14_makeshiftmag", + "scarh_makeshiftmag", + "hk417mag_10rd", + "hk417_makeshiftmag", + "ar10_makeshiftmag", + "m74_clip", + "762x39_clip", + "762R_clip" + ], + "type": "MIGRATION", + "replace": "rifle_sniper_mag" + }, + { + "id": [ "saiga410mag_10rd", "saiga410mag_30rd", "saiga10mag", "saiga30mag", "USAS10mag", "USAS20mag", "shotbelt_20" ], + "type": "MIGRATION", + "replace": "shot_mag" + }, + { + "id": [ "shot_speedloader6", "shot_speedloader8" ], + "type": "MIGRATION", + "replace": "shot_speedloader" + } +] diff --git a/data/mods/Generic_Guns/magazines/grenade.json b/data/mods/Generic_Guns/magazines/grenade.json new file mode 100644 index 0000000000000..ae5627ec0c1e5 --- /dev/null +++ b/data/mods/Generic_Guns/magazines/grenade.json @@ -0,0 +1,11 @@ +[ + { + "id": "grenade_belt", + "copy-from": "belt40mm", + "type": "MAGAZINE", + "name": "grenade machine gun belt", + "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. This one holds grenade cartridges and is too bulky to be worn like other ammo belts.", + "ammo_type": "ammo_grenade", + "linkage": "ammolink40mm" + } +] diff --git a/data/mods/Generic_Guns/magazines/pistol.json b/data/mods/Generic_Guns/magazines/pistol.json new file mode 100644 index 0000000000000..049268d682173 --- /dev/null +++ b/data/mods/Generic_Guns/magazines/pistol.json @@ -0,0 +1,26 @@ +[ + { + "id": "pistol_mag", + "copy-from": "glockbigmag", + "type": "MAGAZINE", + "name": "SMG magazine", + "description": "A long stick magazine for use with pistols and submachine guns. Holds 30 rounds of standard pistol ammo.", + "ammo_type": "ammo_pistol" + }, + { + "id": "pistol_smg_mag", + "copy-from": "glockmag", + "type": "MAGAZINE", + "name": "pistol magazine", + "description": "A flush fitting magazine for use with pistols and submachine guns. Holds 15 rounds of standard pistol ammo.", + "ammo_type": "ammo_pistol" + }, + { + "id": "pistol_speedloader", + "copy-from": "44_speedloader6", + "type": "MAGAZINE", + "name": "revolver speedloader", + "description": "A 'speedloader', a metal block capable of holding and releasing ammunition to aid in loading revolvers. Accepts 6 standard or magnum pistol cartridges.", + "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ] + } +] diff --git a/data/mods/Generic_Guns/magazines/pistol_magnum.json b/data/mods/Generic_Guns/magazines/pistol_magnum.json new file mode 100644 index 0000000000000..d479444a29a9e --- /dev/null +++ b/data/mods/Generic_Guns/magazines/pistol_magnum.json @@ -0,0 +1,10 @@ +[ + { + "id": "pistol_magnum_mag", + "copy-from": "deaglemag", + "type": "MAGAZINE", + "name": "magnum pistol magazine", + "description": "An 8 round magazine for use with semi-automatic magnum pistols.", + "ammo_type": "ammo_pistol_magnum" + } +] diff --git a/data/mods/Generic_Guns/magazines/pistol_tiny.json b/data/mods/Generic_Guns/magazines/pistol_tiny.json new file mode 100644 index 0000000000000..eeaff8ea12abd --- /dev/null +++ b/data/mods/Generic_Guns/magazines/pistol_tiny.json @@ -0,0 +1,10 @@ +[ + { + "id": "pistol_tiny_mag", + "copy-from": "sw22mag", + "type": "MAGAZINE", + "name": "target pistol magazine", + "description": "A flush fitting magazine for use with target pistols, capable of feeding 10 tiny pistol cartridges.", + "ammo_type": "ammo_pistol_tiny" + } +] diff --git a/data/mods/Generic_Guns/magazines/rifle.json b/data/mods/Generic_Guns/magazines/rifle.json new file mode 100644 index 0000000000000..adbea730f02bd --- /dev/null +++ b/data/mods/Generic_Guns/magazines/rifle.json @@ -0,0 +1,27 @@ +[ + { + "id": "rifle_belt", + "copy-from": "belt308", + "type": "MAGAZINE", + "name": "ammo belt", + "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds rifle ammunition.", + "ammo_type": "ammo_rifle" + }, + { + "id": "rifle_mag", + "copy-from": "falbigmag", + "type": "MAGAZINE", + "material": "aluminum", + "name": "standard rifle magazine", + "description": "A 30 round standard capacity magazine for service rifles, cheaper than the cost of a meal due to its adoption by nearly every other common rifle. They're made of aluminum and are meant to be dispsoable, so they're not the most durable; don't let them get damaged.", + "ammo_type": "ammo_rifle" + }, + { + "id": "rifle_sniper_mag", + "copy-from": "hk417mag_10rd", + "type": "MAGAZINE", + "name": "compact rifle magazine", + "description": "A short 10 round steel magazine compatible with nearly every common rifle. Although it has a low capacity it is easy to store and quick to reload.", + "ammo_type": "ammo_rifle" + } +] diff --git a/data/mods/Generic_Guns/magazines/rifle_huge.json b/data/mods/Generic_Guns/magazines/rifle_huge.json new file mode 100644 index 0000000000000..ffbb885f85278 --- /dev/null +++ b/data/mods/Generic_Guns/magazines/rifle_huge.json @@ -0,0 +1,19 @@ +[ + { + "id": "rifle_huge_belt", + "copy-from": "belt50", + "type": "MAGAZINE", + "name": "heavy machine gun belt", + "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds huge rifle ammunition.", + "ammo_type": "ammo_rifle_huge", + "linkage": "ammolinkrifle_huge" + }, + { + "id": "rifle_huge_amr_mag", + "type": "MAGAZINE", + "copy-from": "m107a1mag", + "name": "anti-materiel rifle magazine", + "description": "A huge 10 round magazine for anti-materiel rifles.", + "ammo_type": "ammo_rifle_huge" + } +] diff --git a/data/mods/Generic_Guns/magazines/shot.json b/data/mods/Generic_Guns/magazines/shot.json new file mode 100644 index 0000000000000..4fa21b96de85c --- /dev/null +++ b/data/mods/Generic_Guns/magazines/shot.json @@ -0,0 +1,21 @@ +[ + { + "id": "shot_mag", + "copy-from": "saiga10mag", + "type": "MAGAZINE", + "name": "shotgun box magazine", + "capacity": 8, + "material": "plastic", + "reliability": 6, + "description": "An 8 round magazine for tactical shotguns. Shotshells tend to not work well in box magazines due to their plastic hulls and the compression from the magazine spring.", + "ammo_type": "ammo_shot" + }, + { + "id": "shot_speedloader", + "copy-from": "shot_speedloader6", + "name": "shotgun speedloader", + "type": "MAGAZINE", + "description": "A shotshell 'speedloader', a long plastic tube with a prominent plastic follower. You can feed 6 shotshells into an appropriately modified shotgun by pushing the follower against the shotgun's loading port. Bulky, but sees use in competition occasionally.", + "ammo_type": "ammo_shot" + } +] diff --git a/data/mods/Generic_Guns/modinfo.json b/data/mods/Generic_Guns/modinfo.json index a4cd9b532340e..062221135b306 100644 --- a/data/mods/Generic_Guns/modinfo.json +++ b/data/mods/Generic_Guns/modinfo.json @@ -1,10 +1,10 @@ -[ + [ { "type": "MOD_INFO", "ident": "generic_guns", "name": "Generic Guns", - "authors": [ "nikheizen" ], - "maintainers": [ "nikheizen" ], + "authors": [ "tonkatsu" ], + "maintainers": [ "tonkatsu" ], "description": "Replaces guns and ammo with generic types. Warning: can cause issues with other gun mods.", "category": "items", "dependencies": [ "dda" ] diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json new file mode 100644 index 0000000000000..f66e58ad1e71f --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipe_obsolete.json @@ -0,0 +1,1617 @@ +[ + { + "type": "recipe", + "result": "m203_mod", + "obsolete": true + }, + { + "type": "recipe", + "result": "m320_mod_mod", + "obsolete": true + }, + { + "type": "recipe", + "result": "masterkey_mod", + "obsolete": true + }, + { + "type": "recipe", + "result": "rm121aux_mod", + "obsolete": true + }, + { + "type": "recipe", + "result": "u_shotgun_mod", + "obsolete": true + }, + { + "type": "recipe", + "result": "llink", + "obsolete": true + }, + { + "type": "recipe", + "result": "dias", + "obsolete": true + }, + { + "type": "recipe", + "result": "3006_clip", + "obsolete": true + }, + { + "type": "recipe", + "result": "762x39_clip", + "obsolete": true + }, + { + "type": "recipe", + "result": "762R_clip", + "obsolete": true + }, + { + "type": "recipe", + "result": "garandclip", + "obsolete": true + }, + { + "type": "recipe", + "result": "marlin_tubeloader", + "obsolete": true + }, + { + "type": "recipe", + "result": "survivor223mag", + "obsolete": true + }, + { + "type": "recipe", + "result": "ruger_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "m14_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "hk417_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "ar10_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "g3_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "fal_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "scarh_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "scarh_makeshiftmag_conversion", + "obsolete": true + }, + { + "type": "recipe", + "result": "scarhmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "scarhmag_30rd", + "obsolete": true + }, + { + "type": "recipe", + "result": "shotbelt_20", + "obsolete": true + }, + { + "type": "recipe", + "result": "smg_40_mag", + "obsolete": true + }, + { + "type": "recipe", + "result": "smg_45_mag", + "obsolete": true + }, + { + "type": "recipe", + "result": "ump45_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "thompson_makeshiftmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "survivor9mm_mag", + "obsolete": true + }, + { + "type": "recipe", + "result": "briefcase_smg", + "obsolete": true + }, + { + "type": "recipe", + "result": "pistol_flintlock", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_flintlock", + "obsolete": true + }, + { + "type": "recipe", + "result": "carbine_flintlock", + "obsolete": true + }, + { + "type": "recipe", + "result": "carbine_flintlock_double", + "obsolete": true + }, + { + "type": "recipe", + "result": "carbine_flintlock_double_from_antiques", + "obsolete": true + }, + { + "type": "recipe", + "result": "revolver_shotgun", + "obsolete": true + }, + { + "type": "recipe", + "result": "surv_six_shooter", + "obsolete": true + }, + { + "type": "recipe", + "result": "surv_hand_cannon", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin91_30", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin44", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin91_30_ebr", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin44_ebr", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_HFPack", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_car_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_mbr_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_dsr_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_lmg_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "2_shot_special", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_22", + "obsolete": true + }, + { + "type": "recipe", + "result": "pipe_shotgun", + "obsolete": true + }, + { + "type": "recipe", + "result": "pipe_double_shotgun", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_40", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_44", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_45", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_38", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "surv_carbine_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "rifle_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "triple_launcher_simple", + "obsolete": true + }, + { + "type": "recipe", + "result": "launcher_simple", + "obsolete": true + }, + { + "type": "recipe", + "result": "pipe_launcher40mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "m320", + "obsolete": true + }, + { + "type": "recipe", + "result": "u_shotgun", + "obsolete": true + }, + { + "type": "recipe", + "result": "bigun", + "obsolete": true + }, + { + "type": "recipe", + "result": "ashot", + "obsolete": true + }, + { + "type": "recipe", + "result": "m2browning_sawn", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_buckshot_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_buckshot_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_slug_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_slug_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_flechette_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_flechette_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_buckshot_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_slug_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_flechette_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "460_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "380_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "300blk_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_40sw", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_32_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_38_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_45_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_45_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_46mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_460_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_460_rowland", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_500_Magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_25", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9x18mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9x18mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_380_JHP", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_380_FMJ", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_57mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "36navy", + "obsolete": true + }, + { + "type": "recipe", + "result": "44army", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_32_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_special", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38super_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357sig_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357sig_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357mag_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357mag_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_357mag_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_357mag_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_38_special", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_super", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_40fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_40sw", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_10mm_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_10mm_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_44fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_44magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_44magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_44fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_super", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_454_Casull", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_454_Casull", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45colt_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_46mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_460_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_460_rowland", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_500_Magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_57mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_25", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmP", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmP2", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mmP2", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_JHP", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_p", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_FMJ", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_22_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_22_lr", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_22_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_22_lr", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_270win_jsp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_270win_jsp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_300_winmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_300_winmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_sp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_pen", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_low", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_bp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_5x50dart", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50bmg", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50ss", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_545", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_545_ap", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_300blk", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_300blk", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_556", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_556_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_556", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_556_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_700nx", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_51", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_51_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_51", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_51_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_54R", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_m43", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_m87", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_buckshot_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_buckshot_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_slug_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_slug_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_flechette_m118", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x46mm_flechette_m199", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_buckshot_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_slug_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "40x53mm_flechette_m169", + "obsolete": true + }, + { + "type": "recipe", + "result": "shot_paper_00", + "obsolete": true + }, + { + "type": "recipe", + "result": "shot_paper_slug", + "obsolete": true + }, + { + "type": "recipe", + "result": "shot_paper_dragon", + "obsolete": true + }, + { + "type": "recipe", + "result": "shot_paper_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_shot_00", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_410shot_000", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_shot_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_shot_dragon", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_shot_flechette", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_shot_slug", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_00", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_dragon", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_flechette", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_slug", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_00", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_dragon", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_slug", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_scrap", + "obsolete": true + }, + { + "type": "recipe", + "result": "shot_scrap", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_scrap", + "obsolete": true + }, + { + "type": "recipe", + "result": "460_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "380_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "300blk_casing", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_40fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_40sw", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_32_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_38_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_45_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_45_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_46mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_460_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_460_rowland", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_500_Magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_25", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9x18mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_9x18mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_380_JHP", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_380_FMJ", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_57mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "36navy", + "obsolete": true + }, + { + "type": "recipe", + "result": "44army", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_32_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_special", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38super_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357sig_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357sig_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357mag_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_357mag_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_357mag_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_357mag_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_38_special", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_38_super", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_40fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_40sw", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_10mm_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_10mm_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_44fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_44magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_44magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_acp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45_super", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_454_Casull", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_454_Casull", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_45colt_jhp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_46mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_460_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_460_rowland", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_500_Magnum", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_57mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_25", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmP", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmP2", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mm", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mmfmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_9x18mmP2", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_JHP", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_p", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_380_FMJ", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_22_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_22_lr", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_22_fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_22_lr", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_270win_jsp", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_270win_jsp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_300_winmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_300_winmag", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_3006_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006fmj", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_3006_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_308", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_sp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_pen", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_low", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_4570_bp", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_5x50dart", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50bmg", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_50ss", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_545", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_545_ap", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_300blk", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_300blk", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_556", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_556_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_556", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_556_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_700nx", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_51", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_51_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_51", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_762_51_incendiary", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_54R", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_m43", + "obsolete": true + }, + { + "type": "recipe", + "result": "reloaded_762_m87", + "obsolete": true + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_ammo.json b/data/mods/Generic_Guns/recipes/recipes_ammo.json new file mode 100644 index 0000000000000..a00be66451cfd --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_ammo.json @@ -0,0 +1,108 @@ +[ + { + "result": "reloaded_tiny_pistol_jhp", + "type": "recipe", + "copy-from": "reloaded_22_lr", + "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ] ] + }, + { + "result": "reloaded_tiny_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_22_fmj", + "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "reloaded_pistol_jhp", + "type": "recipe", + "copy-from": "reloaded_9mm", + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] + }, + { + "result": "reloaded_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_9mmfmj", + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "components": [ + [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], + [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] + ] + }, + { + "result": "reloaded_pistol_magnum_jhp", + "type": "recipe", + "copy-from": "reloaded_44magnum", + "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] ] + }, + { + "result": "reloaded_pistol_magnum_ball", + "type": "recipe", + "copy-from": "reloaded_44fmj", + "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], + "components": [ + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], + [ [ "copper", 2 ], [ "pistol_casing", 1 ] ] + ] + }, + { + "result": "reloaded_rifle_ball", + "type": "recipe", + "copy-from": "reloaded_308", + "using": [ [ "req_rifle", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], + "components": [ + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] + ] + }, + { + "result": "reloaded_rifle_AP", + "type": "recipe", + "copy-from": "reloaded_762_51", + "using": [ [ "req_rifle", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], + "components": [ + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], + [ [ "copper", 3 ], [ "pistol_magnum_casing", 1 ] ] + ] + }, + { + "result": "reloaded_rifle_huge_ball", + "type": "recipe", + "copy-from": "reloaded_50bmg", + "using": [ [ "req_rifle_huge", 1 ], [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ] ] + }, + { + "result": "reloaded_rifle_huge_AP", + "type": "recipe", + "copy-from": "reloaded_50ss", + "using": [ [ "req_rifle_huge", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ], [ "rifle_casing", 1 ] ] ] + }, + { + "result": "reloaded_shot_buck", + "type": "recipe", + "copy-from": "reloaded_shot_00" + }, + { + "result": "reloaded_shot_fowl", + "type": "recipe", + "copy-from": "reloaded_shot_bird" + }, + { + "result": "reloaded_shot_foster", + "type": "recipe", + "copy-from": "reloaded_shot_slug" + }, + { + "result": "reloaded_shot_pyro", + "type": "recipe", + "copy-from": "reloaded_shot_dragon" + }, + { + "result": "reloaded_shot_dart", + "type": "recipe", + "copy-from ": "reloaded_shot_flechette" + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_deconstruction.json b/data/mods/Generic_Guns/recipes/recipes_deconstruction.json new file mode 100644 index 0000000000000..dc3f8367b8903 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_deconstruction.json @@ -0,0 +1,180 @@ +[ + { + "result": "broken_secubot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 6, + "time": "2 h", + "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "omni_wheel", 1 ] ], + [ [ "copbot_chassis", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 4 ] ], + [ [ "solar_cell", 2 ] ], + [ [ "rifle_assault", 1 ] ], + [ [ "canister_empty", 1 ] ] + ] + }, + { + "result": "broken_talon_m202a1", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 6, + "time": "2 h", + "using": [ [ "soldering_standard", 20 ], [ "welding_standard", 5 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "omni_wheel", 1 ] ], + [ [ "copbot_chassis", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "power_supply", 4 ] ], + [ [ "solar_cell", 2 ] ], + [ [ "rocket_disposable", 1 ] ], + [ [ "canister_empty", 1 ] ] + ] + }, + { + "result": "broken_skitterbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "RAM", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "scrap", 5 ] ], + [ [ "spidery_legs_small", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "tazer", 2 ] ] + ] + }, + { + "result": "broken_turret", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "pistol_smg", 1 ] ], + [ [ "turret_chassis", 1 ] ] + ] + }, + { + "result": "broken_turret_rifle", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "rifle_assault", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "turret_chassis", 1 ] ] + ] + }, + { + "result": "broken_crows_m240", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "rifle_lmg", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "turret_chassis", 1 ] ] + ] + }, + { + "result": "broken_turret_bmg", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 3, + "time": "1 h", + "using": [ [ "soldering_standard", 10 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "gun_module", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "rifle_huge_hmg", 1 ] ], + [ [ "small_storage_battery", 1 ] ], + [ [ "robot_controls", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "turret_chassis", 1 ] ] + ] + }, + { + "result": "broken_tankbot", + "type": "uncraft", + "skill_used": "electronics", + "difficulty": 8, + "time": "10 h", + "using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ], + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ + [ [ "ai_module", 1 ] ], + [ [ "sensor_module", 1 ] ], + [ [ "memory_module", 1 ] ], + [ [ "pathfinding_module", 1 ] ], + [ [ "identification_module", 1 ] ], + [ [ "tank_tread", 1 ] ], + [ [ "tankbot_chassis", 1 ] ], + [ [ "targeting_module", 1 ] ], + [ [ "gun_module", 3 ] ], + [ [ "flamethrower", 1 ] ], + [ [ "tazer", 1 ] ], + [ [ "rifle_assault", 1 ] ], + [ [ "power_supply", 20 ] ], + [ [ "storage_battery", 1 ] ], + [ [ "plut_cell", 4 ] ], + [ [ "mil_plate", 2 ] ] + ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms.json b/data/mods/Generic_Guns/recipes/recipes_firearms.json new file mode 100644 index 0000000000000..d0d8b1b79afc3 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_firearms.json @@ -0,0 +1,139 @@ +[ + { + "result": "pistol_tiny_zip", + "type": "recipe", + "copy-from": "2_shot_special", + "difficulty": 2, + "tools": [ + [ + [ "tiny_pistol_ball", -1 ], + [ "tiny_pistol_jhp", -1 ], + [ "reloaded_tiny_pistol_ball", -1 ], + [ "reloaded_tiny_pistol_jhp", -1 ], + [ "pistol_tiny_casing", -1 ] + ] + ] + }, + { + "result": "pistol_pipe_smg", + "type": "recipe", + "copy-from": "surv_carbine_223", + "difficulty": 5, + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "pistol_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "result": "pistol_magnum_pipe", + "type": "recipe", + "copy-from": "rifle_9mm", + "difficulty": 3, + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "pistol_magnum_ball", -1 ], + [ "pistol_magnum_jhp", -1 ], + [ "reloaded_pistol_magnum_ball", -1 ], + [ "reloaded_pistol_magnum_jhp", -1 ], + [ "pistol_casing", -1 ], + [ "pistol_magnum_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "steel_chunk", 1 ] ], [ [ "2x4", 1 ] ] ] + }, + { + "result": "pistol_magnum_pipe_levergun", + "type": "recipe", + "copy-from": "surv_carbine_223", + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "pistol_magnum_ball", -1 ], + [ "pistol_magnum_jhp", -1 ], + [ "reloaded_pistol_magnum_ball", -1 ], + [ "reloaded_pistol_magnum_jhp", -1 ], + [ "pistol_casing", -1 ], + [ "pistol_magnum_casing", -1 ] + ] + ] + }, + { + "result": "rifle_pipe_rifle", + "type": "recipe", + "copy-from": "rifle_3006", + "tools": [ + [ + [ "rifle_ball", -1 ], + [ "rifle_AP", -1 ], + [ "reloaded_rifle_ball", -1 ], + [ "reloaded_rifle_AP", -1 ], + [ "rifle_casing", -1 ] + ] + ] + }, + { + "result": "rifle_pipe_carbine", + "type": "recipe", + "copy-from": "surv_carbine_223", + "tools": [ + [ + [ "rifle_ball", -1 ], + [ "rifle_AP", -1 ], + [ "reloaded_rifle_ball", -1 ], + [ "reloaded_rifle_AP", -1 ], + [ "rifle_casing", -1 ] + ] + ] + }, + { + "result": "shot_pipe_double", + "type": "recipe", + "copy-from": "pipe_double_shotgun", + "tools": [ + [ + [ "shot_buck", -1 ], + [ "shot_bean", -1 ], + [ "shot_fowl", -1 ], + [ "shot_foster", -1 ], + [ "shot_pyro", -1 ], + [ "reloaded_shot_buck", -1 ], + [ "reloaded_shot_fowl", -1 ], + [ "reloaded_shot_foster", -1 ], + [ "reloaded_shot_pyro", -1 ], + [ "reloaded_shot_dart", -1 ], + [ "shot_casing", -1 ] + ] + ] + }, + { + "result": "black_powder_pistol", + "type": "recipe", + "difficulty": 3, + "copy-from": "pistol_flintlock" + }, + { + "result": "black_powder_revolver", + "type": "recipe", + "difficulty": 6, + "copy-from": "surv_hand_cannon" + }, + { + "result": "black_powder_rifle", + "type": "recipe", + "difficulty": 3, + "copy-from": "rifle_flintlock" + } +] diff --git a/data/mods/Generic_Guns/recipes/requirements.json b/data/mods/Generic_Guns/recipes/requirements.json new file mode 100644 index 0000000000000..68307c5e8077e --- /dev/null +++ b/data/mods/Generic_Guns/recipes/requirements.json @@ -0,0 +1,60 @@ +[ + { + "id": "req_pistol_tiny", + "type": "requirement", + "//": "Components required for tiny pistol ammo", + "components": [ [ [ "pistol_tiny_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] + }, + { + "id": "req_pistol", + "type": "requirement", + "//": "Components required for pistol ammo", + "components": [ [ [ "pistol_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] + }, + { + "id": "req_pistol_magnum", + "type": "requirement", + "//": "Components required for magnum ammo", + "components": [ [ [ "pistol_magnum_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ] ] + }, + { + "id": "req_rifle", + "type": "requirement", + "//": "Components required for rifle ammo", + "components": [ [ [ "rifle_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ] ] + }, + { + "id": "req_rifle_huge", + "type": "requirement", + "//": "Components required for huge rifle ammo", + "components": [ [ [ "rifle_huge_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] + }, + { + "id": "req_grenade", + "type": "requirement", + "//": "Components required for grenade cartridges", + "components": [ [ [ "grenade_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ] ] + }, + { + "id": "req_shot", + "type": "requirement", + "//": "Components required for shotgun ammo", + "components": [ [ [ "shot_casing", 1 ] ], [ [ "shotgun_primer", 1 ] ] ] + }, + { + "id": "req_penetrator", + "type": "requirement", + "//": "Components required for shotgun ammo", + "components": [ + [ + [ "sheet_metal_small", 1 ], + [ "wire", 1 ], + [ "scrap_bronze", 1 ], + [ "scrap", 1 ], + [ "bearing", 1 ], + [ "nail", 1 ], + [ "combatnail", 1 ] + ] + ] + } +] diff --git a/data/mods/Generic_Guns/robots/inactive_bots.json b/data/mods/Generic_Guns/robots/inactive_bots.json new file mode 100644 index 0000000000000..8788719259ec3 --- /dev/null +++ b/data/mods/Generic_Guns/robots/inactive_bots.json @@ -0,0 +1,76 @@ +[ + { + "id": "bot_antimateriel", + "type": "TOOL", + "name": "inactive M2HB autonomous CROWS II", + "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded .50 BMG rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", + "weight": "172 kg", + "volume": "30 L", + "price": 500500, + "to_hit": -3, + "bashing": 8, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "red", + "use_action": { + "type": "place_monster", + "monster_id": "mon_turret_bmg", + "difficulty": 6, + "moves": 100, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_chickenbot", + "type": "TOOL", + "name": "inactive chicken walker", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "120000 g", + "volume": "92500 ml", + "price": 50000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_chickenbot", + "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", + "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", + "//": "Milspec, but was deployed in active service implying a reliable IFF", + "difficulty": 9, + "moves": 250, + "skill1": "electronics", + "skill2": "computer" + } + }, + { + "id": "bot_tankbot", + "looks_like": "broken_tankbot", + "type": "TOOL", + "name": "inactive tank drone", + "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "weight": "200000 g", + "//": "cheating a bit with the volume due to lack of proper vehicle storage options", + "volume": "250 L", + "price": 100000000, + "to_hit": -3, + "bashing": 8, + "material": [ "steel" ], + "symbol": ";", + "color": "light_green", + "use_action": { + "type": "place_monster", + "monster_id": "mon_tankbot", + "friendly_msg": "The tank drone rolls out and begins acquiring targets.", + "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", + "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", + "difficulty": 10, + "moves": 500, + "skill1": "electronics", + "skill2": "computer" + } + } +] diff --git a/data/mods/Generic_Guns/robots/turrets.json b/data/mods/Generic_Guns/robots/turrets.json new file mode 100644 index 0000000000000..ff2771d78483c --- /dev/null +++ b/data/mods/Generic_Guns/robots/turrets.json @@ -0,0 +1,34 @@ +[ + { + "id": "mon_turret", + "copy-from": "mon_turret", + "type": "MONSTER", + "default_faction": "defense_bot", + "name": "improvised SMG turret", + "description": "A submachinegun attached to a motorized chassis with basic autonomous software control. There is no mechanism to reload the weapon when its magazine is empty and the fire control system is only designed for semi automatic fire." + }, + { + "id": "mon_turret_bmg", + "copy-from": "mon_turret_bmg", + "type": "MONSTER", + "name": "Heavy CROWS II", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a heavy machinegun.", + "default_faction": "military" + }, + { + "id": "mon_turret_rifle", + "copy-from": "mon_turret_rifle", + "type": "MONSTER", + "name": "Light CROWS II", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a service rifle.", + "default_faction": "military" + }, + { + "id": "mon_crows_m240", + "copy-from": "mon_crows_m240", + "type": "MONSTER", + "name": "Medium CROWS II", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a light machine gun.", + "default_faction": "military" + } +] From 1abfce6f8cc8745e9c93eb9b381383be25a228b9 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Tue, 14 Jan 2020 00:56:29 -0600 Subject: [PATCH 02/12] Recipe redefs --- .../Generic_Guns/ammo/gg_ammo_migration.json | 4 +- .../Generic_Guns/firearms/pistol_magnum.json | 17 +-- .../Generic_Guns/magazines/pistol_magnum.json | 2 +- .../Generic_Guns/recipes/recipes_ammo.json | 108 ------------------ .../recipes/recipes_grenade_propelled.json | 46 ++++++++ .../Generic_Guns/recipes/recipes_pistol.json | 77 +++++++++++++ .../Generic_Guns/recipes/recipes_rifle.json | 53 +++++++++ .../Generic_Guns/recipes/recipes_shot.json | 53 +++++++++ .../Generic_Guns/recipes/requirements.json | 4 +- 9 files changed, 243 insertions(+), 121 deletions(-) delete mode 100644 data/mods/Generic_Guns/recipes/recipes_ammo.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_pistol.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_rifle.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_shot.json diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index c11ebed34e8f7..8925cdfd0ab30 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -298,7 +298,7 @@ "replace": "grenade_ammo_teargas" }, { - "id": [ "shot_00", "shot_paper_00" ], + "id": [ "shot_00", "shot_paper_00", "410shot_000" ], "type": "MIGRATION", "replace": "shot_buck" }, @@ -323,7 +323,7 @@ "replace": "shot_pyro" }, { - "id": [ "reloaded_shot_00" ], + "id": [ "reloaded_shot_00", "reloaded_410shot_000" ], "type": "MIGRATION", "replace": "reloaded_shot_buck" }, diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json index dc0787caec12f..4e368021c26ed 100644 --- a/data/mods/Generic_Guns/firearms/pistol_magnum.json +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -4,16 +4,17 @@ "copy-from": "deagle_44", "type": "GUN", "name": "hand cannon", - "ammo": "ammo_pistol_magnum", + "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], + "//": "We're just going to prtend that .357 and .44 magnum deagles will run .38's and .44 special just fine", "description": "This large pistol is almost as heavy as a small carbine, and just about as powerful too. Chambered in hard hitting magnum calibers, it is suitable for hunting medium game, humans, or offsetting any of one's perceived deficiencies. Though tradtionally such magnums are revolvers, this one is a magazine fed semi-automatic.", - "magazines": [ [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_magnum_mag" ] ], [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] }, { "id": "pistol_magnum_levergun", "copy-from": "henry_big_boy", "type": "GUN", "name": "magnum levergun", - "ammo": [ "ammo_pistol", "ammo_pistol_magnum" ], + "ammo": [ "ammo_pistol_magnum" "ammo_pistol" ], "description": "A modern re-imagining of the classic western lever-action, this larger rifle accepts powerful magnum pistol ammunition as well as weaker pistol ammo. Carrying this along side a magnum pistol would allow one to reduce the number of calibers carried, and allow you to squeeze more power from ammuntion.", "clip_size": 10 }, @@ -22,8 +23,8 @@ "copy-from": "henry_big_boy", "type": "GUN", "name": "handmade magnum carbine", - "ammo": "ammo_pistol_magnum", - "description": "A crudely constructed carbine, chambered for magnum pistol ammo and standard pistol ammo. It feeds from detachable box magazines, and locks with a rudimentary lever action system. Its powerful cartridge and relative precision should serve well against zombies and medium game.", + "ammo_type": [ "ammo_pistol_magnum", "ammo_pistol" ], + "description": "A crudely constructed carbine, chambered for magnum pistol ammo and standard pistol ammo. It feeds from commerical magnum pistol magazines, and locks with a rudimentary lever action system. Its powerful cartridge and relative precision should serve well against zombies and medium game.", "weight": "2114 g", "volume": "2 L", "price": 10000, @@ -45,14 +46,14 @@ [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_magnum_mag" ] ], [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] }, { "id": "pistol_magnum_pipe", "copy-from": "ashot", "type": "GUN", "name": "pipe magnum", - "ammo": [ "ammo_pistol", "ammo_pistol_magnum" ], + "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], "ranged_damage": -2, "description": "A firearm made from a stout pipe, reinforced at the chamber. It holds a single a round of standard or magnum pistol ammunition, and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", "dispersion": 440, @@ -63,7 +64,7 @@ "copy-from": "sw629", "type": "GUN", "name": "hunting magnum", - "ammo": "ammo_pistol_magnum", + "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it. These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition. You could take medium to large game with this hefty piece.", "clip_size": 6, "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ], [ "ammo_pistol_magnum", [ "pistol_speedloader" ] ] ] diff --git a/data/mods/Generic_Guns/magazines/pistol_magnum.json b/data/mods/Generic_Guns/magazines/pistol_magnum.json index d479444a29a9e..0935b9325e7e7 100644 --- a/data/mods/Generic_Guns/magazines/pistol_magnum.json +++ b/data/mods/Generic_Guns/magazines/pistol_magnum.json @@ -5,6 +5,6 @@ "type": "MAGAZINE", "name": "magnum pistol magazine", "description": "An 8 round magazine for use with semi-automatic magnum pistols.", - "ammo_type": "ammo_pistol_magnum" + "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ] } ] diff --git a/data/mods/Generic_Guns/recipes/recipes_ammo.json b/data/mods/Generic_Guns/recipes/recipes_ammo.json deleted file mode 100644 index a00be66451cfd..0000000000000 --- a/data/mods/Generic_Guns/recipes/recipes_ammo.json +++ /dev/null @@ -1,108 +0,0 @@ -[ - { - "result": "reloaded_tiny_pistol_jhp", - "type": "recipe", - "copy-from": "reloaded_22_lr", - "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ] ] - }, - { - "result": "reloaded_tiny_pistol_ball", - "type": "recipe", - "copy-from": "reloaded_22_fmj", - "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] - }, - { - "result": "reloaded_pistol_jhp", - "type": "recipe", - "copy-from": "reloaded_9mm", - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] - }, - { - "result": "reloaded_pistol_ball", - "type": "recipe", - "copy-from": "reloaded_9mmfmj", - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ - [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], - [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] - ] - }, - { - "result": "reloaded_pistol_magnum_jhp", - "type": "recipe", - "copy-from": "reloaded_44magnum", - "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], - "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] ] - }, - { - "result": "reloaded_pistol_magnum_ball", - "type": "recipe", - "copy-from": "reloaded_44fmj", - "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ - [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], - [ [ "copper", 2 ], [ "pistol_casing", 1 ] ] - ] - }, - { - "result": "reloaded_rifle_ball", - "type": "recipe", - "copy-from": "reloaded_308", - "using": [ [ "req_rifle", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], - "components": [ - [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] - ] - }, - { - "result": "reloaded_rifle_AP", - "type": "recipe", - "copy-from": "reloaded_762_51", - "using": [ [ "req_rifle", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], - "components": [ - [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], - [ [ "copper", 3 ], [ "pistol_magnum_casing", 1 ] ] - ] - }, - { - "result": "reloaded_rifle_huge_ball", - "type": "recipe", - "copy-from": "reloaded_50bmg", - "using": [ [ "req_rifle_huge", 1 ], [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ] ] - }, - { - "result": "reloaded_rifle_huge_AP", - "type": "recipe", - "copy-from": "reloaded_50ss", - "using": [ [ "req_rifle_huge", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ], [ "rifle_casing", 1 ] ] ] - }, - { - "result": "reloaded_shot_buck", - "type": "recipe", - "copy-from": "reloaded_shot_00" - }, - { - "result": "reloaded_shot_fowl", - "type": "recipe", - "copy-from": "reloaded_shot_bird" - }, - { - "result": "reloaded_shot_foster", - "type": "recipe", - "copy-from": "reloaded_shot_slug" - }, - { - "result": "reloaded_shot_pyro", - "type": "recipe", - "copy-from": "reloaded_shot_dragon" - }, - { - "result": "reloaded_shot_dart", - "type": "recipe", - "copy-from ": "reloaded_shot_flechette" - } -] diff --git a/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json new file mode 100644 index 0000000000000..df94ae45b6eee --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json @@ -0,0 +1,46 @@ +[ + { + "result": "grenade_ammo_shot", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ], [ "req_grenade", -1 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 30 ] ] + ] + }, + { + "result": "grenade_ammo_slug", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ], [ "req_grenade", -1 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 30 ] ] + ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_pistol.json b/data/mods/Generic_Guns/recipes/recipes_pistol.json new file mode 100644 index 0000000000000..f8d13afcdcf95 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_pistol.json @@ -0,0 +1,77 @@ +[ + { + "result": "reloaded_tiny_pistol_jhp", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] ] + }, + { + "result": "reloaded_tiny_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_tiny_pistol_jhp", + "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "reloaded_pistol_jhp", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "req_pistol", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] ] + }, + { + "result": "reloaded_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_pistol_jhp", + "using": [ [ "req_pistol", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "components": [ + [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ], + [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] + ] + }, + { + "result": "reloaded_pistol_magnum_jhp", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 3 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] ] + }, + { + "result": "reloaded_pistol_magnum_ball", + "type": "recipe", + "copy-from": "reloaded_pistol_magnum_jhp", + "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], + "components": [ + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], + [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] + ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_rifle.json b/data/mods/Generic_Guns/recipes/recipes_rifle.json new file mode 100644 index 0000000000000..36dd51bdcde46 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_rifle.json @@ -0,0 +1,53 @@ +[ + { + "result": "reloaded_rifle_ball", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "req_rifle", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], + "components": [ + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] + ] + }, + { + "result": "reloaded_rifle_AP", + "type": "recipe", + "copy-from": "reloaded_rifle_ball", + "using": [ [ "req_rifle", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], + "components": [ + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], + [ [ "copper", 3 ] ] + ] + }, + { + "result": "reloaded_rifle_huge_ball", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 8, + "skills_required": [ "gun", 7 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 6 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "req_rifle_huge", 1 ], [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ] ] + }, + { + "result": "reloaded_rifle_huge_AP", + "type": "recipe", + "copy-from": "reloaded_rifle_huge_ball", + "using": [ [ "req_rifle_huge", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ], [ "rifle_casing", 1 ] ] ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_shot.json b/data/mods/Generic_Guns/recipes/recipes_shot.json new file mode 100644 index 0000000000000..e82e0b3e53f75 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_shot.json @@ -0,0 +1,53 @@ +[ + { + "result": "reloaded_shot_fowl", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], + "tools": [ [ [ "press", -1 ] ] ], + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] + }, + { + "result": "reloaded_shot_pyro", + "type": "recipe", + "copy-from": "reloaded_shot_fowl", + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ] + }, + { + "result": "reloaded_shot_buck", + "type": "recipe", + "copy-from": "reloaded_shot_fowl", + "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] + }, + { + "result": "reloaded_shot_foster", + "type": "recipe", + "copy-from": "reloaded_shot_buck", + "difficulty": 3, + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "req_shot", 1 ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] + }, + { + "result": "reloaded_shot_dart", + "type": "recipe", + "copy-from": "reloaded_shot_buck", + "difficulty": 2, + "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ] + } +] diff --git a/data/mods/Generic_Guns/recipes/requirements.json b/data/mods/Generic_Guns/recipes/requirements.json index 68307c5e8077e..77d950e0d7e58 100644 --- a/data/mods/Generic_Guns/recipes/requirements.json +++ b/data/mods/Generic_Guns/recipes/requirements.json @@ -33,7 +33,7 @@ "id": "req_grenade", "type": "requirement", "//": "Components required for grenade cartridges", - "components": [ [ [ "grenade_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ] ] + "components": [ [ [ "grenade_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] }, { "id": "req_shot", @@ -44,7 +44,7 @@ { "id": "req_penetrator", "type": "requirement", - "//": "Components required for shotgun ammo", + "//": "Components required for barrier/armor penetrators", "components": [ [ [ "sheet_metal_small", 1 ], From 2af1c609fce7ca74f377555f463e9024a216ea36 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Tue, 14 Jan 2020 01:03:34 -0600 Subject: [PATCH 03/12] 20x66 migrations --- .../Generic_Guns/ammo/gg_ammo_migration.json | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 8925cdfd0ab30..e1fa7d06b1deb 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -298,12 +298,22 @@ "replace": "grenade_ammo_teargas" }, { - "id": [ "shot_00", "shot_paper_00", "410shot_000" ], + "id": [ + "shot_00", + "shot_paper_00", + "410shot_000", + "20x66_exp", + "20x66_flechette", + "20x66_frag", + "20x66_inc", + "20x66_shot", + "20x66_flare" + ], "type": "MIGRATION", "replace": "shot_buck" }, { - "id": [ "shot_beanbag" ], + "id": [ "shot_beanbag", "20x66_beanbag" ], "type": "MIGRATION", "replace": "shot_bean" }, @@ -313,7 +323,7 @@ "replace": "shot_fowl" }, { - "id": [ "shot_slug", "shot_paper_slug" ], + "id": [ "shot_slug", "shot_paper_slug", "20x66_slug" ], "type": "MIGRATION", "replace": "shot_foster" }, @@ -323,7 +333,7 @@ "replace": "shot_pyro" }, { - "id": [ "reloaded_shot_00", "reloaded_410shot_000" ], + "id": [ "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette" ], "type": "MIGRATION", "replace": "reloaded_shot_buck" }, @@ -333,7 +343,7 @@ "replace": "reloaded_shot_fowl" }, { - "id": [ "reloaded_shot_slug" ], + "id": [ "reloaded_shot_slug", "20x66_bootleg_slug" ], "type": "MIGRATION", "replace": "reloaded_shot_foster" }, From 73a0b89c15b9ebaad0c9b7c42492f84e8654cd1e Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Tue, 14 Jan 2020 06:38:09 -0600 Subject: [PATCH 04/12] turrets, descriptions, magazine ammo types --- .../ammo/gg_casings_migration.json | 7 +- .../Generic_Guns/firearms/pistol_magnum.json | 2 +- data/mods/Generic_Guns/firearms/rifle.json | 8 +-- data/mods/Generic_Guns/magazines/grenade.json | 1 + data/mods/Generic_Guns/magazines/pistol.json | 9 ++- .../Generic_Guns/magazines/pistol_magnum.json | 1 + .../Generic_Guns/magazines/pistol_tiny.json | 3 +- data/mods/Generic_Guns/magazines/rifle.json | 5 +- .../Generic_Guns/magazines/rifle_huge.json | 2 + data/mods/Generic_Guns/magazines/shot.json | 4 +- .../Generic_Guns/robots/inactive_bots.json | 8 +-- .../mods/Generic_Guns/robots/mon_turrets.json | 67 +++++++++++++++++++ data/mods/Generic_Guns/robots/turrets.json | 34 ---------- 13 files changed, 99 insertions(+), 52 deletions(-) create mode 100644 data/mods/Generic_Guns/robots/mon_turrets.json delete mode 100644 data/mods/Generic_Guns/robots/turrets.json diff --git a/data/mods/Generic_Guns/ammo/gg_casings_migration.json b/data/mods/Generic_Guns/ammo/gg_casings_migration.json index 2054e8cd19a15..4082f3b359b08 100644 --- a/data/mods/Generic_Guns/ammo/gg_casings_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_casings_migration.json @@ -29,17 +29,18 @@ "replace": "pistol_casing" }, { - "id": [ "410shot_hull" ], + "id": [ "410shot_hull", "shot_hull" ], "type": "MIGRATION", - "replace": "shot_hull" + "replace": "shot_casing" }, { - "id": [ "22_casing", "223_casing", "32_casing" ], + "id": [ "22_casing", "32_casing" ], "type": "MIGRATION", "replace": "pistol_tiny_casing" }, { "id": [ + "223_casing", "270win_casing", "300blk_casing", "4570_casing", diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json index 4e368021c26ed..17b27025a0016 100644 --- a/data/mods/Generic_Guns/firearms/pistol_magnum.json +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -14,7 +14,7 @@ "copy-from": "henry_big_boy", "type": "GUN", "name": "magnum levergun", - "ammo": [ "ammo_pistol_magnum" "ammo_pistol" ], + "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], "description": "A modern re-imagining of the classic western lever-action, this larger rifle accepts powerful magnum pistol ammunition as well as weaker pistol ammo. Carrying this along side a magnum pistol would allow one to reduce the number of calibers carried, and allow you to squeeze more power from ammuntion.", "clip_size": 10 }, diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json index 3d8d0d2eb107a..9f2e9a02d35e5 100644 --- a/data/mods/Generic_Guns/firearms/rifle.json +++ b/data/mods/Generic_Guns/firearms/rifle.json @@ -1,11 +1,11 @@ [ { "id": "rifle_assault", - "copy-from": "ar10", + "copy-from": "hk417_13", "type": "GUN", - "name": "service rifle", + "name": "assault rifle", "ammo": "ammo_rifle", - "description": "Borne from years of refinement . The products of decades of improvement, rifle such as this are handy, reliable, and adaptable. Short of large creatures and light vehicles, this should take care of most of your problems out to several hundred meters.", + "description": "The products of decades of improvement, rifle such as this are handy, reliable, and adaptable. An 'assault rifle', it is capable of providing both accurate semi-automatic fire and bursts of automatic fire. Short of large creatures and light vehicles, this should take care of most of your problems out to several hundred meters.", "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] }, { @@ -50,7 +50,7 @@ "type": "GUN", "name": "sporter carbine", "ammo": "ammo_rifle", - "description": "Though often mislabeled an asssault rifle, this common, cheap box-fed carbine isn't capable of automatic fire. While almost as effective as a proper rifle, the wider variety of components and varying levels of maintenance make these less reliable than their military brethren. These rifles are just as adequate for taking on anything smaller than large game, however.", + "description": "Though often mislabeled an asssault rifle, this common, cheap magazine fed carbine isn't capable of automatic fire. While almost as effective as a proper rifle, the wider variety of components and varying levels of maintenance make these less reliable than their military brethren. These rifles are just as adequate for taking on anything smaller than large game, however.", "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] } ] diff --git a/data/mods/Generic_Guns/magazines/grenade.json b/data/mods/Generic_Guns/magazines/grenade.json index ae5627ec0c1e5..76b92514b1022 100644 --- a/data/mods/Generic_Guns/magazines/grenade.json +++ b/data/mods/Generic_Guns/magazines/grenade.json @@ -5,6 +5,7 @@ "type": "MAGAZINE", "name": "grenade machine gun belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. This one holds grenade cartridges and is too bulky to be worn like other ammo belts.", + "delete": { "ammo_type": "40x46mm_grenade" }, "ammo_type": "ammo_grenade", "linkage": "ammolink40mm" } diff --git a/data/mods/Generic_Guns/magazines/pistol.json b/data/mods/Generic_Guns/magazines/pistol.json index 049268d682173..dac4ac9a97227 100644 --- a/data/mods/Generic_Guns/magazines/pistol.json +++ b/data/mods/Generic_Guns/magazines/pistol.json @@ -5,7 +5,8 @@ "type": "MAGAZINE", "name": "SMG magazine", "description": "A long stick magazine for use with pistols and submachine guns. Holds 30 rounds of standard pistol ammo.", - "ammo_type": "ammo_pistol" + "ammo_type": "ammo_pistol", + "delete": { "ammo_type": "9mm" } }, { "id": "pistol_smg_mag", @@ -13,7 +14,8 @@ "type": "MAGAZINE", "name": "pistol magazine", "description": "A flush fitting magazine for use with pistols and submachine guns. Holds 15 rounds of standard pistol ammo.", - "ammo_type": "ammo_pistol" + "ammo_type": "ammo_pistol", + "delete": { "ammo_type": "9mm" } }, { "id": "pistol_speedloader", @@ -21,6 +23,7 @@ "type": "MAGAZINE", "name": "revolver speedloader", "description": "A 'speedloader', a metal block capable of holding and releasing ammunition to aid in loading revolvers. Accepts 6 standard or magnum pistol cartridges.", - "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ] + "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ], + "delete": { "ammo_type": "44" } } ] diff --git a/data/mods/Generic_Guns/magazines/pistol_magnum.json b/data/mods/Generic_Guns/magazines/pistol_magnum.json index 0935b9325e7e7..373951eb4c771 100644 --- a/data/mods/Generic_Guns/magazines/pistol_magnum.json +++ b/data/mods/Generic_Guns/magazines/pistol_magnum.json @@ -5,6 +5,7 @@ "type": "MAGAZINE", "name": "magnum pistol magazine", "description": "An 8 round magazine for use with semi-automatic magnum pistols.", + "delete": { "ammo_type": "44" }, "ammo_type": [ "ammo_pistol", "ammo_pistol_magnum" ] } ] diff --git a/data/mods/Generic_Guns/magazines/pistol_tiny.json b/data/mods/Generic_Guns/magazines/pistol_tiny.json index eeaff8ea12abd..a870526d1ce70 100644 --- a/data/mods/Generic_Guns/magazines/pistol_tiny.json +++ b/data/mods/Generic_Guns/magazines/pistol_tiny.json @@ -5,6 +5,7 @@ "type": "MAGAZINE", "name": "target pistol magazine", "description": "A flush fitting magazine for use with target pistols, capable of feeding 10 tiny pistol cartridges.", - "ammo_type": "ammo_pistol_tiny" + "ammo_type": "ammo_pistol_tiny", + "delete": { "ammo_type": "22" } } ] diff --git a/data/mods/Generic_Guns/magazines/rifle.json b/data/mods/Generic_Guns/magazines/rifle.json index adbea730f02bd..7a141f02168eb 100644 --- a/data/mods/Generic_Guns/magazines/rifle.json +++ b/data/mods/Generic_Guns/magazines/rifle.json @@ -5,6 +5,7 @@ "type": "MAGAZINE", "name": "ammo belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds rifle ammunition.", + "delete": { "ammo_type": "308" }, "ammo_type": "ammo_rifle" }, { @@ -13,7 +14,8 @@ "type": "MAGAZINE", "material": "aluminum", "name": "standard rifle magazine", - "description": "A 30 round standard capacity magazine for service rifles, cheaper than the cost of a meal due to its adoption by nearly every other common rifle. They're made of aluminum and are meant to be dispsoable, so they're not the most durable; don't let them get damaged.", + "description": "A 30 round standard capacity magazine for service rifles, cheaper than the cost of a meal due to its adoption by nearly every other common rifle. They're made of aluminum and were originally meant to be dispsoable, so they're not the most durable; don't let them get damaged.", + "delete": { "ammo_type": "308" }, "ammo_type": "ammo_rifle" }, { @@ -22,6 +24,7 @@ "type": "MAGAZINE", "name": "compact rifle magazine", "description": "A short 10 round steel magazine compatible with nearly every common rifle. Although it has a low capacity it is easy to store and quick to reload.", + "delete": { "ammo_type": "308" }, "ammo_type": "ammo_rifle" } ] diff --git a/data/mods/Generic_Guns/magazines/rifle_huge.json b/data/mods/Generic_Guns/magazines/rifle_huge.json index ffbb885f85278..7b9d3d9c91a3f 100644 --- a/data/mods/Generic_Guns/magazines/rifle_huge.json +++ b/data/mods/Generic_Guns/magazines/rifle_huge.json @@ -6,6 +6,7 @@ "name": "heavy machine gun belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds huge rifle ammunition.", "ammo_type": "ammo_rifle_huge", + "delete": { "ammo_type": "50" }, "linkage": "ammolinkrifle_huge" }, { @@ -14,6 +15,7 @@ "copy-from": "m107a1mag", "name": "anti-materiel rifle magazine", "description": "A huge 10 round magazine for anti-materiel rifles.", + "delete": { "ammo_type": "50" }, "ammo_type": "ammo_rifle_huge" } ] diff --git a/data/mods/Generic_Guns/magazines/shot.json b/data/mods/Generic_Guns/magazines/shot.json index 4fa21b96de85c..81e8b6357d171 100644 --- a/data/mods/Generic_Guns/magazines/shot.json +++ b/data/mods/Generic_Guns/magazines/shot.json @@ -7,7 +7,8 @@ "capacity": 8, "material": "plastic", "reliability": 6, - "description": "An 8 round magazine for tactical shotguns. Shotshells tend to not work well in box magazines due to their plastic hulls and the compression from the magazine spring.", + "description": "An 8 round box magazine for tactical shotguns. Shotshells tend to not work well in box magazines due to their plastic hulls and the compression from the magazine spring.", + "delete": { "ammo_type": "shot" }, "ammo_type": "ammo_shot" }, { @@ -16,6 +17,7 @@ "name": "shotgun speedloader", "type": "MAGAZINE", "description": "A shotshell 'speedloader', a long plastic tube with a prominent plastic follower. You can feed 6 shotshells into an appropriately modified shotgun by pushing the follower against the shotgun's loading port. Bulky, but sees use in competition occasionally.", + "delete": { "ammo_type": "shot" }, "ammo_type": "ammo_shot" } ] diff --git a/data/mods/Generic_Guns/robots/inactive_bots.json b/data/mods/Generic_Guns/robots/inactive_bots.json index 8788719259ec3..51f5c03a4fc5f 100644 --- a/data/mods/Generic_Guns/robots/inactive_bots.json +++ b/data/mods/Generic_Guns/robots/inactive_bots.json @@ -2,8 +2,8 @@ { "id": "bot_antimateriel", "type": "TOOL", - "name": "inactive M2HB autonomous CROWS II", - "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded .50 BMG rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", + "name": "inactive heavy autonomous CROWS II", + "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded heavy machine gun rounds in your inventory (if you wish to divide your ammunition, set aside whatever heavy machine gun rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", "weight": "172 kg", "volume": "30 L", "price": 500500, @@ -25,7 +25,7 @@ "id": "bot_chickenbot", "type": "TOOL", "name": "inactive chicken walker", - "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded rifle and grenade ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", "weight": "120000 g", "volume": "92500 ml", "price": 50000000, @@ -51,7 +51,7 @@ "looks_like": "broken_tankbot", "type": "TOOL", "name": "inactive tank drone", - "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", + "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded rifle and grenade ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", "weight": "200000 g", "//": "cheating a bit with the volume due to lack of proper vehicle storage options", "volume": "250 L", diff --git a/data/mods/Generic_Guns/robots/mon_turrets.json b/data/mods/Generic_Guns/robots/mon_turrets.json new file mode 100644 index 0000000000000..9c88dd306b0fc --- /dev/null +++ b/data/mods/Generic_Guns/robots/mon_turrets.json @@ -0,0 +1,67 @@ +[ + { + "id": "mon_gg_turret", + "copy-from": "mon_turret", + "type": "MONSTER", + "default_faction": "defense_bot", + "name": "improvised SMG turret", + "description": "A submachinegun attached to a motorized chassis with basic autonomous software control. There is no mechanism to reload the weapon when its magazine is empty and the fire control system is only designed for semi automatic fire." + }, + { + "id": "mon_gg_turret_bmg", + "copy-from": "mon_turret_bmg", + "type": "MONSTER", + "name": "Heavy CROWS II", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a heavy machinegun.", + "default_faction": "military" + }, + { + "id": "mon_gg_LMG", + "copy-from": "mon_crows_m240", + "type": "MONSTER", + "name": "Medium CROWS II", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a light machine gun.", + "default_faction": "military", + "species": [ "ROBOT" ], + "diff": 35, + "volume": "60000 ml", + "weight": "172 kg", + "hp": 40, + "speed": 100, + "material": [ "steel" ], + "symbol": "2", + "color": "green", + "aggression": 100, + "morale": 100, + "armor_bash": 14, + "armor_cut": 16, + "vision_day": 50, + "vision_night": 3, + "revert_to_itype": "bot_crows_m240", + "starting_ammo": { "rifle_ball": 1000 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "rifle_lmg", + "ammo_type": "ammo_rifle", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 60, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ], + "special_when_hit": [ "RETURN_FIRE", 100 ], + "death_drops": { }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] + } +] diff --git a/data/mods/Generic_Guns/robots/turrets.json b/data/mods/Generic_Guns/robots/turrets.json deleted file mode 100644 index ff2771d78483c..0000000000000 --- a/data/mods/Generic_Guns/robots/turrets.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "id": "mon_turret", - "copy-from": "mon_turret", - "type": "MONSTER", - "default_faction": "defense_bot", - "name": "improvised SMG turret", - "description": "A submachinegun attached to a motorized chassis with basic autonomous software control. There is no mechanism to reload the weapon when its magazine is empty and the fire control system is only designed for semi automatic fire." - }, - { - "id": "mon_turret_bmg", - "copy-from": "mon_turret_bmg", - "type": "MONSTER", - "name": "Heavy CROWS II", - "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a heavy machinegun.", - "default_faction": "military" - }, - { - "id": "mon_turret_rifle", - "copy-from": "mon_turret_rifle", - "type": "MONSTER", - "name": "Light CROWS II", - "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a service rifle.", - "default_faction": "military" - }, - { - "id": "mon_crows_m240", - "copy-from": "mon_crows_m240", - "type": "MONSTER", - "name": "Medium CROWS II", - "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a light machine gun.", - "default_faction": "military" - } -] From c677f28fb5e06ee2162b6883e34445191a836da5 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 04:11:58 -0600 Subject: [PATCH 05/12] =?UTF-8?q?Sm=C3=B6rg=C3=A5sbord=20of=20stuff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generic_Guns/ammo/gg_ammo_migration.json | 10 +- data/mods/Generic_Guns/firearms/grenade.json | 2 +- data/mods/Generic_Guns/magazines/grenade.json | 14 +- data/mods/Generic_Guns/magazines/rifle.json | 8 +- .../Generic_Guns/magazines/rifle_huge.json | 7 +- .../Generic_Guns/recipes/recipe_obsolete.json | 40 ++++- .../mods/Generic_Guns/robots/active_bots.json | 151 ++++++++++++++++++ .../mods/Generic_Guns/robots/broken_bots.json | 35 ++++ .../Generic_Guns/robots/inactive_bots.json | 89 +++-------- .../mods/Generic_Guns/robots/mon_turrets.json | 67 -------- data/mods/Generic_Guns/vehicles/turrets.json | 67 ++++++++ 11 files changed, 340 insertions(+), 150 deletions(-) create mode 100644 data/mods/Generic_Guns/robots/active_bots.json create mode 100644 data/mods/Generic_Guns/robots/broken_bots.json delete mode 100644 data/mods/Generic_Guns/robots/mon_turrets.json create mode 100644 data/mods/Generic_Guns/vehicles/turrets.json diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index e1fa7d06b1deb..cf248822c6be2 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -333,27 +333,27 @@ "replace": "shot_pyro" }, { - "id": [ "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette" ], + "id": [ "bp_shot_00", "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette" ], "type": "MIGRATION", "replace": "reloaded_shot_buck" }, { - "id": [ "reloaded_shot_bird" ], + "id": [ "bp_shot_bird", "reloaded_shot_bird" ], "type": "MIGRATION", "replace": "reloaded_shot_fowl" }, { - "id": [ "reloaded_shot_slug", "20x66_bootleg_slug" ], + "id": [ "bp_shot_bird", "reloaded_shot_slug", "20x66_bootleg_slug" ], "type": "MIGRATION", "replace": "reloaded_shot_foster" }, { - "id": [ "reloaded_shot_dragon" ], + "id": [ "bp_shot_dragon", "reloaded_shot_dragon" ], "type": "MIGRATION", "replace": "reloaded_shot_pyro" }, { - "id": [ "reloaded_shot_flechette" ], + "id": [ "bp_shot_flechette", "reloaded_shot_flechette" ], "type": "MIGRATION", "replace": "reloaded_shot_dart" } diff --git a/data/mods/Generic_Guns/firearms/grenade.json b/data/mods/Generic_Guns/firearms/grenade.json index 7eddd453e6c55..935b5cfe496b0 100644 --- a/data/mods/Generic_Guns/firearms/grenade.json +++ b/data/mods/Generic_Guns/firearms/grenade.json @@ -14,7 +14,7 @@ "type": "GUN", "name": "automatic grenade launcher", "ammo": "ammo_grenade", - "description": "This large, clumsy looking launcher looks like the offspring of a machine gun and a mortar; its bore is huge, and its action just as massive. A huge belt of grenade cartridges loads into its tray, allowing several grenades to be launched in rapid succession. If one grenade fired from this isn't enough to solve your problems, surely a dozen more are. This must be mounted on a frame to be fired, and reloading is a bit slow.", + "description": "This large, clumsy looking launcher looks like the offspring of a machine gun and a mortar; its bore is huge, and its action is just as massive. A huge belt of grenade cartridges loads into its tray, allowing several grenades to be launched in rapid succession. If one grenade fired from this isn't enough to solve your problems, surely a dozen more are. This must be mounted on a frame to be fired, and reloading is a bit slow.", "magazines": [ [ "ammo_grenade", [ "grenade_belt" ] ] ] }, { diff --git a/data/mods/Generic_Guns/magazines/grenade.json b/data/mods/Generic_Guns/magazines/grenade.json index 76b92514b1022..f44c4eb4e2b10 100644 --- a/data/mods/Generic_Guns/magazines/grenade.json +++ b/data/mods/Generic_Guns/magazines/grenade.json @@ -1,12 +1,20 @@ [ { "id": "grenade_belt", - "copy-from": "belt40mm", "type": "MAGAZINE", "name": "grenade machine gun belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. This one holds grenade cartridges and is too bulky to be worn like other ammo belts.", - "delete": { "ammo_type": "40x46mm_grenade" }, + "volume": 0, + "price": 0, + "rigid": false, + "material": "steel", + "symbol": "#", + "color": "light_gray", "ammo_type": "ammo_grenade", - "linkage": "ammolink40mm" + "capacity": 50, + "count": 25, + "reliability": 6, + "linkage": "ammolinkgrenade", + "flags": [ "MAG_BELT", "MAG_DESTROY" ] } ] diff --git a/data/mods/Generic_Guns/magazines/rifle.json b/data/mods/Generic_Guns/magazines/rifle.json index 7a141f02168eb..1080d02822f6b 100644 --- a/data/mods/Generic_Guns/magazines/rifle.json +++ b/data/mods/Generic_Guns/magazines/rifle.json @@ -1,12 +1,16 @@ [ { "id": "rifle_belt", - "copy-from": "belt308", + "copy-from": "magazine_belt", "type": "MAGAZINE", "name": "ammo belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds rifle ammunition.", "delete": { "ammo_type": "308" }, - "ammo_type": "ammo_rifle" + "ammo_type": "ammo_rifle", + "capacity": 500, + "count": 100, + "default_ammo": "rifle_ball", + "linkage": "ammolinkrifle" }, { "id": "rifle_mag", diff --git a/data/mods/Generic_Guns/magazines/rifle_huge.json b/data/mods/Generic_Guns/magazines/rifle_huge.json index 7b9d3d9c91a3f..4f193995492ea 100644 --- a/data/mods/Generic_Guns/magazines/rifle_huge.json +++ b/data/mods/Generic_Guns/magazines/rifle_huge.json @@ -1,13 +1,14 @@ [ { "id": "rifle_huge_belt", - "copy-from": "belt50", + "copy-from": "magazine_belt", "type": "MAGAZINE", "name": "heavy machine gun belt", "description": "An ammo belt consisting of metal linkages which separate from the belt upon firing. Holds huge rifle ammunition.", "ammo_type": "ammo_rifle_huge", - "delete": { "ammo_type": "50" }, - "linkage": "ammolinkrifle_huge" + "linkage": "ammolinkrifle_huge", + "capacity": 100, + "count": 100 }, { "id": "rifle_huge_amr_mag", diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json index f66e58ad1e71f..c3f375dffb39f 100644 --- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json +++ b/data/mods/Generic_Guns/recipes/recipe_obsolete.json @@ -994,6 +994,31 @@ "result": "shot_paper_bird", "obsolete": true }, + { + "type": "recipe", + "result": "bp_shot_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_00", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_bird", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_dragon", + "obsolete": true + }, + { + "type": "recipe", + "result": "bp_shot_flechette", + "obsolete": true + }, { "type": "recipe", "result": "reloaded_shot_00", @@ -1051,27 +1076,27 @@ }, { "type": "recipe", - "result": "bp_shot_00", + "result": "bp_shot_00_with dowel", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_bird", + "result": "bp_shot_bird_with dowel", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_dragon", + "result": "bp_shot_dragon_with dowel", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_slug", + "result": "bp_shot_slug_with dowel", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_scrap", + "result": "bp_shot_scrap_with dowel", "obsolete": true }, { @@ -1613,5 +1638,10 @@ "type": "recipe", "result": "reloaded_762_m87", "obsolete": true + }, + { + "type": "recipe", + "result": "bot_crows_m240", + "obsolete": true } ] diff --git a/data/mods/Generic_Guns/robots/active_bots.json b/data/mods/Generic_Guns/robots/active_bots.json new file mode 100644 index 0000000000000..761c13eb7db3e --- /dev/null +++ b/data/mods/Generic_Guns/robots/active_bots.json @@ -0,0 +1,151 @@ +[ + { + "id": "mon_turret", + "copy-from": "mon_turret", + "type": "MONSTER", + "name": "improvised SMG turret", + "default_faction": "defense_bot", + "starting_ammo": { "pistol_ball": 30 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "pistol_smg", + "ammo_type": "pistol_ball", + "fake_skills": [ [ "gun", 5 ], [ "smg", 5 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 14, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 400, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 20, + "no_ammo_sound": "a chk!" + } + ] + }, + { + "id": "mon_turret_bmg", + "copy-from": "mon_turret_bmg", + "type": "MONSTER", + "name": "CROWS II, heavy machinegun", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a heavy machinegun.", + "default_faction": "military", + "starting_ammo": { "rifle_huge_ball": 400 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "rifle_huge_hmg", + "ammo_type": "rifle_huge_ball", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 40, "AUTO" ], [ 41, 110, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ] + }, + { + "id": "mon_crows_m240", + "copy-from": "mon_turret_rifle", + "type": "MONSTER", + "default_faction": "military" + }, + { + "id": "mon_turret_rifle", + "copy-from": "mon_turret_rifle", + "type": "MONSTER", + "name": "CROWS II, light machinegun", + "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a light machine gun.", + "default_faction": "military", + "starting_ammo": { "rifle_ball": 1000 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "rifle_lmg", + "ammo_type": "rifle_ball", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 60, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ] + }, + { + "id": "mon_secubot", + "copy-from": "mon_secubot", + "type": "MONSTER", + "name": { "str": "autonomous rifle TALON UGV" }, + "description": "A TALON unmanned ground vehicle equipped with a standard assault rifle. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.", + "starting_ammo": { "rifle_ball": 30 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "rifle_assault", + "ammo_type": "556", + "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 30, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ] + }, + { + "id": "mon_talon_m202a1", + "copy-from": "mon_talon_m202a1", + "type": "MONSTER", + "name": { "str": "autonomous launcher TALON UGV" }, + "description": "A TALON unmanned ground vehicle equipped with a revolver grenade launcher. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.", + "default_faction": "defense_bot", + "starting_ammo": { "grenade_ammo_hedp": 6 }, + "special_attacks": [ + { + "type": "gun", + "cooldown": 1, + "move_cost": 150, + "gun_type": "grenade_revolver", + "ammo_type": "grenade_ammo_hedp", + "fake_skills": [ [ "gun", 8 ], [ "launcher", 8 ] ], + "fake_dex": 12, + "ranges": [ [ 0, 20, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 200, + "targeting_timeout_extend": -10, + "targeting_sound": "\"Hostile detected.\"", + "targeting_volume": 50, + "no_ammo_sound": "a chk!" + } + ] + } +] diff --git a/data/mods/Generic_Guns/robots/broken_bots.json b/data/mods/Generic_Guns/robots/broken_bots.json new file mode 100644 index 0000000000000..ac39d9240755a --- /dev/null +++ b/data/mods/Generic_Guns/robots/broken_bots.json @@ -0,0 +1,35 @@ +[ + + { + "type": "GENERIC", + "id": "broken_turret_rifle", + "name": "broken CROWS II", + "copy-from": "broken_turret_rifle" + }, + { + "type": "GENERIC", + "id": "broken_crows_m240", + "name": "broken CROWS II", + "copy-from": "broken_crows_m240" + }, + { + "type": "GENERIC", + "id": "broken_turret_bmg", + "name": "broken CROWS II Heavy", + "copy-from": "broken_turret_bmg" + }, + { + "type": "GENERIC", + "id": "broken_talon_m202a1", + "copy-from": "broken_talon_m202a1", + "name": "broken rocket TALON UGV", + "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts." + }, + { + "type": "GENERIC", + "id": "broken_secubot", + "copy-from": "broken_secubot", + "name": "broken rifle TALON UGV", + "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts." + } +] diff --git a/data/mods/Generic_Guns/robots/inactive_bots.json b/data/mods/Generic_Guns/robots/inactive_bots.json index 51f5c03a4fc5f..317313ee57ca0 100644 --- a/data/mods/Generic_Guns/robots/inactive_bots.json +++ b/data/mods/Generic_Guns/robots/inactive_bots.json @@ -1,76 +1,37 @@ [ { "id": "bot_antimateriel", + "copy-from": "bot_antimateriel", "type": "TOOL", - "name": "inactive heavy autonomous CROWS II", - "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded heavy machine gun rounds in your inventory (if you wish to divide your ammunition, set aside whatever heavy machine gun rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.", - "weight": "172 kg", - "volume": "30 L", - "price": 500500, - "to_hit": -3, - "bashing": 8, - "material": [ "steel", "plastic" ], - "symbol": ";", - "color": "red", - "use_action": { - "type": "place_monster", - "monster_id": "mon_turret_bmg", - "difficulty": 6, - "moves": 100, - "skill1": "electronics", - "skill2": "computer" - } + "name": "CROWS II, heavy machinegun", + "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded ball heavy machine gun ammunition rounds in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its heavy machine gun." }, { - "id": "bot_chickenbot", + "id": "bot_rifleturret", + "copy-from": "bot_rifleturret", "type": "TOOL", - "name": "inactive chicken walker", - "description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded rifle and grenade ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", - "weight": "120000 g", - "volume": "92500 ml", - "price": 50000000, - "to_hit": -3, - "bashing": 8, - "material": [ "steel" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "type": "place_monster", - "monster_id": "mon_chickenbot", - "friendly_msg": "The chicken walker rises to its feet, sways away from you and begins surveying the area.", - "hostile_msg": "The chicken walker whirrs and aims directly at you. Take cover!", - "//": "Milspec, but was deployed in active service implying a reliable IFF", - "difficulty": 9, - "moves": 250, - "skill1": "electronics", - "skill2": "computer" - } + "name": "inactive CROWS II, light machinegun", + "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded ball rifle ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its light machine gun." }, { - "id": "bot_tankbot", - "looks_like": "broken_tankbot", + "id": "bot_turret", + "copy-from": "bot_turret", "type": "TOOL", - "name": "inactive tank drone", - "description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded rifle and grenade ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.", - "weight": "200000 g", - "//": "cheating a bit with the volume due to lack of proper vehicle storage options", - "volume": "250 L", - "price": 100000000, - "to_hit": -3, - "bashing": 8, - "material": [ "steel" ], - "symbol": ";", - "color": "light_green", - "use_action": { - "type": "place_monster", - "monster_id": "mon_tankbot", - "friendly_msg": "The tank drone rolls out and begins acquiring targets.", - "hostile_msg": "The tank drone swivels its turret and aims directly at you. Don your brown pants!", - "//": "Milspec, clearly designed with little concern for collateral damage. What did you expect of a robo-tank?", - "difficulty": 10, - "moves": 500, - "skill1": "electronics", - "skill2": "computer" - } + "name": "inactive turret", + "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded ball pistol ammunition in your inventory (if you wish to divide your ammunition, set aside whatever ammo you do NOT want to give the turret) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the turret will then identify you as a friendly, and attack all enemies with its SMG." + }, + { + "id": "bot_secubot", + "copy-from": "bot_secubot", + "type": "TOOL", + "name": "inactive TALON UGV", + "description": "This is an inactive TALON UGV equipped with an assault rifle. Using this item involves loading the unit with the factory-loaded ball rifle ammo in inventory (if you wish to divide your ammunition, set aside whatever rifle ammo you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with its rifle." + }, + { + "id": "bot_talon_m202a1", + "copy-from": "bot_talon_m202a1", + "type": "TOOL", + "name": "inactive launcher TALON UGV", + "description": "This is an inactive TALON UGV equipped with a six shot grenade launcher. Using this item involves loading the unit with the HEDP grenade cartridges in your inventory (if you wish to divide your ammunition, set aside whatever grenades you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the UGV will then identify you as a friendly, roam around or follow you, and attack all enemies with its grenade launcher." } ] diff --git a/data/mods/Generic_Guns/robots/mon_turrets.json b/data/mods/Generic_Guns/robots/mon_turrets.json deleted file mode 100644 index 9c88dd306b0fc..0000000000000 --- a/data/mods/Generic_Guns/robots/mon_turrets.json +++ /dev/null @@ -1,67 +0,0 @@ -[ - { - "id": "mon_gg_turret", - "copy-from": "mon_turret", - "type": "MONSTER", - "default_faction": "defense_bot", - "name": "improvised SMG turret", - "description": "A submachinegun attached to a motorized chassis with basic autonomous software control. There is no mechanism to reload the weapon when its magazine is empty and the fire control system is only designed for semi automatic fire." - }, - { - "id": "mon_gg_turret_bmg", - "copy-from": "mon_turret_bmg", - "type": "MONSTER", - "name": "Heavy CROWS II", - "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a heavy machinegun.", - "default_faction": "military" - }, - { - "id": "mon_gg_LMG", - "copy-from": "mon_crows_m240", - "type": "MONSTER", - "name": "Medium CROWS II", - "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the Cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a light machine gun.", - "default_faction": "military", - "species": [ "ROBOT" ], - "diff": 35, - "volume": "60000 ml", - "weight": "172 kg", - "hp": 40, - "speed": 100, - "material": [ "steel" ], - "symbol": "2", - "color": "green", - "aggression": 100, - "morale": 100, - "armor_bash": 14, - "armor_cut": 16, - "vision_day": 50, - "vision_night": 3, - "revert_to_itype": "bot_crows_m240", - "starting_ammo": { "rifle_ball": 1000 }, - "special_attacks": [ - { - "type": "gun", - "cooldown": 1, - "move_cost": 150, - "gun_type": "rifle_lmg", - "ammo_type": "ammo_rifle", - "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], - "fake_dex": 12, - "ranges": [ [ 0, 60, "DEFAULT" ] ], - "require_targeting_npc": true, - "require_targeting_monster": true, - "laser_lock": false, - "targeting_cost": 200, - "targeting_timeout_extend": -10, - "targeting_sound": "\"Hostile detected.\"", - "targeting_volume": 50, - "no_ammo_sound": "a chk!" - } - ], - "special_when_hit": [ "RETURN_FIRE", 100 ], - "death_drops": { }, - "death_function": [ "BROKEN" ], - "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] - } -] diff --git a/data/mods/Generic_Guns/vehicles/turrets.json b/data/mods/Generic_Guns/vehicles/turrets.json new file mode 100644 index 0000000000000..a69c682a44367 --- /dev/null +++ b/data/mods/Generic_Guns/vehicles/turrets.json @@ -0,0 +1,67 @@ +[ + { + "id": "mounted_bigun", + "copy-from": "mounted_bigun", + "type": "vehicle_part", + "name": "mounted tactical shotgun", + "item": "shot_tactical", + "breaks_into": [ { "item": "shot_tactical", "prob": 50 } ] + }, + { + "id": "mounted_browning", + "copy-from": "mounted_browning", + "type": "vehicle_part", + "name": "mounted heavy machinegun", + "item": "rifle_huge_hmg", + "breaks_into": [ { "item": "rifle_huge_hmg", "prob": 50 } ] + }, + { + "id": "mounted_rm298", + "copy-from": "mounted_browning", + "type": "vehicle_part" + }, + { + "id": "mounted_m1918", + "copy-from": "mounted_m1918", + "type": "vehicle_part", + "name": "mounted assault rifle", + "item": "rifle_assault", + "breaks_into": [ { "item": "rifle_assault", "prob": 50 } ] + }, + { + "id": "mounted_m240", + "copy-from": "mounted_m240", + "type": "vehicle_part", + "name": "mounted light machine gun", + "item": "rifle_lmg", + "breaks_into": [ { "item": "rifle_lmg", "prob": 50 } ] + }, + { + "id": "m249", + "copy-from": "mounted_m240", + "type": "vehicle_part" + }, + { + "id": "mounted_m134", + "copy-from": "mounted_m240", + "type": "vehicle_part" + }, + { + "id": "mounted_m60", + "copy-from": "mounted_m240", + "type": "vehicle_part" + }, + { + "id": "mounted_rm614", + "copy-from": "mounted_m240", + "type": "vehicle_part" + }, + { + "id": "mounted_mk19", + "copy-from": "mounted_mk19", + "type": "vehicle_part", + "name": "mounted automatic grenade launcher", + "item": "grenade_hmg", + "breaks_into": [ { "item": "grenade_hmg", "prob": 50 } ] + } +] From 3ab8c5a25ea308193e79638f23f17fc104e11e8d Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 04:15:08 -0600 Subject: [PATCH 06/12] Update gg_ammo_migration.json --- data/mods/Generic_Guns/ammo/gg_ammo_migration.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index cf248822c6be2..10237f34195a0 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -333,7 +333,15 @@ "replace": "shot_pyro" }, { - "id": [ "bp_shot_00", "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette" ], + "id": [ + "bp_shot_scrap", + "shot_scrap", + "bp_shot_00", + "reloaded_shot_00", + "reloaded_410shot_000", + "20x66_bootleg_shot", + "20x66_bootleg_flechette" + ], "type": "MIGRATION", "replace": "reloaded_shot_buck" }, From 9dd0732faa1bf72517a6900f01f4bbd8b843798d Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 16:36:31 -0600 Subject: [PATCH 07/12] black powder recipes &defs, make more recipes standalone --- .../Generic_Guns/ammo/gg_ammo_migration.json | 148 +++++---- data/mods/Generic_Guns/ammo/pistol.json | 20 ++ .../mods/Generic_Guns/ammo/pistol_magnum.json | 40 ++- data/mods/Generic_Guns/ammo/pistol_tiny.json | 20 ++ data/mods/Generic_Guns/ammo/rifle.json | 20 ++ data/mods/Generic_Guns/ammo/rifle_huge.json | 20 ++ data/mods/Generic_Guns/ammo/shot.json | 127 ++++++-- .../firearms/gg_firearms_migration.json | 38 +-- .../Generic_Guns/recipes/recipe_obsolete.json | 38 +-- .../recipes/recipes_firearms.json | 139 -------- .../recipes/recipes_firearms_repeater.json | 100 ++++++ .../recipes/recipes_firearms_single.json | 151 +++++++++ .../Generic_Guns/recipes/recipes_pistol.json | 42 +++ .../Generic_Guns/recipes/recipes_rifle.json | 29 +- .../Generic_Guns/recipes/recipes_shot.json | 299 +++++++++++++++++- .../Generic_Guns/recipes/requirements.json | 20 ++ .../mods/Generic_Guns/robots/broken_bots.json | 1 - .../temp_ammo_redefine_hack.json | 29 ++ .../temp_magazine_json_load_hack.json | 219 +++++++++++++ 19 files changed, 1210 insertions(+), 290 deletions(-) delete mode 100644 data/mods/Generic_Guns/recipes/recipes_firearms.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json create mode 100644 data/mods/Generic_Guns/recipes/recipes_firearms_single.json create mode 100644 data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json create mode 100644 data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 10237f34195a0..057b333c2fd23 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -5,20 +5,30 @@ "replace": "tiny_pistol_ball" }, { - "id": [ "bp_22_fmj", "bp_22_lr", "bp_32_acp", "reloaded_22_fmj", "reloaded_32_acp" ], + "id": [ "reloaded_22_fmj", "reloaded_32_acp" ], "type": "MIGRATION", "replace": "reloaded_tiny_pistol_ball" }, + { + "id": [ "bp_22_fmj", "bp_22_lr", "bp_32_acp" ], + "type": "MIGRATION", + "replace": "bp_tiny_pistol_ball" + }, { "id": [ "22_cb", "22_lr", "22_ratshot" ], "type": "MIGRATION", "replace": "tiny_pistol_jhp" }, { - "id": [ "reloaded_22_lr", "bp_22_lr" ], + "id": [ "reloaded_22_lr" ], "type": "MIGRATION", "replace": "reloaded_tiny_pistol_jhp" }, + { + "id": [ "bp_22_lr" ], + "type": "MIGRATION", + "replace": "bp_tiny_pistol_jhp" + }, { "id": [ "10mm_fmj", @@ -45,16 +55,6 @@ }, { "id": [ - "bp_10mm_fmj", - "bp_38_fmj", - "bp_380_FMJ", - "bp_40ball", - "bp_44ball", - "bp_45_acp", - "bp_46mm", - "bp_57mm", - "bp_9mmfmj", - "bp_9x18mmfmj", "reloaded_10mm_fmj", "reloaded_357sig_fmj", "reloaded_38_fmj", @@ -75,6 +75,22 @@ "type": "MIGRATION", "replace": "reloaded_pistol_ball" }, + { + "id": [ + "bp_10mm_fmj", + "bp_38_fmj", + "bp_380_FMJ", + "bp_40ball", + "bp_44ball", + "bp_45_acp", + "bp_46mm", + "bp_57mm", + "bp_9mmfmj", + "bp_9x18mmfmj" + ], + "type": "MIGRATION", + "replace": "bp_pistol_ball" + }, { "id": [ "357sig_jhp", @@ -95,13 +111,6 @@ }, { "id": [ - "bp_38_special", - "bp_380_JHP", - "bp_40sw", - "bp_45_jhp", - "bp_762_25", - "bp_9mm", - "bp_9x18mm", "reloaded_357sig_jhp", "reloaded_38_special", "reloaded_38_super", @@ -117,37 +126,41 @@ "type": "MIGRATION", "replace": "reloaded_pistol_jhp" }, + { + "id": [ "bp_38_special", "bp_380_JHP", "bp_40sw", "bp_45_jhp", "bp_762_25", "bp_9mm", "bp_9x18mm" ], + "type": "MIGRATION", + "replace": "bp_pistol_jhp" + }, { "id": [ "357mag_fmj", "44fmj", "460_fmj" ], "type": "MIGRATION", "replace": "pistol_magnum_ball" }, { - "id": [ "bp_357mag_fmj", "bp_460_fmj", "reloaded_357mag_fmj", "reloaded_44magnum", "reloaded_460_fmj" ], + "id": [ "reloaded_357mag_fmj", "reloaded_44magnum", "reloaded_460_fmj" ], "type": "MIGRATION", "replace": "reloaded_pistol_magnum_ball" }, + { + "id": [ "bp_357mag_fmj", "bp_44fmj", "bp_460_fmj" ], + "type": "MIGRATION", + "replace": "bp_pistol_magnum_ball" + }, { "id": [ "357mag_jhp", "44magnum", "454_Casull", "460_rowland", "500_Magnum" ], "type": "MIGRATION", "replace": "pistol_magnum_jhp" }, { - "id": [ - "bp_357mag_jhp", - "bp_44magnum", - "bp_454_Casull", - "bp_460_rowland", - "bp_500_Magnum", - "reloaded_357mag_jhp", - "reloaded_44fmj", - "reloaded_454_Casull", - "reloaded_460_rowland", - "reloaded_500_Magnum" - ], + "id": [ "reloaded_357mag_jhp", "reloaded_44fmj", "reloaded_454_Casull", "reloaded_460_rowland", "reloaded_500_Magnum" ], "type": "MIGRATION", "replace": "reloaded_pistol_magnum_jhp" }, + { + "id": [ "bp_357mag_jhp", "bp_44magnum", "bp_454_Casull", "bp_460_rowland", "bp_500_Magnum" ], + "type": "MIGRATION", + "replace": "bp_pistol_magnum_jhp" + }, { "id": [ "223", @@ -170,13 +183,6 @@ }, { "id": [ - "8mm_bootleg", - "bp_223", - "bp_270win_jsp", - "bp_300_winmag", - "bp_3006", - "bp_300blk", - "bp_308", "reloaded_223", "reloaded_270win_jsp", "reloaded_300_winmag", @@ -193,6 +199,11 @@ "type": "MIGRATION", "replace": "reloaded_rifle_ball" }, + { + "id": [ "bp_223", "bp_270win_jsp", "bp_300_winmag", "bp_3006", "bp_300blk", "bp_308" ], + "type": "MIGRATION", + "replace": "bp_rifle_ball" + }, { "id": [ "3006_incendiary", @@ -214,12 +225,6 @@ }, { "id": [ - "bp_3006_incendiary", - "bp_3006fmj", - "bp_556", - "bp_556_incendiary", - "bp_762_51", - "bp_762_51_incendiary", "reloaded_3006_incendiary", "reloaded_3006fmj", "reloaded_4570_pen", @@ -233,6 +238,11 @@ "type": "MIGRATION", "replace": "reloaded_rifle_AP" }, + { + "id": [ "bp_3006_incendiary", "bp_3006fmj", "bp_556", "bp_556_incendiary", "bp_762_51", "bp_762_51_incendiary" ], + "type": "MIGRATION", + "replace": "bp_rifle_AP" + }, { "id": [ "50_incendiary", "50_mk211", "50bmg", "50match" ], "type": "MIGRATION", @@ -333,36 +343,58 @@ "replace": "shot_pyro" }, { - "id": [ - "bp_shot_scrap", - "shot_scrap", - "bp_shot_00", - "reloaded_shot_00", - "reloaded_410shot_000", - "20x66_bootleg_shot", - "20x66_bootleg_flechette" - ], + "id": [ "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette", "shot_scrap" ], "type": "MIGRATION", "replace": "reloaded_shot_buck" }, { - "id": [ "bp_shot_bird", "reloaded_shot_bird" ], + "id": [ "reloaded_shot_00", "reloaded_410shot_000", "20x66_bootleg_shot", "20x66_bootleg_flechette" ], + "type": "MIGRATION", + "replace": "reloaded_shot_buck" + }, + { + "id": [ "reloaded_shot_bird" ], "type": "MIGRATION", "replace": "reloaded_shot_fowl" }, { - "id": [ "bp_shot_bird", "reloaded_shot_slug", "20x66_bootleg_slug" ], + "id": [ "reloaded_shot_slug", "20x66_bootleg_slug" ], "type": "MIGRATION", "replace": "reloaded_shot_foster" }, { - "id": [ "bp_shot_dragon", "reloaded_shot_dragon" ], + "id": [ "reloaded_shot_dragon" ], "type": "MIGRATION", "replace": "reloaded_shot_pyro" }, { - "id": [ "bp_shot_flechette", "reloaded_shot_flechette" ], + "id": [ "reloaded_shot_flechette" ], "type": "MIGRATION", "replace": "reloaded_shot_dart" + }, + { + "id": [ "bp_shot_00", "bp_shot_scrap" ], + "type": "MIGRATION", + "replace": "bp_shot_buck" + }, + { + "id": [ "bp_shot_bird" ], + "type": "MIGRATION", + "replace": "bp_shot_fowl" + }, + { + "id": [ "bp_shot_slug" ], + "type": "MIGRATION", + "replace": "bp_shot_foster" + }, + { + "id": [ "bp_shot_dragon" ], + "type": "MIGRATION", + "replace": "bp_shot_pyro" + }, + { + "id": [ "bp_shot_flechette" ], + "type": "MIGRATION", + "replace": "bp_shot_dart" } ] diff --git a/data/mods/Generic_Guns/ammo/pistol.json b/data/mods/Generic_Guns/ammo/pistol.json index 44f964f6e8fa0..a92fd715e4ca7 100644 --- a/data/mods/Generic_Guns/ammo/pistol.json +++ b/data/mods/Generic_Guns/ammo/pistol.json @@ -35,5 +35,25 @@ "name-plural": "pistol ammo, jhp (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_pistol_ball", + "copy-from": "pistol_ball", + "type": "AMMO", + "name": "pistol ammo, ball (black powder)", + "name-plural": "pistol ammo, ball (black powder)", + "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_pistol_jhp", + "copy-from": "pistol_jhp", + "type": "AMMO", + "name": "pistol ammo, jhp (black powder)", + "name-plural": "pistol ammo, jhp (black powder)", + "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/pistol_magnum.json b/data/mods/Generic_Guns/ammo/pistol_magnum.json index a6ecb2136c903..3a77df15d2402 100644 --- a/data/mods/Generic_Guns/ammo/pistol_magnum.json +++ b/data/mods/Generic_Guns/ammo/pistol_magnum.json @@ -3,27 +3,27 @@ "id": "pistol_magnum_ball", "type": "AMMO", "copy-from": "44fmj", - "name": "magnum pistol ammo, ball", - "name_plural": "magnum pistol ammo, ball", + "name": "magnum ammo, ball", + "name_plural": "magnum ammo, ball", "ammo_type": "ammo_pistol_magnum", "casing": "pistol_magnum_casing", - "description": "Magnum pistol ammuniton, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." + "description": "magnum ammuniton, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead." }, { "id": "pistol_magnum_jhp", "type": "AMMO", "copy-from": "pistol_magnum_ball", - "name": "magnum pistol ammo, jhp", - "name-plural": "magnum pistol ammo, jhp", - "description": "Magnum pistol ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", + "name": "magnum ammo, jhp", + "name-plural": "magnum ammo, jhp", + "description": "magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage. It is more powerful than common pistol ammo. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.", "relative": { "damage": 3, "pierce": -6 } }, { "id": "reloaded_pistol_magnum_ball", "type": "AMMO", "copy-from": "pistol_magnum_ball", - "name": "magnum pistol ammo, ball (reloaded)", - "name-plural": "magnum pistol ammo, ball (reloaded)", + "name": "magnum ammo, ball (reloaded)", + "name-plural": "magnum ammo, ball (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } }, @@ -31,9 +31,29 @@ "id": "reloaded_pistol_magnum_jhp", "type": "AMMO", "copy-from": "pistol_magnum_jhp", - "name": "magnum pistol ammo, jhp (reloaded)", - "name-plural": "magnum pistol ammo, jhp (reloaded)", + "name": "magnum ammo, jhp (reloaded)", + "name-plural": "magnum ammo, jhp (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_pistol_magnum_ball", + "copy-from": "pistol_magnum_ball", + "type": "AMMO", + "name": "magnum ammo, ball (black powder)", + "name-plural": "magnum ammo, ball (black powder)", + "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_pistol_magnum_jhp", + "copy-from": "pistol_magnum_jhp", + "type": "AMMO", + "name": "magnum ammo, jhp (black powder)", + "name-plural": "magnum ammo, jhp (black powder)", + "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/pistol_tiny.json b/data/mods/Generic_Guns/ammo/pistol_tiny.json index 6ee5f377c8b6a..d21926d9db736 100644 --- a/data/mods/Generic_Guns/ammo/pistol_tiny.json +++ b/data/mods/Generic_Guns/ammo/pistol_tiny.json @@ -36,5 +36,25 @@ "name-plural": "tiny pistol ammo, jhp (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_tiny_pistol_ball", + "type": "AMMO", + "copy-from": "tiny_pistol_ball", + "name": "tiny pistol ammo, ball (black powder)", + "name-plural": "tiny pistol ammo, ball (black powder)", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_tiny_pistol_jhp", + "type": "AMMO", + "copy-from": "tiny_pistol_jhp", + "name": "tiny pistol ammo, jhp (black powder)", + "name-plural": "tiny pistol ammo, jhp (black powder)", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/rifle.json b/data/mods/Generic_Guns/ammo/rifle.json index 4dcdc0144cda7..6f9830c87b5a1 100644 --- a/data/mods/Generic_Guns/ammo/rifle.json +++ b/data/mods/Generic_Guns/ammo/rifle.json @@ -35,5 +35,25 @@ "name-plural": "rifle ammo, AP (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_rifle_ball", + "copy-from": "rifle_ball", + "type": "AMMO", + "name": "rifle ammo, ball (black powder)", + "name-plural": "rifle ammo, ball (black powder)", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_rifle_AP", + "copy-from": "rifle_AP", + "type": "AMMO", + "name": "rifle ammo, AP (black powder)", + "name-plural": "rifle ammo, A (black powder)P", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/rifle_huge.json b/data/mods/Generic_Guns/ammo/rifle_huge.json index 3ea8147042ed5..b84f5b3ebd9f2 100644 --- a/data/mods/Generic_Guns/ammo/rifle_huge.json +++ b/data/mods/Generic_Guns/ammo/rifle_huge.json @@ -35,5 +35,25 @@ "name-plural": "huge rifle ammo, AP (reloaded)", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_rifle_huge_ball", + "copy-from": "rifle_huge_ball", + "type": "AMMO", + "name": "rifle ammo, ball (black powder)", + "name-plural": "rifle ammo, ball (black powder)", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_rifle_huge_AP", + "copy-from": "rifle_huge_AP", + "type": "AMMO", + "name": "rifle ammo, AP (black powder)", + "name-plural": "rifle ammo, AP (black powder)", + "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json index aa82fb44c8f19..01b5a95270f2d 100644 --- a/data/mods/Generic_Guns/ammo/shot.json +++ b/data/mods/Generic_Guns/ammo/shot.json @@ -9,77 +9,166 @@ }, { "id": "shot_bean", - "copy-from": "shot_beanbag", + "copy-from": "shot_buck", "type": "AMMO", "name": "shotshell, beanbag", "name-plural": "shotshell, beanbag", - "ammo_type": "ammo_shot" + "description": "A beanbag round for shotguns, not deadly but designed to disable.", + "proportional": { "price": 0.5, "price_postapoc": 0.5, "count": 0.5, "damage": 0.1, "recoil": 0.4, "loudness": 0.6 }, + "extend": { "effects": [ "BEANBAG", "NOGIB" ] } }, { "id": "shot_fowl", - "copy-from": "shot_bird", + "copy-from": "shot_buck", "type": "AMMO", "name": "shotshell, birdshot", "name-plural": "shotshell, birdshot", - "ammo_type": "ammo_shot" + "description": "A shotshell filled with numerous small pellets. Designed for hunting birds and other small game, its applications in combat are very limited.", + "price_postapoc": 2400, + "proportional": { "price": 0.2, "damage": 0.3, "recoil": 0.6, "loudness": 0.8 }, + "extend": { "effects": [ "NOGIB" ] } }, { "id": "shot_foster", - "copy-from": "shot_slug", + "copy-from": "shot_buck", "type": "AMMO", "name": "shotshell, slug", "name-plural": "shotshell, slug", - "ammo_type": "ammo_shot" + "description": "A shotshell with a single projectile, shaped somewhat like a shuttlecock. Slugs are used with shotguns to give them extra range, allowing them to stand in for a rifle. Extremely damaging but rather inaccurate.", + "dispersion": 100, + "relative": { "range": 12, "pierce": 6 }, + "proportional": { "price": 1.4, "price_postapoc": 1.4, "recoil": 1.4 }, + "delete": { "effects": [ "SHOT" ] } }, { "id": "shot_pyro", - "copy-from": "shot_dragon", + "copy-from": "shot_buck", "type": "AMMO", "name": "shotshell, pyrotechnical", "name-plural": "shotshell, pyrotechnical", - "ammo_type": "ammo_shot" + "description": "A novelty shotgun shell filled with a simple pyrotechnical charge. The payload is light and won't wound very well, but the flash and sparks will certainly be impressive, in addition to being an extreme fire hazard.", + "proportional": { "price": 2, "price_postapoc": 2, "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 }, + "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } + }, + { + "id": "reloaded_shot_junk", + "copy-from": "shot_buck", + "type": "AMMO", + "name": "shotshell, junk", + "name-plural": "shotshell, junk", + "description": "A shotgun shell filled with whatever was lying around. They are more damaging than birdshot, but fairly inaccurate.", + "proportional": { "price": 0.4, "damage": 0.6, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } }, { "id": "reloaded_shot_buck", - "copy-from": "reloaded_shot_00", + "copy-from": "shot_buck", "name": "shotshell, buckshot (reloaded)", "name-plural": "shotshell, buckshot (reloaded)", "type": "AMMO", - "ammo_type": "ammo_shot" + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } }, { "id": "reloaded_shot_fowl", - "copy-from": "reloaded_shot_bird", + "copy-from": "shot_fowl", "name": "shotshell, birdshot (reloaded)", "name-plural": "shotshell, birdshot (reloaded)", "type": "AMMO", - "ammo_type": "ammo_shot" + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } }, { "id": "reloaded_shot_foster", - "copy-from": "reloaded_shot_slug", + "copy-from": "shot_foster", "name": "shotshell, slug (reloaded)", "name-plural": "shotshell, slug (reloaded)", "type": "AMMO", - "ammo_type": "ammo_shot" + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } }, { "id": "reloaded_shot_pyro", - "copy-from": "reloaded_shot_dragon", + "copy-from": "shot_pyro", "name": "shotshell, pyrotechnical (reloaded)", "name-plural": "shotshell, pyrotechnical (reloaded)", "type": "AMMO", - "description": "A novelty shotgun shell filled with a simple pyrotechnical charge. The payload is light and won't wound very well, but the flash and sparks will certainly be impressive, in adddition to being an extreme fire hazard.", - "ammo_type": "ammo_shot" + "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } }, { "id": "reloaded_shot_dart", - "copy-from": "reloaded_shot_flechette", + "copy-from": "shot_buck", "name": "shotshell, flechette (reloaded)", "name-plural": "shotshell, flechette (reloaded)", "//": "intentionally reload only", "type": "AMMO", "description": "A shotgun shell filled with tiny steel darts, definitely not a factory loading. Flechettes won't pattern as well as normal shot, and they'll likely do less damage. However, they may fare better against armor than other shotgun loads.", - "ammo_type": "ammo_shot" + "relative": { "pierce": 12 }, + "proportional": { "price": 2, "price_postapoc": 2, "count": 0.5, "damage": 0.8 }, + "extend": { "effects": [ "RECYCLED" ] } + }, + { + "id": "bp_shot_buck", + "copy-from": "shot_buck", + "name": "shotshell, buckshot (black powder)", + "name-plural": "shotshell, buckshot (black powder)", + "type": "AMMO", + "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_shot_fowl", + "copy-from": "shot_fowl", + "name": "shotshell, birdshot (black powder)", + "name-plural": "shotshell, birdshot (black powder)", + "type": "AMMO", + "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_shot_foster", + "copy-from": "shot_foster", + "name": "shotshell, slug (black powder)", + "name-plural": "shotshell, slug (black powder)", + "type": "AMMO", + "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_shot_pyro", + "copy-from": "shot_pyro", + "name": "shotshell, pyrotechnical (black powder)", + "name-plural": "shotshell, pyrotechnical (black powder)", + "type": "AMMO", + "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "bp_shot_dart", + "copy-from": "reloaded_shot_dart", + "name": "shotshell, flechette (black powder)", + "name-plural": "shotshell, flechette (black powder)", + "type": "AMMO", + "proportional": { "price": 0.86, "damage": 0.88, "dispersion": 1.09 }, + "extend": { "effects": [ "MUZZLE_SMOKE", "BLACKPOWDER" ] } + }, + { + "id": "bp_shot_junk", + "copy-from": "reloaded_shot_junk", + "type": "AMMO", + "name": "shotshell, junk (black powder)", + "name-plural": "shotshell, junk (black powder)", + "proportional": { "price": 0.6, "damage": 0.8 }, + "extend": { "effects": [ "MUZZLE_SMOKE" ] } } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 6c44492bfb1bb..7237c7bed4726 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -72,7 +72,18 @@ "replace": "pistol_magnum_pipe" }, { - "id": [ "rm228", "l_bak_223", "ruger_redhawk", "sw629", "bfr", "l_enforcer_45", "sw_500", "raging_bull", "raging_judge" ], + "id": [ + "rm228", + "l_bak_223", + "sw_619", + "ruger_redhawk", + "sw629", + "bfr", + "l_enforcer_45", + "sw_500", + "raging_bull", + "raging_judge" + ], "type": "MIGRATION", "replace": "pistol_magnum_revolver" }, @@ -143,17 +154,7 @@ "replace": "pistol_pipe_smg" }, { - "id": [ - "cop_38", - "model_10_revolver", - "ruger_lcr_38", - "sw_610", - "sw_619", - "bond_410", - "colt_saa", - "l_lookout_9mm", - "rm99_pistol" - ], + "id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "l_lookout_9mm", "rm99_pistol" ], "type": "MIGRATION", "replace": "pistol_revolver" }, @@ -287,7 +288,7 @@ "replace": "rocket_recoilless" }, { - "id": [ "shotgun_d", "shotgun_s", "winchester_1887", "pipe_shotgun","winchester_1897"], + "id": [ "shotgun_d", "shotgun_s", "winchester_1887", "pipe_shotgun", "winchester_1897" ], "type": "MIGRATION", "replace": "shot_double" }, @@ -297,16 +298,7 @@ "replace": "shot_pipe_double" }, { - "id": [ - "saiga_410", - "rm120c", - "rm20", - "bigun", - "saiga_12", - "tavor_12", - "bigun", - "USAS_12" - ], + "id": [ "saiga_410", "rm120c", "rm20", "bigun", "saiga_12", "tavor_12", "bigun", "USAS_12" ], "type": "MIGRATION", "replace": "shot_tactical" }, diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json index c3f375dffb39f..ed8383871c84b 100644 --- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json +++ b/data/mods/Generic_Guns/recipes/recipe_obsolete.json @@ -1006,12 +1006,12 @@ }, { "type": "recipe", - "result": "bp_shot_bird", + "result": "bp_shot_dragon", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_dragon", + "result": "bp_shot_slug", "obsolete": true }, { @@ -1049,31 +1049,6 @@ "result": "reloaded_shot_slug", "obsolete": true }, - { - "type": "recipe", - "result": "bp_shot_00", - "obsolete": true - }, - { - "type": "recipe", - "result": "bp_shot_bird", - "obsolete": true - }, - { - "type": "recipe", - "result": "bp_shot_dragon", - "obsolete": true - }, - { - "type": "recipe", - "result": "bp_shot_flechette", - "obsolete": true - }, - { - "type": "recipe", - "result": "bp_shot_slug", - "obsolete": true - }, { "type": "recipe", "result": "bp_shot_00_with dowel", @@ -1096,12 +1071,12 @@ }, { "type": "recipe", - "result": "bp_shot_scrap_with dowel", + "result": "bp_shot_flechette_with dowel", "obsolete": true }, { "type": "recipe", - "result": "shot_scrap", + "result": "bp_shot_scrap_with dowel", "obsolete": true }, { @@ -1109,6 +1084,11 @@ "result": "bp_shot_scrap", "obsolete": true }, + { + "type": "recipe", + "result": "shot_scrap", + "obsolete": true + }, { "type": "recipe", "result": "460_casing", diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms.json b/data/mods/Generic_Guns/recipes/recipes_firearms.json deleted file mode 100644 index d0d8b1b79afc3..0000000000000 --- a/data/mods/Generic_Guns/recipes/recipes_firearms.json +++ /dev/null @@ -1,139 +0,0 @@ -[ - { - "result": "pistol_tiny_zip", - "type": "recipe", - "copy-from": "2_shot_special", - "difficulty": 2, - "tools": [ - [ - [ "tiny_pistol_ball", -1 ], - [ "tiny_pistol_jhp", -1 ], - [ "reloaded_tiny_pistol_ball", -1 ], - [ "reloaded_tiny_pistol_jhp", -1 ], - [ "pistol_tiny_casing", -1 ] - ] - ] - }, - { - "result": "pistol_pipe_smg", - "type": "recipe", - "copy-from": "surv_carbine_223", - "difficulty": 5, - "tools": [ - [ - [ "pistol_ball", -1 ], - [ "pistol_jhp", -1 ], - [ "reloaded_pistol_ball", -1 ], - [ "reloaded_pistol_jhp", -1 ], - [ "pistol_casing", -1 ] - ] - ], - "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "scrap", 3 ] ] ] - }, - { - "result": "pistol_magnum_pipe", - "type": "recipe", - "copy-from": "rifle_9mm", - "difficulty": 3, - "tools": [ - [ - [ "pistol_ball", -1 ], - [ "pistol_jhp", -1 ], - [ "reloaded_pistol_ball", -1 ], - [ "reloaded_pistol_jhp", -1 ], - [ "pistol_magnum_ball", -1 ], - [ "pistol_magnum_jhp", -1 ], - [ "reloaded_pistol_magnum_ball", -1 ], - [ "reloaded_pistol_magnum_jhp", -1 ], - [ "pistol_casing", -1 ], - [ "pistol_magnum_casing", -1 ] - ] - ], - "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "steel_chunk", 1 ] ], [ [ "2x4", 1 ] ] ] - }, - { - "result": "pistol_magnum_pipe_levergun", - "type": "recipe", - "copy-from": "surv_carbine_223", - "tools": [ - [ - [ "pistol_ball", -1 ], - [ "pistol_jhp", -1 ], - [ "reloaded_pistol_ball", -1 ], - [ "reloaded_pistol_jhp", -1 ], - [ "pistol_magnum_ball", -1 ], - [ "pistol_magnum_jhp", -1 ], - [ "reloaded_pistol_magnum_ball", -1 ], - [ "reloaded_pistol_magnum_jhp", -1 ], - [ "pistol_casing", -1 ], - [ "pistol_magnum_casing", -1 ] - ] - ] - }, - { - "result": "rifle_pipe_rifle", - "type": "recipe", - "copy-from": "rifle_3006", - "tools": [ - [ - [ "rifle_ball", -1 ], - [ "rifle_AP", -1 ], - [ "reloaded_rifle_ball", -1 ], - [ "reloaded_rifle_AP", -1 ], - [ "rifle_casing", -1 ] - ] - ] - }, - { - "result": "rifle_pipe_carbine", - "type": "recipe", - "copy-from": "surv_carbine_223", - "tools": [ - [ - [ "rifle_ball", -1 ], - [ "rifle_AP", -1 ], - [ "reloaded_rifle_ball", -1 ], - [ "reloaded_rifle_AP", -1 ], - [ "rifle_casing", -1 ] - ] - ] - }, - { - "result": "shot_pipe_double", - "type": "recipe", - "copy-from": "pipe_double_shotgun", - "tools": [ - [ - [ "shot_buck", -1 ], - [ "shot_bean", -1 ], - [ "shot_fowl", -1 ], - [ "shot_foster", -1 ], - [ "shot_pyro", -1 ], - [ "reloaded_shot_buck", -1 ], - [ "reloaded_shot_fowl", -1 ], - [ "reloaded_shot_foster", -1 ], - [ "reloaded_shot_pyro", -1 ], - [ "reloaded_shot_dart", -1 ], - [ "shot_casing", -1 ] - ] - ] - }, - { - "result": "black_powder_pistol", - "type": "recipe", - "difficulty": 3, - "copy-from": "pistol_flintlock" - }, - { - "result": "black_powder_revolver", - "type": "recipe", - "difficulty": 6, - "copy-from": "surv_hand_cannon" - }, - { - "result": "black_powder_rifle", - "type": "recipe", - "difficulty": 3, - "copy-from": "rifle_flintlock" - } -] diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json b/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json new file mode 100644 index 0000000000000..cf40b9febfde4 --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_firearms_repeater.json @@ -0,0 +1,100 @@ +[ + { + "result": "pistol_pipe_smg", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 3 ], + "difficulty": 5, + "time": "2 h", + "autolearn": true, + "using": [ [ "welding_standard", 10 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "bp_pistol_ball", -1 ], + [ "bp_pistol_jhp", -1 ], + [ "pistol_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "result": "pistol_magnum_pipe_levergun", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 3 ], + "difficulty": 6, + "time": "2 h", + "autolearn": true, + "using": [ [ "welding_standard", 10 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "bp_pistol_ball", -1 ], + [ "bp_pistol_jhp", -1 ], + [ "pistol_magnum_ball", -1 ], + [ "pistol_magnum_jhp", -1 ], + [ "reloaded_pistol_magnum_ball", -1 ], + [ "reloaded_pistol_magnum_jhp", -1 ], + [ "bp_pistol_magnum_ball", -1 ], + [ "bp_pistol_magnum_jhp", -1 ], + [ "pistol_casing", -1 ], + [ "pistol_magnum_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "result": "rifle_pipe_carbine", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 3 ], + "difficulty": 7, + "time": "3 h", + "autolearn": true, + "using": [ [ "welding_standard", 15 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "tools": [ + [ + [ "rifle_ball", -1 ], + [ "rifle_AP", -1 ], + [ "reloaded_rifle_ball", -1 ], + [ "reloaded_rifle_AP", -1 ], + [ "bp_rifle_ball", -1 ], + [ "bp_rifle_AP", -1 ], + [ "rifle_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "type": "recipe", + "result": "black_powder_revolver", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "difficulty": 7, + "skill_used": "fabrication", + "skills_required": [ "gun", 3 ], + "time": "3 h", + "autolearn": true, + "book_learn": [ [ "manual_pistol", 6 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "GLARE", "level": 2 } ], + "using": [ [ "blacksmithing_standard", 4 ] ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 2 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ], [ [ "sharp_rock", 1 ] ] ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_firearms_single.json b/data/mods/Generic_Guns/recipes/recipes_firearms_single.json new file mode 100644 index 0000000000000..1d63b40db30fb --- /dev/null +++ b/data/mods/Generic_Guns/recipes/recipes_firearms_single.json @@ -0,0 +1,151 @@ +[ + { + "result": "pistol_tiny_zip", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "type": "recipe", + "skill_used": "mechanics", + "difficulty": 2, + "time": "12 m", + "reversible": true, + "autolearn": true, + "tools": [ + [ + [ "tiny_pistol_ball", -1 ], + [ "tiny_pistol_jhp", -1 ], + [ "bp_tiny_pistol_ball", -1 ], + [ "bp_tiny_pistol_jhp", -1 ], + [ "reloaded_tiny_pistol_ball", -1 ], + [ "reloaded_tiny_pistol_jhp", -1 ], + [ "pistol_tiny_casing", -1 ] + ] + ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 1 ] ], [ [ "duct_tape", 50 ] ] ] + }, + { + "result": "pistol_magnum_pipe", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 1 ], + "difficulty": 3, + "time": "14 m", + "reversible": true, + "autolearn": true, + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "tools": [ + [ + [ "pistol_ball", -1 ], + [ "pistol_jhp", -1 ], + [ "reloaded_pistol_ball", -1 ], + [ "reloaded_pistol_jhp", -1 ], + [ "bp_pistol_ball", -1 ], + [ "bp_pistol_jhp", -1 ], + [ "pistol_magnum_ball", -1 ], + [ "pistol_magnum_jhp", -1 ], + [ "reloaded_pistol_magnum_ball", -1 ], + [ "reloaded_pistol_magnum_jhp", -1 ], + [ "bp_pistol_magnum_ball", -1 ], + [ "bp_pistol_magnum_jhp", -1 ], + [ "pistol_casing", -1 ], + [ "pistol_magnum_casing", -1 ] + ] + ], + "components": [ [ [ "pipe", 1 ] ], [ [ "scrap", 2 ] ], [ [ "steel_chunk", 1 ] ], [ [ "2x4", 1 ] ] ] + }, + { + "result": "rifle_pipe_rifle", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 3 ], + "difficulty": 4, + "time": "30 m", + "reversible": true, + "autolearn": true, + "tools": [ + [ + [ "rifle_ball", -1 ], + [ "rifle_AP", -1 ], + [ "bp_rifle_ball", -1 ], + [ "bp_rifle_AP", -1 ], + [ "reloaded_rifle_ball", -1 ], + [ "reloaded_rifle_AP", -1 ], + [ "rifle_casing", -1 ] + ] + ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH", "level": 1 } ], + "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 3 ] ], [ [ "2x4", 1 ] ], [ [ "scrap", 3 ] ] ] + }, + { + "result": "shot_pipe_double", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 1 ], + "difficulty": 3, + "time": "18 m", + "reversible": true, + "autolearn": true, + "tools": [ + [ + [ "shot_buck", -1 ], + [ "shot_bean", -1 ], + [ "shot_fowl", -1 ], + [ "shot_foster", -1 ], + [ "shot_pyro", -1 ], + [ "bp_shot_junk", -1 ], + [ "bp_shot_buck", -1 ], + [ "bp_shot_fowl", -1 ], + [ "bp_shot_foster", -1 ], + [ "bp_shot_pyro", -1 ], + [ "bp_shot_dart", -1 ], + [ "reloaded_shot_junk", -1 ], + [ "reloaded_shot_buck", -1 ], + [ "reloaded_shot_fowl", -1 ], + [ "reloaded_shot_foster", -1 ], + [ "reloaded_shot_pyro", -1 ], + [ "reloaded_shot_dart", -1 ], + [ "shot_casing", -1 ] + ] + ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "2x4", 1 ] ] ] + }, + { + "result": "black_powder_pistol", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "difficulty": 4, + "skill_used": "fabrication", + "skills_required": [ "pistol", 4 ], + "time": "80 m", + "autolearn": true, + "book_learn": [ [ "manual_pistol", 5 ], [ "mag_pistol", 6 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "using": [ [ "blacksmithing_standard", 1 ], [ "steel_standard", 3 ] ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ [ [ "2x4", 1 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ] + }, + { + "result": "black_powder_rifle", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "difficulty": 5, + "skill_used": "fabrication", + "skills_required": [ "rifle", 3 ], + "time": "100 m", + "autolearn": true, + "book_learn": [ [ "manual_rifle", 5 ], [ "mag_rifle", 6 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "using": [ [ "blacksmithing_standard", 2 ], [ "steel_standard", 1 ] ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], + "components": [ [ [ "2x4", 1 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ] + } +] diff --git a/data/mods/Generic_Guns/recipes/recipes_pistol.json b/data/mods/Generic_Guns/recipes/recipes_pistol.json index f8d13afcdcf95..dcd5db3b12aac 100644 --- a/data/mods/Generic_Guns/recipes/recipes_pistol.json +++ b/data/mods/Generic_Guns/recipes/recipes_pistol.json @@ -15,6 +15,12 @@ "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] ] }, + { + "result": "bp_tiny_pistol_jhp", + "type": "recipe", + "copy-from": "reloaded_tiny_pistol_jhp", + "components": [ [ [ "chem_black_powder", 2 ] ] ] + }, { "result": "reloaded_tiny_pistol_ball", "type": "recipe", @@ -22,6 +28,12 @@ "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] }, + { + "result": "bp_tiny_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_tiny_pistol_ball", + "components": [ [ [ "chem_black_powder", 2 ] ], [ [ "copper", 1 ] ] ] + }, { "result": "reloaded_pistol_jhp", "type": "recipe", @@ -38,6 +50,12 @@ "using": [ [ "req_pistol", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] ] }, + { + "result": "bp_pistol_jhp", + "type": "recipe", + "copy-from": "reloaded_pistol_jhp", + "components": [ [ [ "chem_black_powder", 4 ] ] ] + }, { "result": "reloaded_pistol_ball", "type": "recipe", @@ -48,6 +66,15 @@ [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] ] }, + { + "result": "bp_pistol_ball", + "type": "recipe", + "copy-from": "reloaded_pistol_ball", + "components": [ + [ [ "chem_black_powder", 4 ] ], + [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] + ] + }, { "result": "reloaded_pistol_magnum_jhp", "type": "recipe", @@ -64,6 +91,12 @@ "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] ] }, + { + "result": "bp_pistol_magnum_jhp", + "type": "recipe", + "copy-from": "reloaded_pistol_magnum_jhp", + "components": [ [ [ "chem_black_powder", 6 ] ] ] + }, { "result": "reloaded_pistol_magnum_ball", "type": "recipe", @@ -73,5 +106,14 @@ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] ] + }, + { + "result": "bp_pistol_magnum_ball", + "type": "recipe", + "copy-from": "reloaded_pistol_magnum_ball", + "components": [ + [ [ "chem_black_powder", 6 ] ], + [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] + ] } ] diff --git a/data/mods/Generic_Guns/recipes/recipes_rifle.json b/data/mods/Generic_Guns/recipes/recipes_rifle.json index 36dd51bdcde46..93684905da2be 100644 --- a/data/mods/Generic_Guns/recipes/recipes_rifle.json +++ b/data/mods/Generic_Guns/recipes/recipes_rifle.json @@ -14,19 +14,31 @@ "reversible": true, "using": [ [ "req_rifle", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], "components": [ - [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] + [ [ "gunpowder", 12 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] ] }, + { + "result": "bp_rifle_ball", + "type": "recipe", + "copy-from": "reloaded_rifle_ball", + "components": [ [ [ "chem_black_powder", 12 ] ] ] + }, { "result": "reloaded_rifle_AP", "type": "recipe", "copy-from": "reloaded_rifle_ball", "using": [ [ "req_rifle", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], "components": [ - [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], + [ [ "gunpowder", 12 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], [ [ "copper", 3 ] ] ] }, + { + "result": "bp_rifle_AP", + "type": "recipe", + "copy-from": "reloaded_rifle_AP", + "components": [ [ [ "chem_black_powder", 12 ] ], [ [ "copper", 3 ] ] ] + }, { "result": "reloaded_rifle_huge_ball", "type": "recipe", @@ -43,11 +55,24 @@ "using": [ [ "req_rifle_huge", 1 ], [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ] ] }, + { + "result": "bp_rifle_huge_ball", + "type": "recipe", + "copy-from": "reloaded_rifle_huge_ball", + "components": [ [ [ "chem_black_powder", 30 ] ] ] + }, { "result": "reloaded_rifle_huge_AP", "type": "recipe", "copy-from": "reloaded_rifle_huge_ball", "using": [ [ "req_rifle_huge", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ], [ "rifle_casing", 1 ] ] ] + }, + { + "result": "bp_rifle_huge_AP", + "type": "recipe", + "copy-from": "reloaded_rifle_huge_ball", + "using": [ [ "req_rifle_huge", 1 ], [ "req_penetrator", 1 ], [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ], [ "rifle_casing", 1 ] ] ] } ] diff --git a/data/mods/Generic_Guns/recipes/recipes_shot.json b/data/mods/Generic_Guns/recipes/recipes_shot.json index e82e0b3e53f75..d622d2323f718 100644 --- a/data/mods/Generic_Guns/recipes/recipes_shot.json +++ b/data/mods/Generic_Guns/recipes/recipes_shot.json @@ -1,4 +1,55 @@ [ + { + "result": "reloaded_shot_buck", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "tools": [ [ [ "press", -1 ] ] ], + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] + }, + { + "result": "bp_shot_buck", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "tools": [ [ [ "press", -1 ] ] ], + "components": [ [ [ "chem_black_powder", 6 ] ] ] + }, + { + "result": "bp_shot_buck", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ] + }, { "result": "reloaded_shot_fowl", "type": "recipe", @@ -9,45 +60,275 @@ "skills_required": [ "gun", 1 ], "time": "2 m", "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], "charges": 1, "reversible": true, - "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], "tools": [ [ [ "press", -1 ] ] ], + "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, + { + "result": "bp_shot_fowl", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "components": [ [ [ "chem_black_powder", 3 ] ] ] + }, + { + "result": "bp_shot_fowl", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ], + "components": [ [ [ "chem_black_powder", 3 ] ] ] + }, { "result": "reloaded_shot_pyro", "type": "recipe", - "copy-from": "reloaded_shot_fowl", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "req_shot", 1 ] ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ] }, { - "result": "reloaded_shot_buck", + "result": "bp_shot_pyro", "type": "recipe", - "copy-from": "reloaded_shot_fowl", - "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "magnesium", 5 ] ] ] + }, + { + "result": "bp_shot_pyro", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ] }, { "result": "reloaded_shot_foster", "type": "recipe", - "copy-from": "reloaded_shot_buck", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], "difficulty": 3, "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "req_shot", 1 ] ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] }, + { + "result": "bp_shot_foster", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], + "difficulty": 3, + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "req_shot", 1 ] ], + "components": [ [ [ "chem_black_powder", 6 ] ] ] + }, + { + "result": "bp_shot_foster", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ] + }, { "result": "reloaded_shot_dart", "type": "recipe", - "copy-from": "reloaded_shot_buck", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], "using": [ [ "req_shot", 1 ] ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ] + }, + { + "result": "bp_shot_dart", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], + "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ [ [ "chem_black_powder", 6 ] ], [ [ "combatnail", 10 ] ] ] + }, + { + "result": "bp_shot_dart", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ] + }, + { + "result": "reloaded_shot_junk", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ + [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], + [ + [ "scrap", 1 ], + [ "nail", 5 ], + [ "bb", 10 ], + [ "solder_wire", 5 ], + [ "platinum_small", 2 ], + [ "gold_small", 2 ], + [ "bearing", 2 ], + [ "lead", 3 ], + [ "silver_small", 3 ], + [ "bismuth", 3 ], + [ "shrapnel", 2 ] + ] + ] + }, + { + "result": "bp_shot_junk", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ] ], + "using": [ [ "req_shot", 1 ] ], + "components": [ + [ [ "chem_black_powder", 6 ] ], + [ + [ "scrap", 1 ], + [ "nail", 5 ], + [ "bb", 10 ], + [ "solder_wire", 5 ], + [ "platinum_small", 2 ], + [ "gold_small", 2 ], + [ "bearing", 2 ], + [ "lead", 3 ], + [ "silver_small", 3 ], + [ "bismuth", 3 ], + [ "shrapnel", 2 ] + ] + ] + }, + { + "result": "bp_shot_junk", + "id_suffix": "with_dowel", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "tools": [ [ [ "press_dowel", -1 ] ] ] } ] diff --git a/data/mods/Generic_Guns/recipes/requirements.json b/data/mods/Generic_Guns/recipes/requirements.json index 77d950e0d7e58..d3ccfeb8b2176 100644 --- a/data/mods/Generic_Guns/recipes/requirements.json +++ b/data/mods/Generic_Guns/recipes/requirements.json @@ -56,5 +56,25 @@ [ "combatnail", 1 ] ] ] + }, + { + "id": "req_junk", + "type": "requirement", + "//": "Components required for junk ammunition", + "components": [ + [ + [ "scrap", 1 ], + [ "nail", 5 ], + [ "bb", 10 ], + [ "solder_wire", 5 ], + [ "platinum_small", 2 ], + [ "gold_small", 2 ], + [ "bearing", 2 ], + [ "lead", 3 ], + [ "silver_small", 3 ], + [ "bismuth", 3 ], + [ "shrapnel", 2 ] + ] + ] } ] diff --git a/data/mods/Generic_Guns/robots/broken_bots.json b/data/mods/Generic_Guns/robots/broken_bots.json index ac39d9240755a..7bedf8db00ba8 100644 --- a/data/mods/Generic_Guns/robots/broken_bots.json +++ b/data/mods/Generic_Guns/robots/broken_bots.json @@ -1,5 +1,4 @@ [ - { "type": "GENERIC", "id": "broken_turret_rifle", diff --git a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json new file mode 100644 index 0000000000000..5a0f3fbe023fc --- /dev/null +++ b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json @@ -0,0 +1,29 @@ +[ + { + "id": "308", + "type": "AMMO", + "name": "rifle ammo, ball", + "name-plural": "rifle ammo, ball", + "copy-from": "rifle_ball" + }, + { + "id": "762_51", + "type": "AMMO", + "name": "rifle ammo, ball", + "name-plural": "rifle ammo, ball", + "copy-from": "rifle_ball" + }, + { + "id": "556", + "type": "AMMO", + "name": "rifle ammo, ball", + "name-plural": "rifle ammo, ball", + "copy-from": "rifle_ball" + }, + { + "id": "40x53mm_m430a1", + "type": "AMMO", + "name": "HEDP grenade cartridge", + "copy-from": "grenade_ammo_hedp" + } +] diff --git a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json new file mode 100644 index 0000000000000..53de7658cedbe --- /dev/null +++ b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json @@ -0,0 +1,219 @@ +[ + { + "id": "belt308", + "copy-from": "belt308", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "7.62x51mm ammo belt" + }, + { + "id": "falbigmag", + "copy-from": "falbigmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN FAL extended magazine" + }, + { + "id": "falmag", + "copy-from": "falmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN FAL magazine" + }, + { + "id": "fal_makeshiftmag", + "copy-from": "fal_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN FAL makeshift magazine" + }, + { + "id": "g3bigmag", + "copy-from": "g3bigmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "H&K G3 drum magazine" + }, + { + "id": "g3mag", + "copy-from": "g3mag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "H&K G3 magazine" + }, + { + "id": "g3_makeshiftmag", + "copy-from": "g3_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "H&K G3 makeshift magazine" + }, + { + "id": "m14mag", + "copy-from": "m14mag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "M14 magazine" + }, + { + "id": "m14smallmag", + "copy-from": "m14smallmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "M14 compact magazine" + }, + { + "id": "m14_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "copy-from": "m14_makeshiftmag", + "name": "M14 makeshift magazine" + }, + { + "id": "scarhbigmag", + "copy-from": "scarhbigmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN SCAR-H drum magazine" + }, + { + "id": "scarhmag_30rd", + "copy-from": "scarhmag_30rd", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN SCAR-H 30-round magazine" + }, + { + "id": "scarhmag", + "copy-from": "scarhmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN SCAR-H magazine" + }, + { + "id": "scarh_makeshiftmag", + "copy-from": "scarh_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "FN SCAR-H makeshift magazine" + }, + { + "id": "hk417mag_20rd", + "copy-from": "hk417mag_20rd", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "HK417 magazine" + }, + { + "id": "hk417mag_10rd", + "copy-from": "hk417mag_10rd", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "HK417 compact magazine" + }, + { + "id": "hk417_makeshiftmag", + "copy-from": "hk417_makeshiftmag", + "type": "MAGAZINE", + "name": "HK417 makeshift magazine", + "ammo_type": [ "ammo_rifle", "308" ] + }, + { + "id": "ar10mag_20rd", + "copy-from": "ar10mag_20rd", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "AR-10 magazine" + }, + { + "id": "ar10_makeshiftmag", + "copy-from": "ar10_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "308" ], + "name": "AR-10 makeshift magazine" + }, + { + "id": "223_speedloader5", + "copy-from": "223_speedloader5", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "LW-5 speedloader" + }, + { + "id": "belt223", + "copy-from": "belt223", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "5.56x45mm ammo belt" + }, + { + "id": "lw223bigmag", + "copy-from": "lw223bigmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "LW-56 magazine" + }, + { + "id": "lw223mag", + "copy-from": "lw223mag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "LW-32 magazine" + }, + { + "id": "ruger5", + "copy-from": "ruger5", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "Ruger .223 5-round magazine" + }, + { + "id": "stanag10", + "copy-from": "stanag10", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "Ruger .223 10-round magazine" + }, + { + "id": "ruger30", + "copy-from": "ruger30", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "Ruger .223 high-capacity magazine" + }, + { + "id": "stanag30", + "copy-from": "stanag30", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "STANAG magazine" + }, + { + "id": "stanag50", + "copy-from": "stanag50", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "STANAG drum magazine" + }, + { + "id": "survivor223mag", + "copy-from": "survivor223mag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "STANAG makeshift magazine" + }, + { + "id": "ruger_makeshiftmag", + "copy-from": "ruger_makeshiftmag", + "type": "MAGAZINE", + "ammo_type": [ "ammo_rifle", "223", "300blk" ], + "name": "Ruger makeshift magazine" + }, + { + "id": "belt40mm", + "copy-from": "belt40mm", + "type": "MAGAZINE", + "name": "grenade belt", + "ammo_type": [ "40x53mm", "ammo_grenade" ] + } +] From ffdc52b357b3b69ad2c8c7a15d479da5dfd0ccf2 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 18:57:04 -0600 Subject: [PATCH 08/12] fix circular error caused by obsoletion --- data/json/recipes/ammo/shot.json | 46 +++++++++---------- .../recipes/recipes_grenade_propelled.json | 4 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json index e566985745419..9a3a619f60e6d 100644 --- a/data/json/recipes/ammo/shot.json +++ b/data/json/recipes/ammo/shot.json @@ -228,15 +228,22 @@ "components": [ [ [ "chem_black_powder", 6 ] ] ] }, { - "result": "bp_shot_scrap", - "id_suffix": "with dowel", + "result": "shot_scrap", "type": "recipe", - "copy-from": "bp_shot_scrap", - "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], - "time": 4000, - "tools": [ [ [ "press_dowel", -1 ] ] ], + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 50, 5 ], + "autolearn": true, + "charges": 2, + "reversible": true, + "using": [ [ "ammo_shot", 2 ] ], + "tools": [ [ [ "press", -1 ] ] ], "components": [ - [ [ "chem_black_powder", 6 ] ], + [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ], [ [ "scrap", 1 ], [ "nail", 10 ], @@ -247,13 +254,13 @@ [ "bearing", 5 ], [ "lead", 7 ], [ "silver_small", 7 ], - [ "lead", 7 ], + [ "bismuth", 7 ], [ "shrapnel", 4 ] ] ] }, { - "result": "shot_scrap", + "result": "bp_shot_scrap", "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_SHOT", @@ -268,7 +275,7 @@ "using": [ [ "ammo_shot", 2 ] ], "tools": [ [ [ "press", -1 ] ] ], "components": [ - [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ], + [ [ "chem_black_powder", 6 ] ], [ [ "scrap", 1 ], [ "nail", 10 ], @@ -279,26 +286,19 @@ [ "bearing", 5 ], [ "lead", 7 ], [ "silver_small", 7 ], - [ "bismuth", 7 ], + [ "lead", 7 ], [ "shrapnel", 4 ] ] ] }, { "result": "bp_shot_scrap", + "id_suffix": "with dowel", "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", - "skill_used": "fabrication", - "difficulty": 2, - "skills_required": [ "gun", 1 ], - "time": "2 m", - "batch_time_factors": [ 50, 5 ], - "autolearn": true, - "charges": 2, - "reversible": true, - "using": [ [ "ammo_shot", 2 ] ], - "tools": [ [ [ "press", -1 ] ] ], + "copy-from": "bp_shot_scrap", + "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], + "time": 4000, + "tools": [ [ [ "press_dowel", -1 ] ] ], "components": [ [ [ "chem_black_powder", 6 ] ], [ diff --git a/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json index df94ae45b6eee..b773f6564736d 100644 --- a/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json +++ b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json @@ -3,7 +3,7 @@ "result": "grenade_ammo_shot", "type": "recipe", "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", + "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "launcher", 2 ], @@ -25,7 +25,7 @@ "result": "grenade_ammo_slug", "type": "recipe", "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", + "subcategory": "CSC_AMMO_GRENADES", "skill_used": "fabrication", "difficulty": 4, "skills_required": [ "launcher", 2 ], From 9175d62e001791a5147b2ea80bd9457c08df30c8 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 19:05:01 -0600 Subject: [PATCH 09/12] Update recipes_pistol.json --- data/mods/Generic_Guns/recipes/recipes_pistol.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/data/mods/Generic_Guns/recipes/recipes_pistol.json b/data/mods/Generic_Guns/recipes/recipes_pistol.json index dcd5db3b12aac..b124e780eb78e 100644 --- a/data/mods/Generic_Guns/recipes/recipes_pistol.json +++ b/data/mods/Generic_Guns/recipes/recipes_pistol.json @@ -70,10 +70,7 @@ "result": "bp_pistol_ball", "type": "recipe", "copy-from": "reloaded_pistol_ball", - "components": [ - [ [ "chem_black_powder", 4 ] ], - [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] - ] + "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] ] }, { "result": "reloaded_pistol_magnum_jhp", @@ -111,9 +108,6 @@ "result": "bp_pistol_magnum_ball", "type": "recipe", "copy-from": "reloaded_pistol_magnum_ball", - "components": [ - [ [ "chem_black_powder", 6 ] ], - [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] - ] + "components": [ [ [ "chem_black_powder", 6 ] ], [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] ] } ] From d7f4199939f39b6763467251598beff171e30eab Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 19:07:51 -0600 Subject: [PATCH 10/12] Update modinfo.json --- data/mods/Generic_Guns/modinfo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/modinfo.json b/data/mods/Generic_Guns/modinfo.json index 062221135b306..884576d914397 100644 --- a/data/mods/Generic_Guns/modinfo.json +++ b/data/mods/Generic_Guns/modinfo.json @@ -1,4 +1,4 @@ - [ +[ { "type": "MOD_INFO", "ident": "generic_guns", From 34e0dd4cb7f354d4bf9b5d2490ae84739ca7cc44 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sat, 18 Jan 2020 19:19:52 -0600 Subject: [PATCH 11/12] Update pistol.json --- data/mods/Generic_Guns/firearms/pistol.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json index 52960fb265676..e0033aa6c0034 100644 --- a/data/mods/Generic_Guns/firearms/pistol.json +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -15,7 +15,7 @@ "name": "machine pistol", "ammo": "ammo_pistol", "description": "This pistol is a tiny machinegun you can stuff into a holster, with which you could dump its magazine at a blistering rate into any close range foes. Machine pistols mostly see use by vehicle crewmen or bodygaurds of VIPs. Due to its preposterous rate of fire it is difficult to control.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, { "id": "pistol_medium", @@ -24,7 +24,7 @@ "name": "defensive pistol", "ammo": "ammo_pistol", "description": "A modern pistol fit for duty, military service, or personal defense, with a detachable box magazine and a reliable action. Though its chambering is capable of meeting FBI penetration minimums, the lack of a shoulder stock limits its utility.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, { "id": "pistol_pcc", @@ -33,7 +33,7 @@ "name": "survivalist carbine", "ammo": "ammo_pistol", "description": "These small carbines share ammunition and magazines with common pistols, offering a more controllable carbine than a normal rifle, while also reducing ammunition costs. Because of their compatibility, they pair well with duty pistols, allowing one to transition to a more stable weapon without carrying extra ammo or magazines.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, { "id": "pistol_revolver", @@ -52,7 +52,7 @@ "name": "submachine gun", "ammo": "ammo_pistol", "description": "Chambered in common pistol ammunition, this compact long arm is perfect for trench raiders, vehicular crewmen, SWAT teams and special forces. Though not as accurate as a proper rifle, especially at longer ranges, it is very controllable in automatic fire. It feeds from detachable box magazines, which are easy to unload into close range targets.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] }, { "id": "pistol_pipe_smg", @@ -61,6 +61,6 @@ "name": "survivor subgun", "ammo": "ammo_pistol", "description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies... right? Accepts standard pistol ammunition.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] } ] From 1edcd8252f4e2aca5716aa70bb63ab4086210dc6 Mon Sep 17 00:00:00 2001 From: tenmillimaster <> Date: Sun, 19 Jan 2020 01:39:18 -0600 Subject: [PATCH 12/12] Update shot.json --- data/mods/Generic_Guns/ammo/shot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json index 01b5a95270f2d..9b4c4e8429cdb 100644 --- a/data/mods/Generic_Guns/ammo/shot.json +++ b/data/mods/Generic_Guns/ammo/shot.json @@ -36,7 +36,7 @@ "name-plural": "shotshell, slug", "description": "A shotshell with a single projectile, shaped somewhat like a shuttlecock. Slugs are used with shotguns to give them extra range, allowing them to stand in for a rifle. Extremely damaging but rather inaccurate.", "dispersion": 100, - "relative": { "range": 12, "pierce": 6 }, + "relative": { "range": 12, "pierce": 6 }, "proportional": { "price": 1.4, "price_postapoc": 1.4, "recoil": 1.4 }, "delete": { "effects": [ "SHOT" ] } },