Implement Resort Anthem and Lincle

README.md

@@ -13,8 +13,10 @@ Edit services url and enable url_slash
 
 
 ## Playable Games:
-- `DDR A20 PLUS`
+- DDR A20 PLUS
-- `DDR A3`
+- DDR A3
-- `IIDX 20 tricoro`
+- IIDX 18 Resort Anthem
-- `IIDX 29 CastHour`
+- IIDX 19 Lincle
-- `SDVX 6 Exceed Gear`
+- IIDX 20 tricoro
+- IIDX 29 CastHour
+- SDVX 6 Exceed Gear

core_common.py

@@ -52,12 +52,16 @@ async def core_get_game_version_from_software_version(software_version):
 
     if model == 'LDJ' and ext >= 2021101300:
         return 29
+    elif model == 'JDZ' and ext == 2011071200:
+        return 18
+    elif model == 'KDZ' and ext == 2012090300:
+        return 19
+    elif model == 'LDJ' and ext == 2013090900:
+        return 20
     elif model == 'MDX' and ext >= 2019022600:
         return 19
     elif model == 'KFC' and ext >= 2020090402:
         return 6
-    elif model == 'LDJ' and ext == 2013090900:
-        return 20
     else:
         return 0
 

modules/core/cardmng.py

@@ -12,6 +12,8 @@ def get_target_table(game_id):
         "LDJ": "iidx_profile",
         "MDX": "ddr_profile",
         "KFC": "sdvx_profile",
+        "JDZ": "iidx_profile",
+        "KDZ": "iidx_profile",
     }
 
     return target_table[game_id]

modules/iidx/music.py

@@ -10,7 +10,7 @@ from core_database import get_db
 import config
 
 router = APIRouter(prefix='/local', tags=['local'])
-router.model_whitelist = ['LDJ']
+router.model_whitelist = ['LDJ', 'KDZ', 'JDZ']
 
 
 class ClearFlags(IntEnum):
@@ -41,6 +41,11 @@ async def music_getrank(request: Request):
     ):
         music_id = record['music_id']
         clear_flg = record['clear_flg']
+        if game_version < 20:
+            m = str(music_id)
+            music_id = int(''.join([m[:len(m)-3], m[-2:]]))
+            if clear_flg == ClearFlags.FULL_COMBO and game_version < 19:
+                clear_flg = 6
         ex_score = record['ex_score']
         miss_count = record['miss_count']
         cid = record['chart_id']
@@ -91,6 +96,10 @@ async def music_crate(request: Request):
     crate = {}
     fcrate = {}
     for stat in all_score_stats:
+        if game_version < 20:
+            m = str(stat['music_id'])
+            stat['music_id'] = int(''.join([m[:len(m)-3], m[-2:]]))
+
         if stat['music_id'] not in crate:
             crate[stat['music_id']] = [101] * 6
         if stat['music_id'] not in fcrate:
@@ -127,12 +136,20 @@ async def music_reg(request: Request):
     clid = int(root.attrib['clid'])
     great_num = int(root.attrib['gnum'])
     iidx_id = int(root.attrib['iidxid'])
-    is_death = int(root.attrib['is_death'])
-    music_id = int(root.attrib['mid'])
     miss_num = int(root.attrib['mnum'])
     pgreat_num = int(root.attrib['pgnum'])
     pid = int(root.attrib['pid'])
     ex_score = (pgreat_num * 2) + great_num
+    if game_version == 20:
+        is_death = int(root.attrib['is_death'])
+        music_id = int(root.attrib['mid'])
+    else:
+        is_death = 1 if clear_flg < ClearFlags.ASSIST_CLEAR else 0
+        m = str(root.attrib['mid'])
+        music_id = int('0'.join([m[:len(m)-2], m[-2:]]))
+        if clear_flg == 6 and game_version < 19:
+            clear_flg = ClearFlags.FULL_COMBO
+
     if clid < 3:
         note_id = clid + 1
         play_style = 0
@@ -249,11 +266,11 @@ async def music_reg(request: Request):
             'opname': config.arcade,
             'name': game_profile['djname'],
             'pid': game_profile['region'],
-            'body': game_profile['body'],
+            'body': game_profile.get('body', 0),
-            'face': game_profile['face'],
+            'face': game_profile.get('face', 0),
-            'hair': game_profile['hair'],
+            'hair': game_profile.get('hair', 0),
-            'hand': game_profile['hand'],
+            'hand': game_profile.get('hand', 0),
-            'head': game_profile['head'],
+            'head': game_profile.get('head', 0),
             'dgrade': game_profile['grade_double'],
             'sgrade': game_profile['grade_single'],
             'score': score['ex_score'],

