summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Readme.txt4
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/guns.json3
-rw-r--r--json/itemgroups/military.json4
-rw-r--r--json/items/ammo/473.json34
-rw-r--r--json/items/gun/473.json37
-rw-r--r--json/items/magazine/473.json20
-rw-r--r--json/martialarts.json1
-rw-r--r--json/recipes/473.json38
8 files changed, 137 insertions, 4 deletions
diff --git a/Readme.txt b/Readme.txt
index 8249b44..408e3ec 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,4 +1,4 @@
-This mod adds various Heckler and Kock weaponry.
+This mod adds various Heckler and Koch weaponry.
These items are also added to appropriate drop tables.
Items Added:
@@ -6,6 +6,7 @@ UCP
USP .40 and magazine
PSG1 A1
MSG90 A2
+G11 K2 and magazine and ammo and ammo recipes
Item Names tweaked:
USP 9mm and magazine
@@ -16,7 +17,6 @@ HK416
HK417 and magazines
Item Weights tweaked:
-
USP 9mm
USP .45
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 13978ea..d29844c 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -44,7 +44,8 @@
"id": "guns_rifle_milspec",
"//": "Military specification rifles only ever found at military sites.",
"items": [
- { "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 }
+ { "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 },
+ { "item": "hk_g11", "prob": 5, "charges-min": 0, "charges-max": 50 }
]
},
{
diff --git a/json/itemgroups/military.json b/json/itemgroups/military.json
index 2d836c0..d74dad2 100644
--- a/json/itemgroups/military.json
+++ b/json/itemgroups/military.json
@@ -6,7 +6,9 @@
"entries": [
{ "item": "hk_ucp", "prob": 2 },
{ "item": "hk_mp7", "prob": 5 },
- { "item": "46mm", "prob": 7 }
+ { "item": "hk_g11", "prob": 2 },
+ { "item": "46mm", "prob": 7 },
+ { "item": "473x33mm", "prob": 2 }
]
},
{
diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json
new file mode 100644
index 0000000..37f9af4
--- /dev/null
+++ b/json/items/ammo/473.json
@@ -0,0 +1,34 @@
+[
+ {
+ "id": "bootleg_473x33mm",
+ "copy-from": "473x33mm",
+ "type": "AMMO",
+ "name": { "str": "4.73x33mm, bootleg" },
+ "description": "Bootleg duplicates of 4.73x33mm caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+ "extend": { "effects": [ "RECYCLED" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "473x33mm",
+ "type": "AMMO",
+ "name": { "str": "4.73x33mm" },
+ "description": "4.73x33mm caseless rounds. Designed for the H&K G11 rifle, these rounds encase the bullet within a block of solid propellant, greatly reducing ammunition mass while reducing metal requirements to manufacture. Being caseless rounds, these cannot be disassembled or reloaded.",
+ "weight": "3 g",
+ "volume": "250 ml",
+ "price": 225,
+ "price_postapoc": 12500,
+ "material": [ "plastic", "powder" ],
+ "symbol": "=",
+ "color": "pink",
+ "count": 100,
+ "stack_size": 100,
+ "ammo_type": "473",
+ "range": 35,
+ "damage": 35,
+ "pierce": 12,
+ "dispersion": 95,
+ "recoil": 2500,
+ "effects": [ "NEVER_MISFIRES" ]
+ }
+]
diff --git a/json/items/gun/473.json b/json/items/gun/473.json
new file mode 100644
index 0000000..5917a2e
--- /dev/null
+++ b/json/items/gun/473.json
@@ -0,0 +1,37 @@
+[
+ {
+ "id": "hk_g11",
+ "type": "GUN",
+ "reload_noise_volume": 10,
+ "name": { "str": "H&K G11K2 Assault Rifle" },
+ "description": "The Heckler and Koch G11 was designed to replace the G3 rifle and is notable for utilizing the caseless 4.73x33m round. While a technical success, only 1000 units were ever made due to the high cost and NATO decision to standardize on the 5.56x45mm round.",
+ "weight": "3650 g",
+ "volume": "1750 ml",
+ "price": 1800000,
+ "to_hit": -1,
+ "bashing": 12,
+ "material": [ "steel", "ceramic" ],
+ "symbol": "(",
+ "color": "dark_gray",
+ "ammo": "473",
+ "skill": "rifle",
+ "dispersion": 120,
+ "durability": 9,
+ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 5 ] ],
+ "valid_mod_locations": [
+ [ "accessories", 4 ],
+ [ "grip", 1 ],
+ [ "mechanism", 4 ],
+ [ "muzzle", 1 ],
+ [ "rail", 1 ],
+ [ "sights", 1 ],
+ [ "sling", 1 ],
+ [ "stock", 1 ],
+ [ "underbarrel", 1 ]
+ ],
+ "magazine_well": 2,
+ "default_mods": [ "acog_scope" ],
+ "magazines": [ [ "473", [ "hk_g11_mag" ] ] ],
+ "flags": [ "NEVER_JAMS" ]
+ }
+]
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
new file mode 100644
index 0000000..10b7e57
--- /dev/null
+++ b/json/items/magazine/473.json
@@ -0,0 +1,20 @@
+[
+ {
+ "id": "hk_g11_mag",
+ "looks_like": "stanag30",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K G11 magazine" },
+ "description": "A 50 round box magazine for use with H&K G11 caseless assault rifle.",
+ "weight": "5 g",
+ "volume": "500 ml",
+ "price": 25000,
+ "material": [ "plastic" ],
+ "symbol": "#",
+ "color": "dark_gray",
+ "ammo_type": "473",
+ "capacity": 50,
+ "reliability": 10,
+ "reload_time": 50,
+ "flags": [ "MAG_COMPACT" ]
+ }
+]
diff --git a/json/martialarts.json b/json/martialarts.json
index ba8ffd0..c34093c 100644
--- a/json/martialarts.json
+++ b/json/martialarts.json
@@ -92,6 +92,7 @@
"usp_40",
"hk_ucp",
"hk_mp7",
+ "hk_g11",
"v29",
"laser_rifle",
"laser_rifle_a7m"
diff --git a/json/recipes/473.json b/json/recipes/473.json
new file mode 100644
index 0000000..aa4c632
--- /dev/null
+++ b/json/recipes/473.json
@@ -0,0 +1,38 @@
+[
+ {
+ "result": "bootleg_473x33mm",
+ "type": "recipe",
+ "category": "CC_AMMO",
+ "subcategory": "CSC_AMMO_RIFLE",
+ "skill_used": "fabrication",
+ "difficulty": 6,
+ "skills_required": [ "gun", 5 ],
+ "time": "2 m",
+ "batch_time_factors": [ 60, 5 ],
+ "book_learn": [ [ "recipe_caseless", 4 ] ],
+ "charges": 1,
+ "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+ "tools": [ [ [ "mold_plastic", -1 ] ] ],
+ "components": [
+ [ [ "473mm_mold", 1 ] ],
+ [ [ "smrifle_primer", 1 ] ],
+ [ [ "gunpowder", 7 ], [ "gunpowder_rifle", 6 ] ],
+ [ [ "copper", 1 ] ]
+ ]
+ },
+ {
+ "type": "recipe",
+ "result": "473mm_mold",
+ "category": "CC_AMMO",
+ "subcategory": "CSC_AMMO_COMPONENTS",
+ "skill_used": "fabrication",
+ "difficulty": 2,
+ "charges": 25,
+ "skills_required": [ "gun", 4 ],
+ "time": "10 m",
+ "book_learn": [ [ "recipe_caseless", 5 ] ],
+ "using": [ [ "surface_heat", 10 ] ],
+ "tools": [ [ [ "mold_plastic", -1 ] ] ],
+ "components": [ [ [ "plastic_chunk", 1 ] ] ]
+ }
+]