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
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
|
--- a/data/json/items/ammo/20x66mm.json
+++ b/data/json/items/ammo/20x66mm.json
@@ -1,5 +1,35 @@
[
{
+ "abstract": "20x66_shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "20x66mm buckshot" },
+ "//": "2.5x the Generic Rate of $1/shot",
+ "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "weight": "56 g",
+ "volume": "250 ml",
+ "price": 1500,
+ "price_postapoc": 4000,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "material": [ "steel", "powder" ],
+ "symbol": "=",
+ "color": "pink",
+ "count": 20,
+ "stack_size": 20,
+ "ammo_type": "20x66mm",
+ "range": 12,
+ "damage": { "damage_type": "bullet", "amount": 100 },
+ "recoil": 2500,
+ "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
+ },
+ {
+ "id": "20x66_shot",
+ "copy-from": "20x66_shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "20x66mm buckshot" },
+ "//": "2.5x the Generic Rate of $1/shot",
+ "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded."
+ },
+ {
"id": "20x66_beanbag",
"copy-from": "20x66_shot",
"type": "AMMO",
@@ -14,6 +45,19 @@
"extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
},
{
+ "id": "20x66_flechette",
+ "copy-from": "20x66_shot",
+ "type": "AMMO",
+ "name": { "str": "20x66mm flechette" },
+ "description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "price": 4000,
+ "price_postapoc": 4000,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "count": 10,
+ "//": "Balanced as AP.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
+ },
+ {
"id": "20x66_flechette_reloaded",
"copy-from": "20x66_flechette",
"type": "AMMO",
@@ -34,6 +78,21 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "20x66_slug",
+ "copy-from": "20x66_shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "20x66mm slug" },
+ "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "price": 1500,
+ "price_postapoc": 4000,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "//": "Balanced as FMJ",
+ "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
+ "relative": { "range": 20 },
+ "proportional": { "dispersion": 1.3 },
+ "delete": { "effects": [ "SHOT" ] }
+ },
+ {
"id": "20x66_slug_reloaded",
"copy-from": "20x66_slug",
"type": "AMMO",
@@ -75,19 +134,6 @@
"effects": [ "NO_EMBED" ]
},
{
- "id": "20x66_flechette",
- "copy-from": "20x66_shot",
- "type": "AMMO",
- "name": { "str": "20x66mm flechette" },
- "description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 4000,
- "price_postapoc": 4000,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "count": 10,
- "//": "Balanced as AP.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
- },
- {
"id": "20x66_frag",
"copy-from": "20x66_slug",
"type": "AMMO",
@@ -111,50 +157,5 @@
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
"extend": { "effects": [ "INCENDIARY" ] }
- },
- {
- "abstract": "20x66_shot_abstract",
- "type": "AMMO",
- "name": { "str": "20x66mm buckshot" },
- "//": "2.5x the Generic Rate of $1/shot",
- "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "weight": "56 g",
- "volume": "250 ml",
- "price": 1500,
- "price_postapoc": 4000,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "material": [ "steel", "powder" ],
- "symbol": "=",
- "color": "pink",
- "count": 20,
- "stack_size": 20,
- "ammo_type": "20x66mm",
- "range": 20,
- "damage": { "damage_type": "bullet", "amount": 100 },
- "recoil": 2500,
- "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
- },
- {
- "id": "20x66_shot",
- "copy-from": "20x66_shot_abstract",
- "type": "AMMO",
- "name": { "str": "20x66mm buckshot" },
- "//": "2.5x the Generic Rate of $1/shot",
- "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded."
- },
- {
- "id": "20x66_slug",
- "copy-from": "20x66_shot_abstract",
- "type": "AMMO",
- "name": { "str": "20x66mm slug" },
- "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 1500,
- "price_postapoc": 4000,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "//": "Balanced as FMJ",
- "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
- "relative": { "range": 20 },
- "proportional": { "dispersion": 1.3 },
- "delete": { "effects": [ "SHOT" ] }
}
]
--- a/data/json/items/ammo/22.json
+++ b/data/json/items/ammo/22.json
@@ -1,16 +1,5 @@
[
{
- "id": "22_cphp",
- "copy-from": "22_lr",
- "type": "AMMO",
- "name": { "str": ".22 CPHP" },
- "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
- "//": "Hollowpoint damage increase of 25%",
- "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 },
- "relative": { "range": 3 },
- "proportional": { "recoil": 1.5 }
- },
- {
"id": "22_lr",
"type": "AMMO",
"name": { "str": ".22 LR" },
@@ -35,6 +24,17 @@
"effects": [ "COOKOFF" ]
},
{
+ "id": "22_cphp",
+ "copy-from": "22_lr",
+ "type": "AMMO",
+ "name": { "str": ".22 CPHP" },
+ "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
+ "//": "Hollowpoint damage increase of 25%",
+ "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 },
+ "relative": { "range": 3 },
+ "proportional": { "recoil": 1.5 }
+ },
+ {
"id": "22_ratshot",
"copy-from": "22_cphp",
"type": "AMMO",
--- a/data/json/items/ammo/38.json
+++ b/data/json/items/ammo/38.json
@@ -1,14 +1,5 @@
[
{
- "id": "38_fmj",
- "copy-from": "38_special",
- "type": "AMMO",
- "name": { "str": ".38 FMJ" },
- "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.",
- "//": "Base damage of 20, balance increase of two-nineths.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } }
- },
- {
"id": "38_special",
"type": "AMMO",
"name": { "str": ".38 Special" },
@@ -33,6 +24,15 @@
"effects": [ "COOKOFF" ]
},
{
+ "id": "38_fmj",
+ "copy-from": "38_special",
+ "type": "AMMO",
+ "name": { "str": ".38 FMJ" },
+ "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.",
+ "//": "Base damage of 20, balance increase of two-nineths.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } }
+ },
+ {
"id": "bp_38_fmj",
"copy-from": "38_fmj",
"type": "AMMO",
--- a/data/json/items/ammo/40.json
+++ b/data/json/items/ammo/40.json
@@ -1,14 +1,5 @@
[
{
- "id": "40fmj",
- "copy-from": "40sw",
- "type": "AMMO",
- "name": { "str": ".40 S&W FMJ" },
- "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
- "//": "Base damage of 23, balance increase of two-nineths.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } }
- },
- {
"id": "40sw",
"type": "AMMO",
"name": { "str": ".40 S&W JHP" },
@@ -33,6 +24,15 @@
"effects": [ "COOKOFF" ]
},
{
+ "id": "40fmj",
+ "copy-from": "40sw",
+ "type": "AMMO",
+ "name": { "str": ".40 S&W FMJ" },
+ "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
+ "//": "Base damage of 23, balance increase of two-nineths.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } }
+ },
+ {
"id": "bp_40fmj",
"copy-from": "40fmj",
"type": "AMMO",
--- a/data/json/items/ammo/44.json
+++ b/data/json/items/ammo/44.json
@@ -1,14 +1,5 @@
[
{
- "id": "44fmj",
- "copy-from": "44magnum",
- "type": "AMMO",
- "name": { "str": ".44 Magnum FMJ" },
- "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.",
- "//": "Base damage of 36, balance increase of one-nineth.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } }
- },
- {
"id": "44magnum",
"type": "AMMO",
"name": { "str": ".44 Magnum" },
@@ -33,6 +24,15 @@
"effects": [ "COOKOFF" ]
},
{
+ "id": "44fmj",
+ "copy-from": "44magnum",
+ "type": "AMMO",
+ "name": { "str": ".44 Magnum FMJ" },
+ "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.",
+ "//": "Base damage of 36, balance increase of one-nineth.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } }
+ },
+ {
"id": "bp_44magnum",
"copy-from": "44magnum",
"type": "AMMO",
--- a/data/json/items/ammo/45.json
+++ b/data/json/items/ammo/45.json
@@ -1,14 +1,5 @@
[
{
- "id": "45_acp",
- "copy-from": "45_jhp",
- "type": "AMMO",
- "name": { "str": ".45 ACP FMJ" },
- "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
- "//": "Base damage of 27, balance increase of two-nineths.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } }
- },
- {
"id": "45_jhp",
"type": "AMMO",
"name": { "str": ".45 ACP JHP" },
@@ -32,6 +23,15 @@
"effects": [ "COOKOFF" ]
},
{
+ "id": "45_acp",
+ "copy-from": "45_jhp",
+ "type": "AMMO",
+ "name": { "str": ".45 ACP FMJ" },
+ "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
+ "//": "Base damage of 27, balance increase of two-nineths.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } }
+ },
+ {
"id": "45_super",
"copy-from": "45_jhp",
"type": "AMMO",
--- a/data/json/items/ammo/460.json
+++ b/data/json/items/ammo/460.json
@@ -1,13 +1,5 @@
[
{
- "id": "460_fmj",
- "copy-from": "460_rowland",
- "type": "AMMO",
- "name": { "str": ".460 Rowland HCFN" },
- "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
- },
- {
"id": "460_rowland",
"copy-from": "44magnum",
"type": "AMMO",
@@ -18,6 +10,14 @@
"proportional": { "range": 0.95, "damage": { "damage_type": "bullet", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 }
},
{
+ "id": "460_fmj",
+ "copy-from": "460_rowland",
+ "type": "AMMO",
+ "name": { "str": ".460 Rowland HCFN" },
+ "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
+ },
+ {
"id": "bp_460_fmj",
"copy-from": "460_fmj",
"type": "AMMO",
--- a/data/json/items/ammo/50.json
+++ b/data/json/items/ammo/50.json
@@ -1,15 +1,5 @@
[
{
- "id": "50_incendiary",
- "copy-from": "50bmg",
- "type": "AMMO",
- "name": { "str": ".50 BMG M17 tracer" },
- "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
- "count": 10,
- "effects": [ "INCENDIARY" ],
- "dispersion": 310
- },
- {
"id": "50bmg",
"type": "AMMO",
"name": { "str": ".50 BMG M33 Ball" },
@@ -34,6 +24,16 @@
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
},
{
+ "id": "50_incendiary",
+ "copy-from": "50bmg",
+ "type": "AMMO",
+ "name": { "str": ".50 BMG M17 tracer" },
+ "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
+ "count": 10,
+ "effects": [ "INCENDIARY" ],
+ "dispersion": 310
+ },
+ {
"id": "50match",
"copy-from": "50bmg",
"type": "AMMO",
--- a/data/json/items/ammo/8x40mm.json
+++ b/data/json/items/ammo/8x40mm.json
@@ -1,5 +1,36 @@
[
{
+ "id": "8mm_caseless",
+ "type": "AMMO",
+ "name": { "str_sp": "8x40mm caseless" },
+ "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
+ "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "weight": "12 g",
+ "volume": "250 ml",
+ "price": 225,
+ "price_postapoc": 8000,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "material": [ "plastic", "powder" ],
+ "symbol": "=",
+ "color": "pink",
+ "count": 40,
+ "stack_size": 40,
+ "ammo_type": "8x40mm",
+ "range": 42,
+ "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
+ "dispersion": 75,
+ "recoil": 2200,
+ "effects": [ "NEVER_MISFIRES" ]
+ },
+ {
+ "id": "8mm_jhp",
+ "copy-from": "8mm_caseless",
+ "type": "AMMO",
+ "name": { "str": "8x40mm JHP" },
+ "description": "8x40mm caseless rounds, jacketed hollowpoint. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } }
+ },
+ {
"id": "8mm_jhp_reloaded",
"copy-from": "8mm_jhp",
"type": "AMMO",
@@ -20,6 +51,19 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "8mm_hvp",
+ "copy-from": "8mm_caseless",
+ "type": "AMMO",
+ "name": { "str": "8x40mm HVP" },
+ "description": "8x40mm caseless rounds, saboted high-velocity penetrator type. Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "price": 2500,
+ "price_postapoc": 50000,
+ "count": 20,
+ "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
+ "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
+ "proportional": { "dispersion": 1.5, "recoil": 1.5 }
+ },
+ {
"id": "8mm_hvp_reloaded",
"copy-from": "8mm_hvp",
"type": "AMMO",
@@ -30,6 +74,16 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "8mm_inc",
+ "copy-from": "8mm_caseless",
+ "type": "AMMO",
+ "name": { "str": "8x40mm tracer" },
+ "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "count": 20,
+ "proportional": { "dispersion": 0.8 },
+ "extend": { "effects": [ "INCENDIARY" ] }
+ },
+ {
"id": "8mm_inc_reloaded",
"copy-from": "8mm_inc",
"type": "AMMO",
@@ -40,29 +94,6 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
- "id": "8mm_caseless",
- "type": "AMMO",
- "name": { "str_sp": "8x40mm caseless" },
- "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
- "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
- "weight": "12 g",
- "volume": "250 ml",
- "price": 225,
- "price_postapoc": 8000,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "material": [ "plastic", "powder" ],
- "symbol": "=",
- "color": "pink",
- "count": 40,
- "stack_size": 40,
- "ammo_type": "8x40mm",
- "range": 42,
- "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
- "dispersion": 75,
- "recoil": 2200,
- "effects": [ "NEVER_MISFIRES" ]
- },
- {
"id": "8mm_civilian",
"copy-from": "8mm_caseless",
"type": "AMMO",
@@ -83,36 +114,5 @@
"dispersion": 1.2,
"recoil": 0.5
}
- },
- {
- "id": "8mm_hvp",
- "copy-from": "8mm_caseless",
- "type": "AMMO",
- "name": { "str": "8x40mm HVP" },
- "description": "8x40mm caseless rounds, saboted high-velocity penetrator type. Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 2500,
- "price_postapoc": 50000,
- "count": 20,
- "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
- "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
- "proportional": { "dispersion": 1.5, "recoil": 1.5 }
- },
- {
- "id": "8mm_inc",
- "copy-from": "8mm_caseless",
- "type": "AMMO",
- "name": { "str": "8x40mm tracer" },
- "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
- "count": 20,
- "proportional": { "dispersion": 0.8 },
- "extend": { "effects": [ "INCENDIARY" ] }
- },
- {
- "id": "8mm_jhp",
- "copy-from": "8mm_caseless",
- "type": "AMMO",
- "name": { "str": "8x40mm JHP" },
- "description": "8x40mm caseless rounds, jacketed hollowpoint. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
- "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } }
}
]
--- a/data/json/items/ammo/shot.json
+++ b/data/json/items/ammo/shot.json
@@ -1,5 +1,50 @@
[
{
+ "abstract": "shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "00 shot" },
+ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
+ "weight": "32 g",
+ "volume": "250 ml",
+ "price": 500,
+ "price_postapoc": 800,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "material": [ "plastic", "powder" ],
+ "symbol": "=",
+ "color": "red",
+ "dispersion": 10,
+ "count": 20,
+ "stack_size": 20,
+ "ammo_type": "shot",
+ "casing": "shot_hull",
+ "range": 12,
+ "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
+ "recoil": 2500,
+ "loudness": 160,
+ "effects": [ "COOKOFF", "SHOT" ]
+ },
+ {
+ "id": "shot_00",
+ "copy-from": "shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "00 shot" },
+ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces."
+ },
+ {
+ "id": "shot_bird",
+ "copy-from": "shot_00",
+ "type": "AMMO",
+ "name": { "str": "birdshot" },
+ "description": "Weak shotgun ammunition. Designed for hunting birds and other small game, its applications in combat are very limited.",
+ "price": 100,
+ "price_postapoc": 400,
+ "range": 0,
+ "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
+ "loudness": 80,
+ "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+ "extend": { "effects": [ "NOGIB" ] }
+ },
+ {
"id": "reloaded_shot_bird",
"copy-from": "shot_bird",
"type": "AMMO",
@@ -9,6 +54,21 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "shot_dragon",
+ "copy-from": "shot_00",
+ "type": "AMMO",
+ "name": { "str": "dragon's breath shell" },
+ "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool. When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
+ "price": 1000,
+ "price_postapoc": 1600,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "damage": { "damage_type": "heat", "amount": 30 },
+ "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+ "range": 0,
+ "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+ "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+ },
+ {
"id": "reloaded_shot_dragon",
"copy-from": "shot_dragon",
"type": "AMMO",
@@ -27,6 +87,19 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "shot_flechette",
+ "copy-from": "shot_00",
+ "type": "AMMO",
+ "name": { "str": "flechette shell" },
+ "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
+ "price": 2000,
+ "price_postapoc": 800,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "count": 10,
+ "//": "Balanced as standard AP.",
+ "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
+ },
+ {
"id": "reloaded_shot_flechette",
"copy-from": "shot_flechette",
"type": "AMMO",
@@ -36,6 +109,21 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
+ "id": "shot_slug",
+ "copy-from": "shot_abstract",
+ "type": "AMMO",
+ "name": { "str": "shotgun slug" },
+ "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
+ "price": 400,
+ "price_postapoc": 400,
+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+ "dispersion": 80,
+ "//": "Balanced as FMJ",
+ "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } },
+ "proportional": { "recoil": 1.4 },
+ "delete": { "effects": [ "SHOT" ] }
+ },
+ {
"id": "reloaded_shot_slug",
"copy-from": "shot_slug",
"type": "AMMO",
@@ -89,37 +177,6 @@
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
- "abstract": "shot_abstract",
- "type": "AMMO",
- "name": { "str": "00 shot" },
- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
- "weight": "32 g",
- "volume": "250 ml",
- "price": 500,
- "price_postapoc": 800,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "material": [ "plastic", "powder" ],
- "symbol": "=",
- "color": "red",
- "dispersion": 10,
- "count": 20,
- "stack_size": 20,
- "ammo_type": "shot",
- "casing": "shot_hull",
- "range": 20,
- "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
- "recoil": 2500,
- "loudness": 160,
- "effects": [ "COOKOFF", "SHOT" ]
- },
- {
- "id": "shot_00",
- "copy-from": "shot_abstract",
- "type": "AMMO",
- "name": { "str": "00 shot" },
- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces."
- },
- {
"id": "shot_beanbag",
"copy-from": "shot_00",
"type": "AMMO",
@@ -133,48 +191,6 @@
"extend": { "effects": [ "BEANBAG", "NOGIB" ] }
},
{
- "id": "shot_bird",
- "copy-from": "shot_00",
- "type": "AMMO",
- "name": { "str": "birdshot" },
- "description": "Weak shotgun ammunition. Designed for hunting birds and other small game, its applications in combat are very limited.",
- "price": 100,
- "price_postapoc": 400,
- "range": 0,
- "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
- "loudness": 80,
- "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
- "extend": { "effects": [ "NOGIB" ] }
- },
- {
- "id": "shot_dragon",
- "copy-from": "shot_00",
- "type": "AMMO",
- "name": { "str": "dragon's breath shell" },
- "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool. When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
- "price": 1000,
- "price_postapoc": 1600,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "damage": { "damage_type": "heat", "amount": 30 },
- "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
- "range": 0,
- "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
- "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
- },
- {
- "id": "shot_flechette",
- "copy-from": "shot_00",
- "type": "AMMO",
- "name": { "str": "flechette shell" },
- "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
- "price": 2000,
- "price_postapoc": 800,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "count": 10,
- "//": "Balanced as standard AP.",
- "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
- },
- {
"id": "shot_he",
"copy-from": "shot_slug",
"type": "AMMO",
@@ -207,20 +222,5 @@
"proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } },
"extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
- },
- {
- "id": "shot_slug",
- "copy-from": "shot_abstract",
- "type": "AMMO",
- "name": { "str": "shotgun slug" },
- "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
- "price": 400,
- "price_postapoc": 400,
- "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
- "dispersion": 80,
- "//": "Balanced as FMJ",
- "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } },
- "proportional": { "recoil": 1.4 },
- "delete": { "effects": [ "SHOT" ] }
}
]
|