diff options
Diffstat (limited to 'revert-07_Remove-handload-quality-distinction-1481.patch')
| -rw-r--r-- | revert-07_Remove-handload-quality-distinction-1481.patch | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch index a36a285..f2139f2 100644 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ b/revert-07_Remove-handload-quality-distinction-1481.patch @@ -3388,7 +3388,7 @@ index 84d930b02d..c1d954073c 100644 "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], "charges": 1, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], -- "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "lead", 9 ] ] ] +- "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ] + "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ] }, { @@ -3399,7 +3399,7 @@ index 84d930b02d..c1d954073c 100644 "charges": 1, + "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ] + "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ] }, { - "result": "reloaded_5x50dart", @@ -3741,24 +3741,6 @@ index 76d1d3f6b4..3cd7313750 100644 "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ], "components": [ [ [ "gunpowder", 6 ] ] ] }, -diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json -index cc388b9279..0aec1b3de8 100644 ---- a/data/json/uncraft/ammo/4570.json -+++ b/data/json/uncraft/ammo/4570.json -@@ -26,3 +32,13 @@ - "charges": 1 -+ }, -+ { -+ "id": "reloaded_4570_bp", -+ "copy-from": "4570_low", -+ "type": "AMMO", -+ "name": { "str": ".45-70, black powder" }, -+ "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications. Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch. This one has been hand-loaded.", -+ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, -+ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, -+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json index 3146c0a01c..e4e3796a10 100644 --- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json |