From 5cbcfb034ab7794440fe8eb10cdc5a327084b225 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 29 May 2024 11:19:21 +0200 Subject: [PATCH] bot jumpscare Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/itemgroups/SUS/domestic.json | 17 ++++++++++++++--- data/json/itemgroups/misc.json | 7 ++++++- data/json/monsterdrops/clothing_halloween.json | 8 +++++++- data/json/professions.json | 4 +++- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 5c4ac9a1c5957..f90ef3dcb01db 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -76,17 +76,28 @@ "//2": "This group is for a drawer full of knives and related implements.", "subtype": "collection", "entries": [ - { "distribution": [ { "item": "knife_large", "variant": "knife_chef", "prob": 10 }, { "item": "knife_cleaver", "variant": "knife_vegetable_cleaver", "prob": 3 } ] }, + { + "distribution": [ + { "item": "knife_large", "variant": "knife_chef", "prob": 10 }, + { "item": "knife_cleaver", "variant": "knife_vegetable_cleaver", "prob": 3 } + ] + }, { "item": "knife_small", "variant": "knife_paring" }, { "item": "knife_small", "variant": "knife_paring", "prob": 75 }, { "item": "knife_large", "variant": "knife_bread", "prob": 95 }, { "item": "knife_large", "variant": "knife_bread", "prob": 45 }, { - "distribution": [ { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 10 } ], + "distribution": [ + { "item": "knife_huge", "variant": "knife_butcher", "prob": 10 }, + { "item": "knife_cleaver", "variant": "knife_meat_cleaver", "prob": 10 } + ], "prob": 65 }, { "item": "knife_small", "variant": "knife_steak", "count": [ 2, 4 ], "prob": 75 }, - { "collection": [ { "item": "knife_large", "variant": "knife_carving"}, { "item": "carving_fork", "prob": 90 } ], "prob": 85 }, + { + "collection": [ { "item": "knife_large", "variant": "knife_carving" }, { "item": "carving_fork", "prob": 90 } ], + "prob": 85 + }, { "item": "scissors", "prob": 80 }, { "item": "peeler", "prob": 75, "count": [ 1, 2 ] }, { "item": "cutting_board", "count": [ 1, 2 ] }, diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index af572e2e377d9..11f1f5ef575d7 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -92,7 +92,12 @@ "id": "silverware", "type": "item_group", "//": "Forks, spoons, knives, etc.", - "items": [ [ "knife_butter", 30 ], { "item": "knife_small", "variant": "knife_steak", "prob": 10 }, [ "fork", 30 ], [ "spoon", 30 ] ] + "items": [ + [ "knife_butter", 30 ], + { "item": "knife_small", "variant": "knife_steak", "prob": 10 }, + [ "fork", 30 ], + [ "spoon", 30 ] + ] }, { "id": "used_toy_box", diff --git a/data/json/monsterdrops/clothing_halloween.json b/data/json/monsterdrops/clothing_halloween.json index a9ac2cd708e58..ed787a5b250a2 100644 --- a/data/json/monsterdrops/clothing_halloween.json +++ b/data/json/monsterdrops/clothing_halloween.json @@ -1132,7 +1132,13 @@ { "item": "hat_chef", "prob": 70, "damage": [ 1, 4 ] }, { "group": "shirts_unisex", "prob": 75, "damage": [ 1, 4 ] }, { "group": "costume_masks", "prob": 10, "damage": [ 1, 4 ] }, - { "item": "knife_huge", "variant": "knife_butcher", "container-item": "sheath", "prob": 60, "damage": [ 1, 4 ] }, + { + "item": "knife_huge", + "variant": "knife_butcher", + "container-item": "sheath", + "prob": 60, + "damage": [ 1, 4 ] + }, { "group": "socks_unisex", "damage": [ 1, 4 ] }, { "distribution": [ diff --git a/data/json/professions.json b/data/json/professions.json index 47d0b31dcb1ef..99e59cee9763c 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1865,7 +1865,9 @@ "skills": [ { "level": 3, "name": "tailor" }, { "level": 3, "name": "cooking" }, { "level": 3, "name": "driving" } ], "proficiencies": [ "prof_food_prep", "prof_closures", "prof_knife_skills", "prof_knives_familiar" ], "items": { - "both": { "entries": [ { "item": "pocketwatch" }, { "item": "knife_small", "variant": "knife_steak" }, { "group": "charged_smart_phone" } ] }, + "both": { + "entries": [ { "item": "pocketwatch" }, { "item": "knife_small", "variant": "knife_steak" }, { "group": "charged_smart_phone" } ] + }, "male": { "entries": [ { "item": "briefs" },