Merge remote-tracking branch 'upstream/main'

fix #60

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+feat: use ID for uniform(https://stat.ink/api-info/salmon-uniform3)
+
 ## 0.3.0
 
 feat: clear state when season change

src/constant.ts

@@ -2,9 +2,9 @@ import type { StatInkPostBody, VsHistoryDetail } from "./types.ts";
 
 export const AGENT_NAME = "splatoon.catgirlin.space / s3si.ts";
 export const AGENT_VERSION = "1.0.0";
-export const S3SI_VERSION = "0.3.0";
+export const S3SI_VERSION = "0.3.1";
 export const COMBINED_VERSION = `${AGENT_VERSION}/${S3SI_VERSION}`;
-export const NSOAPP_VERSION = "2.4.0";
+export const NSOAPP_VERSION = "2.5.0";
 export const WEB_VIEW_VERSION = "3.0.0-2857bc50";
 export const S3SI_LINK = "https://forgejo.catgirlin.space/catgirl/s3si.ts";
 
@@ -28,17 +28,6 @@ export const SPLATNET3_STATINK_MAP: {
     StatInkPostBody["fest_dragon"]
   >;
   COOP_EVENT_MAP: Record<number, string | undefined>;
-  COOP_UNIFORM_MAP: Record<
-    number,
-    | "orange"
-    | "green"
-    | "yellow"
-    | "pink"
-    | "blue"
-    | "black"
-    | "white"
-    | undefined
-  >;
   COOP_SPECIAL_MAP: Record<string, string | undefined>;
   WATER_LEVEL_MAP: Record<0 | 1 | 2, "low" | "normal" | "high">;
 } = {
@@ -73,15 +62,6 @@ export const SPLATNET3_STATINK_MAP: {
     7: "giant_tornado",
     8: "mudmouth_eruption",
   },
-  COOP_UNIFORM_MAP: {
-    1: "orange",
-    2: "green",
-    3: "yellow",
-    4: "pink",
-    5: "blue",
-    6: "black",
-    7: "white",
-  },
   COOP_SPECIAL_MAP: {
     "bd327d1b64372dedefd32adb28bea62a5b6152d93aada5d9fc4f669a1955d6d4":
       "nicedama",

src/exporters/stat.ink.ts

@@ -682,8 +682,7 @@ export class StatInkExporter implements GameExporter {
       name: player.name,
       number: player.nameId,
       splashtag_title: player.byname,
-      uniform:
-        SPLATNET3_STATINK_MAP.COOP_UNIFORM_MAP[b64Number(player.uniform.id)],
+      uniform: b64Number(player.uniform.id).toString(),
       special: specialWeapon ? await this.mapSpecial(specialWeapon) : undefined,
       weapons: await Promise.all(weapons.map((w) => this.mapCoopWeapon(w))),
       golden_eggs: goldenDeliverCount,

src/types.ts

@@ -681,7 +681,15 @@ export type StatInkCoopPlayer = {
   name: string;
   number: string;
   splashtag_title: string | null;
-  uniform?: "orange" | "green" | "yellow" | "pink" | "blue" | "black" | "white";
+  uniform?:
+    | string
+    | "orange"
+    | "green"
+    | "yellow"
+    | "pink"
+    | "blue"
+    | "black"
+    | "white";
   special?: string;
   weapons: (string | null)[];
   golden_eggs: number;