sonolus-next-rush-engine 1.0.16 → 1.0.18

package/dist/extended/convert.js

@@ -60,6 +60,13 @@ const activeConnectorKindMapping = {
     NormalSlideConnector: ConnectorKind.ACTIVE_NORMAL,
     CriticalSlideConnector: ConnectorKind.ACTIVE_CRITICAL,
 };
+const activeSlideStartArchetypes = new Set([
+    'NormalSlideStartNote',
+    'CriticalSlideStartNote',
+    'HiddenSlideStartNote',
+    'NormalTraceSlideStartNote',
+    'CriticalTraceSlideStartNote',
+]);
 const flickDirectionMapping = {
     [-1]: FlickDirection.UP_LEFT,
     0: FlickDirection.UP_OMNI,
@@ -378,7 +385,7 @@ export const extendedToLevelData = (data, offset = 0) => {
             return false;
         if (head.archetype !== 'HiddenSlideStartNote')
             return false;
-        if (!['NormalSlideStartNote', 'CriticalSlideStartNote'].includes(start.archetype))
+        if (!activeSlideStartArchetypes.has(start.archetype))
             return false;
         return (nearlyEqual(getNum(start, '#BEAT'), getNum(head, '#BEAT')) &&
             nearlyEqual(getNum(start, 'lane'), getNum(head, 'lane')) &&
@@ -457,7 +464,17 @@ export const extendedToLevelData = (data, offset = 0) => {
             return false;
         return getNum(tailOriginal, '#BEAT') < getNum(headOriginal, '#BEAT') - 1e-6;
     }
-    function getUltimateTailRef(startRef, tailRef) {
+    function isSlideTickRef(ref) {
+        return [
+            'IgnoredSlideTickNote',
+            'NormalSlideTickNote',
+            'CriticalSlideTickNote',
+            'HiddenSlideTickNote',
+            'NormalAttachedSlideTickNote',
+            'CriticalAttachedSlideTickNote',
+        ].includes(resolveOriginal(ext, ref)?.archetype ?? '');
+    }
+    function getUltimateTailRef(archetype, startRef, tailRef) {
         let ultimateTailRef = tailRef;
         let ultimateTailBeat = getNum(resolveOriginal(ext, tailRef) ?? { archetype: '', data: [] }, '#BEAT');
         const visited = new Set();
@@ -466,7 +483,12 @@ export const extendedToLevelData = (data, offset = 0) => {
             if (headRef === undefined || visited.has(key))
                 return;
             visited.add(key);
-            const nextConnectors = ext.connectors.filter((c) => getField(c.e, 'head') === headRef && getField(c.e, 'start') === startRef);
+            const nextConnectors = ext.connectors.filter((c) => c.e.archetype === archetype &&
+                getField(c.e, 'head') === headRef &&
+                getField(c.e, 'start') === startRef);
+            if (nextConnectors.length === 0) {
+                nextConnectors.push(...ext.connectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'head') === headRef));
+            }
             if (nextConnectors.length === 0) {
                 const beat = getNum(resolveOriginal(ext, headRef) ?? { archetype: '', data: [] }, '#BEAT');
                 if (beat >= ultimateTailBeat) {
@@ -482,29 +504,89 @@ export const extendedToLevelData = (data, offset = 0) => {
         visit(tailRef);
         return ultimateTailRef;
     }
+    function getUltimateStartRef(archetype, startRef, headRef) {
+        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)}`;
+            if (currentHeadRef === undefined || visited.has(key))
+                return;
+            visited.add(key);
+            if (!isSlideTickRef(currentHeadRef))
+                return;
+            const previousConnectors = ext.connectors.filter((c) => c.e.archetype === archetype && 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;
+                }
+                visit(getField(previousConnector.e, 'head'));
+            }
+        }
+        visit(headRef);
+        return ultimateStartRef;
+    }
     function setInferredActiveHead(note, activeHead) {
-        if (note === activeHead)
-            return;
         if (note.refs.activeHead)
             return;
         note.set('activeHead', activeHead);
     }
+    function isIgnoredSlideTickRef(ref) {
+        return resolveOriginal(ext, ref)?.archetype === 'IgnoredSlideTickNote';
+    }
+    function getNextConnectorWithHead(archetype, startRef, headRef) {
+        return (ext.connectors.find(({ e }) => e.archetype === archetype &&
+            getField(e, 'start') === startRef &&
+            getField(e, 'head') === headRef) ??
+            ext.connectors.find(({ e }) => e.archetype === archetype && getField(e, 'head') === headRef));
+    }
+    function resolveConnectorTailRef(archetype, startRef, tailRef) {
+        const skippedNoteRefs = [];
+        const skippedConnectors = [];
+        const visited = new Set();
+        let resolvedTailRef = tailRef;
+        while (isIgnoredSlideTickRef(resolvedTailRef)) {
+            if (resolvedTailRef === undefined)
+                break;
+            const key = String(resolvedTailRef);
+            if (visited.has(key))
+                break;
+            visited.add(key);
+            skippedNoteRefs.push(resolvedTailRef);
+            const nextConnector = getNextConnectorWithHead(archetype, startRef, resolvedTailRef);
+            if (!nextConnector)
+                break;
+            skippedConnectors.push(nextConnector);
+            resolvedTailRef = getField(nextConnector.e, 'tail');
+        }
+        return { tailRef: resolvedTailRef, skippedNoteRefs, skippedConnectors };
+    }
     for (const { idx, e } of ext.connectors) {
         const startRef = getField(e, 'start');
         const headRef = getField(e, 'head');
-        const tailRef = getField(e, 'tail');
+        if (isIgnoredSlideTickRef(headRef))
+            continue;
+        const { tailRef, skippedNoteRefs, skippedConnectors } = resolveConnectorTailRef(e.archetype, startRef, getField(e, 'tail'));
+        if (isIgnoredSlideTickRef(tailRef))
+            continue;
         const tail = getNote(tailRef);
         const rawHeadOriginal = resolveOriginal(ext, headRef);
         const tailOriginal = resolveOriginal(ext, tailRef);
         const rawHead = getNote(headRef);
-        const activeHead = getNote(startRef);
+        const activeStartRef = getUltimateStartRef(e.archetype, startRef, headRef);
+        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);
         if (!activeTail) {
-            activeTail = getNote(getUltimateTailRef(startRef, getField(e, 'tail')));
+            activeTail = getNote(getUltimateTailRef(e.archetype, activeStartRef, tailRef));
         }
         if (!activeTail) {
             activeTail = tail;
@@ -532,6 +614,7 @@ export const extendedToLevelData = (data, offset = 0) => {
             connector.set('activeHead', activeHead);
             connector.set('activeTail', activeTail);
             finalEntities.push(connector);
+            setInferredActiveHead(segmentHead, activeHead);
             segments.push({ head: segmentHead, tail });
         }
         else {
@@ -568,9 +651,23 @@ export const extendedToLevelData = (data, offset = 0) => {
             setInferredActiveHead(segmentNote, activeHead);
         }
         setInferredActiveHead(activeTail, activeHead);
+        for (const skippedNoteRef of skippedNoteRefs) {
+            const skippedNote = getNote(skippedNoteRef);
+            if (!skippedNote)
+                continue;
+            skippedNote.set('attachHead', head);
+            skippedNote.set('attachTail', tail);
+            skippedNote.set('isAttached', 1);
+            setInferredActiveHead(skippedNote, activeHead);
+        }
         connectorsByIndex.set(idx, connectorLink);
         if (e.name)
             connectorsByName.set(e.name, connectorLink);
+        for (const skippedConnector of skippedConnectors) {
+            connectorsByIndex.set(skippedConnector.idx, connectorLink);
+            if (skippedConnector.e.name)
+                connectorsByName.set(skippedConnector.e.name, connectorLink);
+        }
     }
     function getConn(ref) {
         if (typeof ref === 'number')

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.0.16";
+export declare const version = "1.0.18";
 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.0.16';
+export const version = '1.0.18';
 export const databaseEngineItem = {
     name: 'next-rush',
     version: 13,

package/package.json

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