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

Add other pieces of plated leather armor #3168

Merged
Merged
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
9 changes: 6 additions & 3 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -2278,7 +2278,8 @@
[ "gloves_fingerless", 28 ],
[ "gloves_fingerless_mod", 20 ],
[ "gloves_tactical", 12 ],
[ "gauntlets_larmor", 14 ],
[ "gauntlets_larmor", 4 ],
[ "gauntlets_plarmor", 4 ],
[ "gauntlets_chitin", 2 ],
[ "armguard_larmor", 7 ],
[ "vambrace_larmor", 6 ],
Expand Down Expand Up @@ -2306,7 +2307,8 @@
[ "boots_steel", 28 ],
[ "boots_hiking", 24 ],
[ "boots_combat", 12 ],
[ "boots_larmor", 14 ],
[ "boots_larmor", 10 ],
[ "boots_plarmor", 4 ],
[ "boots_fur", 22 ],
[ "boots_plate", 2 ],
[ "boots_bunker", 8 ],
Expand All @@ -2327,7 +2329,8 @@
[ "helmet_riot", 18 ],
[ "tac_fullhelmet", 8 ],
[ "helmet_lobster", 8 ],
[ "helmet_larmor", 14 ],
[ "helmet_larmor", 10 ],
[ "helmet_plarmor", 4 ],
[ "pickelhaube", 1 ],
[ "firehelmet", 2 ],
[ "helmet_barbute", 1 ],
Expand Down
11 changes: 11 additions & 0 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,17 @@
"environmental_protection": 2,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "boots_plarmor",
"copy-from": "boots_larmor",
"type": "ARMOR",
"name": { "str": "pair of plated leather boots", "str_pl": "pairs of plated leather boots" },
"description": "Thick leather boots that have been reinforced with strategically-placed metal plates. Strong yet light.",
"material": [ "leather", "iron" ],
"looks_like": "boots_plate",
"proportional": { "price": 4, "price_postapoc": 1.2 },
"relative": { "weight": "500 g", "encumbrance": 4 }
},
{
"id": "boots_lsurvivor",
"type": "ARMOR",
Expand Down
11 changes: 11 additions & 0 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,17 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS" ]
},
{
"id": "gauntlets_plarmor",
"copy-from": "gauntlets_larmor",
"type": "ARMOR",
"name": { "str": "pair of plated leather gauntlets", "str_pl": "pairs of plated leather gauntlets" },
"description": "Heavy fingerless leather gloves that have been reinforced with strategically-placed metal plates. Flexible and tough.",
"material": [ "leather", "iron" ],
"looks_like": "gloves_plate",
"proportional": { "price": 4, "price_postapoc": 1.2 },
"relative": { "weight": "250 g", "encumbrance": 4 }
},
{
"id": "gloves_bag",
"type": "ARMOR",
Expand Down
11 changes: 11 additions & 0 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,17 @@
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY" ]
},
{
"id": "helmet_plarmor",
"copy-from": "helmet_larmor",
"type": "ARMOR",
"name": { "str": "plated leather helmet" },
"description": "A thick leather helmet that has been reinforced with strategically-placed metal plates. Provides excellent protection for the head.",
"material": [ "leather", "iron" ],
"looks_like": "helmet_galea",
"proportional": { "price": 4, "price_postapoc": 1.2 },
"relative": { "weight": "500 g", "encumbrance": 4 }
},
{
"id": "helmet_skull",
"type": "ARMOR",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"type": "ARMOR",
"name": { "str": "plated leather armor" },
"description": "Thick leather body armor that has been reinforced with strategically-placed metal plates. Strong and comfortable.",
"weight": "4280 g",
"weight": "4150 g",
"volume": "9 L",
"price": 110000,
"price_postapoc": 3000,
Expand Down
5 changes: 3 additions & 2 deletions data/json/monsterdrops/feral_humans.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,10 @@
},
{
"distribution": [
{ "item": "boots_plate", "prob": 50, "damage": [ 1, 4 ] },
{ "item": "boots_plate", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "chainmail_feet", "prob": 30, "damage": [ 1, 4 ] },
{ "item": "boots_larmor", "prob": 20, "damage": [ 1, 4 ] }
{ "item": "boots_larmor", "prob": 20, "damage": [ 1, 4 ] },
{ "item": "boots_plarmor", "prob": 10, "damage": [ 1, 4 ] }
],
"prob": 80
},
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,21 @@
"using": [ [ "sewing_standard", 24 ] ],
"components": [ [ [ "fabric_hides_proper", 18, "LIST" ] ] ]
},
{
"result": "boots_plarmor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_FEET",
"skill_used": "fabrication",
"difficulty": 2,
"skills_required": [ "tailor", 3 ],
"time": "40 m",
"book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],
"autolearn": [ [ "fabrication", 4 ], [ "tailor", 5 ] ],
"using": [ [ "sewing_standard", 10 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"components": [ [ [ "steel_tiny", 2, "LIST" ], [ "sheet_metal_small", 2 ] ], [ [ "boots_larmor", 1 ] ] ]
},
{
"result": "boots_lsurvivor",
"type": "recipe",
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
},
{
"result": "gauntlets_plarmor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HANDS",
"skill_used": "fabrication",
"difficulty": 2,
"skills_required": [ "tailor", 3 ],
"time": "28 m",
"book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],
"autolearn": [ [ "fabrication", 4 ], [ "tailor", 5 ] ],
"using": [ [ "sewing_standard", 5 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"components": [ [ [ "steel_tiny", 1, "LIST" ], [ "sheet_metal_small", 1 ] ], [ [ "gauntlets_larmor", 1 ] ] ]
},
{
"result": "gloves_bag",
"type": "recipe",
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,21 @@
"using": [ [ "sewing_standard", 18 ] ],
"components": [ [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
},
{
"result": "helmet_plarmor",
"type": "recipe",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HEAD",
"skill_used": "fabrication",
"difficulty": 2,
"skills_required": [ "tailor", 3 ],
"time": "28 m",
"book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],
"autolearn": [ [ "fabrication", 4 ], [ "tailor", 5 ] ],
"using": [ [ "sewing_standard", 10 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"components": [ [ [ "steel_tiny", 2, "LIST" ], [ "sheet_metal_small", 2 ] ], [ [ "helmet_larmor", 1 ] ] ]
},
{
"result": "helmet_nasal",
"type": "recipe",
Expand Down
10 changes: 4 additions & 6 deletions data/json/recipes/armor/suit.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,10 @@
"skills_required": [ "tailor", 3 ],
"time": "28 m",
"book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],
"using": [ [ "sewing_standard", 26 ] ],
"components": [
[ [ "steel_chunk", 6 ], [ "scrap", 18 ], [ "sheet_metal_small", 6 ] ],
[ [ "armor_larmor", 1 ] ],
[ [ "armguard_larmor", 1 ] ]
]
"autolearn": [ [ "fabrication", 4 ], [ "tailor", 5 ] ],
"using": [ [ "sewing_standard", 45 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"components": [ [ [ "steel_tiny", 9, "LIST" ], [ "sheet_metal_small", 9 ] ], [ [ "armor_larmor", 1 ] ], [ [ "armguard_larmor", 1 ] ] ]
},
{
"result": "armor_plate",
Expand Down