summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-07 01:25:18 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-07 01:25:18 -0700
commit6fb51e7db84c84a1c8f77f50118ca68d51925ab7 (patch)
treeb86f77434c50c981170c05e98d4e47722d21cbfd
parentIncrease 000shot lead/flechette requirement by 20% (diff)
downloadcataclysm-bn-mod_hk-loadout-6fb51e7db84c84a1c8f77f50118ca68d51925ab7.tar.xz
Tweak MK7A2 mass
Set 40 round magazine as the default for the MP7A2 Add 30 round 4.6mm magazine and droptable
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/magazines.json3
-rw-r--r--json/items/gun/46.json4
-rw-r--r--json/items/magazine/46.json33
3 files changed, 38 insertions, 2 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 20d5e54..070ead9 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -5,7 +5,8 @@
"//": "Current military specification magazines.",
"items": [
[ "hk_g11_mag", 20 ],
- [ "hk_caws_mag", 15 ]
+ [ "hk_caws_mag", 15 ],
+ [ "hk46midmag", 10 ]
]
},
{
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index 630e6bf..79f54ec 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -39,7 +39,9 @@
"copy-from": "hk_mp7",
"type": "GUN",
"name": { "str": "H&K MP7A2" },
+ "weight": "1960 g",
"volume": "1000 ml",
- "bashing": 10
+ "bashing": 10,
+ "magazines": [ [ "46", [ "hk46bigmag", "hk46midmag", "hk46mag" ] ] ]
}
]
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json
new file mode 100644
index 0000000..f6f22e9
--- /dev/null
+++ b/json/items/magazine/46.json
@@ -0,0 +1,33 @@
+[
+ {
+ "id": "hk46bigmag",
+ "looks_like": "mp5mag",
+ "copy-from": "hk46bigmag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K 4.6mm extended magazine" },
+ "description": "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round.",
+ "weight": "200 g"
+ },
+ {
+ "id": "hk46midmag",
+ "looks_like": "hk46bigmag",
+ "copy-from": "hk46bigmag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K 4.6mm expanded magazine" },
+ "description": "An expanded 30-round magazine for use with H&K's proprietary 4.6x30mm round.",
+ "weight": "150 g",
+ "volume": "375 ml",
+ "price": 5500,
+ "price_postapoc": 300,
+ "capacity": 30
+ },
+ {
+ "id": "hk46mag",
+ "looks_like": "mp5mag",
+ "copy-from": "hk46mag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K 4.6mm magazine" },
+ "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
+ "weight": "100 g"
+ }
+]