ノーテンの出現確率を50%に

ef81sp · Jan 20, 2024 · 7b4652d · 7b4652d
1 parent 99772cb
commit 7b4652d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/src/composables/nanikiruGenerateHand.ts b/src/composables/nanikiruGenerateHand.ts
@@ -1,7 +1,7 @@
 import { 手牌, 牌 } from 'pairi'
 import { ref } from 'vue'
 import * as option from './nanikiruOption'
-import { generateRandomMountain } from '../utils/generateHandUtils'
+import { generateRandomMountain, randomlyNotenOrTempai } from '../utils/generateHandUtils'
 
 const initialHand = new 手牌([
   new 牌('1s'),
@@ -28,6 +28,7 @@ export const generateHand = (
   range: '1-9' | '2-8' | '3-7' = option.range.value,
   waitNum: number = option.waitNum.value,
 ) => {
+  const _ramdomlyNotenOrTempai = randomlyNotenOrTempai()
   do {
     const mountain = generateRandomMountain(suit, range)
     const handStr = mountain.slice(0, length)
@@ -40,22 +41,30 @@ export const generateHand = (
     const tehai = new 手牌(handPaiList)
     tehai.doツモ(new 牌(mountain[Number(length)]))
 
-    if (waitNum === 0) {
-      // ノーテン以上なのでなんでも返して良い
-      hand.value = tehai
-      return hand.value
-    }
-
     const _analysisResult = tehai.getAnalysisResult14()
     if (_analysisResult === null) {
       throw new Error('手牌がおかしい')
     }
-
     const analysisResult = Array.from(_analysisResult.values())
 
     const minimumShanten = Math.min(
       ...analysisResult.map(({ analysisResult }) => analysisResult.シャンテン数),
     )
+
+    if (waitNum === 0) {
+      // _randomlyNotenOrTempai === 'noten' のときは、シャンテン数が1以上の手牌を返すためやり直し
+      if (_ramdomlyNotenOrTempai === 'noten' && minimumShanten === 0) {
+        continue
+      }
+      // _randomlyNotenOrTempai === 'tempai' のときは、シャンテン数が0の手牌を返すためやり直し
+      if (_ramdomlyNotenOrTempai === 'tempai' && minimumShanten !== 0) {
+        continue
+      }
+      hand.value = tehai
+      return hand.value
+    }
+
+
     if (minimumShanten === 0) {
       const onlyMinimumShanten = analysisResult.filter(
         ({ analysisResult }) => analysisResult.シャンテン数 === minimumShanten,

diff --git a/src/composables/nanimachiGenerateHand.ts b/src/composables/nanimachiGenerateHand.ts
@@ -1,7 +1,7 @@
 import { 手牌, 牌 } from 'pairi'
 import { ref } from 'vue'
 import * as option from './nanimachiOption'
-import { generateRandomMountain } from '../utils/generateHandUtils'
+import { generateRandomMountain, randomlyNotenOrTempai } from '../utils/generateHandUtils'
 
 export const handNanimachi = ref<手牌>(
   new 手牌([
@@ -26,6 +26,8 @@ export const generateHandNanimachi = (
   range: '1-9' | '2-8' | '3-7' = option.range.value,
   waitNum: number = option.waitNum.value,
 ) => {
+  const _ramdomlyNotenOrTempai = randomlyNotenOrTempai()
+
   do {
     const mountain = generateRandomMountain(suit, range)
     const handStr = mountain.slice(0, length)
@@ -36,16 +38,24 @@ export const generateHandNanimachi = (
         : [牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌, 牌]
 
     const tehai = new 手牌(handPaiList)
+    const analysisResult = tehai.getAnalysisResult13()
+    if (analysisResult === null) {
+      throw new Error('手牌がおかしい')
+    }
+
     if (waitNum === 0) {
-      // ノーテン以上なのでなんでも返して良い
+      // _randomlyNotenOrTempai === 'noten' のときは、シャンテン数が1以上の手牌を返すためやり直し
+      if (_ramdomlyNotenOrTempai === 'noten' && analysisResult.シャンテン数 === 0) {
+        continue
+      }
+      // _randomlyNotenOrTempai === 'tempai' のときは、シャンテン数が0の手牌を返すためやり直し
+      if (_ramdomlyNotenOrTempai === 'tempai' && analysisResult.シャンテン数 !== 0) {
+        continue
+      }
       handNanimachi.value = tehai
       return handNanimachi.value
     }
 
-    const analysisResult = tehai.getAnalysisResult13()
-    if (analysisResult === null) {
-      throw new Error('手牌がおかしい')
-    }
     if (analysisResult.シャンテン数 === 0) {
       if (analysisResult.有効牌.length >= waitNum) {
         handNanimachi.value = tehai

diff --git a/src/utils/generateHandUtils.ts b/src/utils/generateHandUtils.ts
@@ -47,3 +47,12 @@ export const filterRange = <T extends Manzu[] | Pinzu[] | Sozu[]>(
       ) as T
   }
 }
+
+export const randomlyNotenOrTempai = (): "noten" | "tempai" => {
+  const random = Math.random()
+  if (random < 0.5) {
+    return 'noten'
+  } else {
+    return 'tempai'
+  }
+}