fix: 一部の役判定の間違い

arisucool · May 2, 2023 · 0e0d974 · 0e0d974
1 parent 3141815
commit 0e0d974
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/src/app/shared/classes/cg-donjara-finish-checker/cg-donjara-finish-checker.spec.ts b/src/app/shared/classes/cg-donjara-finish-checker/cg-donjara-finish-checker.spec.ts
@@ -386,6 +386,41 @@ describe('CgDonjaraFinishChecker', () => {
     ]);
   });
 
+  it('ノーマルライブ - 3人公式 + 3人公式 + 3人公式', () => {
+    expect(
+      finishChecker.checkFinish([
+        // ももぺあべりー
+        '087', // 橘ありす
+        '015', // 櫻井桃華
+        '155', // 的場梨沙
+        // プチ＊パフェアリー
+        '024', // 遊佐こずえ
+        '034', // 双葉杏
+        '104', // 佐城雪美
+        // fleeting bouquet
+        '124', // 結城晴
+        '026', // 一ノ瀬志希
+        '064', // 黒埼ちとせ
+      ])
+    ).toMatchObject([
+      {
+        name: 'ノーマルライブ',
+        score: 120000,
+        units: expect.arrayContaining([
+          expect.objectContaining({
+            label: 'プチ＊パフェアリー',
+          }),
+          expect.objectContaining({
+            label: 'ももぺあべりー',
+          }),
+          expect.objectContaining({
+            label: 'fleeting bouquet',
+          }),
+        ]),
+      },
+    ]);
+  });
+
   it('不成立 - 3人公式 + 3人公式 + 2人(Co-Da) + 1人(Pa-Da)', () => {
     expect(
       finishChecker.checkFinish([

diff --git a/src/app/shared/classes/cg-donjara-finish-checker/cg-donjara-finish-checker.ts b/src/app/shared/classes/cg-donjara-finish-checker/cg-donjara-finish-checker.ts
@@ -261,6 +261,11 @@ export class CgDonjaraFinishChecker {
         !unit1.tileIdentifiers.every((id) => tiles.find((tile) => tile === id))
       )
         continue;
+      const idols1 = this.idols.filter((idol) =>
+        unit1.tileIdentifiers.find((tile) => tile === idol.identifier)
+      );
+      if (!idols1.every((idol) => idol.idolType === idols1[0].idolType))
+        continue;
       const remainingTiles1 = tiles.filter(
         (tile) => !unit1.tileIdentifiers.find((id) => id === tile)
       );
@@ -271,6 +276,11 @@ export class CgDonjaraFinishChecker {
           )
         )
           continue;
+        const idols2 = this.idols.filter((idol) =>
+          unit2.tileIdentifiers.find((tile) => tile === idol.identifier)
+        );
+        if (!idols2.every((idol) => idol.idolType === idols2[0].idolType))
+          continue;
         const remainingTiles2 = remainingTiles1.filter(
           (tile) => !unit2.tileIdentifiers.find((id) => id === tile)
         );
@@ -281,6 +291,13 @@ export class CgDonjaraFinishChecker {
             )
           )
             continue;
+
+          const idols3 = this.idols.filter((idol) =>
+            unit3.tileIdentifiers.find((tile) => tile === idol.identifier)
+          );
+          if (!idols3.every((idol) => idol.idolType === idols3[0].idolType))
+            continue;
+
           results.push({
             name: 'トリコロール',
             score: 240000,