Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ankle socks #36347

Merged
merged 13 commits into from
Dec 28, 2019
12 changes: 10 additions & 2 deletions data/json/itemgroups/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,7 @@
[ "snuggie", 5 ],
[ "flyer", 10 ],
[ "socks", 70 ],
[ "socks_ankle", 50 ],
[ "socks_wool", 30 ],
[ "pocketwatch", 5 ],
[ "flask_hip", 2 ],
Expand Down Expand Up @@ -1163,6 +1164,7 @@
"items": [
[ "sneakers", 80 ],
[ "socks", 70 ],
[ "socks_ankle", 50 ],
[ "tights", 20 ],
[ "stockings", 20 ],
[ "knee_high_boots", 20 ],
Expand Down Expand Up @@ -1450,7 +1452,7 @@
{
"type": "item_group",
"id": "shoestore_accessories",
"items": [ [ "socks", 100 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ]
"items": [ [ "socks", 100 ], [ "socks_ankle", 75 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -2554,6 +2556,7 @@
[ "boy_shorts", 25 ],
[ "bra", 25 ],
[ "socks", 45 ],
[ "socks_ankle", 30 ],
[ "stockings", 20 ],
[ "hat_cotton", 35 ],
[ "copper_bracelet", 10 ],
Expand Down Expand Up @@ -2753,7 +2756,12 @@
"type": "item_group",
"//": "unisex socks",
"subtype": "distribution",
"items": [ { "item": "socks", "prob": 70 }, { "item": "socks_wool", "prob": 30 }, { "item": "thermal_socks", "prob": 10 } ]
"items": [
{ "item": "socks", "prob": 70 },
{ "item": "socks_ankle", "prob": 50 },
{ "item": "socks_wool", "prob": 30 },
{ "item": "thermal_socks", "prob": 10 }
]
},
{
"id": "scarfs_unisex",
Expand Down
4 changes: 3 additions & 1 deletion data/json/itemgroups/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@
[ "tieclip", 3 ],
[ "collarpin", 3 ],
[ "socks", 70 ],
[ "socks_ankle", 50 ],
[ "briefcase", 5 ],
[ "mocassins", 5 ],
[ "boots_western", 4 ],
Expand Down Expand Up @@ -1265,7 +1266,8 @@
[ "football_armor", 10 ],
[ "helmet_football", 10 ],
[ "sneakers", 80 ],
[ "socks", 70 ],
[ "socks", 50 ],
[ "socks_ankle", 70 ],
[ "stockings", 20 ],
[ "tshirt", 80 ],
[ "longshirt", 70 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2704,6 +2704,7 @@
[ "coat_lab", 40 ],
[ "boots_steel", 5 ],
[ "socks", 70 ],
[ "socks_ankle", 50 ],
[ "mocassins", 20 ],
[ "bandana", 35 ],
[ "glasses_eye", 90 ],
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -1278,6 +1278,24 @@
"material_thickness": 1,
"flags": [ "VARSIZE", "SKINTIGHT" ]
},
{
"id": "socks_ankle",
"type": "ARMOR",
"name": "pair of ankle socks",
"name_plural": "pairs of ankle socks",
"description": "Short socks, commonly used for sports. These are designed to protect your feet from friction, not temperature",
"weight": "25 g",
"volume": "200 ml",
"price": 100,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "socks",
"color": "light_gray",
"covers": [ "FEET" ],
"coverage": 80,
"material_thickness": 1,
"flags": [ "VARSIZE", "SKINTIGHT" ]
},
{
"id": "socks_bag",
"type": "ARMOR",
Expand Down
5 changes: 3 additions & 2 deletions data/json/npcs/items_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
{
"type": "item_group",
"id": "npc_underwear_feet_male",
"items": [ [ "socks", 80 ], [ "socks_wool", 20 ], [ "null", 5 ] ]
"items": [ [ "socks", 80 ], [ "socks_ankle", 60 ], [ "socks_wool", 20 ], [ "null", 5 ] ]
},
{
"type": "item_group",
"id": "npc_underwear_feet_female",
"items": [ [ "socks", 50 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ]
"items": [ [ "socks", 50 ], [ "socks_ankle", 30 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -1008,6 +1008,7 @@
[ "smrifle_primer", 2 ],
[ "soap", 10 ],
[ "socks", 10 ],
[ "socks_ankle", 10 ],
[ "socks_wool", 10 ],
[ "solder_wire", 5 ],
[ "soldering_iron", 5 ],
Expand Down
18 changes: 9 additions & 9 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
"skills": [ { "level": 2, "name": "dodge" }, { "level": 3, "name": "throw" } ],
"items": {
"both": {
"items": [ "tank_top", "jersey", "b_shorts", "socks", "sneakers", "basketball", "sports_drink" ],
"items": [ "tank_top", "jersey", "b_shorts", "socks_ankle", "sneakers", "basketball", "sports_drink" ],
"entries": [ { "group": "charged_cell_phone" } ]
},
"male": [ "boxer_shorts" ],
Expand Down Expand Up @@ -638,7 +638,7 @@
"folding_bicycle",
"under_armor_shorts",
"under_armor",
"socks",
"socks_ankle",
"sneakers",
"sports_drink",
"wristwatch",
Expand Down Expand Up @@ -1687,7 +1687,7 @@
"CBMs": [ "bio_str_enhancer", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ],
"items": {
"both": [
"socks",
"socks_ankle",
"under_armor_shorts",
"under_armor",
"tshirt",
Expand All @@ -1711,7 +1711,7 @@
"CBMs": [ "bio_adrenaline", "bio_torsionratchet", "bio_power_storage_mkII", "bio_jointservo" ],
"items": {
"both": [
"socks",
"socks_ankle",
"under_armor_shorts",
"under_armor",
"tshirt",
Expand Down Expand Up @@ -2677,7 +2677,7 @@
"description": "You were on your way to the dojo for your first lesson when the world ended. And you really wanted to learn how to swim, too.",
"points": -1,
"items": {
"both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks", "sneakers" ],
"both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks_ankle", "sneakers" ],
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boy_shorts" ]
}
Expand All @@ -2691,7 +2691,7 @@
"traits": [ "PROF_MA_ORANGE" ],
"skills": [ { "level": 2, "name": "melee" }, { "level": 2, "name": "unarmed" }, { "level": 2, "name": "dodge" } ],
"items": {
"both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks", "sneakers" ],
"both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks_ankle", "sneakers" ],
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boy_shorts" ]
}
Expand Down Expand Up @@ -3329,7 +3329,7 @@
"skills": [ { "level": 1, "name": "dodge" }, { "level": 1, "name": "throw" } ],
"items": {
"both": {
"items": [ "tshirt", "jacket_light", "jeans", "socks", "lowtops", "slingpack", "juice" ],
"items": [ "tshirt", "jacket_light", "jeans", "socks_ankle", "lowtops", "slingpack", "juice" ],
"entries": [ { "group": "charged_cell_phone" } ]
},
"male": [ "briefs" ],
Expand Down Expand Up @@ -3432,7 +3432,7 @@
"skills": [ { "level": 2, "name": "dodge" }, { "level": 2, "name": "speech" } ],
"items": {
"both": {
"items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks", "sneakers", "runner_bag", "wristwatch" ],
"items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ],
"entries": [ { "group": "charged_cell_phone" } ]
},
"male": [ "briefs" ],
Expand Down Expand Up @@ -3524,7 +3524,7 @@
"skills": [ { "level": 4, "name": "dodge" } ],
"items": {
"both": {
"items": [ "tshirt", "hoodie", "pants_cargo", "socks", "sneakers", "runner_bag", "wristwatch" ],
"items": [ "tshirt", "hoodie", "pants_cargo", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ],
"entries": [ { "group": "charged_cell_phone" } ]
},
"male": [ "briefs" ],
Expand Down
11 changes: 11 additions & 0 deletions data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,17 @@
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 75 ] ] ]
},
{
"result": "socks_ankle",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_FEET",
"skill_used": "tailor",
"time": "10 m",
"autolearn": true,
"using": [ [ "sewing_standard", 4 ] ],
"components": [ [ [ "rag", 2 ] ] ]
},
{
"result": "stockings",
"type": "recipe",
Expand Down