Skip to content

Commit

Permalink
Fix seemingly erroneous json entries
Browse files Browse the repository at this point in the history
  • Loading branch information
ifreund committed Feb 6, 2020
1 parent 77006ce commit d1d1881
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/9mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "9mm",
"ammo": [ "9mm", "460" ],
"range": 1,
"dispersion": 340,
"durability": 9,
Expand Down
3 changes: 2 additions & 1 deletion data/mods/Generic_Guns/firearms/pistol_tiny.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"name": "plinker carbine",
"ammo": "ammo_pistol_tiny",
"description": "With near non-existent recoil and inexpensive ammunition, rifles like this one are popular introductory firearms. It has a built in magazine, capable of holding an impressive amount of its small cartridges. You could take small game with this, but anything bigger might not even notice.",
"clip_size": 19
"clip_size": 19,
"magazines": [ ]
},
{
"id": "pistol_tiny_target",
Expand Down
3 changes: 2 additions & 1 deletion data/mods/Generic_Guns/firearms/rifle.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"name": "pipe rifle",
"ammo": "ammo_rifle",
"description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.",
"clip_size": 1
"clip_size": 1,
"magazines": [ ]
},
{
"id": "rifle_pipe_carbine",
Expand Down
7 changes: 2 additions & 5 deletions data/mods/Generic_Guns/magazines/gg_magazines_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"hptcf380mag_10rd",
"taurus_spectrum_mag",
"m1911mag_10rd_38super",
"m9mag",
"makarovmag",
"glock40mag",
"sig40mag",
"bhp40mag",
Expand Down Expand Up @@ -57,11 +59,6 @@
"type": "MIGRATION",
"replace": "pistol_magnum_mag"
},
{
"id": [ "m9mag", "makarovmag" ],
"type": "MIGRATION",
"replace": "pistol_medium"
},
{
"id": [
"20x66_40_mag",
Expand Down

0 comments on commit d1d1881

Please sign in to comment.