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.

Sign up for GitHub

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

Jump to bottom

feat(content): Thick socks #4079

Merged
merged 3 commits into from
Jan 10, 2024
Merged

feat(content): Thick socks #4079

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45964c8
Added in thick socks
yay855 Jan 9, 2024
d8d7789
Added looks_like
yay855 Jan 9, 2024
7603dd8
Added encumbrance
yay855 Jan 10, 2024
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
11 changes: 10 additions & 1 deletion data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@
{
"id": "sandal_armor",
"type": "ARMOR",
"name": { "str_sp": "armored sandals" },
"name": { "str_sp": "pair of armored sandals" },
"description": "A pair of strapped sandals with a leather plate in the front to serve as greaves, similar to those used by ancient Roman and Greek soldiers.",
"weight": "100 g",
"volume": "1 L",
Expand All @@ -1455,5 +1455,14 @@
"warmth": 2,
"material_thickness": 3,
"flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "ALLOWS_NATURAL_ATTACKS" ]
},
{
"id": "socks_thick",
"type": "ARMOR",
"name": { "str": "pair of thick socks", "str_pl": "pairs of thick socks" },
"copy-from": "socks",
"looks_like": "socks",
"warmth": 15,
"material_thickness": 2
yay855 marked this conversation as resolved.
Show resolved Hide resolved
}
]
12 changes: 12 additions & 0 deletions data/json/recipes/armor/feet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,5 +585,17 @@
"book_learn": [ [ "textbook_armwest", 2 ] ],
"using": [ [ "sewing_standard", 8 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"result": "socks_thick",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_FEET",
"skill_used": "tailor",
"difficulty": 1,
"time": "10 m",
"autolearn": true,
"using": [ [ "sewing_standard", 5 ] ],
"components": [ [ [ "rag", 4 ] ] ]
}
]
Loading