summaryrefslogtreecommitdiff
path: root/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch')
-rw-r--r--revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch133
1 files changed, 133 insertions, 0 deletions
diff --git a/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch b/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
new file mode 100644
index 0000000..563e693
--- /dev/null
+++ b/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
@@ -0,0 +1,133 @@
+From 2af4ddb342e4b947a6682f675d2df2f2477c7d01 Mon Sep 17 00:00:00 2001
+From: YeOldeMiller <36291373+YeOldeMiller@users.noreply.github.com>
+Date: Wed, 13 Dec 2023 06:32:55 +0300
+Subject: [PATCH 251/318] feat(balance): improve consistency of handmade
+ caseless ammo recipes (#3875)
+
+* Improve consistency of handmade caseless ammo recipes
+
+* 8x40 HVP ammo recipe: replace extra metals with flechettes
+
+* Remove nails from 20x66 flechette recipe
+---
+ data/json/recipes/ammo/rifle.json | 21 +++++++++++----------
+ data/json/recipes/ammo/shot.json | 12 +++++++++---
+ 2 files changed, 20 insertions(+), 13 deletions(-)
+
+diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
+index 64b2d43cdf6..68c1af6aa2d 100644
+--- a/data/json/recipes/ammo/rifle.json
++++ b/data/json/recipes/ammo/rifle.json
+@@ -424,7 +424,7 @@
+ [ "platinum_small", 4 ]
+ ],
+ [ [ "copper", 40 ] ],
+- [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++ [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
+ ]
+ },
+ {
+@@ -456,7 +456,7 @@
+ [ "platinum_small", 4 ]
+ ],
+ [ [ "copper", 80 ] ],
+- [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++ [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
+ ]
+ },
+ {
+@@ -479,16 +479,17 @@
+ [ [ "gunpowder", 400 ] ],
+ [ [ "oxy_powder", 120 ] ],
+ [ [ "lead", 80 ] ],
++ [ [ "combatnail", 40 ] ],
+ [
+- [ "gold_small", 40 ],
+- [ "silver_small", 40 ],
+- [ "tin", 40 ],
+- [ "bismuth", 40 ],
+- [ "solder_wire", 40 ],
+- [ "platinum_small", 40 ]
++ [ "gold_small", 4 ],
++ [ "silver_small", 4 ],
++ [ "tin", 4 ],
++ [ "bismuth", 4 ],
++ [ "solder_wire", 4 ],
++ [ "platinum_small", 4 ]
+ ],
+ [ [ "copper", 80 ] ],
+- [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++ [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
+ ]
+ },
+ {
+@@ -521,7 +522,7 @@
+ [ "platinum_small", 4 ]
+ ],
+ [ [ "copper", 40 ] ],
+- [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++ [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
+ ]
+ },
+ {
+diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
+index 9caa13c0daf..738d8086014 100644
+--- a/data/json/recipes/ammo/shot.json
++++ b/data/json/recipes/ammo/shot.json
+@@ -652,6 +652,7 @@
+ "skills_required": [ "cooking", 2 ],
+ "difficulty": 8,
+ "time": 45000,
++ "charges": 20,
+ "batch_time_factors": [ 60, 5 ],
+ "book_learn": [ [ "recipe_caseless", 5 ] ],
+ "qualities": [ { "id": "CHEM", "level": 2 } ],
+@@ -662,7 +663,8 @@
+ [ [ "oxy_powder", 60 ] ],
+ [ [ "gunpowder", 120 ] ],
+ [ [ "lead", 160 ] ],
+- [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ]
++ [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ],
++ [ [ "shotgun_primer", 20 ] ]
+ ]
+ },
+ {
+@@ -674,6 +676,7 @@
+ "skills_required": [ "cooking", 2 ],
+ "difficulty": 8,
+ "time": 45000,
++ "charges": 20,
+ "batch_time_factors": [ 60, 5 ],
+ "book_learn": [ [ "recipe_caseless", 5 ] ],
+ "qualities": [ { "id": "CHEM", "level": 2 } ],
+@@ -691,7 +694,8 @@
+ [ "bismuth", 10 ],
+ [ "solder_wire", 10 ]
+ ],
+- [ [ "nail", 240 ], [ "combatnail", 240 ] ]
++ [ [ "combatnail", 240 ] ],
++ [ [ "shotgun_primer", 20 ] ]
+ ]
+ },
+ {
+@@ -703,6 +707,7 @@
+ "skills_required": [ "cooking", 2 ],
+ "difficulty": 8,
+ "time": 45000,
++ "charges": 20,
+ "batch_time_factors": [ 60, 5 ],
+ "book_learn": [ [ "recipe_caseless", 5 ] ],
+ "qualities": [ { "id": "CHEM", "level": 2 } ],
+@@ -713,7 +718,8 @@
+ [ [ "oxy_powder", 80 ] ],
+ [ [ "gunpowder", 160 ] ],
+ [ [ "lead", 240 ] ],
+- [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ]
++ [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ],
++ [ [ "shotgun_primer", 20 ] ]
+ ]
+ }
+ ]
+--
+2.42.0
+