diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index 75d8f7bd027a0..6af7807031579 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -91,6 +91,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "300 mm", "max_contains_volume": "1500 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -119,6 +120,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "750 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -147,6 +149,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "750 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -154,6 +157,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "750 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -161,6 +165,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "750 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -168,6 +173,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "750 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -274,6 +280,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "250 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -303,6 +310,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -310,6 +318,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "max_contains_volume": "500 ml", "max_contains_weight": "2 kg", "moves": 40, @@ -426,6 +435,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "300 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -434,6 +444,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "300 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -442,6 +453,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "300 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -450,6 +462,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "300 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -492,6 +505,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -500,6 +514,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -508,6 +523,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", @@ -516,6 +532,7 @@ }, { "pocket_type": "CONTAINER", + "max_item_length": "240 mm", "min_item_volume": "250 ml", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json index 7de4af45cbacc..15e061876a314 100644 --- a/data/json/items/magazine/223.json +++ b/data/json/items/magazine/223.json @@ -52,8 +52,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 10-round magazine" }, "description": "A compact 10-round box magazine for use with STANAG compatible rifles.", - "weight": "131 g", - "volume": "250 ml", + "weight": "145 g", + "volume": "160 ml", + "longest_side": "107 mm", "price": 5000, "price_postapoc": 100, "material": [ "steel" ], @@ -126,8 +127,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 5-round magazine" }, "description": "A very compact 5-round box magazine for use with STANAG compatible rifles.", - "weight": "88 g", - "volume": "50 ml", + "weight": "120 g", + "volume": "130 ml", + "longest_side": "76 mm", "price": 4000, "material": [ "steel" ], "symbol": "#", @@ -142,8 +144,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 20-round magazine" }, "description": "A compact 20-round box magazine for use with STANAG compatible rifles.", - "weight": "91 g", - "volume": "350 ml", + "weight": "210 g", + "volume": "230 ml", + "longest_side": "129 mm", "price": 4000, "material": [ "steel" ], "symbol": "#", @@ -158,8 +161,9 @@ "name": { "str": "STANAG 30-round magazine" }, "//": "Tileset whitelist for rifle magazines", "description": "A standard capacity 30-round box magazine for use with STANAG compatible rifles.", - "weight": "360 g", + "weight": "265 g", "volume": "290 ml", + "longest_side": "190 mm", "price": 8000, "price_postapoc": 250, "material": [ "steel" ], @@ -175,8 +179,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 40-round magazine" }, "description": "An increased-capacity 40-round box magazine for use with STANAG compatible rifles.", - "weight": "181 g", - "volume": "600 ml", + "weight": "220 g", + "volume": "390 ml", + "longest_side": "236 mm", "price": 8500, "material": [ "plastic", "steel" ], "symbol": "#", @@ -191,8 +196,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 50-round drum magazine" }, "description": "A bulky 50-round drum magazine for use with STANAG compatible rifles, known as the X-15.", - "weight": "680 g", - "volume": "1 L", + "weight": "500 g", + "volume": "530 ml", + "longest_side": "114 mm", "price": 9000, "price_postapoc": 500, "to_hit": -2, @@ -211,8 +217,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 60-round magazine" }, "description": "A high-capacity 60-round casket magazine for use with STANAG compatible rifles.", - "weight": "181 g", - "volume": "800 ml", + "weight": "240 g", + "volume": "600 ml", + "longest_side": "240 mm", "price": 12000, "material": [ "aluminum" ], "symbol": "#", @@ -228,7 +235,8 @@ "name": { "str": "STANAG 60-round drum magazine" }, "description": "A bulky 60-round drum magazine for use with STANAG compatible rifles, known as the D-60.", "weight": "581 g", - "volume": "1050 ml", + "volume": "700 ml", + "longest_side": "188 mm", "price": 9250, "to_hit": -2, "bashing": 4, @@ -246,8 +254,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 90-round snail drum magazine" }, "description": "A bulky 90-round snail drum magazine for use with STANAG compatible rifles.", - "weight": "567 g", - "volume": "1500 ml", + "weight": "630 g", + "volume": "1000 ml", + "longest_side": "200 mm", "price": 9500, "to_hit": -2, "bashing": 4, @@ -265,8 +274,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 100-round magazine" }, "description": "A high-capacity 100-round casket magazine for use with STANAG compatible rifles.", - "weight": "272 g", + "weight": "337 g", "volume": "1 L", + "longest_side": "350 mm", "price": 15000, "material": [ "aluminum" ], "symbol": "#", @@ -281,8 +291,9 @@ "type": "MAGAZINE", "name": { "str": "STANAG 100-round double drum magazine" }, "description": "A bulky 100-round double drum magazine for use with STANAG compatible rifles, known as the Beta-C Mag.", - "weight": "998 g", + "weight": "1700 g", "volume": "1200 ml", + "longest_side": "300 mm", "price": 14000, "material": [ "plastic", "steel" ], "symbol": "#", @@ -300,6 +311,7 @@ "description": "A bulky 150-round double drum magazine for use with STANAG compatible rifles, known as the SAW-MAG.", "weight": "2220 g", "volume": "1700 ml", + "longest_side": "343 mm", "price": 18000, "material": [ "plastic", "steel" ], "symbol": "#",