summaryrefslogtreecommitdiff
path: root/json/items/gun
diff options
context:
space:
mode:
Diffstat (limited to 'json/items/gun')
-rw-r--r--json/items/gun/45.json33
-rw-r--r--json/items/gun/46.json36
-rw-r--r--json/items/gun/9mm.json40
-rw-r--r--json/items/gun/shot.json8
4 files changed, 72 insertions, 45 deletions
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 99aa47e..22176ff 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,14 +1,13 @@
[
{
"id": "usp_45",
- "copy-from": "usp_45",
- "looks_like": "glock_17",
+ "copy-from": "pistol_base",
"type": "GUN",
"name": { "str_sp": "H&K USP .45" },
"description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
"weight": "789 g",
- "volume": "500 ml",
- "price": 68000,
+ "volume": "483 ml",
+ "price": 70000,
"price_postapoc": 2500,
"to_hit": -2,
"bashing": 8,
@@ -22,8 +21,7 @@
"blackpowder_tolerance": 48,
"min_cycle_recoil": 450,
"magazine_well": "250 ml",
- "magazines": [ [ "45", [ "usp45mag" ] ] ],
- "delete": { "built_in_mods": [ "match_trigger" ] }
+ "magazines": [ [ "45", [ "usp45mag" ] ] ]
},
{
"id": "hk_45",
@@ -41,12 +39,11 @@
},
{
"id": "hk_ump45",
- "looks_like": "hk_mp5",
+ "copy-from": "smg_base",
"type": "GUN",
- "reload_noise_volume": 10,
- "name": { "str_sp": "H&K UMP45" },
+ "name": { "str": "H&K UMP45" },
"description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
- "weight": "2500 g",
+ "weight": "2300 g",
"volume": "1250 ml",
"price": 290000,
"price_postapoc": 3000,
@@ -57,27 +54,11 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "45",
- "skill": "smg",
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 240,
"durability": 8,
"min_cycle_recoil": 540,
"modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ], [ "AUTO", "auto", 4 ] ],
- "valid_mod_locations": [
- [ "accessories", 3 ],
- [ "barrel", 1 ],
- [ "bore", 1 ],
- [ "brass catcher", 1 ],
- [ "grip", 1 ],
- [ "mechanism", 4 ],
- [ "muzzle", 1 ],
- [ "rail", 1 ],
- [ "sights", 1 ],
- [ "sling", 1 ],
- [ "stock", 1 ],
- [ "underbarrel", 1 ]
- ],
- "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ]
}
]
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index 72d4f2e..05dc0dd 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -6,7 +6,7 @@
"name": { "str_sp": "H&K UCP" },
"description": "The Heckler & Koch UCP is a small, very high capacity pistol designed to counter most common body armors.",
"weight": "730 g",
- "volume": "500 ml",
+ "volume": "460 ml",
"price": 125000,
"price_postapoc": 2150,
"to_hit": -2,
@@ -38,14 +38,42 @@
},
{
"id": "hk_mp7",
- "copy-from": "hk_mp7",
+ "copy-from": "smg_base",
"type": "GUN",
- "name": { "str_sp": "H&K MP7A2" },
+ "name": { "str": "H&K MP7A2" },
+ "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil-free.",
"weight": "1960 g",
"volume": "1000 ml",
- "bashing": 10,
+ "barrel_length": "250 ml",
+ "price": 175000,
+ "price_postapoc": 3000,
+ "to_hit": -2,
+ "bashing": 7,
+ "material": [ "steel", "plastic" ],
+ "symbol": "(",
+ "color": "dark_gray",
+ "ammo": [ "46" ],
+ "skill": "smg",
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
+ "dispersion": 260,
+ "durability": 8,
+ "min_cycle_recoil": 81,
+ "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 5 ] ],
"built_in_mods": [ "folding_stock" ],
+ "valid_mod_locations": [
+ [ "accessories", 3 ],
+ [ "barrel", 1 ],
+ [ "brass catcher", 1 ],
+ [ "grip", 1 ],
+ [ "mechanism", 4 ],
+ [ "muzzle", 1 ],
+ [ "rail", 1 ],
+ [ "sights", 1 ],
+ [ "sling", 1 ],
+ [ "stock", 1 ],
+ [ "underbarrel", 1 ]
+ ],
+ "magazine_well": "250 ml",
"magazines": [ [ "46", [ "hk46bigmag", "hk46midmag", "hk46mag" ] ] ]
}
]
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1961e2b..4c8fc0d 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -1,10 +1,25 @@
[
{
"id": "usp_9mm",
- "copy-from": "usp_9mm",
+ "copy-from": "pistol_base",
"type": "GUN",
"name": { "str_sp": "H&K USP 9mm" },
- "weight": "748 g"
+ "description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+ "weight": "748 g",
+ "volume": "460 ml",
+ "price": 68000,
+ "price_postapoc": 2500,
+ "to_hit": -2,
+ "material": [ "steel", "plastic" ],
+ "color": "dark_gray",
+ "ammo": "9mm",
+ "ranged_damage": { "damage_type": "bullet", "amount": -1 },
+ "dispersion": 400,
+ "durability": 9,
+ "blackpowder_tolerance": 48,
+ "min_cycle_recoil": 450,
+ "magazine_well": "250 ml",
+ "magazines": [ [ "9mm", [ "usp9mag", "usp9mag_10rd", "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd" ] ] ]
},
{
"id": "hk_p30_9",
@@ -25,7 +40,16 @@
"type": "GUN",
"name": { "str_sp": "H&K MP5A4" },
"weight": "2540 g",
- "volume": "1750 ml"
+ "volume": "1750 ml",
+ "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
+ },
+ {
+ "id": "hk_mp5sd",
+ "copy-from": "hk_mp5sd",
+ "type": "GUN",
+ "name": { "str_sp": "H&K MP5SD" },
+ "volume": "2000 ml",
+ "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
},
{
"id": "hk_mp5k",
@@ -33,14 +57,8 @@
"type": "GUN",
"name": { "str_sp": "H&K MP5K-PDW" },
"weight": "2530 g",
- "volume": "1250 ml"
- },
- {
- "id": "hk_mp5sd",
- "copy-from": "hk_mp5sd",
- "type": "GUN",
- "name": { "str_sp": "H&K MP5SD" },
- "volume": "2000 ml"
+ "volume": "1250 ml",
+ "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
},
{
"id": "hk_ump9",
diff --git a/json/items/gun/shot.json b/json/items/gun/shot.json
index 0c1a329..321c4c6 100644
--- a/json/items/gun/shot.json
+++ b/json/items/gun/shot.json
@@ -13,10 +13,11 @@
"to_hit": -1,
"bashing": 12,
"material": [ "steel", "plastic" ],
- "ranged_damage": 5,
- "dispersion": 300,
- "durability": 8,
+ "ranged_damage": { "damage_type": "bullet", "amount": 5 },
"ammo": [ "shot" ],
+ "dispersion": 350,
+ "durability": 8,
+ "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
"barrel_length": "81 ml",
"valid_mod_locations": [
[ "accessories", 2 ],
@@ -31,7 +32,6 @@
[ "underbarrel mount", 1 ]
],
"magazine_well": "250 ml",
- "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
"magazines": [ [ "shot", [ "hk_caws_mag" ] ] ]
}
]
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 08:57:47 +0000