chore: update levels

one-zero-eight · Nov 30, 2024 · bca8e0b · bca8e0b
1 parent 9647633
commit bca8e0b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/frontend/public/preview/zen-7.png b/frontend/public/preview/zen-7.png
diff --git a/frontend/src/components/mahjong/game.ts b/frontend/src/components/mahjong/game.ts
@@ -51,6 +51,7 @@ export class Game {
     }
 
     const kinds: string[] = []
+    let byTwo = false
     if (availableCoords.length / 4 > allKinds.length) {
       kinds.push(...allKinds)
       for (let i = 0; i < availableCoords.length / 4 - allKinds.length; i++) {
@@ -63,23 +64,30 @@ export class Game {
     else {
       const leftoverKinds = [...allKinds]
       shuffleArray(leftoverKinds)
-      kinds.push(...leftoverKinds.slice(0, Math.ceil(availableCoords.length / 4)))
+      kinds.push(...leftoverKinds.slice(0, Math.ceil(availableCoords.length / 2)))
+      byTwo = true
     }
     console.log('kindCounter')
 
     const kindCounter: { [key: string]: number } = {}
     let current = 0
     for (const kind of kinds) {
-      if (availableCoords.length - current >= 4) {
-        kindCounter[kind] = (kindCounter[kind] || 0) + 4
-        current += 4
-      }
-      else if (availableCoords.length - current === 2) {
+      if (byTwo) {
         kindCounter[kind] = (kindCounter[kind] || 0) + 2
         current += 2
       }
       else {
-        throw new Error('Invalid number of available coordinates')
+        if (availableCoords.length - current >= 4) {
+          kindCounter[kind] = (kindCounter[kind] || 0) + 4
+          current += 4
+        }
+        else if (availableCoords.length - current === 2) {
+          kindCounter[kind] = (kindCounter[kind] || 0) + 2
+          current += 2
+        }
+        else {
+          throw new Error('Invalid number of available coordinates')
+        }
       }
     }
     console.log('kindCounter', kindCounter)

diff --git a/frontend/src/components/mahjong/levels.ts b/frontend/src/components/mahjong/levels.ts
@@ -67,6 +67,7 @@ export const levels: LevelInfo[] = [
     template: ZEN_2,
     choices: allChoices,
     requiredLevel: 'zen-1',
+    story: 'Постепенно сложность уровней будет увеличиваться. На этом уровне больше производителей, и есть заблокированные фигуры - те, которые закрыты справа и слева другими фигурами.',
   },
   {
     id: 'zen-3',
@@ -75,6 +76,7 @@ export const levels: LevelInfo[] = [
     template: ZEN_3,
     choices: allChoices,
     requiredLevel: 'zen-2',
+    story: 'А на этом уровне несколько слоёв. Но мы уверены, что вы справитесь!',
   },
   {
     id: '1',