diff --git a/gitadora@asphyxia/README.md b/gitadora@asphyxia/README.md index fc5a1e6..1e164d1 100644 --- a/gitadora@asphyxia/README.md +++ b/gitadora@asphyxia/README.md @@ -9,9 +9,14 @@ Supported Versions - NEX+AGE -Profile sharing between version (WIP) -------------------------------------- -Only scores are shared between versions. As It's planned to support some Version-specific features. +When Plugin Doesn't work correctly / Startup Error on Plugin +------------------------------------------------------------ +The folder structure between v1.0 and v1.1 is quite different. Do not overwrite plugin folder. +
If encounter error, Please try these step: + +1. Remove `gitadora@asphyxia` folder. +2. C-C and C-V the newest version of `gitadora@asphyxia` +3. (Custom MDB Users) Reupload MDB or move `data/custom_mdb.xml` to `data/mdb/custom.xml` Note about newer version of Asphyxia Core ----------------------------------------- @@ -19,15 +24,10 @@ Since newer version of Core separate the save db per each plugin, Seems there wa Release Notes ============= - -v2.0.0 (Current, WIP) ---------------------- -* Support score shares between versions. - - -v1.1.0-beta +v1.1.0 ------------ - * NEX+AGE Support (Beta) + * NEX+AGE Support (Not full support.) + * Restructure bit for maintaining. v1.0.0 ------ diff --git a/gitadora@asphyxia/data/extrastage.ts b/gitadora@asphyxia/data/extrastage.ts index 1255bd4..3d2336f 100644 --- a/gitadora@asphyxia/data/extrastage.ts +++ b/gitadora@asphyxia/data/extrastage.ts @@ -9,11 +9,12 @@ interface EncoreStageData { export function getEncoreStageData(info: EamuseInfo): EncoreStageData { const fallback = { level: 10, musics: [0] } const level: number = U.GetConfig("encore_version") + const ntDummyEncore = U.GetConfig("nextage_dummy_encore") switch (getVersion(info)) { case 'nextage': return { level, - musics: [ + musics: !ntDummyEncore ? [ 2587, // 悪魔のハニープリン 2531, // The ULTIMATES -reminiscence- 2612, // ECLIPSE 2 @@ -23,6 +24,8 @@ export function getEncoreStageData(info: EamuseInfo): EncoreStageData { 305, 602, 703, 802, 902, 1003, 1201, 1400, 1712, 1916, 2289, 2631, // DD13 and encores. 1704, 1811, 2121, 2201, 2624, // Soranaki and encores. 1907, 2020, 2282, 2341, 2666 // Stargazer and encores. + ] : [ + 2622, 305, 1704, 1907, 2686 // Dummy. ] } case 'exchain': diff --git a/gitadora@asphyxia/handlers/info.ts b/gitadora@asphyxia/handlers/info.ts index a5d041e..a0624c9 100644 --- a/gitadora@asphyxia/handlers/info.ts +++ b/gitadora@asphyxia/handlers/info.ts @@ -55,35 +55,6 @@ export const gameInfoGet: EPR = async (info, data, send) => { ...obj, box_term: { state: K.ITEM('u8', 0) - }, - box: { - pack: [ - { - state: K.ITEM("u8", 1), - pack_kind: K.ITEM("s32", 0), - pack_id: K.ITEM("s32", 0), - item: [ - { - index: K.ITEM("s32", 0), - item_kind: K.ITEM("s32", 0), - item_id: K.ITEM("s32", 2666), - item_param: K.ITEM("str", ""), - }, - { - index: K.ITEM("s32", 1), - item_kind: K.ITEM("s32", 0), - item_id: K.ITEM("s32", 2624), - item_param: K.ITEM("str", ""), - }, - { - index: K.ITEM("s32", 2), - item_kind: K.ITEM("s32", 0), - item_id: K.ITEM("s32", 2631), - item_param: K.ITEM("str", ""), - }, - ] - } - ] } }; } else { diff --git a/gitadora@asphyxia/handlers/profiles.ts b/gitadora@asphyxia/handlers/profiles.ts index 14541f7..c93ccbd 100644 --- a/gitadora@asphyxia/handlers/profiles.ts +++ b/gitadora@asphyxia/handlers/profiles.ts @@ -533,28 +533,10 @@ export const getPlayer: EPR = async (info, data, send) => { play_date_ms: K.ITEM("u64", BigInt(0)) }, lottery_result: { - unlock_bit: K.ITEM("u64", BigInt(2305843009213693950)), - }, - }, - lotterybox: { - score_list: { - data: [ - { - term: K.ITEM("u8", 0), - score: { - one_day_play_cnt: K.ITEM("s32", 0), - one_day_lottery_cnt: K.ITEM("s32", 0), - lucky_star: K.ITEM("s32", 0), - bear_mark: K.ITEM("s32", 0), - play_date_ms: K.ITEM("u64", BigInt(0)) - }, - lottery_result: { - unlock_bit: K.ITEM("u64", BigInt(2305843009213693950)) - } - }, - ] + unlock_bit: K.ITEM("u64", BigInt(0)) } }, + lotterybox: {}, ...addition, ...playerData, finish: K.ITEM('bool', 1), diff --git a/gitadora@asphyxia/index.ts b/gitadora@asphyxia/index.ts index 1619552..7940f4d 100644 --- a/gitadora@asphyxia/index.ts +++ b/gitadora@asphyxia/index.ts @@ -2,16 +2,13 @@ import { gameInfoGet, shopInfoRegist } from "./handlers/info"; import { playableMusic } from "./handlers/MusicList" import { getPlayer, check, regist, savePlayer } from "./handlers/profiles"; import { updatePlayerInfo } from "./handlers/webui"; -import { isRequiredCoreVersion } from "./utils"; -import { initialze as migrationInitialize } from "./utils/migration" +import { isAsphyxiaDebugMode, isRequiredCoreVersion } from "./utils"; export function register() { if(!isRequiredCoreVersion(1, 20)) { console.error("You need newer version of Core. v1.20 or newer required.") } - migrationInitialize() - R.GameCode('M32'); R.Config("encore_version", { @@ -21,9 +18,18 @@ export function register() { default: 13, }) + R.Config("nextage_dummy_encore", { + name: "Dummy Encore for SPE (Nextage Only)", + desc: "Since Nextage's Special Premium Encore system is bit complicated, \n" + + "SPE System isn't fully implemented. \n" + + "This thing is bandage of these problem as limiting some Encores for SPE.", + type: "boolean", + default: false + }) + R.Config("enable_custom_mdb", { name: "Enable Custom MDB", - desc: "For who uses own MDB", + desc: "For who uses own MDB. eg) Omnimix.", type: "boolean", default: false, }) @@ -41,7 +47,6 @@ export function register() { R.Route(`exchain_${method}`, handler); R.Route(`matixx_${method}`, handler); R.Route(`nextage_${method}`, handler) - R.Route(`highvoltage_${method}`, handler) // Prediction // TODO: TB, TBRE and more older version? }; @@ -61,6 +66,8 @@ export function register() { R.Unhandled(async (info, data, send) => { if (["eventlog"].includes(info.module)) return; console.error(`Received Unhandled Response on ${info.method} by ${info.model}/${info.module}`) - console.error(`Received Request: ${JSON.stringify(data, null, 4)}`) + if (isAsphyxiaDebugMode()){ + console.error(`Received Request: ${JSON.stringify(data, null, 4)}`) + } }) } \ No newline at end of file diff --git a/gitadora@asphyxia/utils/index.ts b/gitadora@asphyxia/utils/index.ts index f7a2db0..367041a 100644 --- a/gitadora@asphyxia/utils/index.ts +++ b/gitadora@asphyxia/utils/index.ts @@ -17,3 +17,8 @@ export function isRequiredCoreVersion(major: number, minor: number) { const core_minor = typeof CORE_VERSION_MINOR === "number" ? CORE_VERSION_MINOR : 18 return core_major >= major && core_minor >= minor }; + +export function isAsphyxiaDebugMode() { + const argv = process.argv + return argv.includes("--dev") || argv.includes("--console") +} \ No newline at end of file diff --git a/gitadora@asphyxia/utils/migration.ts b/gitadora@asphyxia/utils/migration.ts deleted file mode 100644 index d300618..0000000 --- a/gitadora@asphyxia/utils/migration.ts +++ /dev/null @@ -1,7 +0,0 @@ -export async function initialze() { - await dbMigration() -} - -async function dbMigration() { - -} \ No newline at end of file