暗澹に複数hashを定義

fgosc · May 2, 2022 · fec7ea1 · fec7ea1
1 parent b4c8b45
commit fec7ea1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/fgogachacnt.py b/fgogachacnt.py
@@ -822,6 +822,9 @@ def classify_ce(self):
         if len(itemfiles) > 0:
             itemfiles = sorted(itemfiles.items(), key=lambda x: x[1])
             item = next(iter(itemfiles))
+            if '_' in item[0]:
+                # hashの定義が複数あるアイテムの場合
+                return item[0].split("_")[0]
             return item[0]
         # 自動変換された礼装の判定
         hash_item = hasher.compute(self.img_rgb[35:77, 40:88])  # 画像の距離

diff --git a/hash_ce.csv b/hash_ce.csv
@@ -412,6 +412,7 @@ Replica; Agateram,4,155,120,114,196,63,193,112,249
 欺瞞,2,171,240,58,111,162,251,156,62
 同調,2,49,149,200,143,252,192,15,248
 暗澹,2,33,204,114,35,206,51,204,59
+暗澹_2,2,186,100,56,147,108,19,236,54
 彼方への巡礼,5,212,120,75,169,57,176,182,54
 刹那のまほろば,4,250,232,167,83,32,23,124,56
 出発進行！,3,86,184,51,198,88,77,233,41