sonolus-next-rush-plus-engine 1.8.14 → 1.8.16

package/dist/extended/convert.js

@@ -235,26 +235,38 @@ export const extendedToLevelData = (data, offset = 0) => {
         return undefined;
     }
     for (const { idx, e } of ext.connectors) {
-        const head = getNote(getField(e, 'head'));
-        const tail = getNote(getField(e, 'tail'));
+        let headRef = getField(e, 'head');
         const startRef = getField(e, 'start');
+        const headOrig = resolveOriginal(ext, headRef);
+        const startOrig = resolveOriginal(ext, startRef);
+        if (headOrig && startOrig) {
+            const isHeadStart = headOrig.archetype.includes('StartNote');
+            const isStartStart = startOrig.archetype.includes('StartNote');
+            if (isHeadStart && isStartStart && headRef !== startRef) {
+                headRef = startRef;
+            }
+        }
+        const head = getNote(headRef);
+        const tail = getNote(getField(e, 'tail'));
         const segmentHead = getNote(startRef) || head;
         const endRef = getField(e, 'end');
         let segmentTail = getNote(endRef);
-        if (!segmentTail && startRef !== undefined) {
-            let ultimateTailNote = undefined;
-            for (const { e: otherConn } of ext.connectors) {
-                if (getField(otherConn, 'start') === startRef) {
-                    const otherTailNote = getNote(getField(otherConn, 'tail'));
-                    if (otherTailNote) {
-                        if (!ultimateTailNote ||
-                            otherTailNote.getBeat() > ultimateTailNote.getBeat()) {
-                            ultimateTailNote = otherTailNote;
-                        }
-                    }
+        if (!segmentTail) {
+            const currentTailRef = getField(e, 'tail');
+            let ultimateTailRef = currentTailRef;
+            const visited = new Set();
+            while (ultimateTailRef !== undefined && !visited.has(ultimateTailRef)) {
+                visited.add(ultimateTailRef);
+                const nextConn = ext.connectors.find((c) => getField(c.e, 'head') === ultimateTailRef &&
+                    getField(c.e, 'start') === startRef);
+                if (nextConn) {
+                    ultimateTailRef = getField(nextConn.e, 'tail');
+                }
+                else {
+                    break;
                 }
             }
-            segmentTail = ultimateTailNote;
+            segmentTail = getNote(ultimateTailRef);
         }
         if (!segmentTail) {
             segmentTail = tail;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ import { USC } from './usc/index.js';
 export * from './usc/index.js';
 export { type ExtendedEntityData, type ExtendedEntityDataField, extendedToLevelData, mmwsToUSC, susToUSC, ucmmwsToLevelData, uscToLevelData, };
 export declare const convertToLevelData: (input: string | Uint8Array | USC | LevelData, offset?: number) => LevelData;
-export declare const version = "1.8.14";
+export declare const version = "1.8.16";
 export declare const databaseEngineItem: {
     readonly name: "next-rush-plus";
     readonly version: 13;

package/dist/index.js

@@ -70,7 +70,7 @@ export const convertToLevelData = (input, offset = 0) => {
     }
     return uscToLevelData(usc, offset, true, true);
 };
-export const version = '1.8.14';
+export const version = '1.8.16';
 export const databaseEngineItem = {
     name: 'next-rush-plus',
     version: 13,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonolus-next-rush-plus-engine",
-  "version": "1.8.14",
+  "version": "1.8.16",
   "description": "A new Project Sekai inspired engine for Sonolus",
   "author": "Hyeon2",
   "repository": {