Skip to content

Commit

Permalink
Merge pull request #46251 from Mrzjadacz/Streamline-223-magazines-vol…
Browse files Browse the repository at this point in the history 
…umes,-add-lenghts

Audit .223 STANAG magazines, add max_item_length to ammo pouches
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Jan 8, 2021
2 parents 2d60a57 + 64fc5fc commit 07e0c94
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 18 deletions.
17 changes: 17 additions & 0 deletions data/json/items/armor/ammo_pouch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -147,27 +149,31 @@
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "750 ml",
"max_contains_weight": "2 kg",
"moves": 40,
"flag_restriction": [ "MAG_COMPACT" ]
},
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "750 ml",
"max_contains_weight": "2 kg",
"moves": 40,
"flag_restriction": [ "MAG_COMPACT" ]
},
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "750 ml",
"max_contains_weight": "2 kg",
"moves": 40,
"flag_restriction": [ "MAG_COMPACT" ]
},
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "750 ml",
"max_contains_weight": "2 kg",
"moves": 40,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -303,13 +310,15 @@
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "500 ml",
"max_contains_weight": "2 kg",
"moves": 40,
"flag_restriction": [ "MAG_COMPACT" ]
},
{
"pocket_type": "CONTAINER",
"max_item_length": "240 mm",
"max_contains_volume": "500 ml",
"max_contains_weight": "2 kg",
"moves": 40,
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
48 changes: 30 additions & 18 deletions data/json/items/magazine/223.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down Expand Up @@ -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": "#",
Expand All @@ -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": "#",
Expand All @@ -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" ],
Expand All @@ -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": "#",
Expand All @@ -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,
Expand All @@ -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": "#",
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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": "#",
Expand All @@ -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": "#",
Expand All @@ -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": "#",
Expand Down

0 comments on commit 07e0c94

Please sign in to comment.