diff --git a/AquaNet/src/components/MunetRegisterBanner.svelte b/AquaNet/src/components/MunetRegisterBanner.svelte
deleted file mode 100644
index 187483d7..00000000
--- a/AquaNet/src/components/MunetRegisterBanner.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-  export let username: string;
-  export let email: string;
-
-  let shouldShow = navigator.language.startsWith('zh');
-
-  // 会导致瞬间出现，但是不知道为什么 svelte 的 transition 动画不工作
-  // if (!shouldShow) {
-  //   fetch('https://47.122.72.135/ip/isChina')
-  //     .then(it => it.json())
-  //     .then(it => shouldShow = it)
-  //     .catch(() => shouldShow = false);
-  // }
-
-  const jump = () => {
-    const params = new URLSearchParams();
-    if (username) params.set('username', username);
-    if (email) params.set('email', email);
-    location.href = `https://portal.mumur.net/register?${params.toString()}`;
-  }
-</script>
-
-{#if shouldShow}
-    <div class="cursor-pointer" on:click={jump}>
-        <h2>MuNET 了解一下！</h2>
-        <div>
-            <p>MuNET 是 AquaDX 的继任者，提供更适合中国用户的服务器和更好的游戏体验。</p>
-            <p>如果你还没有游戏数据，建议在 MuNET 上创建账号并开始游戏。点击立即前往</p>
-        </div>
-    </div>
-{/if}
-
diff --git a/AquaNet/src/components/Pagination.svelte b/AquaNet/src/components/Pagination.svelte
new file mode 100644
index 00000000..d717b728
--- /dev/null
+++ b/AquaNet/src/components/Pagination.svelte
@@ -0,0 +1,60 @@
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+
+  export let page: number
+  export let totalPages: number
+
+  const dispatch = createEventDispatcher()
+
+  let editing = false
+  let inputPage: number
+
+  function updatePage(newPage: number) {
+    if (newPage > 0 && newPage <= totalPages) dispatch('updatePage', newPage)
+  }
+
+  function startEditing() {
+    inputPage = page
+    editing = true
+  }
+
+  function finishEditing() {
+    editing = false
+    if (inputPage !== page) updatePage(inputPage)
+  }
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (event.key === 'Enter') finishEditing()
+    else if (event.key === 'Escape') editing = false
+  }
+</script>
+
+<div class="pagination">
+  <button on:click={() => updatePage(page - 1)} disabled={page <= 1}>Previous</button>
+
+  {#if editing}
+    <input bind:value={inputPage} on:blur={finishEditing} on:keydown={handleKeydown} min="1" max={totalPages} autofocus/>
+  {:else}
+    <span on:click={startEditing} role="button" tabindex="0" on:keydown={(e) => e.key === 'Enter' && startEditing()}>
+      Page {page} of {totalPages}
+    </span>
+  {/if}
+
+  <button on:click={() => updatePage(page + 1)} disabled={page >= totalPages}>Next</button>
+</div>
+
+<style lang="sass">
+  .pagination
+    display: flex
+    justify-content: center
+    align-items: center
+    margin: 1rem 0
+    gap: 1rem
+
+  input
+    width: 100px
+    text-align: center
+
+  span[role="button"]
+    cursor: pointer
+</style>
diff --git a/AquaNet/src/components/settings/GeneralGameSettings.svelte b/AquaNet/src/components/settings/GeneralGameSettings.svelte
index d400792e..79611862 100644
--- a/AquaNet/src/components/settings/GeneralGameSettings.svelte
+++ b/AquaNet/src/components/settings/GeneralGameSettings.svelte
@@ -1,7 +1,6 @@
 <script>
   import { fade } from "svelte/transition";
   import { FADE_IN, FADE_OUT } from "../../libs/config";
-  import GameSettingFields from "./GameSettingFields.svelte";
   import { t, ts } from "../../libs/i18n";
   import useLocalStorage from "../../libs/hooks/useLocalStorage.svelte";
   import RegionSelector from "./RegionSelector.svelte";
@@ -11,9 +10,8 @@
 
 <div out:fade={FADE_OUT} in:fade={FADE_IN} class="fields">
   <blockquote>
-    {ts("settings.gameNotice")}
+    {ts("settings.siteNotice")}
   </blockquote>
-  <GameSettingFields game="general"/>
   <div class="field">
     <div class="bool">
       <input id="rounding" type="checkbox" bind:checked={rounding.value}/>
diff --git a/AquaNet/src/components/settings/Mai2Settings.svelte b/AquaNet/src/components/settings/Mai2Settings.svelte
index cb61b5f6..92061903 100644
--- a/AquaNet/src/components/settings/Mai2Settings.svelte
+++ b/AquaNet/src/components/settings/Mai2Settings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { slide, fade } from "svelte/transition";
-  import { FADE_IN, FADE_OUT } from "../../libs/config";
+  import { FADE_IN, FADE_OUT, DATA_HOST } from "../../libs/config";
   import { t } from "../../libs/i18n.js";
   import Icon from "@iconify/svelte";
   import StatusOverlays from "../StatusOverlays.svelte";
@@ -35,6 +35,169 @@
         break
     }
   }
