1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
From 3bffedfdaef7d35bd1f4dccc0d38281ce6f4f116 Mon Sep 17 00:00:00 2001
From: Chaosvolt <chaosvolt@users.noreply.github.com>
Date: Sun, 30 Oct 2022 11:00:10 -0500
Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
---
data/json/items/ammo/270win.json | 2 +-
data/json/items/ammo/300.json | 2 +-
data/json/items/ammo/3006.json | 4 ++--
data/json/items/ammo/300blk.json | 2 +-
data/json/items/ammo/36paper.json | 4 ++--
data/json/items/ammo/44paper.json | 4 ++--
data/json/items/ammo/4570.json | 8 +++++---
data/json/items/ammo/545x39.json | 5 +++--
data/json/items/ammo/700nx.json | 3 ++-
data/json/items/ammo/762.json | 2 +-
data/json/items/ammo/762R.json | 2 +-
14 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
index bc2f5e826e9..6ca0814d2e2 100644
--- a/data/json/items/ammo/270win.json
+++ b/data/json/items/ammo/270win.json
@@ -17,7 +17,7 @@
"ammo_type": "270win",
"casing": "270win_casing",
"range": 65,
- "damage": { "damage_type": "bullet", "amount": 64, "armor_penetration": 4 },
+ "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 34 },
"dispersion": 10,
"recoil": 3800,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
index 95fcb846f5e..2f4335daa40 100644
--- a/data/json/items/ammo/300.json
+++ b/data/json/items/ammo/300.json
@@ -17,7 +17,7 @@
"ammo_type": "300",
"casing": "300_casing",
"range": 65,
- "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 },
+ "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 39 },
"dispersion": 15,
"recoil": 4000,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json
index 222ccaad66c..b2c82f419bf 100644
--- a/data/json/items/ammo/3006.json
+++ b/data/json/items/ammo/3006.json
@@ -17,7 +17,7 @@
"ammo_type": "3006",
"casing": "3006_casing",
"range": 61,
- "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 10 },
+ "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 35 },
"dispersion": 20,
"recoil": 3800,
"effects": [ "COOKOFF" ]
@@ -36,7 +36,7 @@
"type": "AMMO",
"name": { "str": ".30-06 M2 AP" },
"description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets. It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
+ "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 19 } }
},
{
"id": "bp_3006",
diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
index bdff5be36f5..815d1a1702d 100644
--- a/data/json/items/ammo/300blk.json
+++ b/data/json/items/ammo/300blk.json
@@ -17,7 +17,7 @@
"ammo_type": "300blk",
"casing": "300blk_casing",
"range": 45,
- "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 5 },
+ "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 24 },
"dispersion": 30,
"recoil": 2000,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/36paper.json b/data/json/items/ammo/36paper.json
index 40556f4e1c8..4b170321d4f 100644
--- a/data/json/items/ammo/36paper.json
+++ b/data/json/items/ammo/36paper.json
@@ -14,8 +14,8 @@
"count": 25,
"ammo_type": "36paper",
"range": 15,
- "//": "Base damage of 19, balance increase of one-third, plus 25% hollowpoint bonus.",
- "damage": { "damage_type": "bullet", "amount": 32 },
+ "//": "Base damage of 19, balance increase of one-third, half the expected armor penetration.",
+ "damage": { "damage_type": "bullet", "amount": 25, "armor_penetration": 7 },
"dispersion": 80,
"recoil": 210,
"effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json
index 4bdb267b5a8..a0123c41d52 100644
--- a/data/json/items/ammo/44paper.json
+++ b/data/json/items/ammo/44paper.json
@@ -14,8 +14,8 @@
"count": 25,
"ammo_type": "44paper",
"range": 18,
- "//": "Base damage of 27, balance increase of two-nineths, plus 25% hollowpoint bonus.",
- "damage": { "damage_type": "bullet", "amount": 41 },
+ "//": "Base damage of 27, balance increase of two-nineths, half the expected armor penetration.",
+ "damage": { "damage_type": "bullet", "amount": 33, "armor_penetration": 9 },
"dispersion": 70,
"recoil": 580,
"effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
index 360afcdb1c5..bc4f6de6ecb 100644
--- a/data/json/items/ammo/4570.json
+++ b/data/json/items/ammo/4570.json
@@ -17,7 +17,8 @@
"ammo_type": "4570",
"casing": "4570_casing",
"range": 48,
- "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 3 },
+ "//": "Balanced as FMJ, half the expected armor penetration.",
+ "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 16 },
"dispersion": 20,
"recoil": 4300,
"effects": [ "COOKOFF" ]
@@ -32,7 +33,8 @@
"price_postapoc": 600,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
- "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 7 }, "recoil": 300 }
+ "//": "Balanced as +P, 75% of the expected armor penetration.",
+ "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": 8 }, "recoil": 300 }
},
{
"id": "4570_low",
@@ -43,6 +45,6 @@
"price": 250,
"price_postapoc": 400,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -2 }, "recoil": -900 }
+ "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 }
},
{
diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
index 13b13adcf22..1ef50ff5e28 100644
--- a/data/json/items/ammo/545x39.json
+++ b/data/json/items/ammo/545x39.json
@@ -18,7 +18,7 @@
"ammo_type": "545x39",
"casing": "545_casing",
"range": 37,
- "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 6 },
+ "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 23 },
"dispersion": 30,
"recoil": 1400,
"effects": [ "COOKOFF" ]
@@ -34,6 +34,7 @@
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"symbol": "=",
"color": "yellow",
- "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } }
+ "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } }
}
]
diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json
index 0c1502f5921..94dd6064806 100644
--- a/data/json/items/ammo/700nx.json
+++ b/data/json/items/ammo/700nx.json
@@ -17,7 +17,8 @@
"ammo_type": "700nx",
"casing": "700nx_casing",
"range": 42,
- "damage": { "damage_type": "bullet", "amount": 110, "armor_penetration": 30 },
+ "//": "Base damage of 110, balance reduction to roughly 80%, armor penetration half expected value which is still quite a lot.",
+ "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 25 },
"dispersion": 15,
"recoil": 12100,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
index 685111f200a..959458c8f4c 100644
--- a/data/json/items/ammo/762.json
+++ b/data/json/items/ammo/762.json
@@ -17,7 +17,7 @@
"ammo_type": "762",
"casing": "762_casing",
"range": 30,
- "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 8 },
+ "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
"dispersion": 35,
"recoil": 2036,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json
index 1d595cc200e..1bbdeab478b 100644
--- a/data/json/items/ammo/762R.json
+++ b/data/json/items/ammo/762R.json
@@ -17,7 +17,7 @@
"ammo_type": "762R",
"casing": "762R_casing",
"range": 75,
- "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 10 },
+ "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 30 },
"dispersion": 15,
"recoil": 2650,
"effects": [ "COOKOFF" ]
--
2.39.0
|
