sonolus-next-rush-engine 1.1.0 → 1.1.2

package/dist/extended/convert.js

@@ -530,7 +530,6 @@ export const extendedToLevelData = (data, offset = 0) => {
         if (!isSlideTickRef(headRef))
             return startRef;
         let ultimateStartRef = startRef;
-        let ultimateStartBeat = getNum(resolveOriginal(ext, startRef) ?? { archetype: '', data: [] }, '#BEAT');
         const visited = new Set();
         function visit(currentHeadRef) {
             const key = `${archetype}|${String(currentHeadRef)}`;
@@ -539,14 +538,14 @@ export const extendedToLevelData = (data, offset = 0) => {
             visited.add(key);
             if (!isSlideTickRef(currentHeadRef))
                 return;
-            const previousConnectors = ext.connectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'tail') === currentHeadRef);
+            let previousConnectors = ext.connectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'tail') === currentHeadRef);
+            if (previousConnectors.length === 0) {
+                previousConnectors = ext.connectors.filter((c) => c.e.archetype in activeConnectorKindMapping &&
+                    getField(c.e, 'tail') === currentHeadRef);
+            }
             for (const previousConnector of previousConnectors) {
                 const previousStartRef = getField(previousConnector.e, 'start');
-                const previousStartBeat = getNum(resolveOriginal(ext, previousStartRef) ?? { archetype: '', data: [] }, '#BEAT');
-                if (previousStartBeat <= ultimateStartBeat) {
-                    ultimateStartBeat = previousStartBeat;
-                    ultimateStartRef = previousStartRef;
-                }
+                ultimateStartRef = previousStartRef;
                 visit(getField(previousConnector.e, 'head'));
             }
         }
@@ -588,6 +587,46 @@ export const extendedToLevelData = (data, offset = 0) => {
         }
         return { tailRef: resolvedTailRef, skippedNoteRefs, skippedConnectors };
     }
+    function refKey(ref) {
+        const original = resolveOriginal(ext, ref);
+        const index = original ? ext.entities.indexOf(original) : -1;
+        return index >= 0 ? `index:${index}` : `${typeof ref}:${String(ref)}`;
+    }
+    function getRefBeat(ref) {
+        return getNum(resolveOriginal(ext, ref) ?? { archetype: '', data: [] }, '#BEAT');
+    }
+    function getConnectorActiveStartRef(archetype, startRef, headRef, endRef) {
+        if (endRef !== undefined)
+            return startRef;
+        return getUltimateStartRef(archetype, startRef, headRef);
+    }
+    const activeTailRefsByStart = new Map();
+    function getActiveTailRef(activeStartRef) {
+        const key = refKey(activeStartRef);
+        if (activeTailRefsByStart.has(key))
+            return activeTailRefsByStart.get(key);
+        let activeTailRef;
+        let activeTailBeat = Number.NEGATIVE_INFINITY;
+        for (const { e } of ext.connectors) {
+            const startRef = getField(e, 'start');
+            const headRef = getField(e, 'head');
+            if (isIgnoredSlideTickRef(headRef))
+                continue;
+            const endRef = getField(e, 'end');
+            const connectorActiveStartRef = getConnectorActiveStartRef(e.archetype, startRef, headRef, endRef);
+            if (refKey(connectorActiveStartRef) !== key)
+                continue;
+            const { tailRef } = resolveConnectorTailRef(e.archetype, startRef, getField(e, 'tail'));
+            const candidateTailRef = endRef ?? getUltimateTailRef(e.archetype, activeStartRef, tailRef);
+            const candidateTailBeat = getRefBeat(candidateTailRef);
+            if (candidateTailBeat >= activeTailBeat) {
+                activeTailBeat = candidateTailBeat;
+                activeTailRef = candidateTailRef;
+            }
+        }
+        activeTailRefsByStart.set(key, activeTailRef);
+        return activeTailRef;
+    }
     for (const { idx, e } of ext.connectors) {
         const startRef = getField(e, 'start');
         const headRef = getField(e, 'head');
@@ -600,15 +639,15 @@ export const extendedToLevelData = (data, offset = 0) => {
         const rawHeadOriginal = resolveOriginal(ext, headRef);
         const tailOriginal = resolveOriginal(ext, tailRef);
         const rawHead = getNote(headRef);
-        const activeStartRef = getUltimateStartRef(e.archetype, startRef, headRef);
+        const endRef = getField(e, 'end');
+        const activeStartRef = getConnectorActiveStartRef(e.archetype, startRef, headRef, endRef);
         const activeHead = getNote(activeStartRef);
         const usesStartAsHead = shouldUseStartAsHead(startRef, headRef);
         const head = usesStartAsHead ? activeHead : rawHead;
         const headOriginal = resolveOriginal(ext, usesStartAsHead ? startRef : headRef);
-        const endRef = getField(e, 'end');
-        let activeTail = getNote(endRef);
+        let activeTail = getNote(endRef ?? getActiveTailRef(activeStartRef));
         if (!activeTail) {
-            activeTail = getNote(getUltimateTailRef(e.archetype, activeStartRef, tailRef));
+            activeTail = getNote(getActiveTailRef(activeStartRef));
         }
         if (!activeTail) {
             activeTail = 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.1.0";
+export declare const version = "1.1.2";
 export declare const databaseEngineItem: {
     readonly name: "next-rush";
     readonly version: 13;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonolus-next-rush-engine",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Perspective-lane rhythm game for Sonolus",
   "author": "Hyeon2",
   "repository": {