diff options
Diffstat (limited to 'revert-07_Remove-handload-quality-distinction-1481.patch')
| -rw-r--r-- | revert-07_Remove-handload-quality-distinction-1481.patch | 613 |
1 files changed, 1 insertions, 612 deletions
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch index 4e0600e..e43b8b8 100644 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ b/revert-07_Remove-handload-quality-distinction-1481.patch @@ -3737,357 +3737,11 @@ index 76d1d3f6b4..3cd7313750 100644 "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ], "components": [ [ [ "gunpowder", 6 ] ] ] }, -diff --git a/data/json/uncraft/ammo/223.json b/data/json/uncraft/ammo/223.json -index c9d3d3f94e..9530ee17b3 100644 ---- a/data/json/uncraft/ammo/223.json -+++ b/data/json/uncraft/ammo/223.json -@@ -6,7 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/30-06.json b/data/json/uncraft/ammo/30-06.json -index 1ba26c4b91..b235e58d0a 100644 ---- a/data/json/uncraft/ammo/30-06.json -+++ b/data/json/uncraft/ammo/30-06.json -@@ -7,11 +7,11 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "lead", 6 ] ], -+ [ [ "lead", 8 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 8 ] ], -- [ [ "copper", 6 ] ] -+ [ [ "gunpowder", 12 ] ], -+ [ [ "copper", 4 ] ] - ], - "charges": 1 - }, -@@ -23,11 +23,12 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "incendiary", 6 ] ], -+ [ [ "lead", 8 ] ], -+ [ [ "incendiary", 8 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 8 ] ], -- [ [ "copper", 6 ] ] -+ [ [ "gunpowder", 12 ] ], -+ [ [ "copper", 4 ] ] - ], - "charges": 1 - }, -@@ -39,11 +40,11 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "lead", 6 ] ], -+ [ [ "lead", 8 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 8 ] ], -- [ [ "copper", 6 ] ] -+ [ [ "gunpowder", 12 ] ], -+ [ [ "copper", 4 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/300.json b/data/json/uncraft/ammo/300.json -index df0b9505d5..9995c40b9d 100644 ---- a/data/json/uncraft/ammo/300.json -+++ b/data/json/uncraft/ammo/300.json -@@ -11,7 +11,7 @@ - [ [ "300_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 16 ] ], -- [ [ "copper", 21 ] ] -+ [ [ "copper", 4 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/300blk.json b/data/json/uncraft/ammo/300blk.json -index dbc6a8a03a..bb4e4d4470 100644 ---- a/data/json/uncraft/ammo/300blk.json -+++ b/data/json/uncraft/ammo/300blk.json -@@ -26,7 +26,7 @@ - [ [ "lead", 5 ] ], - [ [ "300blk_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], -- [ [ "gunpowder", 3 ] ], -+ [ [ "gunpowder", 6 ] ], - [ [ "copper", 2 ] ] - ], - "charges": 1 -diff --git a/data/json/uncraft/ammo/308.json b/data/json/uncraft/ammo/308.json -index aa59e19273..69c4fe1af7 100644 ---- a/data/json/uncraft/ammo/308.json -+++ b/data/json/uncraft/ammo/308.json -@@ -6,13 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ -- [ [ "lead", 6 ] ], -- [ [ "308_casing", 1 ] ], -- [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 10 ] ], -- [ [ "copper", 6 ] ] -- ], -+ "components": [ [ [ "lead", 6 ] ], [ [ "308_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 3 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json -index 41d027ea61..b23c42b4df 100644 ---- a/data/json/uncraft/ammo/357mag.json -+++ b/data/json/uncraft/ammo/357mag.json -@@ -4,7 +4,13 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], -+ "components": [ -+ [ [ "lead", 2 ] ], -+ [ [ "357mag_casing", 1 ] ], -+ [ [ "lgpistol_primer", 1 ] ], -+ [ [ "gunpowder", 5 ] ], -+ [ [ "copper", 1 ] ] -+ ], - "charges": 1 - }, - { -diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json -index 2a6a13dc7a..256089ff72 100644 ---- a/data/json/uncraft/ammo/357sig.json -+++ b/data/json/uncraft/ammo/357sig.json -@@ -4,7 +4,13 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], -+ "components": [ -+ [ [ "lead", 2 ] ], -+ [ [ "357sig_casing", 1 ] ], -+ [ [ "smpistol_primer", 1 ] ], -+ [ [ "gunpowder", 5 ] ], -+ [ [ "copper", 1 ] ] -+ ], - "charges": 1 - }, - { -@@ -12,7 +18,7 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], -+ "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/38.json b/data/json/uncraft/ammo/38.json -index b51fa23972..80e800b8a7 100644 ---- a/data/json/uncraft/ammo/38.json -+++ b/data/json/uncraft/ammo/38.json -@@ -4,7 +4,7 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], -+ "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - }, - { -@@ -14,13 +14,5 @@ - "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], - "charges": 1 -- }, -- { -- "result": "38_super", -- "type": "uncraft", -- "time": "5 s", -- "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], -- "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json -index dc4b9db6bf..02b0348f30 100644 ---- a/data/json/uncraft/ammo/380.json -+++ b/data/json/uncraft/ammo/380.json -@@ -5,7 +5,7 @@ - "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] -+ "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 2 ] ] ] - }, - { - "result": "380_FMJ", -@@ -13,7 +13,7 @@ - "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] -+ "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] - }, - { - "result": "380_p", -@@ -21,6 +21,6 @@ - "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 4 ] ] ] -+ "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] - } - ] -diff --git a/data/json/uncraft/ammo/38super.json b/data/json/uncraft/ammo/38super.json -index 7810c99fca..97311c220f 100644 ---- a/data/json/uncraft/ammo/38super.json -+++ b/data/json/uncraft/ammo/38super.json -@@ -1,4 +1,12 @@ - [ -+ { -+ "result": "38_super", -+ "type": "uncraft", -+ "time": "5 s", -+ "qualities": [ { "id": "PULL", "level": 1 } ], -+ "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], -+ "charges": 1 -+ }, - { - "result": "38super_fmj", - "type": "uncraft", -@@ -6,7 +14,13 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], -+ "components": [ -+ [ [ "lead", 2 ] ], -+ [ [ "38super_casing", 1 ] ], -+ [ [ "smpistol_primer", 1 ] ], -+ [ [ "gunpowder", 3 ] ], -+ [ [ "copper", 1 ] ] -+ ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/40.json b/data/json/uncraft/ammo/40.json -index 6c7265ba44..7fbbf9ce90 100644 ---- a/data/json/uncraft/ammo/40.json -+++ b/data/json/uncraft/ammo/40.json -@@ -4,7 +4,7 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], -+ "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - }, - { -diff --git a/data/json/uncraft/ammo/44.json b/data/json/uncraft/ammo/44.json -index e191b9aae3..a8c9331718 100644 ---- a/data/json/uncraft/ammo/44.json -+++ b/data/json/uncraft/ammo/44.json -@@ -6,13 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ -- [ [ "lead", 7 ] ], -- [ [ "44_casing", 1 ] ], -- [ [ "lgpistol_primer", 1 ] ], -- [ [ "gunpowder", 10 ] ], -- [ [ "copper", 7 ] ] -- ], -+ "components": [ [ [ "lead", 4 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ], - "charges": 1 - }, - { -@@ -22,7 +16,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], -+ "components": [ [ [ "lead", 5 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/45.json b/data/json/uncraft/ammo/45.json -index 3b9fbbde76..ab84f634e4 100644 ---- a/data/json/uncraft/ammo/45.json -+++ b/data/json/uncraft/ammo/45.json -@@ -4,7 +4,7 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ], - "charges": 1 - }, - { -diff --git a/data/json/uncraft/ammo/454.json b/data/json/uncraft/ammo/454.json -index bae0e66db6..d2dc8fe1ba 100644 ---- a/data/json/uncraft/ammo/454.json -+++ b/data/json/uncraft/ammo/454.json -@@ -6,13 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ -- [ [ "lead", 20 ] ], -- [ [ "454_casing", 1 ] ], -- [ [ "smrifle_primer", 1 ] ], -- [ [ "gunpowder", 20 ] ], -- [ [ "copper", 20 ] ] -- ], -+ "components": [ [ [ "lead", 4 ] ], [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ], - "charges": 1 - } - ] 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 -@@ -6,7 +6,7 @@ - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ - [ [ "copper", 2 ] ], -- [ [ "lead", 5 ] ], -+ [ [ "lead", 8 ] ], - [ [ "4570_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 15 ] ] -@@ -18,7 +18,13 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "copper", 7 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 17 ] ] ], -+ "components": [ -+ [ [ "copper", 7 ] ], -+ [ [ "lead", 8 ] ], -+ [ [ "4570_casing", 1 ] ], -+ [ [ "lgrifle_primer", 1 ] ], -+ [ [ "gunpowder", 17 ] ] -+ ], - "charges": 1 - }, - { -@@ -26,7 +32,17 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 9 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ], -+ "components": [ [ [ "lead", 8 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ], +@@ -26,3 +32,13 @@ "charges": 1 + }, + { @@ -4101,271 +3755,6 @@ index cc388b9279..0aec1b3de8 100644 + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } ] -diff --git a/data/json/uncraft/ammo/45colt.json b/data/json/uncraft/ammo/45colt.json -index ca3b831d8a..056243fcb0 100644 ---- a/data/json/uncraft/ammo/45colt.json -+++ b/data/json/uncraft/ammo/45colt.json -@@ -4,7 +4,7 @@ - "type": "uncraft", - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 5 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], -+ "components": [ [ [ "lead", 4 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/460.json b/data/json/uncraft/ammo/460.json -index c9dac3edbc..3e6517ae9a 100644 ---- a/data/json/uncraft/ammo/460.json -+++ b/data/json/uncraft/ammo/460.json -@@ -6,7 +6,13 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], -+ "components": [ -+ [ [ "lead", 3 ] ], -+ [ [ "460_casing", 1 ] ], -+ [ [ "lgpistol_primer", 1 ] ], -+ [ [ "gunpowder", 6 ] ], -+ [ [ "copper", 2 ] ] -+ ], - "charges": 1 - }, - { -@@ -16,7 +22,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/500.json b/data/json/uncraft/ammo/500.json -index b79146ae5c..5a71a1bf4f 100644 ---- a/data/json/uncraft/ammo/500.json -+++ b/data/json/uncraft/ammo/500.json -@@ -6,13 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ -- [ [ "lead", 24 ] ], -- [ [ "500_casing", 1 ] ], -- [ [ "lgpistol_primer", 1 ] ], -- [ [ "gunpowder", 24 ] ], -- [ [ "copper", 24 ] ] -- ], -+ "components": [ [ [ "lead", 5 ] ], [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 2 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/50bmg.json b/data/json/uncraft/ammo/50bmg.json -index 211fbbd756..386eed9d65 100644 ---- a/data/json/uncraft/ammo/50bmg.json -+++ b/data/json/uncraft/ammo/50bmg.json -@@ -7,7 +7,7 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "lead", 12 ] ], -+ [ [ "lead", 15 ] ], - [ [ "incendiary", 20 ] ], - [ [ "50_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -diff --git a/data/json/uncraft/ammo/545.json b/data/json/uncraft/ammo/545.json -index f3e1d4d100..c586ca687e 100644 ---- a/data/json/uncraft/ammo/545.json -+++ b/data/json/uncraft/ammo/545.json -@@ -6,7 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 2 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - }, - { -@@ -16,7 +16,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 3 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/556.json b/data/json/uncraft/ammo/556.json -index 036fe8bd7c..7ba9ad0b02 100644 ---- a/data/json/uncraft/ammo/556.json -+++ b/data/json/uncraft/ammo/556.json -@@ -6,7 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ], -+ "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - }, - { -@@ -22,7 +22,7 @@ - [ [ "223_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 6 ] ], -- [ [ "copper", 2 ] ] -+ [ [ "copper", 1 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json -index a3666d2303..55dad02d10 100644 ---- a/data/json/uncraft/ammo/5x50.json -+++ b/data/json/uncraft/ammo/5x50.json -@@ -6,7 +6,14 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], -+ "components": [ -+ [ [ "lead", 2 ] ], -+ [ [ "5x50_hull", 1 ] ], -+ [ [ "plastic_chunk", 1 ] ], -+ [ [ "smrifle_primer", 1 ] ], -+ [ [ "gunpowder", 3 ] ], -+ [ [ "combatnail", 1 ] ] -+ ], - "charges": 1 - }, - { -@@ -16,7 +23,14 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 3 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], -+ "components": [ -+ [ [ "lead", 3 ] ], -+ [ [ "5x50_hull", 1 ] ], -+ [ [ "plastic_chunk", 1 ] ], -+ [ [ "smrifle_primer", 1 ] ], -+ [ [ "gunpowder", 4 ] ], -+ [ [ "scrap", 1 ] ] -+ ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/700nx.json b/data/json/uncraft/ammo/700nx.json -index bceaf805ca..0ea364b745 100644 ---- a/data/json/uncraft/ammo/700nx.json -+++ b/data/json/uncraft/ammo/700nx.json -@@ -7,11 +7,11 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "lead", 14 ] ], -+ [ [ "lead", 10 ] ], - [ [ "700nx_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 38 ] ], -- [ [ "copper", 9 ] ] -+ [ [ "gunpowder", 30 ] ], -+ [ [ "copper", 5 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json -index 93334eabc3..7d046c7938 100644 ---- a/data/json/uncraft/ammo/762x39.json -+++ b/data/json/uncraft/ammo/762x39.json -@@ -6,7 +6,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 7 ] ], [ [ "copper", 5 ] ] ], -+ "components": [ [ [ "lead", 4 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - }, - { -@@ -16,7 +16,7 @@ - "difficulty": 5, - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], -- "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 5 ] ] ], -+ "components": [ [ [ "lead", 4 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ], - "charges": 1 - } - ] -diff --git a/data/json/uncraft/ammo/762x51.json b/data/json/uncraft/ammo/762x51.json -index 87933be7e4..dc277d7c17 100644 ---- a/data/json/uncraft/ammo/762x51.json -+++ b/data/json/uncraft/ammo/762x51.json -@@ -11,7 +11,7 @@ - [ [ "762_51_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], -- [ [ "copper", 6 ] ] -+ [ [ "copper", 3 ] ] - ], - "charges": 1 - }, -@@ -23,11 +23,12 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -+ [ [ "lead", 6 ] ], - [ [ "incendiary", 6 ] ], - [ [ "762_51_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], -- [ [ "copper", 6 ] ] -+ [ [ "copper", 3 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/762x54.json b/data/json/uncraft/ammo/762x54.json -index 1e2d1be2ea..69681e16fa 100644 ---- a/data/json/uncraft/ammo/762x54.json -+++ b/data/json/uncraft/ammo/762x54.json -@@ -7,11 +7,11 @@ - "time": "5 s", - "qualities": [ { "id": "PULL", "level": 2 } ], - "components": [ -- [ [ "lead", 3 ] ], -+ [ [ "lead", 7 ] ], - [ [ "762R_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 8 ] ], -- [ [ "copper", 10 ] ] -+ [ [ "gunpowder", 10 ] ], -+ [ [ "copper", 3 ] ] - ], - "charges": 1 - } -diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json -index aca3815900..e3b7ac566c 100644 ---- a/data/json/uncraft/ammo/9mm.json -+++ b/data/json/uncraft/ammo/9mm.json -@@ -29,6 +29,6 @@ - "type": "uncraft", - "using": [ [ "ammo_9mm", 1 ] ], - "qualities": [ { "id": "PULL", "level": 1 } ], -- "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] -+ "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] - } - ] -diff --git a/data/json/uncraft/ammo/9x18mm.json b/data/json/uncraft/ammo/9x18mm.json -index 870af31ad4..ffe80a2a66 100644 ---- a/data/json/uncraft/ammo/9x18mm.json -+++ b/data/json/uncraft/ammo/9x18mm.json -@@ -31,7 +31,7 @@ - [ [ "9x18mm_casing", 1 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "gunpowder", 3 ] ], -- [ [ "copper", 2 ] ] -+ [ [ "copper", 1 ] ] - ], - "charges": 1 - } 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 |