From 95e06d81d4c8f2afc68b914ab491ff758d4d158c Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:09:00 -0500 Subject: [PATCH 01/46] Update 10mm.json changed to reflect stacksize of 40 --- data/json/uncraft/ammo/10mm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/10mm.json b/data/json/uncraft/ammo/10mm.json index a8fdc492c25ee..0f152707e6549 100644 --- a/data/json/uncraft/ammo/10mm.json +++ b/data/json/uncraft/ammo/10mm.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "10mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "10mm_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 87605b891f7e71424869d5b2beadc7a0d5dc967b Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:15:03 -0500 Subject: [PATCH 02/46] Update 22.json changed for stack size of 150 for CB and 100 for all other --- data/json/uncraft/ammo/22.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/uncraft/ammo/22.json b/data/json/uncraft/ammo/22.json index 17313c6d8e9bb..d8071e7fe5cc8 100644 --- a/data/json/uncraft/ammo/22.json +++ b/data/json/uncraft/ammo/22.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 1 ] ] ], + "components": [ [ [ "lead", 300 ] ], [ [ "22_casing_new", 150 ] ], [ [ "gunpowder_pistol", 150 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ], + "components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ], [ [ "copper", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], + "components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -36,7 +36,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], + "components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From ae51c92a3448b3c9967ede0d9c86fe11376ec7d2 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:17:04 -0500 Subject: [PATCH 03/46] Update 223.json changed for stack size of 47 (why 47?) --- data/json/uncraft/ammo/223.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/223.json b/data/json/uncraft/ammo/223.json index e59ca2db651eb..517fd91fa2b3f 100644 --- a/data/json/uncraft/ammo/223.json +++ b/data/json/uncraft/ammo/223.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 3 ] ], - [ [ "223_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 4 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 141 ] ], + [ [ "223_casing", 47 ] ], + [ [ "smrifle_primer", 47 ] ], + [ [ "gunpowder_rifle", 188 ] ], + [ [ "copper", 94 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 1a237d5aab127190141ee2b51c29a3f9002bd919 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:17:48 -0500 Subject: [PATCH 04/46] Update 270win.json changed for stack size of 20 --- data/json/uncraft/ammo/270win.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/uncraft/ammo/270win.json b/data/json/uncraft/ammo/270win.json index f204174bca71a..3376f3f266e91 100644 --- a/data/json/uncraft/ammo/270win.json +++ b/data/json/uncraft/ammo/270win.json @@ -7,10 +7,10 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 5 ] ], - [ [ "270win_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 10 ] ], + [ [ "lead", 100 ] ], + [ [ "270win_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 200 ] ], [ [ "copper", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] From 25edd06ef3e89fbd7b34d1ff3fab1fbabc2fd22f Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:19:47 -0500 Subject: [PATCH 05/46] Update 30-06.json changed for stack size of 20 --- data/json/uncraft/ammo/30-06.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/json/uncraft/ammo/30-06.json b/data/json/uncraft/ammo/30-06.json index 80560f3a1bc8a..a50da091df54c 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": 1 } ], "components": [ - [ [ "lead", 6 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 8 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "3006_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 160 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,11 +23,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "incendiary", 6 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 8 ] ], - [ [ "copper", 6 ] ] + [ [ "incendiary", 120 ] ], + [ [ "3006_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 160 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -39,11 +39,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 6 ] ], - [ [ "3006_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 8 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "3006_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 160 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From ea0b698df9451a2de2d61b906085a13e5812c6be Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:20:47 -0500 Subject: [PATCH 06/46] Update 300.json changed for stack size of 15 --- data/json/uncraft/ammo/300.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/300.json b/data/json/uncraft/ammo/300.json index 02dbf8bdaf12b..ce787703d4e80 100644 --- a/data/json/uncraft/ammo/300.json +++ b/data/json/uncraft/ammo/300.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 8 ] ], - [ [ "300_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 16 ] ], - [ [ "copper", 21 ] ] + [ [ "lead", 120 ] ], + [ [ "300_casing", 15 ] ], + [ [ "lgrifle_primer", 15 ] ], + [ [ "gunpowder_large_rifle", 240 ] ], + [ [ "copper", 315 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 034defa1c7d2f7377582a098f3f6978e57d0fc49 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:22:43 -0500 Subject: [PATCH 07/46] Update 300blk.json changed for stack size of 47 --- data/json/uncraft/ammo/300blk.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/json/uncraft/ammo/300blk.json b/data/json/uncraft/ammo/300blk.json index 09105b3fdb007..3e5a0f2730393 100644 --- a/data/json/uncraft/ammo/300blk.json +++ b/data/json/uncraft/ammo/300blk.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 5 ] ], - [ [ "300blk_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 4 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 235 ] ], + [ [ "300blk_casing", 47 ] ], + [ [ "smrifle_primer", 147 ] ], + [ [ "gunpowder_rifle", 188 ] ], + [ [ "copper", 94 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,11 +23,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 5 ] ], - [ [ "300blk_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 3 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 235 ] ], + [ [ "300blk_casing", 47 ] ], + [ [ "smrifle_primer", 47 ] ], + [ [ "gunpowder", 141 ] ], + [ [ "copper", 94 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From e4c9f5a155d4f534f22c1a494f5de07dc0865d8a Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:23:28 -0500 Subject: [PATCH 08/46] Update 308.json changed for stack size of 20 --- data/json/uncraft/ammo/308.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/308.json b/data/json/uncraft/ammo/308.json index ad96d0863a6ff..dff94716d67ae 100644 --- a/data/json/uncraft/ammo/308.json +++ b/data/json/uncraft/ammo/308.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 6 ] ], - [ [ "308_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 10 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "308_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 200 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 170034d0ed4c3f9cffd6cd5c14f4615d794b03b6 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:24:01 -0500 Subject: [PATCH 09/46] Update 32.json changed for stack size of 80 --- data/json/uncraft/ammo/32.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/32.json b/data/json/uncraft/ammo/32.json index f615190e387db..e6d838400c63f 100644 --- a/data/json/uncraft/ammo/32.json +++ b/data/json/uncraft/ammo/32.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], + "components": [ [ [ "lead", 160 ] ], [ [ "32_casing", 80 ] ], [ [ "smpistol_primer", 80 ] ], [ [ "gunpowder_pistol", 160 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From f323b251a65e51bdbf2a4078f386ca62e5512a4f Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:25:01 -0500 Subject: [PATCH 10/46] Update 357mag.json changed for stack size of 50 --- data/json/uncraft/ammo/357mag.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json index 29c2c95c720a5..37977878c6cf0 100644 --- a/data/json/uncraft/ammo/357mag.json +++ b/data/json/uncraft/ammo/357mag.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From f89c8d06f4c31cd0b6f499ad83c13a6d56babf00 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:26:51 -0500 Subject: [PATCH 11/46] Update 357sig.json changed for stack size of 50 --- data/json/uncraft/ammo/357sig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json index ed1ed2c6f5b60..ed637b7f90cca 100644 --- a/data/json/uncraft/ammo/357sig.json +++ b/data/json/uncraft/ammo/357sig.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 0bc2cda0651ee8b394627b1785bb14b5d8dc3ad5 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:28:10 -0500 Subject: [PATCH 12/46] Update 38.json changed for stack size of 40 --- data/json/uncraft/ammo/38.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/38.json b/data/json/uncraft/ammo/38.json index 6e6989f43eba4..836379df4d77d 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_pistol", 2 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 80 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 80 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -20,7 +20,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 3 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From a93eb64480658c88377ded8bb073abf32c1cc344 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:29:36 -0500 Subject: [PATCH 13/46] Update 380.json changed for stack size of 50 (notice no casing or primer is given, uncertain as to why) --- data/json/uncraft/ammo/380.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json index cbc1e66ab104c..3322def3d2e0a 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_pistol", 3 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, { "result": "380_FMJ", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_380", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, { "result": "380_p", @@ -21,6 +21,6 @@ "type": "uncraft", "using": [ [ "ammo_380", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ] } ] From e399039e2a2d9575cc086e4968cac8c521cc674b Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:30:08 -0500 Subject: [PATCH 14/46] Update 38super.json changed for stack size of 40 --- data/json/uncraft/ammo/38super.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/38super.json b/data/json/uncraft/ammo/38super.json index 143ef343d3bcd..a6aa1b2eb1b6c 100644 --- a/data/json/uncraft/ammo/38super.json +++ b/data/json/uncraft/ammo/38super.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 3 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "38super_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_magnum_pistol", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 8a9a30fe793752945a20f0ecf991e5844c3ee851 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:31:00 -0500 Subject: [PATCH 15/46] Update 40.json changed for stack size of 40 --- data/json/uncraft/ammo/40.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/40.json b/data/json/uncraft/ammo/40.json index 3134dfbb47d30..ca916d4bd3100 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_pistol", 4 ] ] ], + "components": [ [ [ "lead", 40 ] ], [ [ "40_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 160 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], + "components": [ [ [ "lead", 80 ] ], [ [ "40_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 160 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From a6133da92a0242509150df79159a1135e4dbdae8 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:32:37 -0500 Subject: [PATCH 16/46] Update 410shot.json changed for stack size of 20 --- data/json/uncraft/ammo/410shot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/410shot.json b/data/json/uncraft/ammo/410shot.json index ad3f7658a1a18..094d2641170a5 100644 --- a/data/json/uncraft/ammo/410shot.json +++ b/data/json/uncraft/ammo/410shot.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "410shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_pistol", 5 ] ], [ [ "lead", 5 ] ] ], + "components": [ [ [ "410shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_pistol", 100 ] ], [ [ "lead", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From dd07d231d9a12da371ab2f08f90bb446795c05c5 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:34:54 -0500 Subject: [PATCH 17/46] Update 44.json changed for stack size of 20 --- data/json/uncraft/ammo/44.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/44.json b/data/json/uncraft/ammo/44.json index f48d88a6b2819..0f4c391c3c281 100644 --- a/data/json/uncraft/ammo/44.json +++ b/data/json/uncraft/ammo/44.json @@ -7,10 +7,10 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 7 ] ], - [ [ "44_casing", 1 ] ], - [ [ "lgpistol_primer", 1 ] ], - [ [ "gunpowder_magnum_pistol", 10 ] ], + [ [ "lead", 140 ] ], + [ [ "44_casing", 20 ] ], + [ [ "lgpistol_primer", 20 ] ], + [ [ "gunpowder_magnum_pistol", 200 ] ], [ [ "copper", 7 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -22,7 +22,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], + "components": [ [ [ "lead", 200 ] ], [ [ "44_casing", 20 ] ], [ [ "lgpistol_primer", 20 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 39cba68f4d2a97451b0064502790d3de3f65d10a Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:36:13 -0500 Subject: [PATCH 18/46] Update 45.json changed for stack size of 30 --- data/json/uncraft/ammo/45.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/45.json b/data/json/uncraft/ammo/45.json index 30350589639e0..af73c87332c8e 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_pistol", 4 ] ] ], + "components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_pistol", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], + "components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_pistol", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -20,7 +20,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], + "components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_magnum_pistol", 150 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 72fbd4850ec6b2bf0a275c33bdf06fda95c6e610 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:39:49 -0500 Subject: [PATCH 19/46] Update 454.json Changed for stack size of 15 --- data/json/uncraft/ammo/454.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/454.json b/data/json/uncraft/ammo/454.json index ad1a028d1d749..185ad6b231c12 100644 --- a/data/json/uncraft/ammo/454.json +++ b/data/json/uncraft/ammo/454.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 20 ] ], - [ [ "454_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_magnum_pistol", 20 ] ], - [ [ "copper", 20 ] ] + [ [ "lead", 300 ] ], + [ [ "454_casing", 15 ] ], + [ [ "smrifle_primer", 150 ] ], + [ [ "gunpowder_magnum_pistol", 300 ] ], + [ [ "copper", 300 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From e220e74a26720fee294b118d75866ccb7064524a Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:41:16 -0500 Subject: [PATCH 20/46] Update 4570.json changed for stack size of 20 --- data/json/uncraft/ammo/4570.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json index 2239490c0244b..78b40ccc709af 100644 --- a/data/json/uncraft/ammo/4570.json +++ b/data/json/uncraft/ammo/4570.json @@ -5,11 +5,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "copper", 2 ] ], - [ [ "lead", 5 ] ], - [ [ "4570_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 15 ] ] + [ [ "copper", 40 ] ], + [ [ "lead", 100 ] ], + [ [ "4570_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 300 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -18,7 +18,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "copper", 7 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder_large_rifle", 17 ] ] ], + "components": [ [ [ "copper", 140 ] ], [ [ "4570_casing", 20 ] ], [ [ "lgrifle_primer", 20 ] ], [ [ "gunpowder_large_rifle", 340 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 9 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder_large_rifle", 12 ] ] ], + "components": [ [ [ "lead", 180 ] ], [ [ "4570_casing", 20 ] ], [ [ "lgrifle_primer", 20 ] ], [ [ "gunpowder_large_rifle", 240 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 822ec7eed5e13c45063b3fe16041b8215e6d3d2d Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:42:38 -0500 Subject: [PATCH 21/46] Update 45colt.json changed for stack size of 40 --- data/json/uncraft/ammo/45colt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/45colt.json b/data/json/uncraft/ammo/45colt.json index cf84c3b9fb5c1..ccc32991efa46 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_pistol", 4 ] ] ], + "components": [ [ [ "lead", 200 ] ], [ [ "45colt_casing", 40 ] ], [ [ "lgpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 160 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 467161cd8706629b185071a91aca320a46c698e2 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 00:54:33 -0500 Subject: [PATCH 22/46] Update 460.json changed for stack size of 20 --- data/json/uncraft/ammo/460.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/460.json b/data/json/uncraft/ammo/460.json index 1540caa180408..bd71ea68268d9 100644 --- a/data/json/uncraft/ammo/460.json +++ b/data/json/uncraft/ammo/460.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], + "components": [ [ [ "lead", 60 ] ], [ [ "460_casing", 20 ] ], [ [ "lgpistol_primer", 20 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], + "components": [ [ [ "lead", 60 ] ], [ [ "460_casing", 20 ] ], [ [ "lgpistol_primer", 20 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From ef439c3062cdfa2cd71fdaed4f83a882a36289ea Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:00:13 -0500 Subject: [PATCH 23/46] Update 46mm.json changed for stack size of 80 --- data/json/uncraft/ammo/46mm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/46mm.json b/data/json/uncraft/ammo/46mm.json index f3480e4f8a4b1..7024b276846b5 100644 --- a/data/json/uncraft/ammo/46mm.json +++ b/data/json/uncraft/ammo/46mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], + "components": [ [ [ "lead", 160 ] ], [ [ "46mm_casing", 80 ] ], [ [ "smpistol_primer", 80 ] ], [ [ "gunpowder_pistol", 320 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 713cd0368d1bad9907c52bd8dbd4dd79c71c8000 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:00:45 -0500 Subject: [PATCH 24/46] Update 500.json changed for stack size of 10 --- data/json/uncraft/ammo/500.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/500.json b/data/json/uncraft/ammo/500.json index f617c1b13abab..2df14bf55ea41 100644 --- a/data/json/uncraft/ammo/500.json +++ b/data/json/uncraft/ammo/500.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 24 ] ], - [ [ "500_casing", 1 ] ], - [ [ "lgpistol_primer", 1 ] ], - [ [ "gunpowder_magnum_pistol", 24 ] ], - [ [ "copper", 24 ] ] + [ [ "lead", 240 ] ], + [ [ "500_casing", 10 ] ], + [ [ "lgpistol_primer", 10 ] ], + [ [ "gunpowder_magnum_pistol", 240 ] ], + [ [ "copper", 240 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From ca22701607e9b3fcfdb6fe1f0f7b6bd0c06306f4 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:01:40 -0500 Subject: [PATCH 25/46] Update 50bmg.json changed for stack size of 10 --- data/json/uncraft/ammo/50bmg.json | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/json/uncraft/ammo/50bmg.json b/data/json/uncraft/ammo/50bmg.json index f38632073d9df..0529df83fa142 100644 --- a/data/json/uncraft/ammo/50bmg.json +++ b/data/json/uncraft/ammo/50bmg.json @@ -7,12 +7,12 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 12 ] ], - [ [ "incendiary", 20 ] ], - [ [ "50_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 30 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "incendiary", 200 ] ], + [ [ "50_casing", 10 ] ], + [ [ "lgrifle_primer", 10 ] ], + [ [ "gunpowder_large_rifle", 300 ] ], + [ [ "copper", 60 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -24,11 +24,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 12 ] ], - [ [ "50_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 30 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "50_casing", 10 ] ], + [ [ "lgrifle_primer", 10 ] ], + [ [ "gunpowder_large_rifle", 300 ] ], + [ [ "copper", 60 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -40,11 +40,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "50_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 30 ] ], - [ [ "copper", 6 ] ], - [ [ "scrap", 1 ] ] + [ [ "50_casing", 10 ] ], + [ [ "lgrifle_primer", 10 ] ], + [ [ "gunpowder_large_rifle", 300 ] ], + [ [ "copper", 60 ] ], + [ [ "scrap", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From e2c738216e4df08342bbcb1e4fce35e90f902f3c Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:02:55 -0500 Subject: [PATCH 26/46] Update 545.json changed for stack size of 30 --- data/json/uncraft/ammo/545.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/json/uncraft/ammo/545.json b/data/json/uncraft/ammo/545.json index a22ab9ae35683..83c96c71d1c25 100644 --- a/data/json/uncraft/ammo/545.json +++ b/data/json/uncraft/ammo/545.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 2 ] ], - [ [ "545_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 5 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 60 ] ], + [ [ "545_casing", 30 ] ], + [ [ "smrifle_primer", 30 ] ], + [ [ "gunpowder_rifle", 150 ] ], + [ [ "copper", 60 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,11 +23,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 3 ] ], - [ [ "545_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 5 ] ], - [ [ "copper", 3 ] ] + [ [ "lead", 90 ] ], + [ [ "545_casing", 30 ] ], + [ [ "smrifle_primer", 30 ] ], + [ [ "gunpowder_rifle", 150 ] ], + [ [ "copper", 90 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From f3cad69072b78d915fc567552f0514339dbf8658 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:13:13 -0500 Subject: [PATCH 27/46] Update 556.json changed for stack size of 30 --- data/json/uncraft/ammo/556.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/json/uncraft/ammo/556.json b/data/json/uncraft/ammo/556.json index eabf5c87d2ac9..e2ff343e67791 100644 --- a/data/json/uncraft/ammo/556.json +++ b/data/json/uncraft/ammo/556.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 3 ] ], - [ [ "223_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 6 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 90 ] ], + [ [ "223_casing", 30 ] ], + [ [ "smrifle_primer", 30 ] ], + [ [ "gunpowder_rifle", 180 ] ], + [ [ "copper", 60 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,12 +23,12 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "incendiary", 2 ] ], - [ [ "lead", 3 ] ], - [ [ "223_casing", 1 ] ], - [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 6 ] ], - [ [ "copper", 2 ] ] + [ [ "incendiary", 60 ] ], + [ [ "lead", 90 ] ], + [ [ "223_casing", 30 ] ], + [ [ "smrifle_primer", 30 ] ], + [ [ "gunpowder_rifle", 180 ] ], + [ [ "copper", 60 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From c75de625d1b36f0204f92ea4df72a1bea3ffa60e Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:14:07 -0500 Subject: [PATCH 28/46] Update 57mm.json changed for stack size of 60 --- data/json/uncraft/ammo/57mm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/57mm.json b/data/json/uncraft/ammo/57mm.json index ca3e7e99f9292..7c6e484548550 100644 --- a/data/json/uncraft/ammo/57mm.json +++ b/data/json/uncraft/ammo/57mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], + "components": [ [ [ "lead", 120 ] ], [ [ "57mm_casing", 60 ] ], [ [ "smrifle_primer", 60 ] ], [ [ "gunpowder_pistol", 240 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 6fe042c72e5abbd02656781900d57d00e4ba844c Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:15:15 -0500 Subject: [PATCH 29/46] Update 5x50.json changed for stack size of 45 --- data/json/uncraft/ammo/5x50.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json index 8455759437ba7..53bbb09ef4494 100644 --- a/data/json/uncraft/ammo/5x50.json +++ b/data/json/uncraft/ammo/5x50.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_rifle", 3 ] ] ], + "components": [ [ [ "lead", 90 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45] ], [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_rifle", 3 ] ] ], + "components": [ [ [ "lead", 135 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45 ] ], [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From dd441d8110c0dcb896bc889c11395534b842b7a2 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:16:09 -0500 Subject: [PATCH 30/46] Update 700nx.json changed for stack size of 5 --- data/json/uncraft/ammo/700nx.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/700nx.json b/data/json/uncraft/ammo/700nx.json index 3a5d9fec01c04..7df273811ca57 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": 1 } ], "components": [ - [ [ "lead", 14 ] ], - [ [ "700nx_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 38 ] ], - [ [ "copper", 9 ] ] + [ [ "lead", 70 ] ], + [ [ "700nx_casing", 5 ] ], + [ [ "lgrifle_primer", 5 ] ], + [ [ "gunpowder_large_rifle", 190 ] ], + [ [ "copper", 45 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 676f9dd4aefbbfd238aac3dfbc93dce5bc7d9aa9 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:17:46 -0500 Subject: [PATCH 31/46] Update 762x25.json changed for stack size of 40 --- data/json/uncraft/ammo/762x25.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/762x25.json b/data/json/uncraft/ammo/762x25.json index e29c5675386f1..ac48aadd57617 100644 --- a/data/json/uncraft/ammo/762x25.json +++ b/data/json/uncraft/ammo/762x25.json @@ -5,7 +5,7 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] + "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 160 ] ] ] }, { "result": "762_25hot", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] + "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 200 ] ] ] }, { "result": "762_25typeP", @@ -21,6 +21,6 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] + "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 200 ] ] ] } ] From c6df76c418b6369b82f1e1455273f4013f550c73 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:19:06 -0500 Subject: [PATCH 32/46] Update 762x39.json changed for stack size of 20 --- data/json/uncraft/ammo/762x39.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json index a77ec4aa891b1..976cff04a9b5f 100644 --- a/data/json/uncraft/ammo/762x39.json +++ b/data/json/uncraft/ammo/762x39.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 5 ] ], - [ [ "762_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 7 ] ], - [ [ "copper", 5 ] ] + [ [ "lead", 100 ] ], + [ [ "762_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_rifle", 140 ] ], + [ [ "copper", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,11 +23,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 5 ] ], - [ [ "762_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_rifle", 8 ] ], - [ [ "copper", 5 ] ] + [ [ "lead", 100 ] ], + [ [ "762_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_rifle", 160 ] ], + [ [ "copper", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 334bd52bc8948fc63fd5daeabde392a4a9276df1 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:23:00 -0500 Subject: [PATCH 33/46] Update 762x51.json changed for stack size of 20 --- data/json/uncraft/ammo/762x51.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/json/uncraft/ammo/762x51.json b/data/json/uncraft/ammo/762x51.json index 0298b6f588eb0..f227c46677501 100644 --- a/data/json/uncraft/ammo/762x51.json +++ b/data/json/uncraft/ammo/762x51.json @@ -7,11 +7,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 6 ] ], - [ [ "762_51_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 10 ] ], - [ [ "copper", 6 ] ] + [ [ "lead", 120 ] ], + [ [ "762_51_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 200 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -23,11 +23,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "incendiary", 6 ] ], - [ [ "762_51_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 10 ] ], - [ [ "copper", 6 ] ] + [ [ "incendiary", 120 ] ], + [ [ "762_51_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 200 ] ], + [ [ "copper", 120 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 9bc748681304bdc44f4f381b8e7c7cb06e0420e7 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:23:41 -0500 Subject: [PATCH 34/46] Update 762x54.json changed for stack size of 20 --- data/json/uncraft/ammo/762x54.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/uncraft/ammo/762x54.json b/data/json/uncraft/ammo/762x54.json index 357ee2d591789..406647146bdd8 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": 1 } ], "components": [ - [ [ "lead", 3 ] ], - [ [ "762R_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder_large_rifle", 8 ] ], - [ [ "copper", 10 ] ] + [ [ "lead", 60 ] ], + [ [ "762R_casing", 20 ] ], + [ [ "lgrifle_primer", 20 ] ], + [ [ "gunpowder_large_rifle", 160 ] ], + [ [ "copper", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 578d89df7d2d53b73c44b90251d7528993679074 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:24:31 -0500 Subject: [PATCH 35/46] Update 9mm.json changed for stack size of 50 --- data/json/uncraft/ammo/9mm.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json index 2d300f54c9081..29f432b96228c 100644 --- a/data/json/uncraft/ammo/9mm.json +++ b/data/json/uncraft/ammo/9mm.json @@ -5,7 +5,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, { "result": "9mmP", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ] }, { "result": "9mmP2", @@ -21,7 +21,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 250 ] ] ] }, { "result": "9mmfmj", @@ -29,6 +29,6 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] + "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] } ] From 098bf9492f9a786f37f5dd6deac2704473529b2c Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:25:34 -0500 Subject: [PATCH 36/46] Update 9x18mm.json changed for stack size of 50 --- data/json/uncraft/ammo/9x18mm.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/uncraft/ammo/9x18mm.json b/data/json/uncraft/ammo/9x18mm.json index 9b9a144a2c01a..8b57cfc6711ca 100644 --- a/data/json/uncraft/ammo/9x18mm.json +++ b/data/json/uncraft/ammo/9x18mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 3 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "9x18mm_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_pistol", 150 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 5 ] ] ], + "components": [ [ [ "lead", 100 ] ], [ [ "9x18mm_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_pistol", 250 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -27,11 +27,11 @@ "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ - [ [ "lead", 2 ] ], - [ [ "9x18mm_casing", 1 ] ], - [ [ "smpistol_primer", 1 ] ], - [ [ "gunpowder_pistol", 3 ] ], - [ [ "copper", 2 ] ] + [ [ "lead", 100 ] ], + [ [ "9x18mm_casing", 50 ] ], + [ [ "smpistol_primer", 50 ] ], + [ [ "gunpowder_pistol", 150 ] ], + [ [ "copper", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } From 8a64d4a57a79665fba48e84e3b3a9b2a2c4c08bb Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:27:38 -0500 Subject: [PATCH 37/46] Update shot.json changed for stack size of 20 --- data/json/uncraft/ammo/shot.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/uncraft/ammo/shot.json b/data/json/uncraft/ammo/shot.json index e36133224349b..575212b4b168b 100644 --- a/data/json/uncraft/ammo/shot.json +++ b/data/json/uncraft/ammo/shot.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 10 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 120 ] ], [ [ "lead", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "rubber_slug", 1 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 60 ] ], [ [ "rubber_slug", 20 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "lead", 10 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 60 ] ], [ [ "lead", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -36,7 +36,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 60 ] ], [ [ "magnesium", 100 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -46,7 +46,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 120 ] ], [ [ "combatnail", 200 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -57,7 +57,7 @@ "time": "50 s", "//": "A little more carefully...", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "chem_rdx", 1 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 60 ] ], [ [ "chem_rdx", 20 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -67,7 +67,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 20 ] ] ], + "components": [ [ [ "shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_shotgun", 120 ] ], [ [ "lead", 400 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From f8a6010621eefb8d8665a40631ff92de5b781974 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:39:02 -0500 Subject: [PATCH 38/46] Update 762x25.json Edited again for 40 stack size --- data/json/uncraft/ammo/762x25.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/762x25.json b/data/json/uncraft/ammo/762x25.json index ac48aadd57617..e01fbee65b9cc 100644 --- a/data/json/uncraft/ammo/762x25.json +++ b/data/json/uncraft/ammo/762x25.json @@ -4,14 +4,14 @@ "copy-from": "ammo_cartridge", "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], - "qualities": [ { "id": "PULL", "level": 1 } ], + "qualities": [ { "id": "PULL", "level": 40 } ], "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 160 ] ] ] }, { "result": "762_25hot", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_762_25", 1 ] ], + "using": [ [ "ammo_762_25", 40 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 200 ] ] ] }, @@ -19,7 +19,7 @@ "result": "762_25typeP", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_762_25", 1 ] ], + "using": [ [ "ammo_762_25", 40 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 80 ] ], [ [ "gunpowder_pistol", 200 ] ] ] } From 0a81b672c968ffe5ee9c3aa11a751d158cc73bff Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:39:39 -0500 Subject: [PATCH 39/46] Update 9mm.json edited again for stack size of 50 --- data/json/uncraft/ammo/9mm.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json index 29f432b96228c..7da068393a402 100644 --- a/data/json/uncraft/ammo/9mm.json +++ b/data/json/uncraft/ammo/9mm.json @@ -3,7 +3,7 @@ "result": "9mm", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_9mm", 1 ] ], + "using": [ [ "ammo_9mm", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, @@ -11,7 +11,7 @@ "result": "9mmP", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_9mm", 1 ] ], + "using": [ [ "ammo_9mm", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ] }, @@ -19,7 +19,7 @@ "result": "9mmP2", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_9mm", 1 ] ], + "using": [ [ "ammo_9mm", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 250 ] ] ] }, @@ -27,7 +27,7 @@ "result": "9mmfmj", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_9mm", 1 ] ], + "using": [ [ "ammo_9mm", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] } From 3b09ffebf7ede6b573dce0a7f4bf87452ad52e77 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 01:41:24 -0500 Subject: [PATCH 40/46] Update 380.json edited again for stack size of 50 --- data/json/uncraft/ammo/380.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json index 3322def3d2e0a..919c35f56c361 100644 --- a/data/json/uncraft/ammo/380.json +++ b/data/json/uncraft/ammo/380.json @@ -3,7 +3,7 @@ "result": "380_JHP", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], + "using": [ [ "ammo_380", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, @@ -11,7 +11,7 @@ "result": "380_FMJ", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], + "using": [ [ "ammo_380", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ] }, @@ -19,7 +19,7 @@ "result": "380_p", "copy-from": "ammo_cartridge", "type": "uncraft", - "using": [ [ "ammo_380", 1 ] ], + "using": [ [ "ammo_380", 50 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], "components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ] } From a55f11cdacbe361a6c5d3858fa18396e84bef5fb Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 07:01:10 -0500 Subject: [PATCH 41/46] Update 38super.json edited to fit lint requirements --- data/json/uncraft/ammo/38super.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/json/uncraft/ammo/38super.json b/data/json/uncraft/ammo/38super.json index a6aa1b2eb1b6c..5070667e40624 100644 --- a/data/json/uncraft/ammo/38super.json +++ b/data/json/uncraft/ammo/38super.json @@ -6,7 +6,12 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 80 ] ], [ [ "38super_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_magnum_pistol", 120 ] ] ], + "components": [ + [ [ "lead", 80 ] ], + [ [ "38super_casing", 40 ] ], + [ [ "smpistol_primer", 40 ] ], + [ [ "gunpowder_magnum_pistol", 120 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 1c6544ce821297cace577e2287b54bc676798b9e Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 07:05:26 -0500 Subject: [PATCH 42/46] Update 5x50.json Edited to fit lint requirements --- data/json/uncraft/ammo/5x50.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json index 53bbb09ef4494..48d7c220c73ce 100644 --- a/data/json/uncraft/ammo/5x50.json +++ b/data/json/uncraft/ammo/5x50.json @@ -6,7 +6,11 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 90 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45] ], [ [ "gunpowder_rifle", 135 ] ] ], + "components": [ + [ [ "lead", 90 ] ], + [ [ "5x50_hull", 45 ] ], + [ [ "smrifle_primer", 45] ], + [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +20,11 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 135 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45 ] ], [ [ "gunpowder_rifle", 135 ] ] ], + "components": [ + [ [ "lead", 135 ] ], + [ [ "5x50_hull", 45 ] ], + [ [ "smrifle_primer", 45 ] ], + [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From f66edf5401e3bf601098d2b5a891795ef329ac37 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 07:09:37 -0500 Subject: [PATCH 43/46] Update 5x50.json Fixed brackets --- data/json/uncraft/ammo/5x50.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json index 48d7c220c73ce..3152b7f087dcc 100644 --- a/data/json/uncraft/ammo/5x50.json +++ b/data/json/uncraft/ammo/5x50.json @@ -10,7 +10,8 @@ [ [ "lead", 90 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45] ], - [ [ "gunpowder_rifle", 135 ] ] ], + [ [ "gunpowder_rifle", 135 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -24,7 +25,8 @@ [ [ "lead", 135 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45 ] ], - [ [ "gunpowder_rifle", 135 ] ] ], + [ [ "gunpowder_rifle", 135 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From fb145fc7cfd363129395548b3223b885a38b1fc2 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:51:50 -0500 Subject: [PATCH 44/46] Update 5x50.json linted --- data/json/uncraft/ammo/5x50.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json index 3152b7f087dcc..21306aa75a39b 100644 --- a/data/json/uncraft/ammo/5x50.json +++ b/data/json/uncraft/ammo/5x50.json @@ -6,12 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "lead", 90 ] ], - [ [ "5x50_hull", 45 ] ], - [ [ "smrifle_primer", 45] ], - [ [ "gunpowder_rifle", 135 ] ] - ], + "components": [ [ [ "lead", 90 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45 ] ], [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -21,12 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ - [ [ "lead", 135 ] ], - [ [ "5x50_hull", 45 ] ], - [ [ "smrifle_primer", 45 ] ], - [ [ "gunpowder_rifle", 135 ] ] - ], + "components": [ [ [ "lead", 135 ] ], [ [ "5x50_hull", 45 ] ], [ [ "smrifle_primer", 45 ] ], [ [ "gunpowder_rifle", 135 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From e73f4e8a933f45cba07acc31dbd4c33788e437bf Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:53:51 -0500 Subject: [PATCH 45/46] Update 357sig.json linted --- data/json/uncraft/ammo/357sig.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json index ed637b7f90cca..e55547da15642 100644 --- a/data/json/uncraft/ammo/357sig.json +++ b/data/json/uncraft/ammo/357sig.json @@ -4,7 +4,12 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ], + "components": [ + [ [ "lead", 100 ] ], + [ [ "357sig_casing", 50 ] ], + [ [ "smpistol_primer", 50 ] ], + [ [ "gunpowder_magnum_pistol", 100 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +17,12 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ], + "components": [ + [ [ "lead", 100 ] ], + [ [ "357sig_casing", 50 ] ], + [ [ "smpistol_primer", 50 ] ], + [ [ "gunpowder_magnum_pistol", 100 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] From 95fc106187f15a5823daffded00162a547a25cb1 Mon Sep 17 00:00:00 2001 From: Rogal-Dorn <52333807+Rogal-Dorn@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:56:05 -0500 Subject: [PATCH 46/46] Update 357mag.json linted --- data/json/uncraft/ammo/357mag.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json index 37977878c6cf0..270a254d1f4c2 100644 --- a/data/json/uncraft/ammo/357mag.json +++ b/data/json/uncraft/ammo/357mag.json @@ -4,7 +4,12 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ], + "components": [ + [ [ "lead", 100 ] ], + [ [ "357mag_casing", 50 ] ], + [ [ "lgpistol_primer", 50 ] ], + [ [ "gunpowder_magnum_pistol", 250 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +17,12 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ], + "components": [ + [ [ "lead", 100 ] ], + [ [ "357mag_casing", 50 ] ], + [ [ "lgpistol_primer", 50 ] ], + [ [ "gunpowder_magnum_pistol", 250 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ]