[Enhance][Bug fix] Fatalis values & Salt skill

- For Arcaea 6.2.3 - Add support for `skill_salt`. - Add support for dynamic values of "Hikari (Fatalis)", which is depended by world mode total steps. - Fix a bug that the character "Hikari (Fatalis)" cannot be used in world mode. （due to 3f5281582c)
2025-12-14 08:06:23 +08:00 · 2025-02-06 23:40:00 +08:00
parent 44d7d7e490
commit a23e5372fb
10 changed files with 199 additions and 30 deletions
--- a/version/core/character.py
+++ b/version/core/character.py
@@ -2,6 +2,7 @@ from .config_manager import Config
 from .constant import Constant
 from .error import ArcError, InputError, ItemNotEnough, NoData
 from .item import CollectionItemMixin, ItemCore
+from .sql import UserKVTable


 class Level:
@@ -55,6 +56,7 @@ class Skill:
 class CharacterValue:
    def __init__(self, start: float = 0, mid: float = 0, end: float = 0) -> None:
        self.set_parameter(start, mid, end)
+        self.addition: float = 0

    @staticmethod
    def _calc_char_value_20_math(level: int, value_1: float, value_20: float) -> float:
@@ -87,9 +89,9 @@ class CharacterValue:

    def get_value(self, level: Level):
        if level.min_level <= level.level <= level.mid_level:
-            return self._calc_char_value_20_math(level.level, self.start, self.mid)
+            return self._calc_char_value_20_math(level.level, self.start, self.mid) + self.addition
        if level.mid_level < level.level <= level.max_level:
-            return self._calc_char_value_30(level.level, self.mid, self.end)
+            return self._calc_char_value_30(level.level, self.mid, self.end) + self.addition
        return 0


@@ -231,6 +233,8 @@ class UserCharacter(Character):

        self.skill_flag: bool = None

+        self.fatalis_is_limited: bool = False
+
    @property
    def skill_id_displayed(self) -> str:
        '''对外显示的技能id'''
@@ -295,6 +299,22 @@ class UserCharacter(Character):
        if self.character_id in (21, 46):
            self.voice = [0, 1, 2, 3, 100, 1000, 1001]

+        if self.character_id == 55:
+            # fatalis 提升数值
+            # prog & overdrive += 世界模式中完成的所有非无限地图的台阶数之和 / 30
+            if Config.CHARACTER_FULL_UNLOCK:
+                addition = Constant.FATALIS_MAX_VALUE
+                self.fatalis_is_limited = True
+            else:
+                kvd = UserKVTable(self.c, self.user.user_id, 'world')
+                steps = kvd['total_step_count'] or 0
+                addition = steps / 30
+                if addition >= Constant.FATALIS_MAX_VALUE:
+                    addition = Constant.FATALIS_MAX_VALUE
+                    self.fatalis_is_limited = True
+            self.prog.addition = addition
+            self.overdrive.addition = addition
+
        self.select_character_core()

    def to_dict(self) -> dict:
@@ -321,7 +341,7 @@ class UserCharacter(Character):
        if self.voice:
            r['voice'] = self.voice
        if self.character_id == 55:
-            r['fatalis_is_limited'] = False  # emmmmmmm
+            r['fatalis_is_limited'] = self.fatalis_is_limited
        if self.character_id in [1, 6, 7, 17, 18, 24, 32, 35, 52]:
            r['base_character_id'] = 1

--- a/version/core/constant.py
+++ b/version/core/constant.py
@@ -1,7 +1,7 @@
 from .config_manager import Config

-ARCAEA_SERVER_VERSION = 'v2.12.0.3'
-ARCAEA_DATABASE_VERSION = 'v2.12.0.3'
+ARCAEA_SERVER_VERSION = 'v2.12.0.4'
+ARCAEA_DATABASE_VERSION = 'v2.12.0.4'
 ARCAEA_LOG_DATBASE_VERSION = 'v1.1'


@@ -36,6 +36,7 @@ class Constant:
    SKILL_FATALIS_WORLD_LOCKED_TIME = 3600000
    SKILL_MIKA_SONGS = ['aprilshowers', 'seventhsense', 'oshamascramble',
                        'amazingmightyyyy', 'cycles', 'maxrage', 'infinity', 'temptation']
+    FATALIS_MAX_VALUE = 100

    MAX_FRIEND_COUNT = Config.MAX_FRIEND_COUNT

@@ -72,7 +73,6 @@ class Constant:
    LINKPLAY_TCP_SECRET_KEY = Config.LINKPLAY_TCP_SECRET_KEY
    LINKPLAY_TCP_MAX_LENGTH = 0x0FFFFFFF

-
    LINKPLAY_MATCH_GET_ROOMS_INTERVAL = 4  # Units: seconds
    LINKPLAY_MATCH_PTT_ABS = [5, 20, 50, 100, 200, 500, 1000, 2000]
    LINKPLAY_MATCH_UNLOCK_MIN = [1000, 800, 500, 300, 200, 100, 50, 1]
--- a/version/core/score.py
+++ b/version/core/score.py
@@ -372,6 +372,7 @@ class UserPlay(UserScore):
        if self.user.stamina.stamina < self.user.current_map.stamina_cost * self.stamina_multiply:
            raise StaminaNotEnough('Stamina is not enough.')

+        fatalis_stamina_multiply = 1
        self.user.select_user_about_character()
        if not self.user.is_skill_sealed:
            self.user.character.select_character_info()
@@ -383,16 +384,13 @@ class UserPlay(UserScore):

            elif self.user.character.skill_id_displayed == 'skill_fatalis':
                # 特殊判断hikari fatalis的双倍体力消耗
-                self.user.stamina.stamina -= self.user.current_map.stamina_cost * \
-                    self.stamina_multiply * 2
-                self.user.stamina.update()
-                return None
+                fatalis_stamina_multiply = 2

        self.clear_play_state()
        self.c.execute('''insert into songplay_token values(:t,:a,:b,:c,'',-1,0,0,:d,:e,:f,:g,:h,:i,:j)''', {
            'a': self.user.user_id, 'b': self.song.song_id, 'c': self.song.difficulty, 'd': self.stamina_multiply, 'e': self.fragment_multiply, 'f': self.prog_boost_multiply, 'g': self.beyond_boost_gauge_usage, 'h': self.skill_cytusii_flag, 'i': self.skill_chinatsu_flag, 'j': self.invasion_flag, 't': self.song_token})

-        self.user.stamina.stamina -= self.user.current_map.stamina_cost * self.stamina_multiply
+        self.user.stamina.stamina -= self.user.current_map.stamina_cost * self.stamina_multiply * fatalis_stamina_multiply
        self.user.stamina.update()

    def set_play_state_for_course(self, use_course_skip_purchase: bool, course_id: str = None) -> None:
--- a/version/core/sql.py
+++ b/version/core/sql.py
@@ -525,3 +525,35 @@ class MemoryDatabase:
@register
 def atexit():
    MemoryDatabase.conn.close()
+
+
+class UserKVTable:
+    '''用户键值对表'''
+
+    def __init__(self, c=None, user_id: int = None, class_name: str = None) -> None:
+        self.c = c
+        self.user_id = user_id
+        self.class_name = class_name
+
+    def get(self, key: str, idx: int = 0):
+        '''获取键值对'''
+        x = self.c.execute(
+            '''select value from user_kvdata where user_id = ? and class = ? and key = ? and idx = ?''', (self.user_id, self.class_name, key, idx)).fetchone()
+        return x[0] if x else None
+
+    def set(self, key: str, value, idx: int = 0) -> None:
+        '''设置键值对'''
+        self.c.execute('''insert or replace into user_kvdata values(?,?,?,?,?)''',
+                       (self.user_id, self.class_name, key, idx, value))
+
+    def __getitem__(self, args):
+        if isinstance(args, tuple):
+            return self.get(*args)
+        else:
+            return self.get(args)
+
+    def __setitem__(self, args, value):
+        if isinstance(args, tuple):
+            self.set(args[0], value, args[1])
+        else:
+            self.set(args, value)
--- a/version/core/user.py
+++ b/version/core/user.py
@@ -13,8 +13,8 @@ from .item import UserItemList
 from .limiter import ArcLimiter
 from .mission import UserMissionList
 from .score import Score
-from .sql import Query, Sql
-from .world import Map, UserMap, UserStamina
+from .sql import Query, Sql, UserKVTable
+from .world import Map, MapParser, UserMap, UserStamina


 def code_get_id(c, user_code: str) -> int:
@@ -730,6 +730,35 @@ class UserInfo(User):
            '''update user set world_rank_score = ? where user_id = ?''', (x[0], self.user_id))
        self.world_rank_score = x[0]

+    def update_user_world_complete_info(self) -> None:
+        '''
+            更新用户的世界模式完成信息，包括两个部分
+
+            1. 每个章节的完成地图数量，为了 salt 技能
+            2. 全世界模式完成台阶数之和，为了 fatalis 技能
+        '''
+        kvd = UserKVTable(self.c, self.user_id, 'world')
+
+        for chapter_id, map_ids in MapParser.chapter_info_without_repeatable.items():
+            self.c.execute(
+                f'''select map_id, curr_position from user_world where user_id = ? and map_id in ({','.join(['?']*len(map_ids))})''',
+                (self.user_id, *map_ids)
+            )
+            x = self.c.fetchall()
+            n = 0
+            for map_id, curr_position in x:
+                step_count = MapParser.world_info[map_id]['step_count']
+                if curr_position == step_count - 1:
+                    n += 1
+            kvd['chapter_complete_count', chapter_id] = n
+
+        self.c.execute(
+            '''select sum(curr_position) + count(*) from user_world where user_id = ?''', (self.user_id,)
+        )
+        x = self.c.fetchone()
+        if x is not None:
+            kvd['total_step_count'] = x[0] or 0
+
    def select_user_one_column(self, column_name: str, default_value=None, data_type=None) -> None:
        '''
            查询user表的某个属性
--- a/version/core/world.py
+++ b/version/core/world.py
@@ -5,15 +5,22 @@ from random import randint
 from time import time

 from .character import Character, UserCharacter
+from .config_manager import Config
 from .constant import Constant
 from .error import InputError, MapLocked, NoData
 from .item import ItemFactory
+from .sql import UserKVTable


 class MapParser:

    map_id_path: 'dict[str, str]' = {}

+    world_info: 'dict[str, dict]' = {}  # 简要记录地图信息
+    chapter_info: 'dict[int, list[str]]' = {}  # 章节包含的地图
+    # 章节包含的地图（不包含可重复地图）
+    chapter_info_without_repeatable: 'dict[int, list[str]]' = {}
+
    def __init__(self) -> None:
        if not self.map_id_path:
            self.parse()
@@ -25,10 +32,31 @@ class MapParser:
                    continue

                path = os.path.join(root, file)
-                self.map_id_path[file[:-5]] = path
+                map_id = file[:-5]
+                self.map_id_path[map_id] = path
+
+                map_data = self.get_world_info(map_id)
+                chapter = map_data.get('chapter', None)
+                if chapter is None:
+                    continue
+                self.chapter_info.setdefault(chapter, []).append(map_id)
+                is_repeatable = map_data.get('is_repeatable', False)
+                if not is_repeatable:
+                    self.chapter_info_without_repeatable.setdefault(
+                        chapter, []).append(map_id)
+                self.world_info[map_id] = {
+                    'chapter': chapter,
+                    'is_repeatable': is_repeatable,
+                    'is_beyond': map_data.get('is_beyond', False),
+                    'is_legacy': map_data.get('is_legacy', False),
+                    'step_count': len(map_data.get('steps', [])),
+                }

    def re_init(self) -> None:
        self.map_id_path.clear()
+        self.world_info.clear()
+        self.chapter_info.clear()
+        self.chapter_info_without_repeatable.clear()
        self.get_world_info.cache_clear()
        self.parse()

@@ -471,6 +499,14 @@ class UserStamina(Stamina):


 class WorldSkillMixin:
+    '''
+        不可实例化
+
+        self.c = c
+        self.user = user
+        self.user_play = user_play
+    '''
+
    def before_calculate(self) -> None:
        factory_dict = {
            'skill_vita': self._skill_vita,
@@ -480,6 +516,7 @@ class WorldSkillMixin:
            'skill_hikari_vanessa': self._skill_hikari_vanessa,
            'skill_mithra': self._skill_mithra,
            'skill_chinatsu': self._skill_chinatsu,
+            'skill_salt': self._skill_salt,
        }
        if self.user_play.beyond_gauge == 0 and self.character_used.character_id == 35 and self.character_used.skill_id_displayed:
            self._special_tempest()
@@ -670,6 +707,26 @@ class WorldSkillMixin:
            self.character_bonus_progress_normalized = self.progress_normalized
            self.user.current_map.reclimb(self.final_progress)

+    def _skill_salt(self) -> None:
+        '''
+        salt 技能，根据单个章节地图的完成情况额外获得最高 10 的世界模式进度
+
+        当前章节完成地图数 / 本章节总地图数（不含无限图）* 10
+        '''
+        if Config.CHARACTER_FULL_UNLOCK:
+            self.character_bonus_progress_normalized = 10
+            return
+
+        kvd = UserKVTable(self.c, self.user.user_id, 'world')
+
+        chapter_id = self.user.current_map.chapter
+        count = kvd['chapter_complete_count', chapter_id] or 0
+        total = len(MapParser.chapter_info_without_repeatable[chapter_id])
+        if count > total:
+            count = total
+
+        self.character_bonus_progress_normalized = 10 * (count / total)
+

 class BaseWorldPlay(WorldSkillMixin):
    '''
@@ -822,6 +879,9 @@ class BaseWorldPlay(WorldSkillMixin):

        self.user.current_map.update()

+        # 更新用户完成情况
+        self.user.update_user_world_complete_info()
+
    def update(self) -> None:
        '''世界模式更新'''
        self.before_update()
--- a/version/database/init/arc_data.py
+++ b/version/database/init/arc_data.py
@@ -1,45 +1,45 @@
 class InitData:
    char = ['hikari', 'tairitsu', 'kou', 'sapphire', 'lethe', 'hikari&tairitsu(reunion)', 'Tairitsu(Axium)', 'Tairitsu(Grievous Lady)', 'stella', 'Hikari & Fisica', 'ilith', 'eto', 'luna', 'shirabe', 'Hikari(Zero)', 'Hikari(Fracture)', 'Hikari(Summer)', 'Tairitsu(Summer)', 'Tairitsu & Trin',
-            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange', 'linka', 'nami', 'Saya & Elizabeth', 'lily', 'kanae(midsummer)', 'alice&tenniel(minuet)', 'tairitsu(elegy)', 'marija', 'vita', 'hikari(fatalis)', 'saki', 'setsuna', 'amane', 'kou(winter)', 'lagrange(aria)', 'lethe(apophenia)', 'shama(UNiVERSE)', 'milk(UNiVERSE)', 'shikoku', 'mika yurisaki', 'Mithra Tercera', 'Toa Kozukata', 'Nami(Twilight)', 'Ilith & Ivy', 'Hikari & Vanessa', 'Maya', 'Insight(Ascendant - 8th Seeker)', 'Luin', 'Vita(Cadenza)', 'Ai-chan', 'Luna & Ilot', 'Eto & Hoppe', 'Forlorn(Ascendant - 6th Seeker)', 'Chinatsu', 'Tsumugi', 'Nai', 'Selene Sheryl']
+            'ayu', 'Eto & Luna', 'yume', 'Seine & Hikari', 'saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'haruna', 'nono', 'MTA-XXX', 'MDA-21', 'kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'sia', 'DORO*C', 'Tairitsu(Tempest)', 'brillante', 'Ilith(Summer)', 'etude', 'Alice & Tenniel', 'Luna & Mia', 'areus', 'seele', 'isabelle', 'mir', 'lagrange', 'linka', 'nami', 'Saya & Elizabeth', 'lily', 'kanae(midsummer)', 'alice&tenniel(minuet)', 'tairitsu(elegy)', 'marija', 'vita', 'hikari(fatalis)', 'saki', 'setsuna', 'amane', 'kou(winter)', 'lagrange(aria)', 'lethe(apophenia)', 'shama(UNiVERSE)', 'milk(UNiVERSE)', 'shikoku', 'mika yurisaki', 'Mithra Tercera', 'Toa Kozukata', 'Nami(Twilight)', 'Ilith & Ivy', 'Hikari & Vanessa', 'Maya', 'Insight(Ascendant - 8th Seeker)', 'Luin', 'Vita(Cadenza)', 'Ai-chan', 'Luna & Ilot', 'Eto & Hoppe', 'Forlorn(Ascendant - 6th Seeker)', 'Chinatsu', 'Tsumugi', 'Nai', 'Selene Sheryl', 'Salt', 'Acid']

    skill_id = ['gauge_easy', '', '', '', 'note_mirror', 'skill_reunion', '', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', '', '', 'visual_ghost_skynotes', 'skill_vita', 'skill_fatalis', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', '', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'skill_mithra', 'skill_toa', 'skill_nami_twilight', 'skill_ilith_ivy', 'skill_hikari_vanessa', 'skill_maya', 'skill_intruder', 'skill_luin', '', 'skill_aichan', 'skill_luna_ilot', 'skill_eto_hoppe', 'skill_nell', 'skill_chinatsu', 'skill_tsumugi', 'skill_nai', 'skill_selene']
+                'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', '', '', 'visual_ghost_skynotes', 'skill_vita', 'skill_fatalis', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', '', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'skill_mithra', 'skill_toa', 'skill_nami_twilight', 'skill_ilith_ivy', 'skill_hikari_vanessa', 'skill_maya', 'skill_intruder', 'skill_luin', '', 'skill_aichan', 'skill_luna_ilot', 'skill_eto_hoppe', 'skill_nell', 'skill_chinatsu', 'skill_tsumugi', 'skill_nai', 'skill_selene', 'skill_salt', 'skill_acid']

    skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', 'ilith_awakened_skill', 'eto_uncap', 'luna_uncap', 'shirabe_entry_fee',
-                      '', '', '', '', '', 'ayu_uncap', '', 'frags_yume', '', 'skill_saya_uncap', '', '', '', '', '', '', 'skill_kanae_uncap', '', '', '', 'skill_doroc_uncap', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'skill_luin_uncap', '', '', '', '', '', '', '', '', '']
+                      '', '', '', '', '', 'ayu_uncap', '', 'frags_yume', '', 'skill_saya_uncap', '', '', '', '', '', '', 'skill_kanae_uncap', '', '', '', 'skill_doroc_uncap', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'skill_luin_uncap', '', '', '', '', '', '', '', '', '', '', '']

    skill_unlock_level = [0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0,
-                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+                          0, 0, 0, 8, 0, 14, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]

    frag1 = [55, 55, 60, 50, 47, 79, 47, 57, 41, 22, 50, 54, 60, 56, 78, 42, 41, 61, 52, 50, 52, 32,
-             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42, 38, 25, 58, 50, 61, 45, 45, 38, 34, 27, 18, 56, 47, 30, 45, 57, 56, 47, 33, 26, 29, 66, 40, 33, 51, 27, 50, 60, 45, 50, 38, 22, 63, 37, 23, 59, 45]
+             42, 55, 45, 58, 43, 0.5, 68, 50, 62, 45, 45, 52, 44, 27, 59, 0, 45, 50, 50, 47, 47, 61, 43, 42, 38, 25, 58, 50, 61, 45, 45, 38, 34, 27, 18, 56, 47, 30, 45, 57, 56, 47, 33, 26, 29, 66, 40, 33, 51, 27, 50, 60, 45, 50, 38, 22, 63, 37, 23, 59, 45, 20, 43]

    prog1 = [35, 55, 47, 50, 60, 70, 60, 70, 58, 45, 70, 45, 42, 46, 61, 67, 49, 44, 28, 45, 24, 46, 52,
-             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42, 50, 50, 45, 41, 61, 45, 45, 58, 50, 130, 18, 57, 55, 50, 45, 70, 37.5, 29, 44, 26, 26, 35, 40, 33, 58, 31, 40, 50, 45, 41, 12, 31, 72, 40, 16, 33, 35]
+             59, 62, 33, 58, 25, 63, 69, 50, 45, 45, 51, 34, 70, 62, 70, 45, 32, 32, 61, 47, 47, 37, 42, 50, 50, 45, 41, 61, 45, 45, 58, 50, 130, 18, 57, 55, 50, 45, 70, 37.5, 29, 44, 26, 26, 35, 40, 33, 58, 31, 40, 50, 45, 41, 12, 31, 72, 40, 16, 33, 35, 23, 24]

    overdrive1 = [35, 55, 25, 50, 47, 70, 72, 57, 41, 7, 10, 32, 65, 31, 61, 53, 31, 47, 38, 12, 39, 18,
-                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80, 38, 30, 49, 15, 34, 45, 45, 38, 67, 120, 44, 33, 55, 50, 45, 57, 31, 29, 65, 26, 29, 42.5, 40, 33, 58, 31, 35, 34, 45, 41, 12, 19, 38, 40, 26, 39, 56]
+                  48, 65, 45, 55, 44, 25, 46, 44, 33, 45, 45, 37, 25, 27, 50, 20, 45, 63, 21, 47, 61, 47, 65, 80, 38, 30, 49, 15, 34, 45, 45, 38, 67, 120, 44, 33, 55, 50, 45, 57, 31, 29, 65, 26, 29, 42.5, 40, 33, 58, 31, 35, 34, 45, 41, 12, 19, 38, 40, 26, 39, 56, 20, 25]

    frag20 = [78, 80, 90, 75, 70, 79, 70, 79, 65, 40, 50, 80, 90, 82, 0, 61, 67, 92, 85, 50, 86, 52,
-              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 54, 100, 50, 58, 51, 40, 115, 70, 50, 61.6, 48, 37, 90, 60, 50, 92, 66]
+              65, 85, 67, 88, 64, 0.5, 95, 70, 95, 50, 80, 87, 71, 50, 85, 0, 80, 75, 50, 70, 70, 90, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 54, 100, 50, 58, 51, 40, 115, 70, 50, 61.6, 48, 37, 90, 60, 50, 92, 66, 44, 79]

    prog20 = [61, 80, 70, 75, 90, 70, 90, 102, 84, 78, 105, 67, 63, 68, 0, 99, 80, 66, 46, 83, 40, 73,
-              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 50, 53, 85, 58, 96, 47, 80, 80, 67, 41, 55, 50, 103, 66, 35, 52, 65]
+              80, 90, 93, 50, 86, 78, 89, 98, 75, 80, 50, 64, 55, 100, 90, 110, 80, 50, 74, 90, 70, 70, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 50, 53, 85, 58, 96, 47, 80, 80, 67, 41, 55, 50, 103, 66, 35, 52, 65, 50, 43]

    overdrive20 = [61, 80, 47, 75, 70, 70, 95, 79, 65, 31, 50, 59, 90, 58, 0, 78, 50, 70, 62, 49, 64,
-                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 54, 65.5, 59.5, 58, 96, 47, 75, 54, 90, 41, 34, 30, 55, 66, 55, 62, 81]
+                   46, 73, 95, 67, 84, 70, 78, 69, 70, 50, 80, 80, 63, 25, 50, 72, 55, 50, 95, 55, 70, 90, 70, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 54, 65.5, 59.5, 58, 96, 47, 75, 54, 90, 41, 34, 30, 55, 66, 55, 62, 81, 44, 46]

    frag30 = [88, 90, 100, 75, 80, 89, 70, 79, 65, 40, 50, 90, 100, 92, 0, 61, 67, 92, 85, 50, 86, 62,
-              65, 95, 67, 88, 74, 0.5, 105, 80, 105, 50, 80, 87, 81, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 64, 100, 50, 58, 51, 40, 115, 80, 50, 61.6, 48, 37, 90, 60, 50, 102, 76]
+              65, 95, 67, 88, 74, 0.5, 105, 80, 105, 50, 80, 87, 81, 50, 95, 0, 80, 75, 50, 70, 80, 100, 65, 80, 61, 50, 68, 60, 90, 67, 50, 60, 51, 50, 35, 85, 47, 50, 75, 80, 90, 80, 50, 51, 64, 100, 50, 58, 51, 40, 115, 80, 50, 61.6, 48, 37, 90, 60, 50, 102, 76, 44, 89]

    prog30 = [71, 90, 80, 75, 100, 80, 90, 102, 84, 78, 110, 77, 73, 78, 0, 99, 80, 66, 46, 93, 40, 83,
-              80, 100, 93, 50, 96, 88, 99, 108, 85, 80, 50, 64, 65, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 60, 53, 85, 58, 96, 47, 80, 90, 67, 41, 55, 50, 103, 66, 35, 62, 75]
+              80, 100, 93, 50, 96, 88, 99, 108, 85, 80, 50, 64, 65, 100, 100, 110, 80, 50, 74, 90, 80, 80, 56, 80, 79, 55, 65, 59, 90, 50, 90, 90, 75, 210, 35, 86, 92, 80, 75, 100, 60, 50, 68, 51, 60, 53, 85, 58, 96, 47, 80, 90, 67, 41, 55, 50, 103, 66, 35, 62, 75, 50, 53]

    overdrive30 = [71, 90, 57, 75, 80, 80, 95, 79, 65, 31, 50, 69, 100, 68, 0, 78, 50, 70, 62, 59, 64,
-                   56, 73, 105, 67, 84, 80, 88, 79, 80, 60, 80, 80, 63, 35, 50, 82, 55, 50, 95, 55, 70, 100, 80, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 64, 65.5, 59.5, 58, 96, 47, 75, 64, 90, 41, 34, 30, 55, 66, 55, 72, 91]
+                   56, 73, 105, 67, 84, 80, 88, 79, 80, 60, 80, 80, 63, 35, 50, 82, 55, 50, 95, 55, 70, 100, 80, 99, 80, 61, 40, 69, 62, 51, 90, 67, 60, 100, 200, 85, 50, 92, 50, 75, 80, 49.5, 50, 100, 51, 64, 65.5, 59.5, 58, 96, 47, 75, 64, 90, 41, 34, 30, 55, 66, 55, 72, 91, 44, 56]

    char_type = [1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 2, 0, 0, 0, 2, 3, 1, 0, 0, 0, 1,
-                 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 2, 0, 0, 2, 0, 0, 2, 0, 2, 2, 1, 0, 2, 0, 4, 2, 0, 0, 0, 0, 4, 0, 0, 0, 2]
+                 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 2, 2, 0, 0, 2, 0, 0, 2, 0, 2, 2, 1, 0, 2, 0, 4, 2, 0, 0, 0, 0, 4, 0, 0, 0, 2, 0, 2]

    char_core = {
        0: [{'core_id': 'core_hollow', 'amount': 25}, {'core_id': 'core_desolate', 'amount': 5}],
@@ -67,10 +67,11 @@ class InitData:
        23: [{'core_id': 'core_desolate', 'amount': 5}, {'core_id': 'core_serene', 'amount': 25}],
        81: [{'core_id': 'core_chunithm', 'amount': 15}],
        82: [{'core_id': 'core_chunithm', 'amount': 15}],
+        84: [{'core_id': 'core_maimai', 'amount': 15}],
    }

    cores = ['core_hollow', 'core_desolate', 'core_chunithm', 'core_crimson',
-             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic', 'core_binary', 'core_colorful', 'core_course_skip_purchase', 'core_umbral', 'core_wacca', 'core_sunset', 'core_tanoc', 'core_serene']
+             'core_ambivalent', 'core_scarlet', 'core_groove', 'core_generic', 'core_binary', 'core_colorful', 'core_course_skip_purchase', 'core_umbral', 'core_wacca', 'core_sunset', 'core_tanoc', 'core_serene', 'core_maimai']

    world_songs = ["babaroque", "shadesoflight", "kanagawa", "lucifer", "anokumene", "ignotus", "rabbitintheblackroom", "qualia", "redandblue", "bookmaker", "darakunosono", "espebranch", "blacklotus", "givemeanightmare", "vividtheory", "onefr", "gekka", "vexaria3", "infinityheaven3", "fairytale3", "goodtek3", "suomi", "rugie", "faintlight", "harutopia", "goodtek", "dreaminattraction", "syro", "diode", "freefall", "grimheart", "blaster",
                   "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow", "enchantedlove", "take", "lifeispiano", "vandalism", "nexttoyou3", "lostcivilization3", "turbocharger", "bookmaker3", "laqryma3", "kyogenkigo", "hivemind", "seclusion", "quonwacca3", "bluecomet", "energysynergymatrix", "gengaozo", "lastendconductor3", "antithese3", "qualia3", "kanagawa3", "heavensdoor3", "pragmatism3", "nulctrl", "avril", "ddd", "merlin3", "omakeno3", "nekonote", "sanskia", 'altair', 'mukishitsu', 'trapcrow', 'redandblue3', 'ignotus3', 'singularity3', 'dropdead3', 'arcahv', 'freefall3', 'partyvinyl3', 'tsukinimurakumo', 'mantis', 'worldfragments', 'astrawalkthrough', 'chronicle', 'trappola3', 'letsrock', 'shadesoflight3', 'teriqma3', 'impact3', 'lostemotion', 'gimmick', 'lawlesspoint', 'hybris', 'ultimatetaste', 'rgb', 'matenrou', 'dynitikos', 'amekagura', 'fantasy', 'aloneandlorn', 'felys', 'onandon', 'hotarubinoyuki', 'oblivia3', 'libertas3', 'einherjar3', 'purpleverse3', 'viciousheroism3', 'inkarusi3', 'cyberneciacatharsis3', 'alephzero', 'hellohell', 'ichirin', 'awakeninruins', 'morningloom', 'lethalvoltage', 'leaveallbehind', 'desive', 'oldschoolsalvage', 'distortionhuman', 'epitaxy', 'hailstone', 'furetemitai', 'prayer', 'astralexe']
