From 85c8352f94d4d295ac7947bf2c9704109d0716ca Mon Sep 17 00:00:00 2001 From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:51:00 +0300 Subject: [PATCH 1/4] Add 40mm blackpowder loads --- data/json/items/ammo/40x46mm.json | 61 +++++++ data/json/items/ammo/40x53mm.json | 34 +++- data/json/items/gun/40x46mm.json | 6 + data/json/items/gun/40x53mm.json | 2 + data/json/items/gunmod/underbarrel.json | 15 +- data/json/recipes/ammo/40x46mm.json | 150 ++++++++++++++++++ data/json/recipes/ammo/40x53mm.json | 75 +++++++++ .../Generic_Guns/ammo/gg_ammo_migration.json | 17 +- 8 files changed, 349 insertions(+), 11 deletions(-) diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json index 013fa5c7e214c..706f8b8c8a33f 100644 --- a/data/json/items/ammo/40x46mm.json +++ b/data/json/items/ammo/40x46mm.json @@ -118,5 +118,66 @@ "name": { "str": "40x46mm-M199 flechette, reloaded" }, "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", "casing": "40x46mm_m199_casing" + }, + { + "id": "bp_40x46mm_buckshot_m118", + "copy-from": "bp_40x46mm_buckshot_m199", + "type": "AMMO", + "name": { "str": "40x46mm-M118 buckshot, black powder" }, + "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister.", + "casing": "40x46mm_m118_casing" + }, + { + "id": "bp_40x46mm_buckshot_m199", + "copy-from": "40x46mm_m576", + "type": "AMMO", + "name": { "str": "40x46mm-M199 buckshot, black powder" }, + "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", + "proportional": { + "price": 0.3, + "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, + "recoil": 0.76, + "dispersion": 1.2 + }, + "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_40x46mm_slug_m118", + "copy-from": "40x46mm_grenade", + "type": "AMMO", + "name": { "str": "40x46mm-M118 slug, black powder" }, + "description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", + "damage": { "damage_type": "bullet", "amount": 21, "armor_penetration": 1 }, + "weight": "120 g", + "proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 }, + "casing": "40x46mm_m118_casing", + "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_40x46mm_slug_m199", + "copy-from": "bp_40x46mm_slug_m118", + "type": "AMMO", + "name": { "str": "40x46mm-M199 slug, black powder" }, + "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister.", + "casing": "40x46mm_m199_casing" + }, + { + "id": "bp_40x46mm_flechette_m118", + "copy-from": "bp_40x46mm_buckshot_m118", + "type": "AMMO", + "name": { "str": "40x46mm-M118 flechette, black powder" }, + "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", + "damage": { "damage_type": "bullet", "amount": 19, "armor_penetration": 3 }, + "delete": { "effects": [ "NOGIB" ] } + }, + { + "id": "bp_40x46mm_flechette_m199", + "copy-from": "bp_40x46mm_flechette_m118", + "type": "AMMO", + "name": { "str": "40x46mm-M199 flechette, black powder" }, + "description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into a M199 canister.", + "casing": "40x46mm_m199_casing" } ] diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json index 7620c71087d6f..a30226312f96d 100644 --- a/data/json/items/ammo/40x53mm.json +++ b/data/json/items/ammo/40x53mm.json @@ -40,8 +40,7 @@ "type": "AMMO", "name": { "str": "40x53mm buckshot, reloaded" }, "description": "An improvised 40x53mm buckshot load somewhat resembling M576.", - "damage": { "damage_type": "bullet", "amount": 141 }, - "proportional": { "price": 0.7, "dispersion": 1.1 } + "damage": { "damage_type": "bullet", "amount": 141 } }, { "id": "40x53mm_slug_m169", @@ -58,7 +57,36 @@ "type": "AMMO", "name": { "str": "40x53mm flechette, reloaded" }, "description": "An improvised 40x53mm flechette load containing 115 steel darts, similar to M1001 flechette load.", - "range": 14, "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 } + }, + { + "id": "bp_40x53mm_buckshot_m169", + "copy-from": "bp_40x53mm_flechette_m169", + "type": "AMMO", + "name": { "str": "40x53mm buckshot, black powder" }, + "description": "An improvised 40x53mm buckshot load somewhat resembling M576.", + "damage": { "damage_type": "bullet", "amount": 119 } + }, + { + "id": "bp_40x53mm_slug_m169", + "copy-from": "40x53mm_grenade", + "type": "AMMO", + "name": { "str": "40x53mm slug, black powder" }, + "description": "An improvised 40x53mm load resembling an oversized shotgun slug.", + "damage": { "damage_type": "bullet", "amount": 119, "armor_penetration": 3 }, + "proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 }, + "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "bp_40x53mm_flechette_m169", + "copy-from": "40x53mm_m1001", + "type": "AMMO", + "name": { "str": "40x53mm flechette, black powder" }, + "description": "An improvised 40x53mm flechette load containing 115 steel darts, similar to M1001 flechette load.", + "damage": { "damage_type": "bullet", "amount": 114, "armor_penetration": 6 }, + "proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 }, + "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] }, + "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } ] diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index 18c12889da243..6541a91b85be8 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -17,6 +17,7 @@ "ammo": [ "40x46mm" ], "dispersion": 550, "durability": 6, + "blackpowder_tolerance": 60, "clip_size": 1, "reload": 350, "valid_mod_locations": [ @@ -50,6 +51,7 @@ "ammo": [ "40x46mm" ], "dispersion": 270, "durability": 9, + "blackpowder_tolerance": 60, "clip_size": 1, "reload": 150, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 1 } } ] @@ -73,6 +75,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": 3 }, "dispersion": 150, "durability": 8, + "blackpowder_tolerance": 60, "clip_size": 1, "reload": 250, "valid_mod_locations": [ @@ -105,6 +108,7 @@ "ammo": [ "40x46mm" ], "dispersion": 270, "durability": 8, + "blackpowder_tolerance": 60, "clip_size": 6, "reload": 300, "valid_mod_locations": [ @@ -138,6 +142,7 @@ "ammo": [ "40x46mm" ], "dispersion": 140, "durability": 9, + "blackpowder_tolerance": 60, "clip_size": 4, "valid_mod_locations": [ [ "accessories", 4 ], @@ -185,6 +190,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 300, "durability": 10, + "blackpowder_tolerance": 60, "reload": 400, "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ], "clip_size": 6, diff --git a/data/json/items/gun/40x53mm.json b/data/json/items/gun/40x53mm.json index 3b9c00b922e9a..eb9c54d2b7cc7 100644 --- a/data/json/items/gun/40x53mm.json +++ b/data/json/items/gun/40x53mm.json @@ -19,6 +19,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "dispersion": 180, "durability": 8, + "min_cycle_recoil": 16875, "reload": 400, "valid_mod_locations": [ [ "accessories", 2 ], @@ -31,6 +32,7 @@ ], "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ], [ "AUTO", "auto", 2, "NPC_AVOID" ] ], "flags": [ "MOUNTED_GUN" ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index 075a835e3e8b4..d87d558cfa17d 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -289,10 +289,11 @@ "color": "light_red", "location": "underbarrel", "mod_targets": [ "rifle", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 300, "durability": 10, "clip_size": 1 }, + "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 300, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] }, { "id": "m203_mod", @@ -317,10 +318,11 @@ "color": "dark_gray", "location": "underbarrel", "mod_targets": [ "rifle", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 }, + "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 270, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] }, { "id": "m320_mod_mod", @@ -405,9 +407,10 @@ "color": "light_gray", "location": "underbarrel", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 450, "durability": 10, "clip_size": 1 }, + "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 450, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] }, { "id": "pistol_bayonet", diff --git a/data/json/recipes/ammo/40x46mm.json b/data/json/recipes/ammo/40x46mm.json index 507ed3f1f0822..e6ae3fa91ea05 100644 --- a/data/json/recipes/ammo/40x46mm.json +++ b/data/json/recipes/ammo/40x46mm.json @@ -154,5 +154,155 @@ [ [ "40x46mm_m199_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ] ] + }, + { + "result": "bp_40x46mm_buckshot_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_buckshot_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_slug_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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", 1 ], [ "ammo_bullet", 8 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_slug_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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", 1 ], [ "ammo_bullet", 8 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_flechette_m118", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 10 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m118_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ] + ] + }, + { + "result": "bp_40x46mm_flechette_m199", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 10 ] ], + [ [ "chem_black_powder", 2 ] ], + [ [ "40x46mm_m199_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ] + ] } ] diff --git a/data/json/recipes/ammo/40x53mm.json b/data/json/recipes/ammo/40x53mm.json index 7d68c5d83ed97..6d3778b2df483 100644 --- a/data/json/recipes/ammo/40x53mm.json +++ b/data/json/recipes/ammo/40x53mm.json @@ -76,5 +76,80 @@ [ [ "40x53mm_m169_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] + }, + { + "result": "bp_40x53mm_buckshot_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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": [ [ "shot_forming", 12 ], [ "ammo_bullet", 126 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 134 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "bp_40x53mm_slug_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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", 12 ], [ "ammo_bullet", 115 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "chem_black_powder", 194 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "bp_40x53mm_flechette_m169", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "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, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 115 ] ], + [ [ "chem_black_powder", 86 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] } ] diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index b541473109398..5e22f5f6318a1 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -339,13 +339,26 @@ "40x46mm_flechette_m199", "40x53mm_m1001", "40x53mm_flechette_m169", - "40x53mm_buckshot_m169" + "40x53mm_buckshot_m169", + "bp_40x46mm_buckshot_m118", + "bp_40x46mm_buckshot_m199", + "bp_40x46mm_flechette_m118", + "bp_40x46mm_flechette_m199", + "bp_40x53mm_flechette_m169", + "bp_40x53mm_buckshot_m169" ], "type": "MIGRATION", "replace": "grenade_ammo_shot" }, { - "id": [ "40x46mm_slug_m118", "40x46mm_slug_m199", "40x53mm_slug_m169" ], + "id": [ + "40x46mm_slug_m118", + "40x46mm_slug_m199", + "40x53mm_slug_m169", + "bp_40x46mm_slug_m118", + "bp_40x46mm_slug_m199", + "bp_40x53mm_slug_m169" + ], "type": "MIGRATION", "replace": "grenade_ammo_slug" }, From e1c162c47f63a33ae4b86e586b87780496d7e8ef Mon Sep 17 00:00:00 2001 From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> Date: Mon, 30 Nov 2020 22:00:19 +0300 Subject: [PATCH 2/4] Add RELOAD_EJECT to tube launcher --- data/json/items/gunmod/underbarrel.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index d87d558cfa17d..0a49fe8e6f6b2 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -409,6 +409,7 @@ "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ], "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 450, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], + "flags": [ "RELOAD_EJECT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] }, From 1dc8d263467e387134e304bcb660e5d0945dac11 Mon Sep 17 00:00:00 2001 From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> Date: Mon, 30 Nov 2020 22:37:15 +0300 Subject: [PATCH 3/4] Linting --- data/json/items/gunmod/underbarrel.json | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index 0a49fe8e6f6b2..5990f5f799f8e 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -289,7 +289,14 @@ "color": "light_red", "location": "underbarrel", "mod_targets": [ "rifle", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 300, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, + "gun_data": { + "ammo": "40x46mm", + "skill": "launcher", + "dispersion": 300, + "durability": 10, + "blackpowder_tolerance": 60, + "clip_size": 1 + }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], @@ -318,7 +325,14 @@ "color": "dark_gray", "location": "underbarrel", "mod_targets": [ "rifle", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 270, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, + "gun_data": { + "ammo": "40x46mm", + "skill": "launcher", + "dispersion": 270, + "durability": 10, + "blackpowder_tolerance": 60, + "clip_size": 1 + }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], @@ -407,7 +421,14 @@ "color": "light_gray", "location": "underbarrel", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ], - "gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 450, "durability": 10, "blackpowder_tolerance": 60, "clip_size": 1 }, + "gun_data": { + "ammo": "40x46mm", + "skill": "launcher", + "dispersion": 450, + "durability": 10, + "blackpowder_tolerance": 60, + "clip_size": 1 + }, "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], "flags": [ "RELOAD_EJECT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ], From c2aa562ebedbc910cdbe14019db0500bc676608d Mon Sep 17 00:00:00 2001 From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:48:23 +0300 Subject: [PATCH 4/4] Fix descriptions --- data/json/items/ammo/40x46mm.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json index 706f8b8c8a33f..c7cb7860ab5b1 100644 --- a/data/json/items/ammo/40x46mm.json +++ b/data/json/items/ammo/40x46mm.json @@ -99,7 +99,7 @@ "copy-from": "40x46mm_slug_m118", "type": "AMMO", "name": { "str": "40x46mm-M199 slug, reloaded" }, - "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", + "description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", "casing": "40x46mm_m199_casing" }, { @@ -124,7 +124,7 @@ "copy-from": "bp_40x46mm_buckshot_m199", "type": "AMMO", "name": { "str": "40x46mm-M118 buckshot, black powder" }, - "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister.", + "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", "casing": "40x46mm_m118_casing" }, { @@ -160,7 +160,7 @@ "copy-from": "bp_40x46mm_slug_m118", "type": "AMMO", "name": { "str": "40x46mm-M199 slug, black powder" }, - "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister.", + "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", "casing": "40x46mm_m199_casing" }, { @@ -177,7 +177,7 @@ "copy-from": "bp_40x46mm_flechette_m118", "type": "AMMO", "name": { "str": "40x46mm-M199 flechette, black powder" }, - "description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into a M199 canister.", + "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.", "casing": "40x46mm_m199_casing" } ]