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 variants to stockings, glove liners, fingerless gloves #3175

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Add variants to stockings, glove liners, fingerless gloves #3175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11543ce
Add variants to stockings, glove liners, fingerless gloves
chaosvolt Sep 18, 2023
2481317
Fix some big oops
chaosvolt Sep 18, 2023
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
36 changes: 26 additions & 10 deletions data/json/itemgroups/Clothing_Gear/clothing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
{ "item": "army_top", "prob": 50 },
{ "item": "long_underpants", "prob": 50 },
{ "item": "long_undertop", "prob": 50 },
{ "item": "gloves_liner", "prob": 50 },
{ "item": "gloves_liner", "prob": 40 },
{ "item": "gloves_liner_wool", "prob": 10 },
{ "item": "gloves_wool", "prob": 50 },
{ "item": "knit_scarf", "prob": 50 },
{ "item": "pants_cargo", "prob": 75 },
Expand Down Expand Up @@ -164,7 +165,13 @@
{ "item": "elbow_pads", "prob": 10 },
{ "item": "knee_pads", "prob": 85 },
{ "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 },
{ "collection": [ { "item": "gloves_liner", "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 },
{
"collection": [
{ "distribution": [ { "item": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 60 },
{ "item": "winter_gloves_army" }
],
"prob": 80
},
{ "item": "modularvestceramic", "prob": 90 },
{ "item": "molle_pack", "prob": 85 },
{ "group": "clothing_tactical_leg", "prob": 15 },
Expand Down Expand Up @@ -1341,7 +1348,8 @@
[ "thermal_mask", 10 ],
[ "thermal_outfit", 5 ],
[ "gloves_winter", 40 ],
[ "gloves_liner", 25 ],
[ "gloves_liner", 15 ],
[ "gloves_liner_wool", 10 ],
[ "gloves_leather", 45 ],
[ "scarf", 45 ],
[ "knit_scarf", 35 ],
Expand Down Expand Up @@ -1625,7 +1633,8 @@
{ "item": "thermal_outfit", "prob": 1 },
{ "item": "thermal_shirt", "prob": 1 },
{ "item": "gloves_winter", "prob": 40 },
{ "item": "gloves_liner", "prob": 25 },
{ "item": "gloves_liner", "prob": 20 },
{ "item": "gloves_liner_wool", "prob": 5 },
{ "item": "gloves_leather", "prob": 45 },
{ "item": "gloves_work", "prob": 5 },
{ "item": "scarf", "prob": 45 },
Expand All @@ -1643,7 +1652,8 @@
{ "item": "under_armor_shorts", "prob": 20 },
{ "item": "tights", "prob": 20 },
{ "item": "leggings", "prob": 20 },
{ "item": "stockings", "prob": 20 },
{ "item": "stockings", "prob": 15 },
{ "item": "stockings_wool", "prob": 5 },
{ "item": "balclava", "prob": 15 },
{ "item": "pants_ski", "prob": 60 },
{ "item": "long_underpants", "prob": 40 },
Expand Down Expand Up @@ -2016,7 +2026,8 @@
[ "dump_pouch", 20 ],
[ "mask_bal", 5 ],
[ "vest", 15 ],
[ "gloves_fingerless", 20 ],
[ "gloves_fingerless", 15 ],
[ "gloves_light_fingerless", 5 ],
[ "gloves_tactical", 20 ],
[ "glasses_bal", 20 ],
[ "elbow_pads", 40 ],
Expand Down Expand Up @@ -2275,7 +2286,9 @@
[ "gloves_wsurvivor", 4 ],
[ "gloves_fsurvivor", 2 ],
[ "gloves_h20survivor", 1 ],
[ "gloves_fingerless", 28 ],
[ "gloves_fingerless", 20 ],
[ "gloves_light_fingerless", 4 ],
[ "gloves_fur_fingerless", 4 ],
[ "gloves_fingerless_mod", 20 ],
[ "gloves_tactical", 12 ],
[ "gauntlets_larmor", 14 ],
Expand Down Expand Up @@ -2624,7 +2637,8 @@
{ "item": "gloves_golf", "prob": 15 },
{ "item": "gloves_wool", "prob": 15 },
{ "item": "gloves_winter", "prob": 10 },
{ "item": "gloves_fingerless", "prob": 15 },
{ "item": "gloves_fingerless", "prob": 10 },
{ "item": "gloves_light_fingerless", "prob": 5 },
{ "item": "gloves_liner", "prob": 15 },
{ "item": "mittens", "prob": 5 },
{ "item": "thermal_gloves", "prob": 2 }
Expand Down Expand Up @@ -2833,7 +2847,8 @@
{ "item": "camisole", "prob": 30 },
{ "item": "corset", "prob": 10 },
{ "item": "sports_bra", "prob": 50 },
{ "item": "stockings", "prob": 20 },
{ "item": "stockings", "prob": 15 },
{ "item": "stockings_wool", "prob": 5 },
{ "item": "tights", "prob": 20 }
]
},
Expand Down Expand Up @@ -2911,7 +2926,8 @@
"items": [
{ "item": "gloves_leather", "prob": 60 },
{ "item": "gloves_light", "prob": 60 },
{ "item": "gloves_fingerless", "prob": 40 },
{ "item": "gloves_fingerless", "prob": 20 },
{ "item": "gloves_light_fingerless", "prob": 20 },
{ "item": "gloves_wool", "prob": 25 },
{ "item": "gloves_winter", "prob": 15 },
{ "item": "mittens", "prob": 30 },
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/Locations_MapExtras/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,8 @@
[ "thermal_mask", 2 ],
[ "thermal_outfit", 1 ],
[ "gloves_winter", 40 ],
[ "gloves_liner", 25 ],
[ "gloves_liner", 20 ],
[ "gloves_liner_wool", 5 ],
[ "gloves_tactical", 5 ],
[ "glasses_bal", 5 ],
[ "hat_knit", 25 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
[ "sleeveless_trenchcoat", 5 ],
[ "sleeveless_duster", 5 ],
[ "gloves_fingerless", 20 ],
[ "gloves_light_fingerless", 5 ],
[ "gloves_wool_fingerless", 5 ],
[ "backpack", 38 ],
[ "backpack_leather", 28 ],
[ "holster", 8 ],
Expand Down
27 changes: 21 additions & 6 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@
{
"distribution": [
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
]
Expand All @@ -128,7 +132,11 @@
},
{ "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
],
Expand All @@ -140,7 +148,11 @@
{ "item": "veil_wedding", "damage": [ 1, 4 ] },
{ "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
],
Expand Down Expand Up @@ -1369,7 +1381,8 @@
[ "under_armor_shorts", 20 ],
[ "tights", 20 ],
[ "leggings", 20 ],
[ "stockings", 20 ],
[ "stockings", 15 ],
[ "stockings_wool", 5 ],
[ "long_underpants", 40 ],
[ "long_undertop", 40 ],
[ "union_suit", 20 ],
Expand Down Expand Up @@ -1404,7 +1417,8 @@
[ "hat_knit", 25 ],
{ "item": "tights", "prob": 30, "damage": [ 1, 3 ] },
{ "item": "leggings", "prob": 30, "damage": [ 1, 3 ] },
{ "item": "stockings", "prob": 30, "damage": [ 1, 3 ] },
{ "item": "stockings", "prob": 25, "damage": [ 1, 3 ] },
{ "item": "stockings_wool", "prob": 5, "damage": [ 1, 3 ] },
[ "balclava", 15 ],
[ "union_suit", 20 ],
{ "item": "sleeveless_trenchcoat", "prob": 30, "damage": [ 1, 3 ] },
Expand Down Expand Up @@ -1579,7 +1593,8 @@
"type": "item_group",
"subtype": "distribution",
"items": [
[ "stockings", 70 ],
[ "stockings", 60 ],
[ "stockings_wool", 10 ],
[ "dress_shoes", 60 ],
[ "sneakers", 50 ],
[ "dance_shoes", 20 ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/collections_domestic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@
{ "item": "gloves_winter", "prob": 40 },
{ "item": "gloves_liner", "prob": 25 },
{ "item": "gloves_leather", "prob": 45 },
{ "item": "gloves_fingerless", "prob": 20 },
{ "item": "gloves_fingerless", "prob": 10 },
{ "item": "gloves_light_fingerless", "prob": 10 },
{ "item": "gloves_work", "prob": 2 },
{ "item": "bandana", "prob": 35 },
{ "item": "scarf", "prob": 45 },
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,20 @@
"material_thickness": 1,
"flags": [ "VARSIZE", "SKINTIGHT" ]
},
{
"id": "stockings_wool",
"copy-from": "stockings",
"type": "ARMOR",
"name": { "str": "pair of wool stockings", "str_pl": "pairs of wool stockings" },
"description": "Long woolen socks that reach above the knees to help protect from the cold.",
"weight": "125 g",
"price": "15 USD",
"price_postapoc": "3 USD",
"material": [ "wool" ],
"color": "blue",
"encumbrance": 7,
"warmth": 40
},
{
"id": "stockings_tent_legs",
"type": "ARMOR",
Expand Down
62 changes: 61 additions & 1 deletion data/json/items/armor/gloves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
{
"id": "gloves_fingerless",
"type": "ARMOR",
"name": { "str": "pair of fingerless gloves", "str_pl": "pairs of fingerless gloves" },
"name": { "str": "pair of fingerless leather gloves", "str_pl": "pairs of fingerless leather gloves" },
"description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.",
"weight": "100 g",
"volume": "250 ml",
Expand Down Expand Up @@ -292,6 +292,21 @@
"warmth": 70,
"material_thickness": 3
},
{
"id": "gloves_fur_fingerless",
"copy-from": "gloves_fur",
"type": "ARMOR",
"name": { "str": "pair of fingerless fur gloves", "str_pl": "pairs of fingerless fur gloves" },
"description": "A pair of fur gloves with no fingers, cutting down on warmth but making them less cumbersome.",
"weight": "250 g",
"price": "15 USD",
"price_postapoc": "125 cent",
"looks_like": "gloves_fingerless",
"coverage": 50,
"warmth": 28,
"relative": { "encumbrance": -10 },
"extend": { "flags": [ "ALLOWS_NATURAL_ATTACKS" ] }
},
{
"id": "gloves_hsurvivor",
"type": "ARMOR",
Expand Down Expand Up @@ -400,6 +415,21 @@
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY" ]
},
{
"id": "gloves_light_fingerless",
"copy-from": "gloves_light",
"type": "ARMOR",
"name": { "str": "pair of fingerless light gloves", "str_pl": "pairs of fingerless light gloves" },
"description": "A pair of cotton gloves with no fingers, allowing greater manual dexterity.",
"weight": "75 g",
"price": "4 USD",
"price_postapoc": "1 USD",
"looks_like": "gloves_fingerless",
"coverage": 50,
"warmth": 8,
"relative": { "encumbrance": -2 },
"extend": { "flags": [ "ALLOWS_NATURAL_ATTACKS" ] }
},
{
"id": "gloves_liner",
"type": "ARMOR",
Expand All @@ -421,6 +451,21 @@
"material_thickness": 1,
"flags": [ "WATER_FRIENDLY", "SKINTIGHT" ]
},
{
"id": "gloves_liner_wool",
"copy-from": "gloves_liner",
"type": "ARMOR",
"name": { "str": "pair of wool glove liners", "str_pl": "pairs of wool glove liners" },
"description": "A pair of relatively thin wool gloves. Often used as a liner beneath other gloves.",
"weight": "130 g",
"price": "18 USD",
"material": [ "wool" ],
"color": "blue",
"encumbrance": 5,
"warmth": 45,
"material_thickness": 2,
"delete": { "flags": [ "WATER_FRIENDLY" ] }
},
{
"id": "gloves_lsurvivor",
"type": "ARMOR",
Expand Down Expand Up @@ -618,6 +663,21 @@
"warmth": 60,
"material_thickness": 3
},
{
"id": "gloves_wool_fingerless",
"copy-from": "gloves_wool",
"type": "ARMOR",
"name": { "str": "pair of fingerless wool gloves", "str_pl": "pairs of fingerless wool gloves" },
"description": "A thick pair of wool gloves with no fingers, cutting down on warmth but making them less cumbersome.",
"weight": "150 g",
"price": "10 USD",
"price_postapoc": "25 cent",
"looks_like": "gloves_fingerless",
"coverage": 50,
"warmth": 24,
"relative": { "encumbrance": -10 },
"extend": { "flags": [ "ALLOWS_NATURAL_ATTACKS" ] }
},
{
"id": "gloves_work",
"type": "ARMOR",
Expand Down
18 changes: 15 additions & 3 deletions data/json/monsterdrops/feral_humans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@
{ "item": "maid_hat", "prob": 80, "damage": [ 1, 4 ] },
{ "item": "long_glove_white", "prob": 60, "damage": [ 1, 4 ] },
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
}
]
}
Expand Down Expand Up @@ -281,7 +285,11 @@
{
"distribution": [
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
]
Expand All @@ -303,7 +311,11 @@
]
},
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "item": "long_glove_white", "prob": 50, "damage": [ 1, 4 ] }
],
Expand Down
12 changes: 10 additions & 2 deletions data/json/monsterdrops/zombie_child.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@
{
"distribution": [
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
},
{ "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
]
Expand All @@ -68,7 +72,11 @@
},
{ "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
{
"distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
"distribution": [
{ "item": "stockings", "prob": 40, "damage": [ 1, 4 ] },
{ "item": "stockings_wool", "prob": 10, "damage": [ 1, 4 ] },
{ "item": "tights", "prob": 50, "damage": [ 1, 4 ] }
]
}
],
"prob": 20
Expand Down
Loading