sonolus-d4dj-engine 1.1.1 → 1.1.2

package/README.md

@@ -21,7 +21,7 @@ Todo list:
 ## Installation
 
 ```
-npm install sonolus-bandori-engine
+npm install sonolus-d4dj-engine
 ```
 
 ## Custom Resources

package/dist/b34dj/convert.cjs

@@ -1,45 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.b34djToLevelData = void 0;
-function b34djToLevelData(chartData, offset = 0) {
-    let chart = Object.values(chartData);
-    chart[2] = chart[2].map((obj) => Object.values(obj));
-    chart[3] = chart[3].map((obj) => Object.values(obj));
-    const timescale = chart[2];
-    chart[2] = [];
+exports.d4djToLevelData = exports.b34djToLevelData = void 0;
+const index_cjs_1 = require("./index.cjs");
+function b34djToLevelData(chart, offset = 0) {
+    let d4chart = [];
+    d4chart[0] = chart.MusicName;
+    d4chart[1] = [];
+    d4chart[2] = chart.BarLineList;
+    d4chart[3] = chart.NoteDataList.map((note) => [note.LaneId, index_cjs_1.D4DJNoteType[note.Type], note.Time, note.NextId, note.Direction, note.EffectType, note.EffectParameter]);
+    const timescale = chart.SoflanDataList.map((soflan) => [soflan.Time, soflan.TimeScale, soflan.LeftRight]);
     timescale.forEach((ts) => {
-        const i = chart[2].findIndex((tsc) => (tsc[0] === ts[0]) && (tsc[1] === ts[1]));
+        const i = d4chart[1].findIndex((tsc) => (tsc[0] === ts[0]) && (tsc[1] === ts[1]));
         if (i === -1)
-            chart[2].push(ts);
+            d4chart[1].push(ts);
         else
-            chart[2][i][2] = 3;
+            d4chart[1][i][2] = 3;
     });
-    chart = JSON.parse(JSON.stringify(chart)
-        .replaceAll('"Tap1"', "0")
-        .replaceAll('"Tap2"', "1")
-        .replaceAll('"ScratchLeft"', "2")
-        .replaceAll('"ScratchRight"', "3")
-        .replaceAll('"StopStart"', "4")
-        .replaceAll('"StopEnd"', "5")
-        .replaceAll('"LongStart"', "6")
-        .replaceAll('"LongMiddle"', "7")
-        .replaceAll('"LongEnd"', "8")
-        .replaceAll('"Slide"', "9"));
-    const temp = chart[1];
-    chart[1] = chart[2];
-    chart[2] = temp;
-    chart[3] = chart[3].map((note) => {
-        const temp = note[1];
-        note[1] = note[2];
-        note[2] = temp;
-        return note;
-    });
-    return parse(chart, offset);
+    return d4djToLevelData(d4chart, offset);
 }
 exports.b34djToLevelData = b34djToLevelData;
 ;
-function parse(chart, offset = 0) {
-    let sus = {
+function d4djToLevelData(chart, offset = 0) {
+    let data = {
         bgmOffset: offset,
         entities: [
             {
@@ -209,15 +191,16 @@ function parse(chart, offset = 0) {
         ],
     }));
     let notes = note(chart);
-    sus.entities.push(...ts, ...notes, ...bl);
-    return sus;
+    data.entities.push(...ts, ...notes, ...bl);
+    return data;
 }
+exports.d4djToLevelData = d4djToLevelData;
 function note(chart) {
     let hold = [];
     let slider = [];
     let notes = {};
-    let sol = chart[3].map((arr, i) => {
-        const sus = {
+    let nots = chart[3].map((arr, i) => {
+        const not = {
             archetype: arr[1] === 0
                 ? "DarkTapNote"
                 : arr[1] === 1
@@ -262,43 +245,43 @@ function note(chart) {
             : (notes[arr[2]] = [{ name: `note${i}`, lane: arr[0] }]);
         if (arr[3] && (arr[1] === 4 || arr[1] === 6)) {
             let note = {};
-            note.head = sus.name;
+            note.head = not.name;
             note.tail = `note${arr[3]}`;
             hold.push(note);
-            sus.data.push({
+            not.data.push({
                 name: "tail",
                 ref: `note${arr[3]}`,
             });
         }
         if (arr[1] === 9) {
             if (arr[3] > 0) {
-                slider.push({ prev: sus.name, next: `note${arr[3]}` });
-                sus.data.push({
+                slider.push({ prev: not.name, next: `note${arr[3]}` });
+                not.data.push({
                     name: "next",
                     ref: `note${arr[3]}`,
                 });
             }
-            const sld = slider.find((note) => note.next === sus.name);
+            const sld = slider.find((note) => note.next === not.name);
             if (sld)
-                sus.data.push({
+                not.data.push({
                     name: "prev",
                     ref: sld.prev,
                 });
         }
         if (arr[1] === 5 || arr[1] === 8) {
-            sus.data.push({
+            not.data.push({
                 name: "head",
-                ref: hold.find((note) => note.tail === sus.name).head,
+                ref: hold.find((note) => note.tail === not.name).head,
             });
         }
         if (arr[4])
-            sus.data.push({
+            not.data.push({
                 name: "direction",
                 value: arr[4],
             });
-        return sus;
+        return not;
     });
-    hold.forEach(({ head, tail }, i) => sol.splice(parseInt(head.replace("note", "")) + 1 + i, 0, {
+    hold.forEach(({ head, tail }, i) => nots.splice(parseInt(head.replace("note", "")) + 1 + i, 0, {
         archetype: "HoldConnector",
         data: [
             {
@@ -314,7 +297,7 @@ function note(chart) {
     for (const beat in notes) {
         const sim = notes[beat].sort((a, b) => a.lane - b.lane);
         if (sim.length === 2) {
-            sol.push({
+            nots.push({
                 archetype: "SimLine",
                 data: [
                     {
@@ -329,7 +312,7 @@ function note(chart) {
             });
         }
         else if (sim.length === 3) {
-            sol.push({
+            nots.push({
                 archetype: "SimLine",
                 data: [
                     {
@@ -342,7 +325,7 @@ function note(chart) {
                     },
                 ],
             });
-            sol.push({
+            nots.push({
                 archetype: "SimLine",
                 data: [
                     {
@@ -357,5 +340,5 @@ function note(chart) {
             });
         }
     }
-    return sol;
+    return nots;
 }

package/dist/b34dj/convert.d.cts

@@ -1,3 +1,4 @@
 import { LevelData } from '@sonolus/core';
 import { B34DJChart } from './index.cjs';
-export declare function b34djToLevelData(chartData: B34DJChart, offset?: number): LevelData;
+export declare function b34djToLevelData(chart: B34DJChart, offset?: number): LevelData;
+export declare function d4djToLevelData(chart: any, offset?: number): LevelData;

package/dist/b34dj/index.cjs

@@ -1,2 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.D4DJNoteType = exports.B34DJNoteType = void 0;
+var B34DJNoteType;
+(function (B34DJNoteType) {
+    B34DJNoteType["Tap1"] = "Tap1";
+    B34DJNoteType["Tap2"] = "Tap2";
+    B34DJNoteType["ScratchLeft"] = "ScratchLeft";
+    B34DJNoteType["ScratchRight"] = "ScratchRight";
+    B34DJNoteType["StopStart"] = "StopStart";
+    B34DJNoteType["StopEnd"] = "StopEnd";
+    B34DJNoteType["LongStart"] = "LongStart";
+    B34DJNoteType["LongMiddle"] = "LongMiddle";
+    B34DJNoteType["LongEnd"] = "LongEnd";
+    B34DJNoteType["Slide"] = "Slide";
+})(B34DJNoteType || (exports.B34DJNoteType = B34DJNoteType = {}));
+var D4DJNoteType;
+(function (D4DJNoteType) {
+    D4DJNoteType[D4DJNoteType["Tap1"] = 0] = "Tap1";
+    D4DJNoteType[D4DJNoteType["Tap2"] = 1] = "Tap2";
+    D4DJNoteType[D4DJNoteType["ScratchLeft"] = 2] = "ScratchLeft";
+    D4DJNoteType[D4DJNoteType["ScratchRight"] = 3] = "ScratchRight";
+    D4DJNoteType[D4DJNoteType["StopStart"] = 4] = "StopStart";
+    D4DJNoteType[D4DJNoteType["StopEnd"] = 5] = "StopEnd";
+    D4DJNoteType[D4DJNoteType["LongStart"] = 6] = "LongStart";
+    D4DJNoteType[D4DJNoteType["LongMiddle"] = 7] = "LongMiddle";
+    D4DJNoteType[D4DJNoteType["LongEnd"] = 8] = "LongEnd";
+    D4DJNoteType[D4DJNoteType["Slide"] = 9] = "Slide";
+})(D4DJNoteType || (exports.D4DJNoteType = D4DJNoteType = {}));

package/dist/b34dj/index.d.cts

@@ -1,7 +1,8 @@
 export type B34DJChart = {
-    MusicName: "music_0000001";
-    BarLineList: number[];
+    MusicName: string;
     SoflanDataList: B34DJSoflanData[];
+    BarLineList: number[];
+    NoteDataList: B34DJNoteData[];
 };
 export type B34DJSoflanData = {
     Time: number;
@@ -10,10 +11,34 @@ export type B34DJSoflanData = {
 };
 export type B34DJNoteData = {
     LaneId: number;
+    Type: B34DJNoteType;
     Time: number;
-    Type: "Tap1" | "Tap2" | "ScratchLeft" | "ScratchRight" | "StopStart" | "StopEnd" | "LongStart" | "LongMiddle" | "LongEnd" | "Slide";
-    NextId: number;
-    Direction: number;
-    EffectType: number;
-    EffectParameter: number;
+    NextId?: number;
+    Direction?: number;
+    EffectType?: number;
+    EffectParameter?: number;
 };
+export declare enum B34DJNoteType {
+    Tap1 = "Tap1",
+    Tap2 = "Tap2",
+    ScratchLeft = "ScratchLeft",
+    ScratchRight = "ScratchRight",
+    StopStart = "StopStart",
+    StopEnd = "StopEnd",
+    LongStart = "LongStart",
+    LongMiddle = "LongMiddle",
+    LongEnd = "LongEnd",
+    Slide = "Slide"
+}
+export declare enum D4DJNoteType {
+    Tap1 = 0,
+    Tap2 = 1,
+    ScratchLeft = 2,
+    ScratchRight = 3,
+    StopStart = 4,
+    StopEnd = 5,
+    LongStart = 6,
+    LongMiddle = 7,
+    LongEnd = 8,
+    Slide = 9
+}

package/dist/index.cjs

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.databaseEngineItem = exports.version = exports.b34djToLevelData = void 0;
+exports.databaseEngineItem = exports.version = exports.d4djToLevelData = exports.b34djToLevelData = void 0;
 var convert_cjs_1 = require("./b34dj/convert.cjs");
 Object.defineProperty(exports, "b34djToLevelData", { enumerable: true, get: function () { return convert_cjs_1.b34djToLevelData; } });
+Object.defineProperty(exports, "d4djToLevelData", { enumerable: true, get: function () { return convert_cjs_1.d4djToLevelData; } });
 __exportStar(require("./b34dj/index.cjs"), exports);
-exports.version = '1.1.1';
+exports.version = '1.1.2';
 exports.databaseEngineItem = {
     name: 'd4dj',
     version: 12,

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-export { b34djToLevelData } from './b34dj/convert.cjs';
+export { b34djToLevelData, d4djToLevelData } from './b34dj/convert.cjs';
 export * from './b34dj/index.cjs';
-export declare const version = "1.1.1";
+export declare const version = "1.1.2";
 export declare const databaseEngineItem: {
     readonly name: "d4dj";
     readonly version: 12;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonolus-d4dj-engine",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A recreation of D4DJ Groovy Mix engine in Sonolus.",
   "type": "module",
   "author": "Gorengan Hunter",