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
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
|
From aa47f05b61e0b044a0a69f7a58db819f3fe18e0a Mon Sep 17 00:00:00 2001
From: scarf <greenscarf005@gmail.com>
Date: Mon, 13 Nov 2023 16:09:36 +0900
Subject: [PATCH] fix(content): `NON_FOULING` flag not working due to typo
(#3655)
* fix(content): `NON-FOULING` -> `NON_FOULING`
exciting typo fixes
* fix: remove duplicate entries
---
data/json/ammo_effects.json | 5 -----
data/json/ammo_effects_simple.json | 2 +-
data/json/flags.json | 5 -----
data/json/items/ammo.json | 12 ++++++------
data/json/items/ammo/metal_rail.json | 4 ++--
data/json/items/ammo/nail.json | 2 +-
data/json/items/classes/gun.json | 16 ++++++++--------
data/json/items/gun/flammable.json | 2 +-
data/json/items/gun/misc.json | 2 +-
data/json/items/gun/paintball.json | 2 +-
data/json/items/gunmod/rail.json | 2 +-
data/json/items/ranged/spearguns.json | 2 +-
data/json/obsoletion/items.json | 4 ++--
data/mods/Aftershock/items/bioparts.json | 2 +-
data/mods/Aftershock/items/gun/laser.json | 6 +++---
data/mods/Aftershock/items/weapons.json | 4 ++--
data/mods/CRT_EXPANSION/items/crt_gun.json | 20 ++++++++++----------
data/mods/No_Hope/Items/gunmods.json | 2 +-
data/mods/No_Hope/Items/guns.json | 4 ++--
data/mods/TEST_DATA/items.json | 2 +-
src/ranged.cpp | 2 +-
21 files changed, 46 insertions(+), 56 deletions(-)
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
index 8336dd14554..5f0e85035fe 100644
--- a/data/json/ammo_effects.json
+++ b/data/json/ammo_effects.json
@@ -376,10 +376,5 @@
"id": "RECYCLED",
"type": "ammo_effect",
"//": "Nearly-immeasurable chance to fail to fire."
- },
- {
- "id": "NON-FOULING",
- "type": "ammo_effect",
- "//": "Doesn't cause gunk to build up."
}
]
diff --git a/data/json/ammo_effects_simple.json b/data/json/ammo_effects_simple.json
index beb1191f0be..29042cdbfe7 100644
--- a/data/json/ammo_effects_simple.json
+++ b/data/json/ammo_effects_simple.json
@@ -95,7 +95,7 @@
"//": "Doesn't overkill."
},
{
- "id": "NON-FOULING",
+ "id": "NON_FOULING",
"type": "ammo_effect",
"//": "Doesn't cause gunk to build up."
},
diff --git a/data/json/flags.json b/data/json/flags.json
index 796b16e1262..b121cbb023f 100644
--- a/data/json/flags.json
+++ b/data/json/flags.json
@@ -2067,11 +2067,6 @@
"type": "json_flag",
"context": [ ]
},
- {
- "id": "NON-FOULING",
- "type": "json_flag",
- "context": [ ]
- },
{
"id": "PUMP_RAIL_COMPATIBLE",
"type": "json_flag",
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 5adfa2d27ed..5b6b37126d7 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -278,7 +278,7 @@
"to_hit": -1,
"qualities": [ [ "HAMMER", 1 ] ],
"dont_recover_one_in": 80,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "AMMO",
@@ -298,7 +298,7 @@
"dispersion": 14,
"loudness": 0,
"count": 10,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "AMMO",
@@ -362,7 +362,7 @@
"loudness": 0,
"count": 50,
"dont_recover_one_in": 1000,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "AMMO",
@@ -383,7 +383,7 @@
"count": 500,
"stack_size": 200,
"loudness": 9,
- "effects": [ "NOGIB", "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NOGIB", "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "AMMO",
@@ -1080,7 +1080,7 @@
"loudness": 0,
"to_hit": -1,
"dont_recover_one_in": 1000,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "AMMO",
@@ -1100,6 +1100,6 @@
"loudness": 0,
"count": 30,
"dont_recover_one_in": 1000,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
}
]
diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json
index f4ac65c5428..ff40c3dd597 100644
--- a/data/json/items/ammo/metal_rail.json
+++ b/data/json/items/ammo/metal_rail.json
@@ -19,7 +19,7 @@
"range": 20,
"damage": { "damage_type": "stab", "amount": 60, "armor_penetration": 10 },
"dispersion": 200,
- "effects": [ "RECYCLED", "NON-FOULING" ]
+ "effects": [ "RECYCLED", "NON_FOULING" ]
},
{
"id": "steel_rail",
@@ -35,7 +35,7 @@
"material": [ "steel" ],
"color": "light_gray",
"dispersion": 100,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ],
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
"relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
}
]
diff --git a/data/json/items/ammo/nail.json b/data/json/items/ammo/nail.json
index b90889c036c..33602a8bf5a 100644
--- a/data/json/items/ammo/nail.json
+++ b/data/json/items/ammo/nail.json
@@ -29,6 +29,6 @@
"range": 3,
"damage": { "damage_type": "stab", "amount": 4, "armor_penetration": 3 },
"dispersion": 120,
- "effects": [ "NON-FOULING" ]
+ "effects": [ "NON_FOULING" ]
}
]
diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
index 2d8acfc9112..d010aa2dee0 100644
--- a/data/json/items/classes/gun.json
+++ b/data/json/items/classes/gun.json
@@ -163,7 +163,7 @@
"name": { "str": "energy pistol" },
"looks_like": "v29",
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "emitter", 1 ],
@@ -185,7 +185,7 @@
"bashing": 7,
"to_hit": -2,
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ],
"dispersion": 120,
"reload": 600,
"valid_mod_locations": [
@@ -287,7 +287,7 @@
"name": { "str": "energy rifle" },
"looks_like": "laser_rifle",
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "emitter", 1 ],
@@ -309,7 +309,7 @@
"name": { "str": "magnetic rifle" },
"looks_like": "laser_rifle",
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
@@ -331,7 +331,7 @@
"bashing": 8,
"to_hit": -2,
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ],
"dispersion": 90,
"reload": 700,
"valid_mod_locations": [
@@ -353,7 +353,7 @@
"name": { "str": "pneumatic rifle" },
"bashing": 8,
"//": "No conventional faults because it uses non-conventional systems.",
- "flags": [ "NEVER_JAMS", "NON-FOULING", "NEEDS_NO_LUBE" ],
+ "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE" ],
"dispersion": 350,
"reload": 600,
"valid_mod_locations": [ [ "accessories", 3 ], [ "sling", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "stock", 1 ], [ "rail mount", 1 ] ],
@@ -488,7 +488,7 @@
"bashing": 8,
"reload": 200,
"handling": 40,
- "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON-FOULING" ],
+ "flags": [ "NO_UNLOAD", "NEVER_JAMS", "NON_FOULING" ],
"faults": [ ]
},
{
@@ -501,7 +501,7 @@
"bashing": 9,
"skill": "launcher",
"ammo": "chemical_spray",
- "flags": [ "FIRE_50", "NEVER_JAMS", "NON-FOULING" ],
+ "flags": [ "FIRE_50", "NEVER_JAMS", "NON_FOULING" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json
index 2bece97d622..d334d8ec1e1 100644
--- a/data/json/items/gun/flammable.json
+++ b/data/json/items/gun/flammable.json
@@ -41,7 +41,7 @@
"durability": 9,
"modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 4 ] ],
"valid_mod_locations": [ [ "accessories", 4 ], [ "rail", 1 ], [ "grip", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
- "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON-FOULING" ] },
+ "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON_FOULING" ] },
"delete": { "flags": [ "FIRE_100" ] },
"magazines": [ [ "flammable", [ "rm4502", "rm4504" ] ] ]
}
diff --git a/data/json/items/gun/misc.json b/data/json/items/gun/misc.json
index 322d81404a8..a99b8521541 100644
--- a/data/json/items/gun/misc.json
+++ b/data/json/items/gun/misc.json
@@ -32,7 +32,7 @@
"description": "A water cannon from a fire truck. Mounted on a vehicle, it could be used to stop fires or \"protesters\". Or it could be loaded with something more corrosive, for a lot less firefighting and a lot more excessive force.",
"price": 50000,
"material": "steel",
- "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON-FOULING" ],
+ "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON_FOULING" ],
"ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES" ],
"ammo": [ "water", "acid" ],
"weight": "24500 g",
diff --git a/data/json/items/gun/paintball.json b/data/json/items/gun/paintball.json
index 339e78860c2..59854569841 100644
--- a/data/json/items/gun/paintball.json
+++ b/data/json/items/gun/paintball.json
@@ -11,7 +11,7 @@
"price": 8000,
"price_postapoc": 50,
"material": [ "aluminum", "plastic" ],
- "flags": [ "NEVER_JAMS", "NON-FOULING" ],
+ "flags": [ "NEVER_JAMS", "NON_FOULING" ],
"skill": "smg",
"ammo": "paintball",
"weight": "1600 g",
diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json
index c579fea22ad..f65304d5e03 100644
--- a/data/json/items/gunmod/rail.json
+++ b/data/json/items/gunmod/rail.json
@@ -23,7 +23,7 @@
"clip_size": 1
},
"dispersion_modifier": 60,
- "flags": [ "STR_RELOAD", "NON-FOULING" ]
+ "flags": [ "STR_RELOAD", "NON_FOULING" ]
},
{
"id": "gun_crossbow_mod",
diff --git a/data/json/items/ranged/spearguns.json b/data/json/items/ranged/spearguns.json
index 98b818095e9..d5737ffece7 100644
--- a/data/json/items/ranged/spearguns.json
+++ b/data/json/items/ranged/spearguns.json
@@ -74,7 +74,7 @@
"price": 25000,
"price_postapoc": 1000,
"material": [ "plastic", "steel" ],
- "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NON-FOULING" ],
+ "flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NON_FOULING" ],
"skill": "rifle",
"ammo": "fishspear",
"weight": "3460 g",
diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
index 8a74f66facb..1b7e98f70f6 100644
--- a/data/json/obsoletion/items.json
+++ b/data/json/obsoletion/items.json
@@ -1748,7 +1748,7 @@
"magazine_well": 1,
"magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ],
"min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
- "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ]
+ "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON_FOULING" ]
},
{
"type": "recipe",
@@ -1892,7 +1892,7 @@
"description": "A double-barreled pneumatic air shotgun handcrafted from scrap. Though it's firepower is lacking compared to more conventional shotguns, this thing can still pack quite a punch. That is, if your target is directly in front of you.",
"price": 220000,
"material": [ "steel", "wood" ],
- "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON-FOULING" ],
+ "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON_FOULING" ],
"skill": "shotgun",
"ammo": "shotcanister",
"weight": "3410 g",
diff --git a/data/mods/Aftershock/items/bioparts.json b/data/mods/Aftershock/items/bioparts.json
index a56c060bc27..0b0f75a52ee 100644
--- a/data/mods/Aftershock/items/bioparts.json
+++ b/data/mods/Aftershock/items/bioparts.json
@@ -103,6 +103,6 @@
"loudness": 4,
"clip_size": 80,
"ammo_effects": "ACIDBOMB",
- "flags": [ "NO_UNLOAD", "NON-FOULING" ]
+ "flags": [ "NO_UNLOAD", "NON_FOULING" ]
}
]
diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json
index 9c772880aa2..11fca695807 100644
--- a/data/mods/Aftershock/items/gun/laser.json
+++ b/data/mods/Aftershock/items/gun/laser.json
@@ -15,7 +15,7 @@
"dispersion": 500,
"ups_charges": 25,
"ammo_effects": [ "LASER", "BEANBAG" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
},
{
"id": "afs_sentinel_laser",
@@ -29,7 +29,7 @@
"ups_charges": 30,
"modes": [ [ "MULTI", "trilaser", 3 ] ],
"ammo_effects": [ "LASER" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
},
{
"id": "afs_sentinel_laser_mon",
@@ -37,6 +37,6 @@
"copy-from": "afs_sentinel_laser",
"name": { "str": "wrist-trilaser" },
"ups_charges": 0,
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
}
]
diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json
index 188adf91d10..cdb14e6c75e 100644
--- a/data/mods/Aftershock/items/weapons.json
+++ b/data/mods/Aftershock/items/weapons.json
@@ -187,7 +187,7 @@
"reload": 500,
"valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
"ammo_effects": [ "LASER", "DRAW_AS_LINE" ],
- "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ],
+ "flags": [ "NEVER_JAMS", "FIRE_20", "NON_FOULING" ],
"magazines": [
[ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ]
]
@@ -287,6 +287,6 @@
[ "underbarrel mount", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+ "flags": [ "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
}
]
diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json
index 0d5ab8d9828..0c35599551f 100644
--- a/data/mods/CRT_EXPANSION/items/crt_gun.json
+++ b/data/mods/CRT_EXPANSION/items/crt_gun.json
@@ -33,7 +33,7 @@
[ "underbarrel", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING" ]
},
{
"id": "crt_laser_gatling",
@@ -60,7 +60,7 @@
"modes": [ [ "DEFAULT", "burst", 12 ] ],
"valid_mod_locations": [ [ "accessories", 1 ], [ "emitter", 1 ], [ "grip", 1 ], [ "lens", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ] ],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING" ]
},
{
"id": "crt_laser_carbine",
@@ -96,7 +96,7 @@
[ "underbarrel", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING" ]
},
{
"id": "crt_energy_rifle",
@@ -132,7 +132,7 @@
[ "underbarrel", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING" ]
},
{
"id": "crt_cqb_si",
@@ -195,7 +195,7 @@
[ "underbarrel", 1 ]
],
"ammo_effects": [ "STREAM", "INCENDIARY" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "UNARMED_WEAPON", "DURABLE_MELEE", "NON-FOULING", "PYROMANIAC_WEAPON" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "UNARMED_WEAPON", "DURABLE_MELEE", "NON_FOULING", "PYROMANIAC_WEAPON" ]
},
{
"id": "pelletgun",
@@ -209,7 +209,7 @@
"price": 9900,
"//": "You can get a decent Ruger .177 at walmart for $99",
"material": [ "steel", "plastic" ],
- "flags": [ "STR_RELOAD", "NON-FOULING", "NON-FOULING" ],
+ "flags": [ "STR_RELOAD", "NON_FOULING", "NON_FOULING" ],
"skill": "rifle",
"ammo": "pellets",
"weight": "5023 g",
@@ -252,7 +252,7 @@
"reload": 170,
"valid_mod_locations": [ [ "accessories", 1 ], [ "grip", 1 ], [ "sights", 1 ] ],
"ammo_effects": [ "PLASMA", "INCENDIARY", "DRAW_LASER_BEAM" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON-FOULING", "PYROMANIAC_WEAPON" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "PYROMANIAC_WEAPON" ]
},
{
"id": "ds_rivet_gun",
@@ -308,7 +308,7 @@
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"valid_mod_locations": [ [ "accessories", 1 ], [ "grip", 1 ], [ "sights", 1 ] ],
"ammo_effects": [ "WIDE", "LASER" ],
- "flags": [ "NEVER_JAMS", "NO_UNLOAD", "SLOW_WIELD", "NON-FOULING", "PYROMANIAC_WEAPON" ]
+ "flags": [ "NEVER_JAMS", "NO_UNLOAD", "SLOW_WIELD", "NON_FOULING", "PYROMANIAC_WEAPON" ]
},
{
"id": "ds_pulse_rifle",
@@ -335,7 +335,7 @@
"reload": 15,
"modes": [ [ "BURST", "3 rd.", 3 ] ],
"valid_mod_locations": [ [ "accessories", 1 ], [ "grip", 1 ], [ "sights", 1 ], [ "stock", 1 ] ],
- "ammo_effects": [ "NOGIB", "BEANBAG", "NON-FOULING" ],
+ "ammo_effects": [ "NOGIB", "BEANBAG", "NON_FOULING" ],
"flags": [ "NEVER_JAMS" ]
},
{
@@ -364,6 +364,6 @@
"reload": 450,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "REACH", "em field saw", 5, [ "MELEE", "REACH_ATTACK" ] ] ],
"ammo_effects": [ "LIGHTNING" ],
- "flags": [ "NEVER_JAMS", "NON-FOULING" ]
+ "flags": [ "NEVER_JAMS", "NON_FOULING" ]
}
]
diff --git a/data/mods/No_Hope/Items/gunmods.json b/data/mods/No_Hope/Items/gunmods.json
index cf963326d37..7b2f59aacb0 100644
--- a/data/mods/No_Hope/Items/gunmods.json
+++ b/data/mods/No_Hope/Items/gunmods.json
@@ -202,6 +202,6 @@
},
"dispersion_modifier": 60,
"min_skills": [ [ "weapon", 2 ], [ "rifle", 1 ] ],
- "flags": [ "STR_RELOAD", "NON-FOULING" ]
+ "flags": [ "STR_RELOAD", "NON_FOULING" ]
}
]
diff --git a/data/mods/No_Hope/Items/guns.json b/data/mods/No_Hope/Items/guns.json
index a4e65ddea31..f516809673f 100644
--- a/data/mods/No_Hope/Items/guns.json
+++ b/data/mods/No_Hope/Items/guns.json
@@ -35,7 +35,7 @@
[ "underbarrel mount", 1 ]
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NO_UNLOAD", "NON-FOULING", "NEEDS_NO_LUBE" ]
+ "flags": [ "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
},
{
"id": "bio_blaster_gun",
@@ -503,7 +503,7 @@
"description": "A double-barreled pneumatic air shotgun handcrafted from scrap. Though it's firepower is lacking compared to more conventional shotguns, this thing can still pack quite a punch. That is, if your target is directly in front of you.",
"price": 220000,
"material": [ "steel", "wood" ],
- "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON-FOULING" ],
+ "flags": [ "RELOAD_ONE", "STR_RELOAD", "NON_FOULING" ],
"skill": "shotgun",
"ammo": [ "shotcanister" ],
"weight": "3410 g",
diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
index 9eed603c8b8..cdbc4dd16d6 100644
--- a/data/mods/TEST_DATA/items.json
+++ b/data/mods/TEST_DATA/items.json
@@ -20,7 +20,7 @@
"to_hit": -2,
"qualities": [ [ "HAMMER", 1 ] ],
"dont_recover_one_in": 80,
- "effects": [ "NEVER_MISFIRES", "NON-FOULING" ]
+ "effects": [ "NEVER_MISFIRES", "NON_FOULING" ]
},
{
"type": "GENERIC",
diff --git a/src/ranged.cpp b/src/ranged.cpp
index 0f8def43a5c..ecdfa6384ea 100644
--- a/src/ranged.cpp
+++ b/src/ranged.cpp
@@ -91,7 +91,7 @@ static const ammo_effect_str_id ammo_effect_LIGHTNING( "LIGHTNING" );
static const ammo_effect_str_id ammo_effect_NO_CRIT( "NO_CRIT" );
static const ammo_effect_str_id ammo_effect_NO_EMBED( "NO_EMBED" );
static const ammo_effect_str_id ammo_effect_NO_ITEM_DAMAGE( "NO_ITEM_DAMAGE" );
-static const ammo_effect_str_id ammo_effect_NON_FOULING( "NON-FOULING" );
+static const ammo_effect_str_id ammo_effect_NON_FOULING( "NON_FOULING" );
static const ammo_effect_str_id ammo_effect_PLASMA( "PLASMA" );
static const ammo_effect_str_id ammo_effect_RECYCLED( "RECYCLED" );
static const ammo_effect_str_id ammo_effect_SHATTER_SELF( "SHATTER_SELF" );
--
2.42.0
|
