Skip to content

Commit b96da1f

Browse files
authored
Update gun_variant_validator script (#82462)
* Comply with validator * Update gun_variant_validator
1 parent a2f0807 commit b96da1f

File tree

8 files changed

+104
-110
lines changed

8 files changed

+104
-110
lines changed

data/json/items/gun/22.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"copy-from": "gun_base_22_semi_pistol",
191191
"type": "ITEM",
192192
"subtypes": [ "GUN" ],
193-
"name": { "str": "firefly training pistol" },
193+
"name": { "str": "Firefly training pistol" },
194194
"//": "Was the sig mosquito, has been renamed to the more common GSG firefly",
195195
"description": "A medium sized, .22 caliber semi-automatic pistol, for training with a pistol similar to more powerful pistols. Built from aluminum and polymer components, the weapon is lightweight and concealable, but its chambering is not very powerful.",
196196
"variant_type": "gun",
@@ -636,7 +636,7 @@
636636
"looks_like": "glock19",
637637
"type": "ITEM",
638638
"subtypes": [ "GUN" ],
639-
"name": { "str": "Glock 44" },
639+
"name": { "str": "Glock 44 pistol" },
640640
"description": "A Glock chambered in .22LR. While effective against paper targets and rodents, it will struggle against the walking dead.",
641641
"weight": "358 g",
642642
"volume": "398 ml",

data/json/items/gun/308.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574
"looks_like": "modular_ar15",
575575
"type": "ITEM",
576576
"subtypes": [ "GUN" ],
577-
"name": { "str": "scouting rifle" },
577+
"name": { "str": "scout rifle" },
578578
"description": "This is a versatile, all-purpose hunting rifle. To this end, it is exceedingly lightweight, contains an inbuilt polymer bipod, and fits a spare magazine inside the stock for fast reloading. While these features made for a hunting rifle too universal for widespread adoption, they might yet fulfill a vital scouting niche for survivors in the post-Cataclysm world.",
579579
"variant_type": "gun",
580580
"variants": [

data/json/items/gun/380.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"looks_like": "glock_19",
161161
"type": "ITEM",
162162
"subtypes": [ "GUN" ],
163-
"name": { "str": "Glock 42" },
163+
"name": { "str": "Glock 42 pistol" },
164164
"description": "The smallest gun Glock produces, chambered in .380 ACP. Even though it is small a small gun that shoots a weak cartridge, it is still effective against small game, paper targets, and zombified children",
165165
"weight": "345 g",
166166
"volume": "234 ml",

data/json/items/gun/40.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"looks_like": "glock_17",
66
"type": "ITEM",
77
"subtypes": [ "GUN" ],
8-
"name": { "str_sp": "Glock 22" },
8+
"name": { "str": "Glock 22 pistol" },
99
"description": "A .40 S&W variant of the popular Glock 17 pistol. The standard-issue firearm of the FBI from 1997-2016, and of countless other law enforcement agencies worldwide.",
1010
"ascii_picture": "glock_17",
1111
"weight": "645 g",
@@ -30,7 +30,7 @@
3030
"looks_like": "glock_19",
3131
"type": "ITEM",
3232
"subtypes": [ "GUN" ],
33-
"name": { "str_sp": "Glock 23" },
33+
"name": { "str": "Glock 23 pistol" },
3434
"description": "A compact version of the Glock 22, chambered in .40 S&W. Popular among civilian and law enforcement alike for its capacity, durability, and reliability.",
3535
"weight": "600 g",
3636
"volume": "401 ml",
@@ -52,7 +52,7 @@
5252
"looks_like": "glock_19",
5353
"type": "ITEM",
5454
"subtypes": [ "GUN" ],
55-
"name": { "str_sp": "Glock 27" },
55+
"name": { "str": "Glock 27 pistol" },
5656
"description": "A diminutive pistol chambered in .40 S&W. Widely popular among concealed carriers, its popularity soared further in the months leading up to the Cataclysm, partly due to its ability to fit the higher cpacity magazines of its older brothers.",
5757
"weight": "550 g",
5858
"volume": "349 ml",

data/json/items/gun/45.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,13 @@
301301
"copy-from": "gun_base_45_semi_pistol",
302302
"type": "ITEM",
303303
"subtypes": [ "GUN" ],
304-
"name": { "str": "USP pistol" },
304+
"name": { "str": "USP .45 pistol" },
305305
"description": "A semi-automatic pistol chambered in .45 ACP and accepting USP magazines.",
306306
"variant_type": "gun",
307307
"variants": [
308308
{
309309
"id": "usp_45",
310-
"name": { "str": ".45 USP pistol" },
310+
"name": { "str": "USP .45 pistol" },
311311
"description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse."
312312
},
313313
{
@@ -419,7 +419,7 @@
419419
"looks_like": "glock_17",
420420
"type": "ITEM",
421421
"subtypes": [ "GUN" ],
422-
"name": { "str": "Glock 30" },
422+
"name": { "str": "Glock 30 pistol" },
423423
"description": "A Glock compact pistol chambered in .45 ACP. Accepts the same magazines as its older brothers.",
424424
"weight": "675 g",
425425
"volume": "422 ml",
@@ -443,7 +443,7 @@
443443
"looks_like": "glock_17",
444444
"type": "ITEM",
445445
"subtypes": [ "GUN" ],
446-
"name": { "str": "Glock 36" },
446+
"name": { "str": "Glock 36 pistol" },
447447
"description": "A Glock subcompact pistol chambered in .45 ACP. Due to its slim construction, it only accepts Glock 36 magazines.",
448448
"weight": "565 g",
449449
"volume": "370 ml",

data/json/items/gun/9mm.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"looks_like": "glock_19",
102102
"type": "ITEM",
103103
"subtypes": [ "GUN" ],
104-
"name": { "str": "Glock 26" },
104+
"name": { "str": "Glock 26 pistol" },
105105
"description": "A Glock subcompact pistol chambered in 9mm Luger. Despite its tiny size, it can fit the magazines of its larger brothers.",
106106
"weight": "550 g",
107107
"volume": "348 ml",
@@ -133,7 +133,7 @@
133133
"copy-from": "gun_base_9mm_semi_pistol",
134134
"type": "ITEM",
135135
"subtypes": [ "GUN" ],
136-
"name": { "str": "Glock 34" },
136+
"name": { "str": "Glock 34 pistol" },
137137
"description": "A large, stylish Glock chambered in 9mm. Developed for accuracy, this pistol is used by competition shooters, law enforcement, and even the Baba Yaga.",
138138
"weight": "655 g",
139139
"volume": "427 ml",
@@ -157,7 +157,7 @@
157157
"looks_like": "glock_19",
158158
"type": "ITEM",
159159
"subtypes": [ "GUN" ],
160-
"name": { "str": "Glock 43" },
160+
"name": { "str": "Glock 43 pistol" },
161161
"description": "A 9x19mm Glock of diminutive proportions. Unfortunately it is incompatible with other 9mm Glock magazines.",
162162
"weight": "460 g",
163163
"volume": "279 ml",
@@ -175,7 +175,7 @@
175175
"looks_like": "glock_19",
176176
"type": "ITEM",
177177
"subtypes": [ "GUN" ],
178-
"name": { "str": "Glock 43X" },
178+
"name": { "str": "Glock 43X pistol" },
179179
"description": "A 9mm compact Glock. Despite its name, it does not accept the magazines of the Glock 43.",
180180
"weight": "461 g",
181181
"volume": "279 ml",
@@ -193,7 +193,7 @@
193193
"looks_like": "glock_19",
194194
"type": "ITEM",
195195
"subtypes": [ "GUN" ],
196-
"name": { "str": "Glock 48" },
196+
"name": { "str": "Glock 48 pistol" },
197197
"description": "A 9mm, slimline Glock. Designed for concealed carry, and accepts the magazine from a Glock 43x, but not the base 43.",
198198
"weight": "524 g",
199199
"volume": "331 ml",

data/json/items/magazine/57.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"looks_like": "glock17_17",
55
"type": "ITEM",
66
"subtypes": [ "MAGAZINE" ],
7-
"name": { "str": "FN 5.7mm 20-round pistol magazine" },
7+
"name": { "str": "FN 5.7mm pistol 20-round magazine" },
88
"description": "A 20-round box magazine, for use with handguns chambering the proprietary 5.7x28mm cartridge.",
99
"variant_type": "gun",
1010
"variants": [

0 commit comments

Comments
 (0)