diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 81fb0551c916..ec1df7ffc479 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -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 }, @@ -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": [ { "group": "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 }, @@ -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 ], @@ -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 }, @@ -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 }, @@ -2016,7 +2026,8 @@ [ "dump_pouch", 20 ], [ "mask_bal", 5 ], [ "vest", 15 ], - [ "gloves_fingerless", 20 ], + [ "gloves_fingerless", 15 ], + [ "gloves_fingerless_light", 5 ], [ "gloves_tactical", 20 ], [ "glasses_bal", 20 ], [ "elbow_pads", 40 ], @@ -2275,7 +2286,9 @@ [ "gloves_wsurvivor", 4 ], [ "gloves_fsurvivor", 2 ], [ "gloves_h20survivor", 1 ], - [ "gloves_fingerless", 28 ], + [ "gloves_fingerless", 20 ], + [ "gloves_fingerless_light", 4 ], + [ "gloves_fingerless_fur", 4 ], [ "gloves_fingerless_mod", 20 ], [ "gloves_tactical", 12 ], [ "gauntlets_larmor", 14 ], @@ -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_fingerless_light", "prob": 5 }, { "item": "gloves_liner", "prob": 15 }, { "item": "mittens", "prob": 5 }, { "item": "thermal_gloves", "prob": 2 } @@ -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 } ] }, @@ -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_fingerless_light", "prob": 20 }, { "item": "gloves_wool", "prob": 25 }, { "item": "gloves_winter", "prob": 15 }, { "item": "mittens", "prob": 30 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 264975eb1604..e21276f2b5fa 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -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 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json index 1cd2f2f54ba2..099390aefcb2 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json @@ -54,6 +54,8 @@ [ "sleeveless_trenchcoat", 5 ], [ "sleeveless_duster", 5 ], [ "gloves_fingerless", 20 ], + [ "gloves_fingerless_light", 5 ], + [ "gloves_fingerless_wool", 5 ], [ "backpack", 38 ], [ "backpack_leather", 28 ], [ "holster", 8 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index c451e93effff..8f389c0b68a2 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -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 ] } ] @@ -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 ] } ], @@ -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 ] } ], @@ -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 ], @@ -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 ] }, @@ -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 ], diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 9ad4631171f5..9c2e30cc095d 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -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_fingerless_light", "prob": 10 }, { "item": "gloves_work", "prob": 2 }, { "item": "bandana", "prob": 35 }, { "item": "scarf", "prob": 45 }, diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 0c65139429dd..01d4b2849bc4 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -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", diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 03605af24fab..cb30bfa6d174 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json index 8d5b6ec53f8f..4b3ed9b3736d 100644 --- a/data/json/monsterdrops/feral_humans.json +++ b/data/json/monsterdrops/feral_humans.json @@ -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 ] } + ] } ] } @@ -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 ] } ] @@ -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 ] } ], diff --git a/data/json/monsterdrops/zombie_child.json b/data/json/monsterdrops/zombie_child.json index c114a4784380..8f786c18753a 100644 --- a/data/json/monsterdrops/zombie_child.json +++ b/data/json/monsterdrops/zombie_child.json @@ -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 ] } ] @@ -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 diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json index 676d8e9418c2..4f32e4f7c8a6 100644 --- a/data/json/monsterdrops/zombie_default.json +++ b/data/json/monsterdrops/zombie_default.json @@ -56,7 +56,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 ] } ] @@ -79,7 +83,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 ] } ], diff --git a/data/json/npcs/NC_HUNTER.json b/data/json/npcs/NC_HUNTER.json index d4ee08cbf651..92fd10f49379 100644 --- a/data/json/npcs/NC_HUNTER.json +++ b/data/json/npcs/NC_HUNTER.json @@ -12,7 +12,8 @@ "entries": [ { "item": "null", "prob": 60 }, { "item": "gloves_leather", "prob": 20 }, - { "item": "gloves_fingerless", "prob": 20 } + { "item": "gloves_fingerless", "prob": 15 }, + { "item": "gloves_fingerless_fur", "prob": 5 } ] }, { diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index 720093a1b8de..f19e08316e33 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -36,6 +36,7 @@ { "item": "pants_army", "prob": 30 }, { "item": "pants_leather", "prob": 15 }, { "item": "gloves_fingerless", "prob": 30 }, + { "item": "gloves_fingerless_fur", "prob": 30 }, { "item": "gloves_fingerless_mod", "prob": 10 }, { "item": "gloves_tactical", "prob": 15 }, { "item": "gauntlets_larmor", "prob": 25 }, diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index 5a0a42acbdd6..f27f9dc10d48 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -23,7 +23,8 @@ "entries": [ { "item": "null", "prob": 20 }, { "item": "gloves_tactical", "prob": 50 }, - { "item": "gloves_fingerless", "prob": 30 }, + { "item": "gloves_fingerless", "prob": 20 }, + { "item": "gloves_fingerless_light", "prob": 10 }, { "item": "winter_gloves_army", "prob": 10 } ] }, diff --git a/data/json/npcs/NC_SURVIVOR_CHEF.json b/data/json/npcs/NC_SURVIVOR_CHEF.json index ba810e3bf859..079ac22448ad 100644 --- a/data/json/npcs/NC_SURVIVOR_CHEF.json +++ b/data/json/npcs/NC_SURVIVOR_CHEF.json @@ -36,7 +36,8 @@ "entries": [ { "item": "null", "prob": 80 }, { "item": "gloves_leather", "prob": 10 }, - { "item": "gloves_fingerless", "prob": 10 } + { "item": "gloves_fingerless", "prob": 5 }, + { "item": "gloves_fingerless_light", "prob": 5 } ] }, { diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 9fd0b0ff2847..692e604a1037 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -31,7 +31,15 @@ { "type": "item_group", "id": "npc_underwear_feet_female", - "items": [ [ "socks", 50 ], [ "socks_ankle", 30 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ] + "items": [ + [ "socks", 50 ], + [ "socks_ankle", 30 ], + [ "socks_wool", 10 ], + [ "stockings", 15 ], + [ "stockings", 5 ], + [ "tights", 20 ], + [ "null", 5 ] + ] }, { "type": "item_group", @@ -108,7 +116,9 @@ "items": [ [ "null", 60 ], [ "gloves_leather", 20 ], - [ "gloves_fingerless", 20 ], + [ "gloves_fingerless", 10 ], + [ "gloves_fingerless_light", 5 ], + [ "gloves_fingerless_wool", 5 ], [ "fire_gauntlets", 20 ], [ "gloves_work", 10 ], [ "gloves_fingerless_mod", 5 ], diff --git a/data/json/professions.json b/data/json/professions.json index d56ce09deac6..a06ef4aac8e1 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1144,7 +1144,19 @@ "description": "Society drove you to the fringes and set you wandering, with no home, no family, no friends, until you could only find solace in the bottom of a bottle. But society doesn't mean a thing anymore, and for all the crap thrown your way, you're still standing. God damn, you need a drink.", "points": -1, "items": { - "both": [ "pants", "knit_scarf", "whiskey", "gin", "bum_wine", "ragpouch", "bindle", "can_beans", "pockknife", "matches" ], + "both": [ + "pants", + "gloves_fingerless_light", + "knit_scarf", + "whiskey", + "gin", + "bum_wine", + "ragpouch", + "bindle", + "can_beans", + "pockknife", + "matches" + ], "male": [ "undershirt" ], "female": [ "camisole" ] }, @@ -3722,7 +3734,7 @@ "socks", "elbow_pads", "knee_pads", - "gloves_fingerless", + "gloves_fingerless_light", "helmet_skid", "roller_blades", "wristwatch", @@ -3749,7 +3761,7 @@ "jeans", "socks", "sneakers", - "gloves_fingerless", + "gloves_fingerless_light", "slingpack", "matches", "hairpin", diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 87603599d25a..f16fd5663710 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -450,9 +450,9 @@ "skill_used": "tailor", "difficulty": 1, "time": "1 h", + "reversible": true, "autolearn": true, - "qualities": [ { "id": "KNIT", "level": 1 } ], - "components": [ [ [ "yarn", 75 ] ] ] + "using": [ [ "tailoring_wool_knitting", 80 ] ] }, { "result": "socks_ankle", @@ -477,6 +477,18 @@ "using": [ [ "sewing_standard", 6 ] ], "components": [ [ [ "rag", 8 ] ] ] }, + { + "result": "stockings_wool", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "difficulty": 2, + "time": "90 m", + "reversible": true, + "autolearn": true, + "using": [ [ "tailoring_wool_knitting", 320 ] ] + }, { "result": "straw_sandals", "type": "recipe", diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index be7bee42b3f8..72187e93a092 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -72,6 +72,82 @@ "using": [ [ "sewing_standard", 5 ] ], "components": [ [ [ "leather", 2 ] ] ] }, + { + "result": "gloves_light_fingerless", + "type": "recipe", + "byproducts": [ [ "thread", 5 ] ], + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "time": "16 m", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "gloves_light", 1 ] ] ] + }, + { + "result": "gloves_light_fingerless", + "type": "recipe", + "id_suffix": "from patches", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 2, + "time": "8 m", + "autolearn": true, + "using": [ [ "sewing_standard", 4 ] ], + "components": [ [ [ "rag", 4 ] ] ] + }, + { + "result": "gloves_wool_fingerless", + "type": "recipe", + "byproducts": [ [ "yarn", 5 ] ], + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "time": "16 m", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "gloves_wool", 1 ] ] ] + }, + { + "result": "gloves_wool_fingerless", + "type": "recipe", + "id_suffix": "from patches", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 2, + "time": "1 h 15 m", + "reversible": true, + "autolearn": true, + "using": [ [ "tailoring_wool_knitting", 240 ] ] + }, + { + "result": "gloves_fur_fingerless", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "time": "16 m", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "gloves_fur", 1 ] ] ] + }, + { + "result": "gloves_fur_fingerless", + "type": "recipe", + "id_suffix": "from patches", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ "survival", 1 ], + "time": "16 m", + "autolearn": true, + "book_learn": [ [ "manual_tailor", 2 ], [ "textbook_survival", 2 ], [ "pocket_survival", 2 ] ], + "using": [ [ "sewing_standard", 6 ] ], + "components": [ [ [ "fur", 4 ] ] ] + }, { "result": "gloves_fingerless_mod", "type": "recipe", @@ -231,6 +307,19 @@ "using": [ [ "sewing_standard", 2 ] ], "components": [ [ [ "rag", 2 ] ] ] }, + { + "result": "gloves_liner_wool", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 1, + "time": "1 h", + "autolearn": true, + "autolearn": [ [ "tailor", 5 ] ], + "book_learn": [ [ "manual_tailor", 1 ], [ "mag_tailor", 0 ], [ "textbook_survival", 2 ], [ "pocket_survival", 2 ] ], + "using": [ [ "tailoring_wool_knitting", 160 ] ] + }, { "result": "gloves_lsurvivor", "type": "recipe", diff --git a/data/mods/No_Hope/item_groups.json b/data/mods/No_Hope/item_groups.json index a63c1a9d5788..d03f8b7ba4dc 100644 --- a/data/mods/No_Hope/item_groups.json +++ b/data/mods/No_Hope/item_groups.json @@ -362,7 +362,13 @@ { "item": "elbow_pads", "prob": 10 }, { "item": "knee_pads", "prob": 60 }, { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 60 }, - { "collection": [ { "item": "gloves_liner", "prob": 20 }, { "item": "winter_gloves_army" } ], "prob": 60 }, + { + "collection": [ + { "distribution": [ { "group": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 20 }, + { "item": "winter_gloves_army" } + ], + "prob": 60 + }, { "item": "ballistic_vest_esapi", "prob": 20 }, { "item": "molle_pack", "prob": 60 }, { "group": "clothing_tactical_leg", "prob": 15 },