From 5e6d8ce5e19e6ec7826b084c40216f13a6c9316f Mon Sep 17 00:00:00 2001 From: muskit <15199219+muskit@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:32:01 -0700 Subject: [PATCH] fix talent_lists --- src/talent_lists.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/talent_lists.py b/src/talent_lists.py index c134933..6f32a37 100644 --- a/src/talent_lists.py +++ b/src/talent_lists.py @@ -1,11 +1,11 @@ import util -holo_en = dict[int, str] -holo_id = dict[int, str] -niji_en = dict[int, str] -niji_exid = dict[int, str] -talents = dict[int, str] -talents_company = dict[int, str] +holo_en: dict[int, str] = dict() +holo_id: dict[int, str] = dict() +niji_en: dict[int, str] = dict() +niji_exid: dict[int, str] = dict() +talents: dict[int, str] = dict() +talents_company: dict[int, str] = dict() test_talents = dict() @@ -48,7 +48,7 @@ def is_holo(id: int) -> bool: return id in holo_en or id in holo_id def is_cross_company(id1: int, id2: int): - return is_niji(id1) == is_holo(id2) + return (is_niji(id1) and is_holo(id2)) or (is_holo(id1) and is_niji(id2)) # For filtered stream # DEPRECATED: thx elon