From 9ac7baa55d3a6b8f9613c5b055c78d08652eab7b Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 27 Jun 2020 02:29:57 -0700
Subject: Reduce duplication of item references No longer require editing of
 45.json

---
 json/items/magazine/40.json  | 14 +++-----------
 json/items/magazine/45.json  | 45 +++++++++++++++++---------------------------
 json/items/magazine/9mm.json | 42 ++++++-----------------------------------
 3 files changed, 26 insertions(+), 75 deletions(-)

(limited to 'json/items/magazine')

diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index cd6fa13..f4736a3 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -1,19 +1,11 @@
 [
   {
     "id": "usp40mag",
-    "looks_like": "glock17_17",
+    "copy-from": "usp9mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K USP .40 magazine" },
     "description": "A standard capacity magazine for use with the H&K USP .40 handgun.",
-    "weight": "60 g",
-    "volume": "250 ml",
-    "price": 5900,
-    "material": "plastic",
-    "symbol": "#",
-    "color": "light_gray",
     "ammo_type": "40",
-    "capacity": 13,
-    "reliability": 10,
-    "flags": [ "MAG_COMPACT" ]
-}
+    "capacity": 13
+  }
 ]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index 63695b3..3988982 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -1,36 +1,25 @@
 [
-  {
-    "id": "usp45mag",
-    "looks_like": "glock17_17",
-    "type": "MAGAZINE",
-    "name": { "str": "H&K USP .45 magazine" },
-    "description": "A standard capacity magazine for use with the H&K USP .45 handgun.",
-    "weight": "60 g",
-    "volume": "250 ml",
-    "price": 5900,
-    "material": "plastic",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "45",
-    "capacity": 12,
-    "reliability": 10,
-    "flags": [ "MAG_COMPACT" ]
-},
   {
     "id": "ump45mag",
-    "looks_like": "mp5mag",
+    "looks_like": "ump45mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K UMP45 magazine" },
     "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.",
-    "weight": "200 g",
-    "volume": "500 ml",
-    "price": 4950,
-    "material": "steel",
     "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "45",
-    "capacity": 25,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
-}
+    "ammo_type": "45"
+  },
+  {
+    "id": "ump45_makeshiftmag",
+    "copy-from": "ump45_makeshiftmag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K UMP45 makeshift magazine" },
+    "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the H&K UMP45 SMG."
+  },
+  {
+    "id": "usp45mag",
+    "copy-from": "usp45mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP .45 magazine" },
+    "description": "A standard capacity magazine for use with the H&K USP .45 handgun."
+  }
 ]
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index 14e46c5..89a401c 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -1,54 +1,24 @@
 [
   {
     "id": "usp9mag",
-    "looks_like": "glock17_17",
+    "copy-from": "usp9mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K USP 9mm magazine" },
-    "description": "A factory specification 15-round box magazine for use with the dependable H&K USP 9x19mm pistol.",
-    "weight": "75 g",
-    "volume": "250 ml",
-    "price": 3850,
-    "material": "steel",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "9mm",
-    "capacity": 15,
-    "reliability": 10,
-    "flags": [ "MAG_COMPACT" ]
+    "ammo_type": "9mm"
 },
   {
     "id": "mp5mag",
+    "copy-from": "usp9mag",
     "//": "Tileset whitelist for SMG magazines",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 magazine" },
-    "description": "A standard capacity curved magazine for use with the H&K MP5 SMG.",
-    "weight": "210 g",
-    "volume": "500 ml",
-    "price": 4100,
-    "material": "steel",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "9mm",
-    "capacity": 30,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "ammo_type": "9mm"
 },
   {
     "id": "mp5bigmag",
-    "looks_like": "glock17_17",
+    "copy-from": "usp9mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 extended magazine" },
-    "description": "A drum magazine for use with the H&K MP5 SMG.  Much greater capacity but less reliable the factory specification magazine.",
-    "weight": "350 g",
-    "volume": "750 ml",
-    "price": 6920,
-    "material": "steel",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "9mm",
-    "capacity": 50,
-    "reliability": 8,
-    "reload_time": 160,
-    "flags": [ "MAG_BULKY" ]
+    "ammo_type": "9mm"
 }
 ]
-- 
cgit v1.2.1