diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/TangguoData.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/TangguoData.py index fef0ba4..9665a1d 100644 --- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/TangguoData.py +++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/TangguoData.py @@ -142,6 +142,7 @@ NORI_EGG_SOUP_1 = "rtdd:norieggsoup_1" # (七分熟) NORI_EGG_SOUP_2 = "rtdd:norieggsoup_2" # (全熟) NORI_EGG_SOUP_3 = "rtdd:norieggsoup_3" # (熟) TOFU_FISH_SOUP_RAW = "rtdd:tufusoupb" # 豆腐鲑鱼汤(生) +TOFU_FISH_SCALLION = "rtdd:tufusoupc" # 汤锅_89(豆腐鲑鱼汤_生_加葱花) TOFU_FISH_SOUP_1 = "rtdd:tufufishsoup_1" # (四分熟) TOFU_FISH_SOUP_2 = "rtdd:tufufishsoup_2" # (八分熟) TOFU_FISH_SOUP_3 = "rtdd:tufufishsoup_3" # (熟) @@ -277,67 +278,71 @@ SWITCH_RULES = [ # ---------------- 四、加肉/鱼/豆腐 -> 汤羹(生), 开始计时 ---------------- {"block": CARROT_SOUP, "item": BEEF, "target": CARROT_BEEF_SOUP, "consume": 2, "startTimer": CARROT_BEEF_SOUP, - "tip": "§a胡萝卜汤加生牛肉x2, 开始熬制(共90秒, 3级，30秒); 等计时结束变成 胡萝卜牛肉汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜汤加生牛肉x2, 开始熬制; 等计时结束变成 胡萝卜牛肉汤(熟), 手持木碗出锅"}, {"block": CARROT_SOUP, "item": MUTTON, "target": LAMB_SOUP_WITH_TURNIPS, "consume": 2, "startTimer": LAMB_SOUP_WITH_TURNIPS, - "tip": "§a胡萝卜汤加羊肉x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜羊肉汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜汤加羊肉x2, 开始熬制; 等计时结束变成 胡萝卜羊肉汤(熟), 手持木碗出锅"}, {"block": CARROT_SOUP, "item": PORKRIB, "target": CARROT_RIBS, "consume": 2, "startTimer": CARROT_RIBS, - "tip": "§a胡萝卜汤加猪肋排x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜排骨汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜汤加猪肋排x2, 开始熬制; 等计时结束变成 胡萝卜排骨汤(熟), 手持木碗出锅"}, {"block": VEGETABLE_SOUP, "item": MUTTON, "target": VEGETABLE_BEEF_SOUP, "consume": 2, "startTimer": VEGETABLE_BEEF_SOUP, - "tip": "§a蔬菜汤加羊肉x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 清汤羊肉(熟), 手持木碗出锅"}, + "tip": "§a蔬菜汤加羊肉x2, 开始熬制; 等计时结束变成 清汤羊肉(熟), 手持木碗出锅"}, {"block": VEGETABLE_SOUP, "item": BEEF, "target": VEGETABLE_LAMB_SOUP, "consume": 2, "startTimer": VEGETABLE_LAMB_SOUP, - "tip": "§a蔬菜汤加生牛肉x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 蔬菜牛肉汤(熟), 手持木碗出锅"}, + "tip": "§a蔬菜汤加生牛肉x2, 开始熬制; 等计时结束变成 蔬菜牛肉汤(熟), 手持木碗出锅"}, {"block": VEGETABLE_SOUP, "item": CRUSHED_MEAT, "target": VEGETABLE_LEAN_BROTH, "consume": 5, "startTimer": VEGETABLE_LEAN_BROTH, - "tip": "§a蔬菜汤加碎肉x5, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 蔬菜瘦肉汤(熟), 手持木碗出锅"}, + "tip": "§a蔬菜汤加碎肉x5, 开始熬制; 等计时结束变成 蔬菜瘦肉汤(熟), 手持木碗出锅"}, {"block": VEGETABLE_SOUP, "item": CARROT_POTATO_SOUP, "target": VEGETABLE_SSTEW, "consume": 1, "drop": POT_EMPTY, "startTimer": VEGETABLE_SSTEW, - "tip": "§a蔬菜汤加胡萝卜土豆汤, 变成 蔬菜乱炖(生), 掉落一个汤锅(空); 开始熬制(共180秒, 3级，60秒), 等计时结束变熟, 手持木碗出锅"}, + "tip": "§a蔬菜汤加胡萝卜土豆汤, 变成 蔬菜乱炖(生), 掉落一个汤锅(空); 开始熬制, 等计时结束变熟, 手持木碗出锅"}, {"block": CARROT_POTATO_SOUP, "item": VEGETABLE, "target": VEGETABLE_SSTEW, "consume": 3, "startTimer": VEGETABLE_SSTEW, - "tip": "§a胡萝卜土豆汤加青菜碎x3, 变成 蔬菜乱炖(生); 开始熬制(共180秒, 3级，60秒), 等计时结束变熟, 手持木碗出锅"}, + "tip": "§a胡萝卜土豆汤加青菜碎x3, 变成 蔬菜乱炖(生); 开始熬制, 等计时结束变熟, 手持木碗出锅"}, {"block": CARROT_POTATO_SOUP, "item": COW_RIBS, "target": BEEF_BONE_BROTH, "consume": 2, "startTimer": BEEF_BONE_BROTH, - "tip": "§a胡萝卜土豆汤加牛肋x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜土豆牛骨汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜土豆汤加牛肋x2, 开始熬制; 等计时结束变成 胡萝卜土豆牛骨汤(熟), 手持木碗出锅"}, {"block": CARROT_POTATO_SOUP, "item": MUTTON, "target": LAMB_STEW, "consume": 2, "startTimer": LAMB_STEW, - "tip": "§a胡萝卜土豆汤加羊肉x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 土豆胡萝卜炖羊肉(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜土豆汤加羊肉x2, 开始熬制; 等计时结束变成 土豆胡萝卜炖羊肉(熟), 手持木碗出锅"}, {"block": CARROT_POTATO_SOUP, "item": SHEEP_RACKS, "target": VEGETABLE_POTATOES_LAMBSTEAK, "consume": 2, "startTimer": VEGETABLE_POTATOES_LAMBSTEAK, - "tip": "§a胡萝卜土豆汤加羊小排x2, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜土豆羊排汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜土豆汤加羊小排x2, 开始熬制; 等计时结束变成 胡萝卜土豆羊排汤(熟), 手持木碗出锅"}, {"block": CARROT_SOUP, "item": COD, "target": CARROT_COD_SOUP, "consume": 1, "startTimer": CARROT_COD_SOUP, - "tip": "§a胡萝卜汤加鳕鱼, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜鳕鱼汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜汤加鳕鱼, 开始熬制; 等计时结束变成 胡萝卜鳕鱼汤(熟), 手持木碗出锅"}, {"block": CARROT_SOUP, "item": SALMON, "target": CARROT_FISH_SOUP, "consume": 1, "startTimer": CARROT_FISH_SOUP, - "tip": "§a胡萝卜汤加鲑鱼, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 胡萝卜鲑鱼汤(熟), 手持木碗出锅"}, + "tip": "§a胡萝卜汤加鲑鱼, 开始熬制; 等计时结束变成 胡萝卜鲑鱼汤(熟), 手持木碗出锅"}, {"block": COD_SOUP, "item": EGG, "target": EGG_COD_SOUP, "consume": 3, "startTimer": EGG_COD_SOUP, - "tip": "§a鳕鱼汤加鸡蛋x3, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 蛋花鳕鱼汤(熟), 手持木碗出锅"}, + "tip": "§a鳕鱼汤加鸡蛋x3, 开始熬制; 等计时结束变成 蛋花鳕鱼汤(熟), 手持木碗出锅"}, {"block": EGG_SOUP, "item": COD, "target": EGG_COD_SOUP, "consume": 1, "startTimer": EGG_COD_SOUP, - "tip": "§a蛋花汤加鳕鱼, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 蛋花鳕鱼汤(熟), 手持木碗出锅"}, + "tip": "§a蛋花汤加鳕鱼, 开始熬制; 等计时结束变成 蛋花鳕鱼汤(熟), 手持木碗出锅"}, {"block": EGG_SOUP, "item": CRUSHED_MEAT, "target": NORI_EGG_SOUP, "consume": 5, "startTimer": NORI_EGG_SOUP, - "tip": "§a蛋花汤加碎肉x5, 开始熬制(共120秒, 4级，30秒); 等计时结束变成 瘦肉蛋花汤(熟), 手持木碗出锅"}, + "tip": "§a蛋花汤加碎肉x5, 开始熬制; 等计时结束变成 瘦肉蛋花汤(熟), 手持木碗出锅"}, {"block": VEGETABLE_LEAN_BROTH, "item": EGG, "target": NORI_EGG_SOUP, "consume": 3, "startTimer": NORI_EGG_SOUP, - "tip": "§a蔬菜瘦肉汤加鸡蛋x3, 开始熬制(共120秒, 4级，30秒); 等计时结束变成 瘦肉蛋花汤(熟), 手持木碗出锅"}, + "tip": "§a蔬菜瘦肉汤加鸡蛋x3, 开始熬制; 等计时结束变成 瘦肉蛋花汤(熟), 手持木碗出锅"}, {"block": TOFU_SOUP, "item": SALMON, "target": TOFU_FISH_SOUP_RAW, - "consume": 1, "startTimer": TOFU_FISH_SOUP_RAW, - "tip": "§a豆腐汤加鲑鱼, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 豆腐鲑鱼汤(熟), 手持木碗出锅"}, + "consume": 1, + "tip": "§a豆腐汤加鲑鱼, 变成 豆腐鲑鱼汤_生; 再拿葱花碎右键加葱花后开始熬制, 计时结束变成 豆腐鲑鱼汤(熟), 手持木碗出锅"}, {"block": SALMON_SOUP, "item": BEANCURD, "target": TOFU_FISH_SOUP_RAW, - "consume": 4, "startTimer": TOFU_FISH_SOUP_RAW, - "tip": "§a鲑鱼汤加豆腐x4, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 豆腐鲑鱼汤(熟), 手持木碗出锅"}, + "consume": 4, + "tip": "§a鲑鱼汤加豆腐x4, 变成 豆腐鲑鱼汤_生; 再拿葱花碎右键加葱花后开始熬制, 计时结束变成 豆腐鲑鱼汤(熟), 手持木碗出锅"}, + # 菜谱26 supplement: 豆腐鲑鱼汤_生 + 葱花碎x3 -> 汤锅_89(加葱花), 开始计时 + {"block": TOFU_FISH_SOUP_RAW, "item": SCALLIONS, "target": TOFU_FISH_SCALLION, + "consume": 3, "startTimer": TOFU_FISH_SCALLION, + "tip": "§a豆腐鲑鱼汤加葱花碎x3, 变成 汤锅_89(加葱花), 开始熬制; 计时结束变成 豆腐鲑鱼汤(熟), 手持木碗出锅"}, {"block": MUSHROOM_SOUP, "item": CHICKEN, "target": CHICKEN_STEW_MUSHROOMS, "consume": 1, "startTimer": CHICKEN_STEW_MUSHROOMS, - "tip": "§a蘑菇汤加生鸡肉, 开始熬制(共270秒, 3级，90秒); 等计时结束变成 蘑菇炖鸡(熟), 手持木碗出锅"}, + "tip": "§a蘑菇汤加生鸡肉, 开始熬制; 等计时结束变成 蘑菇炖鸡(熟), 手持木碗出锅"}, {"block": VEGETABLE_SOUP, "item": SASHIMI, "target": VEGETABLE_FISH_SOUP_0, "consume": 10, "startTimer": VEGETABLE_FISH_SOUP_0, - "tip": "§a蔬菜汤加生鱼片x10, 开始熬制(共180秒, 3级，60秒); 等计时结束变成 蔬菜鱼片汤(熟), 手持木碗出锅"}, + "tip": "§a蔬菜汤加生鱼片x10, 开始熬制; 等计时结束变成 蔬菜鱼片汤(熟), 手持木碗出锅"}, # ---------------- 五、单独菜谱 ---------------- # 菜谱29 猪蹄汤 @@ -345,31 +350,31 @@ SWITCH_RULES = [ "consume": 2, "tip": "§a放入猪蹄x2, 变成 猪蹄汤(生); 继续拿土豆块x3右键 加土豆"}, {"block": RAW_PIG_FOOD_SOUP_0, "item": POTATO_WEDGES, "target": RAW_PIG_FOOD_SOUP_2, "consume": 3, "startTimer": RAW_PIG_FOOD_SOUP_2, - "tip": "§a猪蹄汤加土豆块x3, 开始熬制(共90秒, 3级，30秒); 等计时结束变成 猪蹄汤(全熟), 手持木碗出锅"}, + "tip": "§a猪蹄汤加土豆块x3, 开始熬制; 等计时结束变成 猪蹄汤(全熟), 手持木碗出锅"}, # 菜谱30 羊肉泡馍汤 {"block": POT_WATER, "item": MO, "target": ROUJIAMO_SOUP_0, "consume": 1, "startTimer": ROUJIAMO_SOUP_0, - "tip": "§a放入馍, 开始熬制(共30秒); 等计时结束变成 羊肉泡馍汤(熟), 手持木碗出锅"}, + "tip": "§a放入馍, 开始熬制; 等计时结束变成 羊肉泡馍汤(熟), 手持木碗出锅"}, # 菜谱31 生面汤 {"block": POT_WATER, "item": NOODLES, "target": RAW_NOODLE_SOUP, "consume": 1, "startTimer": RAW_NOODLE_SOUP, - "tip": "§a放入生面, 开始熬制(共60秒); 等计时结束变成 熟面汤, 手持木碗盛出 熟面条"}, + "tip": "§a放入生面, 开始熬制; 等计时结束变成 熟面汤, 手持木碗盛出 熟面条"}, # 菜谱32 饺子汤 {"block": POT_WATER, "item": DUMPLINGS, "target": DUMPLINGS_SOUP_0, "consume": 1, "startTimer": DUMPLINGS_SOUP_0, - "tip": "§a放入生饺子, 开始熬制(共120秒, 2级，60秒); 等计时结束变成 饺子汤(熟), 手持木碗盛出 饺子_碗装"}, + "tip": "§a放入生饺子, 开始熬制; 等计时结束变成 饺子汤(熟), 手持木碗盛出 饺子_碗装"}, # 菜谱35 生米锅 {"block": POT_WATER, "item": BROWN_RICE, "target": RAW_RICE_POT, "consume": 64, "startTimer": RAW_RICE_POT, - "tip": "§a放入大米x64, 变成 生米锅; 开始煮饭(共90秒)结束变成 熟米饭(形态随机)"}, + "tip": "§a放入大米x64, 变成 生米锅; 开始煮饭结束变成 熟米饭(形态随机)"}, # 菜谱39 煮鸡蛋(生) {"block": POT_WATER, "item": EGG_PILE, "target": RAW_EGG_SOUP, "consume": 1, "startTimer": RAW_EGG_SOUP, - "tip": "§a放入鸡蛋堆, 开始熬制(共60秒); 等计时结束变成 煮鸡蛋(熟), 空手右键取出 水煮蛋x9"}, + "tip": "§a放入鸡蛋堆, 开始熬制; 等计时结束变成 煮鸡蛋(熟), 空手右键取出 水煮蛋x9"}, # 菜谱42 煮豆腐(生) {"block": POT_WATER, "item": SOYMILK, "target": BEANCURD_SOUP_0, "consume": 1, "startTimer": BEANCURD_SOUP_0, - "tip": "§a倒入豆浆, 开始熬制(共60秒); 等计时结束变成 煮豆腐(熟), 拿菜刀右键切成 豆腐x16"}, + "tip": "§a倒入豆浆, 开始熬制; 等计时结束变成 煮豆腐(熟), 拿菜刀右键切成 豆腐x16"}, # ---------------- 六、出锅(熟汤羹+木碗 -> 碗装成品, 锅变回汤锅(空)) ---------------- {"block": CARROT_BEEF_SOUP_3, "item": BOWL, "action": "take_out", @@ -527,151 +532,151 @@ ITEM_USE_ON_RULES = [ # ============================================================================ TIMER_RULES = [ # 胡萝卜牛肉汤(30秒/级) - {"source": CARROT_BEEF_SOUP, "target": CARROT_BEEF_SOUP_1, "time": 30, + {"source": CARROT_BEEF_SOUP, "target": CARROT_BEEF_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_BEEF_SOUP_1, "target": CARROT_BEEF_SOUP_2, "time": 30, + {"source": CARROT_BEEF_SOUP_1, "target": CARROT_BEEF_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_BEEF_SOUP_2, "target": CARROT_BEEF_SOUP_3, "time": 30, + {"source": CARROT_BEEF_SOUP_2, "target": CARROT_BEEF_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜羊肉汤(60秒/级) - {"source": LAMB_SOUP_WITH_TURNIPS, "target": LAMB_SOUP_WITH_TURNIPS_1, "time": 60, + {"source": LAMB_SOUP_WITH_TURNIPS, "target": LAMB_SOUP_WITH_TURNIPS_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_SOUP_WITH_TURNIPS_1, "target": LAMB_SOUP_WITH_TURNIPS_2, "time": 60, + {"source": LAMB_SOUP_WITH_TURNIPS_1, "target": LAMB_SOUP_WITH_TURNIPS_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_SOUP_WITH_TURNIPS_2, "target": LAMB_SOUP_WITH_TURNIPS_3, "time": 60, + {"source": LAMB_SOUP_WITH_TURNIPS_2, "target": LAMB_SOUP_WITH_TURNIPS_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜排骨汤(60秒/级) - {"source": CARROT_RIBS, "target": CARROT_RIBS_1, "time": 60, + {"source": CARROT_RIBS, "target": CARROT_RIBS_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_RIBS_1, "target": CARROT_RIBS_2, "time": 60, + {"source": CARROT_RIBS_1, "target": CARROT_RIBS_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_RIBS_2, "target": CARROT_RIBS_3, "time": 60, + {"source": CARROT_RIBS_2, "target": CARROT_RIBS_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 清汤羊肉(60秒/级) - {"source": VEGETABLE_BEEF_SOUP, "target": VEGETABLE_BEEF_SOUP_1, "time": 60, + {"source": VEGETABLE_BEEF_SOUP, "target": VEGETABLE_BEEF_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_BEEF_SOUP_1, "target": VEGETABLE_BEEF_SOUP_2, "time": 60, + {"source": VEGETABLE_BEEF_SOUP_1, "target": VEGETABLE_BEEF_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_BEEF_SOUP_2, "target": VEGETABLE_BEEF_SOUP_3, "time": 60, + {"source": VEGETABLE_BEEF_SOUP_2, "target": VEGETABLE_BEEF_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蔬菜牛肉汤(60秒/级) - {"source": VEGETABLE_LAMB_SOUP, "target": VEGETABLE_LAMB_SOUP_1, "time": 60, + {"source": VEGETABLE_LAMB_SOUP, "target": VEGETABLE_LAMB_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_LAMB_SOUP_1, "target": VEGETABLE_LAMB_SOUP_2, "time": 60, + {"source": VEGETABLE_LAMB_SOUP_1, "target": VEGETABLE_LAMB_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_LAMB_SOUP_2, "target": VEGETABLE_LAMB_SOUP_3, "time": 60, + {"source": VEGETABLE_LAMB_SOUP_2, "target": VEGETABLE_LAMB_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蔬菜瘦肉汤(60秒/级) - {"source": VEGETABLE_LEAN_BROTH, "target": VEGETABLE_LEAN_BROTH_1, "time": 60, + {"source": VEGETABLE_LEAN_BROTH, "target": VEGETABLE_LEAN_BROTH_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_LEAN_BROTH_1, "target": VEGETABLE_LEAN_BROTH_2, "time": 60, + {"source": VEGETABLE_LEAN_BROTH_1, "target": VEGETABLE_LEAN_BROTH_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_LEAN_BROTH_2, "target": VEGETABLE_LEAN_BROTH_3, "time": 60, + {"source": VEGETABLE_LEAN_BROTH_2, "target": VEGETABLE_LEAN_BROTH_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蔬菜乱炖(60秒/级) - {"source": VEGETABLE_SSTEW, "target": VEGETABLE_SSTEW_1, "time": 60, + {"source": VEGETABLE_SSTEW, "target": VEGETABLE_SSTEW_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_SSTEW_1, "target": VEGETABLE_SSTEW_2, "time": 60, + {"source": VEGETABLE_SSTEW_1, "target": VEGETABLE_SSTEW_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_SSTEW_2, "target": VEGETABLE_SSTEW_3, "time": 60, + {"source": VEGETABLE_SSTEW_2, "target": VEGETABLE_SSTEW_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜土豆牛骨汤(60秒/级) - {"source": BEEF_BONE_BROTH, "target": BEEF_BONE_BROTH_1, "time": 60, + {"source": BEEF_BONE_BROTH, "target": BEEF_BONE_BROTH_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": BEEF_BONE_BROTH_1, "target": BEEF_BONE_BROTH_2, "time": 60, + {"source": BEEF_BONE_BROTH_1, "target": BEEF_BONE_BROTH_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": BEEF_BONE_BROTH_2, "target": BEEF_BONE_BROTH_3, "time": 60, + {"source": BEEF_BONE_BROTH_2, "target": BEEF_BONE_BROTH_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 土豆胡萝卜炖羊肉(60秒/级) - {"source": LAMB_STEW, "target": LAMB_STEW_1, "time": 60, + {"source": LAMB_STEW, "target": LAMB_STEW_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_STEW_1, "target": LAMB_STEW_2, "time": 60, + {"source": LAMB_STEW_1, "target": LAMB_STEW_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_STEW_2, "target": LAMB_STEW_3, "time": 60, + {"source": LAMB_STEW_2, "target": LAMB_STEW_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜土豆羊排汤(60秒/级) - {"source": VEGETABLE_POTATOES_LAMBSTEAK, "target": LAMB_CHOP_SOUP_1, "time": 60, + {"source": VEGETABLE_POTATOES_LAMBSTEAK, "target": LAMB_CHOP_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_CHOP_SOUP_1, "target": LAMB_CHOP_SOUP_2, "time": 60, + {"source": LAMB_CHOP_SOUP_1, "target": LAMB_CHOP_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": LAMB_CHOP_SOUP_2, "target": LAMB_CHOP_SOUP_3, "time": 60, + {"source": LAMB_CHOP_SOUP_2, "target": LAMB_CHOP_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜鳕鱼汤(60秒/级) - {"source": CARROT_COD_SOUP, "target": CARROT_COD_SOUP_1, "time": 60, + {"source": CARROT_COD_SOUP, "target": CARROT_COD_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_COD_SOUP_1, "target": CARROT_COD_SOUP_2, "time": 60, + {"source": CARROT_COD_SOUP_1, "target": CARROT_COD_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_COD_SOUP_2, "target": CARROT_COD_SOUP_3, "time": 60, + {"source": CARROT_COD_SOUP_2, "target": CARROT_COD_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 胡萝卜鲑鱼汤(60秒/级) - {"source": CARROT_FISH_SOUP, "target": CARROT_FISH_SOUP_1, "time": 60, + {"source": CARROT_FISH_SOUP, "target": CARROT_FISH_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_FISH_SOUP_1, "target": CARROT_FISH_SOUP_2, "time": 60, + {"source": CARROT_FISH_SOUP_1, "target": CARROT_FISH_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CARROT_FISH_SOUP_2, "target": CARROT_FISH_SOUP_3, "time": 60, + {"source": CARROT_FISH_SOUP_2, "target": CARROT_FISH_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蛋花鳕鱼汤(60秒/级) - {"source": EGG_COD_SOUP, "target": EGG_COD_SOUP_1, "time": 60, + {"source": EGG_COD_SOUP, "target": EGG_COD_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": EGG_COD_SOUP_1, "target": EGG_COD_SOUP_2, "time": 60, + {"source": EGG_COD_SOUP_1, "target": EGG_COD_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": EGG_COD_SOUP_2, "target": EGG_COD_SOUP_3, "time": 60, + {"source": EGG_COD_SOUP_2, "target": EGG_COD_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 瘦肉蛋花汤(30秒/级, 四段) - {"source": NORI_EGG_SOUP, "target": NORI_EGG_SOUP_0, "time": 30, + {"source": NORI_EGG_SOUP, "target": NORI_EGG_SOUP_0, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": NORI_EGG_SOUP_0, "target": NORI_EGG_SOUP_1, "time": 30, + {"source": NORI_EGG_SOUP_0, "target": NORI_EGG_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": NORI_EGG_SOUP_1, "target": NORI_EGG_SOUP_2, "time": 30, + {"source": NORI_EGG_SOUP_1, "target": NORI_EGG_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": NORI_EGG_SOUP_2, "target": NORI_EGG_SOUP_3, "time": 30, + {"source": NORI_EGG_SOUP_2, "target": NORI_EGG_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 豆腐鲑鱼汤(60秒/级, 生=tufusoupb) - {"source": TOFU_FISH_SOUP_RAW, "target": TOFU_FISH_SOUP_1, "time": 60, + {"source": TOFU_FISH_SCALLION, "target": TOFU_FISH_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": TOFU_FISH_SOUP_1, "target": TOFU_FISH_SOUP_2, "time": 60, + {"source": TOFU_FISH_SOUP_1, "target": TOFU_FISH_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": TOFU_FISH_SOUP_2, "target": TOFU_FISH_SOUP_3, "time": 60, + {"source": TOFU_FISH_SOUP_2, "target": TOFU_FISH_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蘑菇炖鸡(90秒/级) - {"source": CHICKEN_STEW_MUSHROOMS, "target": CHICKEN_STEW_MUSHROOMS_1, "time": 90, + {"source": CHICKEN_STEW_MUSHROOMS, "target": CHICKEN_STEW_MUSHROOMS_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CHICKEN_STEW_MUSHROOMS_1, "target": CHICKEN_STEW_MUSHROOMS_2, "time": 90, + {"source": CHICKEN_STEW_MUSHROOMS_1, "target": CHICKEN_STEW_MUSHROOMS_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": CHICKEN_STEW_MUSHROOMS_2, "target": CHICKEN_STEW_MUSHROOMS_3, "time": 90, + {"source": CHICKEN_STEW_MUSHROOMS_2, "target": CHICKEN_STEW_MUSHROOMS_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 猪蹄汤(30秒/级, 加土豆->三分熟->七分熟->全熟) - {"source": RAW_PIG_FOOD_SOUP_2, "target": RAW_PIG_FOOD_SOUP_3, "time": 30, + {"source": RAW_PIG_FOOD_SOUP_2, "target": RAW_PIG_FOOD_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": RAW_PIG_FOOD_SOUP_3, "target": RAW_PIG_FOOD_SOUP_4, "time": 30, + {"source": RAW_PIG_FOOD_SOUP_3, "target": RAW_PIG_FOOD_SOUP_4, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": RAW_PIG_FOOD_SOUP_4, "target": RAW_PIG_FOOD_SOUP_5, "time": 30, + {"source": RAW_PIG_FOOD_SOUP_4, "target": RAW_PIG_FOOD_SOUP_5, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 羊肉泡馍汤(单级30秒) - {"source": ROUJIAMO_SOUP_0, "target": ROUJIAMO_SOUP_1, "time": 30, + {"source": ROUJIAMO_SOUP_0, "target": ROUJIAMO_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 生面汤(单级60秒) - {"source": RAW_NOODLE_SOUP, "target": COOKED_NOODLE_SOUP, "time": 60, + {"source": RAW_NOODLE_SOUP, "target": COOKED_NOODLE_SOUP, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 饺子汤(60秒/级) - {"source": DUMPLINGS_SOUP_0, "target": DUMPLINGS_SOUP_1, "time": 60, + {"source": DUMPLINGS_SOUP_0, "target": DUMPLINGS_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": DUMPLINGS_SOUP_1, "target": DUMPLINGS_SOUP_2, "time": 60, + {"source": DUMPLINGS_SOUP_1, "target": DUMPLINGS_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 生米锅(一级90秒, 形态随机) - {"source": RAW_RICE_POT, "time": 90, "below": [LIT_STOVE], "autoStart": True, + {"source": RAW_RICE_POT, "time": 1, "below": [LIT_STOVE], "autoStart": True, "randomTargets": [RICE_POT_1, RICE_POT_2, RICE_POT_3]}, # 煮鸡蛋(单级60秒) - {"source": RAW_EGG_SOUP, "target": COOKED_EGG_SOUP, "time": 60, + {"source": RAW_EGG_SOUP, "target": COOKED_EGG_SOUP, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 煮豆腐(单级60秒) - {"source": BEANCURD_SOUP_0, "target": BEANCURD_SOUP_1, "time": 60, + {"source": BEANCURD_SOUP_0, "target": BEANCURD_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, # 蔬菜鱼片汤(60秒/级, 3级) - {"source": VEGETABLE_FISH_SOUP_0, "target": VEGETABLE_FISH_SOUP_1, "time": 60, + {"source": VEGETABLE_FISH_SOUP_0, "target": VEGETABLE_FISH_SOUP_1, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_FISH_SOUP_1, "target": VEGETABLE_FISH_SOUP_2, "time": 60, + {"source": VEGETABLE_FISH_SOUP_1, "target": VEGETABLE_FISH_SOUP_2, "time": 1, "below": [LIT_STOVE], "autoStart": True}, - {"source": VEGETABLE_FISH_SOUP_2, "target": VEGETABLE_FISH_SOUP_3, "time": 60, + {"source": VEGETABLE_FISH_SOUP_2, "target": VEGETABLE_FISH_SOUP_3, "time": 1, "below": [LIT_STOVE], "autoStart": True}, ] diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/service/TangguoService.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/service/TangguoService.py index 752cc24..bcc373f 100644 --- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/service/TangguoService.py +++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/tangguo/service/TangguoService.py @@ -137,29 +137,21 @@ class TangguoService(BlueFoxServerSystem): for src, r in self._timerBySrc.items(): self.timerSources.add(src) self.featureBlocks.add(src) # 登记右键路由, 空手右键才分发到这里 - total, stages = self._timerTotal[src] # total = 从当前级到终点剩余秒数 - curLv, totLv = self._timerStages.get(src, (1, 1)) - lvTip = "(第%d级/共%d级)" % (curLv, totLv) if totLv > 1 else "" - if len(stages) == 1: - perTip = "" - elif len(set(stages)) == 1: - perTip = "每级%d秒" % stages[0] - else: - perTip = "先%d秒，再%s" % (stages[0], "，".join("%d秒" % s for s in stages[1:])) - perStr = (", " + perTip) if perTip else "" + # 【提示不再报秒数】计时已统一为 1 秒/级, 秒数信息无意义, 只提示成品 if r.get("randomTargets"): - tip = "§a开始煮饭%s: 还需%d秒%s, 计时结束变成 熟米饭(形态随机)" % (lvTip, total, perStr) - t2 = "§e正在煮饭中%s: 还需%d秒%s, 计时结束变成 熟米饭(形态随机)" % (lvTip, total, perStr) + tip = "§a开始煮饭, 计时结束变成 熟米饭(形态随机)" + t2 = "§e正在煮饭, 计时结束变成 熟米饭(形态随机)" else: endBlock = self._timerTerminal(src) endName = self._finalNames.get(endBlock, "") if endBlock else "" act = self._finalInfo.get(endBlock) if endBlock else None actStr = (", " + act) if act else "" - base = "还需%d秒%s" % (total, perStr) if endName: - base += ", 计时结束变成 %s%s" % (endName, actStr) - tip = "§a开始熬制%s: %s" % (lvTip, base) - t2 = "§e正在熬制中%s: %s" % (lvTip, base) + base = "计时结束变成 %s%s" % (endName, actStr) + else: + base = "计时结束自动变成成品" + tip = "§a开始熬制: %s" % base + t2 = "§e正在熬制: %s" % base self.startTimerTips[src] = tip self.timingTips[src] = t2 diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/youguo/YouguoData.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/youguo/YouguoData.py index 0ff1161..f8b0392 100644 --- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/youguo/YouguoData.py +++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/youguo/YouguoData.py @@ -84,27 +84,27 @@ SWITCH_RULES = [ {"block": OILPOT_1, "item": BREADED_CHICKEN, "target": CHICKEN_0, "consume": 1, "startTimer": CHICKEN_0, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入裹粉鸡块，开始炸制共90秒，先60秒半熟，再30秒熟，计时结束变成 炸鸡块(熟)"}, + "tip": "§a放入裹粉鸡块，开始炸制, 计时结束变成 炸鸡块(熟)"}, {"block": OILPOT_1, "item": BREADED_PORK, "target": PORK_0, "consume": 1, "startTimer": PORK_0, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入裹粉猪肉，开始炸制共90秒，先60秒半熟，再30秒熟，计时结束变成 炸猪排(熟)"}, + "tip": "§a放入裹粉猪肉，开始炸制, 计时结束变成 炸猪排(熟)"}, {"block": OILPOT_1, "item": BREADED_FRIES, "target": FRIES_0, "consume": 3, "startTimer": FRIES_0, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入裹粉薯条x3，开始炸制共90秒，先60秒半熟，再30秒熟，计时结束变成 炸薯条(熟)"}, + "tip": "§a放入裹粉薯条x3，开始炸制, 计时结束变成 炸薯条(熟)"}, {"block": OILPOT_1, "item": BREADED_FISH, "target": FISH_0, "consume": 1, "startTimer": FISH_0, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入裹粉鱼，开始炸制共90秒，先60秒半熟，再30秒熟，计时结束变成 炸鱼块(熟)"}, + "tip": "§a放入裹粉鱼，开始炸制, 计时结束变成 炸鱼块(熟)"}, {"block": OILPOT_1, "item": BREADED_TEMPURA, "target": TEMPURA_1, "consume": 4, "startTimer": TEMPURA_1, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入裹粉天妇罗x4, 开始炸制(共60秒); 计时结束变成 炸天妇罗(熟)"}, + "tip": "§a放入裹粉天妇罗x4, 开始炸制, 计时结束变成 炸天妇罗(熟)"}, {"block": OILPOT_1, "item": DUMPLINGS, "target": DUMPLING_1, "consume": 3, "startTimer": DUMPLING_1, "needBelow": LIT_STOVE, "belowTip": "§c油锅需要放在点燃的炉灶上", - "tip": "§a放入生饺子x3, 开始炸制(共60秒); 计时结束变成 炸饺子(熟)"}, + "tip": "§a放入生饺子x3, 开始炸制, 计时结束变成 炸饺子(熟)"}, # ---- 三、出锅(熟炸物 + 盘子 -> 掉落盘装成品) ---- {"block": CHICKEN_2, "item": PLATE, "action": "take_out", @@ -127,30 +127,30 @@ SWITCH_RULES = [ # ============================================================================ TIMER_RULES = [ # 炸鸡块: 生->半熟60秒, 半熟->熟30秒 - {"source": CHICKEN_0, "target": CHICKEN_1, "time": 60, - "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鸡块半熟了, 继续炸(30秒)"}, - {"source": CHICKEN_1, "target": CHICKEN_2, "time": 30, + {"source": CHICKEN_0, "target": CHICKEN_1, "time": 2, + "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鸡块半熟了, 继续炸"}, + {"source": CHICKEN_1, "target": CHICKEN_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鸡块炸好了, 手持盘子右键取出"}, # 炸猪排 - {"source": PORK_0, "target": PORK_1, "time": 60, - "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸猪排半熟了, 继续炸(30秒)"}, - {"source": PORK_1, "target": PORK_2, "time": 30, + {"source": PORK_0, "target": PORK_1, "time": 2, + "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸猪排半熟了, 继续炸"}, + {"source": PORK_1, "target": PORK_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸猪排炸好了, 手持盘子右键取出"}, # 炸薯条 - {"source": FRIES_0, "target": FRIES_1, "time": 60, - "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸薯条半熟了, 继续炸(30秒)"}, - {"source": FRIES_1, "target": FRIES_2, "time": 30, + {"source": FRIES_0, "target": FRIES_1, "time": 2, + "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸薯条半熟了, 继续炸"}, + {"source": FRIES_1, "target": FRIES_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸薯条炸好了, 手持盘子右键取出"}, # 炸鱼块 - {"source": FISH_0, "target": FISH_1, "time": 60, - "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鱼块半熟了, 继续炸(30秒)"}, - {"source": FISH_1, "target": FISH_2, "time": 30, + {"source": FISH_0, "target": FISH_1, "time": 2, + "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鱼块半熟了, 继续炸"}, + {"source": FISH_1, "target": FISH_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸鱼块炸好了, 手持盘子右键取出"}, # 炸天妇罗(单级: 生->熟60秒) - {"source": TEMPURA_1, "target": TEMPURA_2, "time": 60, + {"source": TEMPURA_1, "target": TEMPURA_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e天妇罗炸好了, 手持盘子右键取出"}, # 炸饺子(单级: 生->熟60秒, 油锅+饺子合体) - {"source": DUMPLING_1, "target": DUMPLING_2, "time": 60, + {"source": DUMPLING_1, "target": DUMPLING_2, "time": 2, "below": [LIT_STOVE], "autoStart": True, "doneTip": "§e炸饺子炸好了, 手持盘子右键取出"}, ]