modules/iidx/pc.py

@@ -9,7 +9,7 @@ from core_common import core_process_request, core_prepare_response, E
 from core_database import get_db
 
 router = APIRouter(prefix="/local", tags=["local"])
-router.model_whitelist = ["LDJ"]
+router.model_whitelist = ["LDJ", "KDZ", "JDZ"]
 
 
 def get_profile(cid):
@@ -56,10 +56,11 @@ async def pc_get(request: Request):
     request_info = await core_process_request(request)
     game_version = request_info['game_version']
 
-    cid = request_info['root'][0].attrib['did']
+    cid = request_info['root'][0].attrib['rid']
     profile = get_game_profile(cid, game_version)
     djid, djid_split = get_id_from_profile(cid)
 
+    if game_version == 20:
         response = E.response(
             E.pc(
                 E.pcdata(
@@ -242,22 +243,178 @@ async def pc_get(request: Request):
                     weekly_num=profile.get('achievements_weekly_num', 0),
                 ),
                 E.step(
-                E.stamp("", __type="bin"),
+                    E.stamp(profile.get('stepup_stamp', ""), __type="bin"),
-                E.help("", __type="bin"),
+                    E.help(profile.get('stepup_help', ""), __type="bin"),
-                dp_ach=0,
+                    dp_ach=profile.get('stepup_dp_ach', 0),
-                dp_hdpt=0,
+                    dp_hdpt=profile.get('stepup_dp_hdpt', 0),
-                dp_level=0,
+                    dp_level=profile.get('stepup_dp_level', 0),
-                dp_mplay=0,
+                    dp_mplay=profile.get('stepup_dp_mplay', 0),
-                dp_round=0,
+                    dp_round=profile.get('stepup_dp_round', 0),
-                review=0,
+                    review=profile.get('stepup_review', 0),
-                sp_ach=0,
+                    sp_ach=profile.get('stepup_sp_ach', 0),
-                sp_hdpt=0,
+                    sp_hdpt=profile.get('stepup_sp_hdpt', 0),
-                sp_level=0,
+                    sp_level=profile.get('stepup_sp_level', 0),
-                sp_mplay=0,
+                    sp_mplay=profile.get('stepup_sp_mplay', 0),
-                sp_round=0,
+                    sp_round=profile.get('stepup_sp_round', 0),
                 )
             )
         )
