From bc4f3debf87649feeed46ae3c94cfd37d263371f Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Wed, 26 Feb 2020 00:32:48 +0100 Subject: [PATCH] Magazine name to object --- data/json/items/battery.json | 2 +- data/json/items/classes/magazine.json | 4 ++-- data/json/items/magazine/22.json | 2 +- data/json/items/magazine/32.json | 2 +- data/json/items/magazine/40.json | 2 +- data/json/items/magazine/40mm.json | 4 ++-- data/json/items/magazine/45.json | 6 +++--- data/json/items/magazine/9mm.json | 6 +++--- data/json/items/magazine/chemical_spray.json | 2 +- data/json/items/magazine/liquid.json | 4 ++-- data/json/items/magazine/nail.json | 2 +- data/json/items/magazine/shot.json | 10 +++++----- data/json/items/magazine/weldgas.json | 4 ++-- data/json/items/vehicle/fuel_storage.json | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/json/items/battery.json b/data/json/items/battery.json index be3433a117a17..09398f079036d 100644 --- a/data/json/items/battery.json +++ b/data/json/items/battery.json @@ -264,7 +264,7 @@ "id": "huge_atomic_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "military plutonium fuel cell", + "name": { "str": "military plutonium fuel cell" }, "description": "This battery uses a huge plutonium-244 rod to stablize an exotic nanocompound. It was used in military mech-suits, was highly experimental, and had no civilian applications. Although it stores a stupendous amount of power, it cannot be recharged.", "weight": "64000 g", "volume": "30 L", diff --git a/data/json/items/classes/magazine.json b/data/json/items/classes/magazine.json index 0b4fa204fb5be..cddf032580e40 100644 --- a/data/json/items/classes/magazine.json +++ b/data/json/items/classes/magazine.json @@ -2,9 +2,9 @@ { "abstract": "magazine_belt", "type": "MAGAZINE", - "name": "ammo belt", + "name": { "str": "ammo belt" }, "description": "An ammo belt consisting of metal linkages which disintegrate upon firing.", - "volume": 0, + "volume": "0 ml", "price": 0, "material": "steel", "symbol": "#", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index dedfa91078fba..2734cf7cc455a 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -175,7 +175,7 @@ "id": "wp22mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Walther P22 magazine", + "name": { "str": "Walther P22 magazine" }, "description": "A 10-round box magazine for the Walther P22.", "weight": "25 g", "volume": "126 ml", diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json index ad96587037d8b..4bc148d666bb9 100644 --- a/data/json/items/magazine/32.json +++ b/data/json/items/magazine/32.json @@ -3,7 +3,7 @@ "id": "ppkmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Walther PPK magazine", + "name": { "str": "Walther PPK magazine" }, "description": "A standard 8-round steel box magazine for the Walther PPK.", "weight": "80 g", "volume": "250 ml", diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index 958dd41090b2e..4a6427952ee11 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -71,7 +71,7 @@ "id": "smg_40_mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "makeshift .40 20-round magazine", + "name": { "str": "makeshift .40 20-round magazine" }, "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 20 rounds of .40S&W.", "weight": "300 g", "volume": "750 ml", diff --git a/data/json/items/magazine/40mm.json b/data/json/items/magazine/40mm.json index 25a163b9775cd..1e5b6fd3b4d02 100644 --- a/data/json/items/magazine/40mm.json +++ b/data/json/items/magazine/40mm.json @@ -3,9 +3,9 @@ "id": "belt40mm", "//": "Tileset whitelist for explosive launchers.", "type": "MAGAZINE", - "name": "grenade belt", + "name": { "str": "grenade belt" }, "description": "An ammo belt consisting of metal linkages which disintegrate upon firing. This one holds 40mm grenades and is too bulky to be worn like other ammo belts.", - "volume": 0, + "volume": "0 ml", "price": 0, "rigid": false, "material": "steel", diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index c9574693ec8e6..66a428072a066 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -149,7 +149,7 @@ "id": "ump45mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "UMP45 magazine", + "name": { "str": "UMP45 magazine" }, "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.", "weight": "200 g", "volume": "500 ml", @@ -166,14 +166,14 @@ "id": "ump45_makeshiftmag", "copy-from": "smg_45_mag", "type": "MAGAZINE", - "name": "UMP45 makeshift magazine", + "name": { "str": "UMP45 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 UMP45 SMG." }, { "id": "usp45mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "USP .45 magazine", + "name": { "str": "USP .45 magazine" }, "description": "A standard capacity magazine for use with the H&K USP handgun.", "weight": "60 g", "volume": "250 ml", diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index 4773aca978609..0c4a51739c45f 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -246,7 +246,7 @@ "id": "survivor9mm_mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "makeshift STEN magazine", + "name": { "str": "makeshift STEN magazine" }, "description": "An improvised magazine that is mostly compatible with the STEN submachine gun, with a simplified feed system.", "weight": "300 g", "volume": "500 ml", @@ -281,7 +281,7 @@ "id": "usp9mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "USP 9mm magazine", + "name": { "str": "USP 9mm magazine" }, "description": "A factory specification 15-round box magazine for use with the dependable H&K USP 9x19mm pistol.", "weight": "75 g", "volume": "250 ml", @@ -298,7 +298,7 @@ "id": "uzimag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "UZI magazine", + "name": { "str": "UZI magazine" }, "description": "A standard 32-round steel box magazine for use with the UZI SMG.", "weight": "220 g", "volume": "500 ml", diff --git a/data/json/items/magazine/chemical_spray.json b/data/json/items/magazine/chemical_spray.json index af80e97395ea2..fc67d84f9401e 100644 --- a/data/json/items/magazine/chemical_spray.json +++ b/data/json/items/magazine/chemical_spray.json @@ -3,7 +3,7 @@ "id": "pressurized_tank_chem", "looks_like": "pressurized_tank", "type": "MAGAZINE", - "name": "pressurized chemical tank", + "name": { "str": "pressurized chemical tank" }, "description": "A makeshift pressurized 2L canister designed to feed a makeshift chemical thrower.", "weight": "800 g", "volume": "2 L", diff --git a/data/json/items/magazine/liquid.json b/data/json/items/magazine/liquid.json index d1d359a3f2cdf..71f47707731c9 100644 --- a/data/json/items/magazine/liquid.json +++ b/data/json/items/magazine/liquid.json @@ -3,7 +3,7 @@ "id": "pressurized_tank", "//": "Tileset whitelist for flame or chemical throwers.", "type": "MAGAZINE", - "name": "pressurized fuel tank", + "name": { "str": "pressurized fuel tank" }, "description": "A pressurized 3L canister designed to feed a flamethrower.", "weight": "600 g", "volume": "3 L", @@ -20,7 +20,7 @@ "id": "aux_pressurized_tank", "looks_like": "pressurized_tank", "type": "MAGAZINE", - "name": "small pressurized fuel tank", + "name": { "str": "small pressurized fuel tank" }, "description": "A pressurized 0.5L canister built for use with a small auxiliary flamethrower.", "weight": "100 g", "volume": "500 ml", diff --git a/data/json/items/magazine/nail.json b/data/json/items/magazine/nail.json index ddc36b0fd67e2..eda6ee79cbf3f 100644 --- a/data/json/items/magazine/nail.json +++ b/data/json/items/magazine/nail.json @@ -3,7 +3,7 @@ "id": "nailmag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "nail rifle magazine", + "name": { "str": "nail rifle magazine" }, "description": "An improvised magazine for use with a nail rifle. Little more than a tin can, spring and some duct tape it is awkward to reload and not especially reliable.", "weight": "60 g", "volume": "250 ml", diff --git a/data/json/items/magazine/shot.json b/data/json/items/magazine/shot.json index 34e8d75997915..db50ba655d1c5 100644 --- a/data/json/items/magazine/shot.json +++ b/data/json/items/magazine/shot.json @@ -38,7 +38,7 @@ "id": "USAS10mag", "looks_like": "shotbelt_20", "type": "MAGAZINE", - "name": "USAS-12 box magazine", + "name": { "str": "USAS-12 box magazine" }, "description": "A removable plastic magazine for the USAS-12 shotgun. Holds 10 rounds.", "weight": "750 g", "volume": "360 ml", @@ -55,7 +55,7 @@ "id": "USAS20mag", "looks_like": "shotbelt_20", "type": "MAGAZINE", - "name": "USAS-12 drum magazine", + "name": { "str": "USAS-12 drum magazine" }, "description": "A removable plastic magazine for the USAS-12 shotgun. Holds 20 rounds.", "weight": "794 g", "volume": "1742 ml", @@ -73,7 +73,7 @@ "id": "shotbelt_20", "//": "Tileset whitelist for shotgun magazines and speedloaders", "type": "MAGAZINE", - "name": "shotshell belt", + "name": { "str": "shotshell belt" }, "description": "A non-disintegrating cloth ammo belt which can hold up to 20 shotgun shells. Notably less reliable than metal ammo belts.", "weight": "200 g", "volume": "500 ml", @@ -91,7 +91,7 @@ "id": "shot_speedloader6", "looks_like": "shotbelt_20", "type": "MAGAZINE", - "name": "shotgun 6-round speedloader", + "name": { "str": "shotgun 6-round speedloader" }, "description": "A plastic tube with a sliding handle that can be used to quickly load 6 rounds into a shotgun's tube in a much shorter period of time than by hand. It needs to interface with a chute to be used with any speed.", "weight": "480 g", "volume": "1750 ml", @@ -107,7 +107,7 @@ "id": "shot_speedloader8", "looks_like": "shotbelt_20", "type": "MAGAZINE", - "name": "shotgun 8-round speedloader", + "name": { "str": "shotgun 8-round speedloader" }, "description": "A plastic tube with a sliding handle that can be used to quickly load 8 rounds into a shotgun's tube in a much shorter period of time than by hand. It needs to interface with a chute to be used with any speed.", "weight": "510 g", "volume": "2 L", diff --git a/data/json/items/magazine/weldgas.json b/data/json/items/magazine/weldgas.json index 67729390e0f6b..f773450ebd94e 100644 --- a/data/json/items/magazine/weldgas.json +++ b/data/json/items/magazine/weldgas.json @@ -3,7 +3,7 @@ "id": "tinyweldtank", "looks_like": "pressurized_tank", "type": "MAGAZINE", - "name": "small welding tank", + "name": { "str": "small welding tank" }, "description": "A compact steel cylinder designed for holding pressurized welding gases. It is marked with several faded and now unreadable symbols.", "weight": "1500 g", "volume": "1 L", @@ -21,7 +21,7 @@ "id": "weldtank", "looks_like": "pressurized_tank", "type": "MAGAZINE", - "name": "welding tank", + "name": { "str": "welding tank" }, "description": "A large steel cylinder designed for holding pressurized welding gases. It is marked with several faded and now unreadable symbols.", "weight": "6000 g", "volume": "3 L", diff --git a/data/json/items/vehicle/fuel_storage.json b/data/json/items/vehicle/fuel_storage.json index c88398116c7c1..bc0fd062f712e 100644 --- a/data/json/items/vehicle/fuel_storage.json +++ b/data/json/items/vehicle/fuel_storage.json @@ -2,7 +2,7 @@ { "id": "fuel_bunker", "type": "MAGAZINE", - "name": "fuel bunker", + "name": { "str": "fuel bunker" }, "description": "A bin for holding solid fuel.", "symbol": "]", "color": "white",