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

Add plural forms to missing armors #56635

Merged
merged 8 commits into from
Apr 9, 2022
Merged

Add plural forms to missing armors #56635

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f8a512
Add plural forms to missing armors
Faalagorn Apr 6, 2022
ae6053c
Fix missed str_sp
Faalagorn Apr 6, 2022
21ccaa1
Update singular to pair of gauntlets
Faalagorn Apr 7, 2022
c0aad81
Update robofac_armor.json
Faalagorn Apr 7, 2022
6bbe744
Add Aftershock items
Faalagorn Apr 7, 2022
223e2a0
Add Magiclysm
Faalagorn Apr 7, 2022
a88b4be
Update helmets.json
Faalagorn Apr 7, 2022
7d2e948
Update custom_headgear.json
Faalagorn Apr 7, 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
40 changes: 20 additions & 20 deletions data/json/items/armor/gloves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@
"id": "lc_demi_gaunt",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "mild steel demi-gauntlet" },
"name": { "str": "mild steel demi-gauntlet", "str_pl": "pairs of mild steel demi-gauntlets" },
Faalagorn marked this conversation as resolved.
Show resolved Hide resolved
"description": "A leather glove with chainmail protecting the fingers and palm, then plating over the back of the hand and wrist.",
"weight": "750 g",
"volume": "750 ml",
Expand Down Expand Up @@ -1193,7 +1193,7 @@
"id": "xl_lc_demi_gaunt",
"type": "ARMOR",
"copy-from": "lc_demi_gaunt",
"name": { "str_sp": "XL mild steel demi-gauntlet" },
"name": { "str": "XL mild steel demi-gauntlet", "str_pl": "pairs of XL mild steel demi-gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1202,7 +1202,7 @@
"type": "ARMOR",
"copy-from": "lc_demi_gaunt",
"material": [ "mc_steel", "mc_steel_chain" ],
"name": { "str_sp": "medium steel demi-gauntlet" },
"name": { "str": "medium steel demi-gauntlet", "str_pl": "pairs of medium steel demi-gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1220,7 +1220,7 @@
"id": "xl_mc_demi_gaunt",
"type": "ARMOR",
"copy-from": "mc_demi_gaunt",
"name": { "str_sp": "XL medium steel demi-gauntlet" },
"name": { "str": "XL medium steel demi-gauntlet", "str_pl": "pairs of XL medium steel demi-gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1229,7 +1229,7 @@
"type": "ARMOR",
"copy-from": "lc_demi_gaunt",
"material": [ "hc_steel", "hc_steel_chain" ],
"name": { "str_sp": "high steel demi-gauntlet" },
"name": { "str": "high steel demi-gauntlet", "str_pl": "pairs of high steel demi-gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1246,7 +1246,7 @@
{
"id": "xl_hc_demi_gaunt",
"type": "ARMOR",
"name": { "str_sp": "XL high steel demi-gauntlet" },
"name": { "str": "XL high steel demi-gauntlet", "str_pl": "pairs of XL high steel demi-gauntlets" },
"copy-from": "hc_demi_gaunt",
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
Expand All @@ -1256,7 +1256,7 @@
"type": "ARMOR",
"copy-from": "lc_demi_gaunt",
"material": [ "ch_steel", "ch_steel_chain" ],
"name": { "str_sp": "hardened steel demi-gauntlet" },
"name": { "str": "hardened steel demi-gauntlet", "str_pl": "pairs of hardened steel demi-gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1273,7 +1273,7 @@
{
"id": "xl_ch_demi_gaunt",
"type": "ARMOR",
"name": { "str_sp": "XL hardened steel demi-gauntlet" },
"name": { "str": "XL hardened steel demi-gauntlet", "str_pl": "pairs of XL hardened steel demi-gauntlets" },
"copy-from": "ch_demi_gaunt",
"material": [ "qt_steel", "qt_steel_chain" ],
"proportional": { "weight": 1.5, "volume": 1.5 },
Expand All @@ -1283,7 +1283,7 @@
"id": "qt_demi_gaunt",
"type": "ARMOR",
"copy-from": "lc_demi_gaunt",
"name": { "str_sp": "tempered steel demi-gauntlet" },
"name": { "str": "tempered steel demi-gauntlet", "str_pl": "pairs of tempered steel demi-gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1300,7 +1300,7 @@
{
"id": "xl_qt_demi_gaunt",
"type": "ARMOR",
"name": { "str_sp": "XL tempered steel demi-gauntlet" },
"name": { "str": "XL tempered steel demi-gauntlet", "str_pl": "pairs of XL tempered steel demi-gauntlets" },
"copy-from": "qt_demi_gaunt",
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
Expand All @@ -1309,7 +1309,7 @@
"id": "lc_mitten_gaunt",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "mild steel mitten gauntlet" },
"name": { "str": "mild steel mitten gauntlet", "str_pl": "pairs of mild steel mitten gauntlets" },
"description": "A leather glove with chainmail protecting the fingers and palm, then steel plating over the hand, fingers, and wrist for additional protection.",
"weight": "1250 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -1341,7 +1341,7 @@
"id": "xl_lc_mitten_gaunt",
"type": "ARMOR",
"copy-from": "lc_mitten_gaunt",
"name": { "str_sp": "XL mild steel mitten gauntlet" },
"name": { "str": "XL mild steel mitten gauntlet", "str_pl": "pairs of XL mild steel mitten gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1350,7 +1350,7 @@
"type": "ARMOR",
"copy-from": "lc_mitten_gaunt",
"material": [ "mc_steel", "mc_steel_chain" ],
"name": { "str_sp": "medium steel mitten gauntlet" },
"name": { "str": "medium steel mitten gauntlet", "str_pl": "pairs of medium steel mitten gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1368,7 +1368,7 @@
"id": "xl_mc_mitten_gaunt",
"type": "ARMOR",
"copy-from": "mc_mitten_gaunt",
"name": { "str_sp": "XL medium steel mitten gauntlet" },
"name": { "str": "XL medium steel mitten gauntlet", "str_pl": "pairs of XL medium steel mitten gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1377,7 +1377,7 @@
"type": "ARMOR",
"copy-from": "lc_mitten_gaunt",
"material": [ "hc_steel", "hc_steel_chain" ],
"name": { "str_sp": "high steel mitten gauntlet" },
"name": { "str": "high steel mitten gauntlet", "str_pl": "pairs of high steel mitten gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1395,7 +1395,7 @@
"id": "xl_hc_mitten_gaunt",
"type": "ARMOR",
"copy-from": "hc_mitten_gaunt",
"name": { "str_sp": "XL high steel mitten gauntlet" },
"name": { "str": "XL high steel mitten gauntlet", "str_pl": "pairs of XL high steel mitten gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1404,7 +1404,7 @@
"type": "ARMOR",
"copy-from": "lc_mitten_gaunt",
"material": [ "ch_steel", "ch_steel_chain" ],
"name": { "str_sp": "hardened mitten gauntlet" },
"name": { "str": "hardened steel mitten gauntlet", "str_pl": "pairs of hardened steel mitten gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1422,7 +1422,7 @@
"id": "xl_ch_mitten_gaunt",
"type": "ARMOR",
"copy-from": "ch_mitten_gaunt",
"name": { "str_sp": "XL hardened steel mitten gauntlet" },
"name": { "str": "XL hardened steel mitten gauntlet", "str_pl": "pairs of XL hardened steel mitten gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
},
Expand All @@ -1431,7 +1431,7 @@
"type": "ARMOR",
"copy-from": "lc_mitten_gaunt",
"material": [ "qt_steel", "qt_steel_chain" ],
"name": { "str_sp": "tempered steel mitten gauntlet" },
"name": { "str": "tempered steel mitten gauntlet", "str_pl": "pairs of tempered steel mitten gauntlets" },
"armor": [
{
"material": [
Expand All @@ -1449,7 +1449,7 @@
"id": "xl_qt_mitten_gaunt",
"type": "ARMOR",
"copy-from": "qt_mitten_gaunt",
"name": { "str_sp": "XL tempered steel mitten gauntlet" },
"name": { "str": "XL tempered steel mitten gauntlet", "str_pl": "pairs of XL tempered steel mitten gauntlets" },
"proportional": { "weight": 1.5, "volume": 1.5 },
"extend": { "flags": [ "OVERSIZE" ] }
}
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/armor/robofac_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
"abstract": "robofac_vambraces",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "abstract armored vambraces" },
"name": { "str": "abstract armored vambraces", "str_pl": "pairs of abstract armored vambraces" },
"looks_like": "armguard_hard",
"repairs_like": "armguard_hard",
"weight": "1750 g",
Expand Down Expand Up @@ -348,7 +348,7 @@
"abstract": "robofac_greaves",
"type": "ARMOR",
"category": "armor",
"name": { "str_sp": "abstract armored greaves" },
"name": { "str": "abstract armored greaves", "str_pl": "pairs of abstract armored greaves" },
"looks_like": "legguard_hard",
"repairs_like": "legguard_hard",
"weight": "1750 g",
Expand Down Expand Up @@ -485,7 +485,7 @@
"id": "robofac_basic_vambraces",
"type": "ARMOR",
"copy-from": "robofac_vambraces",
"name": { "str_sp": "Hub 01 prototype vambraces" },
"name": { "str": "Hub 01 prototype vambraces", "str_pl": "pairs of Hub 01 prototype vambraces" },
"description": "3D printed arm guards, despite its rough finish it's still lightweight and secure. This is made of 3D printed plastic with an unhardened metal core to give some reinforcement.",
"material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ]
},
Expand All @@ -494,7 +494,7 @@
"id": "robofac_rubber_vambraces",
"type": "ARMOR",
"copy-from": "robofac_vambraces",
"name": { "str_sp": "Hub 01 kinetic vambraces" },
"name": { "str": "Hub 01 kinetic vambraces", "str_pl": "pairs of Hub 01 kinetic vambraces" },
"description": "3D printed arm guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -504,7 +504,7 @@
"id": "robofac_nomex_vambraces",
"type": "ARMOR",
"copy-from": "robofac_vambraces",
"name": { "str_sp": "Hub 01 turnout vambraces" },
"name": { "str": "Hub 01 turnout vambraces", "str_pl": "pairs of Hub 01 turnout vambraces" },
"description": "3D printed arm guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with printed Nomex and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -514,7 +514,7 @@
"id": "robofac_kevlar_vambraces",
"type": "ARMOR",
"copy-from": "robofac_vambraces",
"name": { "str_sp": "Hub 01 ballistic vambraces" },
"name": { "str": "Hub 01 ballistic vambraces", "str_pl": "pairs of Hub 01 ballistic vambraces" },
"description": "3D printed arm guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -524,7 +524,7 @@
"id": "robofac_military_vambraces",
"type": "ARMOR",
"copy-from": "robofac_vambraces",
"name": { "str_sp": "Hub 01 soldier vambraces" },
"name": { "str": "Hub 01 soldier vambraces", "str_pl": "pairs of Hub 01 soldier vambraces" },
"description": "3D printed arm guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.",
"material": [
{ "type": "thermo_resin", "portion": 1 },
Expand All @@ -539,7 +539,7 @@
"id": "robofac_basic_greaves",
"type": "ARMOR",
"copy-from": "robofac_greaves",
"name": { "str_sp": "Hub 01 prototype greaves" },
"name": { "str": "Hub 01 prototype greaves", "str_pl": "pairs of Hub 01 prototype greaves" },
"description": "3D printed leg guards, despite its rough finish it's still lightweight and secure. This is made of 3D printed plastic with an unhardened metal core to give some reinforcement.",
"material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ]
},
Expand All @@ -548,7 +548,7 @@
"id": "robofac_rubber_greaves",
"type": "ARMOR",
"copy-from": "robofac_greaves",
"name": { "str_sp": "Hub 01 kinetic greaves" },
"name": { "str": "Hub 01 kinetic greaves", "str_pl": "pairs of Hub 01 kinetic greaves" },
"description": "3D printed leg guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -558,7 +558,7 @@
"id": "robofac_nomex_greaves",
"type": "ARMOR",
"copy-from": "robofac_greaves",
"name": { "str_sp": "Hub 01 turnout greaves" },
"name": { "str": "Hub 01 turnout greaves", "str_pl": "pairs of Hub 01 turnout greaves" },
"description": "3D printed leg guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with printed Nomex and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -568,7 +568,7 @@
"id": "robofac_kevlar_greaves",
"type": "ARMOR",
"copy-from": "robofac_greaves",
"name": { "str_sp": "Hub 01 ballistic greaves" },
"name": { "str": "Hub 01 ballistic greaves", "str_pl": "pairs of Hub 01 ballistic greaves" },
"description": "3D printed leg guards, it is well finished, lightweight and secure. This is made of 3D printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement.",
"material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ],
"proportional": { "weight": 2.5 }
Expand All @@ -578,7 +578,7 @@
"id": "robofac_military_greaves",
"type": "ARMOR",
"copy-from": "robofac_greaves",
"name": { "str_sp": "Hub 01 soldier greaves" },
"name": { "str": "Hub 01 soldier greaves", "str_pl": "pairs of Hub 01 soldier greaves" },
"description": "3D printed leg guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.",
"material": [
{ "type": "thermo_resin", "portion": 1 },
Expand Down