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

Chainmail standardization #55455

Merged
merged 29 commits into from
Feb 19, 2022
Merged

Chainmail standardization #55455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
73f43ee
Chainmail updates
Drew4484 Feb 17, 2022
8aa9d3e
Update recipe_obsolete.json
Drew4484 Feb 17, 2022
222b2d3
Linting
Drew4484 Feb 17, 2022
b1bead9
Steel grades for chainmail
Drew4484 Feb 18, 2022
f1f8761
Linting
Drew4484 Feb 18, 2022
6a2185a
Corrected plate thickness
Drew4484 Feb 18, 2022
91d120a
Revert find/replace errors.
Drew4484 Feb 18, 2022
9dfac4c
Fix pet armor
Drew4484 Feb 18, 2022
d75e1af
Correct tool requirements
Drew4484 Feb 18, 2022
1971313
Standardize steel names
Drew4484 Feb 18, 2022
0c26f0e
Correct more material names
Drew4484 Feb 18, 2022
e284db9
Fix test
Drew4484 Feb 18, 2022
49ed239
Trim copy-froms
Drew4484 Feb 19, 2022
f6ac83f
Update hoods.json
Drew4484 Feb 19, 2022
589a420
Update hoods.json
Drew4484 Feb 19, 2022
2c7d8fd
Update torso_armor.json
Drew4484 Feb 19, 2022
363ed2e
Update torso_armor.json
Drew4484 Feb 19, 2022
485091c
Update torso_armor.json
Drew4484 Feb 19, 2022
85cf8f5
Update torso_armor.json
Drew4484 Feb 19, 2022
7a9aadd
Missing name details
Drew4484 Feb 19, 2022
6747aec
More copy-from
Drew4484 Feb 19, 2022
fbfb358
Update ammo.json
Drew4484 Feb 19, 2022
22e1797
Update ammo.json
Drew4484 Feb 19, 2022
2914949
Update generic.json
Drew4484 Feb 19, 2022
f68cd76
Update data/json/items/armor/arms_armor.json
Drew4484 Feb 19, 2022
a86a293
Update data/json/items/armor/arms_armor.json
Drew4484 Feb 19, 2022
6191975
Update data/json/items/armor/arms_armor.json
Drew4484 Feb 19, 2022
9eec702
Update data/json/items/armor/arms_armor.json
Drew4484 Feb 19, 2022
d0e26e8
Update data/json/items/armor/arms_armor.json
Drew4484 Feb 19, 2022
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
44 changes: 44 additions & 0 deletions data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,50 @@
"ammo_type": "components",
"count": 150
},
{
"type": "AMMO",
"id": "lc_chain_link",
"category": "spare_parts",
"price": 150,
"price_postapoc": 50,
"name": { "str": "mild steel chain link" },
"symbol": "=",
"color": "light_gray",
"description": "Small metal rings, suitable for constructing chainmail.",
"material": [ "lc_steel" ],
"volume": "250 ml",
"weight": "1 g",
"ammo_type": "components",
"count": 150
},
{
"type": "AMMO",
"id": "mc_chain_link",
"copy-from": "lc_chain_link",
"name": { "str": "medium steel chain link" },
"material": [ "mc_steel" ]
},
{
"type": "AMMO",
"id": "hc_chain_link",
"copy-from": "lc_chain_link",
"name": { "str": "high steel chain link" },
"material": [ "hc_steel" ]
},
{
"type": "AMMO",
"id": "ch_chain_link",
"copy-from": "lc_chain_link",
"name": { "str": "hardened steel chain link" },
"material": [ "ch_steel" ]
},
{
"type": "AMMO",
"id": "qt_chain_link",
"copy-from": "lc_chain_link",
"name": { "str": "tempered steel chain link" },
"material": [ "qt_steel" ]
},
{
"type": "AMMO",
"id": "nitrox",
Expand Down
244 changes: 212 additions & 32 deletions data/json/items/armor/arms_armor.json
View file
Open in desktop

Large diffs are not rendered by default.

186 changes: 178 additions & 8 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,12 +1208,17 @@
"price": 5012,
"price_postapoc": 2000,
"to_hit": -1,
"material": [ "steel", "cotton" ],
"symbol": "[",
"color": "light_red",
"material_thickness": 3,
"flags": [ "VARSIZE", "STURDY" ],
"armor": [ { "encumbrance": 20, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ]
"armor": [
{
"material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_chainmail_feet",
Expand All @@ -1232,6 +1237,171 @@
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"flags": [ "VARSIZE", "STURDY", "UNDERSIZE" ]
},
{
"id": "lc_chainmail_feet",
"type": "ARMOR",
"category": "armor",
"name": { "str": "pair of mild steel chainmail chausses", "str_pl": "pairs of mild steel chainmail chausses" },
"description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
"weight": "2006 g",
"volume": "500 ml",
"price": 5012,
"price_postapoc": 2000,
"to_hit": -1,
"symbol": "[",
"color": "light_red",
"flags": [ "VARSIZE", "STURDY", "OUTER" ],
"armor": [
{
"material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_lc_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"name": { "str": "pair of XL mild steel chainmail chausses", "str_pl": "pairs of XL mild steel chainmail chausses" },
"proportional": { "weight": 2, "volume": 2 },
"extend": { "flags": [ "OVERSIZE" ] }
},
{
"id": "xs_lc_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"looks_like": "chainmail_feet",
"name": { "str": "pair of XS mild steel chainmail chausses", "str_pl": "pairs of XS mild steel chainmail chausses" },
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"extend": { "flags": [ "UNDERSIZE" ] }
},
{
"id": "mc_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"name": { "str": "pair of medium steel chainmail chausses", "str_pl": "pairs of medium steel chainmail chausses" },
"description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
"armor": [
{
"material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_mc_chainmail_feet",
"type": "ARMOR",
"copy-from": "mc_chainmail_feet",
"name": { "str": "pair of XL medium steel chainmail chausses", "str_pl": "pairs of XL medium steel chainmail chausses" },
"proportional": { "weight": 2, "volume": 2 },
"extend": { "flags": [ "OVERSIZE" ] }
},
{
"id": "xs_mc_chainmail_feet",
"type": "ARMOR",
"copy-from": "mc_chainmail_feet",
"looks_like": "chainmail_feet",
"name": { "str": "pair of XS medium steel chainmail chausses", "str_pl": "pairs of XS medium steel chainmail chausses" },
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"extend": { "flags": [ "UNDERSIZE" ] }
},
{
"id": "hc_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"name": { "str": "pair of high steel chainmail chausses", "str_pl": "pairs of high steel chainmail chausses" },
"description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
"armor": [
{
"material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_hc_chainmail_feet",
"type": "ARMOR",
"copy-from": "hc_chainmail_feet",
"name": { "str": "pair of XL high steel chainmail chausses", "str_pl": "pairs of XL high steel chainmail chausses" },
"proportional": { "weight": 2, "volume": 2 },
"extend": { "flags": [ "OVERSIZE" ] }
},
{
"id": "xs_hc_chainmail_feet",
"type": "ARMOR",
"copy-from": "hc_chainmail_feet",
"name": { "str": "pair of XS high steel chainmail chausses", "str_pl": "pairs of XS high steel chainmail chausses" },
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"extend": { "flags": [ "UNDERSIZE" ] }
},
{
"id": "ch_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"name": { "str": "pair of hardened steel chainmail chausses", "str_pl": "pairs of hardened steel chainmail chausses" },
"description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
"armor": [
{
"material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_ch_chainmail_feet",
"type": "ARMOR",
"copy-from": "ch_chainmail_feet",
"name": { "str": "pair of XL hardened steel chainmail chausses", "str_pl": "pairs of XL hardened steel chainmail chausses" },
"proportional": { "weight": 2, "volume": 2 },
"extend": { "flags": [ "OVERSIZE" ] }
},
{
"id": "xs_ch_chainmail_feet",
"type": "ARMOR",
"copy-from": "ch_chainmail_feet",
"name": { "str": "pair of XS hardened steel chainmail chausses", "str_pl": "pairs of XS hardened steel chainmail chausses" },
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"extend": { "flags": [ "UNDERSIZE" ] }
},
{
"id": "qt_chainmail_feet",
"type": "ARMOR",
"copy-from": "lc_chainmail_feet",
"name": { "str": "pair of tempered steel chainmail chausses", "str_pl": "pairs of tempered steel chainmail chausses" },
"description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
"armor": [
{
"material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ],
"covers": [ "foot_l", "foot_r" ],
"coverage": 100,
"encumbrance": 20
}
]
},
{
"id": "xl_qt_chainmail_feet",
"type": "ARMOR",
"copy-from": "qt_chainmail_feet",
"name": { "str": "pair of XL tempered steel chainmail chausses", "str_pl": "pairs of XL tempered steel chainmail chausses" },
"proportional": { "weight": 2, "volume": 2 },
"extend": { "flags": [ "OVERSIZE" ] }
},
{
"id": "xs_qt_chainmail_feet",
"type": "ARMOR",
"copy-from": "qt_chainmail_feet",
"name": { "str": "pair of XS tempered steel chainmail chausses", "str_pl": "pairs of XS tempered steel chainmail chausses" },
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
"extend": { "flags": [ "UNDERSIZE" ] }
},
{
"id": "nomex_socks",
"type": "ARMOR",
Expand Down Expand Up @@ -1509,7 +1679,7 @@
"armor": [
{
"material": [
{ "type": "low_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "lc_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "leather", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "foot_l", "foot_l" ],
Expand Down Expand Up @@ -1548,7 +1718,7 @@
"armor": [
{
"material": [
{ "type": "med_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "mc_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "leather", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "foot_l", "foot_l" ],
Expand Down Expand Up @@ -1587,7 +1757,7 @@
"armor": [
{
"material": [
{ "type": "high_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "hc_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "leather", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "foot_l", "foot_l" ],
Expand Down Expand Up @@ -1626,7 +1796,7 @@
"armor": [
{
"material": [
{ "type": "case_hardened_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "ch_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "leather", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "foot_l", "foot_l" ],
Expand Down Expand Up @@ -1665,7 +1835,7 @@
"armor": [
{
"material": [
{ "type": "tempered_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "qt_steel", "covered_by_mat": 90, "thickness": 1.25 },
{ "type": "leather", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "foot_l", "foot_l" ],
Expand Down
Loading