koishi-plugin-noah 2.3.0 → 2.3.3

package/lib/games/sdvx/adapters/asphyxia.d.ts

@@ -10,7 +10,7 @@ export declare class AsphyxiaSDVXService implements GameService {
     private constructor();
     static getInstance(logger: Logger, config: SDVXConfig): AsphyxiaSDVXService;
     private getModel;
-    getRefid(ctx: Context, url: string, model: string, cardId: string): Promise<string>;
+    getRefid(ctx: Context, url: string, cardId: string): Promise<string>;
     getUserName(ctx: Context, url: string, cardId: string): Promise<string>;
     getAllScore(ctx: Context, url: string, cardId: string, config: SDVXConfig): Promise<SDVXScore[]>;
     private getClearType;

package/lib/games/sdvx/adapters/mao.d.ts

@@ -11,6 +11,7 @@ export declare class MaoSDVXService implements ISDVXService {
     getUserName(ctx: Context, url: string, cardId: string): Promise<string>;
     verifyPin(ctx: Context, url: string, cardId: string, pin: string): Promise<boolean>;
     private clearTypeToNum;
+    private gradeToNum;
     private diffNameToMusicType;
     uploadScore(ctx: Context, url: string, cardId: string, scores: SDVXScore[]): Promise<boolean>;
     getAllScore(ctx: Context, url: string, cardId: string, config: SDVXConfig): Promise<SDVXScore[]>;

package/lib/games/sdvx/utils/difficulty.d.ts

@@ -14,7 +14,7 @@ export declare function getDiffName(diffStr: string, infVer: string | number): s
 export declare function getDiffFullName(diffStr: string, infVer: string | number): string;
 /**
  * 根据难度缩写名称获取难度字符串和 infVer
- * @param diffAbbr - 难度缩写名称 (例如: "NOV", "ADV", "EXH", "INF", "GRV", "HVN", "VVD", "XCD", "MXM")
+ * @param diffAbbr - 难度缩写名称 (例如: "NOV", "ADV", "EXH", "INF", "GRV", "HVN", "VVD", "XCD", "NBL", "MXM")
  * @returns 包含难度字符串和 infVer 的对象，如果是非 infinite 难度则 infVer 为 null
  */
 export declare function getDiffStringFromAbbr(diffAbbr: string): {

package/lib/index.cjs

@@ -2927,7 +2927,7 @@ var SDVXDrawer = class extends BaseDrawer {
     const { loadImage } = this.ctx.skia;
     const grades = ["D", "C", "B", "A", "A+", "AA", "AA+", "AAA", "AAA+", "S"];
     const circles = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-    const diffs = ["NOV", "ADV", "EXH", "INF", "MXM", "GRV", "HVN", "VVD", "XCD", "ULT"];
+    const diffs = ["NOV", "ADV", "EXH", "INF", "MXM", "GRV", "HVN", "VVD", "XCD", "NBL", "ULT"];
     const clears = ["PUC", "SPUC", "UC", "MC", "HC", "NC", "PLAYED", "NOPLAY"];
     const [gradeImages, circleImages, difficultyBadges, clearTypeBadges] = await Promise.all([
       this.loadImageMap(loadImage, grades, (g) => `sdvx/vf/grade/${g}.png`),
@@ -3265,7 +3265,8 @@ var SDVXDrawer = class extends BaseDrawer {
             3: "GRV",
             4: "HVN",
             5: "VVD",
-            6: "XCD"
+            6: "XCD",
+            7: "NBL"
           };
           diffKey = infVerNum != null && infMap[infVerNum] ? infMap[infVerNum] : "INF";
         }
@@ -4464,6 +4465,8 @@ function getDiffName(diffStr, infVer) {
             return "VVD";
           case "6":
             return "XCD";
+          case "7":
+            return "NBL";
         }
       }
       break;
@@ -4496,6 +4499,8 @@ function getDiffFullName(diffStr, infVer) {
             return "VIVID";
           case "6":
             return "EXCEED";
+          case "7":
+            return "NABLA";
         }
       }
       break;
@@ -4525,6 +4530,8 @@ function getDiffStringFromAbbr(diffAbbr) {
       return { diffStr: "infinite", infVer: 5 };
     case "XCD":
       return { diffStr: "infinite", infVer: 6 };
+    case "NBL":
+      return { diffStr: "infinite", infVer: 7 };
     case "MXM":
       return { diffStr: "maximum", infVer: null };
     case "ULT":
@@ -4556,13 +4563,12 @@ var AsphyxiaSDVXService = class _AsphyxiaSDVXService {
   }
   async getModel(ctx) {
     if (this.cachedModel) return this.cachedModel;
-    const resp = await ctx.http.get(
-      `${this.config.sdvx_data_url}/model`
-    );
+    const resp = await ctx.http.get(`${this.config.sdvx_data_url}/model`);
     this.cachedModel = String(resp.model);
     return this.cachedModel;
   }
-  async getRefid(ctx, url, model, cardId) {
+  async getRefid(ctx, url, cardId) {
+    const model = await this.getModel(ctx);
     const requestUrl = `?model=KFC:J:G:A:${model}&f=message.get`;
     const xmlRequestBody = `<?xml version="1.0" encoding="UTF-8"?>
 <call model="KFC:J:G:A:${model}" srcid="00010203040506070809">
@@ -4577,7 +4583,7 @@ var AsphyxiaSDVXService = class _AsphyxiaSDVXService {
   }
   async getUserName(ctx, url, cardId) {
     const model = await this.getModel(ctx);
-    const refid = await this.getRefid(ctx, url, model, cardId);
+    const refid = await this.getRefid(ctx, url, cardId);
     const requestUrl = `?model=KFC:J:G:A:${model}&f=message.get`;
     const xmlRequestBody = `<call model="KFC:J:G:A:${model}" srcid="00010203040506070809">
     <game method="sv7_load" ver="0">
@@ -4596,7 +4602,7 @@ var AsphyxiaSDVXService = class _AsphyxiaSDVXService {
   }
   async getAllScore(ctx, url, cardId, config) {
     const model = await this.getModel(ctx);
-    const refid = await this.getRefid(ctx, url, model, cardId);
+    const refid = await this.getRefid(ctx, url, cardId);
     const requestUrl = `?model=KFC:J:G:A:${model}&f=message.get`;
     const xmlRequestBody = `<call model="KFC:J:G:A:${model}" srcid="00010203040506070809">
     <game method="sv7_load_m" ver="0">
@@ -4766,6 +4772,30 @@ var MaoSDVXService = class _MaoSDVXService {
         return 0;
     }
   }
+  gradeToNum(grade) {
+    switch (grade) {
+      case "S":
+        return 9;
+      case "AAA+":
+        return 8;
+      case "AAA":
+        return 7;
+      case "AA+":
+        return 6;
+      case "AA":
+        return 5;
+      case "A+":
+        return 4;
+      case "A":
+        return 3;
+      case "B":
+        return 2;
+      case "C":
+        return 1;
+      default:
+        return 0;
+    }
+  }
   diffNameToMusicType(diffName) {
     switch (diffName.toUpperCase()) {
       case "NOV":
@@ -4779,6 +4809,7 @@ var MaoSDVXService = class _MaoSDVXService {
       case "HVN":
       case "VVD":
       case "XCD":
+      case "NBL":
         return 3;
       case "MXM":
         return 4;
@@ -4802,7 +4833,8 @@ var MaoSDVXService = class _MaoSDVXService {
       music_type: this.diffNameToMusicType(s.music.music_diff_name),
       score: s.music.score,
       exscore: s.music.exscore,
-      clear_type: this.clearTypeToNum(s.music.clear_type)
+      clear_type: this.clearTypeToNum(s.music.clear_type),
+      score_grade: this.gradeToNum(s.music.score_grade)
     }));
     if (payload.length === 0) return false;
     const resp = await ctx.http.post(
@@ -5511,6 +5543,8 @@ function parseDiffAndTitle(rawTokens) {
     vvd: "infinite",
     exceed: "infinite",
     xcd: "infinite",
+    nabla: "infinite",
+    nbl: "infinite",
     maximum: "maximum",
     mxm: "maximum"
   };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-noah",
-    "version": "2.3.0",
+    "version": "2.3.3",
     "contributors": [
         "Logthm <logthm@outlook.com>"
     ],