Skip to content

Commit

Permalink
Fix some big oops
Browse files Browse the repository at this point in the history
  • Loading branch information
chaosvolt committed Sep 18, 2023
1 parent 11543ce commit 2481317
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 20 deletions.
12 changes: 6 additions & 6 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_HUNTER.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_JUNK_SHOPKEEP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_SOLDIER.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_SURVIVOR_CHEF.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/items_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@
"items": {
"both": [
"pants",
"gloves_fingerless_light",
"gloves_light_fingerless",
"knit_scarf",
"whiskey",
"gin",
Expand Down Expand Up @@ -3734,7 +3734,7 @@
"socks",
"elbow_pads",
"knee_pads",
"gloves_fingerless_light",
"gloves_light_fingerless",
"helmet_skid",
"roller_blades",
"wristwatch",
Expand All @@ -3761,7 +3761,7 @@
"jeans",
"socks",
"sneakers",
"gloves_fingerless_light",
"gloves_light_fingerless",
"slingpack",
"matches",
"hairpin",
Expand Down
1 change: 0 additions & 1 deletion data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/No_Hope/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2481317

Please sign in to comment.