From 5e2d8ef1e7b25208af26fe17fef654c7cb0bd6ca Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 8 Aug 2018 02:48:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=97=90=20=EB=B9=99=EC=9D=98=20=EB=B6=88=EA=B0=80=20=EC=9E=A5?= =?UTF-8?q?=EC=88=98=20=EB=AA=A9=EB=A1=9D=20=EA=B0=9C=EB=85=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/conv_general_stat.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/conv_general_stat.py b/src/conv_general_stat.py index f8099d1c..25db836e 100644 --- a/src/conv_general_stat.py +++ b/src/conv_general_stat.py @@ -230,6 +230,8 @@ with open('%s.json'%xlsxpath, 'wt', encoding='utf-8') as fp: fp.write(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalList])) fp.write('\n ]') + names2 = [] + names3 = [] if '확장 장수 목록' in wb.sheet_names(): generalExList, names2 = extractGeneralList(wb.sheet_by_name('확장 장수 목록'), nationInfo, nationChiefInfo) @@ -240,4 +242,19 @@ with open('%s.json'%xlsxpath, 'wt', encoding='utf-8') as fp: fp.write(',\n "general_ex":[\n ') fp.write(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalExList])) fp.write('\n ]') + + if '빙의 불가 장수 목록' in wb.sheet_names(): + generalNeutralList, names3 = extractGeneralList(wb.sheet_by_name('빙의 불가 장수 목록'), nationInfo, nationChiefInfo) + + for name in names3: + if name in names: + raise RuntimeError('%s가 일반 장수 및 빙의 불가 장수에 모두 있습니다!'%name) + for name in names3: + if name in names2: + raise RuntimeError('%s가 확장 장수 및 빙의 불가 장수에 모두 있습니다!'%name) + + fp.write(',\n "general_neutral":[\n ') + fp.write(',\n '.join([json.dumps(general, ensure_ascii=False) for general in generalNeutralList])) + fp.write('\n ]') + fp.write('\n}') \ No newline at end of file