Various generic guns quickfixes

data/mods/Generic_Guns/ammo/pistol.json

@@ -13,8 +13,8 @@
     "id": "pistol_jhp",
     "type": "AMMO",
     "copy-from": "pistol_ball",
-    "name": "pistol ammo, jhp",
-    "name-plural": "pistol ammo, jhp",
+    "name": "pistol ammo, JHP",
+    "name-plural": "pistol ammo, JHP",
     "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 3, "pierce": -6 }
   },
@@ -31,8 +31,8 @@
     "id": "reloaded_pistol_jhp",
     "type": "AMMO",
     "copy-from": "pistol_jhp",
-    "name": "pistol ammo, jhp (reloaded)",
-    "name-plural": "pistol ammo, jhp (reloaded)",
+    "name": "pistol ammo, JHP (reloaded)",
+    "name-plural": "pistol ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -50,8 +50,8 @@
     "id": "bp_pistol_jhp",
     "copy-from": "pistol_jhp",
     "type": "AMMO",
-    "name": "pistol ammo, jhp (black powder)",
-    "name-plural": "pistol ammo, jhp (black powder)",
+    "name": "pistol ammo, JHP (black powder)",
+    "name-plural": "pistol ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/mods/Generic_Guns/ammo/pistol_magnum.json

@@ -7,15 +7,15 @@
     "name_plural": "magnum ammo, ball",
     "ammo_type": "ammo_pistol_magnum",
     "casing": "pistol_magnum_casing",
-    "description": "magnum ammuniton, developed from early handgun hunting efforts and popularized by law enforcement usage.  It is more powerful than common pistol ammo.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
+    "description": "Magnum ammuniton, developed from early handgun hunting efforts and popularized by law enforcement usage.  It is more powerful than common pistol ammo.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
   },
   {
     "id": "pistol_magnum_jhp",
     "type": "AMMO",
     "copy-from": "pistol_magnum_ball",
-    "name": "magnum ammo, jhp",
-    "name-plural": "magnum ammo, jhp",
-    "description": "magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage.  It is more powerful than common pistol ammo.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
+    "name": "magnum ammo, JHP",
+    "name-plural": "magnum ammo, JHP",
+    "description": "Magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage.  It is more powerful than common pistol ammo.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 3, "pierce": -6 }
   },
   {
@@ -31,8 +31,8 @@
     "id": "reloaded_pistol_magnum_jhp",
     "type": "AMMO",
     "copy-from": "pistol_magnum_jhp",
-    "name": "magnum ammo, jhp (reloaded)",
-    "name-plural": "magnum ammo, jhp (reloaded)",
+    "name": "magnum ammo, JHP (reloaded)",
+    "name-plural": "magnum ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -50,8 +50,8 @@
     "id": "bp_pistol_magnum_jhp",
     "copy-from": "pistol_magnum_jhp",
     "type": "AMMO",
-    "name": "magnum ammo, jhp (black powder)",
-    "name-plural": "magnum ammo, jhp (black powder)",
+    "name": "magnum ammo, JHP (black powder)",
+    "name-plural": "magnum ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/mods/Generic_Guns/ammo/pistol_tiny.json

@@ -7,16 +7,16 @@
     "name-plural": "tiny pistol ammo, ball",
     "ammo_type": "ammo_pistol_tiny",
     "casing": "pistol_tiny_casing",
-    "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century side-arms.  Sold in great quantities preceding the riots.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
+    "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms.  Sold in great quantities preceding the riots.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
     "relative": { "damage": -2, "pierce": 3 }
   },
   {
     "id": "tiny_pistol_jhp",
     "type": "AMMO",
     "copy-from": "tiny_pistol_ball",
-    "name": "tiny pistol ammo, jhp",
-    "name-plural": "tiny pistol ammo, jhp",
-    "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century side-arms.  Sold in great quantities preceding the riots.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
+    "name": "tiny pistol ammo, JHP",
+    "name-plural": "tiny pistol ammo, JHP",
+    "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms.  Sold in great quantities preceding the riots.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 2, "pierce": -3 }
   },
   {
@@ -32,8 +32,8 @@
     "id": "reloaded_tiny_pistol_jhp",
     "type": "AMMO",
     "copy-from": "tiny_pistol_jhp",
-    "name": "tiny pistol ammo, jhp (reloaded)",
-    "name-plural": "tiny pistol ammo, jhp (reloaded)",
+    "name": "tiny pistol ammo, JHP (reloaded)",
+    "name-plural": "tiny pistol ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -51,8 +51,8 @@
     "id": "bp_tiny_pistol_jhp",
     "type": "AMMO",
     "copy-from": "tiny_pistol_jhp",
-    "name": "tiny pistol ammo, jhp (black powder)",
-    "name-plural": "tiny pistol ammo, jhp (black powder)",
+    "name": "tiny pistol ammo, JHP (black powder)",
+    "name-plural": "tiny pistol ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -293,7 +293,7 @@
     "replace": "shot_double"
   },
   {
-    "id": [ "pipe_double_shotgun", "revolver_shotgun", "ashot" ],
+    "id": [ "pipe_double_shotgun", "revolver_shotgun", "ashot", "pipe_combination_gun" ],
     "type": "MIGRATION",
     "replace": "shot_pipe_double"
   },

