From bedb46f4123db579b6220607cc45f135a5c4a1a6 Mon Sep 17 00:00:00 2001 From: esummins Date: Sat, 1 Jun 2024 12:36:02 -0700 Subject: [PATCH 1/3] Apparently the cooking data needed to be regenerated. --- scripts/cooking.py | 4 +- src/data/cooking.json | 1036 +++++++++++++++++++++++++++++++++-------- 2 files changed, 836 insertions(+), 204 deletions(-) mode change 100644 => 100755 scripts/cooking.py diff --git a/scripts/cooking.py b/scripts/cooking.py old mode 100644 new mode 100755 index 2c16c100..317c43c5 --- a/scripts/cooking.py +++ b/scripts/cooking.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + # Purpose: Get all the recipes needed to cook for achievement, along with their # unlock conditions and ingredients # Result is saved to data/cooking.json @@ -16,7 +18,7 @@ # load the content files OBJECTS: dict[str, Object] = load_data("objects.json") COOKING_RECIPES: dict[str, str] = load_content("CookingRecipes.json") -TV_RECIPES: dict[str, str] = load_content("CookingChannel.json") +TV_RECIPES: dict[str, str] = load_content("TV/CookingChannel.json") # hardcoded checks for recipes with unusual unlock conditions # l 100, null diff --git a/src/data/cooking.json b/src/data/cooking.json index 84433805..e42c9c43 100644 --- a/src/data/cooking.json +++ b/src/data/cooking.json @@ -1,14 +1,25 @@ { "194": { - "ingredients": [{ "itemID": "-5", "quantity": 1 }], + "ingredients": [ + { + "itemID": "-5", + "quantity": 1 + } + ], "itemID": "194", "minVersion": "1.5.0", "unlockConditions": "Starter Recipe - no steps required!" }, "195": { "ingredients": [ - { "itemID": "-5", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "-5", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "195", "minVersion": "1.5.0", @@ -16,9 +27,18 @@ }, "196": { "ingredients": [ - { "itemID": "20", "quantity": 1 }, - { "itemID": "22", "quantity": 1 }, - { "itemID": "419", "quantity": 1 } + { + "itemID": "20", + "quantity": 1 + }, + { + "itemID": "22", + "quantity": 1 + }, + { + "itemID": "419", + "quantity": 1 + } ], "itemID": "196", "minVersion": "1.5.0", @@ -26,8 +46,14 @@ }, "197": { "ingredients": [ - { "itemID": "190", "quantity": 1 }, - { "itemID": "424", "quantity": 1 } + { + "itemID": "190", + "quantity": 1 + }, + { + "itemID": "424", + "quantity": 1 + } ], "itemID": "197", "minVersion": "1.5.0", @@ -35,9 +61,18 @@ }, "198": { "ingredients": [ - { "itemID": "145", "quantity": 1 }, - { "itemID": "132", "quantity": 1 }, - { "itemID": "246", "quantity": 1 } + { + "itemID": "145", + "quantity": 1 + }, + { + "itemID": "132", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + } ], "itemID": "198", "minVersion": "1.5.0", @@ -45,9 +80,18 @@ }, "199": { "ingredients": [ - { "itemID": "24", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 }, - { "itemID": "419", "quantity": 1 } + { + "itemID": "24", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "419", + "quantity": 1 + } ], "itemID": "199", "minVersion": "1.5.0", @@ -55,8 +99,14 @@ }, "200": { "ingredients": [ - { "itemID": "256", "quantity": 1 }, - { "itemID": "284", "quantity": 1 } + { + "itemID": "256", + "quantity": 1 + }, + { + "itemID": "284", + "quantity": 1 + } ], "itemID": "200", "minVersion": "1.5.0", @@ -64,10 +114,22 @@ }, "201": { "ingredients": [ - { "itemID": "194", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 }, - { "itemID": "210", "quantity": 1 }, - { "itemID": "211", "quantity": 1 } + { + "itemID": "194", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "210", + "quantity": 1 + }, + { + "itemID": "211", + "quantity": 1 + } ], "itemID": "201", "minVersion": "1.5.0", @@ -75,9 +137,18 @@ }, "202": { "ingredients": [ - { "itemID": "151", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "151", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "202", "minVersion": "1.5.0", @@ -85,9 +156,18 @@ }, "203": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "722", "quantity": 1 }, - { "itemID": "308", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "722", + "quantity": 1 + }, + { + "itemID": "308", + "quantity": 1 + } ], "itemID": "203", "minVersion": "1.5.0", @@ -95,9 +175,18 @@ }, "204": { "ingredients": [ - { "itemID": "154", "quantity": 1 }, - { "itemID": "229", "quantity": 1 }, - { "itemID": "597", "quantity": 1 } + { + "itemID": "154", + "quantity": 1 + }, + { + "itemID": "229", + "quantity": 1 + }, + { + "itemID": "597", + "quantity": 1 + } ], "itemID": "204", "minVersion": "1.5.0", @@ -105,9 +194,18 @@ }, "205": { "ingredients": [ - { "itemID": "404", "quantity": 1 }, - { "itemID": "257", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "404", + "quantity": 1 + }, + { + "itemID": "257", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "205", "minVersion": "1.5.0", @@ -115,39 +213,70 @@ }, "206": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "256", "quantity": 1 }, - { "itemID": "424", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + }, + { + "itemID": "424", + "quantity": 1 + } ], "itemID": "206", "minVersion": "1.5.0", "unlockConditions": "Spring 7, Year 2" }, "207": { - "ingredients": [{ "itemID": "188", "quantity": 2 }], + "ingredients": [ + { + "itemID": "188", + "quantity": 2 + } + ], "itemID": "207", "minVersion": "1.5.0", "unlockConditions": "Reach 7 hearts with Clint." }, "208": { "ingredients": [ - { "itemID": "280", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "280", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "208", "minVersion": "1.5.0", "unlockConditions": "Fall 21, Year 1" }, "209": { - "ingredients": [{ "itemID": "142", "quantity": 4 }], + "ingredients": [ + { + "itemID": "142", + "quantity": 4 + } + ], "itemID": "209", "minVersion": "1.5.0", "unlockConditions": "Summer 7, Year 2" }, "210": { "ingredients": [ - { "itemID": "192", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "192", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "210", "minVersion": "1.5.0", @@ -155,8 +284,14 @@ }, "211": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + } ], "itemID": "211", "minVersion": "1.5.0", @@ -164,9 +299,18 @@ }, "212": { "ingredients": [ - { "itemID": "139", "quantity": 1 }, - { "itemID": "300", "quantity": 1 }, - { "itemID": "250", "quantity": 1 } + { + "itemID": "139", + "quantity": 1 + }, + { + "itemID": "300", + "quantity": 1 + }, + { + "itemID": "250", + "quantity": 1 + } ], "itemID": "212", "minVersion": "1.5.0", @@ -174,10 +318,22 @@ }, "213": { "ingredients": [ - { "itemID": "130", "quantity": 1 }, - { "itemID": "229", "quantity": 1 }, - { "itemID": "266", "quantity": 1 }, - { "itemID": "306", "quantity": 1 } + { + "itemID": "130", + "quantity": 1 + }, + { + "itemID": "229", + "quantity": 1 + }, + { + "itemID": "266", + "quantity": 1 + }, + { + "itemID": "306", + "quantity": 1 + } ], "itemID": "213", "minVersion": "1.5.0", @@ -185,9 +341,18 @@ }, "214": { "ingredients": [ - { "itemID": "136", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "136", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "214", "minVersion": "1.5.0", @@ -195,24 +360,44 @@ }, "215": { "ingredients": [ - { "itemID": "260", "quantity": 1 }, - { "itemID": "424", "quantity": 1 } + { + "itemID": "260", + "quantity": 1 + }, + { + "itemID": "424", + "quantity": 1 + } ], "itemID": "215", "minVersion": "1.5.0", "unlockConditions": "Reach 3 hearts with Shane." }, "216": { - "ingredients": [{ "itemID": "246", "quantity": 1 }], + "ingredients": [ + { + "itemID": "246", + "quantity": 1 + } + ], "itemID": "216", "minVersion": "1.5.0", "unlockConditions": "Summer 28, Year 1" }, "218": { "ingredients": [ - { "itemID": "88", "quantity": 1 }, - { "itemID": "720", "quantity": 1 }, - { "itemID": "404", "quantity": 1 } + { + "itemID": "88", + "quantity": 1 + }, + { + "itemID": "720", + "quantity": 1 + }, + { + "itemID": "404", + "quantity": 1 + } ], "itemID": "218", "minVersion": "1.5.0", @@ -220,8 +405,14 @@ }, "219": { "ingredients": [ - { "itemID": "138", "quantity": 1 }, - { "itemID": "153", "quantity": 1 } + { + "itemID": "138", + "quantity": 1 + }, + { + "itemID": "153", + "quantity": 1 + } ], "itemID": "219", "minVersion": "1.5.0", @@ -229,9 +420,18 @@ }, "220": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + } ], "itemID": "220", "minVersion": "1.5.0", @@ -239,10 +439,22 @@ }, "221": { "ingredients": [ - { "itemID": "254", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 } + { + "itemID": "254", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + } ], "itemID": "221", "minVersion": "1.5.0", @@ -250,9 +462,18 @@ }, "222": { "ingredients": [ - { "itemID": "252", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "252", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "222", "minVersion": "1.5.0", @@ -260,9 +481,18 @@ }, "223": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + } ], "itemID": "223", "minVersion": "1.5.0", @@ -270,8 +500,14 @@ }, "224": { "ingredients": [ - { "itemID": "246", "quantity": 1 }, - { "itemID": "256", "quantity": 1 } + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + } ], "itemID": "224", "minVersion": "1.5.0", @@ -279,8 +515,14 @@ }, "225": { "ingredients": [ - { "itemID": "148", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "148", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "225", "minVersion": "1.5.0", @@ -288,39 +530,70 @@ }, "226": { "ingredients": [ - { "itemID": "148", "quantity": 1 }, - { "itemID": "260", "quantity": 1 } + { + "itemID": "148", + "quantity": 1 + }, + { + "itemID": "260", + "quantity": 1 + } ], "itemID": "226", "minVersion": "1.5.0", "unlockConditions": "Reach 7 hearts with George." }, "227": { - "ingredients": [{ "itemID": "-4", "quantity": 1 }], + "ingredients": [ + { + "itemID": "-4", + "quantity": 1 + } + ], "itemID": "227", "minVersion": "1.5.0", "unlockConditions": "Reach 3 hearts with Linus." }, "228": { "ingredients": [ - { "itemID": "-4", "quantity": 1 }, - { "itemID": "152", "quantity": 1 }, - { "itemID": "423", "quantity": 1 } + { + "itemID": "-4", + "quantity": 1 + }, + { + "itemID": "152", + "quantity": 1 + }, + { + "itemID": "423", + "quantity": 1 + } ], "itemID": "228", "minVersion": "1.5.0", "unlockConditions": "Summer 21, Year 1" }, "229": { - "ingredients": [{ "itemID": "270", "quantity": 1 }], + "ingredients": [ + { + "itemID": "270", + "quantity": 1 + } + ], "itemID": "229", "minVersion": "1.5.0", "unlockConditions": "Fall 7, Year 1" }, "230": { "ingredients": [ - { "itemID": "266", "quantity": 1 }, - { "itemID": "264", "quantity": 1 } + { + "itemID": "266", + "quantity": 1 + }, + { + "itemID": "264", + "quantity": 1 + } ], "itemID": "230", "minVersion": "1.5.0", @@ -328,8 +601,14 @@ }, "231": { "ingredients": [ - { "itemID": "272", "quantity": 1 }, - { "itemID": "256", "quantity": 1 } + { + "itemID": "272", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + } ], "itemID": "231", "minVersion": "1.5.0", @@ -337,9 +616,18 @@ }, "232": { "ingredients": [ - { "itemID": "-6", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "423", "quantity": 1 } + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "423", + "quantity": 1 + } ], "itemID": "232", "minVersion": "1.5.0", @@ -347,8 +635,14 @@ }, "233": { "ingredients": [ - { "itemID": "-6", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "233", "minVersion": "1.5.0", @@ -356,10 +650,22 @@ }, "234": { "ingredients": [ - { "itemID": "258", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 } + { + "itemID": "258", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + } ], "itemID": "234", "minVersion": "1.5.0", @@ -367,8 +673,14 @@ }, "235": { "ingredients": [ - { "itemID": "280", "quantity": 1 }, - { "itemID": "276", "quantity": 1 } + { + "itemID": "280", + "quantity": 1 + }, + { + "itemID": "276", + "quantity": 1 + } ], "itemID": "235", "minVersion": "1.5.0", @@ -376,8 +688,14 @@ }, "236": { "ingredients": [ - { "itemID": "276", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "276", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "236", "minVersion": "1.5.0", @@ -385,9 +703,18 @@ }, "237": { "ingredients": [ - { "itemID": "278", "quantity": 1 }, - { "itemID": "282", "quantity": 1 }, - { "itemID": "274", "quantity": 1 } + { + "itemID": "278", + "quantity": 1 + }, + { + "itemID": "282", + "quantity": 1 + }, + { + "itemID": "274", + "quantity": 1 + } ], "itemID": "237", "minVersion": "1.5.0", @@ -395,8 +722,14 @@ }, "238": { "ingredients": [ - { "itemID": "282", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "282", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "238", "minVersion": "1.5.0", @@ -404,9 +737,18 @@ }, "239": { "ingredients": [ - { "itemID": "216", "quantity": 1 }, - { "itemID": "282", "quantity": 1 }, - { "itemID": "408", "quantity": 1 } + { + "itemID": "216", + "quantity": 1 + }, + { + "itemID": "282", + "quantity": 1 + }, + { + "itemID": "408", + "quantity": 1 + } ], "itemID": "239", "minVersion": "1.5.0", @@ -414,8 +756,14 @@ }, "240": { "ingredients": [ - { "itemID": "195", "quantity": 1 }, - { "itemID": "24", "quantity": 1 } + { + "itemID": "195", + "quantity": 1 + }, + { + "itemID": "24", + "quantity": 1 + } ], "itemID": "240", "minVersion": "1.5.0", @@ -423,9 +771,18 @@ }, "241": { "ingredients": [ - { "itemID": "216", "quantity": 1 }, - { "itemID": "78", "quantity": 1 }, - { "itemID": "272", "quantity": 1 } + { + "itemID": "216", + "quantity": 1 + }, + { + "itemID": "78", + "quantity": 1 + }, + { + "itemID": "272", + "quantity": 1 + } ], "itemID": "241", "minVersion": "1.5.0", @@ -433,8 +790,14 @@ }, "242": { "ingredients": [ - { "itemID": "131", "quantity": 2 }, - { "itemID": "210", "quantity": 1 } + { + "itemID": "131", + "quantity": 2 + }, + { + "itemID": "210", + "quantity": 1 + } ], "itemID": "242", "minVersion": "1.5.0", @@ -442,9 +805,18 @@ }, "243": { "ingredients": [ - { "itemID": "78", "quantity": 2 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "78", + "quantity": 2 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "243", "minVersion": "1.5.0", @@ -452,46 +824,85 @@ }, "244": { "ingredients": [ - { "itemID": "78", "quantity": 1 }, - { "itemID": "412", "quantity": 1 } + { + "itemID": "78", + "quantity": 1 + }, + { + "itemID": "412", + "quantity": 1 + } ], "itemID": "244", "minVersion": "1.5.0", "unlockConditions": "Reach level 3 in Combat skill." }, "253": { - "ingredients": [{ "itemID": "395", "quantity": 3 }], + "ingredients": [ + { + "itemID": "395", + "quantity": 3 + } + ], "itemID": "253", "minVersion": "1.5.0", "unlockConditions": "Stardrop Saloon for 5,000g." }, "265": { "ingredients": [ - { "itemID": "267", "quantity": 1 }, - { "itemID": "269", "quantity": 1 }, - { "itemID": "814", "quantity": 1 } + { + "itemID": "267", + "quantity": 1 + }, + { + "itemID": "269", + "quantity": 1 + }, + { + "itemID": "814", + "quantity": 1 + } ], "itemID": "265", "minVersion": "1.5.0", "unlockConditions": "Reach level 9 in Fishing skill." }, "456": { - "ingredients": [{ "itemID": "153", "quantity": 4 }], + "ingredients": [ + { + "itemID": "153", + "quantity": 4 + } + ], "itemID": "456", "minVersion": "1.5.0", "unlockConditions": "Reach 3 hearts with Clint." }, "457": { - "ingredients": [{ "itemID": "157", "quantity": 2 }], + "ingredients": [ + { + "itemID": "157", + "quantity": 2 + } + ], "itemID": "457", "minVersion": "1.5.0", "unlockConditions": "Reach 3 hearts with Marnie." }, "604": { "ingredients": [ - { "itemID": "406", "quantity": 2 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "406", + "quantity": 2 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "604", "minVersion": "1.5.0", @@ -499,8 +910,14 @@ }, "605": { "ingredients": [ - { "itemID": "274", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "274", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "605", "minVersion": "1.5.0", @@ -508,27 +925,56 @@ }, "606": { "ingredients": [ - { "itemID": "78", "quantity": 1 }, - { "itemID": "404", "quantity": 1 }, - { "itemID": "250", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "78", + "quantity": 1 + }, + { + "itemID": "404", + "quantity": 1 + }, + { + "itemID": "250", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "606", "minVersion": "1.5.0", "unlockConditions": "Spring 7, Year 1" }, "607": { - "ingredients": [{ "itemID": "408", "quantity": 3 }], + "ingredients": [ + { + "itemID": "408", + "quantity": 3 + } + ], "itemID": "607", "minVersion": "1.5.0", "unlockConditions": "Summer 28, Year 2" }, "608": { "ingredients": [ - { "itemID": "276", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "276", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "608", "minVersion": "1.5.0", @@ -536,9 +982,18 @@ }, "609": { "ingredients": [ - { "itemID": "247", "quantity": 1 }, - { "itemID": "419", "quantity": 1 }, - { "itemID": "264", "quantity": 1 } + { + "itemID": "247", + "quantity": 1 + }, + { + "itemID": "419", + "quantity": 1 + }, + { + "itemID": "264", + "quantity": 1 + } ], "itemID": "609", "minVersion": "1.5.0", @@ -546,9 +1001,18 @@ }, "610": { "ingredients": [ - { "itemID": "258", "quantity": 1 }, - { "itemID": "254", "quantity": 1 }, - { "itemID": "634", "quantity": 1 } + { + "itemID": "258", + "quantity": 1 + }, + { + "itemID": "254", + "quantity": 1 + }, + { + "itemID": "634", + "quantity": 1 + } ], "itemID": "610", "minVersion": "1.5.0", @@ -556,9 +1020,18 @@ }, "611": { "ingredients": [ - { "itemID": "410", "quantity": 2 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "246", "quantity": 1 } + { + "itemID": "410", + "quantity": 2 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + } ], "itemID": "611", "minVersion": "1.5.0", @@ -566,9 +1039,18 @@ }, "612": { "ingredients": [ - { "itemID": "282", "quantity": 1 }, - { "itemID": "613", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "282", + "quantity": 1 + }, + { + "itemID": "613", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "612", "minVersion": "1.5.0", @@ -576,9 +1058,18 @@ }, "618": { "ingredients": [ - { "itemID": "216", "quantity": 1 }, - { "itemID": "247", "quantity": 1 }, - { "itemID": "256", "quantity": 1 } + { + "itemID": "216", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + } ], "itemID": "618", "minVersion": "1.5.0", @@ -586,9 +1077,18 @@ }, "648": { "ingredients": [ - { "itemID": "266", "quantity": 1 }, - { "itemID": "419", "quantity": 1 }, - { "itemID": "306", "quantity": 1 } + { + "itemID": "266", + "quantity": 1 + }, + { + "itemID": "419", + "quantity": 1 + }, + { + "itemID": "306", + "quantity": 1 + } ], "itemID": "648", "minVersion": "1.5.0", @@ -596,9 +1096,18 @@ }, "649": { "ingredients": [ - { "itemID": "247", "quantity": 1 }, - { "itemID": "259", "quantity": 1 }, - { "itemID": "248", "quantity": 1 } + { + "itemID": "247", + "quantity": 1 + }, + { + "itemID": "259", + "quantity": 1 + }, + { + "itemID": "248", + "quantity": 1 + } ], "itemID": "649", "minVersion": "1.5.0", @@ -606,9 +1115,18 @@ }, "651": { "ingredients": [ - { "itemID": "376", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "376", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "651", "minVersion": "1.5.0", @@ -616,8 +1134,14 @@ }, "727": { "ingredients": [ - { "itemID": "372", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "372", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "727", "minVersion": "1.5.0", @@ -625,10 +1149,22 @@ }, "728": { "ingredients": [ - { "itemID": "716", "quantity": 1 }, - { "itemID": "719", "quantity": 1 }, - { "itemID": "722", "quantity": 1 }, - { "itemID": "256", "quantity": 1 } + { + "itemID": "716", + "quantity": 1 + }, + { + "itemID": "719", + "quantity": 1 + }, + { + "itemID": "722", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + } ], "itemID": "728", "minVersion": "1.5.0", @@ -636,8 +1172,14 @@ }, "729": { "ingredients": [ - { "itemID": "721", "quantity": 1 }, - { "itemID": "248", "quantity": 1 } + { + "itemID": "721", + "quantity": 1 + }, + { + "itemID": "248", + "quantity": 1 + } ], "itemID": "729", "minVersion": "1.5.0", @@ -645,8 +1187,14 @@ }, "730": { "ingredients": [ - { "itemID": "715", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 } + { + "itemID": "715", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + } ], "itemID": "730", "minVersion": "1.5.0", @@ -654,9 +1202,18 @@ }, "731": { "ingredients": [ - { "itemID": "724", "quantity": 1 }, - { "itemID": "245", "quantity": 1 }, - { "itemID": "246", "quantity": 1 } + { + "itemID": "724", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + } ], "itemID": "731", "minVersion": "1.5.0", @@ -664,10 +1221,22 @@ }, "732": { "ingredients": [ - { "itemID": "717", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "-5", "quantity": 1 }, - { "itemID": "247", "quantity": 1 } + { + "itemID": "717", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "-5", + "quantity": 1 + }, + { + "itemID": "247", + "quantity": 1 + } ], "itemID": "732", "minVersion": "1.5.0", @@ -675,9 +1244,18 @@ }, "733": { "ingredients": [ - { "itemID": "720", "quantity": 1 }, - { "itemID": "256", "quantity": 1 }, - { "itemID": "16", "quantity": 1 } + { + "itemID": "720", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + }, + { + "itemID": "16", + "quantity": 1 + } ], "itemID": "733", "minVersion": "1.5.0", @@ -685,8 +1263,14 @@ }, "903": { "ingredients": [ - { "itemID": "829", "quantity": 3 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "829", + "quantity": 3 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "903", "minVersion": "1.5.0", @@ -694,9 +1278,18 @@ }, "904": { "ingredients": [ - { "itemID": "91", "quantity": 1 }, - { "itemID": "-6", "quantity": 1 }, - { "itemID": "245", "quantity": 1 } + { + "itemID": "91", + "quantity": 1 + }, + { + "itemID": "-6", + "quantity": 1 + }, + { + "itemID": "245", + "quantity": 1 + } ], "itemID": "904", "minVersion": "1.5.0", @@ -704,25 +1297,48 @@ }, "905": { "ingredients": [ - { "itemID": "834", "quantity": 1 }, - { "itemID": "88", "quantity": 1 }, - { "itemID": "423", "quantity": 1 } + { + "itemID": "834", + "quantity": 1 + }, + { + "itemID": "88", + "quantity": 1 + }, + { + "itemID": "423", + "quantity": 1 + } ], "itemID": "905", "minVersion": "1.5.0", "unlockConditions": "Reach 7 hearts with Leo." }, "906": { - "ingredients": [{ "itemID": "830", "quantity": 4 }], + "ingredients": [ + { + "itemID": "830", + "quantity": 4 + } + ], "itemID": "906", "minVersion": "1.5.0", "unlockConditions": "Reach 3 hearts with Leo." }, "907": { "ingredients": [ - { "itemID": "88", "quantity": 1 }, - { "itemID": "832", "quantity": 1 }, - { "itemID": "260", "quantity": 1 } + { + "itemID": "88", + "quantity": 1 + }, + { + "itemID": "832", + "quantity": 1 + }, + { + "itemID": "260", + "quantity": 1 + } ], "itemID": "907", "minVersion": "1.5.0", @@ -730,18 +1346,32 @@ }, "921": { "ingredients": [ - { "itemID": "814", "quantity": 1 }, - { "itemID": "246", "quantity": 1 }, - { "itemID": "256", "quantity": 1 } + { + "itemID": "814", + "quantity": 1 + }, + { + "itemID": "246", + "quantity": 1 + }, + { + "itemID": "256", + "quantity": 1 + } ], "itemID": "921", "minVersion": "1.5.0", "unlockConditions": "Reach level 9 in Combat skill." }, "MossSoup": { - "ingredients": [{ "itemID": "Moss", "quantity": 20 }], + "ingredients": [ + { + "itemID": "Moss", + "quantity": 20 + } + ], "itemID": "MossSoup", "minVersion": "1.6.0", "unlockConditions": "Reach level 3 in Foraging skill." } -} +} \ No newline at end of file From 6c283bb188efdd99dff2a7b2e77b16960efec3a8 Mon Sep 17 00:00:00 2001 From: esummins Date: Sat, 1 Jun 2024 12:42:24 -0700 Subject: [PATCH 2/3] Patching air date math --- scripts/helpers/utils.py | 3 ++- src/data/cooking.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/helpers/utils.py b/scripts/helpers/utils.py index 6b3d53b7..f460a899 100644 --- a/scripts/helpers/utils.py +++ b/scripts/helpers/utils.py @@ -282,7 +282,8 @@ def get_tv_airing_date(key: int) -> str: season_idx = (key - 1) // 4 season = seasons[season_idx % 4] - year = (key * 7) // 112 + 1 + # Dropping key from 1 indexed to 0 indexed + year = (key - 1) // 16 + 1 return f"{season} {day}, Year {year}" diff --git a/src/data/cooking.json b/src/data/cooking.json index e42c9c43..d9e9087f 100644 --- a/src/data/cooking.json +++ b/src/data/cooking.json @@ -1054,7 +1054,7 @@ ], "itemID": "612", "minVersion": "1.5.0", - "unlockConditions": "Winter 28, Year 2" + "unlockConditions": "Winter 28, Year 1" }, "618": { "ingredients": [ @@ -1259,7 +1259,7 @@ ], "itemID": "733", "minVersion": "1.5.0", - "unlockConditions": "Winter 28, Year 3" + "unlockConditions": "Winter 28, Year 2" }, "903": { "ingredients": [ From 5865c2c1c46d3a653ce4c354d390b3dccf72634e Mon Sep 17 00:00:00 2001 From: esummins Date: Sat, 1 Jun 2024 12:49:02 -0700 Subject: [PATCH 3/3] cleaning up some math --- scripts/helpers/utils.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/helpers/utils.py b/scripts/helpers/utils.py index f460a899..679982d0 100644 --- a/scripts/helpers/utils.py +++ b/scripts/helpers/utils.py @@ -274,16 +274,16 @@ def get_tv_airing_date(key: int) -> str: Returns: str: A string in the format "Spring 7, Year 1". """ - seasons = ["Spring", "Summer", "Fall", "Winter"] - day = (key * 7) % 28 - if day == 0: - day = 28 + # Dropping key from 1 indexed to 0 indexed + key_idx = key - 1 + day_key = key_idx % 4 + day = (day_key + 1) * 7 - season_idx = (key - 1) // 4 + seasons = ["Spring", "Summer", "Fall", "Winter"] + season_idx = key_idx // 4 season = seasons[season_idx % 4] - # Dropping key from 1 indexed to 0 indexed - year = (key - 1) // 16 + 1 + year = key_idx // 16 + 1 return f"{season} {day}, Year {year}"