From d0aecc76ed8ba6089f5d7592bbf82ffed8eed260 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Thu, 8 Aug 2024 13:50:14 +0800
Subject: [PATCH] [O] Move general game settings to general tab

---
 AquaNet/src/components/GeneralGameSettings.svelte        | 9 +++++++++
 AquaNet/src/components/Mai2Settings.svelte               | 2 --
 AquaNet/src/pages/User/Settings.svelte                   | 5 ++++-
 src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt | 8 ++++----
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 AquaNet/src/components/GeneralGameSettings.svelte

diff --git a/AquaNet/src/components/GeneralGameSettings.svelte b/AquaNet/src/components/GeneralGameSettings.svelte
new file mode 100644
index 00000000..6438b8c5
--- /dev/null
+++ b/AquaNet/src/components/GeneralGameSettings.svelte
@@ -0,0 +1,9 @@
+<script>
+  import { fade } from "svelte/transition";
+  import { FADE_IN, FADE_OUT } from "../libs/config";
+  import GameSettingFields from "./GameSettingFields.svelte";
+</script>
+
+<div out:fade={FADE_OUT} in:fade={FADE_IN}>
+  <GameSettingFields game="general"/>
+</div>
diff --git a/AquaNet/src/components/Mai2Settings.svelte b/AquaNet/src/components/Mai2Settings.svelte
index ea7b902d..34dfb3f3 100644
--- a/AquaNet/src/components/Mai2Settings.svelte
+++ b/AquaNet/src/components/Mai2Settings.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { slide, fade } from "svelte/transition";
   import { FADE_IN, FADE_OUT } from "../libs/config";
-  import GameSettingFields from "./GameSettingFields.svelte";
   import { t } from "../libs/i18n.js";
   import Icon from "@iconify/svelte";
   import StatusOverlays from "./StatusOverlays.svelte";
@@ -73,7 +72,6 @@
       </div>
     </div>
   {/each}
-  <GameSettingFields game="mai2"/>
   <button class="exportButton" on:click={exportData}>
     <Icon icon="bxs:file-export"/>
     {t('settings.export')}
diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte
index 716c0ac9..0951196f 100644
--- a/AquaNet/src/pages/User/Settings.svelte
+++ b/AquaNet/src/pages/User/Settings.svelte
@@ -12,6 +12,7 @@
   import UserBox from "../../components/UserBox.svelte";
   import Mai2Settings from "../../components/Mai2Settings.svelte";
   import WaccaSettings from "../../components/WaccaSettings.svelte";
+  import GeneralGameSettings from "../../components/GeneralGameSettings.svelte";
 
   USER.ensureLoggedIn()
 
@@ -19,7 +20,7 @@
   let error: string;
   let submitting = ""
   let tab = 0
-  let tabs = [ 'profile' ]
+  let tabs = [ 'profile', 'game' ]
 
   const profileFields = [
     [ 'displayName', t('settings.profile.name') ],
@@ -139,6 +140,8 @@
     <Mai2Settings username={me.username} />
   {:else if tabs[tab] === 'wacca'}
     <WaccaSettings />
+  {:else if tabs[tab] === 'game'}
+    <GeneralGameSettings />
   {/if}
 
   <StatusOverlays {error} loading={!me || !!submitting} />
diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
index 814cea4f..28353a5e 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
@@ -14,16 +14,16 @@ class AquaGameOptions(
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     var id: Long = 0,
 
-    @SettingField("mai2")
+    @SettingField("general")
     var unlockMusic: Boolean = false,
 
-    @SettingField("mai2")
+    @SettingField("general")
     var unlockChara: Boolean = false,
 
-    @SettingField("mai2")
+    @SettingField("general")
     var unlockCollectables: Boolean = false,
 
-    @SettingField("mai2")
+    @SettingField("general")
     var unlockTickets: Boolean = false,
 
     @SettingField("wacca")