diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index ec1df7ffc479..ed20e02d5513 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -167,7 +167,7 @@ { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 }, { "collection": [ - { "distribution": [ { "group": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 60 }, + { "distribution": [ { "item": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 @@ -2027,7 +2027,7 @@ [ "mask_bal", 5 ], [ "vest", 15 ], [ "gloves_fingerless", 15 ], - [ "gloves_fingerless_light", 5 ], + [ "gloves_light_fingerless", 5 ], [ "gloves_tactical", 20 ], [ "glasses_bal", 20 ], [ "elbow_pads", 40 ], @@ -2287,8 +2287,8 @@ [ "gloves_fsurvivor", 2 ], [ "gloves_h20survivor", 1 ], [ "gloves_fingerless", 20 ], - [ "gloves_fingerless_light", 4 ], - [ "gloves_fingerless_fur", 4 ], + [ "gloves_light_fingerless", 4 ], + [ "gloves_fur_fingerless", 4 ], [ "gloves_fingerless_mod", 20 ], [ "gloves_tactical", 12 ], [ "gauntlets_larmor", 14 ], @@ -2638,7 +2638,7 @@ { "item": "gloves_wool", "prob": 15 }, { "item": "gloves_winter", "prob": 10 }, { "item": "gloves_fingerless", "prob": 10 }, - { "item": "gloves_fingerless_light", "prob": 5 }, + { "item": "gloves_light_fingerless", "prob": 5 }, { "item": "gloves_liner", "prob": 15 }, { "item": "mittens", "prob": 5 }, { "item": "thermal_gloves", "prob": 2 } @@ -2927,7 +2927,7 @@ { "item": "gloves_leather", "prob": 60 }, { "item": "gloves_light", "prob": 60 }, { "item": "gloves_fingerless", "prob": 20 }, - { "item": "gloves_fingerless_light", "prob": 20 }, + { "item": "gloves_light_fingerless", "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_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json index 099390aefcb2..5c57dc441077 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json @@ -54,8 +54,8 @@ [ "sleeveless_trenchcoat", 5 ], [ "sleeveless_duster", 5 ], [ "gloves_fingerless", 20 ], - [ "gloves_fingerless_light", 5 ], - [ "gloves_fingerless_wool", 5 ], + [ "gloves_light_fingerless", 5 ], + [ "gloves_wool_fingerless", 5 ], [ "backpack", 38 ], [ "backpack_leather", 28 ], [ "holster", 8 ], diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 9c2e30cc095d..e540693657a7 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -322,7 +322,7 @@ { "item": "gloves_liner", "prob": 25 }, { "item": "gloves_leather", "prob": 45 }, { "item": "gloves_fingerless", "prob": 10 }, - { "item": "gloves_fingerless_light", "prob": 10 }, + { "item": "gloves_light_fingerless", "prob": 10 }, { "item": "gloves_work", "prob": 2 }, { "item": "bandana", "prob": 35 }, { "item": "scarf", "prob": 45 }, diff --git a/data/json/npcs/NC_HUNTER.json b/data/json/npcs/NC_HUNTER.json index 92fd10f49379..f08692fd4eab 100644 --- a/data/json/npcs/NC_HUNTER.json +++ b/data/json/npcs/NC_HUNTER.json @@ -13,7 +13,7 @@ { "item": "null", "prob": 60 }, { "item": "gloves_leather", "prob": 20 }, { "item": "gloves_fingerless", "prob": 15 }, - { "item": "gloves_fingerless_fur", "prob": 5 } + { "item": "gloves_fur_fingerless", "prob": 5 } ] }, { diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index f19e08316e33..3ce42f4b57ae 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -36,7 +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_fur_fingerless", "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 f27f9dc10d48..936defabf64b 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -24,7 +24,7 @@ { "item": "null", "prob": 20 }, { "item": "gloves_tactical", "prob": 50 }, { "item": "gloves_fingerless", "prob": 20 }, - { "item": "gloves_fingerless_light", "prob": 10 }, + { "item": "gloves_light_fingerless", "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 079ac22448ad..8abf280f1fda 100644 --- a/data/json/npcs/NC_SURVIVOR_CHEF.json +++ b/data/json/npcs/NC_SURVIVOR_CHEF.json @@ -37,7 +37,7 @@ { "item": "null", "prob": 80 }, { "item": "gloves_leather", "prob": 10 }, { "item": "gloves_fingerless", "prob": 5 }, - { "item": "gloves_fingerless_light", "prob": 5 } + { "item": "gloves_light_fingerless", "prob": 5 } ] }, { diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 692e604a1037..83371e79c9f6 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -117,8 +117,8 @@ [ "null", 60 ], [ "gloves_leather", 20 ], [ "gloves_fingerless", 10 ], - [ "gloves_fingerless_light", 5 ], - [ "gloves_fingerless_wool", 5 ], + [ "gloves_light_fingerless", 5 ], + [ "gloves_wool_fingerless", 5 ], [ "fire_gauntlets", 20 ], [ "gloves_work", 10 ], [ "gloves_fingerless_mod", 5 ], diff --git a/data/json/professions.json b/data/json/professions.json index a06ef4aac8e1..79078c904f2a 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1146,7 +1146,7 @@ "items": { "both": [ "pants", - "gloves_fingerless_light", + "gloves_light_fingerless", "knit_scarf", "whiskey", "gin", @@ -3734,7 +3734,7 @@ "socks", "elbow_pads", "knee_pads", - "gloves_fingerless_light", + "gloves_light_fingerless", "helmet_skid", "roller_blades", "wristwatch", @@ -3761,7 +3761,7 @@ "jeans", "socks", "sneakers", - "gloves_fingerless_light", + "gloves_light_fingerless", "slingpack", "matches", "hairpin", diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 72187e93a092..146cf162cef9 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -315,7 +315,6 @@ "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 ] ] diff --git a/data/mods/No_Hope/item_groups.json b/data/mods/No_Hope/item_groups.json index d03f8b7ba4dc..fae49609de7f 100644 --- a/data/mods/No_Hope/item_groups.json +++ b/data/mods/No_Hope/item_groups.json @@ -364,7 +364,7 @@ { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 60 }, { "collection": [ - { "distribution": [ { "group": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 20 }, + { "distribution": [ { "item": "gloves_liner", "prob": 75 }, { "item": "gloves_liner_wool", "prob": 25 } ], "prob": 20 }, { "item": "winter_gloves_army" } ], "prob": 60