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

Oversized recipes and clothing items #44783

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c1dbcb3
Oversized Proficiency
Maleclypse Oct 10, 2020
aa085bc
Update arms.json
Maleclypse Oct 10, 2020
76a091f
remove proficiency add more recipes
Maleclypse Oct 10, 2020
57dac32
items and recipes
Maleclypse Oct 10, 2020
66faa57
Update arms_armor.json
Maleclypse Oct 11, 2020
affbb6b
Update arms.json
Maleclypse Oct 11, 2020
776ef45
Update arms.json
Maleclypse Oct 11, 2020
6ecdb5e
Update feet.json
Maleclypse Oct 11, 2020
0171d15
Update feet.json
Maleclypse Oct 11, 2020
040918b
Update boots.json
Maleclypse Oct 11, 2020
f953db3
feet and boots
Maleclypse Oct 12, 2020
5c761be
hands and fixes
Maleclypse Oct 12, 2020
1741fbe
Update data/json/items/armor/arms_armor.json
Maleclypse Oct 13, 2020
f7449ec
Update data/json/recipes/armor/feet.json
Maleclypse Oct 13, 2020
fa0d2e1
Update data/json/recipes/armor/feet.json
Maleclypse Oct 13, 2020
3525681
Update data/json/recipes/armor/feet.json
Maleclypse Oct 13, 2020
cb134d0
Update data/json/recipes/armor/feet.json
Maleclypse Oct 13, 2020
82ede06
Update hands.json
Maleclypse Oct 13, 2020
db8cf03
hands and gloves
Maleclypse Oct 14, 2020
4a6ea0e
head and fix
Maleclypse Oct 14, 2020
5c44f7f
Merge branch 'master' into oversized-profiency-and-recipes
Maleclypse Oct 14, 2020
4c83d4a
Update head.json
Maleclypse Oct 14, 2020
7a9c904
head and fix
Maleclypse Oct 14, 2020
d1aaaa1
Update head.json
Maleclypse Oct 16, 2020
10c4a44
Merge branch 'oversized-profiency-and-recipes' of https://github.com/…
Maleclypse Oct 16, 2020
d05cd02
Update head.json
Maleclypse Oct 16, 2020
c1a759a
Update head.json
Maleclypse Oct 17, 2020
3d2f53f
linting and such
Maleclypse Oct 17, 2020
136565d
Update hoods.json
Maleclypse Oct 17, 2020
6058939
Update feet.json
Maleclypse Oct 17, 2020
e9cee3e
Update data/json/items/armor/hoods.json
Maleclypse Oct 18, 2020
445e75f
Update data/json/items/armor/hoods.json
Maleclypse Oct 18, 2020
cefb06c
fixes
Maleclypse Oct 18, 2020
e5e3d50
Merge branch 'oversized-profiency-and-recipes' of https://github.com/…
Maleclypse Oct 18, 2020
6e85398
Update undergarment.json
Maleclypse Oct 18, 2020
39c38ba
so close
Maleclypse Oct 18, 2020
79e4acb
all but suits and torso
Maleclypse Oct 18, 2020
b516619
fix
Maleclypse Oct 19, 2020
3fd8142
suits
Maleclypse Oct 19, 2020
891fb3d
Update suit.json
Maleclypse Oct 19, 2020
9aeb521
Update suit.json
Maleclypse Oct 19, 2020
e007351
lint
Maleclypse Oct 19, 2020
9fd0d00
Update suit.json
Maleclypse Oct 19, 2020
c56f602
Update torso.json
Maleclypse Oct 20, 2020
10808ab
Update torso_armor.json
Maleclypse Oct 20, 2020
d7ae9c7
Update torso_armor.json
Maleclypse Oct 20, 2020
a488860
Merge branch 'master' into oversized-profiency-and-recipes
Maleclypse Oct 20, 2020
f099ade
final save errors
Maleclypse Oct 20, 2020
5141f0b
Update data/json/recipes/armor/suit.json
Maleclypse Oct 20, 2020
b8beb21
Merge branch 'oversized-profiency-and-recipes' of https://github.com/…
Maleclypse Oct 20, 2020
450769a
Merge branch 'oversized-profiency-and-recipes' of https://github.com/…
Maleclypse Oct 20, 2020
ebb3a6d
Update suit.json
Maleclypse Oct 20, 2020
9d64f79
fixes
Maleclypse Oct 20, 2020
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
18 changes: 18 additions & 0 deletions data/json/items/armor/ammo_pouch.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@
"use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
{
"id": "xl_chestrig",
"type": "ARMOR",
"copy-from": "chestrig",
"name": { "str": "oversize chestrig" },
"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" ]
},
{
"id": "javelin_bag",
"type": "ARMOR",
Expand Down Expand Up @@ -450,6 +459,15 @@
],
"flags": [ "WATER_FRIENDLY", "WAIST" ]
},
{
"id": "xl_tacvest",
"type": "ARMOR",
"copy-from": "tacvest",
"name": { "str": "oversize 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" ]
},
{
"id": "xlkevlar",
"type": "ARMOR",
Expand Down
101 changes: 101 additions & 0 deletions data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@
"environmental_protection": 2,
"flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ]
},
{
"id": "xl_armguard_chitin",
"copy-from": "armguard_chitin",
"looks_like": "armguard_chitin",
"type": "ARMOR",
"name": { "str": "pair of xl chitin arm guards", "str_pl": "pairs of xl chitin arm guards" },
"description": "A pair of arm guards made from the exoskeletons of insects. Light and durable. Larger than average.",
"proportional": { "weight": 1.25, "volume": 1.23 },
"flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "armguard_acidchitin",
"copy-from": "armguard_chitin",
Expand All @@ -58,6 +68,17 @@
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"relative": { "material_thickness": 1 }
},
{
"id": "xl_armguard_acidchitin",
"copy-from": "armguard_acidchitin",
"type": "ARMOR",
"name": { "str": "pair of xl biosilicified chitin arm guards", "str_pl": "pairs of xl biosilicified chitin arm guards" },
"description": "A pair of arm guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable and sized for the largest of survivors.",
"material": [ "acidchitin" ],
"proportional": { "weight": 1.25, "volume": 1.25 },
"relative": { "material_thickness": 1 },
"flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "armguard_hard",
"type": "ARMOR",
Expand All @@ -80,6 +101,16 @@
"environmental_protection": 1,
"flags": [ "BELTED", "WATER_FRIENDLY", "BLOCK_WHILE_WORN" ]
},
{
"id": "xl_armguard_hard",
"type": "ARMOR",
"name": { "str": "pair of oversized hard arm guards", "str_pl": "pairs of oversized hard arm guards" },
"description": "A pair of neoprene arm sleeves covered with molded plastic sheaths. Epic sized.",
"weight": "550 g",
"volume": "4 L",
"copy-from": "armguard_hard",
"flags": [ "BELTED", "WATER_FRIENDLY", "BLOCK_WHILE_WORN", "OVERSIZE" ]
},
{
"id": "armguard_larmor",
"type": "ARMOR",
Expand All @@ -103,6 +134,16 @@
"valid_mods": [ "steel_padded" ],
"flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ]
},
{
"id": "xl_armguard_larmor",
"type": "ARMOR",
"name": { "str": "pair of gigantic leather arm guards", "str_pl": "pairs of gigantic leather arm guards" },
"description": "A pair of gigantic leather arm guards. Heavy but comfortable.",
"weight": "730 g",
"volume": "3 L",
"copy-from": "armguard_larmor",
"flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "armguard_lightplate",
"type": "ARMOR",
Expand All @@ -125,6 +166,16 @@
"material_thickness": 4,
"flags": [ "VARSIZE", "BELTED", "STURDY", "BLOCK_WHILE_WORN" ]
},
{
"id": "xl_armguard_lightplate",
"type": "ARMOR",
"name": { "str": "pair of huge steel arm guards", "str_pl": "pairs of huge 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",
"copy-from": "armguard_lightplate",
"flags": [ "VARSIZE", "BELTED", "STURDY", "BLOCK_WHILE_WORN", "OVERSIZE" ]
},
{
"id": "armguard_metal",
"type": "ARMOR",
Expand All @@ -147,6 +198,16 @@
"environmental_protection": 1,
"flags": [ "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ]
},
{
"id": "xl_armguard_metal",
"type": "ARMOR",
"name": { "str": "pair of oversize metal arm guards", "str_pl": "pairs of oversize 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",
"copy-from": "armguard_metal",
"flags": [ "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "armguard_paper",
"type": "ARMOR",
Expand Down Expand Up @@ -193,6 +254,16 @@
"material_thickness": 2,
"flags": [ "BELTED", "BLOCK_WHILE_WORN" ]
},
{
"id": "xl_armguard_scrap",
"type": "ARMOR",
"name": { "str": "pair of xl scrap armguards", "str_pl": "pairs of xl scrap armguards" },
"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",
"copy-from": "armguard_scrap",
"flags": [ "BELTED", "BLOCK_WHILE_WORN", "OVERSIZE" ]
},
{
"id": "armguard_soft",
"type": "ARMOR",
Expand All @@ -216,6 +287,16 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ]
},
{
"id": "xl_armguard_soft",
"type": "ARMOR",
"name": { "str": "pair of xl neoprene arm sleeves", "str_pl": "pairs of xl neoprene arm sleeves" },
"description": "A pair of extra large soft neoprene arm sleeves. Often used in contact sports, by giants.",
"weight": "330 g",
"volume": "1750 ml",
"copy-from": "armguard_soft",
"flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "chainmail_arms",
"type": "ARMOR",
Expand All @@ -237,6 +318,16 @@
"material_thickness": 4,
"flags": [ "VARSIZE", "STURDY" ]
},
{
"id": "xl_chainmail_arms",
"type": "ARMOR",
"name": { "str": "pair of xl chainmail sleeves", "str_pl": "pairs of xl chainmail sleeves" },
"description": "Customized chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves. These are oversized.",
"weight": "3212 g",
"volume": "1050 ml",
"copy-from": "chainmail_arms",
"flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
},
{
"id": "elbow_pads",
"type": "ARMOR",
Expand Down Expand Up @@ -280,6 +371,16 @@
"environmental_protection": 1,
"flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ]
},
{
"id": "xl_vambrace_larmor",
"type": "ARMOR",
"name": { "str": "pair of xl leather vambraces", "str_pl": "pairs of xl leather vambraces" },
"description": "Customized oversized leather vambraces, made for archery.",
"weight": "531 g",
"volume": "1250 ml",
"copy-from": "vambrace_larmor",
"flags": [ "STURDY", "BELTED", "WATER_FRIENDLY", "OVERSIZE" ]
},
{
"id": "armguard_cut_resistant",
"repairs_like": "armguard_soft",
Expand Down
91 changes: 91 additions & 0 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
"environmental_protection": 2,
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
"id": "xl_boots",
"type": "ARMOR",
"name": { "str": "pair of oversize boots", "str_pl": "pairs of oversize boots" },
"copy-from": "boots",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_bone",
"type": "ARMOR",
Expand Down Expand Up @@ -110,6 +117,13 @@
"environmental_protection": 3,
"flags": [ "STURDY" ]
},
{
"id": "xl_boots_chitin",
"type": "ARMOR",
"name": { "str": "paird of oversize chitin boots", "str_pl": "pairs of oversized chitin boots" },
"copy-from": "boots_chitin",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_acidchitin",
"copy-from": "boots_chitin",
Expand All @@ -121,6 +135,13 @@
"proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
"relative": { "bashing": 2, "material_thickness": 1 }
},
{
"id": "xl_boots_acidchitin",
"type": "ARMOR",
"name": { "str": "pair of oversize biosilicified boots", "str_pl": "pairs of oversize biosilicified boots" },
"copy-from": "boots_acidchitin",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_combat",
"repairs_like": "boots_survivor",
Expand Down Expand Up @@ -211,6 +232,13 @@
"environmental_protection": 10,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_fsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized fireproof survivorboots", "str_pl": "pairs of oversized fireproof survivorboots" },
"copy-from": "boots_fsurvivor",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_fur",
"type": "ARMOR",
Expand All @@ -234,6 +262,13 @@
"environmental_protection": 2,
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
"id": "xl_boots_fur",
"type": "ARMOR",
"name": { "str": "pair of oversized fur boots", "str_pl": "pairs of oversized fur boots" },
"copy-from": "boots_fur",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_h20survivor",
"type": "ARMOR",
Expand Down Expand Up @@ -306,6 +341,13 @@
"environmental_protection": 5,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_hsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized heavy survivorboots", "str_pl": "pairs of oversized heavy survivorboots" },
"copy-from": "boots_hsurvivor",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_larmor",
"type": "ARMOR",
Expand All @@ -330,6 +372,13 @@
"environmental_protection": 2,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_larmor",
"type": "ARMOR",
"name": { "str": "pair of oversized leather armor boots", "str_pl": "pairs of oversized leather armor boots" },
"copy-from": "boots_larmor",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_lsurvivor",
"type": "ARMOR",
Expand All @@ -354,6 +403,13 @@
"environmental_protection": 3,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_lsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized light survivor boots", "str_pl": "pairs of oversized light survivor boots" },
"copy-from": "boots_lsurvivor",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_plate",
"type": "ARMOR",
Expand All @@ -378,6 +434,13 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_plate",
"type": "ARMOR",
"name": { "str": "pair of oversized armored boots", "str_pl": "pairs of oversized armored boots" },
"copy-from": "boots_plate",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_rubber",
"repairs_like": "boots",
Expand Down Expand Up @@ -424,6 +487,13 @@
"material_thickness": 2,
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
"id": "xl_boots_scrap",
"type": "ARMOR",
"name": { "str": "pair of oversized scrap boots", "str_pl": "pairs of oversized scrap boots" },
"copy-from": "boots_scrap",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_steel",
"repairs_like": "boots_larmor",
Expand Down Expand Up @@ -511,6 +581,13 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
"id": "xl_boots_winter",
"type": "ARMOR",
"name": { "str": "pair of oversized winter boots", "str_pl": "pairs of oversized winter boots" },
"copy-from": "boots_winter",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
},
{
"id": "boots_wsurvivor",
"type": "ARMOR",
Expand All @@ -535,6 +612,13 @@
"environmental_protection": 5,
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
"id": "xl_boots_wsurvivor",
"type": "ARMOR",
"name": { "str": "pair of oversized winter survivor boots", "str_pl": "pairs of oversized winter survivor boots" },
"copy-from": "boots_larmor",
"flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
},
{
"id": "boots_xlsurvivor",
"type": "ARMOR",
Expand Down Expand Up @@ -1249,6 +1333,13 @@
"material_thickness": 4,
"flags": [ "VARSIZE", "STURDY" ]
},
{
"id": "xl_chainmail_feet",
"type": "ARMOR",
"name": { "str": "pair of oversize chainmail chausses", "str_pl": "pairs of oversize chainmail chausses" },
"copy-from": "chainmail_feet",
"flags": [ "VARSIZE", "OVERSIZE" ]
},
{
"id": "leg_warmers_xlf",
"type": "ARMOR",
Expand Down
Loading