--- a/version/database/init/packs.json
+++ b/version/database/init/packs.json
@@ -916,5 +916,23 @@
 		],
 		"orig_price": 400,
 		"price": 400
+	},
+	{
+		"name": "maimai_append_2",
+		"items": [
+			{
+				"type": "pack",
+				"id": "maimai_append_2",
+				"is_available": true
+			},
+			{
+				"type": "core",
+				"amount": 4,
+				"id": "core_generic",
+				"is_available": true
+			}
+		],
+		"orig_price": 400,
+		"price": 400
 	}
 ]
--- a/version/database/init/tables.sql
+++ b/version/database/init/tables.sql
@@ -279,6 +279,17 @@ status int,
 primary key(user_id, mission_id)
 );

+-- value 无类型
+create table if not exists user_kvdata(
+user_id int,
+class text,
+key text,
+idx int,
+value,
+primary key(user_id, class, key, idx)
+);
+
+
 create index if not exists best_score_1 on best_score (song_id, difficulty);

 PRAGMA journal_mode = WAL;
--- a/version/web/index.py
+++ b/version/web/index.py
@@ -443,7 +443,7 @@ def all_character():
 def change_character():
    # 修改角色数据
    skill_ids = ['No_skill', 'gauge_easy', 'note_mirror', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap', 'frags_preferred_song', 'visual_ghost_skynotes', 'ayu_uncap', 'skill_vita', 'skill_fatalis', 'skill_reunion', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'ilith_awakened_skill', 'skill_mithra', 'skill_toa', 'skill_nami_twilight', 'skill_ilith_ivy', 'skill_hikari_vanessa', 'skill_maya', 'skill_luin', 'skill_luin_uncap', 'skill_kanae_uncap', 'skill_doroc_uncap', 'skill_saya_uncap', 'skill_luna_ilot', 'skill_eto_hoppe', 'skill_aichan', 'skill_nell', 'skill_chinatsu', 'skill_tsumugi', 'skill_nai', 'skill_selene']
+                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle', 'gauge_exhaustion', 'skill_lagrange', 'gauge_safe_10', 'frags_nami', 'skill_elizabeth', 'skill_lily', 'skill_kanae_midsummer', 'eto_uncap', 'luna_uncap', 'frags_preferred_song', 'visual_ghost_skynotes', 'ayu_uncap', 'skill_vita', 'skill_fatalis', 'skill_reunion', 'frags_ongeki_slash', 'frags_ongeki_hard', 'skill_amane', 'skill_kou_winter', 'gauge_hard|note_mirror', 'skill_shama', 'skill_milk', 'skill_shikoku', 'skill_mika', 'ilith_awakened_skill', 'skill_mithra', 'skill_toa', 'skill_nami_twilight', 'skill_ilith_ivy', 'skill_hikari_vanessa', 'skill_maya', 'skill_luin', 'skill_luin_uncap', 'skill_kanae_uncap', 'skill_doroc_uncap', 'skill_saya_uncap', 'skill_luna_ilot', 'skill_eto_hoppe', 'skill_aichan', 'skill_nell', 'skill_chinatsu', 'skill_tsumugi', 'skill_nai', 'skill_selene', 'skill_salt', 'skill_acid']
    return render_template('web/changechar.html', skill_ids=skill_ids)