Skip to content

Commit a47f941

Browse files
ehughsbairdehughsbaird
authored
More JSON error reporting for extend/delete/relative/proportional (#82126)
1 parent 4ad8536 commit a47f941

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+566
-327
lines changed

‎data/json/items/ammo/10mm.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"dispersion": 1.2
9191
},
9292
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
93-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
93+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
9494
},
9595
{
9696
"id": "reloaded_10mm_fmj",
@@ -100,7 +100,7 @@
100100
"name": { "str_sp": "10mm Auto FMJ, reloaded" },
101101
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
102102
"extend": { "effects": [ "RECYCLED" ] },
103-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
103+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
104104
},
105105
{
106106
"id": "matchhead_10mm_fmj",
@@ -126,7 +126,7 @@
126126
"dispersion": 1.2
127127
},
128128
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
129-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
129+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
130130
},
131131
{
132132
"id": "reloaded_10mm_jhp",
@@ -136,7 +136,7 @@
136136
"name": { "str_sp": "10mm Auto JHP, reloaded" },
137137
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
138138
"extend": { "effects": [ "RECYCLED" ] },
139-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
139+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
140140
},
141141
{
142142
"id": "matchhead_10mm_jhp",
@@ -156,6 +156,6 @@
156156
"name": { "str_sp": "10mm Auto +P, reloaded" },
157157
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
158158
"extend": { "effects": [ "RECYCLED" ] },
159-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
159+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
160160
}
161161
]

‎data/json/items/ammo/22.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"dispersion": 1.2
8484
},
8585
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
86-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
86+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
8787
},
8888
{
8989
"id": "bp_22_lr",
@@ -98,7 +98,7 @@
9898
"dispersion": 1.2
9999
},
100100
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
101-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
101+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
102102
},
103103
{
104104
"id": "reloaded_22_lr",
@@ -108,7 +108,7 @@
108108
"name": { "str_sp": ".22 LR, reloaded" },
109109
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
110110
"extend": { "effects": [ "RECYCLED" ] },
111-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
111+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
112112
},
113113
{
114114
"id": "reloaded_22_fmj",
@@ -118,7 +118,7 @@
118118
"name": { "str_sp": ".22 LR FMJ, reloaded" },
119119
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
120120
"extend": { "effects": [ "RECYCLED" ] },
121-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
121+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
122122
},
123123
{
124124
"id": "matchhead_22_fmj",

‎data/json/items/ammo/223.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
"dispersion": 1.2
159159
},
160160
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
161-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
161+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
162162
},
163163
{
164164
"id": "bp_556",
@@ -173,7 +173,7 @@
173173
"dispersion": 1.2
174174
},
175175
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
176-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
176+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
177177
},
178178
{
179179
"id": "bp_556_incendiary",
@@ -188,7 +188,7 @@
188188
"dispersion": 1.2
189189
},
190190
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
191-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
191+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
192192
},
193193
{
194194
"id": "reloaded_223",
@@ -198,7 +198,7 @@
198198
"name": { "str_sp": ".223 Remington, reloaded" },
199199
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
200200
"extend": { "effects": [ "RECYCLED" ] },
201-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
201+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
202202
},
203203
{
204204
"id": "reloaded_556",
@@ -208,7 +208,7 @@
208208
"name": { "str_sp": "5.56x45mm NATO, reloaded" },
209209
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
210210
"extend": { "effects": [ "RECYCLED" ] },
211-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
211+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
212212
},
213213
{
214214
"id": "reloaded_556_incendiary",
@@ -218,6 +218,6 @@
218218
"name": { "str_sp": "5.56x45mm NATO tracer, reloaded" },
219219
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
220220
"extend": { "effects": [ "RECYCLED" ] },
221-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
221+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
222222
}
223223
]

‎data/json/items/ammo/270win.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
"recoil": 0.76,
146146
"dispersion": 1.2
147147
},
148-
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
149-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
148+
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
150149
}
151150
]

‎data/json/items/ammo/300.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"dispersion": 1.2
9494
},
9595
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
96-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
96+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
9797
},
9898
{
9999
"id": "reloaded_300_winmag",
@@ -103,6 +103,6 @@
103103
"name": { "str_sp": ".300 Winchester Magnum JHP, reloaded" },
104104
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
105105
"extend": { "effects": [ "RECYCLED" ] },
106-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
106+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
107107
}
108108
]