+    elif game_version == 19:
+        response = E.response(
+            E.pc(
+                E.pcdata(
+                    dach=profile['dach'],
+                    dp_opt=profile['dp_opt'],
+                    dp_opt2=profile['dp_opt2'],
+                    dpnum=profile["dpnum"],
+                    gno=profile['gno'],
+                    help=profile['help'],
+                    id=djid,
+                    idstr=djid_split,
+                    liflen=profile['lift'],
+                    mode=profile['mode'],
+                    name=profile['djname'],
+                    notes=profile['notes'],
+                    pase=profile['pase'],
+                    pid=profile['region'],
+                    pmode=profile['pmode'],
+                    sach=profile['sach'],
+                    sdhd=profile['sdhd'],
+                    sdtype=profile['sdtype'],
+                    sflg0=-1,
+                    sflg1=-1,
+                    sp_opt=profile['sp_opt'],
+                    spnum=profile["spnum"],
+                    timing=profile['timing'],
+                ),
+                E.qprodata([profile["head"], profile["hair"], profile["face"], profile["hand"], profile["body"]],
+                        __type="u32", __size=5 * 4),
+                E.skin(
+                    [
+                        profile["frame"],
+                        profile["turntable"],
+                        profile["explosion"],
+                        profile["bgm"],
+                        calculate_folder_mask(profile),
+                        profile["sudden"],
+                        0,
+                        profile["categoryvoice"],
+                        profile["note"],
+                        profile["fullcombo"],
+                        profile["keybeam"],
+                        profile["judgestring"],
+                        0,
+                        0,
+                    ],
+                    __type="s16"),
+                E.grade(
+                    dgid=profile['grade_double'],
+                    sgid=profile['grade_single'],
+                ),
+                E.ex(),
+                E.ocrs(),
+                E.step(
+                    E.sp_cflg("", __type="bin"),
+                    E.dp_cflg("", __type="bin"),
+                    dp_ach=0,
+                    dp_dif=0,
+                    sp_ach=0,
+                    sp_dif=0,
+                ),
+                E.lincle(comflg=1),
+                E.reflec(br=1, sg=1, sr=1, ssc=1, tb=1, tf=1, wu=1),
+                E.phase2(wonder=1, yellow=1),
+                E.event(knee=1, lethe=0, resist=0, jknee=1, jlethe=0, jresist=0),
+                E.phase4(
+                    qpro=1,
+                    glass=1,
+                    treasure=1,
+                    beautiful=1,
+                    quaver=1,
+                    castle=1,
+                    flip=1,
+                    titans=1,
+                    exusia=1,
+                    waxing=1,
+                    sampling=1,
+                    beachside=1,
+                    cuvelia=1,
+                    qproflg=1,
+                    glassflg=1,
+                    reunion=1,
+                    bad=1,
+                    turii=1,
+                    anisakis=1,
+                    second=1,
+                    whydidyou=1,
+                    china=1,
+                    fallen=1,
+                    broken=1,
+                    summer=1,
+                    sakura=1,
+                    wuv=1,
+                    survival=1,
+                    thunder=1,
+                ),
+                E.shop(
+                    E.item([3, 3, 3], __type="u8"),
+                    spitem=1,
+                ),
+                E.rlist(),
+            )
+        )
+    elif game_version == 18:
+        response = E.response(
+            E.pc(
+                E.pcdata(
+                    dach=profile['dach'],
+                    dp_opt=profile['dp_opt'],
+                    dp_opt2=profile['dp_opt2'],
+                    dpnum=profile["dpnum"],
+                    gno=profile['gno'],
+                    id=djid,
+                    idstr=djid_split,
+                    liflen=profile['lift'],
+                    mcomb=0,
+                    mode=profile['mode'],
+                    name=profile['djname'],
+                    ncomb=0,
+                    pid=profile['region'],
+                    pmode=profile['pmode'],
+                    sach=profile['sach'],
+                    sdhd=profile['sdhd'],
+                    sdtype=profile['sdtype'],
+                    sflg0=-1,
+                    sflg1=-1,
+                    sp_opt=profile['sp_opt'],
+                    spnum=profile["spnum"],
+                    timing=profile['timing'],
+                ),
+                E.skin(
+                    [
+                        profile["frame"],
+                        profile["turntable"],
+                        profile["explosion"],
+                        profile["bgm"],
+                        calculate_folder_mask(profile),
+                        profile["sudden"],
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                    ],
+                    __type="u16"),
+                E.grade(
+                    dgid="-1",
+                    sgid="-1",
+                ),
+                E.ex(),
+                E.ocrs(),
+                E.rlist(),
+            )
+        )
 
     response_body, response_headers = await core_prepare_response(request, response)
     return Response(content=response_body, headers=response_headers)
@@ -266,7 +423,9 @@ async def pc_get(request: Request):
 @router.post('/{gameinfo}/pc/common')
 async def pc_common(request: Request):
     request_info = await core_process_request(request)
+    game_version = request_info['game_version']
 
