sonolus-next-rush-engine 1.0.12 → 1.0.13

package/dist/extended/convert.js

@@ -348,6 +348,8 @@ export const extendedToLevelData = (data, offset = 0) => {
         note.set('size', getNum(e, 'size', 0.0));
         note.set('direction', flickDirectionMapping[getNum(e, 'direction', 0)] ?? FlickDirection.UP_OMNI);
         note.set('segmentKind', ConnectorKind.ACTIVE_NORMAL);
+        note.set('segmentAlpha', 1);
+        note.set('segmentLayer', 0);
         note.set('isAttached', 0);
         note.set('connectorEase', 0);
         note.set('isSeparator', 0);
@@ -363,6 +365,10 @@ export const extendedToLevelData = (data, offset = 0) => {
             return notesByName.get(ref);
         return undefined;
     }
+    function getTimeScaleAt(changes, beat) {
+        const change = [...changes].reverse().find((change) => change.beat < beat - 1e-6);
+        return change?.timeScale ?? 1;
+    }
     function shouldUseStartAsHead(startRef, headRef) {
         if (startRef === headRef)
             return false;
@@ -378,6 +384,27 @@ export const extendedToLevelData = (data, offset = 0) => {
             nearlyEqual(getNum(start, 'lane'), getNum(head, 'lane')) &&
             nearlyEqual(getNum(start, 'size'), getNum(head, 'size')));
     }
+    function findExistingConnectorSplitNote(beat, lane, size, tsg) {
+        const splitTsg = tsg ?? defaultTsg;
+        for (const { idx, e } of ext.notes) {
+            const note = notesByIndex.get(idx);
+            if (!note)
+                continue;
+            if (getField(e, 'attach') !== undefined)
+                continue;
+            if (!nearlyEqual(getNum(e, '#BEAT'), beat))
+                continue;
+            if (!nearlyEqual(getNum(e, 'lane'), lane))
+                continue;
+            if (!nearlyEqual(getNum(e, 'size'), size))
+                continue;
+            const noteTsg = getTSG(getField(e, 'timeScaleGroup')) ?? defaultTsg;
+            if (noteTsg !== splitTsg)
+                continue;
+            return note;
+        }
+        return undefined;
+    }
     function createConnectorAnchor(beat, lane, size, tsg, kind) {
         const anchor = new EntityBuilder('AnchorNote');
         anchor.set('#BEAT', beat);
@@ -404,8 +431,12 @@ export const extendedToLevelData = (data, offset = 0) => {
         const headChanges = getTSGChanges(headTsgRef);
         const tailChanges = getTSGChanges(tailTsgRef);
         const splitBeats = headChanges
-            .map(({ beat }) => beat)
-            .filter((beat) => headBeat + 1e-6 < beat && beat < tailBeat - 1e-6);
+            .filter((change) => {
+            if (!(headBeat + 1e-6 < change.beat && change.beat < tailBeat - 1e-6))
+                return false;
+            return !nearlyEqual(change.timeScale, getTimeScaleAt(headChanges, change.beat));
+        })
+            .map(({ beat }) => beat);
         if (splitBeats.length === 0)
             return [];
         const headScaledTime = timeToScaledTime(beatToTime(headBeat), headChanges);
@@ -433,7 +464,10 @@ export const extendedToLevelData = (data, offset = 0) => {
             const scaledTime = timeToScaledTime(beatToTime(beat), headChanges);
             const frac = unlerp(headScaledTime, tailScaledTime, scaledTime);
             const easedFrac = applyEase(ease, frac);
-            return createConnectorAnchor(beat, lerp(headLane, tailLane, easedFrac), lerp(headSize, tailSize, easedFrac), tsg, kind);
+            const lane = lerp(headLane, tailLane, easedFrac);
+            const size = lerp(headSize, tailSize, easedFrac);
+            return (findExistingConnectorSplitNote(beat, lane, size, tsg) ??
+                createConnectorAnchor(beat, lane, size, tsg, kind));
         });
     }
     function isReverseHiddenPopConnector(headOriginal, tailOriginal) {
@@ -445,6 +479,31 @@ export const extendedToLevelData = (data, offset = 0) => {
             return false;
         return getNum(tailOriginal, '#BEAT') < getNum(headOriginal, '#BEAT') - 1e-6;
     }
+    function getUltimateTailRef(startRef, tailRef) {
+        let ultimateTailRef = tailRef;
+        let ultimateTailBeat = getNum(resolveOriginal(ext, tailRef) ?? { archetype: '', data: [] }, '#BEAT');
+        const visited = new Set();
+        function visit(headRef) {
+            const key = `${String(startRef)}|${String(headRef)}`;
+            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);
+            if (nextConnectors.length === 0) {
+                const beat = getNum(resolveOriginal(ext, headRef) ?? { archetype: '', data: [] }, '#BEAT');
+                if (beat >= ultimateTailBeat) {
+                    ultimateTailBeat = beat;
+                    ultimateTailRef = headRef;
+                }
+                return;
+            }
+            for (const nextConnector of nextConnectors) {
+                visit(getField(nextConnector.e, 'tail'));
+            }
+        }
+        visit(tailRef);
+        return ultimateTailRef;
+    }
     for (const { idx, e } of ext.connectors) {
         const startRef = getField(e, 'start');
         const headRef = getField(e, 'head');
@@ -460,21 +519,7 @@ export const extendedToLevelData = (data, offset = 0) => {
         const endRef = getField(e, 'end');
         let activeTail = getNote(endRef);
         if (!activeTail) {
-            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;
-                }
-            }
-            activeTail = getNote(ultimateTailRef);
+            activeTail = getNote(getUltimateTailRef(startRef, getField(e, 'tail')));
         }
         if (!activeTail) {
             activeTail = tail;
@@ -490,6 +535,7 @@ export const extendedToLevelData = (data, offset = 0) => {
             : [];
         const segmentEase = splitAnchors.length > 0 ? EaseType.LINEAR : ease;
         const segmentNotes = [head, ...splitAnchors, tail];
+        const segments = [];
         if (reverseHiddenPopConnector && rawHeadOriginal && tailOriginal) {
             const segmentHead = createConnectorAnchor(getNum(rawHeadOriginal, '#BEAT'), getNum(rawHeadOriginal, 'lane'), getNum(rawHeadOriginal, 'size'), getTSG(getField(rawHeadOriginal, 'timeScaleGroup')) ?? tsg, kind);
             const connector = new EntityBuilder('Connector');
@@ -501,6 +547,7 @@ export const extendedToLevelData = (data, offset = 0) => {
             connector.set('activeHead', activeHead);
             connector.set('activeTail', activeTail);
             finalEntities.push(connector);
+            segments.push({ head: segmentHead, tail });
         }
         else {
             for (let i = 0; i < segmentNotes.length - 1; i++) {
@@ -514,13 +561,16 @@ export const extendedToLevelData = (data, offset = 0) => {
                 connector.set('activeHead', activeHead);
                 connector.set('activeTail', activeTail);
                 finalEntities.push(connector);
+                segments.push({ head: segmentHead, tail: segmentTail });
             }
         }
-        const connectorLink = new EntityBuilder('Connector');
-        connectorLink.set('head', head);
-        connectorLink.set('tail', tail);
-        connectorLink.set('activeHead', activeHead);
-        connectorLink.set('activeTail', activeTail);
+        const connectorLink = {
+            head,
+            tail,
+            activeHead,
+            activeTail,
+            segments,
+        };
         for (const segmentHead of segmentNotes.slice(0, -1)) {
             segmentHead.set('connectorEase', segmentEase);
             segmentHead.set('segmentKind', kind);
@@ -540,6 +590,18 @@ export const extendedToLevelData = (data, offset = 0) => {
             return connectorsByName.get(ref);
         return undefined;
     }
+    function getAttachSegment(conn, beat) {
+        for (const segment of conn.segments) {
+            const headBeat = segment.head.getBeat();
+            const tailBeat = segment.tail.getBeat();
+            const minBeat = Math.min(headBeat, tailBeat);
+            const maxBeat = Math.max(headBeat, tailBeat);
+            if (minBeat - 1e-6 <= beat && beat <= maxBeat + 1e-6) {
+                return segment;
+            }
+        }
+        return { head: conn.head, tail: conn.tail };
+    }
     for (const [idx, note] of notesByIndex.entries()) {
         const e = ext.get(idx);
         const tsgRef = getField(e, 'timeScaleGroup');
@@ -548,17 +610,18 @@ export const extendedToLevelData = (data, offset = 0) => {
         const attachRef = getField(e, 'attach');
         if (attachRef !== undefined) {
             const attachConn = getConn(attachRef);
-            if (attachConn?.refs.head && attachConn.refs.tail) {
-                note.set('attachHead', attachConn.refs.head);
-                note.set('attachTail', attachConn.refs.tail);
+            if (attachConn) {
+                const attachSegment = getAttachSegment(attachConn, getNum(e, '#BEAT'));
+                note.set('attachHead', attachSegment.head);
+                note.set('attachTail', attachSegment.tail);
                 note.set('isAttached', 1);
             }
         }
         const slideRef = getField(e, 'slide');
         if (slideRef !== undefined) {
             const slideConn = getConn(slideRef);
-            if (slideConn?.refs.activeHead) {
-                note.set('activeHead', slideConn.refs.activeHead);
+            if (slideConn) {
+                note.set('activeHead', slideConn.activeHead);
             }
         }
     }
@@ -575,6 +638,7 @@ export const extendedToLevelData = (data, offset = 0) => {
     const anchorsByBeat = new Map();
     const anchorPositions = new Map();
     function getAnchor(beat, lane, size, tsg, pos, segmentKind = -1, segmentAlpha = -1, connectorEase = -1) {
+        const anchorTsg = tsg ?? defaultTsg;
         const anchors = anchorsByBeat.get(beat) || [];
         for (const anchor of anchors) {
             const positions = anchorPositions.get(anchor);
@@ -582,7 +646,7 @@ export const extendedToLevelData = (data, offset = 0) => {
                 continue;
             if (anchor.values.lane === lane &&
                 anchor.values.size === size &&
-                anchor.refs['#TIMESCALE_GROUP'] === tsg &&
+                anchor.refs['#TIMESCALE_GROUP'] === anchorTsg &&
                 (segmentKind === -1 ||
                     anchor.values.segmentKind === segmentKind ||
                     anchor.values.segmentKind === -1) &&
@@ -606,10 +670,11 @@ export const extendedToLevelData = (data, offset = 0) => {
         newAnchor.set('#BEAT', beat);
         newAnchor.set('lane', lane);
         newAnchor.set('size', size);
-        if (tsg)
-            newAnchor.set('#TIMESCALE_GROUP', tsg);
+        newAnchor.set('direction', FlickDirection.UP_OMNI);
+        newAnchor.set('#TIMESCALE_GROUP', anchorTsg);
         newAnchor.set('segmentKind', segmentKind);
         newAnchor.set('segmentAlpha', segmentAlpha);
+        newAnchor.set('segmentLayer', 0);
         newAnchor.set('connectorEase', connectorEase);
         newAnchor.set('isAttached', 0);
         newAnchor.set('isSeparator', 0);

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

package/package.json

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