Merge pull request #28 from MahjongPantheon/TYR-22-daburi-ippatsu-fix

TYR-22 allow double riichi + ippatsu
MahjongPantheon · May 7, 2017 · e4f59d2 · e4f59d2
2 parents 9ce91b3 + 030cc0c
commit e4f59d2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/primitives/appstate/yaku.ts b/src/app/primitives/appstate/yaku.ts
@@ -234,14 +234,14 @@ export function getAllowedYaku(outcome: AppOutcome, mrWinner: number): YakuId[]
 
 function _excludeYaku(outcome: AppOutcome, winner: number, rawYakuList: YakuId[], list: YakuId[], toBeExcluded: YakuId[]) {
   return list.filter((yaku: YakuId) => {
-    if ( // disable ippatsu if riichi is not selected
+    if ( // disable ippatsu if riichi or double riichi is not selected
       yaku === YakuId.IPPATSU
       && (
         outcome.selectedOutcome === 'ron'
         || outcome.selectedOutcome === 'tsumo'
         || outcome.selectedOutcome === 'multiron'
       )
-      && rawYakuList.indexOf(YakuId.RIICHI) === -1
+      && (rawYakuList.indexOf(YakuId.RIICHI) === -1 && rawYakuList.indexOf(YakuId.DOUBLERIICHI) === -1)
     ) {
       return false;
     }