summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--json/itemgroups/Weapons_Mods_Ammo/magazines.json18
-rw-r--r--json/items/ammo/shot.json4
-rw-r--r--json/items/gun/473.json2
-rw-r--r--json/items/magazine/223.json2
-rw-r--r--json/items/magazine/308.json33
-rw-r--r--json/items/magazine/40.json12
-rw-r--r--json/items/magazine/45.json16
-rw-r--r--json/items/magazine/46.json2
-rw-r--r--json/items/magazine/473.json4
-rw-r--r--json/items/magazine/9mm.json28
-rw-r--r--json/items/magazine/shot.json4
-rw-r--r--json/recipes/473.json2
12 files changed, 74 insertions, 53 deletions
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index c0e5b54..599a7af 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -30,15 +30,15 @@
[ "mp5mag_100rd", 15 ],
[ "mp5mag_40rd", 20 ],
[ "mp5mag_38rd", 20 ],
- [ "mp5mag_20rd", 20 ],
- [ "mp5mag_15rd", 20 ],
- [ "mp5mag_10rd", 20 ],
+ [ "mp5mag_20rd", 10 ],
+ [ "mp5mag_15rd", 10 ],
+ [ "mp5mag_10rd", 10 ],
[ "ump9mag", 20 ],
[ "ump40mag", 20 ],
- [ "usp9mag_10rd", 10 ],
+ [ "usp9mag_10rd", 5 ],
[ "usp9mag_18rd", 10 ],
[ "usp9mag_20rd", 10 ],
- [ "usp9mag_32rd", 10 ],
+ [ "usp9mag_32rd", 7 ],
[ "usp40mag", 10 ],
[ "p309mag", 10 ],
[ "p3040mag", 10 ],
@@ -50,12 +50,12 @@
"id": "mags_smg_common",
"//": "Factory specification SMG magazines commonly owned by citizens.",
"items": [
- [ "mp5mag_100rd", 5 ],
+ [ "mp5mag_100rd", 2 ],
[ "mp5mag_40rd", 5 ],
[ "mp5mag_38rd", 5 ],
- [ "mp5mag_20rd", 5 ],
- [ "mp5mag_15rd", 5 ],
- [ "mp5mag_10rd", 5 ],
+ [ "mp5mag_20rd", 10 ],
+ [ "mp5mag_15rd", 10 ],
+ [ "mp5mag_10rd", 10 ],
[ "ump9mag", 5 ],
[ "ump40mag", 5 ]
]
diff --git a/json/items/ammo/shot.json b/json/items/ammo/shot.json
index e33fc96..420c4a5 100644
--- a/json/items/ammo/shot.json
+++ b/json/items/ammo/shot.json
@@ -4,7 +4,7 @@
"type": "AMMO",
"looks_like": "shot_00",
"name": { "str_sp": "12ga 000 buckshot" },
- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
+ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range.",
"weight": "32 g",
"volume": "250 ml",
"price": "750 cent",
@@ -40,7 +40,7 @@
"copy-from": "shot_000",
"type": "AMMO",
"name": { "str_sp": "12ga 000 buckshot, reloaded" },
- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. SWAT forces wouldn't use this homebrew shell, but a sovereign citizen looking to fend off SWAT probably would.",
+ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/gun/473.json b/json/items/gun/473.json
index 0fbd280..76bd0df 100644
--- a/json/items/gun/473.json
+++ b/json/items/gun/473.json
@@ -8,7 +8,7 @@
"description": "The Heckler & Koch G11 is a bullpup assault rifle that was designed to replace the G3 rifle. It utilizes the caseless 4.73x33mm round from an internal magazine bay and has a very high rate of burst fire.",
"weight": "3650 g",
"volume": "1500 ml",
- "looks_like": "rm51_assault_rifle",
+ "looks_like": "fs2000",
"price": "15000 USD",
"price_postapoc": "100 USD",
"to_hit": -1,
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
index 6901149..22f18bf 100644
--- a/json/items/magazine/223.json
+++ b/json/items/magazine/223.json
@@ -5,7 +5,7 @@
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "H&K G36 30-round magazine" },
- "description": "A standard capacity box magazine for use with the Heckler & Koch G36 assault rifle.",
+ "description": "A standard 30-round box magazine for use with the Heckler & Koch G36 assault rifle.",
"weight": "127 g",
"material": [ "plastic" ],
"ammo_type": [ "223" ],
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index bc9cade..159ed01 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -4,7 +4,7 @@
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "H&K HK417 20-round magazine" },
- "description": "A 20-round double stack box magazine for the Heckler & Koch HK417 rifle.",
+ "description": "A standard 20-round double-stack box magazine for the Heckler & Koch HK417 rifle.",
"weight": "90 g",
"volume": "500 ml",
"price": 5600,
@@ -21,7 +21,7 @@
"copy-from": "hk417mag_20rd",
"type": "MAGAZINE",
"name": { "str": "H&K HK417 10-round magazine" },
- "description": "A 10-round double stack box magazine for the Heckler & Koch HK417 rifle.",
+ "description": "A compact 10-round double-stack box magazine for the Heckler & Koch HK417 rifle.",
"weight": "55 g",
"volume": "250 ml",
"price": 5000,
@@ -33,15 +33,29 @@
"id": "hk417_makeshiftmag",
"copy-from": "hk417_makeshiftmag",
"type": "MAGAZINE",
- "name": { "str": "H&K HK417 5-round makeshift magazine" },
- "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch HK417 rifle."
+ "name": { "str": "H&K HK417 makeshift magazine" },
+ "description": "An improvised 5-round single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch HK417 rifle."
+ },
+ {
+ "id": "g3mag",
+ "copy-from": "g3mag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K G3 20-round magazine" },
+ "description": "A standard 20-round box magazine for the Heckler & Koch G3 rifle."
+ },
+ {
+ "id": "g3bigmag",
+ "copy-from": "g3bigmag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K G3 50-round drum magazine" },
+ "description": "A bulky 50-round drum magazine for the Heckler & Koch G3 rifle."
},
{
"id": "g3smallmag",
"looks_like": "g3mag",
"type": "MAGAZINE",
- "name": { "str": "H&K G3 10 round magazine" },
- "description": "A 10-round aluminum box magazine for the Heckler & Koch G3 rifle.",
+ "name": { "str": "H&K G3 10-round magazine" },
+ "description": "A compact 10-round box magazine for the Heckler & Koch G3 rifle.",
"weight": "75 g",
"volume": "250 ml",
"price": 4500,
@@ -53,5 +67,12 @@
"reliability": 9,
"flags": [ "MAG_COMPACT" ],
"capacity": 10
+ },
+ {
+ "id": "g3_makeshiftmag",
+ "copy-from": "g3_makeshiftmag",
+ "type": "MAGAZINE",
+ "name": { "str": "H&K G3 makeshift magazine" },
+ "description": "An improvised 5-round single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch G3 rifle."
}
]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index a4a691c..aba7e38 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -3,8 +3,8 @@
"id": "usp40mag",
"copy-from": "usp9mag",
"type": "MAGAZINE",
- "name": { "str": "H&K USP .40 13-round magazine" },
- "description": "A standard capacity magazine for use with the Heckler & Koch USP .40 handgun.",
+ "name": { "str": "H&K USP .40 magazine" },
+ "description": "A standard 13-round magazine for use with the Heckler & Koch USP .40 handgun.",
"ammo_type": [ "40" ],
"capacity": 13
},
@@ -12,15 +12,15 @@
"id": "p3040mag",
"copy-from": "usp40mag",
"type": "MAGAZINE",
- "name": { "str": "H&K P30 .40 13-round magazine" },
- "description": "A standard capacity magazine for use with the Heckler & Koch P30 .40 handgun."
+ "name": { "str": "H&K P30 .40 magazine" },
+ "description": "A standard 13-round magazine for use with the Heckler & Koch P30 .40 handgun."
},
{
"id": "ump40mag",
"copy-from": "ump45mag",
"type": "MAGAZINE",
- "name": { "str": "H&K UMP40 30-round magazine" },
- "description": "A standard 30-round box magazine for use with the Heckler & Koch UMP40 SMG.",
+ "name": { "str": "H&K UMP40 magazine" },
+ "description": "A standard 30-round curved box magazine for use with the Heckler & Koch UMP40 SMG.",
"weight": "200 g",
"ammo_type": [ "40" ],
"capacity": 30
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index ec295bd..67b28c2 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -3,8 +3,8 @@
"id": "ump45mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
- "name": { "str": "H&K UMP45 25-round magazine" },
- "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG.",
+ "name": { "str": "H&K UMP45 magazine" },
+ "description": "A standard 25-round straight box magazine for use with the Heckler & Koch UMP45 SMG.",
"weight": "200 g",
"volume": "500 ml",
"price": 4950,
@@ -20,15 +20,15 @@
"id": "ump45_makeshiftmag",
"copy-from": "ump45_makeshiftmag",
"type": "MAGAZINE",
- "name": { "str": "H&K UMP45 20-round makeshift magazine" },
- "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch UMP45 SMG."
+ "name": { "str": "H&K UMP45 makeshift magazine" },
+ "description": "An improvised 20-round single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch UMP45 SMG."
},
{
"id": "usp45mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
- "name": { "str": "H&K USP .45 12-round magazine" },
- "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun.",
+ "name": { "str": "H&K USP .45 magazine" },
+ "description": "A standard 12-round magazine for use with the Heckler & Koch USP .45 handgun.",
"weight": "60 g",
"volume": "250 ml",
"price": 5900,
@@ -45,8 +45,8 @@
"id": "hk45mag",
"copy-from": "usp45mag",
"type": "MAGAZINE",
- "name": { "str": "H&K HK45 10-round magazine" },
- "description": "A standard capacity magazine for use with the Heckler & Koch HK45 handgun.",
+ "name": { "str": "H&K HK45 magazine" },
+ "description": "A standard 10-round magazine for use with the Heckler & Koch HK45 handgun.",
"capacity": 10
}
]
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json
index d62d2dc..f033fc9 100644
--- a/json/items/magazine/46.json
+++ b/json/items/magazine/46.json
@@ -5,7 +5,7 @@
"looks_like": "usp9mag",
"type": "MAGAZINE",
"name": { "str": "H&K 4.6mm 20-round magazine" },
- "description": "A standard capacity 20-round magazine for use with Heckler & Koch's proprietary 4.6x30mm round.",
+ "description": "A standard 20-round magazine for use with Heckler & Koch's proprietary 4.6x30mm round.",
"weight": "100 g",
"volume": "250 ml",
"price": 4700,
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 0a4cac7..0acb848 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -3,8 +3,8 @@
"id": "hk_g11_mag",
"looks_like": "8x40_50_mag",
"type": "MAGAZINE",
- "name": { "str": "H&K G11 50-round magazine" },
- "description": "A 50 round box magazine for use with the Heckler & Koch G11 caseless assault rifle.",
+ "name": { "str": "H&K G11 magazine" },
+ "description": "A standard 50-round box magazine for use with the Heckler & Koch G11 caseless assault rifle.",
"weight": "100 g",
"volume": "500 ml",
"price": 20000,
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index d62ed35..9311d24 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -4,7 +4,7 @@
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": { "str": "H&K USP 9x19mm 15-round magazine" },
- "description": "A factory specification 15-round box magazine for use with the dependable Heckler & Koch USP 9x19mm pistol.",
+ "description": "A standard 15-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
"weight": "75 g",
"volume": "250 ml",
"price": 3850,
@@ -22,7 +22,7 @@
"copy-from": "usp9mag",
"type": "MAGAZINE",
"name": { "str": "H&K USP 9x19mm 10-round magazine" },
- "description": "A 10-round box magazine for use with the Heckler & Koch USP 9x19mm pistol, physically of the same size as a 15-round magazine. It's made to comply with laws that limit maximum magazine capacity for firearms in some states.",
+ "description": "A reduced-capacity 10-round box magazine for use with the Heckler & Koch USP 9x19mm pistol, physically of the same size as a 15-round magazine. It is made to comply with laws that limit maximum magazine capacity for firearms in some states.",
"price_postapoc": 80,
"capacity": 10
},
@@ -31,7 +31,7 @@
"copy-from": "usp9mag",
"type": "MAGAZINE",
"name": { "str": "H&K USP 9x19mm 18-round magazine" },
- "description": "An extended 18-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+ "description": "An expanded 18-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
"weight": "90 g",
"volume": "270 ml",
"price": 4000,
@@ -43,7 +43,7 @@
"copy-from": "usp9mag",
"type": "MAGAZINE",
"name": { "str": "H&K USP 9x19mm 20-round magazine" },
- "description": "An extended 20-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+ "description": "An expanded 20-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
"weight": "98 g",
"volume": "280 ml",
"price": 4200,
@@ -66,15 +66,15 @@
"id": "p309mag",
"copy-from": "usp9mag",
"type": "MAGAZINE",
- "name": { "str": "H&K P30 9mm 15-round magazine" },
- "description": "A factory specification 15-round box magazine for use with the Heckler & Koch P30 9mm handgun."
+ "name": { "str": "H&K P30 9x19mm magazine" },
+ "description": "A standard 15-round box magazine for use with the Heckler & Koch P30 9x19mm pistol."
},
{
"id": "mp5mag",
"//": "Tileset whitelist for SMG magazines",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 30-round magazine" },
- "description": "A standard capacity curved magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "A standard 30-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "210 g",
"volume": "500 ml",
"price": 4100,
@@ -106,7 +106,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 50-round drum magazine" },
- "description": "A drum magazine for use with the Heckler & Koch MP5 SMG. Much greater capacity, but less reliable than the factory specification magazine.",
+ "description": "A 50-round drum magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "350 g",
"volume": "750 ml",
"price": 6920,
@@ -120,7 +120,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 40-round magazine" },
- "description": "An extended-capacity 40-round magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "An expanded-capacity 40-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "280 g",
"volume": "667 ml",
"price": 4550,
@@ -132,7 +132,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 38-round magazine" },
- "description": "An extended-capacity 38-round magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "An expanded-capacity 38-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "266 g",
"volume": "633 ml",
"price": 4500,
@@ -144,7 +144,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 20-round magazine" },
- "description": "A compact 20-round magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "A compact 20-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "128 g",
"volume": "172 ml",
"price": 3500,
@@ -156,7 +156,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 15-round magazine" },
- "description": "A compact 15-round magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "A compact 15-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "96 g",
"volume": "129 ml",
"price": 3000,
@@ -168,7 +168,7 @@
"copy-from": "mp5mag",
"type": "MAGAZINE",
"name": { "str": "H&K MP5 10-round magazine" },
- "description": "A compact 10-round magazine for use with the Heckler & Koch MP5 SMG.",
+ "description": "A very compact 10-round curved magazine for use with the Heckler & Koch MP5 SMG.",
"weight": "64 g",
"volume": "86 ml",
"price": 2500,
@@ -179,7 +179,7 @@
"id": "ump9mag",
"copy-from": "ump45mag",
"type": "MAGAZINE",
- "name": { "str": "H&K UMP9 30-round magazine" },
+ "name": { "str": "H&K UMP9 magazine" },
"description": "A standard 30-round curved box magazine for use with the Heckler & Koch UMP9 SMG.",
"weight": "200 g",
"ammo_type": [ "9mm" ],
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
index 272168f..1f57f67 100644
--- a/json/items/magazine/shot.json
+++ b/json/items/magazine/shot.json
@@ -3,8 +3,8 @@
"id": "hk_caws_mag",
"looks_like": "saiga10mag",
"type": "MAGAZINE",
- "name": { "str": "H&K CAWS 10-round magazine" },
- "description": "A removable plastic box magazine for the Heckler & Koch CAWS shotgun. Holds 10 shells.",
+ "name": { "str": "H&K CAWS magazine" },
+ "description": "A standard 10-round box magazine for the Heckler & Koch CAWS shotgun.",
"weight": "210 g",
"volume": "500 ml",
"price": 30000,
diff --git a/json/recipes/473.json b/json/recipes/473.json
index ef77185..7439198 100644
--- a/json/recipes/473.json
+++ b/json/recipes/473.json
@@ -5,7 +5,7 @@
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_RIFLE",
"skill_used": "fabrication",
- "difficulty": 7,
+ "difficulty": 10,
"skills_required": [ "gun", 6 ],
"time": "2 m",
"batch_time_factors": [ 60, 5 ],
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-30 06:42:01 +0000