summaryrefslogtreecommitdiff
path: root/json/itemgroups
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-11-03 16:37:04 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-11-03 16:37:04 -0800
commit5f858cdea6c355812caae5b09857a8d970db317a (patch)
treeac599ead1b24cca594574509208e3ac15b2367fa /json/itemgroups
parentAdd the 473 mold and ammo type (diff)
downloadcataclysm-bn-mod_hk-loadout-5f858cdea6c355812caae5b09857a8d970db317a.tar.xz
Add the CAWS
Adjust the MSG90 out of active service
Diffstat (limited to 'json/itemgroups')
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/ammo.json11
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/guns.json10
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/magazines.json12
-rw-r--r--json/itemgroups/military.json14
4 files changed, 35 insertions, 12 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
new file mode 100644
index 0000000..6c311ca
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -0,0 +1,11 @@
+[
+ {
+ "type": "item_group",
+ "id": "ammo_rifle_milspec",
+ "//": "Military specification rifle ammo found at military sites.",
+ "subtype": "distribution",
+ "entries": [
+ { "item": "473x33mm", "prob": 30 }
+ ]
+ }
+]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index d29844c..abf179e 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -45,7 +45,15 @@
"//": "Military specification rifles only ever found at military sites.",
"items": [
{ "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 },
- { "item": "hk_g11", "prob": 5, "charges-min": 0, "charges-max": 50 }
+ { "item": "hk_g11", "prob": 10, "charges-min": 0, "charges-max": 50 }
+ ]
+ },
+ {
+ "type": "item_group",
+ "id": "guns_shotgun_milspec",
+ "//": "Military shotguns currently in service.",
+ "items": [
+ { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 }
]
},
{
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index dc955d8..ff7eb00 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -1,10 +1,20 @@
[
{
"type": "item_group",
+ "id": "mags_milspec",
+ "//": "Current military specification magazines.",
+ "items": [
+ [ "hk_g11_mag", 10 ],
+ [ "hk_caws_mag", 10 ]
+ ]
+ },
+ {
+ "type": "item_group",
"id": "mags_military",
"//": "_DEPRECATED_ Older military magazines still in service.",
"items": [
- [ "usp40mag", 9 ]
+ [ "usp40mag", 9 ],
+
]
},
{
diff --git a/json/itemgroups/military.json b/json/itemgroups/military.json
index d74dad2..48791c1 100644
--- a/json/itemgroups/military.json
+++ b/json/itemgroups/military.json
@@ -6,17 +6,11 @@
"entries": [
{ "item": "hk_ucp", "prob": 2 },
{ "item": "hk_mp7", "prob": 5 },
- { "item": "hk_g11", "prob": 2 },
{ "item": "46mm", "prob": 7 },
- { "item": "473x33mm", "prob": 2 }
- ]
- },
- {
- "type": "item_group",
- "id": "military_standard_sniper_rifles",
- "subtype": "distribution",
- "entries": [
- { "item": "hk_msg90a2", "prob": 10, "charges": [ 0, 20] }
+ { "item": "hk_g11", "prob": 5 },
+ { "item": "hk_caws", "prob": 2 },
+ { "item": "473x33mm", "prob": 7 },
+ { "item": "hk_msg90a2", "prob": 7 }
]
}
]