diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index 2d185790d7e86..65e83c98bd8ee 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -423,10 +423,10 @@ "overwrite_min_cycle_recoil": 83, "//0": "AR has too big recoil for .22 round, 83 is right on the edge of being able to use blackpowder loaded and ratshot", "ammo_modifier": [ "22" ], - "magazine_adaptor": [ [ "22", [ "22_ar15mag_10", "22_ar15mag_28" ] ] ], + "magazine_adaptor": [ [ "22", [ "22_ar15mag_10", " 22_ar15mag_28" ] ] ], "pocket_mods": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "22_ar15mag_10", "22_ar15mag_28" ] } ], "min_skills": [ [ "weapon", 2 ] ], - "damage_modifier": 2, + "damage_modifier": { "damage_type": "bullet", "amount": 2 }, "add_mod": [ [ "brass catcher", 1 ], [ "bayonet lug", 1 ], [ "rail", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ] }, { diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md index 92ab4535c7d2d..221a070661d46 100644 --- a/doc/JSON_INFO.md +++ b/doc/JSON_INFO.md @@ -4199,7 +4199,7 @@ Gun mods can be defined like this: "ammo_modifier": [ "57" ], // Optional field which if specified modifies parent gun to use these ammo types "magazine_adaptor": [ [ "223", [ "stanag30" ] ] ], // Optional field which changes the types of magazines the parent gun accepts "pocket_mods": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ai_338mag", "ai_338mag_10" ] } ], // Optional field, alters the original pockets of the weapon ; share the syntax with pocket_data; pocket type MAGAZINE and MAGAZINE_WELL are always overwritten, pocket type CONTAINER is always added to existing pockets; for MAGAZINE and MAGAZINE_WELL both ammo_modifier and magazine_adaptor fields are required to correctly migrate ammo type; type: TOOLMOD can use this field also -"damage_modifier": -1, // Optional field increasing or decreasing base gun damage +"damage_modifier": { "damage_type": "bullet", "amount": -1 }, // Optional field increasing or decreasing base gun damage "dispersion_modifier": 15, // Optional field increasing or decreasing base gun dispersion "loudness_modifier": 4, // Optional field increasing or decreasing base guns loudness "range_modifier": 2, // Optional field increasing or decreasing base gun range