diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index fe31be679e63a..c48d8d8b141f7 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -5,11 +5,11 @@ "type": "MAGAZINE", "name": { "str": ".22 8-round speedloader" }, "description": "This speedloader can hold 8 rounds of .22 and quickly reload a compatible revolver.", - "weight": "64 g", - "volume": "250 ml", + "weight": "32 g", + "volume": "47 ml", "price": 600, "price_postapoc": 100, - "material": [ "steel" ], + "material": [ "steel", "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -30,8 +30,9 @@ "description": "An unusually-shaped pan magazine for the American-180." } ], - "weight": "760 g", - "volume": "500 ml", + "weight": "1039 g", + "volume": "892 ml", + "longest_side": "14 cm", "price": 7300, "price_postapoc": 250, "material": [ "steel" ], @@ -56,11 +57,12 @@ "description": "An unusually-shaped, polymer pan magazine for the American-180." } ], - "weight": "500 g", - "volume": "500 ml", + "weight": "779 g", + "volume": "892 ml", + "longest_side": "14 cm", "price": 7300, "price_postapoc": 250, - "material": [ "plastic" ], + "material": [ "plastic", "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -82,8 +84,9 @@ "description": "An unusually-shaped pan magazine for the American-180." } ], - "weight": "600 g", - "volume": "500 ml", + "weight": "1133 g", + "volume": "973 ml", + "longest_side": "15 cm", "price": 7500, "price_postapoc": 300, "material": [ "steel" ], @@ -108,11 +111,12 @@ "description": "An unusually-shaped polymer pan magazine for the American-180." } ], - "weight": "660 g", - "volume": "500 ml", + "weight": "1258 g", + "volume": "1081 ml", + "longest_side": "16 cm", "price": 8000, "price_postapoc": 400, - "material": [ "plastic" ], + "material": [ "plastic", "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -134,11 +138,12 @@ "description": "An unusually-shaped polymer pan magazine for the American-180." } ], - "weight": "770 g", - "volume": "600 ml", + "weight": "1258 g", + "volume": "1081 ml", + "longest_side": "17 cm", "price": 8000, "price_postapoc": 400, - "material": [ "plastic" ], + "material": [ "plastic", "steel" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -152,8 +157,9 @@ "type": "MAGAZINE", "name": { "str": ".22 19-round tube loader" }, "description": "A tube which holds 19 rounds of .22, designed for quick reloading of a compatible rifle with a tubular magazine.", - "weight": "180 g", - "volume": "250 ml", + "weight": "10 g", + "volume": "14 ml", + "longest_side": "49 cm", "price": 1200, "price_postapoc": 100, "material": [ "steel" ], @@ -178,7 +184,8 @@ } ], "weight": "60 g", - "volume": "250 ml", + "volume": "72 ml", + "longest_side": "9 cm", "price": 1700, "price_postapoc": 100, "material": [ "steel" ], @@ -202,11 +209,12 @@ "description": "An extended 25-round stick magazine for the Ruger 10/22, known as the BX-25." } ], - "weight": "180 g", - "volume": "500 ml", + "weight": "245 g", + "volume": "159 ml", + "longest_side": "185 mm", "price": 7900, "price_postapoc": 200, - "material": [ "steel" ], + "material": [ "steel", "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -227,11 +235,12 @@ "description": "A removable 10-round rotary magazine for the Ruger 10/22 which allows the magazine to fit flush with the bottom of the stock." } ], - "weight": "80 g", - "volume": "250 ml", + "weight": "57 g", + "volume": "34 ml", + "longest_side": "4 cm", "price": 1400, "price_postapoc": 100, - "material": [ "steel" ], + "material": [ "steel", "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], @@ -253,8 +262,9 @@ "description": "A standard capacity magazine for the popular S&W 22A pistol." } ], - "weight": "70 g", - "volume": "250 ml", + "weight": "60 g", + "volume": "72 ml", + "longest_side": "9 cm", "price": 2100, "price_postapoc": 100, "material": [ "steel" ], @@ -280,6 +290,7 @@ ], "weight": "55 g", "volume": "27ml", + "longest_side": "7 cm", "price": 2800, "price_postapoc": 100, "material": [ "steel" ], @@ -303,11 +314,12 @@ "description": "A 10-round box magazine for the Walther P22." } ], - "weight": "25 g", - "volume": "126 ml", + "weight": "60 g", + "volume": "44 ml", + "longest_side": "10 cm", "price": 3250, "price_postapoc": 100, - "material": [ "steel" ], + "material": [ "steel", "plastic" ], "symbol": "#", "color": "light_gray", "ammo_type": [ "22" ], diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 8bc889ed4c467..8791862e7663f 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -51,7 +51,6 @@ "hot_sauce", "yeast", "candy3", - "a180mag4", "liquid_soap", "chem_aluminium_sulphate", "bot_lab_security_drone_GR", @@ -140,7 +139,6 @@ "k_gambeson_xs", "arcfurnace", "maple_sap", - "a180mag3", "chem_washing_soda", "peanutbutter_imitation", "casting_mold",