labag 2.6.2 → 2.6.4

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { Mode } from "./mode";
 import { patterns } from "./pattern";
 import { Recorder, GameRecord } from "./recorder";
 import { RecordChecker } from "./recordChecker";
-import { ModeName } from "./types/index";
+import { ModeName } from "./types";
 declare const labag: LaBaG;
 declare const recorder: Recorder;
 declare const checker: RecordChecker;

package/dist/labag.d.ts

@@ -19,10 +19,10 @@ export declare class LaBaG {
     /** 當前轉出的圖案組合 */
     patterns: [Pattern | null, Pattern | null, Pattern | null];
     /** 遊戲模式列表 */
-    modes: Mode<Record<string, any>>[];
+    modes: Mode[];
     /** 事件監聽器列表 */
     eventListeners: Record<LaBaGEvent, ((game: LaBaG) => void)[]>;
-    __defaultMode__: Mode<{}, "normal">;
+    __defaultMode__: Mode;
     constructor(times?: number);
     /**
      * 觸發指定事件。

package/dist/labag.js

@@ -86,7 +86,7 @@ class LaBaG {
                         game.patterns[i] = matchedPattern;
                     }
                 },
-                calculateScore: (game) => {
+                calculateScore: (game, mode) => {
                     const [p1, p2, p3] = game.patterns;
                     if (!p1 || !p2 || !p3) {
                         game.marginScore = 0;
@@ -112,20 +112,24 @@ class LaBaG {
                             this.marginScore += p1.scores[1];
                             this.marginScore += p2.scores[2];
                         }
-                        this.marginScore = Math.round(this.marginScore / 1.4);
+                        this.marginScore = Math.round(this.marginScore / mode.variable.twoMatchDivisor);
                     }
                     else {
                         // 三個圖案皆不同
                         this.marginScore += p1.scores[2];
                         this.marginScore += p2.scores[2];
                         this.marginScore += p3.scores[2];
-                        this.marginScore = Math.round(this.marginScore / 3);
+                        this.marginScore = Math.round(this.marginScore / mode.variable.allDifferentDivisor);
                     }
                 },
                 roundEnd: (game) => {
                     game.score += game.marginScore;
                 },
             },
+            variable: {
+                twoMatchDivisor: 1.4,
+                allDifferentDivisor: 3,
+            },
         });
         this.addMode(this.__defaultMode__);
     }

package/dist/modes/index.d.ts

@@ -1,5 +1,5 @@
 export declare const _modes: {
-    pikachu: import("..").Mode<{
+    readonly pikachu: import("..").Mode<{
         times: number;
         pattern: {
             name: string;
@@ -11,7 +11,7 @@ export declare const _modes: {
         };
         bonusRounds: number;
     }, "pikachu">;
-    superhhh: import("..").Mode<{
+    readonly superhhh: import("..").Mode<{
         times: number;
         rate: number;
         score: number;
@@ -27,7 +27,7 @@ export declare const _modes: {
         };
         extendTimes: number;
     }, "superhhh">;
-    greenwei: import("..").Mode<{
+    readonly greenwei: import("..").Mode<{
         times: number;
         rate: number;
         randNum: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "labag",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -5,7 +5,7 @@ import { Mode } from "./mode";
 import { patterns } from "./pattern";
 import { Recorder, GameRecord } from "./recorder";
 import { RecordChecker } from "./recordChecker";
-import { ModeName } from "./types/index";
+import { ModeName } from "./types";
 
 const labag = new LaBaG();
 modes.forEach((mode) => {

package/src/labag.ts

@@ -22,11 +22,11 @@ export class LaBaG {
   /** 當前轉出的圖案組合 */
   patterns: [Pattern | null, Pattern | null, Pattern | null];
   /** 遊戲模式列表 */
-  modes: Mode<Record<string, any>>[];
+  modes: Mode[];
   /** 事件監聽器列表 */
   eventListeners: Record<LaBaGEvent, ((game: LaBaG) => void)[]>;
 
-  __defaultMode__: Mode<{}, "normal">;
+  __defaultMode__: Mode;
 
   constructor(times: number = 30) {
     this.times = times;
@@ -92,7 +92,7 @@ export class LaBaG {
             game.patterns[i] = matchedPattern;
           }
         },
-        calculateScore: (game) => {
+        calculateScore: (game, mode) => {
           const [p1, p2, p3] = game.patterns;
           if (!p1 || !p2 || !p3) {
             game.marginScore = 0;
@@ -117,19 +117,27 @@ export class LaBaG {
               this.marginScore += p1.scores[1];
               this.marginScore += p2.scores[2];
             }
-            this.marginScore = Math.round(this.marginScore / 1.4);
+            this.marginScore = Math.round(
+              this.marginScore / mode.variable.twoMatchDivisor,
+            );
           } else {
             // 三個圖案皆不同
             this.marginScore += p1.scores[2];
             this.marginScore += p2.scores[2];
             this.marginScore += p3.scores[2];
-            this.marginScore = Math.round(this.marginScore / 3);
+            this.marginScore = Math.round(
+              this.marginScore / mode.variable.allDifferentDivisor,
+            );
           }
         },
         roundEnd: (game) => {
           game.score += game.marginScore;
         },
       },
+      variable: {
+        twoMatchDivisor: 1.4,
+        allDifferentDivisor: 3,
+      },
     });
     this.addMode(this.__defaultMode__);
   }

package/src/modes/index.ts

@@ -2,5 +2,5 @@ import greenwei from "./greenwei";
 import pikachu from "./pikachu";
 import superhhh from "./superhhh";
 
-export const _modes = { pikachu, superhhh, greenwei };
+export const _modes = { pikachu, superhhh, greenwei } as const;
 export const modes = Object.values(_modes);