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
|
--- 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": "stab", "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": "stab", "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": "stab", "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": "stab", "amount": -6, "armor_penetration": 14 } }
+ },
+ {
"id": "reloaded_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": "stab", "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": "stab", "amount": -7, "armor_penetration": 16 } }
+ },
+ {
"id": "bp_40fmj",
"copy-from": "40fmj",
"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": "stab", "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": "stab", "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": "stab", "amount": -4, "armor_penetration": 8 } }
- },
- {
"id": "460_rowland",
"copy-from": "44magnum",
"type": "AMMO",
@@ -18,6 +10,14 @@
"proportional": { "range": 0.95, "damage": { "damage_type": "stab", "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": "stab", "amount": -4, "armor_penetration": 8 } }
+ },
+ {
"id": "bp_460_fmj",
"copy-from": "460_fmj",
"type": "AMMO",
|
