diff --git a/module/config/argument/args.json b/module/config/argument/args.json index bcef6ed7e..04921816c 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -8516,7 +8516,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] }, "Option2": { @@ -8530,7 +8532,9 @@ 4, 5, 6, - 7 + 7, + 8, + 9 ] } }, diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 51919d1b7..628d51bb5 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -626,10 +626,10 @@ Island14: Receive: false Option1: value: 0 - option: [ 0, 1, 2, 3, 4, 5, 6, 7 ] + option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ] Option2: value: 0 - option: [ 0, 1, 2, 3, 4, 5, 6, 7 ] + option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ] Island15: Receive: false Option1: diff --git a/module/config/config_generated.py b/module/config/config_generated.py index e58c8e27d..ca81b3b0a 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -349,8 +349,8 @@ class GeneratedConfig: # Group `Island14` Island14_Receive = False - Island14_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 - Island14_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7 + Island14_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 + Island14_Option2 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # Group `Island15` Island15_Receive = False diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 1dca0599c..c32449882 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -2290,7 +2290,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island14.Option2.name", @@ -2302,7 +2304,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" } }, "Island15": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index c0dc5ec18..1b663630a 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -2290,7 +2290,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island14.Option2.name", @@ -2302,7 +2304,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" } }, "Island15": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index f9276434e..1cd7bffac 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -2012,8 +2012,8 @@ "2": "草莓", "3": "棉花", "4": "茶叶", - "5": "胡萝卜", - "6": "薰衣草", + "5": "薰衣草", + "6": "胡萝卜", "7": "洋葱" }, "Option2": { @@ -2024,8 +2024,8 @@ "2": "草莓", "3": "棉花", "4": "茶叶", - "5": "胡萝卜", - "6": "薰衣草", + "5": "薰衣草", + "6": "胡萝卜", "7": "洋葱" } }, @@ -2045,10 +2045,10 @@ "1": "柿子饼", "2": "松茸鸡汤", "3": "豆腐", - "4": "蛋包饭", - "5": "白菜豆腐汤", - "6": "蔬菜沙拉", - "7": "肉末烧豆腐", + "4": "肉末烧豆腐", + "5": "蛋包饭", + "6": "白菜豆腐汤", + "7": "蔬菜沙拉", "8": "绵玉定食", "9": "经典豆腐套餐" }, @@ -2059,10 +2059,10 @@ "1": "柿子饼", "2": "松茸鸡汤", "3": "豆腐", - "4": "蛋包饭", - "5": "白菜豆腐汤", - "6": "蔬菜沙拉", - "7": "肉末烧豆腐", + "4": "肉末烧豆腐", + "5": "蛋包饭", + "6": "白菜豆腐汤", + "7": "蔬菜沙拉", "8": "绵玉定食", "9": "经典豆腐套餐" } @@ -2160,10 +2160,10 @@ "name": "第一个格子生产物品", "help": "", "0": "不生产", - "1": "胡萝卜厚蛋烧", + "1": "炭烤肉串", "2": "禽肉土豆拼盘", - "3": "炭烤肉串", - "4": "爆炒禽肉", + "3": "爆炒禽肉", + "4": "胡萝卜厚蛋烧", "5": "汉堡肉饭", "6": "烤肉狂欢", "7": "能量双拼套餐" @@ -2172,10 +2172,10 @@ "name": "第二个格子生产物品", "help": "", "0": "不生产", - "1": "胡萝卜厚蛋烧", + "1": "炭烤肉串", "2": "禽肉土豆拼盘", - "3": "炭烤肉串", - "4": "爆炒禽肉", + "3": "爆炒禽肉", + "4": "胡萝卜厚蛋烧", "5": "汉堡肉饭", "6": "烤肉狂欢", "7": "能量双拼套餐" @@ -2259,7 +2259,7 @@ "1": "墨盒", "2": "钟表", "3": "蓄电池", - "4": "滤水器芯" + "4": "净水滤芯" }, "Option2": { "name": "第二个格子生产物品", @@ -2268,7 +2268,7 @@ "1": "墨盒", "2": "钟表", "3": "蓄电池", - "4": "滤水器芯" + "4": "净水滤芯" } }, "Island14": { @@ -2284,25 +2284,29 @@ "name": "第一个格子生产物品", "help": "", "0": "不生产", - "1": "布料", - "2": "皮革", - "3": "绳索", - "4": "手套", - "5": "香囊", - "6": "鞋靴", - "7": "绷带" + "1": "秋季花束", + "2": "花生油", + "3": "布料", + "4": "皮革", + "5": "绳索", + "6": "手套", + "7": "香囊", + "8": "鞋靴", + "9": "绷带" }, "Option2": { "name": "第二个格子生产物品", "help": "", "0": "不生产", - "1": "布料", - "2": "皮革", - "3": "绳索", - "4": "手套", - "5": "香囊", - "6": "鞋靴", - "7": "绷带" + "1": "秋季花束", + "2": "花生油", + "3": "布料", + "4": "皮革", + "5": "绳索", + "6": "手套", + "7": "香囊", + "8": "鞋靴", + "9": "绷带" } }, "Island15": { @@ -2324,9 +2328,9 @@ "4": "拿铁", "5": "柑橘咖啡", "6": "草莓奶绿", - "7": "果香双杯乐", - "8": "晨光活力组合", - "9": "醒神套餐" + "7": "晨光活力组合", + "8": "醒神套餐", + "9": "果香双杯乐" }, "Option2": { "name": "第二个格子生产物品", @@ -2338,9 +2342,9 @@ "4": "拿铁", "5": "柑橘咖啡", "6": "草莓奶绿", - "7": "果香双杯乐", - "8": "晨光活力组合", - "9": "醒神套餐" + "7": "晨光活力组合", + "8": "醒神套餐", + "9": "果香双杯乐" } }, "GeneralShop": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index c195d3104..61e3500be 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -2290,7 +2290,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" }, "Option2": { "name": "Island14.Option2.name", @@ -2302,7 +2304,9 @@ "4": "4", "5": "5", "6": "6", - "7": "7" + "7": "7", + "8": "8", + "9": "9" } }, "Island15": { diff --git a/module/island/project_data.py b/module/island/project_data.py index b67267ff7..432754dba 100644 --- a/module/island/project_data.py +++ b/module/island/project_data.py @@ -23,12 +23,12 @@ items_data_cn = { 7: '柠檬', 8: '牛油果', 9: '橡胶', }, 6: { - 1: '亚麻', 2: '草莓', 3: '棉花', 4: '茶叶', 5: '胡萝卜', 6: '薰衣草', + 1: '亚麻', 2: '草莓', 3: '棉花', 4: '茶叶', 5: '薰衣草', 6: '胡萝卜', 7: '洋葱', }, 7: { - 1: '柿子饼', 2: '松茸鸡汤', 3: '豆腐', 4: '蛋包饭', 5: '白菜豆腐汤', - 6: '蔬菜沙拉', 7: '肉末烧豆腐', 8: '绵玉定食', 9: '经典豆腐套餐', + 1: '柿子饼', 2: '松茸鸡汤', 3: '豆腐', 4: '肉末烧豆腐', 5: '蛋包饭', + 6: '白菜豆腐汤', 7: '蔬菜沙拉', 8: '绵玉定食', 9: '经典豆腐套餐', }, 8: { 1: '胡萝卜秋梨汁', 2: '菊花茶', 3: '苹果汁', 4: '香蕉芒果汁', @@ -40,7 +40,7 @@ items_data_cn = { 6: '草莓夏洛特', 7: '果园二重奏', 8: '香甜组合', 9: '莓果香橙甜点组', }, 10: { - 1: '胡萝卜厚蛋烧', 2: '禽肉土豆拼盘', 3: '炭烤肉串', 4: '爆炒禽肉', + 1: '炭烤肉串', 2: '禽肉土豆拼盘', 3: '爆炒禽肉', 4: '胡萝卜厚蛋烧', 5: '汉堡肉饭', 6: '烤肉狂欢', 7: '能量双拼套餐', }, 11: { @@ -50,14 +50,14 @@ items_data_cn = { 1: '炭笔', 2: '电缆', 3: '铁钉', 4: '硫酸', 5: '火药', 6: '刀叉餐具', }, 13: { - 1: '墨盒', 2: '钟表', 3: '蓄电池', 4: '滤水器芯', + 1: '墨盒', 2: '钟表', 3: '蓄电池', 4: '净水滤芯', }, 14: { - 1: '布料', 2: '皮革', 3: '绳索', 4: '手套', 5: '香囊', 6: '鞋靴', - 7: '绷带', + 1: '秋季花束', 2: '花生油', 3: '布料', 4: '皮革', 5: '绳索', 6: '手套', + 7: '香囊', 8: '鞋靴', 9: '绷带', }, 15: { 1: '欧姆蛋', 2: '冰咖啡', 3: '芝士', 4: '拿铁', 5: '柑橘咖啡', - 6: '草莓奶绿', 7: '果香双杯乐', 8: '晨光活力组合', 9: '醒神套餐', + 6: '草莓奶绿', 7: '晨光活力组合', 8: '醒神套餐', 9: '果香双杯乐', }, }