+  async function exportBatchManual() {
+    submitting = "batchExport"
+    const DIFFICULTY_MAP: Record<number, string> = {
+      0: "Basic",
+      1: "Advanced",
+      2: "Expert",
+      3: "Master",
+      4: "Re:Master"
+    }
+
+    const DAN_MAP: Record<number, string> = {
+      1: "DAN_1",
+      2: "DAN_2",
+      3: "DAN_3",
+      4: "DAN_4",
+      5: "DAN_5",
+      6: "DAN_6",
+      7: "DAN_7",
+      8: "DAN_8",
+      9: "DAN_9",
+      10: "DAN_10",
+      11: "SHINDAN_1",
+      12: "SHINDAN_2",
+      13: "SHINDAN_3",
+      14: "SHINDAN_4",
+      15: "SHINDAN_5",
+      16: "SHINDAN_6",
+      17: "SHINDAN_7",
+      18: "SHINDAN_8",
+      19: "SHINDAN_9",
+      20: "SHINDAN_10",
+      21: "SHINKAIDEN",
+      22: "URAKAIDEN"
+    }
+
+    const CLASS_MAP: Record<number, string> = {
+      0: "B5",
+      1: "B4",
+      2: "B3",
+      3: "B2",
+      4: "B1",
+      5: "A5",
+      6: "A4",
+      7: "A3",
+      8: "A2",
+      9: "A1",
+      10: "S5",
+      11: "S4",
+      12: "S3",
+      13: "S2",
+      14: "S1",
+      15: "SS5",
+      16: "SS4",
+      17: "SS3",
+      18: "SS2",
+      19: "SS1",
+      20: "SSS5",
+      21: "SSS4",
+      22: "SSS3",
+      23: "SSS2",
+      24: "SSS1",
+      25: "LEGEND"
+    }
+
+    let data: any
+    let musicData: any
+    let output: any = {
+      "meta": {
+        "game": "maimaidx",
+        "playtype": "Single",
+        "service": "AquaDX-Manual"
+      },
+      "scores": [],
+      "classes": {}
+    }
+    try {
+      musicData = await fetch(`${DATA_HOST}/d/mai2/00/all-music.json`).then(res => res.json())
+    } catch (e) {
+      error = e.message;
+      submitting = ""
+      return;
+    }
+    try {
+      data = await GAME.export('mai2');
+    } catch (e) {
+      error = e.message;
+      submitting = ""
+      return;
+    }
+    if (data && "userPlaylogList" in data) {
+      for (let score of data.userPlaylogList) {
+        if(score.musicId > 100000){
+          continue; // UTAGE charts are not supported
+        }
+        const musicItem = musicData[score.musicId as string];
+        if (!musicItem) continue;
+        let difficulty = null;
+
+        if (!(score.level in DIFFICULTY_MAP))
+          continue;
+
+        const isDX = score.musicId >= 10000;
+        difficulty = isDX ? `DX ${DIFFICULTY_MAP[score.level]}` : DIFFICULTY_MAP[score.level];
+
+        const percent = score.achievement/10000;
+
+        const pcrit = score.tapCriticalPerfect + score.holdCriticalPerfect + score.slideCriticalPerfect + score.touchCriticalPerfect + score.breakCriticalPerfect;
+        const perfect = score.tapPerfect + score.holdPerfect + score.slidePerfect + score.touchPerfect + score.breakPerfect;
+        const great = score.tapGreat + score.holdGreat + score.slideGreat + score.touchGreat + score.breakGreat;
+        const good = score.tapGood + score.holdGood + score.slideGood + score.touchGood + score.breakGood;
+        const miss = score.tapMiss + score.holdMiss + score.slideMiss + score.touchMiss + score.breakMiss;
+        const judgements  = {
+          "pcrit": pcrit,
+          "perfect": perfect,
+          "great": great,
+          "good": good,
+          "miss": miss
+        }
+        let lamp = null;
+        if (score.isAllPerfect) {
+          lamp = "ALL PERFECT";
+          if (score.percent == 101.0) {
+            lamp = "ALL PERFECT+";
+          }
+        } else if (score.isFullCombo) {
+          lamp = "FULL COMBO";
+          if (good == 0 && great == 0) {
+            lamp = "FULL COMBO+";
+          }
+        } else if (score.isClear) {
+          lamp = "CLEAR";
+        } else {
+          lamp = "FAILED";
+        }
+
+        const optional = {
+          "fast": score.fastCount,
+          "slow": score.lateCount,
+          "maxCombo": score.maxCombo
+        }
+
+        output.scores.push({
+          "percent": percent,
+          "lamp": lamp,
+          "matchType": "inGameID",
+          "identifier": score.musicId.toString(),
+          "difficulty": difficulty,
+          "timeAchieved": new Date(score.userPlayDate).getTime(),
+          "judgements": judgements,
+          "optional": optional
+        })
+      }
+    }
+
+    if(data.userData.courseRank in DAN_MAP){
+      output.classes["dan"] = DAN_MAP[data.userData.courseRank]
+    }
+    if(data.userData.classRank in CLASS_MAP){
+      output.classes["matchingClass"] = CLASS_MAP[data.userData.classRank]
+    }
+    download(JSON.stringify(output), `AquaDX_maimai2_BatchManualExport_${values[0]}.json`)
+    submitting = ""
+  }
 
   function exportData() {
     submitting = "export"
@@ -70,6 +233,10 @@
     <Icon icon="bxs:file-export"/>
     {t('settings.export')}
   </button>
+  <button class="exportBatchManualButton" on:click={exportBatchManual}>
+    <Icon icon="bxs:file-export"/>
+    {t('settings.batchManualExport')}
+  </button>
 </div>
 
 <StatusOverlays {error} loading={!values[0] || !!submitting}/>
diff --git a/AquaNet/src/libs/i18n/en_ref.ts b/AquaNet/src/libs/i18n/en_ref.ts
index 3f268d8e..9f85cf8b 100644
--- a/AquaNet/src/libs/i18n/en_ref.ts
+++ b/AquaNet/src/libs/i18n/en_ref.ts
@@ -144,23 +144,35 @@ export const EN_REF_HOME = {
 export const EN_REF_SETTINGS = {
   'settings.title': 'Settings',
   'settings.tabs.profile': 'Profile',
-  'settings.tabs.game': 'Game',
+  'settings.tabs.global': 'Global',
   'settings.tabs.chu3': 'Chuni',
   'settings.tabs.mai2': 'Mai',
   'settings.tabs.ongeki': 'Ongeki',
   'settings.tabs.wacca': 'Wacca',
-  'settings.fields.unlockMusic.name': 'Unlock All Music',
-  'settings.fields.unlockMusic.desc': 'Unlock all music and master difficulty in game.',
-  'settings.fields.unlockChara.name': 'Unlock All Characters',
-  'settings.fields.unlockChara.desc': 'Unlock all characters, voices, and partners in game.',
-  'settings.fields.unlockCollectables.name': 'Unlock All Collectables',
-  'settings.fields.unlockCollectables.desc': 'Unlock all collectables (nameplate, title, icon, frame) in game.',
-  'settings.fields.unlockTickets.name': 'Unlock All Tickets',
-  'settings.fields.unlockTickets.desc': 'Infinite map/ex tickets (Note: maimai still limits which tickets can be used).',
-  'settings.fields.waccaInfiniteWp.name': 'Wacca: Infinite WP',
-  'settings.fields.waccaInfiniteWp.desc': 'Set WP to 999999',
-  'settings.fields.waccaAlwaysVip.name': 'Wacca: Always VIP',
-  'settings.fields.waccaAlwaysVip.desc': 'Set VIP expiration date to 2077-01-01',
+  'settings.fields.mai2UnlockMusic.name': 'Unlock All Music',
+  'settings.fields.mai2UnlockMusic.desc': 'Unlock all music and master difficulty.',
+  'settings.fields.mai2UnlockChara.name': 'Unlock All Characters',
+  'settings.fields.mai2UnlockChara.desc': 'Unlock all characters (new characters start at level 1).',
+  'settings.fields.mai2UnlockCharaMaxLevel.name': 'Max Character Level',
+  'settings.fields.mai2UnlockCharaMaxLevel.desc': 'Set all characters to max level.',
+  'settings.fields.mai2UnlockPartners.name': 'Unlock All Partners',
+  'settings.fields.mai2UnlockPartners.desc': 'Unlock all partners.',
+  'settings.fields.mai2UnlockCollectables.name': 'Unlock All Collectables',
+  'settings.fields.mai2UnlockCollectables.desc': 'Unlock all collectables (nameplate, title, icon, frame).',
+  'settings.fields.mai2UnlockTickets.name': 'Unlock All Tickets',
+  'settings.fields.mai2UnlockTickets.desc': 'Infinite tickets (Note: client still limits which tickets can be used).',
+  'settings.fields.waccaUnlockMusic.name': 'Unlock All Music',
+  'settings.fields.waccaUnlockMusic.desc': 'Unlock all music.',
+  'settings.fields.waccaUnlockPlates.name': 'Unlock All Plates',
+  'settings.fields.waccaUnlockPlates.desc': 'Unlock all plates.',
+  'settings.fields.waccaUnlockCollectables.name': 'Unlock All Collectables',
+  'settings.fields.waccaUnlockCollectables.desc': 'Unlock all collectables (icon, trophy).',
+  'settings.fields.waccaUnlockTickets.name': 'Infinite Tickets',
+  'settings.fields.waccaUnlockTickets.desc': 'Infinite tickets.',
+  'settings.fields.waccaInfiniteWp.name': 'Infinite WP',
+  'settings.fields.waccaInfiniteWp.desc': 'Set WP to 999999.',
+  'settings.fields.waccaAlwaysVip.name': 'Always VIP',
+  'settings.fields.waccaAlwaysVip.desc': 'Set VIP expiration date to 2077-01-01.',
   'settings.fields.chusanTeamName.name': 'Team Name',
   'settings.fields.chusanTeamName.desc': 'Customize the text displayed on the top of your profile.',
   'settings.fields.chusanInfinitePenguins.name': 'Infinite Penguins',
@@ -196,10 +208,10 @@ export const EN_REF_SETTINGS = {
   'settings.export': 'Export Player Data',
   'settings.batchManualExport': "Export in Batch Manual (for Tachi)",
   'settings.cabNotice': "Note: These settings will only affect your own cab/setup. If you're playing on someone else's setup, please contact them to change these settings.",
-  'settings.gameNotice': "These only apply to Mai and Wacca.",
-  'settings.regionNotice': "These only apply to Mai, Ongeki and Chuni.",
+  'settings.siteNotice': "These settings only apply to the website.",
+  'settings.regionNotice': "These settings are shared amongst Mai, Ongeki and Chuni.",
   'settings.regionSelector.title': "Prefecture Selector",
-  'settings.regionSelector.desc': "Select the region where you want the game to think you are playing",
+  'settings.regionSelector.desc': "Select the region where you want the game to identify you",
   'settings.regionSelector.select': "Select Prefecture",
 }
 
diff --git a/AquaNet/src/libs/i18n/zh.ts b/AquaNet/src/libs/i18n/zh.ts
index 047e9c17..e1abb124 100644
--- a/AquaNet/src/libs/i18n/zh.ts
+++ b/AquaNet/src/libs/i18n/zh.ts
@@ -156,23 +156,35 @@ const zhHome: typeof EN_REF_HOME = {
 const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.title': '用户设置',
   'settings.tabs.profile': '个人资料',
-  'settings.tabs.game': '游戏设置',
+  'settings.tabs.global': '全局',
   'settings.tabs.chu3': '中二',
   'settings.tabs.mai2': '舞萌',
   'settings.tabs.ongeki': '音击',
   'settings.tabs.wacca': '华卡',
-  'settings.fields.unlockMusic.name': '解锁谱面',
-  'settings.fields.unlockMusic.desc': '在游戏中解锁所有曲目和大师难度谱面。',
-  'settings.fields.unlockChara.name': '解锁角色',
-  'settings.fields.unlockChara.desc': '在游戏中解锁所有角色、语音和伙伴。',
-  'settings.fields.unlockCollectables.name': '解锁收藏品',
-  'settings.fields.unlockCollectables.desc': '在游戏中解锁所有收藏品（名牌、称号、图标、背景图）。',
-  'settings.fields.unlockTickets.name': '解锁游戏券',
-  'settings.fields.unlockTickets.desc': '无限跑图券/解锁券（注：maimai 客户端仍限制一些券不能使用）。',
-  'settings.fields.waccaInfiniteWp.name': '华卡：无限 WP',
-  'settings.fields.waccaInfiniteWp.desc': '将 WP 设置为 999999',
-  'settings.fields.waccaAlwaysVip.name': '华卡：永久会员',
-  'settings.fields.waccaAlwaysVip.desc': '将 VIP 到期时间设置为 2077-01-01',
+  'settings.fields.mai2UnlockMusic.name': '解锁谱面',
+  'settings.fields.mai2UnlockMusic.desc': '解锁所有曲目和大师难度谱面。',
+  'settings.fields.mai2UnlockChara.name': '解锁角色',
+  'settings.fields.mai2UnlockChara.desc': '解锁所有角色（新角色从 1 级开始）。',
+  'settings.fields.mai2UnlockCharaMaxLevel.name': '角色满级',
+  'settings.fields.mai2UnlockCharaMaxLevel.desc': '将所有角色设置为满级。',
+  'settings.fields.mai2UnlockPartners.name': '解锁搭档',
+  'settings.fields.mai2UnlockPartners.desc': '解锁所有搭档。',
+  'settings.fields.mai2UnlockCollectables.name': '解锁收藏品',
+  'settings.fields.mai2UnlockCollectables.desc': '解锁所有收藏品（姓名框、称号、头像、背景）。',
+  'settings.fields.mai2UnlockTickets.name': '解锁功能票',
+  'settings.fields.mai2UnlockTickets.desc': '无限功能票（注：客户端仍限制一些功能票不能使用）。',
+  'settings.fields.waccaUnlockMusic.name': '解锁谱面',
+  'settings.fields.waccaUnlockMusic.desc': '解锁所有曲目。',
+  'settings.fields.waccaUnlockPlates.name': '解锁铭牌',
+  'settings.fields.waccaUnlockPlates.desc': '解锁所有铭牌。',
+  'settings.fields.waccaUnlockCollectables.name': '解锁收藏品',
+  'settings.fields.waccaUnlockCollectables.desc': '解锁所有收藏品。',
+  'settings.fields.waccaUnlockTickets.name': '无限解锁券',
+  'settings.fields.waccaUnlockTickets.desc': '无限解锁券。',
+  'settings.fields.waccaInfiniteWp.name': '无限 WP',
+  'settings.fields.waccaInfiniteWp.desc': '将 WP 设置为 999999。',
+  'settings.fields.waccaAlwaysVip.name': '永久会员',
+  'settings.fields.waccaAlwaysVip.desc': '将 VIP 到期时间设置为 2077-01-01。',
   'settings.fields.chusanTeamName.name': '队伍名称',
   'settings.fields.chusanTeamName.desc': '自定义显示在个人资料顶部的文本。',
   'settings.fields.chusanInfinitePenguins.name': '我是桐谷遥',
@@ -208,9 +220,10 @@ const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.export': '导出玩家数据',
   'settings.batchManualExport': "导出 Batch Manual 格式（用于 Tachi）",
   'settings.cabNotice': '注意：下面这些设置只会影响你自己的机器，如果你是在其他人的机器上玩的话，请联系机主来改设置',
-  'settings.gameNotice': "这些设置仅对舞萌和华卡生效。",
   // AI
-  'settings.regionNotice': "这些设置仅适用于舞萌、音击和中二。",
+  'settings.siteNotice': "这些设置仅适用于网站。",
+  // AI
+  'settings.regionNotice': "这些设置在舞萌、音击和中二节奏之间共享。",
   // AI
   'settings.regionSelector.title': "地区选择器",
   // AI
diff --git a/AquaNet/src/pages/Home.svelte b/AquaNet/src/pages/Home.svelte
index bd5b275f..1faa9162 100644
--- a/AquaNet/src/pages/Home.svelte
+++ b/AquaNet/src/pages/Home.svelte
@@ -10,7 +10,6 @@
   import { t } from "../libs/i18n";
   import ImportDataAction from "./Home/ImportDataAction.svelte";
   import Communities from "./Home/Communities.svelte";
-  import MigrateAction from "./Home/MigrateAction.svelte";
 
   USER.ensureLoggedIn();
 
@@ -59,9 +58,6 @@
       </ActionCard>
 
       <ImportDataAction/>
-      {#if me}
-        <MigrateAction username={me.username}/>
-      {/if}
     </div>
   {:else if tab === 1}
     <div out:fade={FADE_OUT} in:fade={FADE_IN}>
diff --git a/AquaNet/src/pages/Home/MigrateAction.svelte b/AquaNet/src/pages/Home/MigrateAction.svelte
deleted file mode 100644
index 530d2e28..00000000
--- a/AquaNet/src/pages/Home/MigrateAction.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<script lang="ts">
-  import { fade } from "svelte/transition"
-  import { t } from "../../libs/i18n";
-  import ActionCard from "../../components/ActionCard.svelte";
-  import { CARD, GAME, USER } from "../../libs/sdk";
-
-  export let username: string;
-  let shouldShow = navigator.language.startsWith('zh');
-  let showWarning = false;
-  let isCardBindIssue = false;
-
-  if (!shouldShow) {
-    fetch('https://47.122.72.135/ip/isChina')
-      .then(it => it.json())
-      .then(it => shouldShow = it)
-      .catch(() => shouldShow = false);
-  }
-
-  CARD.userGames(username).then(games => {
-    if (!Object.values(games).some(it => it)) {
-      isCardBindIssue = true;
-    }
-  })
-
-  const handleClick = () => {
-    if (isCardBindIssue) {
-      showWarning = true;
-      return
-    }
-    jump()
-  }
-
-  const jump = () => {
-    const token = localStorage.getItem('token')
-    location.href = `https://portal.mumur.net/migrateFromAquaDx/${token}`
-  }
-</script>
-
-{#if shouldShow}
-    <ActionCard color="190, 149, 255" icon="system-uicons:jump-up" on:click={handleClick}>
-        <h3>迁移到 MuNET</h3>
-        <span>更适合中国宝宝体质的服务器，AquaDX 的继任者。点击查看详情</span>
-    </ActionCard>
-{/if}
-
-{#if showWarning}
-    <div class="overlay" transition:fade>
-        <div>
-            <h2>提示</h2>
-            <p>看起来你在 AquaDX 还没有游戏数据，也许是因为没有绑卡或者绑定的卡不是在游戏中点击“查看卡号”获取的…</p>
-            <p>现在迁移的话，大概会导致你的游戏数据无法被正确的迁移。建议你先去检查一下吧</p>
-            <div class="buttons">
-                <button on:click={() => showWarning = false}>{t('action.cancel')}</button>
-                <button on:click={jump}>继续</button>
-            </div>
-        </div>
-    </div>
-{/if}
-
-<style lang="sass">
-  h3
-    font-size: 1.3rem
-    margin: 0
-
-  .buttons
-    display: grid
-    grid-template-columns: 1fr 1fr
-    gap: 1rem
-</style>
diff --git a/AquaNet/src/pages/Ranking.svelte b/AquaNet/src/pages/Ranking.svelte
index d0b10ac8..80f246b2 100644
--- a/AquaNet/src/pages/Ranking.svelte
+++ b/AquaNet/src/pages/Ranking.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { onMount } from "svelte";
   import { title } from "../libs/ui";
   import { GAME } from "../libs/sdk";
   import type { GenericRanking } from "../libs/generalTypes";
@@ -8,6 +9,7 @@
   import { t } from "../libs/i18n";
   import UserCard from "../components/UserCard.svelte";
   import Tooltip from "../components/Tooltip.svelte";
+  import Pagination from "../components/Pagination.svelte";
 
   export let game: GameName = 'mai2';
 
@@ -15,15 +17,45 @@
 
   let d: { users: GenericRanking[] };
   let error: string | null;
+
+  let page = 1
+  const perPage = 50
+  let totalPages = 1
+
+  function handleUpdatePage(event: CustomEvent<number>) {
+    page = event.detail;
+    const url = new URL(window.location.toString())
+    url.searchParams.set('page', page.toString())
+    history.pushState({}, '', url.toString())
+    window.scrollTo(0, 0)
+  }
+
+  onMount(() => {
+    const url = new URL(window.location.toString())
+    const pageParam = url.searchParams.get('page')
+    if (pageParam) {
+      page = parseInt(pageParam, 10) || 1
+    }
+
+    window.addEventListener('popstate', () => {
+      const url = new URL(window.location.toString())
+      const pageParam = url.searchParams.get('page')
+      page = parseInt(pageParam, 10) || 1
+      window.scrollTo(0, 0)
+    })
+  })
+
   Promise.all([GAME.ranking(game)])
     .then(([users]) => {
-      console.log(users)
-      d = { users };
+      d = { users }
+      totalPages = Math.ceil(users.length / perPage)
     })
     .catch((e) => error = e.message);
 
   let hoveringUser = "";
   let hoverLoading = false;
+
+  $: paginatedUsers = d ? d.users.slice((page - 1) * perPage, page * perPage) : []
 </script>
 
 <main class="content leaderboard">
@@ -37,8 +69,12 @@
   </div>
 
   {#if d}
+    {#if page > 1}
+      <Pagination {page} {totalPages} on:updatePage={handleUpdatePage} />
+    {/if}
+
     <div class="leaderboard-container">
-      <div class="lb-user" on:mouseenter={() => hoveringUser = d.users[0].username} role="heading" aria-level="2">
+      <div class="lb-user" on:mouseenter={() => hoveringUser = paginatedUsers[0]?.username} role="heading" aria-level="2">
         <span class="rank">{t("Leaderboard.Rank")}</span>
         <span class="name"></span>
         <span class="rating">{t("Leaderboard.Rating")}</span>
@@ -46,7 +82,7 @@
         <span class="fc">{t("Leaderboard.FC")}</span>
         <span class="ap">{t("Leaderboard.AP")}</span>
       </div>
-      {#each d.users as user, i (user.rank)}
+      {#each paginatedUsers as user, i (user.rank)}
         <div class="lb-user" class:alternate={i % 2 === 1} role="listitem"
           on:mouseover={() => hoveringUser = user.username} on:focus={() => {}}>
 
@@ -70,6 +106,8 @@
       {/each}
     </div>
 
+    <Pagination {page} {totalPages} on:updatePage={handleUpdatePage} />
+
     <Tooltip triggeredBy=".name" loading={hoverLoading}>
       <UserCard username={hoveringUser} {game} setLoading={l => hoverLoading = l} />
     </Tooltip>
@@ -132,5 +170,4 @@
     &.alternate
       background-color: vars.$ov-light
 
-
 </style>
diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte
index 31fda27a..d9c60778 100644
--- a/AquaNet/src/pages/User/Settings.svelte
+++ b/AquaNet/src/pages/User/Settings.svelte
@@ -23,7 +23,7 @@
   let error: string;
   let submitting = ""
   let tab = 0
-  let tabs = [ 'profile', 'game' ]
+  let tabs = ['profile']
 
   const profileFields = [
     [ 'displayName', t('settings.profile.name') ],
@@ -45,18 +45,11 @@
     me = m
 
     CARD.userGames(m.username).then(games => {
-      if (games.chu3 && !tabs.includes('chu3')) {
-        tabs = [...tabs, 'chu3']
-      }
-      if (games.mai2 && !tabs.includes('mai2')) {
-        tabs = [...tabs, 'mai2']
-      }
-      if (games.wacca && !tabs.includes('wacca')) {
-        tabs = [...tabs, 'wacca']
-      }
-      if (games.ongeki && !tabs.includes('ongeki')) {
-        tabs = [...tabs, 'ongeki']
-      }
+      tabs = [
+        ...tabs, 
+        ...['chu3', 'mai2','wacca', 'ongeki'].filter(v => games[v as keyof typeof games]), // :xdx:
+        'global'
+      ]
     })
   }).catch(e => error = e.message)
   getMe()
@@ -217,7 +210,7 @@
     <WaccaSettings />
   {:else if tabs[tab] === 'ongeki'}
     <OngekiSettings />
-  {:else if tabs[tab] === 'game'}
+  {:else if tabs[tab] === 'global'}
     <GeneralGameSettings />
   {/if}
 
diff --git a/AquaNet/src/pages/Welcome.svelte b/AquaNet/src/pages/Welcome.svelte
index aeebd01d..9442fc57 100644
--- a/AquaNet/src/pages/Welcome.svelte
+++ b/AquaNet/src/pages/Welcome.svelte
@@ -5,7 +5,6 @@
   import Icon from "@iconify/svelte";
   import { USER } from "../libs/sdk";
   import { t } from "../libs/i18n"
-  import MunetRegisterBanner from "../components/MunetRegisterBanner.svelte";
 
   let params = new URLSearchParams(window.location.search)
 
@@ -100,9 +99,6 @@
             state = 'verify'
             verifyMsg = t("welcome.verify-state-2")
           }
-          else if (e.message === 'Login not allowed: Card has been migrated to Minato.') {
-            location.href = `https://portal.mumur.net/login?username=${encodeURIComponent(email)}`
-          }
           else {
             error = e.message
             submitting = false // unnecessary? see line 113, same for both reset functions
@@ -162,7 +158,7 @@
       return submitting = false
     }
 
-    // Send request to server 
+    // Send request to server
     await USER.changePassword({ token, password })
       .then(() => {
         state = 'verify'
@@ -221,9 +217,6 @@
                    on:turnstile-expired={_ => window.location.reload()}
                    on:turnstile-timeout={_ => console.log(error = t('welcome.turnstile-timeout'))} />
         {/if}
-        {#if isSignup}
-          <MunetRegisterBanner username={username} email={email}/>
-        {/if}
       </div>
     {:else if state === "submitreset"}
       <div class="login-form" transition:slide>
@@ -264,7 +257,7 @@
       {#if error}
         <span class="error">{error}</span>
       {/if}
-      <div class="login-form" transition:slide> 
+      <div class="login-form" transition:slide>
         <input type="password" placeholder={t('new-password')} bind:value={password}>
           <button on:click={changePassword}>
             {#if submitting}
diff --git a/README.md b/README.md
index 01fed622..35b3c7ab 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,8 @@ Check out these docs for more information.
 * [Game specific notes](docs/game_specific_notes.md)
 * [Frequently asked questions](docs/frequently_asked_questions.md)
 
-> [!TIP]  
-> Some games may require additional patches and these will not be provided in this project and repository. You already found this, so you know where to find related resources too.
+> [!WARNING]  
+> CHUNITHM pre-NEW!! and maimai pre-DX are no longer supported after February 6th, 2026 and all associated data will be removed.
 
 ## Usage
 If you own a cab or controller and just want to play the game, follow the instructions below:
@@ -59,7 +59,7 @@ If you own a cab or controller and just want to play the game, follow the instru
 5. Pet your cat 🐱
 6. Link your card on the website. 
 
-If you encounter any issue, please report in the [issue tracker](https://MewoLab/AquaDX/issues).
+If you encounter any issue, please report in the [issue tracker](https://github.com/MewoLab/AquaDX/issues).
 
 > [!TIP]  
 > If you don't know your card ID, there's always a button on the login screen of the game that can read a card's access code.
diff --git a/src/main/java/ext/Ext.kt b/src/main/java/ext/Ext.kt
index 6a665591..2a790312 100644
--- a/src/main/java/ext/Ext.kt
+++ b/src/main/java/ext/Ext.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.withContext
 import org.apache.tika.Tika
 import org.apache.tika.mime.MimeTypes
 import org.slf4j.LoggerFactory
+import org.springframework.context.ApplicationContext
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity.BodyBuilder
@@ -34,8 +35,10 @@ import java.util.concurrent.locks.Lock
 import kotlin.reflect.KCallable
 import kotlin.reflect.KClass
 import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.javaField
 import kotlin.reflect.jvm.jvmErasure
 
 typealias RP = RequestParam
@@ -80,7 +83,9 @@ annotation class SettingField(
 
 // Reflection
 @Suppress("UNCHECKED_CAST")
-fun <T : Any> KClass<T>.vars() = memberProperties.mapNotNull { it as? Var<T, Any> }
+fun <T : Any> KClass<T>.ownVars() = declaredMemberProperties.sortedBy { it.javaField?.declaringClass?.declaredFields?.indexOf(it.javaField) ?: Int.MAX_VALUE }.mapNotNull { it as? Var<T, Any> }
+@Suppress("UNCHECKED_CAST")
+fun <T : Any> KClass<T>.vars(): List<Var<T, Any>> = supertypes.mapNotNull { it.classifier as? KClass<*> }.filter { !it.java.isInterface }.flatMap{ it.vars() as List<Var<T, Any>> } + ownVars()
 fun <T : Any> KClass<T>.varsMap() = vars().associateBy { it.name }
 fun <T : Any> KClass<T>.getters() = java.methods.filter { it.name.startsWith("get") }
 fun <T : Any> KClass<T>.gettersMap() = getters().associateBy { it.name.removePrefix("get").firstCharLower() }
@@ -268,3 +273,6 @@ val <S> Pair<*, S>.r get() = component2()
 val Query.exec get() = resultList.map { (it as Array<*>).toList() }
 fun List<List<Any?>>.numCsv(vararg head: Str) = head.joinToString(",") + "\n" +
     joinToString("\n") { it.joinToString(",") }
+
+// DI
+inline fun <reified T> ApplicationContext.lazy() = lazy { getBean(T::class.java) }
diff --git a/src/main/java/ext/Json.kt b/src/main/java/ext/Json.kt
index d8a7e4c5..f7acf3ac 100644
--- a/src/main/java/ext/Json.kt
+++ b/src/main/java/ext/Json.kt
@@ -21,15 +21,15 @@ val JSON_FUZZY_BOOLEAN = SimpleModule().addDeserializer(Boolean::class.java, obj
         else -> 400 - "Invalid boolean value ${parser.text}"
     }
 })
-val JSON_DATETIME = SimpleModule().addDeserializer(java.time.LocalDateTime::class.java, object : JsonDeserializer<java.time.LocalDateTime>() {
+val JSON_DATETIME = SimpleModule().addDeserializer(java.time.LocalDateTime::class.java, object : JsonDeserializer<LocalDateTime>() {
     override fun deserialize(parser: JsonParser, context: DeserializationContext) =
         // First try standard formats via asDateTime() method
-        parser.text.asDateTime() ?: try {
+        parser.text.takeIf { it.isNotEmpty() }?.run { asDateTime() ?: try {
             // Try maimai2 format (yyyy-MM-dd HH:mm:ss.0)
             LocalDateTime.parse(parser.text, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0"))
         } catch (e: Exception) {
             400 - "Invalid date time value ${parser.text}"
-        }
+        } }
 })
 val JACKSON = jacksonObjectMapper().apply {
     setSerializationInclusion(JsonInclude.Include.NON_NULL)
diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt
index 96c3334f..e015eb39 100644
--- a/src/main/java/icu/samnyan/aqua/net/CardController.kt
+++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt
@@ -101,8 +101,7 @@ class CardController(
         val games = migrate.split(',')
         cardGameService.migrate(card, games)
 
-        fedy.onCardLinked(card.luid, oldExtId = card.extId, ghostExtId = u.ghostCard.extId,
-                          games.map { Fedy.getGameName(it) }.filterNotNull())
+        fedy.onCardLinked(card.luid, oldExtId = card.extId, ghostExtId = u.ghostCard.extId, games)
 
         log.info("Net /card/link : Linked card ${card.id} to user ${u.username} and migrated data to ${games.joinToString()}")
 
@@ -207,7 +206,8 @@ class CardGameService(
     val diva: PlayerProfileRepository,
     val safety: AquaNetSafetyService,
     val cardRepo: CardRepository,
-    val em: EntityManager
+    val em: EntityManager,
+    val cardService: CardService
 ) {
     companion object {
         val log = logger()
@@ -225,7 +225,9 @@ class CardGameService(
         val remainingGames = dataRepos.keys.toMutableSet()
         games.forEach { game ->
             val dataRepo = dataRepos[game] ?: return@forEach
-            migrateCard(game, dataRepo, cardRepo, crd)
+            if (migrateCard(game, dataRepo, cardRepo, crd))
+                // Update timestamp for the ghost card (data migrated in)
+                cardService.updateCardTimestamp(crd.aquaUser!!.ghostCard, game, resetCreatedAt = true)
             remainingGames.remove(game)
         }
         // For remaining games, orphan the data by assigning them to a dummy card
diff --git a/src/main/java/icu/samnyan/aqua/net/Fedy.kt b/src/main/java/icu/samnyan/aqua/net/Fedy.kt
index 5d4ce50b..c2f6359a 100644
--- a/src/main/java/icu/samnyan/aqua/net/Fedy.kt
+++ b/src/main/java/icu/samnyan/aqua/net/Fedy.kt
@@ -3,6 +3,7 @@ package icu.samnyan.aqua.net
 import ext.*
 import icu.samnyan.aqua.net.components.EmailProperties
 import icu.samnyan.aqua.net.components.JWT
+import icu.samnyan.aqua.net.db.AquaGameOptions
 import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.ExportOptions
@@ -24,7 +25,9 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.support.TransactionTemplate
 import org.springframework.web.bind.annotation.RestController
+import org.springframework.context.ApplicationContext
 import org.springframework.web.multipart.MultipartFile
+import java.time.Instant
 import java.security.MessageDigest
 import java.util.concurrent.CompletableFuture
 import kotlin.io.path.getLastModifiedTime
@@ -41,11 +44,11 @@ class FedyProps {
     var remote: String = ""
 }
 
-data class UserProfilePicture(val url: Str, val lastUpdatedMs: Long)
+data class UserProfilePicture(val url: Str, val updatedAtMs: Long)
 data class UserBasicInfo(
     val auId: Long, val ghostExtId: Long, val registrationTimeMs: Long,
     val username: Str, val displayName: Str, val email: Str, val passwordHash: Str, val profileBio: Str,
-    val profilePicture: UserProfilePicture?,
+    val profilePicture: UserProfilePicture?, val gameOptions: Map<Str, Any?>?,
 )
 
 private data class UserUpdatedEvent(val user: UserBasicInfo, val isNewlyCreated: Bool)
@@ -66,21 +69,23 @@ private data class FedyEvent(
 @API("/api/v2/fedy", consumes = ["multipart/form-data"])
 class Fedy(
     val jwt: JWT,
-    val us: AquaUserServices,
     val emailProps: EmailProperties,
     val cardRepo: CardRepository,
-    val cardService: CardService,
-    val mai2Import: Mai2Import,
     val mai2UserDataRepo: Mai2UserDataRepo,
-    val mai2UploadUserPlaylog: Mai2UploadUserPlaylogHandler,
-    val mai2UpsertUserAll: Mai2UpsertUserAllHandler,
     val chu3UserDataRepo: Chu3UserDataRepo,
     val ongekiUserDataRepo: OgkUserDataRepo,
     val waccaUserDataRepo: WcUserRepo,
     val props: FedyProps,
     val paths: PathProps,
-    val transactionManager: PlatformTransactionManager
+    val transactionManager: PlatformTransactionManager,
+    ctx: ApplicationContext
 ) {
+    val us by ctx.lazy<AquaUserServices>()
+    val cardService by ctx.lazy<CardService>()
+    val mai2Import by ctx.lazy<Mai2Import>()
+    val mai2UploadUserPlaylog by ctx.lazy<Mai2UploadUserPlaylogHandler>()
+    val mai2UpsertUserAll by ctx.lazy<Mai2UpsertUserAllHandler>()
+
     val transaction by lazy { TransactionTemplate(transactionManager) }
 
     private fun Str.checkKey() {
@@ -127,7 +132,7 @@ class Fedy(
         } caught { UserRegisterRes(error = it) }
     }
 
-    data class UserUpdateReq(val auId: Long, val fields: Map<Str, Str?>?)
+    data class UserUpdateReq(val auId: Long, val fields: Map<Str, Str?>?, val gameOptions: Map<Str, Any?>?)
     data class UserUpdateRes(val error: FedyErr? = null, val user: UserBasicInfo? = null)
     @API("/user/update")
     fun handleUserUpdate(@RH(KEY_HEADER) key: Str, @RT(REQ_PART) req: UserUpdateReq, @RT(PFP_PART) pfpFile: MultipartFile?): UserUpdateRes = handleFedy(key) {
@@ -138,12 +143,16 @@ class Fedy(
                 if (k == "email") { ru.email = us.validateEmail(v) }
                 else us.update(ru, k, v)
             }
-            pfpFile?.run {
+            pfpFile?.apply {
                 val mime = TIKA.detect(pfpFile.bytes).takeIf { it.startsWith("image/") } ?: (400 - "Invalid file type")
                 val name = "${ru.auId}${MIMES.forName(mime)?.extension ?: ".jpg"}"
                 (paths.aquaNetPortrait.path() / name).writeBytes(bytes)
                 ru.profilePicture = name
             }
+            req.gameOptions?.apply {
+                val options = ru.gameOptions ?: AquaGameOptions().also { ru.gameOptions = it }
+                forEach { (k, v) -> v?.let { GAME_OPTIONS_FIELDS[k]?.set(options, it) } }
+            }
             us.userRepo.save(ru)
             if (fields.containsKey("pwHash") ?: false) { us.clearAllSessions(ru) }
             UserUpdateRes(user = ru.fedyBasicInfo())
@@ -157,25 +166,31 @@ class Fedy(
             ?.let { paths.aquaNetPortrait.path() / it }?.takeIf { it.isRegularFile() }
             ?.let { UserProfilePicture(
                 url = "/uploads/net/portrait/${profilePicture}",
-                lastUpdatedMs = it.getLastModifiedTime().toMillis()
-            ) }
+                updatedAtMs = it.getLastModifiedTime().toMillis()
+            ) },
+        gameOptions?.let { o -> GAME_OPTIONS_FIELDS.mapValues { it.value.get(o) } }
     )
 
-    data class DataPullReq(val extId: Long, val game: Str, val exportOptions: ExportOptions)
-    data class DataPullRes(val error: FedyErr? = null, val result: Any? = null)
+    data class DataPullReq(val extId: Long, val game: Str, val createdAtMs: Long, val updatedAtMs: Long, val exportOptions: ExportOptions)
+    data class DataPullResult(val data: Any?, val createdAtMs: Long, val updatedAtMs: Long, val isRebased: Bool)
+    data class DataPullRes(val error: FedyErr? = null, val result: DataPullResult? = null)
     @API("/data/pull")
     fun handleDataPull(@RH(KEY_HEADER) key: Str, @RT(REQ_PART) req: DataPullReq): DataPullRes = handleFedy(key) {
         val card = cardRepo.findByExtId(req.extId)
             ?: (404 - "Card with extId ${req.extId} not found")
+        val cardTimestamp = cardService.getCardTimestamp(card, req.game)
+        if (cardTimestamp.updatedAt.toEpochMilli() == req.updatedAtMs) return@handleFedy DataPullRes(error = null, result = null) // No changes
+        val isRebased = req.createdAtMs > 0 && cardTimestamp.createdAt.toEpochMilli() > req.createdAtMs
+        val exportOptions = if (!isRebased) { req.exportOptions } else { req.exportOptions.copy(playlogAfter = null) }
         {
-            DataPullRes(result = when (req.game) {
-                "mai2" -> mai2Import.export(card, req.exportOptions)
+            DataPullRes(result = DataPullResult(data = when (req.game) {
+                "mai2" -> mai2Import.export(card, exportOptions)
                 else -> 406 - "Unsupported game"
-            })
+            }, createdAtMs = cardTimestamp.createdAt.toEpochMilli(), updatedAtMs = cardTimestamp.updatedAt.toEpochMilli(), isRebased = isRebased))
         } caught { DataPullRes(error = it) }
     }
 
-    data class DataPushReq(val extId: Long, val game: Str, val data: JDict, val removeOldData: Bool)
+    data class DataPushReq(val extId: Long, val game: Str, val data: JDict, val removeOldData: Bool, val updatedAtMs: Long)
     @Suppress("UNCHECKED_CAST")
     @API("/data/push")
     fun handleDataPush(@RH(KEY_HEADER) key: Str, @RT(REQ_PART) req: DataPushReq): Any = handleFedy(key) {
@@ -187,6 +202,7 @@ class Fedy(
                 repo.flush()
             }
         }
+        val card = cardRepo.findByExtId(extId) ?: (404 - "Card not found")
         transaction.execute { when (req.game) {
             "mai2" -> {
                 if (req.removeOldData) { removeOldData(mai2UserDataRepo) }
@@ -197,7 +213,7 @@ class Fedy(
             }
             else -> 406 - "Unsupported game"
         } }
-
+        cardService.updateCardTimestamp(card, req.game, now = Instant.ofEpochMilli(req.updatedAtMs), resetCreatedAt = req.removeOldData)
         SUCCESS
     }
 
@@ -220,9 +236,9 @@ class Fedy(
             var pairedCard = cardService.tryLookup(req.pairedLuid)?.maybeGhost()
             if (pairedCard?.extId != card?.extId) {
                 var isGhost = pairedCard?.isGhost == true
-                var isFresh = pairedCard != null && isCardFresh(pairedCard)
-                if (isGhost && isFresh) isPairedLuidDiverged = true
-                else if (!isGhost && card?.isGhost == true) {
+                var isNonFresh = pairedCard != null && !isCardFresh(pairedCard)
+                if (isGhost || isNonFresh) isPairedLuidDiverged = true
+                else if (card?.isGhost == true) {
                     // Ensure paired card is linked, if the main card is linked
                     // If the main card is not linked, there's nothing Fedy can do. It's Fedy's best effort.
                     if (pairedCard == null) { pairedCard = cardService.registerByAccessCode(req.pairedLuid, card.aquaUser) }
@@ -275,17 +291,16 @@ class Fedy(
         log.info("Fedy /card/unlink : Unlinked card ${card.id} (${card.luid}) from user ${cu.auId} (${cu.username})")
     }
 
-    fun onUserUpdated(u: AquaNetUser, isNew: Bool = false) = maybeNotifyAsync(FedyEvent(userUpdated = UserUpdatedEvent(u.fedyBasicInfo(), isNew)))
-    fun onCardCreated(luid: Str, extId: Long) = maybeNotifyAsync(FedyEvent(cardCreated = CardCreatedEvent(luid, extId)))
-    fun onCardLinked(luid: Str, oldExtId: Long?, ghostExtId: Long, migratedGames: List<Str>) = maybeNotifyAsync(FedyEvent(cardLinked = CardLinkedEvent(luid, oldExtId, ghostExtId, migratedGames)))
-    fun onCardUnlinked(luid: Str) = maybeNotifyAsync(FedyEvent(cardUnlinked = CardUnlinkedEvent(luid)))
-    fun onDataUpdated(extId: Long, game: Str, removeOldData: Bool) = maybeNotifyAsync({
+    fun onUserUpdated(u: AquaNetUser, isNew: Bool = false) = maybeNotifyAsync { FedyEvent(userUpdated = UserUpdatedEvent(u.fedyBasicInfo(), isNew)) }
+    fun onCardCreated(luid: Str, extId: Long) = maybeNotifyAsync { FedyEvent(cardCreated = CardCreatedEvent(luid, extId)) }
+    fun onCardLinked(luid: Str, oldExtId: Long?, ghostExtId: Long, migratedGames: List<Str>) = maybeNotifyAsync { FedyEvent(cardLinked = CardLinkedEvent(luid, oldExtId, ghostExtId, migratedGames)) }
+    fun onCardUnlinked(luid: Str) = maybeNotifyAsync { FedyEvent(cardUnlinked = CardUnlinkedEvent(luid)) }
+    fun onDataUpdated(extId: Long, game: Str, removeOldData: Bool) = maybeNotifyAsync {
         val card = cardRepo.findByExtId(extId) ?: return@maybeNotifyAsync null // Card not found, nothing to do
         FedyEvent(dataUpdated = DataUpdatedEvent(extId, card.isGhost, game, removeOldData))
-    })
+    }
 
-    private fun maybeNotifyAsync(event: FedyEvent) = maybeNotifyAsync({ event })
-    private fun maybeNotifyAsync(getEvent: () -> FedyEvent?) = if (!props.enabled && !suppressEvents.get()) {} else CompletableFuture.runAsync {
+    private fun maybeNotifyAsync(getEvent: () -> FedyEvent?) = if (!props.enabled || suppressEvents.get()) {} else CompletableFuture.runAsync {
         var event: FedyEvent? = null
         try {
             event = getEvent()
@@ -325,7 +340,7 @@ class Fedy(
 
     // Apparently existing cards could possibly be fresh and never used in any game. Treat them as new cards.
     private fun isCardFresh(c: Card): Bool {
-        fun <T : IUserData> checkForGame(repo: GenericUserDataRepo<T>, card: Card): Bool = repo.findByCard(card) == null
+        fun <T : IUserData> checkForGame(repo: GenericUserDataRepo<T>, card: Card): Bool = repo.findByCard(card) != null
         return when {
             checkForGame(mai2UserDataRepo, c) -> false
             checkForGame(chu3UserDataRepo, c) -> false
@@ -344,18 +359,12 @@ class Fedy(
         const val KEY_HEADER = "X-Fedy-Key"
         const val REQ_PART = "request"
         const val PFP_PART = "profilePicture"
+        @Suppress("UNCHECKED_CAST")
+        val GAME_OPTIONS_FIELDS = listOf(
+            O::mai2UnlockMusic, O::mai2UnlockChara, O::mai2UnlockCharaMaxLevel, O::mai2UnlockPartners, O::mai2UnlockCollectables, O::mai2UnlockTickets
+        ).map { it as Var<O, Any?> }.associateBy { it.name }
         val log = logger()
-
-        fun getGameName(gameId: Str) = when (gameId) {
-            "mai2" -> "mai2"
-            "SDEZ" -> "mai2"
-            "chu3" -> "chu3"
-            "SDHD" -> "chu3"
-            "ongeki" -> "mu3"
-            "SDDT" -> "mu3"
-            "wacca" -> "wacca"
-            "SDFE" -> "wacca"
-            else -> null // Not supported
-        }
     }
 }
+
+typealias O = AquaGameOptions
diff --git a/src/main/java/icu/samnyan/aqua/net/SettingsApi.kt b/src/main/java/icu/samnyan/aqua/net/SettingsApi.kt
index eda35a8e..fb761aa1 100644
--- a/src/main/java/icu/samnyan/aqua/net/SettingsApi.kt
+++ b/src/main/java/icu/samnyan/aqua/net/SettingsApi.kt
@@ -14,7 +14,8 @@ import kotlin.reflect.jvm.jvmErasure
 class SettingsApi(
     val us: AquaUserServices,
     val userRepo: AquaNetUserRepo,
-    val goRepo: AquaGameOptionsRepo
+    val goRepo: AquaGameOptionsRepo,
+    val fedy: Fedy
 ) {
     // Get all params with SettingField annotation
     val fields = AquaGameOptions::class.vars()
@@ -41,6 +42,6 @@ class SettingsApi(
         }
         // Check field type
         field.setCast(options, value)
-        goRepo.save(options)
+        goRepo.save(options).also { fedy.onUserUpdated(u) }
     }
 }
diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
index 6f073980..99915057 100644
--- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -12,8 +12,6 @@ import icu.samnyan.aqua.sega.general.dao.CardRepository
 import icu.samnyan.aqua.sega.general.model.CardStatus
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.context.annotation.Lazy
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.multipart.MultipartFile
@@ -27,6 +25,7 @@ class UserRegistrar(
     val hasher: PasswordEncoder,
     val turnstileService: TurnstileService,
     val emailService: EmailService,
+    val fedy: Fedy,
     val geoIP: GeoIP,
     val jwt: JWT,
     val confirmationRepo: EmailConfirmationRepo,
@@ -36,7 +35,6 @@ class UserRegistrar(
     val emailProps: EmailProperties,
     final val paths: PathProps
 ) {
-    @Autowired @Lazy lateinit var fedy: Fedy
     val portraitPath = paths.aquaNetPortrait.path()
 
     companion object {
@@ -92,8 +90,6 @@ class UserRegistrar(
             ?: (400 - "User not found")
         if (!hasher.matches(password, user.pwHash)) 400 - "Invalid password"
 
-        if (user.ghostCard.status == CardStatus.MIGRATED_TO_MINATO) 400 - "Login not allowed: Card has been migrated to Minato."
-
         // Check if email is verified
         if (!user.emailConfirmed && emailProps.enable) {
             // Check if last confirmation email was sent within a minute
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 f5067b00..a81679e4 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
@@ -2,10 +2,7 @@ package icu.samnyan.aqua.net.db
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import ext.SettingField
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import jakarta.persistence.*
 import org.springframework.data.jpa.repository.JpaRepository
 
 @Entity
@@ -14,21 +11,29 @@ class AquaGameOptions(
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     var id: Long = 0,
 
-    @SettingField("general")
-    var unlockMusic: Boolean = false,
-
-    @SettingField("general")
-    var unlockChara: Boolean = false,
-
-    @SettingField("general")
-    var unlockCollectables: Boolean = false,
-
-    @SettingField("general")
-    var unlockTickets: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_music")
+    var mai2UnlockMusic: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_chara")
+    var mai2UnlockChara: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_chara_max_level")
+    var mai2UnlockCharaMaxLevel: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_partners")
+    var mai2UnlockPartners: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_collectables")
+    var mai2UnlockCollectables: Boolean = false,
+    @SettingField("mai2") @Column(name = "mai2_unlock_tickets")
+    var mai2UnlockTickets: Boolean = false,
 
+    @SettingField("wacca")
+    var waccaUnlockMusic: Boolean = false,
+    @SettingField("wacca")
+    var waccaUnlockPlates: Boolean = false,
+    @SettingField("wacca")
+    var waccaUnlockCollectables: Boolean = false,
+    @SettingField("wacca")
+    var waccaUnlockTickets: Boolean = false,
     @SettingField("wacca")
     var waccaInfiniteWp: Boolean = false,
-
     @SettingField("wacca")
     var waccaAlwaysVip: Boolean = false,
 
diff --git a/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt b/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
index 197f4d04..100e7175 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
@@ -5,7 +5,7 @@ import icu.samnyan.aqua.net.BotProps
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.model.CardStatus
+import icu.samnyan.aqua.sega.general.service.CardService
 import jakarta.annotation.PostConstruct
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -27,9 +27,12 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
     abstract val playlogRepo: GenericPlaylogRepo<*>
     abstract val userMusicRepo: GenericUserMusicRepo<*>
     abstract val shownRanks: List<Pair<Int, String>>
+
     abstract val settableFields: Map<String, (T, String) -> Unit>
     open val gettableFields: Set<String> = setOf()
 
+    @Autowired lateinit var cardService: CardService
+
     @API("trend")
     abstract suspend fun trend(@RP username: String): List<TrendOut>
     @API("user-summary")
@@ -56,7 +59,7 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
 
         val reqUser = token?.let { us.jwt.auth(it) }?.let { u ->
             // Optimization: If the user is not banned, we don't need to process user information
-            if (!u.ghostCard.rankingBanned && !u.cards.any { it.rankingBanned } && u.ghostCard.status == CardStatus.NORMAL) null
+            if (!u.ghostCard.rankingBanned && !u.cards.any { it.rankingBanned } && u.ghostCard.status.isNormal) null
             else u
         }
 
@@ -124,13 +127,11 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
         (settableFields.keys.toSet() + gettableFields)
             .associateWith { k -> (vm[k] ?: error("Field $k not found")) }
     } }
-
     @API("user-detail")
     suspend fun userDetail(@RP username: String) = us.cardByName(username) { card ->
         val u = userDataRepo.findByCard(card) ?: (404 - "User not found")
         userDetailFields.toList().associate { (k, f) -> k to f.invoke(u) }
     }
-
     @API("user-detail-set")
     suspend fun userDetailSet(@RP token: String, @RP field: String, @RP value: String): Any {
         val prop = settableFields[field] ?: (400 - "Invalid field $field")
@@ -139,10 +140,16 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
             val user = async { userDataRepo.findByCard(u.ghostCard) } ?: (404 - "User not found")
             prop(user, value)
             async { userDataRepo.save(user) }
+            cardService.updateCardTimestamp(u.ghostCard, name)
             SUCCESS
         }
     }
 
+    @API("user-option")
+    open suspend fun userOption(@RP token: String): Any? = 400 - "Unsupported by this game"
+    @API("user-option-set")
+    open suspend fun userOptionSet(@RP token: String, @RP field: String, @RP value: Int): Any = 400 - "Unsupported by this game"
+
     @API("user-music-from-list")
     suspend fun userMusicFromList(@RP username: Str, @RB musicList: List<Int>) = us.cardByName(username) { card ->
         userMusicRepo.findByUser_Card_ExtIdAndMusicIdIn(card.extId, musicList)
diff --git a/src/main/java/icu/samnyan/aqua/net/games/ImportController.kt b/src/main/java/icu/samnyan/aqua/net/games/ImportController.kt
index 4c85cf4d..248772f8 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/ImportController.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/ImportController.kt
@@ -7,6 +7,7 @@ import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.utils.AquaNetProps
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.general.model.Card
+import icu.samnyan.aqua.sega.general.service.CardService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
@@ -49,6 +50,7 @@ interface IUserRepo<UserModel, ThisModel>: JpaRepository<ThisModel, Long> {
  * Import controller for a game
  *
  * @param game: 4-letter Game ID
+ * @param gameName: mai2/chu3/ongeki
  * @param exportFields: Mapping of type names to variables in the export model
  *      (e.g. "Mai2UserCharacter" -> Mai2DataExport::userCharacterList)
  * @param exportRepos: Mapping of variables to repositories that can be used to find the data
@@ -56,6 +58,7 @@ interface IUserRepo<UserModel, ThisModel>: JpaRepository<ThisModel, Long> {
  */
 abstract class ImportController<ExportModel: IExportClass<UserModel>, UserModel: IUserData>(
     val game: String,
+    val gameName: String,
     val exportClass: KClass<ExportModel>,
     val exportFields: Map<String, Var<ExportModel, Any>>,
     val exportRepos: Map<Var<ExportModel, Any>, IUserRepo<UserModel, *>>,
@@ -70,7 +73,7 @@ abstract class ImportController<ExportModel: IExportClass<UserModel>, UserModel:
     @Autowired lateinit var netProps: AquaNetProps
     @Autowired lateinit var transManager: PlatformTransactionManager
     val trans by lazy { TransactionTemplate(transManager) }
-    @Autowired @Lazy lateinit var fedy: Fedy
+    @Autowired lateinit var cardService: CardService
 
     init {
         artemisRenames.values.forEach {
@@ -147,7 +150,7 @@ abstract class ImportController<ExportModel: IExportClass<UserModel>, UserModel:
             }
         }
 
-        Fedy.getGameName(game)?.let { fedy.onDataUpdated(u.ghostCard.extId, it, true) }
+        cardService.updateCardTimestamp(u.ghostCard, gameName, resetCreatedAt = true)
 
         SUCCESS
     }
diff --git a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt
index be9a45eb..f6292dc0 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt
@@ -17,7 +17,7 @@ import kotlin.reflect.full.declaredMembers
 class Chu3Import(
     val repos: Chu3Repos,
 ) : ImportController<Chu3DataExport, Chu3UserData>(
-    "SDHD", Chu3DataExport::class,
+    "SDHD", "chu3", Chu3DataExport::class,
     exportFields = Chu3DataExport::class.vars().associateBy {
         it.name.replace("List", "").lowercase()
     },
diff --git a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt
index cc34f4db..303b5262 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt
@@ -9,7 +9,12 @@ import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
 import icu.samnyan.aqua.sega.chusan.model.Chu3UserMusicDetailRepo
 import icu.samnyan.aqua.sega.chusan.model.Chu3UserPlaylogRepo
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData
+import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption
 import org.springframework.web.bind.annotation.RestController
+import kotlin.jvm.optionals.getOrNull
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.memberProperties
 
 @RestController
 @API("api/v2/game/chu3")
@@ -36,6 +41,7 @@ class Chusan(
         "trophyIdSub2" to { u, v -> u.trophyIdSub2 = v.int },
         "mapIconId" to { u, v -> u.mapIconId = v.int },
         "voiceId" to { u, v -> u.voiceId = v.int },
+        "characterId" to { u, v -> u.characterId = v.int },
         "avatarWear" to { u, v -> u.avatarWear = v.int },
         "avatarHead" to { u, v -> u.avatarHead = v.int },
         "avatarFace" to { u, v -> u.avatarFace = v.int },
@@ -47,7 +53,7 @@ class Chusan(
         "lastRomVersion" to { u, v -> u.lastRomVersion = v },
         "lastDataVersion" to { u, v -> u.lastDataVersion = v },
     ) }
-    override val gettableFields: Set<String> = setOf("level", "playerRating", "characterId")
+    override val gettableFields: Set<String> = setOf("level", "playerRating")
 
     override suspend fun userSummary(@RP username: Str, @RP token: String?) = us.cardByName(username) { card ->
         // Summary values: total plays, player rating, server-wide ranking
@@ -97,6 +103,23 @@ class Chusan(
         )
     }
 
+    @API("user-option")
+    override suspend fun userOption(@RP token: String): Any? = us.jwt.auth(token) { u ->
+        rp.userGameOption.findByUser_Card_ExtId(u.ghostCard.extId).getOrNull(0)
+    }
+    @API("user-option-set")
+    override suspend fun userOptionSet(@RP token: String, @RP field: String, @RP value: Int): Any = us.jwt.auth(token) { u ->
+        val gameOptions = rp.userGameOption.findSingleByUser_Card_ExtId(u.ghostCard.extId)
+        val property = UserGameOption::class.memberProperties.filterIsInstance<KMutableProperty1<Any, Any?>>().find{ it.name == field }
+
+        if (property != null && gameOptions != null) {
+            property.setter.call(gameOptions, value)
+            rp.userGameOption.save(gameOptions)
+            200 - "Success"
+        } else
+            400 - "Invalid parameters"
+    }
+
     // UserBox related APIs
     @API("user-box")
     fun userBox(@RP token: String) = us.jwt.auth(token) {
diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt
index 8fe0df64..850d0bb6 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt
@@ -20,7 +20,7 @@ import kotlin.reflect.full.declaredMembers
 class Mai2Import(
     val repos: Mai2Repos,
 ) : ImportController<Maimai2DataExport, Mai2UserDetail>(
-    "SDEZ", Maimai2DataExport::class,
+    "SDEZ", "mai2", Maimai2DataExport::class,
     exportFields = Maimai2DataExport::class.vars().associateBy {
         it.name.replace("List", "").lowercase()
     },
diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt
index 46195599..180d2b90 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt
@@ -6,6 +6,7 @@ import ext.RP
 import ext.minus
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.utils.SUCCESS
+import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMusicDetail
 import org.springframework.web.bind.annotation.PostMapping
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController
 class Mai2MusicDetailImport(
     val us: AquaUserServices,
     val repos: Mai2Repos,
+    val cardService: CardService,
 ) {
     @PostMapping("import-music-detail")
     suspend fun importMusicDetail(@RP token: String, @RB data: List<Mai2UserMusicDetail>) = us.jwt.auth(token) { u ->
@@ -36,6 +38,7 @@ class Mai2MusicDetailImport(
                 }
             }
             repos.userMusicDetail.saveAll(data)
+            cardService.updateCardTimestamp(card, "mai2")
             SUCCESS
         }
     }
diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
index 0312bd96..1a7fbc47 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
@@ -13,9 +13,13 @@ import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserGeneralData
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserLoginBonus
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserOption
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController
+import kotlin.jvm.optionals.getOrNull
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.memberProperties
 
 @RestController
 @API("api/v2/game/mai2")
@@ -115,6 +119,7 @@ class Maimai2(
             val user = userDataRepo.findByCard(card) ?: (404 - "User not found")
             user.userName = newNameFull
             userDataRepo.save(user)
+            cardService.updateCardTimestamp(card, "mai2")
         }
         mapOf("newName" to newNameFull)
     }
@@ -144,10 +149,29 @@ class Maimai2(
                 loginBonus.add(newBonus)
             }
             repos.userLoginBonus.saveAll(loginBonus)
+            cardService.updateCardTimestamp(card, "mai2")
         }
         SUCCESS
     }
 
+    @API("user-option")
+    override suspend fun userOption(@RP token: String) = us.jwt.auth(token) { u ->
+        repos.userOption.findByUser_Card_ExtId(u.ghostCard.extId).getOrNull(0)
+    }
+    @API("user-option-set")
+    override suspend fun userOptionSet(@RP token: String, @RP field: String, @RP value: Int): Any = us.jwt.auth(token) { u ->
+        val gameOptions = repos.userOption.findSingleByUser_Card_ExtId(u.ghostCard.extId)
+        val property = Mai2UserOption::class.memberProperties.filterIsInstance<KMutableProperty1<Any, Any?>>().find{ it.name == field }
+
+        if (property != null && gameOptions != null) {
+            property.setter.call(gameOptions, value)
+            repos.userOption.save(gameOptions)
+            200 - "Success"
+        } else
+            400 - "Invalid parameters"
+
+    }
+
     @API("owned-items")
     suspend fun ownedItems(@RP token: String) = us.jwt.auth(token) { u ->
         us.cardByName(u.username) { card ->
@@ -177,6 +201,7 @@ class Maimai2(
 
             myRival.propertyValue = myRivalList.joinToString(",")
             repos.userGeneralData.save(myRival)
+            cardService.updateCardTimestamp(myCard, "mai2")
         }
         SUCCESS
     }
diff --git a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt
index d2caaa9e..e72657bb 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt
@@ -1,15 +1,22 @@
 package icu.samnyan.aqua.net.games.ongeki
 
 import ext.API
+import ext.RP
+import ext.minus
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.*
 import icu.samnyan.aqua.net.utils.ongekiScores
 import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserGeneralDataRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserMusicDetailRepo
+import icu.samnyan.aqua.sega.ongeki.OgkUserOptionRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserPlaylogRepo
 import icu.samnyan.aqua.sega.ongeki.model.UserData
+import icu.samnyan.aqua.sega.ongeki.model.UserOption
 import org.springframework.web.bind.annotation.RestController
+import kotlin.jvm.optionals.getOrNull
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.memberProperties
 
 @RestController
 @API("api/v2/game/ongeki")
@@ -18,7 +25,8 @@ class Ongeki(
     override val playlogRepo: OgkUserPlaylogRepo,
     override val userDataRepo: OgkUserDataRepo,
     override val userMusicRepo: OgkUserMusicDetailRepo,
-    val userGeneralDataRepository: OgkUserGeneralDataRepo
+    val userGeneralDataRepository: OgkUserGeneralDataRepo,
+    val userOptionRepo: OgkUserOptionRepo
 ): GameApiController<UserData>("ongeki", UserData::class) {
     override suspend fun trend(username: String) = us.cardByName(username) { card ->
         findTrend(playlogRepo.findByUser_Card_ExtId(card.extId)
@@ -45,4 +53,21 @@ class Ongeki(
 
         genericUserSummary(card, ratingComposition)
     }
+
+    @API("user-option")
+    override suspend fun userOption(@RP token: String) = us.jwt.auth(token) { u ->
+        userOptionRepo.findByUser_Card_ExtId(u.ghostCard.extId).getOrNull(0)
+    }
+    @API("user-option-set")
+    override suspend fun userOptionSet(@RP token: String, @RP field: String, @RP value: Int): Any = us.jwt.auth(token) { u ->
+        val gameOptions = userOptionRepo.findSingleByUser_Card_ExtId(u.ghostCard.extId)
+        val property = UserOption::class.memberProperties.filterIsInstance<KMutableProperty1<Any, Any?>>().find{ it.name == field }
+
+        if (property != null && gameOptions != null) {
+            property.setter.call(gameOptions, value)
+            userOptionRepo.save(gameOptions)
+            200 - "Success"
+        } else
+            400 - "Invalid parameters"
+    }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
index 3eb3ccd0..714580eb 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
@@ -10,6 +10,7 @@ import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
 import icu.samnyan.aqua.sega.general.GameMusicPopularity
 import icu.samnyan.aqua.sega.general.MeowApi
 import icu.samnyan.aqua.sega.general.RequestContext
+import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.util.BasicMapper
 import icu.samnyan.aqua.sega.util.StringMapper
 import icu.samnyan.aqua.spring.Metrics
@@ -28,6 +29,7 @@ class ChusanController(
     val cmMapper: BasicMapper,
     val db: Chu3Repos,
     val us: AquaUserServices,
+    val cardService: CardService,
     val versionHelper: ChusanVersionHelper,
     val props: ChusanProps,
     val pop: GameMusicPopularity,
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
index f8fff3ec..88249541 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
@@ -236,9 +236,7 @@ fun ChusanController.chusanInit() {
         ) + userDict
 
         if (user.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            res["userName"] = "JiaQQqun / ChangeDNS"
-            res["rating"] = 0
-            res["playerLevel"] = 0
+            res["userName"] = "${res["userName"]}＠ＡｑｕａＤＸ"
         }
 
         res
@@ -394,13 +392,6 @@ fun ChusanController.chusanInit() {
 //        }
 //        process()
 
-        val user = db.userData.findByCard_ExtId(uid)
-
-        if (user?.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            """{"returnCode":"0"}"""
-        }
-        else {
-            """{"returnCode":"1"}"""
-        }
+        """{"returnCode":"1"}"""
     }
 }
\ No newline at end of file
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt
index 850fa791..bf748a65 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt
@@ -75,6 +75,8 @@ fun ChusanController.cmApiInit() {
             )
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "chu3") }
+
         mapOf(
             "returnCode" to 1,
             "apiName" to "CMUpsertUserGachaApi",
@@ -85,13 +87,15 @@ fun ChusanController.cmApiInit() {
     "CMUpsertUserPrintCancel" {
         val orderIdList: List<Long> = cmMapper.convert<List<Long>>(parsing { data["orderIdList"]!! })
 
-        db.userCardPrintState.saveAll(orderIdList.mapNotNull {
+        val states = db.userCardPrintState.saveAll(orderIdList.mapNotNull {
             // TODO: The original code by Eori writes findById but I don't think that is correct...
             db.userCardPrintState.findById(it)()?.apply {
                 hasCompleted = true
             }
         })
 
+        states.firstOrNull()?.user?.card?.let { cardService.updateCardTimestamp(it, "chu3") }
+
         mapOf("returnCode" to 1, "apiName" to "CMUpsertUserPrintCancelApi")
     }
 
@@ -114,6 +118,8 @@ fun ChusanController.cmApiInit() {
             db.userCardPrintState.save(this)
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "chu3") }
+
         mapOf("returnCode" to 1, "apiName" to "CMUpsertUserPrintSubtractApi")
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt
index 9e324f09..306d9391 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt
@@ -4,6 +4,7 @@ import ext.*
 import icu.samnyan.aqua.sega.chusan.ChusanController
 import icu.samnyan.aqua.sega.chusan.model.request.Chu3UserAll
 import icu.samnyan.aqua.sega.chusan.model.userdata.*
+import icu.samnyan.aqua.sega.general.model.CardStatus
 import icu.samnyan.aqua.sega.general.model.UserRecentRating
 
 @Suppress("UNCHECKED_CAST")
@@ -13,6 +14,7 @@ fun ChusanController.upsertApiInit() {
         charge.user = db.userData.findByCard_ExtId(uid) ?: (400 - "User not found")
         charge.id = db.userCharge.findByUser_Card_ExtIdAndChargeId(uid, charge.chargeId)?.id ?: 0
         db.userCharge.save(charge)
+        charge.user.card?.let { cardService.updateCardTimestamp(it, "chu3") }
         """{"returnCode":"1"}"""
     }
 
@@ -36,6 +38,12 @@ fun ChusanController.upsertApiInit() {
                 userNameEx = ""
             }.also { db.userData.saveAndFlush(it) }
 
+            // If the user was previously migrated to Minato, saving would mark them "migrated and then cleared".
+            if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
+                u.card?.status = CardStatus.NORMAL_MIGRATED_TO_MINATO_AND_THEN_CLEARED
+                us.cardRepo.save(u.card!!)
+            }
+
             // Only save if it is a valid region and the user has played at least a song
             req.userPlaylogList?.firstOrNull()?.regionId?.let { rid ->
                 val region = db.userRegions.findByUserAndRegionId(u, rid)?.apply {
@@ -185,8 +193,10 @@ fun ChusanController.upsertApiInit() {
                         }.also { db.userCMissionProgress.save(it) }
                 }
             }
+
+            u.card?.let { cardService.updateCardTimestamp(it, "chu3") }
         }
 
         """{"returnCode":1}"""
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt
index 3aa2d176..fcd0183f 100644
--- a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.kt
@@ -9,7 +9,7 @@ enum class CardStatus {
     NORMAL,
 
     // Reserved for future use
-    NORMAL_RESERVED_1,
+    NORMAL_MIGRATED_TO_MINATO_AND_THEN_CLEARED,
     NORMAL_RESERVED_2,
     NORMAL_RESERVED_3,
     NORMAL_RESERVED_4,
@@ -22,7 +22,12 @@ enum class CardStatus {
     // Deleted statuses
     OVERWRITTEN,
     DELETED,
-    MIGRATED_TO_MINATO,
+    MIGRATED_TO_MINATO;
+
+    /**
+     * Returns true if card status is in any NORMAL state
+     */
+    val isNormal get() = this.ordinal in NORMAL.ordinal..NORMAL_RESERVED_9.ordinal
 }
 
 /**
diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt b/src/main/java/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt
new file mode 100644
index 00000000..9a64e3e8
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt
@@ -0,0 +1,32 @@
+package icu.samnyan.aqua.sega.general.model
+
+import ext.Str
+import jakarta.persistence.*
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
+import java.time.Instant
+
+@Entity(name = "SegaCardTimestamp")
+@Table(name = "sega_card_timestamp")
+class CardTimestamp(
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    var id: Long = 0,
+
+    @Column(nullable = false)
+    var createdAt: Instant = Instant.now(),
+
+    @Column(nullable = false)
+    var updatedAt: Instant = Instant.now(),
+
+    var game: Str,
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "card_id")
+    var card: Card? = null,
+)
+
+@Repository
+interface CardTimestampRepo : JpaRepository<CardTimestamp, Long> {
+    fun findByCardIdAndGame(cardId: Long, game: Str): CardTimestamp?
+}
diff --git a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt
index 63b434b7..d5761fe9 100644
--- a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt
@@ -1,10 +1,16 @@
 package icu.samnyan.aqua.sega.general.service
 
+import ext.Bool
+import ext.Str
 import ext.minus
+import icu.samnyan.aqua.net.Fedy
 import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.sega.general.dao.CardRepository
 import icu.samnyan.aqua.sega.general.model.Card
+import icu.samnyan.aqua.sega.general.model.CardTimestamp
+import icu.samnyan.aqua.sega.general.model.CardTimestampRepo
 import org.springframework.stereotype.Service
+import java.time.Instant
 import java.time.LocalDateTime
 import java.util.concurrent.ThreadLocalRandom
 
@@ -12,7 +18,7 @@ import java.util.concurrent.ThreadLocalRandom
  * @author samnyan (privateamusement@protonmail.com)
  */
 @Service
-class CardService(val cardRepo: CardRepository)
+class CardService(val cardRepo: CardRepository, val cardTimestampRepo: CardTimestampRepo, val fedy: Fedy)
 {
     /**
      * Find a card by External ID
@@ -97,4 +103,13 @@ class CardService(val cardRepo: CardRepository)
         }
         return eid
     }
+
+    fun getCardTimestamp(card: Card, game: Str, now: Instant = Instant.now()) =
+        cardTimestampRepo.findByCardIdAndGame(card.id, game) ?: CardTimestamp(game = game, card = card, createdAt = now, updatedAt = now);
+
+    fun updateCardTimestamp(card: Card, game: Str, now: Instant = Instant.now(), resetCreatedAt: Bool = false) {
+        cardTimestampRepo.save(getCardTimestamp(card, game, now).apply { updatedAt = now }
+            .apply { if (resetCreatedAt) createdAt = now });
+        fedy.onDataUpdated(card.extId, game, resetCreatedAt)
+    }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt
index abc95b96..040f12ce 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt
@@ -115,10 +115,7 @@ fun Maimai2ServletController.initApis() {
         )
 
         if (d.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            res["userName"] = "JiaQQqun / ChangeDNS"
-            res["dispRate"] = 1
-            res["playerRating"] = 66564
-            res["totalAwake"] = 7114
+            res["userName"] = "${res["userName"]}＠ＡｑｕａＤＸ"
         }
 
         res
@@ -134,10 +131,6 @@ fun Maimai2ServletController.initApis() {
             "Bearer" to "meow", "bearer" to "meow"
         )
 
-        if (d?.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            res["returnCode"] = 0
-        }
-
         // Get regionId from request
         val region = data["regionId"] as? Int
 
@@ -150,6 +143,7 @@ fun Maimai2ServletController.initApis() {
                 regionId = region
             }
             db.userRegions.save(region)
+            // d.card?.let { cardService.updateCardTimestamp(it, "mai2") } // TODO: why save regions on login?
         }
 
         res
@@ -231,12 +225,16 @@ fun Maimai2ServletController.initApis() {
     // Kaleidoscope, added on 1.50
     // [{gateId, phaseId}]
     "GetGameKaleidxScope" { mapOf("gameKaleidxScopeList" to ls(
-        mapOf("gateId" to 1, "phaseId" to findPhase(LocalDate.of(2025, 1, 18))),
-        mapOf("gateId" to 2, "phaseId" to 2),
-        mapOf("gateId" to 3, "phaseId" to 2),
-        mapOf("gateId" to 4, "phaseId" to findPhase(LocalDate.of(2025, 2, 25))),
-        mapOf("gateId" to 5, "phaseId" to 2),
-        mapOf("gateId" to 6, "phaseId" to 2),
+        mapOf("gateId" to 1, "phaseId" to 6),
+        mapOf("gateId" to 2, "phaseId" to 6),
+        mapOf("gateId" to 3, "phaseId" to 6),
+        mapOf("gateId" to 4, "phaseId" to 6),
+        mapOf("gateId" to 5, "phaseId" to 6),
+        mapOf("gateId" to 6, "phaseId" to 6),
+        mapOf("gateId" to 7, "phaseId" to 6),
+        mapOf("gateId" to 8, "phaseId" to 6),
+        mapOf("gateId" to 9, "phaseId" to 6),
+        mapOf("gateId" to 10, "phaseId" to 13),
     )) }
     // Request: {userId}
     // Response: {userId, userKaleidxScopeList}
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt
index aac2a9aa..3cbf80e3 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt
@@ -41,9 +41,6 @@ class Maimai2ServletController(
     val db: Mai2Repos,
     val net: Maimai2,
 ): MeowApi(serialize = { _, resp -> if (resp is String) resp else resp.toJson() }) {
-
-    @Autowired @Lazy lateinit var fedy: Fedy
-
     companion object {
         private val log = logger()
         private val empty = listOf<Any>()
@@ -96,7 +93,6 @@ class Maimai2ServletController(
                 val ctx = RequestContext(req, data.mut)
                 serialize(api, handlers[api]!!(ctx) ?: noop).also {
                     log.info("$token : $api > ${it.truncate(500)}")
-                    if (api == "UpsertUserAllApi") { data["userId"]?.long?.let { fedy.onDataUpdated(it, "mai2", false) } }
                 }
             }
         } catch (e: Exception) {
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt
index 1c60de0b..52dcf0fc 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt
@@ -1,11 +1,14 @@
 package icu.samnyan.aqua.sega.maimai2.handler
 
+import ext.int
 import ext.logger
+import ext.mapApply
 import icu.samnyan.aqua.net.games.mai2.Maimai2
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.general.dao.CardRepository
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserCharacter
 import org.springframework.stereotype.Component
 
 @Component("Maimai2GetUserCharacterHandler")
@@ -14,34 +17,25 @@ class GetUserCharacterHandler(
     val maimai2: Maimai2,
     val cardRepo: CardRepository,
 ) : BaseHandler {
-    val itemUnlock = maimai2.itemMapping[Mai2ItemKind.chara.name]?.map { mapOf(
-        "characterId" to it.key,
-        "level" to 9999,
-        "awakening" to 1,
-        "useCount" to 0
-    ) }
+    val charaIds = maimai2.itemMapping[Mai2ItemKind.chara.name]?.map { it.key.int() } ?: emptyList()
 
     init {
-        if (itemUnlock.isNullOrEmpty()) logger.warn("Mai2 item info is empty")
+        if (charaIds.isEmpty()) logger.warn("Mai2 item info is empty")
     }
 
     override fun handle(request: Map<String, Any>): Any {
         val userId = (request["userId"] as Number).toLong()
-
-        // Aqua Net game unlock feature
-        cardRepo.findByExtId(userId)?.aquaUser?.gameOptions?.let { opt ->
-            if (!opt.unlockChara or itemUnlock.isNullOrEmpty()) return@let
-
-            logger.info("Response: ${itemUnlock!!.size} Characters - All unlock")
-            return mapOf(
-                "userId" to userId,
-                "userCharacterList" to itemUnlock
-            )
-        }
+        val gameOptions = cardRepo.findByExtId(userId)?.aquaUser?.gameOptions
+        val userCharacterList = repos.userCharacter.findByUser_Card_ExtId(userId)
+            .let { if (gameOptions?.mai2UnlockChara != true) it else (
+                       charaIds.associateWith { Mai2UserCharacter().apply { characterId = it; level = 1 } } +
+                       it.associateBy { it.characterId }
+                   ).values }
+            .let { if (gameOptions?.mai2UnlockCharaMaxLevel != true) it else it.mapApply { level = 9999 } }
 
         return mapOf(
             "userId" to userId,
-            "userCharacterList" to repos.userCharacter.findByUser_Card_ExtId(userId)
+            "userCharacterList" to userCharacterList
         )
     }
 
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt
index a84e529f..7bae9966 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt
@@ -49,10 +49,11 @@ class GetUserItemHandler(
         // Aqua Net game unlock feature
         cardRepo.findByExtId(userId)?.aquaUser?.gameOptions?.let { opt ->
             val items = when {
-                (kind in 5..8) && opt.unlockMusic -> musicUnlock.getValue(kind)
-                (kind in 1..3 || kind == 11) && opt.unlockCollectables -> itemUnlock[kind]
-                (kind == 12) && opt.unlockTickets -> itemUnlock[kind]
-                (kind in 9..10) && opt.unlockChara -> itemUnlock[kind]
+                (kind in 5..8) && opt.mai2UnlockMusic -> musicUnlock.getValue(kind)
+                (kind in 1..3 || kind == 11) && opt.mai2UnlockCollectables -> itemUnlock[kind]
+                (kind == 12) && opt.mai2UnlockTickets -> itemUnlock[kind]
+                (kind == 9) && opt.mai2UnlockChara -> itemUnlock[kind]
+                (kind == 10) && opt.mai2UnlockPartners -> itemUnlock[kind]
                 else -> emptyList()
             }
 
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
index 8bbb2873..98267e1b 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
@@ -6,6 +6,7 @@ import ext.millis
 import ext.parsing
 import icu.samnyan.aqua.sega.allnet.TokenChecker
 import icu.samnyan.aqua.sega.general.BaseHandler
+import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
 import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPlaylog
@@ -21,7 +22,8 @@ import org.springframework.stereotype.Component
 class UploadUserPlaylogHandler(
     private val userDataRepository: Mai2UserDataRepo,
     private val playlogRepo: Mai2UserPlaylogRepo,
-    private val mapper: BasicMapper
+    private val mapper: BasicMapper,
+    private val cardService: CardService
 ) : BaseHandler {
     data class BacklogEntry(val time: Long, val playlog: Mai2UserPlaylog)
     companion object {
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
index 19cdbdb3..5c5ad944 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
@@ -5,6 +5,7 @@ import ext.mapApply
 import ext.minus
 import ext.unique
 import icu.samnyan.aqua.sega.general.BaseHandler
+import icu.samnyan.aqua.sega.general.model.CardStatus
 import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler.Companion.playBacklog
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
@@ -25,7 +26,6 @@ class UpsertUserAllHandler(
     val cardService: CardService,
     val repos: Mai2Repos
 ) : BaseHandler {
-
     fun String.isValidUsername() = isNotBlank() && length <= 8
 
     @Throws(JsonProcessingException::class)
@@ -59,6 +59,12 @@ class UpsertUserAllHandler(
             }
         })
 
+        // If the user was previously migrated to Minato, saving would mark them "migrated and then cleared".
+        if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
+            u.card?.status = CardStatus.NORMAL_MIGRATED_TO_MINATO_AND_THEN_CLEARED
+            cardService.cardRepo.save(u.card!!)
+        }
+
         // Check playlog backlog
         if (playBacklog.containsKey(userId)) playBacklog.remove(userId)?.forEach {
             repos.userPlaylog.save(it.playlog.apply { user = u })
@@ -163,6 +169,8 @@ class UpsertUserAllHandler(
                 })
             }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "mai2") }
+
         return SUCCESS
     }
 
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
index 8208cf71..c12ffa5b 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
@@ -5,6 +5,7 @@ import ext.logger
 import ext.long
 import ext.parsing
 import icu.samnyan.aqua.sega.general.BaseHandler
+import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPrintDetail
 import icu.samnyan.aqua.sega.util.BasicMapper
@@ -18,6 +19,7 @@ import java.util.concurrent.ThreadLocalRandom
 class UpsertUserPrintHandler(
     val mapper: BasicMapper,
     val db: Mai2Repos,
+    val cardService: CardService,
     @param:Value("\${game.cardmaker.card.expiration:15}") val expirationTime: Long,
 ) : BaseHandler {
     val log = logger()
@@ -43,6 +45,8 @@ class UpsertUserPrintHandler(
         }
         db.userPrintDetail.save(userPrint)
 
+        userData.card?.let { cardService.updateCardTimestamp(it, "mai2") }
+
         return mapOf(
             "returnCode" to 1,
             "orderId" to 0,
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt
index a9e21512..0797ef8d 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt
@@ -190,6 +190,8 @@ fun OngekiController.cmApiInit() {
             }
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "ongeki") }
+
         null
     }
 
@@ -243,6 +245,8 @@ fun OngekiController.cmApiInit() {
             }
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "ongeki") }
+
         null
     }
 
@@ -306,6 +310,8 @@ fun OngekiController.cmApiInit() {
             }
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "ongeki") }
+
         null
     }
 
@@ -335,4 +341,4 @@ fun OngekiController.cmApiInit() {
 
         mapOf("length" to 0, "gameTheaterList" to emptyList<Any>(), "registIdList" to emptyList<Any>())
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
index f5ef7558..a82bb06c 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
@@ -7,6 +7,7 @@ import icu.samnyan.aqua.sega.allnet.TokenChecker
 import icu.samnyan.aqua.sega.general.GameMusicPopularity
 import icu.samnyan.aqua.sega.general.MeowApi
 import icu.samnyan.aqua.sega.general.RequestContext
+import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.util.BasicMapper
 import icu.samnyan.aqua.spring.Metrics
 import jakarta.servlet.http.HttpServletRequest
@@ -21,6 +22,7 @@ class OngekiController(
     val gdb: OngekiGameRepos,
     val us: AquaUserServices,
     val pop: GameMusicPopularity,
+    val cardService: CardService,
 ): MeowApi({ _, resp -> if (resp is String) resp else mapper.write(resp) }) {
 
     val log = logger()
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
index 378acb33..67f11000 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
@@ -4,6 +4,7 @@ import ext.int
 import ext.invoke
 import ext.mapApply
 import ext.minus
+import icu.samnyan.aqua.sega.general.model.CardStatus
 import icu.samnyan.aqua.sega.ongeki.model.OngekiUpsertUserAll
 import icu.samnyan.aqua.sega.ongeki.model.UserData
 import icu.samnyan.aqua.sega.ongeki.model.UserGeneralData
@@ -49,6 +50,12 @@ fun OngekiController.initUpsertAll() {
             db.regions.save(region)
         }
 
+        // If the user was previously migrated to Minato, saving would mark them "migrated and then cleared".
+        if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
+            u.card?.status = CardStatus.NORMAL_MIGRATED_TO_MINATO_AND_THEN_CLEARED
+            us.cardRepo.save(u.card!!)
+        }
+
         all.run {
             // Set users
             listOfNotNull(
@@ -202,6 +209,8 @@ fun OngekiController.initUpsertAll() {
                     id = db.kop.findByUserAndKopIdAndAreaId(u, kopId, areaId)?.id ?: 0 }) }
         }
 
+        u.card?.let { cardService.updateCardTimestamp(it, "ongeki") }
+
         null
     }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
index adba5f27..59fb88b0 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
@@ -162,26 +162,13 @@ fun OngekiController.initUser() {
         )
 
         if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            res["userName"] = "JiaQQqun / ChangeDNS"
-            res["level"] = 0
-            res["exp"] = 0
-            res["playerRating"] = 0
-            res["newPlayerRating"] = 0
+            res["userName"] = "${res["userName"]}＠ＡｑｕａＤＸ"
         }
 
         res
     }
 
-    "GameLogin" {
-        val user = db.data.findByCard_ExtId(uid)
-
-        if (user?.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            """{"returnCode":"0"}"""
-        }
-        else {
-            """{"returnCode":"1"}"""
-        }
-    }
+    "GameLogin" { """{"returnCode":"1"}""" }
 
     "GetUserRecentRating".unpaged {
         db.generalData.findByUser_Card_ExtIdAndPropertyKey(uid, "recent_rating_list")?.let { recent ->
diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
index 4d9af594..3c5e28a4 100644
--- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
@@ -205,28 +205,28 @@ fun WaccaServer.init() {
         val go = u.card?.aquaUser?.gameOptions ?: AquaGameOptions()
 
         // All unlock
-        if (go.unlockMusic && wacca.musicMapping.isNotEmpty()) {
+        if (go.waccaUnlockMusic && wacca.musicMapping.isNotEmpty()) {
             items[MUSIC_UNLOCK()] = wacca.musicMapping.map { (id, v) -> MUSIC_UNLOCK(u, id, p1 = v.notes.size.long() - 1) }
         }
-        if (go.unlockTickets) {
+        if (go.waccaUnlockTickets) {
             var i = 0
             items[TICKET()] = enabledTickets.flatMap { (1..5).map { TICKET(u, it).apply { id = (i++).toLong() } } }
         }
-        if (go.unlockChara) {
+        if (go.waccaUnlockPlates) {
             wacca.itemMapping["plates"]?.let { items[USER_PLATE()] = it.map { (k, _) -> USER_PLATE(u, k.int()) } }
         }
-        if (go.unlockCollectables) {
+        if (go.waccaUnlockCollectables) {
             // TODO: Add titles
-            mapOf("icon" to ICON, "plates" to USER_PLATE, "trophy" to TROPHY).map { (name, type) ->
+            mapOf("icon" to ICON, "trophy" to TROPHY).map { (name, type) ->
                 wacca.itemMapping[name]?.let { items[type()] = it.map { (k, _) -> type(u, k.int()) } }
             }
         }
 
         val status = u.lStatus().toMutableList()
 
-        if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
-            status[1] = "JiaQQqun / ChangeDNS"
-        }
+//        if (u.card?.status == CardStatus.MIGRATED_TO_MINATO) {
+//            status[1] = "${status[1]}@AquaDX"
+//        }
 
         u.run { ls(
             "0 status" - status,
diff --git a/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql b/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql
new file mode 100644
index 00000000..553a8e3c
--- /dev/null
+++ b/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql
@@ -0,0 +1,11 @@
+# Fix NULL values in maimai2_user_detail point and total_point fields
+# These fields were added without NOT NULL constraint in V1000_36
+
+# First, set NULL values to 0
+UPDATE maimai2_user_detail SET point = 0 WHERE point IS NULL;
+UPDATE maimai2_user_detail SET total_point = 0 WHERE total_point IS NULL;
+
+# Then add NOT NULL constraint
+ALTER TABLE maimai2_user_detail MODIFY point INT NOT NULL DEFAULT 0;
+ALTER TABLE maimai2_user_detail MODIFY total_point INT NOT NULL DEFAULT 0;
+
diff --git a/src/main/resources/db/80/V1000_61__ongeki_refresh_a017_to_a032.sql b/src/main/resources/db/80/V1000_61__ongeki_refresh_a017_to_a032.sql
new file mode 100644
index 00000000..ffad9b84
--- /dev/null
+++ b/src/main/resources/db/80/V1000_61__ongeki_refresh_a017_to_a032.sql
@@ -0,0 +1,289 @@
+INSERT IGNORE INTO `ongeki_game_music` (id, artist_name, boss_card_id, boss_level, genre, level0, level1, level2, level3, level4, name, sort_name) VALUES
+(337, 'LOVE☆MAXガールズ「ゴシックは魔法乙女」', '100816', 15, 'POPS＆ANIME', '4', '6', '9', 12, 0, 'わたしたち魔法乙女です☆', 'ワタシタチマホウオトメテス'),
+(591, 'TJ.hangneil', '101557', 80, 'オンゲキ', '6', '10', '13', 15, 0, 'Apollo', 'APOLLO'),
+(945, '柊かえ（CV:立花芽恵夢）「Re:ステージ！プリズムステップ」', '100915', 40, 'POPS＆ANIME', '4', '8', '12', 14, 0, 'ガジェットはプリンセス', 'カシエツトハフリンセス'),
+(946, 'テトラルキア「Re:ステージ！プリズムステップ」', '100915', 15, 'POPS＆ANIME', '2', '7', '11', 14, 0, 'ユニゾンモノローグ', 'ユニソンモノロク'),
+(1000, 'あべにゅうぷろじぇくと feat.エンジェルオールスターズ(めぐる・すみれ・遥・葵・クルミ・テスラ・ナイン)', '102185', 7, 'POPS＆ANIME', '3', '7', '10', 12, 0, 'えんじぇる♡ピタゴリ☆ほーみたい！', 'エンシエルヒタコリホミタイ'),
+(1001, '周防パトラ', '102217', 10, 'POPS＆ANIME', '4', '8', '11', 13, 0, '偉大なる悪魔は実は大天使パトラちゃん様なのだ！', 'イタイナルアクマハシツハタイテンシハトラチヤンサマナノタ'),
+(1002, '周防パトラ', '102217', 8, 'POPS＆ANIME', '3', '6', '9', 12, 0, 'ハートサーモグラフィー', 'ハトサモクラフイ'),
+(1061, 'ARForest', '100765', 35, 'オンゲキ', '5', '9', '11', 14, 0, 'Flow Into You', 'FLOWINTOYOU'),
+(1074, '曲：Feryquitous／歌：高瀬 梨緒(CV：久保 ユリカ)', '101872', 24, 'オンゲキ', '3', '8', '12', 13, 0, 'Ai Me', 'AIME'),
+(1075, '曲：KENSUKE／歌：結城 莉玖(CV：朝日奈 丸佳)', '101873', 25, 'オンゲキ', '4', '8', '12', 13, 0, 'がおっと!!最強☆ぱーりーないと', 'カオツトサイキヨウハリナイト'),
+(1076, '曲：テラ(少女理論観測所)／歌：藍原 椿(CV：橋本 ちなみ)', '101874', 26, 'オンゲキ', '3', '7', '11', 13, 0, '耐冬花麗', 'ツハキウルワシ'),
+(1077, '提供', '100070', 15, 'オンゲキ', '4', '8', '12', 14, 0, 'Never Ending Adventure', 'NEVERENDINGADVENTURE'),
+(1078, 'brz1128', '100762', 40, 'オンゲキ', '4', '9', '12', 14, 0, 'ALLNIGHT_DANCER', 'ALLNIGHTDANCER'),
+(1079, '7mai', '101571', 63, 'オンゲキ', '6', '9', '12', 14, 0, 'Nýx', 'NYX'),
+(1080, 'Aoi', '100785', 80, 'オンゲキ', '7', '10', '13', 15, 0, 'Sargasso', 'SARGASSO'),
+(1083, 'Artifact vs. Dualcast', '100001', 43, 'チュウマイ', '4', '9', '12', 14, 0, 'Energizing Flame', 'ENERGIZINGFLAME'),
+(1084, 'owl＊tree feat.nie＊tree', '100064', 44, 'チュウマイ', '4', '9', '12', 14, 0, 'QuiQ', 'QUIQ'),
+(1085, '歌：長瀬有花／曲：いよわ', '102586', 5, 'POPS＆ANIME', '2', '6', '10', 13, 0, 'オレンジスケール', 'オレンシスケル'),
+(1086, '歌：長瀬有花／曲：いよわ', '102586', 15, 'POPS＆ANIME', '4', '8', '11', 13, 0, 'ほんの感想', 'ホンノカンソウ'),
+(1087, 'ジョー・力一', '101600', 11, 'POPS＆ANIME', '2', '7', '10', 13, 0, 'レイテストショーマン', 'レイテストシヨマン'),
+(1088, '名取さな', '101842', 37, 'POPS＆ANIME', '2', '7', '10', 13, 0, 'いっかい書いてさようなら', 'イツカイカイテサヨウナラ'),
+(1089, 'K-forest「Phigros」', '100209', 15, 'VARIETY', '3', '9', '12', 14, 0, 'Break Over', 'BREAKOVER'),
+(1090, 'Halv「Phigros」', '100029', 25, 'VARIETY', '3', '9', '12', 14, 0, 'Concvssion', 'CONCVSSION'),
+(1091, 'Sakuzyo「Phigros」', '100074', 65, 'VARIETY', '6', '10', '13', 15, 0, 'Distorted Fate', 'DISTORTEDFATE'),
+(1092, 'Blacklolita', '102300', 60, 'オンゲキ', '3', '9', '13', 14, 0, '[HALO]', 'HALO'),
+(1093, '矢鴇つかさ feat. kalon.', '100443', 26, 'チュウマイ', '2', '8', '11', 13, 0, 'SPILL OVER COLORS', 'SPILLOVERCOLORS'),
+(1094, '原口沙輔 feat.重音テト', '102503', 10, 'niconico', '2', '8', '10', 13, 0, '人マニア', 'ヒトマニア'),
+(1095, 'マサラダ', '102503', 15, 'niconico', '3', '7', '10', 13, 0, 'ライアーダンサー', 'ライアタンサ'),
+(1096, '柊マグネタイト', '100420', 28, 'niconico', '2', '7', '10', 13, 0, 'リアライズ', 'リアライス'),
+(1097, 'かめりあ', '100048', 71, 'チュウマイ', '6', '9', '13', 15, 0, 'Λzure Vixen', 'AZUREVIXEN'),
+(1098, '曲：脇眞富／歌：オンゲキシューターズ', '102711', 7, 'オンゲキ', '3', '7', '10', 13, 0, 'パピプペ Popping！ Talk！', 'ハヒフヘPOPPINGTALK'),
+(1099, 'パソコン音楽クラブ', '100248', 33, 'チュウマイ', '3', '9', '13', 14, 0, 'Ignition', 'IGNITION'),
+(1100, 'kamome sano', '100022', 39, 'チュウマイ', '5', '8', '12', 14, 0, 'crazy (about you)', 'CRAZYABOUTYOU'),
+(1101, '天川はの', '100211', 5, 'POPS＆ANIME', '2', '6', '10', 12, 0, 'Honeycomb', 'HONEYCOMB'),
+(1102, 'DÉ DÉ MOUSE & WaMi', '100061', 9, 'VARIETY', '2', '7', '11', 13, 0, 'As You Feel', 'ASYOUFEEL'),
+(1103, '歌：櫻川めぐ／曲：堀江晶太', '102571', 1, 'POPS＆ANIME', '2', '5', '10', 13, 0, '一冊のアロー', 'イツサツノアロ'),
+(1104, '歌：松下／曲：堀江晶太', '100427', 10, 'POPS＆ANIME', '2', '6', '10', 13, 0, 'Hey Darling!', 'HEYDARLING'),
+(1105, 'Mitsukiyo「ブルーアーカイブ -Blue Archive-」', '102598', 5, 'VARIETY', '3', '9', '12', 14, 0, 'Unwelcome School', 'UNWELCOMESCHOOL'),
+(1106, 'SUGAR RUSH「ブルーアーカイブ -Blue Archive-」', '102598', 10, 'VARIETY', '3', '6', '11', 13, 0, '彩りキャンバス', 'イロトリキヤンハス'),
+(1107, 'KARUT「ブルーアーカイブ -Blue Archive-」', '102603', 20, 'VARIETY', '3', '8', '11', 13, 0, 'Glitch Street', 'GLITCHSTREET'),
+(1108, 'Nor「ブルーアーカイブ -Blue Archive-」', '102598', 15, 'VARIETY', '3', '7', '10', 13, 0, 'Usagi Flap', 'USAGIFLAP'),
+(1109, 'Nor「ブルーアーカイブ -Blue Archive-」', '102603', 25, 'VARIETY', '3', '7', '10', 13, 0, 'RE Aoharu', 'REAOHARU'),
+(1113, 'B小町 ルビー（CV：伊駒ゆりえ）、有馬かな（CV：潘めぐみ）、MEMちょ（CV：大久保瑠美）', '100250', 2, 'POPS＆ANIME', '3', '7', '10', 13, 0, 'POP IN 2', 'POPIN2'),
+(7077, '曲：穴山大輔, 水野健治／歌：藤沢 柚子(CV：久保田 梨沙)', '100769', 40, 'オンゲキ', '1', '5', '8', 12, 0, '夏色花火 -藤沢 柚子ソロver.-', 'ナツイロハナヒフシサワユスソロVER'),
+(7078, '曲：穴山大輔, 水野健治／歌：早乙女 彩華(CV：中島 唯)', '100770', 40, 'オンゲキ', '1', '5', '8', 12, 0, '夏色花火 -早乙女 彩華ソロver.-', 'ナツイロハナヒサオトメアヤカソロVER'),
+(7079, '曲：Powerless／歌：柏木 咲姫(CV：石見 舞菜香)', '100755', 40, 'オンゲキ', '3', '6', '11', 13, 0, 'Iudicium “Apocalypsis Mix” -柏木 咲姫ソロver.-', 'IUDICIUMAPOCALYPSISMIXカシワキサキソロVER'),
+(7080, '曲：Powerless／歌：柏木 美亜(CV：和氣 あず未)', '100756', 40, 'オンゲキ', '3', '6', '11', 13, 0, 'Iudicium “Apocalypsis Mix” -柏木 美亜ソロver.-', 'IUDICIUMAPOCALYPSISMIXカシワキミアソロVER'),
+(7152, '曲：アオワイファイ／歌：星咲 あかり(CV：赤尾 ひかる)', '100001', 40, 'オンゲキ', '2', '5', '10', 12, 0, 'WakeUP MakeUP FEVER! -星咲 あかりソロver.-', 'WAKEUPMAKEUPFEVERホシサキアカリソロVER'),
+(7153, '曲：アオワイファイ／歌：高瀬 梨緒(CV：久保 ユリカ)', '100028', 40, 'オンゲキ', '2', '5', '10', 12, 0, 'WakeUP MakeUP FEVER! -高瀬 梨緒ソロver.-', 'WAKEUPMAKEUPFEVERタカセリオソロVER'),
+(7154, '曲：アオワイファイ／歌：藍原 椿(CV：橋本 ちなみ)', '100042', 40, 'オンゲキ', '2', '5', '10', 12, 0, 'WakeUP MakeUP FEVER! -藍原 椿ソロver.-', 'WAKEUPMAKEUPFEVERアイハラツハキソロVER'),
+(7155, '曲：アオワイファイ／歌：桜井 春菜(CV：近藤 玲奈)', '100049', 40, 'オンゲキ', '2', '5', '10', 12, 0, 'WakeUP MakeUP FEVER! -桜井 春菜ソロver.-', 'WAKEUPMAKEUPFEVERサクライハルナソロVER'),
+(7156, '曲：アオワイファイ／歌：東雲 つむぎ(CV：和泉 風花)', '100452', 40, 'オンゲキ', '2', '5', '10', 12, 0, 'WakeUP MakeUP FEVER! -東雲 つむぎソロver.-', 'WAKEUPMAKEUPFEVERシノノメツムキソロVER'),
+(8060, 'LeaF', '101320', 56, 'チュウマイ', '0', '0', '0', 0, 14, 'macrocosmos', 'MACROCOSMOS'),
+(8177, 'オルタンシア「Re:ステージ！プリズムステップ」', '100915', 50, 'POPS＆ANIME', '0', '0', '0', 0, 14, '君とインフィニティ -2021-', 'キミトインフイニテイ2021'),
+(8178, 'aran', '3', 40, 'オンゲキ', '0', '0', '0', 0, 0, 'Random Access Emotions', 'RANDOMACCESSEMOTIONS'),
+(8185, 'Tanchiky', '100476', 41, 'VARIETY', '0', '0', '0', 0, 0, 'ENERGY SYNERGY MATRIX', 'ENERGYSYNERGYMATRIX'),
+(8186, 'HiTECH NINJA', '100031', 10, 'オンゲキ', '0', '0', '0', 0, 14, 'Dolphika', 'DOLPHIKA'),
+(8187, '曲：アオワイファイ／歌：オンゲキシューターズ', '100236', 50, 'オンゲキ', '0', '0', '0', 0, 14, 'WakeUP MakeUP FEVER!', 'WAKEUPMAKEUPFEVER'),
+(8188, 'LOVE☆MAXガールズ「ゴシックは魔法乙女」', '100816', 55, 'POPS＆ANIME', '0', '0', '0', 0, 14, 'わたしたち魔法乙女です☆', 'ワタシタチマホウオトメテス');
+INSERT IGNORE INTO `ongeki_game_event` (`id`) VALUES
+('1500430101'),
+('1500431601'),
+('1500432001'),
+('1500450101'),
+('1500450301'),
+('1500450302'),
+('1500451601'),
+('1500451701'),
+('1500451902'),
+('1500520101'),
+('1500520102'),
+('1500520301'),
+('1500520302'),
+('1500521301'),
+('1500540101'),
+('1500540102'),
+('1500540103'),
+('1500540301'),
+('1500540302'),
+('1500540303'),
+('1500540304'),
+('1500540305'),
+('1500540501'),
+('1500540502'),
+('1500540601'),
+('1500541501'),
+('1500541502'),
+('1500541503'),
+('1500541601'),
+('1500541602'),
+('1500541701'),
+('1500610101'),
+('1500610102'),
+('1500610301'),
+('1500610302'),
+('1500610303'),
+('1500610701'),
+('1500611301'),
+('1500630101'),
+('1500630102'),
+('1500630301'),
+('1500630501'),
+('1500630601'),
+('1500630801'),
+('1500631501'),
+('1500631601'),
+('1500631701'),
+('1500631801'),
+('1500710101'),
+('1500710102'),
+('1500710103'),
+('1500710301'),
+('1500710302'),
+('1500710303'),
+('1500710304'),
+('1500710305'),
+('1500710501'),
+('1500710701'),
+('1500711301'),
+('1500720101'),
+('1500720102'),
+('1500720103'),
+('1500720301'),
+('1500720302'),
+('1500720303'),
+('1500720304'),
+('1500720305'),
+('1500720501'),
+('1500720502'),
+('1500721501'),
+('1500721502'),
+('1500721601'),
+('1500721602'),
+('1500721701'),
+('1500721802'),
+('1500730101'),
+('1500730301'),
+('1500730801'),
+('1500760101'),
+('1500760501'),
+('1500760601'),
+('1500761401'),
+('1500761501'),
+('1500761601'),
+('1500761701'),
+('1500761801'),
+('1500810101'),
+('1500810102'),
+('1500810103'),
+('1500810301'),
+('1500810302'),
+('1500810303'),
+('1500810701'),
+('1500811301'),
+('1500811401'),
+('1500811501'),
+('1500811502'),
+('1500811503'),
+('1500811601'),
+('1500811701'),
+('1500811902'),
+('1500821801'),
+('1500830101'),
+('1500830102'),
+('1500830301'),
+('1500830302'),
+('1500830303'),
+('1500830304'),
+('1500830305'),
+('1500830306'),
+('1500830501'),
+('1500830601'),
+('1500831501'),
+('1500831502'),
+('1500831601'),
+('1500831701'),
+('1500910701'),
+('1500931801'),
+('1501051801'),
+('1501051802');
+INSERT IGNORE INTO `ongeki_game_card` (id, name, nick_name, attribute, chara_id, school, gakunen, rarity, level_param, skill_id, cho_kaika_skill_id, card_number, version) VALUES
+(100048, '【SSR】藍原 椿[サディスティック・スマイル]', 'サディスティック・スマイル', 'Leaf', 1005, '奏坂学園', '高校1年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100106, 100107, '[O.N.G.E.K.I.]1.00-0057', '1.00'),
+(102036, '【SSR】三角 葵[夏宵スターマイン]', '夏宵スターマイン', 'Aqua', 1002, 'プロモーション', '高校2年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 105020, 105021, '[O.N.G.E.K.I.]Special Card', '1.45'),
+(102037, '【SSR】藍原 椿[夏宵スターマイン]', '夏宵スターマイン', 'Leaf', 1005, 'プロモーション', '高校1年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 105020, 105021, '[O.N.G.E.K.I.]Special Card', '1.45'),
+(102049, '【SSR】結城 莉玖[I got a gig tonight!]', 'I got a gig tonight!', 'Fire', 1004, '奏坂学園', '高校1年生', 'SSR', '66,277,297,309,316,327,0,0,0,332', 150013, 150014, '[O.N.G.E.K.I.]1.50-0027', '1.50'),
+(102050, '【SSR】逢坂 茜[Rule the World!!]', 'Rule the World!!', 'Fire', 1011, '奏坂学園', '高校3年生', 'SSR', '66,277,297,309,316,327,0,0,0,332', 150015, 150016, '[O.N.G.E.K.I.]1.50-0028', '1.50'),
+(102297, '【SSR】柏木 美亜[Primera Fes. ～Bridal Stage～]', 'Primera Fes. ～Bridal Stage～', 'Fire', 1013, '奏坂学園', '中学2年生', 'SSR', '70,300,313,323,330,335,0,0,0,340', 115134, 115135, '[O.N.G.E.K.I.]1.50-0046', '1.50'),
+(102298, '【SSR】珠洲島 有栖[Primera Fes. ～Bridal Stage～]', 'Primera Fes. ～Bridal Stage～', 'Aqua', 1012, '奏坂学園', '高校1年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 120006, 120007, '[O.N.G.E.K.I.]1.50-0047', '1.50'),
+(102299, '【SSR】三角 葵[Primera Fes. ～Bridal Stage～]', 'Primera Fes. ～Bridal Stage～', 'Aqua', 1002, '奏坂学園', '高校2年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 115122, 115123, '[O.N.G.E.K.I.]1.50-0048', '1.50'),
+(102300, '【SSR】柏木 美亜[Primera Fes. ～Bridal Stage～(集合Ver.)対戦相手専用]', 'Primera Fes. ～Bridal Stage～(集合Ver.)対戦相手専用', 'Fire', 1013, '奏坂学園', '中学2年生', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100000, 100041, '[O.N.G.E.K.I.]1.50-', '1.50'),
+(102510, '【SR】重音テト[お ま え]', 'お ま え', 'Fire', 46194, '重音テト', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100033, 100074, '[O.N.G.E.K.I.]1.50-E-0024', '1.50'),
+(102511, '【SR】重音テト[踊れ 踊れ 嘘に踊れ]', '踊れ 踊れ 嘘に踊れ', 'Fire', 46194, '重音テト', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 105042, 105043, '[O.N.G.E.K.I.]1.50-E-0025', '1.50'),
+(102512, '【SR】重音テト[踊ったもん勝ち]', '踊ったもん勝ち', 'Fire', 46194, '重音テト', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120088, 120089, '[O.N.G.E.K.I.]1.50-E-0026', '1.50'),
+(102515, '【SSR】重音テト[人マニア]', '人マニア', 'Fire', 46194, '重音テト', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100138, 100139, '[O.N.G.E.K.I.]1.50-E-0029', '1.50'),
+(102516, '【SSR】重音テト[ライアーダンサー]', 'ライアーダンサー', 'Fire', 46194, '重音テト', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100031, 100072, '[O.N.G.E.K.I.]1.50-E-0030', '1.50'),
+(102571, '【R】和泉 妃愛[生徒会副会長]', '生徒会副会長', 'Fire', 46203, 'ハミダシクリエイティブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0039', '1.50'),
+(102572, '【R】常磐 華乃[生徒会広報]', '生徒会広報', 'Fire', 46204, 'ハミダシクリエイティブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0040', '1.50'),
+(102573, '【R】錦 あすみ[生徒会書記]', '生徒会書記', 'Fire', 46205, 'ハミダシクリエイティブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110148, 110149, '[O.N.G.E.K.I.]1.50-E-0041', '1.50'),
+(102574, '【R】鎌倉 詩桜[前生徒会長]', '前生徒会長', 'Fire', 46206, 'ハミダシクリエイティブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 130006, 130007, '[O.N.G.E.K.I.]1.50-E-0042', '1.50'),
+(102575, '【R】竜閑 天梨[生徒会お手伝い]', '生徒会お手伝い', 'Fire', 46207, 'ハミダシクリエイティブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110142, 110143, '[O.N.G.E.K.I.]1.50-E-0043', '1.50'),
+(102576, '【SR】和泉 妃愛[ダメ兄を甘やかすことに喜びを感じる人気声優]', 'ダメ兄を甘やかすことに喜びを感じる人気声優', 'Fire', 46203, 'ハミダシクリエイティブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 125012, 125013, '[O.N.G.E.K.I.]1.50-E-0044', '1.50'),
+(102577, '【SR】常磐 華乃[黒歴史を抱える売れっ子イラストレーター]', '黒歴史を抱える売れっ子イラストレーター', 'Fire', 46204, 'ハミダシクリエイティブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100025, 100066, '[O.N.G.E.K.I.]1.50-E-0045', '1.50'),
+(102578, '【SR】錦 あすみ[電脳世界「から」受肉した天使]', '電脳世界「から」受肉した天使', 'Fire', 46205, 'ハミダシクリエイティブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100016, 100057, '[O.N.G.E.K.I.]1.50-E-0046', '1.50'),
+(102579, '【SR】鎌倉 詩桜[前会長にして元凶の気まぐれ小説家]', '前会長にして元凶の気まぐれ小説家', 'Fire', 46206, 'ハミダシクリエイティブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100033, 100074, '[O.N.G.E.K.I.]1.50-E-0047', '1.50'),
+(102580, '【SR】竜閑 天梨[今をときめく人気読モ]', '今をときめく人気読モ', 'Fire', 46207, 'ハミダシクリエイティブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 115036, 115037, '[O.N.G.E.K.I.]1.50-E-0048', '1.50'),
+(102581, '【SSR】和泉 妃愛[妃愛&あすみ]', '妃愛&あすみ', 'Fire', 46203, 'ハミダシクリエイティブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 130062, 130063, '[O.N.G.E.K.I.]1.50-E-0049', '1.50'),
+(102582, '【SSR】和泉 妃愛[ハミダシクリエイティブ]', 'ハミダシクリエイティブ', 'Fire', 46203, 'ハミダシクリエイティブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 125046, 125047, '[O.N.G.E.K.I.]1.50-E-0050', '1.50'),
+(102586, '【R】長瀬有花[RIOT MUSIC]', 'RIOT MUSIC', 'Aqua', 46208, '長瀬有花', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0051', '1.50'),
+(102588, '【SR】長瀬有花[長瀬有花の日常①]', '長瀬有花の日常①', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100025, 100066, '[O.N.G.E.K.I.]1.50-E-0052', '1.50'),
+(102589, '【SR】長瀬有花[長瀬有花の日常②]', '長瀬有花の日常②', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100033, 100074, '[O.N.G.E.K.I.]1.50-E-0053', '1.50'),
+(102590, '【SR】長瀬有花[長瀬有花の日常③]', '長瀬有花の日常③', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100018, 100059, '[O.N.G.E.K.I.]1.50-E-0054', '1.50'),
+(102591, '【SR】長瀬有花[長瀬有花の日常④]', '長瀬有花の日常④', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110086, 110087, '[O.N.G.E.K.I.]1.50-E-0055', '1.50'),
+(102592, '【SR】長瀬有花[長瀬有花の日常⑤]', '長瀬有花の日常⑤', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110094, 110095, '[O.N.G.E.K.I.]1.50-E-0056', '1.50'),
+(102593, '【SR】長瀬有花[長瀬有花の日常⑥]', '長瀬有花の日常⑥', 'Aqua', 46208, '長瀬有花', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 125022, 125023, '[O.N.G.E.K.I.]1.50-E-0057', '1.50'),
+(102595, '【SSR】長瀬有花[Eureka]', 'Eureka', 'Aqua', 46208, '長瀬有花', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 110070, 110071, '[O.N.G.E.K.I.]1.50-E-0058', '1.50'),
+(102596, '【SSR】長瀬有花[だつりょく系アーティスト]', 'だつりょく系アーティスト', 'Aqua', 46208, '長瀬有花', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 105020, 105021, '[O.N.G.E.K.I.]1.50-E-0059', '1.50'),
+(102598, '【R】陸八魔 アル[便利屋68]', '便利屋68', 'Fire', 46209, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0067', '1.50'),
+(102599, '【R】鬼方 カヨコ[便利屋68]', '便利屋68', 'Fire', 46210, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0068', '1.50'),
+(102600, '【R】浅黄 ムツキ[便利屋68]', '便利屋68', 'Fire', 46211, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110142, 110143, '[O.N.G.E.K.I.]1.50-E-0069', '1.50'),
+(102601, '【R】伊草 ハルカ[便利屋68]', '便利屋68', 'Fire', 46212, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110108, 110109, '[O.N.G.E.K.I.]1.50-E-0070', '1.50'),
+(102602, '【R】桐藤 ナギサ[ティーパーティー]', 'ティーパーティー', 'Aqua', 46213, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 125050, 125051, '[O.N.G.E.K.I.]1.50-E-0096', '1.50'),
+(102603, '【R】聖園 ミカ[ティーパーティー]', 'ティーパーティー', 'Aqua', 46214, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0097', '1.50'),
+(102604, '【R】百合園 セイア[ティーパーティー]', 'ティーパーティー', 'Aqua', 46215, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100004, 100045, '[O.N.G.E.K.I.]1.50-E-0098', '1.50'),
+(102605, '【R】阿慈谷 ヒフミ[補習授業部]', '補習授業部', 'Aqua', 46216, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100004, 100045, '[O.N.G.E.K.I.]1.50-E-0099', '1.50'),
+(102606, '【R】白洲 アズサ[補習授業部]', '補習授業部', 'Aqua', 46217, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0100', '1.50'),
+(102607, '【R】下江 コハル[補習授業部]', '補習授業部', 'Aqua', 46218, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100003, 100044, '[O.N.G.E.K.I.]1.50-E-0101', '1.50'),
+(102608, '【R】浦和 ハナコ[補習授業部]', '補習授業部', 'Aqua', 46219, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 125006, 125007, '[O.N.G.E.K.I.]1.50-E-0102', '1.50'),
+(102609, '【R】柚鳥 ナツ[放課後スイーツ部]', '放課後スイーツ部', 'Leaf', 46220, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110084, 110085, '[O.N.G.E.K.I.]1.50-E-0071', '1.50'),
+(102610, '【R】杏山 カズサ[放課後スイーツ部]', '放課後スイーツ部', 'Leaf', 46221, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0072', '1.50'),
+(102611, '【R】栗村 アイリ[放課後スイーツ部]', '放課後スイーツ部', 'Leaf', 46222, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 105004, 105005, '[O.N.G.E.K.I.]1.50-E-0073', '1.50'),
+(102612, '【R】伊原木 ヨシミ[放課後スイーツ部]', '放課後スイーツ部', 'Leaf', 46223, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0074', '1.50'),
+(102613, '【R】美甘 ネル[Cleaning&Clearing]', 'Cleaning&Clearing', 'Fire', 46224, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0075', '1.50'),
+(102614, '【R】一之瀬 アスナ[Cleaning&Clearing]', 'Cleaning&Clearing', 'Fire', 46225, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100004, 100045, '[O.N.G.E.K.I.]1.50-E-0076', '1.50'),
+(102615, '【R】角楯 カリン[Cleaning&Clearing]', 'Cleaning&Clearing', 'Fire', 46226, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 100005, 100046, '[O.N.G.E.K.I.]1.50-E-0077', '1.50'),
+(102616, '【R】室笠 アカネ[Cleaning&Clearing]', 'Cleaning&Clearing', 'Fire', 46227, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 105112, 105113, '[O.N.G.E.K.I.]1.50-E-0078', '1.50'),
+(102617, '【R】飛鳥馬 トキ[Cleaning&Clearing]', 'Cleaning&Clearing', 'Fire', 46228, 'ブルーアーカイブ', '-', 'R', '50,197,212,227,242,257,0,0,0,257', 110092, 110093, '[O.N.G.E.K.I.]1.50-E-0079', '1.50'),
+(102628, '【SR】陸八魔 アル[外部経営顧問としての入社提案]', '外部経営顧問としての入社提案', 'Fire', 46209, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120018, 120019, '[O.N.G.E.K.I.]1.50-E-0080', '1.50'),
+(102629, '【SR】鬼方 カヨコ[雨の降る日の路地裏]', '雨の降る日の路地裏', 'Fire', 46210, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100025, 100066, '[O.N.G.E.K.I.]1.50-E-0081', '1.50'),
+(102630, '【SR】浅黄 ムツキ[誰かからの特別な依頼]', '誰かからの特別な依頼', 'Fire', 46211, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100016, 100057, '[O.N.G.E.K.I.]1.50-E-0082', '1.50'),
+(102631, '【SR】伊草 ハルカ[間違えて]', '間違えて', 'Fire', 46212, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 115008, 115009, '[O.N.G.E.K.I.]1.50-E-0083', '1.50'),
+(102632, '【SR】桐藤 ナギサ[紅茶とコク]', '紅茶とコク', 'Aqua', 46213, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110066, 110067, '[O.N.G.E.K.I.]1.50-E-0103', '1.50'),
+(102633, '【SR】聖園 ミカ[屋根裏部屋のお姫様]', '屋根裏部屋のお姫様', 'Aqua', 46214, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 105042, 105043, '[O.N.G.E.K.I.]1.50-E-0104', '1.50'),
+(102634, '【SR】百合園 セイア[眠り姫からの誘い]', '眠り姫からの誘い', 'Aqua', 46215, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110086, 110087, '[O.N.G.E.K.I.]1.50-E-0105', '1.50'),
+(102635, '【SR】阿慈谷 ヒフミ[偶然のお出かけ]', '偶然のお出かけ', 'Aqua', 46216, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 105052, 105053, '[O.N.G.E.K.I.]1.50-E-0106', '1.50'),
+(102636, '【SR】白洲 アズサ[計画]', '計画', 'Aqua', 46217, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100025, 100066, '[O.N.G.E.K.I.]1.50-E-0107', '1.50'),
+(102637, '【SR】下江 コハル[何するつもり？]', '何するつもり？', 'Aqua', 46218, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 115052, 115053, '[O.N.G.E.K.I.]1.50-E-0108', '1.50'),
+(102638, '【SR】浦和 ハナコ[少し変わった女の子]', '少し変わった女の子', 'Aqua', 46219, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100018, 100059, '[O.N.G.E.K.I.]1.50-E-0109', '1.50'),
+(102639, '【SR】柚鳥 ナツ[3時間目「実習：発掘」]', '3時間目「実習：発掘」', 'Leaf', 46220, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100017, 100058, '[O.N.G.E.K.I.]1.50-E-0084', '1.50'),
+(102640, '【SR】杏山 カズサ[バッドタイミング]', 'バッドタイミング', 'Leaf', 46221, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110094, 110095, '[O.N.G.E.K.I.]1.50-E-0085', '1.50'),
+(102641, '【SR】栗村 アイリ[ちょっとしたデート]', 'ちょっとしたデート', 'Leaf', 46222, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 105000, 105001, '[O.N.G.E.K.I.]1.50-E-0086', '1.50'),
+(102642, '【SR】伊原木 ヨシミ[その輝きの、すぐそばに]', 'その輝きの、すぐそばに', 'Leaf', 46223, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 100033, 100074, '[O.N.G.E.K.I.]1.50-E-0087', '1.50'),
+(102643, '【SR】美甘 ネル[輝く夜に]', '輝く夜に', 'Fire', 46224, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120018, 120019, '[O.N.G.E.K.I.]1.50-E-0088', '1.50'),
+(102644, '【SR】一之瀬 アスナ[壊れたアスナ]', '壊れたアスナ', 'Fire', 46225, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110136, 110137, '[O.N.G.E.K.I.]1.50-E-0089', '1.50'),
+(102645, '【SR】角楯 カリン[メイドカフェ！]', 'メイドカフェ！', 'Fire', 46226, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120074, 120075, '[O.N.G.E.K.I.]1.50-E-0090', '1.50'),
+(102646, '【SR】室笠 アカネ[輝く午後を迎えて]', '輝く午後を迎えて', 'Fire', 46227, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 130000, 130001, '[O.N.G.E.K.I.]1.50-E-0091', '1.50'),
+(102647, '【SR】飛鳥馬 トキ[メイドの中のメイド]', 'メイドの中のメイド', 'Fire', 46228, 'ブルーアーカイブ', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 110094, 110095, '[O.N.G.E.K.I.]1.50-E-0092', '1.50'),
+(102658, '【SSR】聖園 ミカ[聖園ミカ、ついに登場～☆ って感じかな？]', '聖園ミカ、ついに登場～☆ って感じかな？', 'Aqua', 46214, 'ブルーアーカイブ', '-', 'SSR', '67,287,307,319,326,337,0,0,0,342', 115134, 115135, '[O.N.G.E.K.I.]1.50-E-0110', '1.50'),
+(102659, '【SSR】美甘 ネル[コールサイン・ダブルオー]', 'コールサイン・ダブルオー', 'Fire', 46224, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 120006, 120007, '[O.N.G.E.K.I.]1.50-E-0093', '1.50'),
+(102660, '【SSR】阿慈谷 ヒフミ[私たちの、青春の物語を！！]', '私たちの、青春の物語を！！', 'Aqua', 46216, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 110098, 110099, '[O.N.G.E.K.I.]1.50-E-0111', '1.50'),
+(102661, '【SSR】栗村 アイリ[-ive aLIVE!]', '-ive aLIVE!', 'Leaf', 46222, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 110068, 110069, '[O.N.G.E.K.I.]1.50-E-0094', '1.50'),
+(102662, '【SSR】白洲 アズサ[Et Omnia Vanitas]', 'Et Omnia Vanitas', 'Aqua', 46217, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100144, 100145, '[O.N.G.E.K.I.]1.50-E-0112', '1.50'),
+(102663, '【SSR】陸八魔 アル[あっはは！これくらい簡単よ！]', 'あっはは！これくらい簡単よ！', 'Fire', 46209, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 110070, 110071, '[O.N.G.E.K.I.]1.50-E-0095', '1.50'),
+(102664, '【SSR】桐藤 ナギサ[いつでも余裕をもって、優雅に]', 'いつでも余裕をもって、優雅に', 'Aqua', 46213, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 105020, 105021, '[O.N.G.E.K.I.]1.50-301', '1.50'),
+(102665, '【SSR】飛鳥馬 トキ[命令を遂行します。]', '命令を遂行します。', 'Fire', 46228, 'ブルーアーカイブ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 125046, 125047, '[O.N.G.E.K.I.]1.50-302', '1.50'),
+(102688, '【SSR】星咲 あかり[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Fire', 1000, '奏坂学園', '高校2年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150001, 150002, '[O.N.G.E.K.I.]1.50-0029', '1.50'),
+(102689, '【SSR】藤沢 柚子[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Leaf', 1001, '奏坂学園', '高校2年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150005, 150006, '[O.N.G.E.K.I.]1.50-0030', '1.50'),
+(102690, '【SSR】三角 葵[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Aqua', 1002, '奏坂学園', '高校2年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150003, 150004, '[O.N.G.E.K.I.]1.50-0031', '1.50'),
+(102691, '【SSR】高瀬 梨緒[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Aqua', 1003, '奏坂学園', '高校2年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150003, 150004, '[O.N.G.E.K.I.]1.50-0032', '1.50'),
+(102692, '【SSR】結城 莉玖[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Fire', 1004, '奏坂学園', '高校1年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150001, 150002, '[O.N.G.E.K.I.]1.50-0033', '1.50'),
+(102693, '【SSR】藍原 椿[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Leaf', 1005, '奏坂学園', '高校1年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150005, 150006, '[O.N.G.E.K.I.]1.50-0034', '1.50'),
+(102696, '【SSR】九條 楓[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Leaf', 1008, '奏坂学園', '高校3年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150005, 150006, '[O.N.G.E.K.I.]1.50-0037', '1.50'),
+(102699, '【SSR】逢坂 茜[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Fire', 1011, '奏坂学園', '高校3年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150001, 150002, '[O.N.G.E.K.I.]1.50-0040', '1.50'),
+(102700, '【SSR】珠洲島 有栖[ハーバリウム・フェアリーズ]', 'ハーバリウム・フェアリーズ', 'Aqua', 1012, '奏坂学園', '高校1年生', 'SSR', '67,290,310,322,332,340,0,0,0,345', 150003, 150004, '[O.N.G.E.K.I.]1.50-0041', '1.50'),
+(102706, '【SSR】西館 ハク[アイシング・ドリーム]', 'アイシング・ドリーム', 'Fire', 32001, 'Re:ステージ！プリズムステップ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 130002, 130003, '[O.N.G.E.K.I.]1.50-0019', '1.50'),
+(102707, '【SSR】結城 莉玖[O.N.G.E.K.I. 7th Anniversary]', 'O.N.G.E.K.I. 7th Anniversary', 'Fire', 1004, '奏坂学園', '高校1年生', 'SSR', '65,275,295,307,314,325,0,0,0,330', 100034, 100075, '[O.N.G.E.K.I.]1.50-0049', '1.50'),
+(102708, '【SSR】桜井 春菜[O.N.G.E.K.I. 7th Anniversary]', 'O.N.G.E.K.I. 7th Anniversary', 'Fire', 1007, '奏坂学園', '高校2年生', 'SSR', '66,280,300,312,319,330,0,0,0,335', 135038, 135039, '[O.N.G.E.K.I.]1.50-0050', '1.50'),
+(102709, '【SSR】井之原 小星[O.N.G.E.K.I. 7th Anniversary]', 'O.N.G.E.K.I. 7th Anniversary', 'Leaf', 1010, '奏坂学園', '高校1年生', 'SSR', '65,275,295,307,314,325,0,0,0,330', 135074, 135075, '[O.N.G.E.K.I.]1.50-0051', '1.50'),
+(102710, '【SSR】逢坂 茜[O.N.G.E.K.I. 7th Anniversary]', 'O.N.G.E.K.I. 7th Anniversary', 'Fire', 1011, '奏坂学園', '高校3年生', 'SSR', '65,275,295,307,314,325,0,0,0,330', 105020, 105021, '[O.N.G.E.K.I.]1.50-0052', '1.50'),
+(102711, '【SSR】柏木 美亜[O.N.G.E.K.I. 7th Anniversary]', 'O.N.G.E.K.I. 7th Anniversary', 'Fire', 1013, '奏坂学園', '中学2年生', 'SSR', '66,280,300,312,319,330,0,0,0,335', 115120, 115121, '[O.N.G.E.K.I.]1.50-0053', '1.50'),
+(102721, '【SR】西郷・R・いろり[もちもちダウナー有能]', 'もちもちダウナー有能', 'Fire', 46019, '名取さな', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120068, 120069, '[O.N.G.E.K.I.]1.50-E-0060', '1.50'),
+(102722, '【SR】名取さな[名取探偵事務所所長]', '名取探偵事務所所長', 'Fire', 46019, '名取さな', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 120018, 120019, '[O.N.G.E.K.I.]1.50-E-0061', '1.50'),
+(102723, '【SR】名取さな[みんなで踊ろうおしりぷり音頭]', 'みんなで踊ろうおしりぷり音頭', 'Fire', 46019, '名取さな', '-', 'SR', '50,222,237,252,267,282,0,0,0,282', 115068, 115069, '[O.N.G.E.K.I.]1.50-E-0062', '1.50'),
+(102724, '【SSR】名取さな[名取探偵事務所開店！！]', '名取探偵事務所開店！！', 'Fire', 46019, '名取さな', '-', 'SSR', '65,270,291,304,314,322,0,0,0,327', 115132, 115133, '[O.N.G.E.K.I.]1.50-E-0063', '1.50'),
+(102725, '【SSR】名取さな[さなちゃんねる夏祭り]', 'さなちゃんねる夏祭り', 'Fire', 46019, '名取さな', '-', 'SSR', '65,270,291,304,314,322,0,0,0,327', 110004, 110005, '[O.N.G.E.K.I.]1.50-E-0064', '1.50'),
+(102726, '【SSR】名取さな[ハロー・マイ・バースデイ]', 'ハロー・マイ・バースデイ', 'Fire', 46019, '名取さな', '-', 'SSR', '65,270,291,304,314,322,0,0,0,327', 130086, 130087, '[O.N.G.E.K.I.]1.50-E-0065', '1.50'),
+(102727, '【SSR】名取さな[王国からの招待状]', '王国からの招待状', 'Fire', 46019, '名取さな', '-', 'SSR', '65,270,291,304,314,322,0,0,0,327', 120006, 120007, '[O.N.G.E.K.I.]1.50-E-0066', '1.50'),
+(102734, '【SSR】旭 日向[Earthly Light(集合Ver.)]', 'Earthly Light(集合Ver.)', 'Leaf', 32001, 'Re:ステージ！プリズムステップ', '-', 'SSR', '60,257,280,295,307,317,0,0,0,322', 100000, 100041, '[O.N.G.E.K.I.]1.50-371', '1.50'),
+(102738, '【SR+】珠洲島 有栖[Nexture 05「SIRIUS」]', 'Nexture 05「SIRIUS」', 'Aqua', 1012, '奏坂学園', '高校1年生', 'SRPlus', '53,240,263,278,290,300,0,0,0,300', 120072, 120073, '[O.N.G.E.K.I.]Special Card', '1.50');
diff --git a/src/main/resources/db/80/V1000_62__sega_card_timestamp.sql b/src/main/resources/db/80/V1000_62__sega_card_timestamp.sql
new file mode 100644
index 00000000..edd9f71d
--- /dev/null
+++ b/src/main/resources/db/80/V1000_62__sega_card_timestamp.sql
@@ -0,0 +1,11 @@
+CREATE TABLE sega_card_timestamp
+(
+    id           BIGINT AUTO_INCREMENT NOT NULL,
+    created_at   datetime(3)           NOT NULL,
+    updated_at   datetime(3)           NOT NULL,
+    game         VARCHAR(255)          NOT NULL,
+    card_id      BIGINT                NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT fk_sega_card_timestamp_on_sega_card FOREIGN KEY (card_id) REFERENCES sega_card (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT unq_sega_card_timestamp_on_game_card UNIQUE (game, card_id)
+);
diff --git a/src/main/resources/db/80/V1000_63__unlock_options_migration.sql b/src/main/resources/db/80/V1000_63__unlock_options_migration.sql
new file mode 100644
index 00000000..3a9df05e
--- /dev/null
+++ b/src/main/resources/db/80/V1000_63__unlock_options_migration.sql
@@ -0,0 +1,30 @@
+-- Add new unlock columns
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_music BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_chara BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_chara_max_level BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_partners BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_collectables BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN mai2_unlock_tickets BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN wacca_unlock_music BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN wacca_unlock_plates BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN wacca_unlock_collectables BIT NOT NULL DEFAULT 0;
+ALTER TABLE aqua_game_options ADD COLUMN wacca_unlock_tickets BIT NOT NULL DEFAULT 0;
+
+-- Migrate data
+UPDATE aqua_game_options SET
+    mai2_unlock_music = unlock_music,
+    mai2_unlock_chara = unlock_chara,
+    mai2_unlock_chara_max_level = unlock_chara,
+    mai2_unlock_partners = unlock_chara,
+    mai2_unlock_collectables = unlock_collectables,
+    mai2_unlock_tickets = unlock_tickets,
+    wacca_unlock_music = unlock_music,
+    wacca_unlock_plates = unlock_chara | unlock_collectables,
+    wacca_unlock_collectables = unlock_collectables,
+    wacca_unlock_tickets = unlock_tickets;
+
+-- Drop old columns
+ALTER TABLE aqua_game_options DROP COLUMN unlock_music;
+ALTER TABLE aqua_game_options DROP COLUMN unlock_chara;
+ALTER TABLE aqua_game_options DROP COLUMN unlock_collectables;
+ALTER TABLE aqua_game_options DROP COLUMN unlock_tickets;
diff --git a/src/main/resources/db/80/V1000_64__chusan_xverse_events_071_to_300.sql b/src/main/resources/db/80/V1000_64__chusan_xverse_events_071_to_300.sql
new file mode 100644
index 00000000..84ddb47a
--- /dev/null
+++ b/src/main/resources/db/80/V1000_64__chusan_xverse_events_071_to_300.sql
@@ -0,0 +1,112 @@
+INSERT INTO chusan_game_event (id, type, end_date, start_date, enable)
+VALUES
+    (17090, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17091, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17092, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17093, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17094, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17095, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17096, 11, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17100, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17101, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17102, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17103, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17104, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17105, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17106, 17, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17107, 4, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17108, 5, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17109, 7, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17150, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17151, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17152, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17153, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17154, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17155, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17156, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17157, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17158, 14, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17159, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17160, 11, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17200, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17201, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17202, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17203, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17204, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17205, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17206, 10, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17207, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17208, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17209, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17210, 17, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17211, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17213, 4, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17214, 5, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17250, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17251, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17252, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17256, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17257, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17258, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17259, 11, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17260, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17261, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17262, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17263, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17300, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17301, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17302, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17303, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17304, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17305, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17306, 17, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17307, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17308, 14, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17309, 4, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17310, 5, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17350, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17351, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17352, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17353, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17354, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17355, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17356, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17357, 10, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17358, 11, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17380, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17382, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17383, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17384, 7, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17385, 7, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17386, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17400, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17401, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17402, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17403, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17404, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17405, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17406, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17407, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17408, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17409, 17, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17410, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17411, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17412, 14, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17413, 4, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17414, 5, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17450, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17451, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17452, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17453, 8, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17454, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17480, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17481, 3, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17482, 1, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17483, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17484, 2, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true),
+    (17485, 17, '2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true)
+ON DUPLICATE KEY UPDATE
+    type = VALUES(type),
+    end_date = VALUES(end_date),
+    start_date = VALUES(start_date),
+    enable = VALUES(enable);
diff --git a/src/main/resources/db/80/V1000_60__drop_the_codebase.sql b/src/main/resources/db/80/V1000_65__drop_the_codebase.sql
similarity index 90%
rename from src/main/resources/db/80/V1000_60__drop_the_codebase.sql
rename to src/main/resources/db/80/V1000_65__drop_the_codebase.sql
index 6e37d855..085417bd 100644
--- a/src/main/resources/db/80/V1000_60__drop_the_codebase.sql
+++ b/src/main/resources/db/80/V1000_65__drop_the_codebase.sql
@@ -1,4 +1,3 @@
-# there are 0 profiles here so should be fine.
 drop table maimai_user_web_option;
 drop table maimai_user_survival;
 drop table maimai_user_present_event;
@@ -14,7 +13,6 @@ drop table maimai_game_event;
 
 drop table maimai_user_data;
 
-# there are 30 profiles in chuni, so make sure to back up before upgrading!
 drop table chuni_game_character;
 drop table chuni_game_charge;
 drop table chuni_game_event;