From 94c33bae8f50c94b78a7403b00cf774a56d6016d Mon Sep 17 00:00:00 2001
From: spacemeowx2 <spacemeowx2@gmail.com>
Date: Mon, 23 Oct 2023 20:00:44 +0800
Subject: [PATCH] feat: support random primary ability

---
 CHANGELOG.md                  |  4 ++++
 gui/src-tauri/tauri.conf.json |  2 +-
 src/constant.ts               |  2 +-
 src/exporters/stat.ink.ts     | 12 +++++++-----
 src/types.ts                  |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22882d6..9c48c19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.10
+
+feat: support random primary ability
+
 ## 0.4.9
 
 feat: add species and crown_type
diff --git a/gui/src-tauri/tauri.conf.json b/gui/src-tauri/tauri.conf.json
index a9fbac6..b738e83 100644
--- a/gui/src-tauri/tauri.conf.json
+++ b/gui/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "s3si-ts",
-    "version": "0.4.9"
+    "version": "0.4.10"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/constant.ts b/src/constant.ts
index 16d2eaa..8055ffe 100644
--- a/src/constant.ts
+++ b/src/constant.ts
@@ -1,7 +1,7 @@
 import type { StatInkPostBody, VsHistoryDetail } from "./types.ts";
 
 export const AGENT_NAME = "s3si.ts";
-export const S3SI_VERSION = "0.4.9";
+export const S3SI_VERSION = "0.4.10";
 export const NSOAPP_VERSION = "2.7.0";
 export const WEB_VIEW_VERSION = "4.0.0-dae4328c";
 export enum Queries {
diff --git a/src/exporters/stat.ink.ts b/src/exporters/stat.ink.ts
index a63baa3..19c3a10 100644
--- a/src/exporters/stat.ink.ts
+++ b/src/exporters/stat.ink.ts
@@ -365,7 +365,7 @@ export class StatInkExporter implements GameExporter {
       { primaryGearPower, additionalGearPowers }: PlayerGear,
     ): StatInkGear => {
       const primary = mapAbility(primaryGearPower);
-      if (!primary) {
+      if (!primary && !this.isRandom(primaryGearPower.image)) {
         throw new Error("Unknown ability: " + primaryGearPower.name);
       }
       return {
@@ -629,16 +629,18 @@ export class StatInkExporter implements GameExporter {
   }
   isRandom(image: Image | null): boolean {
     // question mark
-    const RANDOM_FILENAME =
-      "473fffb2442075078d8bb7125744905abdeae651b6a5b7453ae295582e45f7d1";
+    const RANDOM_FILENAME = [
+      "473fffb2442075078d8bb7125744905abdeae651b6a5b7453ae295582e45f7d1",
+      "dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91",
+    ];
     // file exporter will replace url to { pathname: string } | string
     const url = image?.url as ReturnType<typeof urlSimplify> | undefined | null;
     if (typeof url === "string") {
-      return url.includes(RANDOM_FILENAME);
+      return RANDOM_FILENAME.some((i) => url.includes(i));
     } else if (url === undefined || url === null) {
       return false;
     } else {
-      return url.pathname.includes(RANDOM_FILENAME);
+      return RANDOM_FILENAME.some((i) => url.pathname.includes(i));
     }
   }
   async mapCoopWeapon(
diff --git a/src/types.ts b/src/types.ts
index 0fc0432..8e1c95d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -640,7 +640,7 @@ export type StatInkWeapon = {
 }[];
 
 export type StatInkGear = {
-  primary_ability: string;
+  primary_ability: string | null;
   secondary_abilities: (string | null)[];
 };