diff --git a/iidx@asphyxia/handlers/music.ts b/iidx@asphyxia/handlers/music.ts index fa81070..1d4cad3 100644 --- a/iidx@asphyxia/handlers/music.ts +++ b/iidx@asphyxia/handlers/music.ts @@ -934,20 +934,15 @@ export const musiccrate: EPR = async (info, data, send) => { K.ITEM("str", str, { ver: String(verMid[0]) }) ); } - else if (version < 27) { - c.push( - K.ARRAY("u8", [...indices.map(i => cRate[i]), ...indices.map(i => fcRate[i])], { mid: key }), - ); - } else { - c.push( - K.ARRAY("s32", [...cRate, ...fcRate], { mid: key }), - ); + let rateArray = version < 27 ? [...indices.map(i => cRate[i]), ...indices.map(i => fcRate[i])] : [...cRate, ...fcRate]; + let rateResult = version < 24 ? K.ARRAY("u8", rateArray, { mid: key }) : K.ARRAY("s32", rateArray, { mid: key }); + + c.push(rateResult); } } - if (version == 14 || version == 15) result = { cdata }; - else result = { c }; + result = (version == 14 || version == 15) ? { cdata } : { c }; return send.object(result); } diff --git a/iidx@asphyxia/handlers/pc.ts b/iidx@asphyxia/handlers/pc.ts index d98557f..da66eec 100644 --- a/iidx@asphyxia/handlers/pc.ts +++ b/iidx@asphyxia/handlers/pc.ts @@ -3063,8 +3063,6 @@ export const pcsave: EPR = async (info, data, send) => { pcdata.d_pace = parseInt($(data).attr().d_pace); pcdata.s_gno = parseInt($(data).attr().s_gno); pcdata.d_gno = parseInt($(data).attr().d_gno); - pcdata.s_sub_gno = parseInt($(data).attr().s_sub_gno); - pcdata.d_sub_gno = parseInt($(data).attr().d_sub_gno); pcdata.s_gtype = parseInt($(data).attr().s_gtype); pcdata.d_gtype = parseInt($(data).attr().d_gtype); pcdata.s_sdlen = parseInt($(data).attr().s_sdlen); diff --git a/iidx@asphyxia/index.ts b/iidx@asphyxia/index.ts index 3e67f21..617ba9f 100644 --- a/iidx@asphyxia/index.ts +++ b/iidx@asphyxia/index.ts @@ -333,7 +333,7 @@ export function register() { name: "忍々七鍵伝", desc: "忍々七鍵伝 Phase", type: "integer", - default: 2, + default: 1, }); R.Config("sb_extraboss", {