labag 2.2.13 → 2.3.1

package/dist/labag.d.ts

@@ -1,4 +1,5 @@
 import { Mode } from "./mode";
+import { ModeName } from "./modes";
 import { Pattern, LaBaGEvent } from "./types";
 /**
  * 拉霸遊戲的主要類別。
@@ -58,7 +59,7 @@ export declare class LaBaG {
      * 取得目前遊戲的相關設定
      */
     getCurrentConfig(): {
-        modes: Mode<string>[];
+        modes: Mode[];
         ranges: {
             threshold: number;
             pattern: Pattern;
@@ -83,5 +84,5 @@ export declare class LaBaG {
     private roundEnd;
     private gameOver;
     play(): void;
-    getMode(modeName: string): Mode | undefined;
+    getMode(modeName: ModeName): Mode | undefined;
 }

package/dist/mode.d.ts

@@ -3,11 +3,11 @@ import { LaBaGEvent, Pattern, PatternName } from "./types";
 /**
  * 代表遊戲的一種模式，包含機率設定和事件監聽器。
  */
-export declare class Mode<N extends string = string> {
+export declare class Mode {
     /** 模式是否啟用 */
     active: boolean;
     /** 模式名稱 */
-    name: N;
+    name: string;
     /** 各圖案出現的機率 */
     rates: Record<PatternName, number>;
     ranges: {
@@ -26,5 +26,5 @@ export declare class Mode<N extends string = string> {
      * @param rates - 各圖案的機率設定。
      * @param eventListener - 事件監聽器。
      */
-    constructor(active: boolean, name: N, rates: Record<PatternName, number>, eventListener?: Partial<Record<LaBaGEvent, (game: LaBaG, mode: Mode) => void>>, variable?: Record<string, any>);
+    constructor(active: boolean, name: string, rates: Record<PatternName, number>, eventListener?: Partial<Record<LaBaGEvent, (game: LaBaG, mode: Mode) => void>>, variable?: Record<string, any>);
 }

package/dist/modes/greenwei.d.ts

@@ -1,3 +1,3 @@
 import { Mode } from "../mode";
-declare const _default: Mode<"greenwei">;
+declare const _default: Mode;
 export default _default;

package/dist/modes/greenwei.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const pattern_1 = require("../pattern");
 const mode_1 = require("../mode");
 const randInt_1 = require("../utils/randInt");
 exports.default = new mode_1.Mode(false, "greenwei", {
@@ -34,7 +35,7 @@ exports.default = new mode_1.Mode(false, "greenwei", {
         let gssCount = 0;
         let allGSS = true;
         for (const p of patterns) {
-            if (p?.name === mode.variable.bindPattern) {
+            if (p?.name === mode.variable.bindPattern.name) {
                 gssCount++;
             }
             else {
@@ -64,7 +65,7 @@ exports.default = new mode_1.Mode(false, "greenwei", {
             if (activated) {
                 mode.active = true;
                 for (let i = 0; i < patterns.length; i++) {
-                    if (patterns[i]?.name === mode.variable.bindPattern) {
+                    if (patterns[i]?.name === mode.variable.bindPattern.name) {
                         patterns[i] = variable.pattern;
                     }
                 }
@@ -81,7 +82,7 @@ exports.default = new mode_1.Mode(false, "greenwei", {
         scores: [800, 400, 180],
     },
     extendTimes: 2,
-    bindPattern: "gss",
+    bindPattern: pattern_1.patterns[0],
     bonusTimes: 2,
     requiredGssCount: 20,
     mutiplier: 3,

package/dist/modes/index.d.ts

@@ -1,8 +1,8 @@
 export declare const modes: {
-    pikachu: import("..").Mode<"pikachu">;
-    superhhh: import("..").Mode<"superhhh">;
-    greenwei: import("..").Mode<"greenwei">;
-    normal: import("..").Mode<"normal">;
+    pikachu: import("..").Mode;
+    superhhh: import("..").Mode;
+    greenwei: import("..").Mode;
+    normal: import("..").Mode;
 };
-export type ModeName = (typeof modes)[keyof typeof modes]["name"];
-export declare const modeList: (import("..").Mode<"greenwei"> | import("..").Mode<"normal"> | import("..").Mode<"pikachu"> | import("..").Mode<"superhhh">)[];
+export type ModeName = keyof typeof modes;
+export declare const modeList: import("..").Mode[];

package/dist/modes/normal.d.ts

@@ -1,3 +1,3 @@
 import { Mode } from "../mode";
-declare const _default: Mode<"normal">;
+declare const _default: Mode;
 export default _default;

package/dist/modes/pikachu.d.ts

@@ -1,3 +1,3 @@
 import { Mode } from "../mode";
-declare const _default: Mode<"pikachu">;
+declare const _default: Mode;
 export default _default;

package/dist/modes/pikachu.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const pattern_1 = require("../pattern");
 const mode_1 = require("../mode");
 exports.default = new mode_1.Mode(false, "pikachu", {
     gss: 36,
@@ -15,13 +16,13 @@ exports.default = new mode_1.Mode(false, "pikachu", {
     },
     roundEnd: (game, mode) => {
         const { patterns } = game;
-        const hasBindPattern = patterns.some((p) => p && p.name === mode.variable.bindPattern);
+        const hasBindPattern = patterns.some((p) => p && p.name === mode.variable.bindPattern.name);
         if (!game.isRunning() && hasBindPattern) {
             mode.active = true;
             game.played -= mode.variable.bonusRounds;
             mode.variable.times += 1;
             patterns.forEach((p, i) => {
-                if (p?.name === mode.variable.bindPattern) {
+                if (p?.name === mode.variable.bindPattern.name) {
                     patterns[i] = mode.variable.pattern;
                 }
             });
@@ -37,6 +38,6 @@ exports.default = new mode_1.Mode(false, "pikachu", {
         name: "pikachu",
         scores: [12000, 8000, 1250],
     },
-    bindPattern: "kachu",
+    bindPattern: pattern_1.patterns[4],
     bonusRounds: 5,
 });

package/dist/modes/superhhh.d.ts

@@ -1,3 +1,3 @@
 import { Mode } from "../mode";
-declare const _default: Mode<"superhhh">;
+declare const _default: Mode;
 export default _default;

package/dist/modes/superhhh.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const pattern_1 = require("../pattern");
 const mode_1 = require("../mode");
 const randInt_1 = require("../utils/randInt");
 exports.default = new mode_1.Mode(false, "superhhh", {
@@ -27,7 +28,7 @@ exports.default = new mode_1.Mode(false, "superhhh", {
     calculateScore: (game, mode) => {
         if (mode.active)
             return;
-        if (game.patterns.every((p) => p?.name === mode.variable.bindPattern) &&
+        if (game.patterns.every((p) => p?.name === mode.variable.bindPattern.name) &&
             mode.variable.randNum <= mode.variable.rate) {
             mode.variable.score += Math.round(game.score / 2);
             game.marginScore += mode.variable.score;
@@ -39,7 +40,7 @@ exports.default = new mode_1.Mode(false, "superhhh", {
         let hhhCount = 0;
         let allHHH = true;
         for (const p of patterns) {
-            if (p?.name === mode.variable.bindPattern)
+            if (p?.name === mode.variable.bindPattern.name)
                 hhhCount++;
             else
                 allHHH = false;
@@ -57,7 +58,7 @@ exports.default = new mode_1.Mode(false, "superhhh", {
                 mode.active = true;
                 variable.times += variable.bonusTimes;
                 for (let i = 0; i < patterns.length; i++) {
-                    if (patterns[i]?.name === mode.variable.bindPattern) {
+                    if (patterns[i]?.name === mode.variable.bindPattern.name) {
                         patterns[i] = variable.pattern;
                     }
                 }
@@ -69,7 +70,7 @@ exports.default = new mode_1.Mode(false, "superhhh", {
     rate: 15,
     score: 0,
     randNum: 0,
-    bindPattern: "hhh",
+    bindPattern: pattern_1.patterns[1],
     bonusTimes: 6,
     pattern: {
         name: "superhhh",

package/package.json

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

package/src/labag.ts

@@ -1,4 +1,5 @@
 import { Mode } from "./mode";
+import { ModeName } from "./modes";
 import { patterns } from "./pattern";
 import { Pattern, LaBaGEvent, PatternName } from "./types";
 import { randInt } from "./utils/randInt";
@@ -250,7 +251,7 @@ export class LaBaG {
     }
   }
 
-  getMode(modeName: string): Mode | undefined {
+  getMode(modeName: ModeName): Mode | undefined {
     return this.modes.find((mode) => mode.name === modeName);
   }
 }

package/src/mode.ts

@@ -5,17 +5,19 @@ import { LaBaGEvent, Pattern, PatternName } from "./types";
 /**
  * 代表遊戲的一種模式，包含機率設定和事件監聽器。
  */
-export class Mode<N extends string = string> {
+export class Mode{
   /** 模式是否啟用 */
   active: boolean;
   /** 模式名稱 */
-  name: N;
+  name: string;
   /** 各圖案出現的機率 */
   rates: Record<PatternName, number>;
   // 預先計算的區間，用於高效查找
   ranges: { threshold: number; pattern: Pattern }[];
   /** 事件監聽器 */
-  eventListener: Partial<Record<LaBaGEvent, (game: LaBaG, mode: Mode) => void>>;
+  eventListener: Partial<
+    Record<LaBaGEvent, (game: LaBaG, mode: Mode) => void>
+  >;
 
   /** 模式專屬的變數儲存空間 */
   variable: Record<string, any>;
@@ -30,7 +32,7 @@ export class Mode<N extends string = string> {
    */
   constructor(
     active: boolean,
-    name: N,
+    name: string,
     rates: Record<PatternName, number>,
     eventListener?: Partial<
       Record<LaBaGEvent, (game: LaBaG, mode: Mode) => void>
@@ -55,4 +57,4 @@ export class Mode<N extends string = string> {
       }
     }
   }
-}
+}

package/src/modes/greenwei.ts

@@ -1,3 +1,4 @@
+import { patterns } from "../pattern";
 import { Mode } from "../mode";
 import { randInt } from "../utils/randInt";
 
@@ -39,7 +40,7 @@ export default new Mode(
       let gssCount = 0;
       let allGSS = true;
       for (const p of patterns) {
-        if (p?.name === mode.variable.bindPattern) {
+        if (p?.name === mode.variable.bindPattern.name) {
           gssCount++;
         } else {
           allGSS = false;
@@ -69,7 +70,7 @@ export default new Mode(
         if (activated) {
           mode.active = true;
           for (let i = 0; i < patterns.length; i++) {
-            if (patterns[i]?.name === mode.variable.bindPattern) {
+            if (patterns[i]?.name === mode.variable.bindPattern.name) {
               patterns[i] = variable.pattern;
             }
           }
@@ -87,7 +88,7 @@ export default new Mode(
       scores: [800, 400, 180],
     },
     extendTimes: 2,
-    bindPattern: "gss",
+    bindPattern: patterns[0],
     bonusTimes: 2,
     requiredGssCount: 20,
     mutiplier: 3,

package/src/modes/index.ts

@@ -8,8 +8,8 @@ export const modes = {
   superhhh,
   greenwei,
   normal,
-}
+};
 
-export type ModeName = (typeof modes)[keyof typeof modes]["name"];
+export type ModeName = keyof typeof modes;
 
 export const modeList = Object.values(modes);

package/src/modes/pikachu.ts

@@ -1,3 +1,4 @@
+import { patterns } from "../pattern";
 import { Mode } from "../mode";
 
 export default new Mode(
@@ -19,7 +20,7 @@ export default new Mode(
     roundEnd: (game, mode) => {
       const { patterns } = game;
       const hasBindPattern = patterns.some(
-        (p) => p && p.name === mode.variable.bindPattern
+        (p) => p && p.name === mode.variable.bindPattern.name
       );
 
       if (!game.isRunning() && hasBindPattern) {
@@ -27,7 +28,7 @@ export default new Mode(
         game.played -= mode.variable.bonusRounds;
         mode.variable.times += 1;
         patterns.forEach((p, i) => {
-          if (p?.name === mode.variable.bindPattern) {
+          if (p?.name === mode.variable.bindPattern.name) {
             patterns[i] = mode.variable.pattern;
           }
         });
@@ -45,7 +46,7 @@ export default new Mode(
       name: "pikachu",
       scores: [12000, 8000, 1250],
     },
-    bindPattern: "kachu",
+    bindPattern: patterns[4],
     bonusRounds: 5,
   }
 );

package/src/modes/superhhh.ts

@@ -1,3 +1,4 @@
+import { patterns } from "../pattern";
 import { Mode } from "../mode";
 import { randInt } from "../utils/randInt";
 
@@ -29,7 +30,9 @@ export default new Mode(
     calculateScore: (game, mode) => {
       if (mode.active) return;
       if (
-        game.patterns.every((p) => p?.name === mode.variable.bindPattern) &&
+        game.patterns.every(
+          (p) => p?.name === mode.variable.bindPattern.name
+        ) &&
         mode.variable.randNum <= mode.variable.rate
       ) {
         mode.variable.score += Math.round(game.score / 2);
@@ -43,7 +46,7 @@ export default new Mode(
       let hhhCount = 0;
       let allHHH = true;
       for (const p of patterns) {
-        if (p?.name === mode.variable.bindPattern) hhhCount++;
+        if (p?.name === mode.variable.bindPattern.name) hhhCount++;
         else allHHH = false;
       }
 
@@ -60,7 +63,7 @@ export default new Mode(
           variable.times += variable.bonusTimes;
 
           for (let i = 0; i < patterns.length; i++) {
-            if (patterns[i]?.name === mode.variable.bindPattern) {
+            if (patterns[i]?.name === mode.variable.bindPattern.name) {
               patterns[i] = variable.pattern;
             }
           }
@@ -73,7 +76,7 @@ export default new Mode(
     rate: 15,
     score: 0,
     randNum: 0,
-    bindPattern: "hhh",
+    bindPattern: patterns[1],
     bonusTimes: 6,
     pattern: {
       name: "superhhh",