labag 2.5.0 → 2.6.0

package/src/recordChecker.ts

@@ -24,61 +24,51 @@ export class RecordChecker {
    * @returns 計算出的分數。
    */
   calculateScore(record: GameRecord): number {
-    // 重置遊戲狀態
+    // 警告：此操作會重置並覆蓋當前傳入的遊戲實例狀態
     this.game.init();
     this.game.times = record.times;
 
-    // 使用 any 類型來存取私有方法
-    const gameAny = this.game as any;
-
     for (const round of record.rounds) {
-      if (!this.game.isRunning()) {
-        throw new Error("遊戲次數已達上限，無法繼續遊玩。");
+      if (!this.game.isRunning) {
+        break;
       }
 
       // 1. 回合開始
-      gameAny.roundStart();
+      this.game.roundStart();
+
+      // 2. 觸發 rollSlots 事件，這會執行所有模式的隨機邏輯
+      this.game.rollSlots();
 
-      // 2. 設定隨機數字與圖案 (模擬 rollSlots)
+      // 3. 覆蓋隨機數字與圖案 (確保使用紀錄中的數值)
       const { ranges } = this.game.getCurrentConfig();
-      
-      this.game.randNums = [
-        round.randNums["0"],
-        round.randNums["1"],
-        round.randNums["2"],
-      ];
 
-      this.game.randNums.forEach((num, index) => {
-        const match = ranges.find((r) => num <= r.threshold);
-        if (match) {
-          this.game.patterns[index] = match.pattern;
-        } else {
-          this.game.patterns[index] = null;
-        }
-      });
+      for (let i = 0; i < 3; i++) {
+        const num = round.randNums?.[i.toString()] ?? 0;
+        this.game.randNums[i] = num;
 
-      // 觸發 rollSlots 事件，讓模式執行其邏輯 (例如 greenwei 產生隨機數)
-      gameAny.emit("rollSlots");
+        const match = ranges.find((r) => num <= r.threshold);
+        this.game.patterns[i] = match ? match.pattern : null;
+      }
 
-      // 3. 覆蓋模式的隨機變數 (確保使用紀錄中的數值)
+      // 4. 覆蓋模式的隨機變數 (確保使用紀錄中的數值)
       this.game.modes.forEach((mode) => {
-        if (round.randNums[mode.name] !== undefined) {
-          mode.variable.randNum = round.randNums[mode.name];
+        const recordedNum = round.randNums?.[mode.name];
+        if (recordedNum !== undefined && mode.variable) {
+          mode.variable.randNum = recordedNum;
         }
       });
 
-      // 4. 計算分數
-      gameAny.calculateScore();
+      // 5. 計算分數
+      this.game.calculateScore();
 
-      // 5. 回合結束
-      gameAny.roundEnd();
+      // 6. 回合結束
+      this.game.roundEnd();
     }
 
-    if (!this.game.isRunning()) {
-      gameAny.gameOver();
+    if (!this.game.isRunning) {
+      this.game.gameOver();
     }
 
     return this.game.score;
   }
 }
-

package/src/recorder.ts

@@ -1,13 +1,13 @@
 import { LaBaG } from "./labag";
 
 export type RoundRecord = {
-  randNums: Record<string, number>;
+  readonly randNums: Readonly<Record<string, number>>;
 };
 
 export type GameRecord = {
   times: number;
   score: number;
-  rounds: RoundRecord[];
+  readonly rounds: ReadonlyArray<RoundRecord>;
 };
 
 export type RecorderOptions = {
@@ -17,25 +17,23 @@ export class Recorder {
   private game: LaBaG;
   #rounds: RoundRecord[] = [];
   private score: number = 0;
-  private onRoundEndBound: (e: LaBaG) => void;
   private started = false;
   private debug = false;
 
   constructor(gameInstance: LaBaG, options?: RecorderOptions) {
     this.game = gameInstance;
-    this.onRoundEndBound = this.onRoundEnd.bind(this);
-    this.debug = !!options?.debug;
+    this.debug = options?.debug ?? false;
   }
 
-  get rounds() {
-    return this.#rounds.map((r) => ({ ...r }));
+  get rounds(): ReadonlyArray<RoundRecord> {
+    return this.#rounds;
   }
 
-  private onRoundEnd(g: LaBaG) {
+  private onRoundEnd = (g: LaBaG) => {
     const randNums: Record<string, number> = {};
 
     g.randNums.forEach((value, key) => {
-      if (!isNaN(value)) {
+      if (typeof value === "number" && !Number.isNaN(value)) {
         randNums[key] = value;
       }
     });
@@ -43,7 +41,7 @@ export class Recorder {
     // 收集各模式的 randNum（若為數值且有效）
     g.modes.forEach((mode) => {
       const rn = mode?.variable?.randNum;
-      if (!isNaN(rn)) {
+      if (typeof rn === "number" && !Number.isNaN(rn)) {
         randNums[mode.name] = rn;
       }
     });
@@ -60,7 +58,7 @@ export class Recorder {
 
     this.#rounds.push(round);
     this.score = g.score;
-  }
+  };
 
   init(clearExisting = true) {
     if (this.started) return;
@@ -68,14 +66,14 @@ export class Recorder {
       this.clear();
     }
     if (typeof this.game.addEventListener === "function") {
-      this.game.addEventListener("roundEnd", this.onRoundEndBound);
+      this.game.addEventListener("roundEnd", this.onRoundEnd);
       this.started = true;
     }
   }
 
   dispose() {
     if (!this.started) return;
-    this.game.removeEventListener("roundEnd", this.onRoundEndBound);
+    this.game.removeEventListener("roundEnd", this.onRoundEnd);
     this.started = false;
   }
   clear() {

package/src/test.ts

@@ -1,4 +1,5 @@
-import { labag } from "./index";
+import { checker, labag } from "./index";
+import { recorder } from "./index";
 labag.addEventListener("gameStart", (game) => {
   console.log("Game Started!");
   console.log(`Total Rounds: ${game.times}\n`);
@@ -12,7 +13,7 @@ labag.addEventListener("rollSlots", (game) => {
   console.log(
     `Probability Ranges: ${ranges
       .map((r) => `${r.pattern.name}<=${r.threshold}`)
-      .join(", ")}`
+      .join(", ")}`,
   );
 });
 labag.addEventListener("roundEnd", (game) => {
@@ -22,7 +23,9 @@ labag.addEventListener("roundEnd", (game) => {
 });
 
 labag.init();
-while (labag.isRunning()) {
+recorder.init();
+
+while (labag.isRunning) {
   labag.play();
 }
 
@@ -32,5 +35,11 @@ console.log(
   `Active Modes at end: ${labag
     .getCurrentConfig()
     .modes.map((m) => m.name)
-    .join(", ")}`
+    .join(", ")}`,
+);
+console.log(`record: ${JSON.stringify(recorder.getRecord(), null, 2)}`);
+console.log(
+  checker.check(recorder.getRecord())
+    ? "Record is valid!"
+    : "Record is invalid!",
 );

package/src/types/index.ts

@@ -1,3 +1,5 @@
+import { LaBaG } from "src/labag";
+import { modes } from "src/modes";
 import { patterns } from "src/pattern";
 
 /**
@@ -26,3 +28,4 @@ export type Pattern = {
  */
 export type PatternName = (typeof patterns)[number]["name"];
 
+export type ModeName = (typeof modes)[number]["name"] | "normal";

package/src/modes/normal.ts

@@ -1,10 +0,0 @@
-import { Mode } from "../mode";
-
-export default new Mode(true, "normal", {
-  gss: 36,
-  hhh: 24,
-  hentai: 17,
-  handson: 12,
-  kachu: 8,
-  rrr: 3,
-});