diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 57ebd8219..80412d6c1 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -9727,7 +9727,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] }, "Option2": { @@ -9741,7 +9743,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] }, "Option3": { @@ -9755,7 +9759,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] }, "Option4": { @@ -9769,7 +9775,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] }, "Character1": { @@ -10109,9 +10117,7 @@ 4, 5, 6, - 7, - 8, - 9 + 7 ] }, "Option2": { @@ -10125,9 +10131,7 @@ 4, 5, 6, - 7, - 8, - 9 + 7 ] }, "Character1": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index f2322371f..05500fec1 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -503,16 +503,16 @@ Awaken: _Island: IslandOption4: &IslandOption4 value: 0 - option: [ 0, 1, 2, 3, 4] + option: [ 0, 1, 2, 3, 4 ] IslandOption5: &IslandOption5 value: 0 - option: [ 0, 1, 2, 3, 4, 5] + option: [ 0, 1, 2, 3, 4, 5 ] IslandOption6: &IslandOption6 value: 0 - option: [ 0, 1, 2, 3, 4, 5, 6] + option: [ 0, 1, 2, 3, 4, 5, 6 ] IslandOption7: &IslandOption7 value: 0 - option: [ 0, 1, 2, 3, 4, 5, 6, 7] + option: [ 0, 1, 2, 3, 4, 5, 6, 7 ] IslandOption8: &IslandOption8 value: 0 option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ] @@ -647,10 +647,10 @@ Island5: SecondaryCharacter4: *IslandSecondaryCharacter Island6: Receive: false - Option1: *IslandOption7 - Option2: *IslandOption7 - Option3: *IslandOption7 - Option4: *IslandOption7 + Option1: *IslandOption9 + Option2: *IslandOption9 + Option3: *IslandOption9 + Option4: *IslandOption9 Character1: *IslandCharacter SecondaryCharacter1: *IslandSecondaryCharacter Character2: *IslandCharacter @@ -661,8 +661,8 @@ Island6: SecondaryCharacter4: *IslandSecondaryCharacter Island7: Receive: false - Option1: *IslandOption9 - Option2: *IslandOption9 + Option1: *IslandOption7 + Option2: *IslandOption7 Character1: *IslandCharacter SecondaryCharacter1: *IslandSecondaryCharacter Character2: *IslandCharacter diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 0f4f914e5..992966749 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -354,10 +354,10 @@ class GeneratedConfig: # Group `Island6` Island6_Receive = False - Island6_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 - Island6_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 - Island6_Option3 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 - Island6_Option4 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 + Island6_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 + Island6_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 + Island6_Option3 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 + Island6_Option4 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 Island6_Character1 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune Island6_SecondaryCharacter1 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune Island6_Character2 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune @@ -369,8 +369,8 @@ class GeneratedConfig: # Group `Island7` Island7_Receive = False - Island7_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 - Island7_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 + Island7_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 + Island7_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 Island7_Character1 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune Island7_SecondaryCharacter1 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune Island7_Character2 = 'manjuu' # manjuu, saratoga, new_jersey, tashkent, lemalin, shimakaze, akashi, ying_swei, chao_ho, william_d_porter, chen_hai, hood, prinz_eugen, tb, oceana, explorer, unicorn, cheshire, amagi_chan, helena, atago, friedrich_der_grobe, javelin, laffey, takao, yat_sen, fei_yuen, august_von_parseval, anchorage, belfast, chang_feng, leonardo_da_vinci, mogador, royal_fortune diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 4f596b30c..45e089d1d 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -3519,7 +3519,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island6.Option2.name", @@ -3531,7 +3533,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option3": { "name": "Island6.Option3.name", @@ -3543,7 +3547,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option4": { "name": "Island6.Option4.name", @@ -3555,7 +3561,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Character1": { "name": "Island6.Character1.name", @@ -3881,9 +3889,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Option2": { "name": "Island7.Option2.name", @@ -3895,9 +3901,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Character1": { "name": "Island7.Character1.name", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index de28ffe45..fcc78a22e 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -3519,7 +3519,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island6.Option2.name", @@ -3531,7 +3533,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option3": { "name": "Island6.Option3.name", @@ -3543,7 +3547,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option4": { "name": "Island6.Option4.name", @@ -3555,7 +3561,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Character1": { "name": "Island6.Character1.name", @@ -3881,9 +3889,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Option2": { "name": "Island7.Option2.name", @@ -3895,9 +3901,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Character1": { "name": "Island7.Character1.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 256ff1550..1e7ca9953 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -3513,49 +3513,57 @@ "name": "第 1 格生产物品", "help": "", "0": "不生产", - "1": "苹果", - "2": "柑橘", - "3": "香蕉", - "4": "芒果", - "5": "柠檬", - "6": "牛油果", - "7": "橡胶" + "1": "秋月梨", + "2": "柿子", + "3": "苹果", + "4": "柑橘", + "5": "香蕉", + "6": "芒果", + "7": "柠檬", + "8": "牛油果", + "9": "橡胶" }, "Option2": { "name": "第 2 格生产物品", "help": "", "0": "不生产", - "1": "苹果", - "2": "柑橘", - "3": "香蕉", - "4": "芒果", - "5": "柠檬", - "6": "牛油果", - "7": "橡胶" + "1": "秋月梨", + "2": "柿子", + "3": "苹果", + "4": "柑橘", + "5": "香蕉", + "6": "芒果", + "7": "柠檬", + "8": "牛油果", + "9": "橡胶" }, "Option3": { "name": "第 3 格生产物品", "help": "", "0": "不生产", - "1": "苹果", - "2": "柑橘", - "3": "香蕉", - "4": "芒果", - "5": "柠檬", - "6": "牛油果", - "7": "橡胶" + "1": "秋月梨", + "2": "柿子", + "3": "苹果", + "4": "柑橘", + "5": "香蕉", + "6": "芒果", + "7": "柠檬", + "8": "牛油果", + "9": "橡胶" }, "Option4": { "name": "第 4 格生产物品", "help": "", "0": "不生产", - "1": "苹果", - "2": "柑橘", - "3": "香蕉", - "4": "芒果", - "5": "柠檬", - "6": "牛油果", - "7": "橡胶" + "1": "秋月梨", + "2": "柿子", + "3": "苹果", + "4": "柑橘", + "5": "香蕉", + "6": "芒果", + "7": "柠檬", + "8": "牛油果", + "9": "橡胶" }, "Character1": { "name": "第 1 格首选角色", @@ -3875,29 +3883,25 @@ "name": "第 1 格生产物品", "help": "", "0": "不生产", - "1": "番茄", - "2": "黄瓜", - "3": "亚麻", - "4": "草莓", - "5": "棉花", - "6": "茶叶", - "7": "薰衣草", - "8": "胡萝卜", - "9": "洋葱" + "1": "亚麻", + "2": "草莓", + "3": "棉花", + "4": "茶叶", + "5": "薰衣草", + "6": "胡萝卜", + "7": "洋葱" }, "Option2": { "name": "第 2 格生产物品", "help": "", "0": "不生产", - "1": "番茄", - "2": "黄瓜", - "3": "亚麻", - "4": "草莓", - "5": "棉花", - "6": "茶叶", - "7": "薰衣草", - "8": "胡萝卜", - "9": "洋葱" + "1": "亚麻", + "2": "草莓", + "3": "棉花", + "4": "茶叶", + "5": "薰衣草", + "6": "胡萝卜", + "7": "洋葱" }, "Character1": { "name": "第 1 格首选角色", @@ -4065,8 +4069,8 @@ "name": "第 1 格生产物品", "help": "", "0": "不生产", - "1": "苋菜饭团", - "2": "番茄炒蛋", + "1": "柿子饼", + "2": "松茸鸡汤", "3": "豆腐", "4": "肉末烧豆腐", "5": "蛋包饭", @@ -4082,8 +4086,8 @@ "name": "第 2 格生产物品", "help": "", "0": "不生产", - "1": "苋菜饭团", - "2": "番茄炒蛋", + "1": "柿子饼", + "2": "松茸鸡汤", "3": "豆腐", "4": "肉末烧豆腐", "5": "蛋包饭", @@ -4261,8 +4265,8 @@ "name": "第 1 格生产物品", "help": "", "0": "不生产", - "1": "黄瓜汁", - "2": "西瓜汁", + "1": "胡萝卜秋梨汁", + "2": "菊花茶", "3": "苹果汁", "4": "香蕉芒果汁", "5": "蜂蜜柠檬水", @@ -4277,8 +4281,8 @@ "name": "第 2 格生产物品", "help": "", "0": "不生产", - "1": "黄瓜汁", - "2": "西瓜汁", + "1": "胡萝卜秋梨汁", + "2": "菊花茶", "3": "苹果汁", "4": "香蕉芒果汁", "5": "蜂蜜柠檬水", @@ -5385,8 +5389,8 @@ "name": "第 1 格生产物品", "help": "", "0": "不生产", - "1": "茉莉精油", - "2": "夏季花束", + "1": "秋季花束", + "2": "花生油", "3": "布料", "4": "皮革", "5": "绳索", @@ -5399,8 +5403,8 @@ "name": "第 2 格生产物品", "help": "", "0": "不生产", - "1": "茉莉精油", - "2": "夏季花束", + "1": "秋季花束", + "2": "花生油", "3": "布料", "4": "皮革", "5": "绳索", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index e591106c1..9ce1e273c 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -3519,7 +3519,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island6.Option2.name", @@ -3531,7 +3533,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option3": { "name": "Island6.Option3.name", @@ -3543,7 +3547,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option4": { "name": "Island6.Option4.name", @@ -3555,7 +3561,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Character1": { "name": "Island6.Character1.name", @@ -3881,9 +3889,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Option2": { "name": "Island7.Option2.name", @@ -3895,9 +3901,7 @@ "4": "4", "5": "5", "6": "6", - "7": "7", - "8": "8", - "9": "9" + "7": "7" }, "Character1": { "name": "Island7.Character1.name", diff --git a/module/island/project_data.py b/module/island/project_data.py index e7c36f6b9..1bea58192 100644 --- a/module/island/project_data.py +++ b/module/island/project_data.py @@ -26,36 +26,36 @@ __items_data_cn = { 1: '自然之木', 2: '实用之木', 3: '精选之木', 4: '典雅之木', }, # autumn - # 6: { - # 1: '秋月梨', 2: '柿子', 3: '苹果', 4: '柑橘', 5: '香蕉', 6: '芒果', - # 7: '柠檬', 8: '牛油果', 9: '橡胶', - # }, - # spring & summer 6: { - 1: '苹果', 2: '柑橘', 3: '香蕉', 4: '芒果', 5: '柠檬', 6: '牛油果', - 7: '橡胶', + 1: '秋月梨', 2: '柿子', 3: '苹果', 4: '柑橘', 5: '香蕉', 6: '芒果', + 7: '柠檬', 8: '牛油果', 9: '橡胶', }, - # autumn - # 7: { - # 1: '亚麻', 2: '草莓', 3: '棉花', 4: '茶叶', 5: '薰衣草', 6: '胡萝卜', - # 7: '洋葱', + # spring & summer + # 6: { + # 1: '苹果', 2: '柑橘', 3: '香蕉', 4: '芒果', 5: '柠檬', 6: '牛油果', + # 7: '橡胶', # }, + # autumn + 7: { + 1: '亚麻', 2: '草莓', 3: '棉花', 4: '茶叶', 5: '薰衣草', 6: '胡萝卜', + 7: '洋葱', + }, # spring # 7: { # 1: '芦笋', 2: '凤梨', 3: '亚麻', 4: '草莓', 5: '棉花', 6: '茶叶', # 7: '薰衣草', 8: '胡萝卜', 9: '洋葱', # }, # summer - 7: { - 1: '番茄', 2: '黄瓜', 3: '亚麻', 4: '草莓', 5: '棉花', 6: '茶叶', - 7: '薰衣草', 8: '胡萝卜', 9: '洋葱', - }, - # autumn - # 8: { - # 1: '柿子饼', 2: '松茸鸡汤', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', - # 6: '白菜豆腐汤', 7: '蔬菜沙拉', 8: '炸鱼薯条', 9: '洋葱蒸鱼', 10: '佛跳墙', - # 11: '经典豆腐套餐', 12: '绵玉定食', + # 7: { + # 1: '番茄', 2: '黄瓜', 3: '亚麻', 4: '草莓', 5: '棉花', 6: '茶叶', + # 7: '薰衣草', 8: '胡萝卜', 9: '洋葱', # }, + # autumn + 8: { + 1: '柿子饼', 2: '松茸鸡汤', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', + 6: '白菜豆腐汤', 7: '蔬菜沙拉', 8: '炸鱼薯条', 9: '洋葱蒸鱼', 10: '佛跳墙', + 11: '经典豆腐套餐', 12: '绵玉定食', + }, # spring # 8: { # 1: '凉拌双笋', 2: '芦笋炒虾仁', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', @@ -63,17 +63,17 @@ __items_data_cn = { # 11: '经典豆腐套餐', 12: '绵玉定食', # }, # summer - 8: { - 1: '苋菜饭团', 2: '番茄炒蛋', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', - 6: '白菜豆腐汤', 7: '蔬菜沙拉', 8: '炸鱼薯条', 9: '洋葱蒸鱼', 10: '佛跳墙', - 11: '经典豆腐套餐', 12: '绵玉定食', - }, - # autumn - # 9: { - # 1: '胡萝卜秋梨汁', 2: '菊花茶', 3: '苹果汁', 4: '香蕉芒果汁', - # 5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙', - # 9: '花香果韵', 10: '缤纷果乐园', 11: '阳光蜜水', + # 8: { + # 1: '苋菜饭团', 2: '番茄炒蛋', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', + # 6: '白菜豆腐汤', 7: '蔬菜沙拉', 8: '炸鱼薯条', 9: '洋葱蒸鱼', 10: '佛跳墙', + # 11: '经典豆腐套餐', 12: '绵玉定食', # }, + # autumn + 9: { + 1: '胡萝卜秋梨汁', 2: '菊花茶', 3: '苹果汁', 4: '香蕉芒果汁', + 5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙', + 9: '花香果韵', 10: '缤纷果乐园', 11: '阳光蜜水', + }, # spring # 9: { # 1: '鲜榨菠萝汁', 2: '迎春花茶', 3: '苹果汁', 4: '香蕉芒果汁', @@ -81,11 +81,11 @@ __items_data_cn = { # 9: '花香果韵', 10: '缤纷果乐园', 11: '阳光蜜水', # }, # summer - 9: { - 1: '黄瓜汁', 2: '西瓜汁', 3: '苹果汁', 4: '香蕉芒果汁', - 5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙', - 9: '花香果韵', 10: '缤纷果乐园', 11: '阳光蜜水', - }, + # 9: { + # 1: '黄瓜汁', 2: '西瓜汁', 3: '苹果汁', 4: '香蕉芒果汁', + # 5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙', + # 9: '花香果韵', 10: '缤纷果乐园', 11: '阳光蜜水', + # }, 10: { 1: '玉米杯', 2: '苹果派', 3: '香橙派', 4: '芒果糯米饭', 5: '香蕉可丽饼', 6: '草莓夏洛特', 7: '海鲜饭', 8: '香甜组合', 9: '果园二重奏', @@ -105,20 +105,20 @@ __items_data_cn = { 1: '墨盒', 2: '钟表', 3: '蓄电池', 4: '净水滤芯', }, # autumn - # 15: { - # 1: '秋季花束', 2: '花生油', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', - # 7: '香囊', 8: '鞋靴', 9: '绷带', - # }, + 15: { + 1: '秋季花束', 2: '花生油', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', + 7: '香囊', 8: '鞋靴', 9: '绷带', + }, # spring # 15: { # 1: '袋装荠菜干', 2: '春季花束', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', # 7: '香囊', 8: '鞋靴', 9: '绷带', # }, # summer - 15: { - 1: '茉莉精油', 2: '夏季花束', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', - 7: '香囊', 8: '鞋靴', 9: '绷带', - }, + # 15: { + # 1: '茉莉精油', 2: '夏季花束', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', + # 7: '香囊', 8: '鞋靴', 9: '绷带', + # }, 16: { 1: '欧姆蛋', 2: '冰咖啡', 3: '芝士', 4: '拿铁', 5: '柑橘咖啡', 6: '草莓奶绿', 7: '晨光活力组合', 8: '醒神套餐', 9: '果香双杯乐',