clear load errors, last commit before WIP PR

data/mods/Generic_Guns/ammo/gg_ammo_migration.json

@@ -274,7 +274,16 @@
     "replace": "grenade_ammo_hedp"
   },
   {
-    "id": [ "40x46mm_m576", "40x46mm_buckshot_m118", "40x46mm_buckshot_m199", "40x46mm_flechette_m118", "40x46mm_flechette_m199", "40x53mm_m1001", "40x53mm_flechette_m169", "40x53mm_buckshot_m169" ],
+    "id": [
+      "40x46mm_m576",
+      "40x46mm_buckshot_m118",
+      "40x46mm_buckshot_m199",
+      "40x46mm_flechette_m118",
+      "40x46mm_flechette_m199",
+      "40x53mm_m1001",
+      "40x53mm_flechette_m169",
+      "40x53mm_buckshot_m169"
+    ],
     "type": "MIGRATION",
     "replace": "grenade_ammo_shot"
   },

data/mods/Generic_Guns/ammo/shot.json

@@ -66,10 +66,10 @@
   {
     "id": "reloaded_shot_dart",
     "copy-from": "reloaded_shot_flechette",
-    "//":  "intentionally reload only",
+    "//": "intentionally reload only",
     "description": "A shotgun shell filled with tiny steel darts, definitely not a factory loading.  These aren't going to pattern well, and they'll likely do less damage.  They might fare better against armor than other shotgun loads, however.",
     "type": "AMMO",
     "ammo_type": "ammo_shot",
     "name": "shotshell, flechette (reloaded)"
-  },
+  }
 ]

data/mods/Generic_Guns/gunmods/gg_gumods_blacklist.json

@@ -1,9 +1,9 @@
 {
-    "type": "ITEM_BLACKLIST",
-    "items":
-    [
-      "lemat_revolver_shotgun",
-      "ts12_aux_shotgun2",
-	    "retool_ar15_300blk"
-    ]
-  }
+  "type": "ITEM_BLACKLIST",
+  "items": [
+    "lemat_revolver_shotgun",
+    "ts12_aux_shotgun",
+    "ts12_aux_shotgun2",
+    "retool_ar15_300blk"
+  ]
+}

data/mods/Generic_Guns/gunmods/gg_gunmods_migration.json

@@ -10,7 +10,17 @@
     "replace": "grenade_under_mod"
   },
   {
-    "id": [ "masterkey", "rm121aux", "u_shotgun", "lead_u_shotgun", "M6_shotgun", "ts12_aux_shotgun", "ksg_aux_shotgun", "combination_gun_shotgun", "combination_gun_shotgun_pipe" ],
+    "id": [
+      "masterkey",
+      "rm121aux",
+      "u_shotgun",
+      "lead_u_shotgun",
+      "M6_shotgun",
+      "ts12_aux_shotgun",
+      "ksg_aux_shotgun",
+      "combination_gun_shotgun",
+      "combination_gun_shotgun_pipe"
+    ],
     "type": "MIGRATION",
     "replace": "shotgun_under"
   },

data/mods/Generic_Guns/gunmods/gunmods.json

@@ -17,7 +17,7 @@
     "id": "grenade_under_mod",
     "copy-from": "m320_mod_mod",
     "type": "GUNMOD",
-    "name": "modified underbarrel launcher",
+    "name": "underbarrel launcher (modified)",
     "description": "A stubby single shot launcher for launching grenades or flares.  This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights.  In more recent years, variants were sold commercially to ostensibly launch flares.  With the right cartridges, this would be devastating against hard or soft targets. A crude homemade bracket has been attached, allowing a wider variety of hosts.",
     "gun_data": { "ammo": "ammo_grenade", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 },
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
@@ -26,20 +26,23 @@
     "id": "shotgun_under",
     "copy-from": "masterkey",
     "type": "GUNMOD",
+    "name": "underbarrel shotgun",
     "gun_data": { "ammo": "ammo_shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 }
   },
   {
     "id": "shotgun_under_mod",
-    "copy-from": "masterkey",
+    "copy-from": "masterkey_mod",
     "type": "GUNMOD",
+    "name": "modified underbarrel shotgun (modified)",
     "gun_data": { "ammo": "ammo_shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 }
   },
   {
     "id": "arredondo_chute",
     "type": "GUNMOD",
+    "name": "speedloader chute",
     "description": "A metal ramp that is installed near a shotgun's feeding port to index speedloader tubes.",
+    "location": "loading port",
     "acceptable_ammo": [ "ammo_shot" ],
     "magazine_adaptor": [ [ "ammo_shot", [ "shot_speedloader" ] ] ]
   }
-
 ]

data/mods/Generic_Guns/magazines/pistol_magnum.json

@@ -1,10 +1,10 @@
 [
-    {
-      "id": "pistol_magnum_mag",
-
-      "copy-from": "deaglemag",      "type": "MAGAZINE",
-      "name": "magnum pistol magazine",
-      "description": "An 8 round magazine for use with semi-automatic magnum pistols.",
-      "ammo_type": "ammo_pistol_magnum"
-    }
+  {
+    "id": "pistol_magnum_mag",
+    "copy-from": "deaglemag",
+    "type": "MAGAZINE",
+    "name": "magnum pistol magazine",
+    "description": "An 8 round magazine for use with semi-automatic magnum pistols.",
+    "ammo_type": "ammo_pistol_magnum"
+  }
 ]

data/mods/Generic_Guns/magazines/rifle_huge.json

@@ -11,7 +11,8 @@
   {
     "id": "rifle_huge_amr_mag",
     "type": "MAGAZINE",
-    "copy-from": "m107a1mag",    "name": "anti-materiel rifle magazine",
+    "copy-from": "m107a1mag",
+    "name": "anti-materiel rifle magazine",
     "description": "A huge 10 round magazine for anti-materiel rifles.",
     "ammo_type": "ammo_rifle_huge"
   }

data/mods/Generic_Guns/magazines/shot.json

@@ -17,5 +17,5 @@
     "type": "MAGAZINE",
     "description": "A shotshell 'speedloader', a long plastic tube with a prominent plastic follower.  You can feed 6 shotshells into an appropriately modified shotgun by pushing the follower against the shotgun's loading port.  Bulky, but sees use in competition occasionally.",
     "ammo_type": "ammo_shot"
-    }
+  }
 ]

data/mods/Generic_Guns/modinfo.json

@@ -3,8 +3,8 @@
     "type": "MOD_INFO",
     "ident": "generic_guns",
     "name": "Generic Guns",
-    "authors": [ "nikheizen" ],
-    "maintainers": [ "nikheizen" ],
+    "authors": [ "tonkatsu" ],
+    "maintainers": [ "tonkatsu" ],
     "description": "Replaces guns and ammo with generic types.  Warning: can cause issues with other gun mods.",
     "category": "items",
     "dependencies": [ "dda" ]