Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions data/json/items/armor/bespoke_armor/custom_legs.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,42 @@
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1000 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "21 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1000 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "21 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "15 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "500 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "13 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "500 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "13 cm",
"moves": 100
}
Expand Down Expand Up @@ -101,56 +101,56 @@
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "3 kg",
"max_contains_weight": "4 kg",
"max_item_length": "21 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "3 kg",
"max_contains_weight": "4 kg",
"max_item_length": "21 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "800 ml",
"max_contains_weight": "2 kg",
"max_contains_weight": "3 kg",
"max_item_length": "15 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "500 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "13 cm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "500 ml",
"max_contains_weight": "1 kg",
"max_contains_weight": "2 kg",
"max_item_length": "13 cm",
"moves": 100
}
Expand Down Expand Up @@ -212,28 +212,28 @@
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
}
Expand Down
45 changes: 30 additions & 15 deletions data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@
"moves": 100
}
],
"warmth": 10,
"warmth": 8,
"material_thickness": 0.65,
"flags": [ "VARSIZE", "POCKETS" ]
},
Expand Down Expand Up @@ -539,14 +539,14 @@
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
}
Expand Down Expand Up @@ -580,7 +580,7 @@
"type": "ITEM",
"subtypes": [ "ARMOR" ],
"name": { "str_sp": "skinny jeans" },
"description": "A pair of skinny jeans with two pockets.",
"description": "A pair of skinny jeans with four pockets.",
"weight": "500 g",
"volume": "1300 ml",
"price": "50 USD",
Expand Down Expand Up @@ -624,9 +624,9 @@
"//": "Lightweight 8 oz denim jeans.",
"flags": [ "VARSIZE", "POCKETS" ],
"snippet_category": [
{ "id": "jeans_skinny1", "text": "A pair of blue skinny jeans with two pockets." },
{ "id": "jeans_skinny2", "text": "A pair of black skinny jeans with two pockets." },
{ "id": "jeans_skinny3", "text": "A pair of red skinny jeans with two pockets." }
{ "id": "jeans_skinny1", "text": "A pair of blue skinny jeans with four pockets." },
{ "id": "jeans_skinny2", "text": "A pair of black skinny jeans with four pockets." },
{ "id": "jeans_skinny3", "text": "A pair of red skinny jeans with four pockets." }
],
"armor": [ { "encumbrance": [ 5, 7 ], "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ]
},
Expand Down Expand Up @@ -2119,7 +2119,7 @@
"warmth": 15,
"material_thickness": 0.2,
"flags": [ "VARSIZE", "POCKETS" ],
"armor": [ { "encumbrance": [ 2, 5 ], "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ]
"armor": [ { "encumbrance": [ 7, 11 ], "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ]
},
{
"id": "technician_pants_gray",
Expand All @@ -2138,29 +2138,44 @@
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_contains_volume": "1500 ml",
"max_contains_weight": "5 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_contains_volume": "1500 ml",
"max_contains_weight": "5 kg",
"max_item_length": "19 cm",
"moves": 80
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"max_item_length": "120 mm",
"moves": 140,
"description": "Utility knife pocket."
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "400 ml",
"max_contains_weight": "2 kg",
"max_item_length": "80 mm",
"moves": 120
},
{
"pocket_type": "CONTAINER",
"max_contains_volume": "1080 ml",
"max_contains_weight": "4 kg",
"max_contains_weight": "5 kg",
"max_item_length": "165 mm",
"moves": 100
}
Expand Down Expand Up @@ -2292,7 +2307,7 @@
"max_contains_volume": "1250 ml",
"max_contains_weight": "4 kg",
"max_item_length": "19 cm",
"moves": 80
"moves": 60
},
{
"pocket_type": "CONTAINER",
Expand Down