data/mods/Generic_Guns/firearms/pistol.json

@@ -37,7 +37,7 @@
   },
   {
     "id": "pistol_revolver",
-    "copy-from": "ruger_lcr_38",
+    "copy-from": "model_10_revolver",
     "type": "GUN",
     "name": "police revolver",
     "ammo": "ammo_pistol",

data/mods/Generic_Guns/firearms/pistol_tiny.json

@@ -23,7 +23,7 @@
     "type": "GUN",
     "name": "zip gun",
     "ammo": "ammo_pistol_tiny",
-    "description": "A crude single shot firearm made from improvised or homemade components, chambered for tiny plinking plinking ammunition.  Zip guns like these often turned up in the hands of criminals and insurgents.  There's no extractor, so it might be slow to reload, and its construction leaves its longevity in question.",
+    "description": "A crude single shot firearm made from improvised or homemade components, chambered for tiny plinking ammunition.  Zip guns like these often turned up in the hands of criminals and insurgents.  There's no extractor, so it might be slow to reload, and its construction leaves its longevity in question.",
     "clip_size": 1
   }
 ]

data/mods/Generic_Guns/firearms/rifle.json

@@ -42,7 +42,7 @@
     "name": "sniper rifle",
     "ammo": "ammo_rifle",
     "description": "Sniper rifles fill military, police and civilian needs for precise, accurate fire.  Modern examples feature detachable magazines and various mounting interfaces for optics and supports.  With care and practice, all should be quite capable of eliminating bipedal threats from very safe ranges. ",
-    "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ]
+    "magazines": [ [ "ammo_rifle", [ "rifle_sniper_mag", "rifle_mag" ] ] ]
   },
   {
     "id": "rifle_sporter",

data/mods/Generic_Guns/magazines/gg_magazines_migration.json

@@ -167,6 +167,7 @@
       "g3bigmag",
       "g3mag",
       "m14mag",
+      "ruger30",
       "scarhbigmag",
       "scarhmag_30rd",
       "scarhmag",
@@ -191,7 +192,6 @@
       "223_speedloader5",
       "ruger5",
       "stanag10",
-      "ruger30",
       "survivor223mag",
       "ruger_makeshiftmag",
       "3006_clip",

data/mods/Generic_Guns/magazines/pistol.json

@@ -1,19 +1,19 @@
 [
   {
     "id": "pistol_mag",
-    "copy-from": "glockbigmag",
+    "copy-from": "glockmag",
     "type": "MAGAZINE",
-    "name": "SMG magazine",
-    "description": "A long stick magazine for use with pistols and submachine guns.  Holds 30 rounds of standard pistol ammo.",
+    "name": "pistol magazine",
+    "description": "A flush fitting magazine for use with pistols and submachine guns.  Holds 15 rounds of standard pistol ammo.",
     "ammo_type": "ammo_pistol",
     "delete": { "ammo_type": "9mm" }
   },
   {
     "id": "pistol_smg_mag",
-    "copy-from": "glockmag",
+    "copy-from": "glockbigmag",
     "type": "MAGAZINE",
-    "name": "pistol magazine",
-    "description": "A flush fitting magazine for use with pistols and submachine guns.  Holds 15 rounds of standard pistol ammo.",
+    "name": "SMG magazine",
+    "description": "A long stick magazine for use with pistols and submachine guns.  Holds 30 rounds of standard pistol ammo.",
     "ammo_type": "ammo_pistol",
     "delete": { "ammo_type": "9mm" }
   },

data/mods/Generic_Guns/magazines/rifle.json

@@ -24,10 +24,10 @@
   },
   {
     "id": "rifle_sniper_mag",
-    "copy-from": "hk417mag_10rd",
+    "copy-from": "m2010mag",
     "type": "MAGAZINE",
     "name": "compact rifle magazine",
-    "description": "A short 10 round steel magazine compatible with nearly every common rifle.  Although it has a low capacity it is easy to store and quick to reload.",
+    "description": "A short 5 round steel magazine compatible with nearly every common rifle.  Although it has a low capacity it is easy to store and quick to reload.",
     "delete": { "ammo_type": "308" },
     "ammo_type": "ammo_rifle"
   }

data/mods/Generic_Guns/modinfo.json

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

data/mods/Generic_Guns/recipes/recipe_obsolete.json

@@ -254,6 +254,11 @@
     "result": "pipe_double_shotgun",
     "obsolete": true
   },
+  {
+    "type": "recipe",
+    "result": "pipe_combination_gun",
+    "obsolete": true
+  },
   {
     "type": "recipe",
     "result": "rifle_9mm",