npm - labag - Versions diffs - 1.0.6 → 1.0.7 - Mend

labag 1.0.6 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/index.d.ts +2 -2
package/dist/index.js +2 -2
package/dist/types/BaseLaBaG.d.ts +26 -0
package/dist/types/BaseLaBaG.js +174 -0
package/dist/types/JsonLaBaG.d.ts +1 -1
package/dist/types/JsonLaBaG.js +4 -5
package/dist/types/LaBaG.d.ts +4 -25
package/dist/types/LaBaG.js +0 -172
package/dist/types/PlayLaBaG.d.ts +1 -1
package/dist/types/PlayLaBaG.js +2 -2
package/dist/utils/RandInt.d.ts +1 -1
package/dist/utils/RandInt.js +1 -3
package/package.json +1 -1
package/src/index.ts +15 -2
package/src/types/JsonLaBaG.ts +1 -2

package/dist/index.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { LaBaG } from "./types/LaBaG";
+import { LaBaG, OneDataType, AllDataType } from "./types/LaBaG";
 import { Mode, ModeNames } from "./types/Mode";
 import { PlayLaBaG } from "./types/PlayLaBaG";
 import { JsonLaBaG } from "./types/JsonLaBaG";
 import { P, PData } from "./types/P";
 declare const PDatas: Record<string, PData>;
 declare const Modes: Record<Exclude<ModeNames, "Normal">, Mode>;
-export { LaBaG, PlayLaBaG, JsonLaBaG, Modes, ModeNames, P, PData, PDatas };
+export { OneDataType, AllDataType, LaBaG, PlayLaBaG, JsonLaBaG, Modes, ModeNames, P, PData, PDatas, };

package/dist/index.js CHANGED Viewed

