From 036e04acc70e6eee2c7163e7f2667697f5b966b4 Mon Sep 17 00:00:00 2001 From: Shawnsdaddy Date: Wed, 13 Sep 2023 23:28:02 -0700 Subject: [PATCH] =?UTF-8?q?improve=20=E6=8E=92=E7=8F=AD=E8=A1=A8=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/utils/operators.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arknights_mower/utils/operators.py b/arknights_mower/utils/operators.py index 4c3e2aa60..fb4b3f527 100644 --- a/arknights_mower/utils/operators.py +++ b/arknights_mower/utils/operators.py @@ -77,6 +77,8 @@ def init_and_validate(self, update=False): return f'高效组不可用龙舌兰，但书 房间->{room}, 干员->{data.agent}' if data.agent == '菲亚梅塔' and idx == 1: return f'菲亚梅塔不能安排在2号位置 房间->{room}, 干员->{data.agent}' + if data.agent == '菲亚梅塔' and not room.startswith('dorm'): + return f'菲亚梅塔必须安排在宿舍' if data.agent == 'Free' and not room.startswith('dorm'): return f'Free只能安排在宿舍 房间->{room}, 干员->{data.agent}' if data.agent in self.operators and data.agent != "Free": @@ -96,7 +98,7 @@ def init_and_validate(self, update=False): r_count = len(data.replacement) if "龙舌兰" in data.replacement or "但书" in data.replacement: r_count -= 1 - if r_count <= 0 and data.agent != 'Free' and (not room.startswith("dorm")): + if r_count <= 0 and ((data.agent != 'Free' and (not room.startswith("dorm"))) or data.agent == "菲亚梅塔"): missing_replacements.append(data.agent) for _replacement in data.replacement: if _replacement not in agent_list and data.agent != 'Free':