From 53fd457f8cb081b73e755844d1878de699a76a8d Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 2 Jan 2025 11:49:53 -0800 Subject: Various formatting fixes I found while porting this mod. --- json/ammo_types.json | 2 +- json/items/gun/45.json | 48 +++++++++++++-------------- json/items/magazine/308.json | 19 ++++++----- json/items/magazine/40.json | 23 +++++++++++-- json/items/magazine/45.json | 17 +++++----- json/items/magazine/46.json | 9 ++--- json/items/magazine/9mm.json | 76 ++++++++++++++++++++++++------------------- json/items/magazine/shot.json | 8 ++--- json/recipes/473.json | 2 +- 9 files changed, 117 insertions(+), 87 deletions(-) diff --git a/json/ammo_types.json b/json/ammo_types.json index 2dbc9f6..9aae40c 100644 --- a/json/ammo_types.json +++ b/json/ammo_types.json @@ -1,7 +1,7 @@ [ { - "type": "ammunition_type", "id": "473", + "type": "ammunition_type", "name": "4.73x33mm", "default": "473x33mm" } diff --git a/json/items/gun/45.json b/json/items/gun/45.json index 0dc2f3c..d3bf4c2 100644 --- a/json/items/gun/45.json +++ b/json/items/gun/45.json @@ -1,4 +1,28 @@ [ + { + "id": "hk_ump45", + "copy-from": "smg_base", + "type": "GUN", + "name": { "str_sp": "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": "2300 g", + "volume": "1250 ml", + "price": "2900 USD", + "price_postapoc": "30 USD", + "to_hit": -2, + "ascii_picture": "hk_ump", + "bashing": 11, + "material": [ "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": "45", + "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 ] ], + "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ] + }, { "id": "usp_45", "//": "Modding this gun requires changing vanilla game files. :/ Upstream needs to get their copy-from load order problems fixed.", @@ -37,29 +61,5 @@ "min_cycle_recoil": 400, "magazines": [ [ "45", [ "hk45mag" ] ] ], "built_in_mods": [ "pistol_grip" ] - }, - { - "id": "hk_ump45", - "copy-from": "smg_base", - "type": "GUN", - "name": { "str_sp": "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": "2300 g", - "volume": "1250 ml", - "price": "2900 USD", - "price_postapoc": "30 USD", - "to_hit": -2, - "ascii_picture": "hk_ump", - "bashing": 11, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": "45", - "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 ] ], - "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ] } ] diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json index 159ed01..dfed8b2 100644 --- a/json/items/magazine/308.json +++ b/json/items/magazine/308.json @@ -7,14 +7,15 @@ "description": "A standard 20-round double-stack box magazine for the Heckler & Koch HK417 rifle.", "weight": "90 g", "volume": "500 ml", - "price": 5600, - "price_postapoc": 250, + "price": "56 USD", + "price_postapoc": "250 cent", "material": [ "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "308" ], - "flags": [ "MAG_COMPACT" ], - "capacity": 20 + "capacity": 20, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] }, { "id": "hk417mag_10rd", @@ -24,8 +25,8 @@ "description": "A compact 10-round double-stack box magazine for the Heckler & Koch HK417 rifle.", "weight": "55 g", "volume": "250 ml", - "price": 5000, - "price_postapoc": 100, + "price": "50 USD", + "price_postapoc": "1 USD", "material": [ "plastic" ], "capacity": 10 }, @@ -52,14 +53,14 @@ }, { "id": "g3smallmag", - "looks_like": "g3mag", + "looks_like": "stanag20", "type": "MAGAZINE", "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, - "price_postapoc": 90, + "price": "45 USD", + "price_postapoc": "90 cent", "material": [ "aluminum" ], "symbol": "#", "color": "light_gray", diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json index aba7e38..4c98dfd 100644 --- a/json/items/magazine/40.json +++ b/json/items/magazine/40.json @@ -1,11 +1,20 @@ [ { "id": "usp40mag", - "copy-from": "usp9mag", + "looks_like": "usp9mag", "type": "MAGAZINE", "name": { "str": "H&K USP .40 magazine" }, "description": "A standard 13-round magazine for use with the Heckler & Koch USP .40 handgun.", + "weight": "75 g", + "volume": "250 ml", + "price": 3850, + "price_postapoc": 100, + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", "ammo_type": [ "40" ], + "reliability": 10, + "flags": [ "MAG_COMPACT" ], "capacity": 13 }, { @@ -17,12 +26,20 @@ }, { "id": "ump40mag", - "copy-from": "ump45mag", + "looks_like": "ump45mag", "type": "MAGAZINE", "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", + "volume": "500 ml", + "price": "4950 cent", + "price_postapoc": "1 USD", + "material": "steel", + "symbol": "#", + "color": "light_gray", "ammo_type": [ "40" ], - "capacity": 30 + "capacity": 30, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] } ] diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json index 67b28c2..65c9f52 100644 --- a/json/items/magazine/45.json +++ b/json/items/magazine/45.json @@ -7,14 +7,15 @@ "description": "A standard 25-round straight box magazine for use with the Heckler & Koch UMP45 SMG.", "weight": "200 g", "volume": "500 ml", - "price": 4950, - "price_postapoc": 100, + "price": "4950 cent", + "price_postapoc": "1 USD", "material": [ "plastic", "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "45" ], - "flags": [ "MAG_COMPACT" ], - "capacity": 25 + "capacity": 25, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] }, { "id": "ump45_makeshiftmag", @@ -31,15 +32,15 @@ "description": "A standard 12-round magazine for use with the Heckler & Koch USP .45 handgun.", "weight": "60 g", "volume": "250 ml", - "price": 5900, - "price_postapoc": 100, + "price": "59 USD", + "price_postapoc": "1 USD", "material": [ "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "45" ], + "capacity": 12, "reliability": 10, - "flags": [ "MAG_COMPACT" ], - "capacity": 12 + "flags": [ "MAG_COMPACT" ] }, { "id": "hk45mag", diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json index f033fc9..911a5b6 100644 --- a/json/items/magazine/46.json +++ b/json/items/magazine/46.json @@ -8,14 +8,15 @@ "description": "A standard 20-round magazine for use with Heckler & Koch's proprietary 4.6x30mm round.", "weight": "100 g", "volume": "250 ml", - "price": 4700, - "price_postapoc": 100, + "price": "47 USD", + "price_postapoc": "1 USD", "material": [ "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "46" ], - "flags": [ "MAG_COMPACT" ], - "capacity": 20 + "capacity": 20, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] }, { "id": "hk46bigmag", diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json index 9311d24..c4413a1 100644 --- a/json/items/magazine/9mm.json +++ b/json/items/magazine/9mm.json @@ -7,15 +7,15 @@ "description": "A standard 15-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.", "weight": "75 g", "volume": "250 ml", - "price": 3850, - "price_postapoc": 100, + "price": "3850 cent", + "price_postapoc": "1 USD", "material": [ "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "9mm" ], "reliability": 10, - "flags": [ "MAG_COMPACT" ], - "capacity": 15 + "capacity": 15, + "flags": [ "MAG_COMPACT" ] }, { "id": "usp9mag_10rd", @@ -23,7 +23,7 @@ "type": "MAGAZINE", "name": { "str": "H&K USP 9x19mm 10-round magazine" }, "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, + "price_postapoc": "80 cent", "capacity": 10 }, { @@ -34,8 +34,8 @@ "description": "An expanded 18-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.", "weight": "90 g", "volume": "270 ml", - "price": 4000, - "price_postapoc": 120, + "price": "40 USD", + "price_postapoc": "120 cent", "capacity": 18 }, { @@ -46,8 +46,8 @@ "description": "An expanded 20-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.", "weight": "98 g", "volume": "280 ml", - "price": 4200, - "price_postapoc": 130, + "price": "42 USD", + "price_postapoc": "130 cent", "capacity": 20 }, { @@ -58,9 +58,10 @@ "description": "An extended 32-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.", "weight": "140 g", "volume": "420 ml", - "price": 4800, - "price_postapoc": 180, - "capacity": 32 + "price": "48 USD", + "price_postapoc": "180 cent", + "capacity": 32, + "reliability": 9 }, { "id": "p309mag", @@ -77,14 +78,15 @@ "description": "A standard 30-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "210 g", "volume": "500 ml", - "price": 4100, - "price_postapoc": 250, + "price": "41 USD", + "price_postapoc": "250 cent", "material": [ "steel" ], "symbol": "#", "color": "light_gray", - "ammo_type": [ "9mm" ], - "flags": [ "MAG_COMPACT" ], - "capacity": 30 + "ammo_type": "9mm", + "capacity": 30, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] }, { "id": "mp5mag_100rd", @@ -94,8 +96,8 @@ "description": "A bulky 100-round double drum magazine for use with the Heckler & Koch MP5 SMG.", "weight": "780 g", "volume": "800 ml", - "price": 7000, - "price_postapoc": 700, + "price": "70 USD", + "price_postapoc": "7 USD", "material": [ "steel", "plastic" ], "reload_time": 160, "flags": [ "MAG_BULKY" ], @@ -109,8 +111,8 @@ "description": "A 50-round drum magazine for use with the Heckler & Koch MP5 SMG.", "weight": "350 g", "volume": "750 ml", - "price": 6920, - "price_postapoc": 500, + "price": "6920 cent", + "price_postapoc": "5 USD", "reload_time": 160, "flags": [ "MAG_BULKY" ], "capacity": 50 @@ -123,8 +125,8 @@ "description": "An expanded-capacity 40-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "280 g", "volume": "667 ml", - "price": 4550, - "price_postapoc": 360, + "price": "4550 cent", + "price_postapoc": "360 cent", "capacity": 40 }, { @@ -135,8 +137,8 @@ "description": "An expanded-capacity 38-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "266 g", "volume": "633 ml", - "price": 4500, - "price_postapoc": 350, + "price": "45 USD", + "price_postapoc": "350 cent", "capacity": 38 }, { @@ -147,8 +149,8 @@ "description": "A compact 20-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "128 g", "volume": "172 ml", - "price": 3500, - "price_postapoc": 200, + "price": "35 USD", + "price_postapoc": "2 USD", "capacity": 20 }, { @@ -159,8 +161,8 @@ "description": "A compact 15-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "96 g", "volume": "129 ml", - "price": 3000, - "price_postapoc": 150, + "price": "30 USD", + "price_postapoc": "150 cent", "capacity": 15 }, { @@ -171,18 +173,26 @@ "description": "A very compact 10-round curved magazine for use with the Heckler & Koch MP5 SMG.", "weight": "64 g", "volume": "86 ml", - "price": 2500, - "price_postapoc": 100, + "price": "25 USD", + "price_postapoc": "1 USD", "capacity": 10 }, { "id": "ump9mag", - "copy-from": "ump45mag", + "looks_like": "ump45mag", "type": "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", + "volume": "500 ml", + "price": "4950 cent", + "price_postapoc": "1 USD", + "material": "steel", + "symbol": "#", + "color": "light_gray", "ammo_type": [ "9mm" ], - "capacity": 30 + "capacity": 30, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] } ] diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json index 1f57f67..0fcd4e8 100644 --- a/json/items/magazine/shot.json +++ b/json/items/magazine/shot.json @@ -7,14 +7,14 @@ "description": "A standard 10-round box magazine for the Heckler & Koch CAWS shotgun.", "weight": "210 g", "volume": "500 ml", - "price": 30000, - "price_postapoc": 175, + "price": "300 USD", + "price_postapoc": "175 cent", "material": [ "plastic" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "shot" ], + "capacity": 10, "reliability": 9, - "flags": [ "MAG_COMPACT" ], - "capacity": 10 + "flags": [ "MAG_COMPACT" ] } ] diff --git a/json/recipes/473.json b/json/recipes/473.json index cce9675..5759674 100644 --- a/json/recipes/473.json +++ b/json/recipes/473.json @@ -1,5 +1,5 @@ [ - { + { "result": "bootleg_473x33mm", "type": "recipe", "category": "CC_AMMO", -- cgit v1.2.1