‎data/json/items/ammo/3006.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"dispersion": 1.2
106106
},
107107
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
108-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
108+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
109109
},
110110
{
111111
"id": "reloaded_3006_jsp",
@@ -115,7 +115,7 @@
115115
"name": { "str_sp": ".30-06 JSP, reloaded" },
116116
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
117117
"extend": { "effects": [ "RECYCLED" ] },
118-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
118+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
119119
},
120120
{
121121
"id": "3006_incendiary",
@@ -151,7 +151,7 @@
151151
"dispersion": 1.2
152152
},
153153
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
154-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
154+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
155155
},
156156
{
157157
"id": "bp_3006_incendiary",
@@ -166,7 +166,7 @@
166166
"dispersion": 1.2
167167
},
168168
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
169-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
169+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
170170
},
171171
{
172172
"id": "bp_3006fmj",
@@ -181,7 +181,7 @@
181181
"dispersion": 1.2
182182
},
183183
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
184-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
184+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
185185
},
186186
{
187187
"id": "reloaded_3006",
@@ -191,7 +191,7 @@
191191
"name": { "str_sp": ".30-06 FMJ, reloaded" },
192192
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
193193
"extend": { "effects": [ "RECYCLED" ] },
194-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
194+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
195195
},
196196
{
197197
"id": "reloaded_3006_incendiary",
@@ -201,7 +201,7 @@
201201
"name": { "str_sp": ".30-06 tracer, reloaded" },
202202
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
203203
"extend": { "effects": [ "RECYCLED" ] },
204-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
204+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
205205
},
206206
{
207207
"id": "reloaded_3006fmj",
@@ -211,6 +211,6 @@
211211
"name": { "str_sp": ".30-06 M2 AP, reloaded" },
212212
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
213213
"extend": { "effects": [ "RECYCLED" ] },
214-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
214+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
215215
}
216216
]

‎data/json/items/ammo/300blk.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"dispersion": 1.2
8888
},
8989
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
90-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
90+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
9191
},
9292
{
9393
"id": "reloaded_300blk",
@@ -97,7 +97,7 @@
9797
"name": { "str_sp": ".300 AAC Blackout, reloaded" },
9898
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
9999
"extend": { "effects": [ "RECYCLED" ] },
100-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
100+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
101101
},
102102
{
103103
"id": "bp_300blk_ss",
@@ -113,7 +113,7 @@
113113
"dispersion": 1.2
114114
},
115115
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
116-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
116+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
117117
},
118118
{
119119
"id": "reloaded_300blk_ss",
@@ -124,6 +124,6 @@
124124
"name": { "str_sp": ".300 AAC Blackout subsonic, reloaded" },
125125
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
126126
"extend": { "effects": [ "RECYCLED" ] },
127-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
127+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
128128
}
129129
]

‎data/json/items/ammo/303.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"dispersion": 1.2
113113
},
114114
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
115-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
115+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
116116
},
117117
{
118118
"id": "bp_303sp",
@@ -128,7 +128,7 @@
128128
"dispersion": 1.2
129129
},
130130
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
131-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
131+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
132132
},
133133
{
134134
"id": "bp_303fmj",
@@ -144,7 +144,7 @@
144144
"dispersion": 1.2
145145
},
146146
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
147-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
147+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
148148
},
149149
{
150150
"id": "reloaded_303",
@@ -154,7 +154,7 @@
154154
"name": { "str_sp": ".303 British OTM, reloaded" },
155155
"proportional": { "price": 0.7, "price_postapoc": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
156156
"extend": { "effects": [ "RECYCLED" ] },
157-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
157+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
158158
},
159159
{
160160
"id": "reloaded_303sp",
@@ -164,7 +164,7 @@
164164
"name": { "str_sp": ".303 British JSP, reloaded" },
165165
"proportional": { "price": 0.7, "price_postapoc": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
166166
"extend": { "effects": [ "RECYCLED" ] },
167-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
167+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
168168
},
169169
{
170170
"id": "reloaded_303fmj",
@@ -174,6 +174,6 @@
174174
"name": { "str_sp": ".303 British FMJ, reloaded" },
175175
"proportional": { "price": 0.7, "price_postapoc": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
176176
"extend": { "effects": [ "RECYCLED" ] },
177-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
177+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
178178
}
179179
]

‎data/json/items/ammo/308.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@
9393
"description": ".308 Winchester ammunition with a 168gr hollow point bullet. The .308 cartridge is one of the most popular hunting cartridges in the world due to its accuracy and power.",
9494
"relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -4 }, "dispersion": -10 },
9595
"proportional": { "recoil": 0.909 },
96-
"casing": "308_casing",
97-
"delete": { "effects": [ "NEVER_MISFIRES" ] }
96+
"casing": "308_casing"
9897
},
9998
{
10099
"id": "762_51_incendiary",

‎data/json/items/ammo/30carbine.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"dispersion": 1.2
8484
},
8585
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
86-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
86+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
8787
},
8888
{
8989
"id": "reloaded_30carbine_jsp",
@@ -118,7 +118,7 @@
118118
"dispersion": 1.2
119119
},
120120
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
121-
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
121+
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
122122
},
123123
{
124124
"id": "reloaded_30carbine",

0 commit comments

Comments
 (0)