summaryrefslogtreecommitdiff
path: root/ammo-01_inconsistent-ammo-names.patch
blob: bdb28ca96c4692cb110e1a7ac18b1dfbec1ee67b (plain)
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
--- a/data/json/items/ammo/223.json
+++ b/data/json/items/ammo/223.json
@@ -74,7 +74,7 @@
     "id": "556_incendiary",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str_sp": "5.56 NATO tracer" },
+    "name": { "str_sp": "5.56 NATO M856 tracer" },
     "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  They have the potential to ignite flammable surfaces at their point of impact.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -97,7 +97,7 @@
     "id": "bp_556",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str_sp": "5.56 NATO, black powder" },
+    "name": { "str_sp": "5.56 NATO M855A1, black powder" },
     "description": "5.56x45mm ammunition with a 62gr FMJ bullet.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
@@ -112,7 +112,7 @@
     "id": "bp_556_incendiary",
     "copy-from": "556_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": "5.56 NATO tracer, black powder" },
+    "name": { "str_sp": "5.56 NATO M856 tracer, black powder" },
     "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
@@ -137,7 +137,7 @@
     "id": "reloaded_556",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str_sp": "5.56 NATO, reloaded" },
+    "name": { "str_sp": "5.56 NATO M855A1, reloaded" },
     "description": "5.56x45mm ammunition with a 62gr FMJ bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -147,7 +147,7 @@
     "id": "reloaded_556_incendiary",
     "copy-from": "556_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": "5.56 NATO tracer, reloaded" },
+    "name": { "str_sp": "5.56 NATO M856 tracer, reloaded" },
     "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
--- a/data/json/items/ammo/308.json
+++ b/data/json/items/ammo/308.json
@@ -26,7 +26,7 @@
     "id": "762_51",
     "copy-from": "308",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm M80" },
+    "name": { "str_sp": "7.62x51mm NATO M80" },
     "casing": "762_51_casing",
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
     "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
@@ -37,7 +37,7 @@
     "id": "762_51_incendiary",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm NATO tracer" },
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer" },
     "description": "An M62 tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  They have the potential to ignite flammable surfaces on impact.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -60,7 +60,7 @@
     "id": "bp_762_51",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm, black powder" },
+    "name": { "str_sp": "7.62x51mm NATO M80, black powder" },
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
@@ -75,7 +75,7 @@
     "id": "bp_762_51_incendiary",
     "copy-from": "762_51_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm tracer, black powder" },
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer, black powder" },
     "description": "An M62 tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
@@ -100,7 +100,7 @@
     "id": "reloaded_762_51",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm, reloaded" },
+    "name": { "str_sp": "7.62x51mm NATO M80, reloaded" },
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -110,7 +110,7 @@
     "id": "reloaded_762_51_incendiary",
     "copy-from": "762_51_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x51mm tracer, reloaded" },
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer, reloaded" },
     "description": "An M62 tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  It's been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
--- a/data/json/items/ammo/45.json
+++ b/data/json/items/ammo/45.json
@@ -76,7 +76,7 @@
     "id": "reloaded_45_acp",
     "copy-from": "45_acp",
     "type": "AMMO",
-    "name": { "str_sp": ".45 FMJ, reloaded" },
+    "name": { "str_sp": ".45 ACP FMJ, reloaded" },
     "description": ".45 ACP ammunition with a 230gr FMJ bullet.  Due to a reputation for effectiveness, the .45 ACP round has been common for over a century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
--- a/data/json/items/ammo/50.json
+++ b/data/json/items/ammo/50.json
@@ -70,7 +70,7 @@
     "id": "reloaded_50_incendiary",
     "copy-from": "50_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": ".50 BMG tracer, reloaded" },
+    "name": { "str_sp": ".50 BMG M17 tracer, reloaded" },
     "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.  This one has been hand-reloaded  by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo..",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -90,7 +90,7 @@
     "id": "reloaded_50ss",
     "copy-from": "50ss",
     "type": "AMMO",
-    "name": { "str_sp": ".50 BMG AP, reloaded" },
+    "name": { "str_sp": ".50 BMG M2 AP, reloaded" },
     "description": "A variant of the .50 BMG round that uses a core of hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.  by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -100,7 +100,7 @@
     "id": "bp_50_incendiary",
     "copy-from": "50_incendiary",
     "type": "AMMO",
-    "name": { "str_sp": ".50 BMG tracer, black powder" },
+    "name": { "str_sp": ".50 BMG M17 tracer, black powder" },
     "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.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
@@ -130,7 +130,7 @@
     "id": "bp_50ss",
     "copy-from": "50ss",
     "type": "AMMO",
-    "name": { "str_sp": ".50 BMG AP, black powder" },
+    "name": { "str_sp": ".50 BMG M2 AP, black powder" },
     "description": "A variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
--- a/data/json/items/ammo/5x50.json
+++ b/data/json/items/ammo/5x50.json
@@ -38,7 +38,7 @@
     "id": "reloaded_5x50dart",
     "copy-from": "5x50dart",
     "type": "AMMO",
-    "name": { "str": "5x50mm flechette, reloaded", "str_pl": "5x50mm flechettes, reloaded" },
+    "name": { "str": "RA110 5x50mm flechette, reloaded", "str_pl": "RA110 5x50mm flechettes, reloaded" },
     "price_postapoc": 1200,
     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded by a lucky survivor or perhaps a pre-Cataclysm corporate spy, leading to slightly inferior performance compared to factory-produced ammo.",
     "effects": [ "COOKOFF", "RECYCLED" ],
--- a/data/json/items/ammo/762x25.json
+++ b/data/json/items/ammo/762x25.json
@@ -67,7 +67,7 @@
     "id": "reloaded_762_25",
     "copy-from": "762_25hot",
     "type": "AMMO",
-    "name": { "str_sp": "7.62x25mm, reloaded" },
+    "name": { "str_sp": "7.62x25mm FMJ, reloaded" },
     "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
   }