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
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
From 1a5095256a34f230d604f879c704fb2be07aee82 Mon Sep 17 00:00:00 2001
From: Chaosvolt <chaosvolt@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:16:38 -0600
Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
* Ammo Rebalance, Part 8
* Doi I forgot .50 at first
---
data/json/items/ammo/223.json | 6 +++---
data/json/items/ammo/270win.json | 2 +-
data/json/items/ammo/300.json | 2 +-
data/json/items/ammo/3006.json | 2 +-
data/json/items/ammo/300blk.json | 2 +-
data/json/items/ammo/308.json | 2 +-
data/json/items/ammo/4570.json | 10 +++++-----
data/json/items/ammo/50.json | 4 ++--
data/json/items/ammo/545x39.json | 4 ++--
data/json/items/ammo/700nx.json | 4 ++--
data/json/items/ammo/762.json | 2 +-
data/json/items/ammo/762R.json | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
index 5b747112341..beaea0d4e9f 100644
--- a/data/json/items/ammo/223.json
+++ b/data/json/items/ammo/223.json
@@ -18,7 +18,7 @@
"casing": "223_casing",
"range": 36,
"//": "Balanced as FMJ rather than JHP, as M855A1 is steel core and would fit better as AP.",
- "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 24 },
+ "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 },
"dispersion": 30,
"recoil": 1500,
"effects": [ "COOKOFF" ]
@@ -32,8 +32,8 @@
"price": 290,
"price_postapoc": 900,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 13 }, "dispersion": -10 },
+ "//": "Balanced as AP, 7/8 damage, arpen 6/7 of that value.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 14 }, "dispersion": -10 },
"proportional": { "recoil": 1.1 },
"extend": { "effects": [ "NEVER_MISFIRES" ] }
},
diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
index 6ca0814d2e2..8a9139df52c 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": 60, "armor_penetration": 34 },
+ "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 26 },
"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 2f4335daa40..be8462b330c 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": 39 },
+ "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 17 },
"dispersion": 15,
"recoil": 4000,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json
index b2c82f419bf..ee10a10f0ad 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": 35 },
+ "damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 27 },
"dispersion": 20,
"recoil": 3800,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
index 815d1a1702d..4e9b193b5e7 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": 24 },
+ "damage": { "damage_type": "bullet", "amount": 43, "armor_penetration": 19 },
"dispersion": 30,
"recoil": 2000,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
index bbf6d3701ec..52e9c588eda 100644
--- a/data/json/items/ammo/308.json
+++ b/data/json/items/ammo/308.json
@@ -18,7 +18,7 @@
"casing": "308_casing",
"range": 65,
"//": "Balanced as FMJ rather than JHP.",
- "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 31 },
+ "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 24 },
"dispersion": 15,
"recoil": 3000,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
index bc4f6de6ecb..048d32d35c7 100644
--- a/data/json/items/ammo/4570.json
+++ b/data/json/items/ammo/4570.json
@@ -17,8 +17,8 @@
"ammo_type": "4570",
"casing": "4570_casing",
"range": 48,
- "//": "Balanced as FMJ, half the expected armor penetration.",
- "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 16 },
+ "//": "Balanced as FMJ.",
+ "damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 25 },
"dispersion": 20,
"recoil": 4300,
"effects": [ "COOKOFF" ]
@@ -33,8 +33,8 @@
"price_postapoc": 600,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
- "//": "Balanced as +P, 75% of the expected armor penetration.",
- "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14, "armor_penetration": 8 }, "recoil": 300 }
+ "//": "Balanced as +P.",
+ "relative": { "range": 2, "damage": { "damage_type": "bullet", "amount": 14 }, "recoil": 300 }
},
{
"id": "4570_low",
@@ -45,6 +45,6 @@
"price": 250,
"price_postapoc": 400,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 }
+ "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 }
},
{
diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
index 3edf19bbc59..3338049784d 100644
--- a/data/json/items/ammo/50.json
+++ b/data/json/items/ammo/50.json
@@ -28,7 +28,7 @@
"casing": "50_casing",
"range": 110,
"//": "Base damage of 131, balance reduction to roughly 75%.",
- "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 56 },
+ "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 44 },
"dispersion": 150,
"recoil": 5000,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
@@ -51,7 +51,7 @@
"description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel. Penetration is increased, but damage is reduced.",
"count": 10,
"//": "Balanced as AP, 7/8 damage, arpen matches damage.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 32 } },
+ "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 31 } },
"dispersion": 600
},
{
diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
index 1ef50ff5e28..de5d665d24d 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": 23 },
+ "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 18 },
"dispersion": 30,
"recoil": 1400,
"effects": [ "COOKOFF" ]
@@ -34,7 +34,7 @@
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"symbol": "=",
"color": "yellow",
- "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
+ "//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.",
"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 94dd6064806..98df0003da4 100644
--- a/data/json/items/ammo/700nx.json
+++ b/data/json/items/ammo/700nx.json
@@ -17,8 +17,8 @@
"ammo_type": "700nx",
"casing": "700nx_casing",
"range": 42,
- "//": "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 },
+ "//": "Base damage of 110, balance reduction to roughly 80%.",
+ "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 39 },
"dispersion": 15,
"recoil": 12100,
"effects": [ "COOKOFF" ]
diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
index 959458c8f4c..fbff61d9966 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": 25 },
+ "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 20 },
"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 1bbdeab478b..288626ab191 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": 30 },
+ "damage": { "damage_type": "bullet", "amount": 54, "armor_penetration": 24 },
"dispersion": 15,
"recoil": 2650,
"effects": [ "COOKOFF" ]
--
2.39.1
|
