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

XL clothing adjustments #46299

Merged
merged 4 commits into from Jan 8, 2021
Merged

XL clothing adjustments #46299

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b218c73
Fix oversized armor crafting times and qualities
TheShadowFerret Dec 24, 2020
2fd9f01
Consistent naming for oversized clothing
TheShadowFerret Dec 24, 2020
13dfee2
Scale up weight and volume
TheShadowFerret Dec 25, 2020
89d173a
Spacing
Jan 8, 2021
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
4 changes: 2 additions & 2 deletions data/json/items/armor/ammo_pouch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"id": "xl_chestrig",
"type": "ARMOR",
"copy-from": "chestrig",
"name": { "str": "oversize chestrig" },
"name": { "str": "XL chest rig" },
"description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines in its pouches and fits larger-than-human forms.",
"proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
Expand Down Expand Up @@ -463,7 +463,7 @@
"id": "xl_tacvest",
"type": "ARMOR",
"copy-from": "tacvest",
"name": { "str": "oversize tac vest" },
"name": { "str": "XL tac vest" },
"description": "This light vest is meant to carry your gear and ammunition comfortably distributed about your torso. They are popular amongst law enforcement, but less so than combination tactical vests incorporating Kevlar. Oversized and easy to don, this vest can hold four magazines close at hand in its many pouches.",
"proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
"flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/armor/arms_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
{
"id": "xl_armguard_hard",
"type": "ARMOR",
"name": { "str": "pair of oversized hard arm guards", "str_pl": "pairs of oversized hard arm guards" },
"name": { "str": "pair of XL hard arm guards", "str_pl": "pairs of XL hard arm guards" },
"description": "A pair of neoprene arm sleeves covered with molded plastic sheaths. Epic sized.",
"weight": "550 g",
"volume": "4 L",
Expand Down Expand Up @@ -137,7 +137,7 @@
{
"id": "xl_armguard_larmor",
"type": "ARMOR",
"name": { "str": "pair of gigantic leather arm guards", "str_pl": "pairs of gigantic leather arm guards" },
"name": { "str": "pair of XL leather arm guards", "str_pl": "pairs of XL leather arm guards" },
"description": "A pair of gigantic leather arm guards. Heavy but comfortable.",
"weight": "730 g",
"volume": "3 L",
Expand Down Expand Up @@ -169,7 +169,7 @@
{
"id": "xl_armguard_lightplate",
"type": "ARMOR",
"name": { "str": "pair of huge steel arm guards", "str_pl": "pairs of huge steel arm guards" },
"name": { "str": "pair of XL steel arm guards", "str_pl": "pairs of XL steel arm guards" },
"description": "A full assembly of medieval arm protection, made for Jotun. Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.",
"weight": "3243 g",
"volume": "7 L",
Expand Down Expand Up @@ -201,7 +201,7 @@
{
"id": "xl_armguard_metal",
"type": "ARMOR",
"name": { "str": "pair of oversize metal arm guards", "str_pl": "pairs of oversize metal arm guards" },
"name": { "str": "pair of XL metal arm guards", "str_pl": "pairs of XL metal arm guards" },
"description": "A pair of arm guards hammered out from metal. Perfect for the Post-Apocalyptic Warrior look. Larger than average.",
"weight": "1380 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -257,7 +257,7 @@
{
"id": "xl_armguard_scrap",
"type": "ARMOR",
"name": { "str": "pair of XL scrap armguards", "str_pl": "pairs of XL scrap armguards" },
"name": { "str": "pair of XL scrap arm guards", "str_pl": "pairs of XL scrap arm guards" },
"description": "A pair of oversized arm guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
"weight": "3412 g",
"volume": "6 L",
Expand Down
39 changes: 26 additions & 13 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
{
"id": "xl_boots",
"type": "ARMOR",
"name": { "str": "pair of oversize boots", "str_pl": "pairs of oversize boots" },
"name": { "str": "pair of XL boots", "str_pl": "pairs of XL boots" },
"copy-from": "boots",
"proportional": { "weight": 1.25, "volume": 1.25 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -120,8 +121,9 @@
{
"id": "xl_boots_chitin",
"type": "ARMOR",
"name": { "str": "pair of oversize chitin boots", "str_pl": "pairs of oversized chitin boots" },
"name": { "str": "pair of XL chitinous boots", "str_pl": "pairs of XL chitinous boots" },
"copy-from": "boots_chitin",
"proportional": { "weight": 1.25, "volume": 1.25 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand All @@ -138,8 +140,9 @@
{
"id": "xl_boots_acidchitin",
"type": "ARMOR",
"name": { "str": "pair of oversize biosilicified boots", "str_pl": "pairs of oversize biosilicified boots" },
"name": { "str": "pair of XL biosilicified chitin boots", "str_pl": "pairs of XL biosilicified chitin boots" },
"copy-from": "boots_acidchitin",
"proportional": { "weight": 1.25, "volume": 1.25 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -235,8 +238,9 @@
{
"id": "xl_boots_fsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized fireproof survivorboots", "str_pl": "pairs of oversized fireproof survivorboots" },
"name": { "str": "pair of XL survivor fireboots", "str_pl": "pairs of XL survivor fireboots" },
"copy-from": "boots_fsurvivor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -265,8 +269,9 @@
{
"id": "xl_boots_fur",
"type": "ARMOR",
"name": { "str": "pair of oversized fur boots", "str_pl": "pairs of oversized fur boots" },
"name": { "str": "pair of XL fur boots", "str_pl": "pairs of XL fur boots" },
"copy-from": "boots_fur",
"proportional": { "weight": 1.15, "volume": 1.15 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -344,8 +349,9 @@
{
"id": "xl_boots_hsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized heavy survivorboots", "str_pl": "pairs of oversized heavy survivorboots" },
"name": { "str": "pair of XL heavy survivor boots", "str_pl": "pairs of XL heavy survivor boots" },
"copy-from": "boots_hsurvivor",
"proportional": { "weight": 1.2, "volume": 1.2 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -375,8 +381,9 @@
{
"id": "xl_boots_larmor",
"type": "ARMOR",
"name": { "str": "pair of oversized leather armor boots", "str_pl": "pairs of oversized leather armor boots" },
"name": { "str": "pair of XL leather armor boots", "str_pl": "pairs of XL leather armor boots" },
"copy-from": "boots_larmor",
"proportional": { "weight": 1.3, "volume": 1.3 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -406,8 +413,9 @@
{
"id": "xl_boots_lsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized light survivor boots", "str_pl": "pairs of oversized light survivor boots" },
"name": { "str": "pair of XL light survivor boots", "str_pl": "pairs of XL light survivor boots" },
"copy-from": "boots_lsurvivor",
"proportional": { "weight": 1.4, "volume": 1.4 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -437,8 +445,9 @@
{
"id": "xl_boots_plate",
"type": "ARMOR",
"name": { "str": "pair of oversized armored boots", "str_pl": "pairs of oversized armored boots" },
"name": { "str": "pair of XL armored boots", "str_pl": "pairs of XL armored boots" },
"copy-from": "boots_plate",
"proportional": { "weight": 1.25, "volume": 1.25 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -490,8 +499,9 @@
{
"id": "xl_boots_scrap",
"type": "ARMOR",
"name": { "str": "pair of oversized scrap boots", "str_pl": "pairs of oversized scrap boots" },
"name": { "str": "pair of XL scrap boots", "str_pl": "pairs of XL scrap boots" },
"copy-from": "boots_scrap",
"proportional": { "weight": 1.3, "volume": 1.3 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -584,8 +594,9 @@
{
"id": "xl_boots_winter",
"type": "ARMOR",
"name": { "str": "pair of oversized winter boots", "str_pl": "pairs of oversized winter boots" },
"name": { "str": "pair of XL winter boots", "str_pl": "pairs of XL winter boots" },
"copy-from": "boots_winter",
"proportional": { "weight": 1.3, "volume": 1.3 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -615,8 +626,9 @@
{
"id": "xl_boots_wsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized winter survivor boots", "str_pl": "pairs of oversized winter survivor boots" },
"name": { "str": "pair of XL winter survivor boots", "str_pl": "pairs of XL winter survivor boots" },
"copy-from": "boots_larmor",
"proportional": { "weight": 1.3, "volume": 1.3 },
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -1336,8 +1348,9 @@
{
"id": "xl_chainmail_feet",
"type": "ARMOR",
"name": { "str": "pair of oversize chainmail chausses", "str_pl": "pairs of oversize chainmail chausses" },
"name": { "str": "pair of XL chainmail chausses", "str_pl": "pairs of XL chainmail chausses" },
"copy-from": "chainmail_feet",
"proportional": { "weight": 2, "volume": 2 },
"flags": [ "VARSIZE", "OVERSIZE" ]
},
{
Expand Down
51 changes: 30 additions & 21 deletions data/json/items/armor/gloves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@
{
"id": "xl_chainmail_hands",
"type": "ARMOR",
"name": { "str": "pair of oversize chainmail gloves", "str_pl": "pairs of oversize chainmail gloves" },
"name": { "str": "pair of XL chainmail gloves", "str_pl": "pairs of XL chainmail gloves" },
"copy-from": "chainmail_hands",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -123,8 +124,9 @@
{
"id": "xl_gauntlets_chitin",
"type": "ARMOR",
"name": { "str": "pair of oversize chitinous gauntlets", "str_pl": "pairs of oversize chitinous gauntlets" },
"name": { "str": "pair of XL chitinous gauntlets", "str_pl": "pairs of XL chitinous gauntlets" },
"copy-from": "gauntlets_chitin",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "STURDY", "OVERSIZE" ]
},
{
Expand All @@ -142,11 +144,9 @@
{
"id": "xl_gauntlets_acidchitin",
"type": "ARMOR",
"name": {
"str": "pair of oversize biosilicified chitin gauntlets",
"str_pl": "pairs of oversize biosilicified chitin gauntlets"
},
"name": { "str": "pair of XL biosilicified chitin gauntlets", "str_pl": "pairs of XL biosilicified chitin gauntlets" },
"copy-from": "gauntlets_acidchitin",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "STURDY", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -220,8 +220,9 @@
{
"id": "xl_gauntlets_larmor",
"type": "ARMOR",
"name": { "str": "pair of oversize leather armor gauntlets", "str_pl": "pairs of oversize leather armor gauntlets" },
"name": { "str": "pair of XL leather armor gauntlets", "str_pl": "pairs of XL leather armor gauntlets" },
"copy-from": "gauntlets_larmor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -312,8 +313,9 @@
{
"id": "xl_gloves_fsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized survivor firegloves", "str_pl": "pairs of oversized survivor firegloves" },
"name": { "str": "pair of XL survivor firegloves", "str_pl": "pairs of XL survivor firegloves" },
"copy-from": "gloves_fsurvivor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
},
{
Expand All @@ -339,8 +341,9 @@
{
"id": "xl_gloves_fur",
"type": "ARMOR",
"name": { "str": "pair of oversized fur gloves", "str_pl": "pairs of oversized fur gloves" },
"name": { "str": "pair of XL fur gloves", "str_pl": "pairs of XL fur gloves" },
"copy-from": "gloves_fur",
"proportional": { "weight": 1.6, "volume": 1.6 },
"flags": [ "WATERPROOF" ]
},
{
Expand Down Expand Up @@ -369,8 +372,9 @@
{
"id": "xl_gloves_hsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized heavy survivor gloves", "str_pl": "pairs of oversized heavy survivor gloves" },
"name": { "str": "pair of XL heavy survivor gloves", "str_pl": "pairs of XL heavy survivor gloves" },
"copy-from": "gloves_hsurvivor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
},
{
Expand Down Expand Up @@ -419,8 +423,9 @@
{
"id": "xl_gloves_leather",
"type": "ARMOR",
"name": { "str": "pair of oversized leather gloves", "str_pl": "pairs of oversized leather gloves" },
"name": { "str": "pair of XL leather gloves", "str_pl": "pairs of XL leather gloves" },
"copy-from": "gloves_leather",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "OVERSIZE", "WATERPROOF" ]
},
{
Expand All @@ -447,8 +452,9 @@
{
"id": "xl_gloves_light",
"type": "ARMOR",
"name": { "str": "pair of oversized light cotton gloves", "str_pl": "pairs of oversized light cotton gloves" },
"name": { "str": "pair of XL light gloves", "str_pl": "pairs of XL light gloves" },
"copy-from": "gloves_light",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ]
},
{
Expand All @@ -475,8 +481,9 @@
{
"id": "xl_gloves_liner",
"type": "ARMOR",
"name": { "str": "pair of oversized glove liner", "str_pl": "pairs of oversized glove liner" },
"name": { "str": "pair of XL glove liners", "str_pl": "pairs of XL glove liners" },
"copy-from": "gloves_liner",
"proportional": { "weight": 2, "volume": 2 },
"flags": [ "SKINTIGHT", "OVERSIZE", "WATER_FRIENDLY" ]
},
{
Expand Down Expand Up @@ -505,8 +512,9 @@
{
"id": "xl_gloves_lsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized light survivor gloves", "str_pl": "pairs of oversized light survivor gloves" },
"name": { "str": "pair of XL light survivor gloves", "str_pl": "pairs of XL light survivor gloves" },
"copy-from": "gloves_lsurvivor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
},
{
Expand Down Expand Up @@ -535,11 +543,9 @@
{
"id": "xl_gloves_survivor_fingerless",
"type": "ARMOR",
"name": {
"str": "pair of oversized survivor gloves without fingers",
"str_pl": "pairs of oversized survivor gloves without fingers"
},
"name": { "str": "pair of XL fingerless survivor gloves", "str_pl": "pairs of XL fingerless survivor gloves" },
"copy-from": "gloves_survivor_fingerless",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF", "ALLOWS_NATURAL_ATTACKS" ]
},
{
Expand Down Expand Up @@ -591,8 +597,9 @@
{
"id": "xl_gloves_plate",
"type": "ARMOR",
"name": { "str": "pair of oversized armored gauntlets", "str_pl": "pairs of oversized armored gauntlets" },
"name": { "str": "pair of XL armored gauntlets", "str_pl": "pairs of XL armored gauntlets" },
"copy-from": "gloves_plate",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -709,8 +716,9 @@
{
"id": "xl_gloves_wool",
"type": "ARMOR",
"name": { "str": "pair of oversized wool gloves", "str_pl": "pairs of oversized wool gloves" },
"name": { "str": "pair of XL wool gloves", "str_pl": "pairs of XL wool gloves" },
"copy-from": "gloves_wool",
"proportional": { "weight": 1.4, "volume": 1.4 },
"flags": [ "OVERSIZE" ]
},
{
Expand Down Expand Up @@ -867,8 +875,9 @@
{
"id": "xl_gloves_wsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized winter survivor gloves", "str_pl": "pairs of oversized winter survivor gloves" },
"name": { "str": "pair of XL winter survivor gloves", "str_pl": "pairs of XL winter survivor gloves" },
"copy-from": "gloves_wsurvivor",
"proportional": { "weight": 1.5, "volume": 1.5 },
"flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OVERSIZE" ]
},
{
Expand Down
Loading