@@ -59,7 +59,7 @@ const Modes = {
         Score: 0,
         RandNum: 0,
         Random() {
-            this.RandNum = (0, RandInt_1.RandInt)();
+            this.RandNum = (0, RandInt_1.RandInt)(1, 100);
         },
         Judge(Game) {
             if (!Game.GameRunning() ||
@@ -105,7 +105,7 @@ const Modes = {
         Score: 0, // 咖波累積數
         RandNum: 0,
         Random() {
-            this.RandNum = (0, RandInt_1.RandInt)();
+            this.RandNum = (0, RandInt_1.RandInt)(1, 100);
         },
         Judge(Game) {
             if (!Game.GameRunning() ||

package/dist/types/BaseLaBaG.d.ts ADDED Viewed

@@ -0,0 +1,26 @@
+import { AllDataType, LaBaG, OneDataType } from "./LaBaG";
+import { ModeNames } from "./Mode";
+import { P } from "./P";
+export declare class BaseLaBaG implements LaBaG {
+    AllData: AllDataType;
+    OneData: OneDataType;
+    DataIndex: number;
+    Times: number;
+    Played: number;
+    Score: number;
+    MarginScore: number;
+    Ps: [P | null, P | null, P | null];
+    RateRanges: Record<ModeNames, number[]>;
+    ScoreTimes: Record<ModeNames, number>;
+    ScoreTime: number;
+    ModeToScreen: boolean;
+    constructor();
+    GameRunning(): boolean;
+    NowMode(): ModeNames;
+    Reset(): void;
+    Random(): void;
+    CalculateScore(): void;
+    Result(): void;
+    JudgeMode(): void;
+    Logic(): void;
+}

package/dist/types/BaseLaBaG.js ADDED Viewed

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseLaBaG = void 0;
+const src_1 = require("src");
+const P_1 = require("./P");
+const RandInt_1 = require("src/utils/RandInt");
+class BaseLaBaG {
+    AllData = {};
+    OneData = {};
+    DataIndex = 0;
+    Times = 30;
+    Played = 0;
+    Score = 0;
+    MarginScore = 0;
+    Ps = [null, null, null];
+    RateRanges = [
+        "Normal",
+        "SuperHHH",
+        "GreenWei",
+        "PiKaChu",
+    ].reduce((Ranges, mode) => {
+        const res = [];
+        let accRate = 0;
+        for (const p of P_1.P.Map.values()) {
+            accRate += p.rates[mode];
+            res.push(accRate);
+        }
+        Ranges[mode] = res;
+        return Ranges;
+    }, {});
+    ScoreTimes = {
+        Normal: 1,
+        SuperHHH: 1,
+        GreenWei: 3,
+        PiKaChu: 1,
+    };
+    ScoreTime = 1;
+    ModeToScreen = false;
+    constructor() { }
+    GameRunning() {
+        //遊戲進行
+        return this.Times > this.Played;
+    }
+    NowMode() {
+        // 查找當前模式
+        const mode = Object.entries(src_1.Modes).find(([_, mode]) => mode.InMode ?? false);
+        return mode ? mode[0] : "Normal";
+    }
+    Reset() {
+        // 重置
+        this.AllData = {};
+        this.DataIndex = 0;
+        this.Played = 0;
+        this.Score = 0;
+        this.MarginScore = 0;
+        this.ScoreTime = 1;
+        this.Ps = [null, null, null];
+        Object.values(src_1.Modes).forEach((mode) => {
+            if (mode.InMode !== undefined)
+                mode.InMode = false;
+            if (mode.Score !== undefined)
+                mode.Score = 0;
+            if (mode.RandNum !== undefined)
+                mode.RandNum = 0;
+            if (mode.Times !== undefined)
+                mode.Times = 0;
+        });
+    }
+    Random() {
+        const RandNums = Array.from({ length: 3 }, () => (0, RandInt_1.RandInt)(1, 100));
+        RandNums.forEach((RandNum, index) => {
+            this.OneData[`RandNums[${index}]`] = RandNum;
+        });
+        Object.values(src_1.Modes).forEach((mode) => {
+            mode.Random?.();
+        });
+        this.OneData["SuperHHH"] = src_1.Modes.SuperHHH.RandNum;
+        this.OneData["GreenWei"] = src_1.Modes.GreenWei.RandNum;
+        const RateRange = this.RateRanges[this.NowMode()];
+        const PCodes = Array.from(P_1.P.Map.keys());
+        RandNums.forEach((RandNum, i) => {
+            const code = PCodes.find((_, j) => RandNum <= RateRange[j]);
+            if (code) {
+                this.Ps[i] = P_1.P.Map.get(code) ?? null;
+            }
+        });
+        // 累積咖波累積數
+        this.Ps.forEach((p) => {
+            if (src_1.Modes.GreenWei.Score !== undefined) {
+                if (p?.code === "A" && src_1.Modes.GreenWei.Score < 20) {
+                    src_1.Modes.GreenWei.Score += 1;
+                }
+            }
+        });
+    }
+    CalculateScore() {
+        //計算分數
+        const UniqueCount = new Set(this.Ps.map((p) => p?.code)).size;
+        switch (UniqueCount) {
+            case 1: // 三個一樣
+                this.MarginScore += this.Ps[0]?.scores?.[0];
+                break;
+            case 2: // 兩個一樣
+                if (this.Ps[0]?.code === this.Ps[1]?.code) {
+                    this.MarginScore += this.Ps[0]?.scores?.[1];
+                    this.MarginScore += this.Ps[2]?.scores?.[2];
+                    this.MarginScore = Math.round(this.MarginScore / 1.4);
+                }
+                else if (this.Ps[1]?.code === this.Ps[2]?.code) {
+                    this.MarginScore += this.Ps[1]?.scores?.[1];
+                    this.MarginScore += this.Ps[0]?.scores?.[2];
+                    this.MarginScore = Math.round(this.MarginScore / 1.4);
+                }
+                else if (this.Ps[2]?.code === this.Ps[0]?.code) {
+                    this.MarginScore += this.Ps[2]?.scores?.[1];
+                    this.MarginScore += this.Ps[1]?.scores?.[2];
+                    this.MarginScore = Math.round(this.MarginScore / 1.4);
+                }
+                break;
+            case 3: // 三個不一樣
+                this.MarginScore += this.Ps[0]?.scores?.[2];
+                this.MarginScore += this.Ps[1]?.scores?.[2];
+                this.MarginScore += this.Ps[2]?.scores?.[2];
+                this.MarginScore = Math.round(this.MarginScore / 3);
+                break;
+        }
+        // 根據當前模式更新加分倍數
+        this.ScoreTime = this.ScoreTimes[this.NowMode()];
+        this.MarginScore *= this.ScoreTime;
+    }
+    Result() {
+        // 結果
+        this.Played += 1;
+        this.DataIndex += 1;
+        this.Score += this.MarginScore;
+        this.AllData[`${this.DataIndex}`] = this.OneData;
+    }
+    JudgeMode() {
+        if (!this.GameRunning()) {
+            src_1.Modes.PiKaChu.Judge?.(this);
+            return;
+        }
+        const mode = this.NowMode();
+        switch (mode) {
+            case "Normal":
+            case "PiKaChu":
+                src_1.Modes.SuperHHH.Judge?.(this);
+                if (!src_1.Modes.SuperHHH.InMode) {
+                    src_1.Modes.GreenWei.Judge?.(this);
+                }
+                break;
+            case "SuperHHH":
+                src_1.Modes.SuperHHH.Judge?.(this);
+                break;
+            case "GreenWei":
+                src_1.Modes.GreenWei.Judge?.(this);
+                break;
+        }
+    }
+    Logic() {
+        // 邏輯流程
+        this.Reset();
+        while (this.GameRunning()) {
+            this.ModeToScreen = false;
+            this.OneData = {};
+            this.MarginScore = 0;
+            this.Random();
+            this.CalculateScore();
+            this.Result();
+            this.JudgeMode();
+        }
+    }
+}
+exports.BaseLaBaG = BaseLaBaG;

package/dist/types/JsonLaBaG.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { BaseLaBaG } from "./LaBaG";
+import { BaseLaBaG } from "./BaseLaBaG";
 export declare class JsonLaBaG extends BaseLaBaG {
     jsonData: BaseLaBaG["AllData"];
     dataIndex: number;

package/dist/types/JsonLaBaG.js CHANGED Viewed

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonLaBaG = void 0;
 const P_1 = require("./P");
-const LaBaG_1 = require("./LaBaG");
 const __1 = require("..");
-class JsonLaBaG extends LaBaG_1.BaseLaBaG {
+const BaseLaBaG_1 = require("./BaseLaBaG");
+class JsonLaBaG extends BaseLaBaG_1.BaseLaBaG {
     jsonData;
     dataIndex;
     constructor() {
@@ -20,10 +20,9 @@ class JsonLaBaG extends LaBaG_1.BaseLaBaG {
         this.dataIndex = 0;
     }
     Random() {
-        const currData = this.jsonData[this.dataIndex];
+        const currData = this.jsonData[`${this.dataIndex}`];
         if (!currData) {
-            super.Random();
-            return;
+            throw new Error("No data found for the current index");
         }
         try {
             const RandNums = [

package/dist/types/LaBaG.d.ts CHANGED Viewed

@@ -1,8 +1,10 @@
 import { P } from "../types/P";
 import { ModeNames } from "../types/Mode";
+export type OneDataType = Partial<Record<"SuperHHH" | "GreenWei" | `RandNum[${0 | 1 | 2}]`, number>>;
+export type AllDataType = Record<`${number}`, OneDataType>;
 export interface LaBaG {
-    AllData: Record<string, Record<string, number>>;
-    OneData: Record<string, number>;
+    AllData: AllDataType;
+    OneData: OneDataType;
     DataIndex: number;
     Times: number;
     Played: number;
@@ -22,26 +24,3 @@ export interface LaBaG {
     JudgeMode(): void;
     Logic(): void;
 }
-export declare class BaseLaBaG implements LaBaG {
-    AllData: Record<string, Record<string, number>>;
-    OneData: Record<string, number>;
-    DataIndex: number;
-    Times: number;
-    Played: number;
-    Score: number;
-    MarginScore: number;
-    Ps: [P | null, P | null, P | null];
-    RateRanges: Record<ModeNames, number[]>;
-    ScoreTimes: Record<ModeNames, number>;
-    ScoreTime: number;
-    ModeToScreen: boolean;
-    constructor();
-    GameRunning(): boolean;
-    NowMode(): ModeNames;
-    Reset(): void;
-    Random(): void;
-    CalculateScore(): void;
-    Result(): void;
-    JudgeMode(): void;
-    Logic(): void;
-}

package/dist/types/LaBaG.js CHANGED Viewed

@@ -1,174 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseLaBaG = void 0;
-const P_1 = require("../types/P");
-const RandInt_1 = require("../utils/RandInt");
-const __1 = require("..");
-class BaseLaBaG {
-    AllData = {};
-    OneData = {};
-    DataIndex = 0;
-    Times = 30;
-    Played = 0;
-    Score = 0;
-    MarginScore = 0;
-    Ps = [null, null, null];
-    RateRanges = [
-        "Normal",
-        "SuperHHH",
-        "GreenWei",
-        "PiKaChu",
-    ].reduce((Ranges, mode) => {
-        const res = [];
-        let accRate = 0;
-        for (const p of P_1.P.Map.values()) {
-            accRate += p.rates[mode];
-            res.push(accRate);
-        }
-        Ranges[mode] = res;
-        return Ranges;
-    }, {});
-    ScoreTimes = {
-        Normal: 1,
-        SuperHHH: 1,
-        GreenWei: 3,
-        PiKaChu: 1,
-    };
-    ScoreTime = 1;
-    ModeToScreen = false;
-    constructor() { }
-    GameRunning() {
-        //遊戲進行
-        return this.Times > this.Played;
-    }
-    NowMode() {
-        // 查找當前模式
-        const mode = Object.entries(__1.Modes).find(([_, mode]) => mode.InMode ?? false);
-        return mode ? mode[0] : "Normal";
-    }
-    Reset() {
-        // 重置
-        this.AllData = {};
-        this.DataIndex = 0;
-        this.Played = 0;
-        this.Score = 0;
-        this.MarginScore = 0;
-        this.ScoreTime = 1;
-        this.Ps = [null, null, null];
-        Object.values(__1.Modes).forEach((mode) => {
-            if (mode.InMode !== undefined)
-                mode.InMode = false;
-            if (mode.Score !== undefined)
-                mode.Score = 0;
-            if (mode.RandNum !== undefined)
-                mode.RandNum = 0;
-            if (mode.Times !== undefined)
-                mode.Times = 0;
-        });
-    }
-    Random() {
-        const RandNums = Array.from({ length: 3 }, () => (0, RandInt_1.RandInt)());
-        RandNums.forEach((RandNum, index) => {
-            this.OneData[`RandNums[${index}]`] = RandNum;
-        });
-        Object.values(__1.Modes).forEach((mode) => {
-            mode.Random?.();
-        });
-        this.OneData["SuperHHH"] = __1.Modes.SuperHHH.RandNum;
-        this.OneData["GreenWei"] = __1.Modes.GreenWei.RandNum;
-        const RateRange = this.RateRanges[this.NowMode()];
-        const PCodes = Array.from(P_1.P.Map.keys());
-        RandNums.forEach((RandNum, i) => {
-            const code = PCodes.find((_, j) => RandNum <= RateRange[j]);
-            if (code) {
-                this.Ps[i] = P_1.P.Map.get(code) ?? null;
-            }
-        });
-        // 累積咖波累積數
-        this.Ps.forEach((p) => {
-            if (__1.Modes.GreenWei.Score !== undefined) {
-                if (p?.code === "A" && __1.Modes.GreenWei.Score < 20) {
-                    __1.Modes.GreenWei.Score += 1;
-                }
-            }
-        });
-    }
-    CalculateScore() {
-        //計算分數
-        const UniqueCount = new Set(this.Ps.map((p) => p?.code)).size;
-        switch (UniqueCount) {
-            case 1: // 三個一樣
-                this.MarginScore += this.Ps[0]?.scores?.[0];
-                break;
-            case 2: // 兩個一樣
-                if (this.Ps[0]?.code === this.Ps[1]?.code) {
-                    this.MarginScore += this.Ps[0]?.scores?.[1];
-                    this.MarginScore += this.Ps[2]?.scores?.[2];
-                    this.MarginScore = Math.round(this.MarginScore / 1.4);
-                }
-                else if (this.Ps[1]?.code === this.Ps[2]?.code) {
-                    this.MarginScore += this.Ps[1]?.scores?.[1];
-                    this.MarginScore += this.Ps[0]?.scores?.[2];
-                    this.MarginScore = Math.round(this.MarginScore / 1.4);
-                }
-                else if (this.Ps[2]?.code === this.Ps[0]?.code) {
-                    this.MarginScore += this.Ps[2]?.scores?.[1];
-                    this.MarginScore += this.Ps[1]?.scores?.[2];
-                    this.MarginScore = Math.round(this.MarginScore / 1.4);
-                }
-                break;
-            case 3: // 三個不一樣
-                this.MarginScore += this.Ps[0]?.scores?.[2];
-                this.MarginScore += this.Ps[1]?.scores?.[2];
-                this.MarginScore += this.Ps[2]?.scores?.[2];
-                this.MarginScore = Math.round(this.MarginScore / 3);
-                break;
-        }
-        // 根據當前模式更新加分倍數
-        this.ScoreTime = this.ScoreTimes[this.NowMode()];
-        this.MarginScore *= this.ScoreTime;
-    }
-    Result() {
-        // 結果
-        this.Played += 1;
-        this.DataIndex += 1;
-        this.Score += this.MarginScore;
-        this.AllData[`${this.DataIndex}`] = this.OneData;
-    }
-    JudgeMode() {
-        if (!this.GameRunning()) {
-            __1.Modes.PiKaChu.Judge?.(this);
-            return;
-        }
-        const mode = this.NowMode();
-        switch (mode) {
-            case "Normal":
-            case "PiKaChu":
-                __1.Modes.SuperHHH.Judge?.(this);
-                if (!__1.Modes.SuperHHH.InMode) {
-                    __1.Modes.GreenWei.Judge?.(this);
-                }
-                break;
-            case "SuperHHH":
-                __1.Modes.SuperHHH.Judge?.(this);
-                break;
-            case "GreenWei":
-                __1.Modes.GreenWei.Judge?.(this);
-                break;
-        }
-    }
-    Logic() {
-        // 邏輯流程
-        this.Reset();
-        while (this.GameRunning()) {
-            this.ModeToScreen = false;
-            this.OneData = {};
-            this.MarginScore = 0;
-            this.Random();
-            this.CalculateScore();
-            this.Result();
-            this.JudgeMode();
-        }
-    }
-}
-exports.BaseLaBaG = BaseLaBaG;

package/dist/types/PlayLaBaG.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { BaseLaBaG } from "./LaBaG";
+import { BaseLaBaG } from "./BaseLaBaG";
 export declare class PlayLaBaG extends BaseLaBaG {
     Reset(): void;
     Random(): void;

package/dist/types/PlayLaBaG.js CHANGED Viewed

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayLaBaG = void 0;
 const __1 = require("..");
-const LaBaG_1 = require("./LaBaG");
-class PlayLaBaG extends LaBaG_1.BaseLaBaG {
+const BaseLaBaG_1 = require("./BaseLaBaG");
+class PlayLaBaG extends BaseLaBaG_1.BaseLaBaG {
     Reset() {
         super.Reset();
         console.log("遊戲已重置");

package/dist/utils/RandInt.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export declare function RandInt(): number;
1	+ export declare function RandInt(min: number, max: number): number;

package/dist/utils/RandInt.js CHANGED Viewed

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandInt = RandInt;
-function RandInt() {
-    const min = 1;
-    const max = 100;
+function RandInt(min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 }

package/package.json CHANGED Viewed

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

package/src/index.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { LaBaG } from "./types/LaBaG";
+import { LaBaG, OneDataType, AllDataType } from "./types/LaBaG";
 import { Mode, ModeNames } from "./types/Mode";
 import { RandInt } from "./utils/RandInt";
 import { PlayLaBaG } from "./types/PlayLaBaG";
@@ -179,4 +179,17 @@ const Modes: Record<Exclude<ModeNames, "Normal">, Mode> = {
   },
 };
-export { LaBaG, PlayLaBaG, JsonLaBaG, Modes, ModeNames, P, PData, PDatas };
+export {
+  OneDataType,
+  AllDataType,
+  LaBaG,
+  PlayLaBaG,
+  JsonLaBaG,
+  Modes,
+  ModeNames,
+  P,
+  PData,
+  PDatas,
+};

package/src/types/JsonLaBaG.ts CHANGED Viewed

@@ -23,8 +23,7 @@ export class JsonLaBaG extends BaseLaBaG {
   Random(): void {
     const currData = this.jsonData[`${this.dataIndex}`];
     if (!currData) {
-      super.Random();
-      return;
+      throw new Error("No data found for the current index");
     }
     try {