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

Total tailoring overhaul #32766

Closed
wants to merge 14 commits into from
Closed
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
10,218 changes: 10,218 additions & 0 deletions data/json/item_groups/item_groups.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions data/json/itemgroups/mall_item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"type": "item_group",
"items": [
[ "blazer", 75 ],
[ "button_plastic", 20 ],
[ "tie_skinny", 40 ],
[ "tie_necktie", 40 ],
[ "tie_bow", 30 ],
Expand Down Expand Up @@ -204,6 +205,8 @@
"id": "leather_shop_repair",
"type": "item_group",
"items": [
{ "group": "tailoring_extra", "prob": 40 },
[ "awl_steel", 40 ],
[ "sewing_kit", 5 ],
[ "tailors_kit", 50 ],
[ "thread", 10 ],
Expand Down Expand Up @@ -278,6 +281,7 @@
"ammo": 75,
"magazine": 100,
"items": [
[ "dye_powder", 5 ],
[ "mag_glam", 40 ],
[ "mag_beauty", 30 ],
[ "hairpin", 40 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,9 @@
"subtype": "distribution",
"items": [
{ "group": "suits", "prob": 50, "damage": [ 0, 2 ] },
{ "group": "tailoring_extra", "prob": 30 },
[ "scissors", 50 ],
[ "tailoring_pattern_set", 20 ],
[ "thread", 50 ],
{ "group": "pants", "prob": 40, "damage": [ 0, 2 ] },
{ "group": "shirts", "prob": 40, "damage": [ 0, 2 ] },
Expand Down
32 changes: 32 additions & 0 deletions data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,36 @@
[ "hand_crank_charger", 30 ]
]
},
{
"id": "tailoring_extra",
"type": "item_group",
"//": "Parts and materials for making clothing, other than fabric itself and thread.",
"items": [
[ "buckle_steel", 10 ],
[ "button_plastic", 60 ],
[ "button_steel", 10 ],
[ "button_wood", 2 ],
[ "snapfastener_steel", 40 ],
[ "touch_fastener", 15 ],
[ "zipper_long_plastic", 30 ],
[ "zipper_short_plastic", 40 ]
]
},
{
"id": "tailoring_fabric",
"type": "item_group",
"//": "Fabric sheets used for tailoring.",
"items": [
[ "sheet_cotton", 200 ],
[ "sheet_faux_fur", 40 ],
[ "sheet_felt", 80 ],
[ "sheet_kevlar", 5 ],
[ "sheet_neoprene", 10 ],
[ "sheet_nomex", 5 ],
[ "tanned_pelt", 50 ],
[ "tanned_hide", 50 ]
]
},
{
"id": "paint",
"type": "item_group",
Expand Down Expand Up @@ -210,6 +240,8 @@
"id": "supplies_reagents_lab",
"//": "General laboratory reagents and expendibles. This list contains most conceivable chemicals in the game. More specific lists for each type of lab would be reasonable eventually.",
"items": [
[ "dye_powder", 5 ],
[ "chem_potassium_alum", 10 ],
[ "water_clean", 90 ],
[ "salt_water", 20 ],
[ "detergent", 10 ],
Expand Down
13 changes: 12 additions & 1 deletion data/json/itemgroups/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,28 @@
"id": "tools_tailor",
"type": "item_group",
"items": [
[ "awl_steel", 60 ],
[ "loom_frame", 5 ],
[ "needle_curved", 30 ],
[ "scissors", 1000 ],
[ "sewing_kit", 120 ],
[ "shed_stick", 5 ],
[ "tailoring_pattern_set", 10 ],
[ "tailors_kit", 10 ],
[ "knitting_needles", 20 ]
]
},
{
"id": "tools_commercial_tailor",
"type": "item_group",
"items": [ [ "needle_curved", 30 ], [ "scissors", 1000 ], [ "sewing_kit", 10 ], [ "tailors_kit", 120 ] ]
"items": [
[ "awl_steel", 150 ],
[ "needle_curved", 30 ],
[ "scissors", 1000 ],
[ "sewing_kit", 10 ],
[ "tailoring_pattern_set", 100 ],
[ "tailors_kit", 120 ]
]
},
{
"type": "item_group",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -9136,7 +9136,7 @@
"volume": "5 L",
"price": 10000,
"to_hit": -3,
"material": [ "neoprene", "cotton" ],
"material": [ "neoprene" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "LEGS", "TORSO", "ARMS" ],
Expand Down Expand Up @@ -9277,15 +9277,15 @@
"volume": "12 L",
"price": 14500,
"to_hit": -3,
"material": [ "cotton" ],
"material": [ "cotton", "faux_fur" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "LEGS", "TORSO", "ARMS", "HANDS", "HEAD", "FEET", "MOUTH", "EYES" ],
"coverage": 100,
"encumbrance": 30,
"storage": "1 L",
"warmth": 50,
"material_thickness": 7,
"material_thickness": 4,
"environmental_protection": 2,
"flags": [ "OUTER" ]
},
Expand Down
34 changes: 34 additions & 0 deletions data/json/items/resources/chemicals.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"id": "chem_potassium_alum",
"type": "AMMO",
"category": "chems",
"name": "potassium alum",
"description": "Small white crystals of potassium alum with watery metallic odor, soluble in water, historically used for many different purposes. Also known as potash alum and potassium aluminum sulfate; often called simply alum, as it's the most important member of the generic class of compounds called alums.",
"container": "bottle_plastic_small",
"weight": 1,
"volume": "250 ml",
"price": 2500,
"material": "powder_nonflam",
"symbol": "=",
"color": "dark_gray",
"count": 250,
"ammo_type": "components"
},
{
"id": "dye_powder",
"type": "AMMO",
"category": "chems",
"name": "cloth dye powder",
"description": "This is a powdered colorful cloth dye, which can be used to dye many fabrics if combined with water and some mordant.",
"container": "bottle_plastic_small",
"weight": 1,
"volume": "250 ml",
"price": 2500,
"material": "powder_nonflam",
"symbol": "=",
"color": "dark_gray",
"count": 250,
"ammo_type": "components"
}
]
98 changes: 98 additions & 0 deletions data/json/items/resources/fasteners.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"id": "buckle_steel",
"type": "AMMO",
"category": "spare_parts",
"name": "steel buckle",
"description": "A steel buckle, like that usually found on belts.",
"weight": 24,
"volume": "5 ml",
"price": 100,
"material": "steel",
"symbol": "=",
"color": "dark_gray",
"ammo_type": "components"
},
{
"id": "button_plastic",
"type": "AMMO",
"category": "spare_parts",
"name": "plastic button",
"description": "A plastic button, usually found on clothing.",
"weight": 1,
"volume": "20 ml",
"price": 100,
"material": "plastic",
"symbol": "=",
"color": "dark_gray",
"count": 20,
"ammo_type": "components"
Rail-Runner marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "button_steel",
"copy-from": "button_plastic",
"type": "AMMO",
"name": "steel button",
"description": "A steel button, usually found on clothing.",
"weight": 8,
"price": 300,
"material": "steel"
},
{
"id": "button_wood",
"copy-from": "button_plastic",
"type": "AMMO",
"name": "wooden button",
"description": "A primitive wooden button, usually found on clothing.",
"material": "wood"
},
{
"id": "snapfastener_steel",
"copy-from": "button_steel",
"type": "AMMO",
"name": "steel snap fastener",
"description": "A steel snap fastener, usually found on clothing."
},
{
"id": "touch_fastener",
"type": "AMMO",
"category": "spare_parts",
"name": "touch fastener",
"description": "This is a pair of cloth strips, one of which has tiny hooks and another has tiny loops. Useful as a fastener for clothing and footwear.",
"weight": 2,
"volume": "2 ml",
"price": 100,
"material": "cotton",
"symbol": "=",
"color": "dark_gray",
"ammo_type": "components"
},
{
"id": "zipper_long_plastic",
"type": "AMMO",
"category": "spare_parts",
"name": "long plastic zipper",
"description": "A long zipper made from plastic, usually found on clothing.",
"weight": 8,
"volume": "8 ml",
"price": 200,
"material": [ "plastic", "cotton" ],
"symbol": "=",
"color": "dark_gray",
"ammo_type": "components"
},
{
"id": "zipper_short_plastic",
"type": "AMMO",
"category": "spare_parts",
"name": "short plastic zipper",
"description": "A short zipper made from plastic, usually found on footwear or clothing pockets.",
"weight": 4,
"volume": "4 ml",
"price": 100,
"material": [ "plastic", "cotton" ],
"symbol": "=",
"color": "dark_gray",
"ammo_type": "components"
}
]
14 changes: 14 additions & 0 deletions data/json/items/resources/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,19 @@
"color": "white",
"flags": [ "NONCONDUCTIVE" ],
"use_action": { "type": "deploy_furn", "furn_type": "f_floor_mattress" }
},
{
"id": "sole_rubber",
"type": "AMMO",
"category": "spare_parts",
"name": "rubber sole",
"description": "This is a sole made from rubber, usually found on the bottoms of boots. Can be used for making actual boots.",
"weight": 140,
"volume": "500 ml",
"price": 100,
"material": "plastic",
"symbol": "=",
"color": "dark_gray",
"ammo_type": "components"
}
]
Loading