+    if game_version == 20:
         response = E.response(
             E.pc(
                 E.mranking(
@@ -306,6 +465,38 @@ async def pc_common(request: Request):
                 expire=600
             )
         )
+    elif game_version == 19:
+        response = E.response(
+            E.pc(
+                E.secret(
+                    E.mid([1901, 1914, 1946, 1955, 1956, 1966], __type="u16"),
+                    E.open([1, 1, 1, 1, 1, 1], __type="bool"),
+                ),
+                E.boss(phase=2),
+                E.ir(beat=2),
+                E.travel(flg=1),
+                E.lincle(phase=4),
+                E.monex(no=3),
+                expire=600
+            )
+        )
+    elif game_version == 18:
+        response = E.response(
+            E.pc(
+                E.cmd(
+                    gmbl=1,
+                    gmbla=1,
+                    regl=1,
+                    rndp=1,
+                    hrnd=1,
+                    alls=1,
+                ),
+                E.lg(lea=1),
+                E.ir(beat=3),
+                E.ev(pha=2),
+                expire=600
+            )
+        )
 
     response_body, response_headers = await core_prepare_response(request, response)
     return Response(content=response_body, headers=response_headers)
@@ -471,6 +662,7 @@ async def pc_reg(request: Request):
         iidx_id = random.randint(10000000, 99999999)
         all_profiles_for_card['iidx_id'] = iidx_id
 
+    if game_version == 20:
         all_profiles_for_card['version'][str(game_version)] = {
             'game_version': game_version,
             'djname': name,
@@ -516,17 +708,19 @@ async def pc_reg(request: Request):
             'deller': 0,
 
             # Step up mode
+            'stepup_stamp': "",
+            'stepup_help': "",
+            'stepup_dp_ach': 0,
+            'stepup_dp_hdpt': 0,
             'stepup_dp_level': 0,
             'stepup_dp_mplay': 0,
-        'stepup_enemy_damage': 0,
+            'stepup_dp_round': 0,
-        'stepup_enemy_defeat_flg': 0,
+            'stepup_review': 0,
-        'stepup_mission_clear_num': 0,
+            'stepup_sp_ach': 0,
-        'stepup_progress': 0,
+            'stepup_sp_hdpt': 0,
             'stepup_sp_level': 0,
             'stepup_sp_mplay': 0,
-        'stepup_tips_read_list': 0,
+            'stepup_sp_round': 0,
-        'stepup_total_point': 0,
-        'stepup_is_track_ticket': 0,
 
             # Grades
             'grade_single': -1,
@@ -543,6 +737,103 @@ async def pc_reg(request: Request):
             'achievements_visit_flg': 0,
             'achievements_weekly_num': 0,
 
+            # Web UI/Other options
+            '_show_category_grade': 0,
+            '_show_category_status': 1,
+            '_show_category_difficulty': 1,
+            '_show_category_alphabet': 1,
+            '_show_category_rival_play': 0,
+            '_show_category_rival_winlose': 0,
+            '_show_rival_shop_info': 0,
+            '_hide_play_count': 0,
+            '_hide_rival_info': 1,
+        }
+    elif game_version == 19:
+        all_profiles_for_card['version'][str(game_version)] = {
+            'game_version': game_version,
+            'djname': name,
+            'region': int(pid),
+            'head': 0,
+            'hair': 0,
+            'face': 0,
+            'hand': 0,
+            'body': 0,
+            'frame': 0,
+            'turntable': 0,
+            'explosion': 0,
+            'bgm': 0,
+            'folder_mask': 0,
+            'sudden': 0,
+            'categoryvoice': 0,
+            'note': 0,
+            'fullcombo': 0,
+            'keybeam': 0,
+            'judgestring': 0,
+            'dach': 0,
+            'dp_opt': 0,
+            'dp_opt2': 0,
+            'dpnum': 0,
+            'gno': 0,
+            'help': 0,
+            'lift': 0,
+            'mode': 0,
+            'notes': 0,
+            'pase': 0,
+            'pmode': 0,
+            'sach': 0,
+            'sdhd': 50,
+            'sdtype': 0,
+            'sp_opt': 0,
+            'spnum': 0,
+            'timing': 0,
+
+            # Grades
+            'grade_single': -1,
+            'grade_double': -1,
+            'grade_values': [],
+
+            # Web UI/Other options
+            '_show_category_grade': 0,
+            '_show_category_status': 1,
+            '_show_category_difficulty': 1,
+            '_show_category_alphabet': 1,
+            '_show_category_rival_play': 0,
+            '_show_category_rival_winlose': 0,
+            '_show_rival_shop_info': 0,
+            '_hide_play_count': 0,
+            '_hide_rival_info': 1,
+        }
+    elif game_version == 18:
+        all_profiles_for_card['version'][str(game_version)] = {
+            'game_version': game_version,
+            'djname': name,
+            'region': int(pid),
+            'frame': 0,
+            'turntable': 0,
+            'explosion': 0,
+            'bgm': 0,
+            'folder_mask': 0,
+            'sudden': 0,
+            'dach': 0,
+            'dp_opt': 0,
+            'dp_opt2': 0,
+            'dpnum': 0,
+            'gno': 0,
+            'lift': 0,
+            'mode': 0,
+            'pmode': 0,
+            'sach': 0,
+            'sdhd': 50,
+            'sdtype': 0,
+            'sp_opt': 0,
+            'spnum': 0,
+            'timing': 0,
+
+            # Grades
+            'grade_single': -1,
+            'grade_double': -1,
+            'grade_values': [],
+
             # Web UI/Other options
             '_show_category_grade': 0,
             '_show_category_status': 1,

modules/iidx/ranking.py

@@ -4,8 +4,8 @@ from fastapi import APIRouter, Request, Response
 
 from core_common import core_process_request, core_prepare_response, E
 
-router = APIRouter(prefix="/local2", tags=["local2"])
+router = APIRouter(prefix="/local", tags=["local"])
-router.model_whitelist = ["LDJ"]
+router.model_whitelist = ["LDJ", "KDZ", "JDZ"]
 
 
 @router.post('/{gameinfo}/ranking/getranker')

modules/iidx/shop.py

@@ -5,7 +5,7 @@ from fastapi import APIRouter, Request, Response
 from core_common import core_process_request, core_prepare_response, E
 
 router = APIRouter(prefix="/local", tags=["local"])
-router.model_whitelist = ["LDJ"]
+router.model_whitelist = ["LDJ", "KDZ", "JDZ"]
 
 
 @router.post('/{gameinfo}/shop/getname')