From 5f858cdea6c355812caae5b09857a8d970db317a Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 3 Nov 2020 16:37:04 -0800
Subject: Add the CAWS Adjust the MSG90 out of active service
---
json/itemgroups/Weapons_Mods_Ammo/ammo.json | 11 ++++++++
json/itemgroups/Weapons_Mods_Ammo/guns.json | 10 ++++++-
json/itemgroups/Weapons_Mods_Ammo/magazines.json | 12 ++++++++-
json/itemgroups/military.json | 14 +++-------
json/items/gun/shot.json | 34 ++++++++++++++++++++++++
json/items/magazine/shot.json | 19 +++++++++++++
6 files changed, 88 insertions(+), 12 deletions(-)
create mode 100644 json/itemgroups/Weapons_Mods_Ammo/ammo.json
create mode 100644 json/items/gun/shot.json
create mode 100644 json/items/magazine/shot.json
(limited to 'json')
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 }
]
}
]
diff --git a/json/items/gun/shot.json b/json/items/gun/shot.json
new file mode 100644
index 0000000..abeb352
--- /dev/null
+++ b/json/items/gun/shot.json
@@ -0,0 +1,34 @@
+[
+ {
+ "id": "hk_caws",
+ "copy-from": "shotgun_base",
+ "type": "GUN",
+ "name": { "str": "H&K CAWS" },
+ "description": "The H&K CAWS .",
+ "weight": "3700 g",
+ "volume": "2750 ml",
+ "looks_like": "USAS_12",
+ "price": 300000,
+ "to_hit": -1,
+ "bashing": 12,
+ "material": [ "steel", "plastic" ],
+ "ranged_damage": 5,
+ "dispersion": 510,
+ "durability": 8,
+ "barrel_length": "100 ml",
+ "valid_mod_locations": [
+ [ "accessories", 2 ],
+ [ "mechanism", 4 ],
+ [ "barrel", 1 ],
+ [ "sling", 1 ],
+ [ "muzzle", 1 ],
+ [ "grip", 1 ],
+ [ "brass catcher", 1 ],
+ [ "rail mount", 1 ],
+ [ "sights mount", 1 ],
+ [ "underbarrel mount", 1 ]
+ ],
+ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
+ "magazines": [ [ "shot", [ "hk_caws_mag", "shotbelt_20" ] ] ]
+ }
+]
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
new file mode 100644
index 0000000..292d21a
--- /dev/null
+++ b/json/items/magazine/shot.json
@@ -0,0 +1,19 @@
+[
+ {
+ "id": "hk_caws_mag",
+ "looks_like": "shotbelt_20",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K CAWS box magazine" },
+ "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 rounds.",
+ "weight": "210 g",
+ "volume": "500 ml",
+ "price": 4500,
+ "material": "plastic",
+ "symbol": "#",
+ "color": "dark_gray",
+ "ammo_type": "shot",
+ "capacity": 10,
+ "reliability": 9,
+ "flags": [ "MAG_COMPACT" ]
+ }
+]
--
cgit v1.2.1