sonolus-next-rush-engine 1.0.4 → 1.0.6

package/dist/extended/convert.js

@@ -87,6 +87,8 @@ const guideKindMapping = {
     6: ConnectorKind.GUIDE_CYAN,
     7: ConnectorKind.GUIDE_BLACK,
 };
+const LEGACY_DEFAULT_NOTE_DURATION = 2;
+const LEGACY_MIN_HIDDEN_POP_WINDOW = 1 / 30;
 class ExtData {
     constructor(entities) {
         this.byArch = new Map();
@@ -334,6 +336,28 @@ export const extendedToLevelData = (data, offset = 0) => {
         }
         return scaledTime;
     }
+    function createHideUntilTimescaleGroup(showBeat) {
+        const group = new EntityBuilder('#TIMESCALE_GROUP');
+        const hide = new EntityBuilder('#TIMESCALE_CHANGE');
+        const show = new EntityBuilder('#TIMESCALE_CHANGE');
+        const hideBeat = Math.min(0, showBeat - 1e-6);
+        hide.set('#BEAT', hideBeat);
+        hide.set('#TIMESCALE', 1);
+        hide.set('#TIMESCALE_SKIP', 0);
+        hide.set('#TIMESCALE_GROUP', group);
+        hide.set('#TIMESCALE_EASE', 0);
+        hide.set('hideNotes', 1);
+        hide.set('next', show);
+        show.set('#BEAT', showBeat);
+        show.set('#TIMESCALE', 1);
+        show.set('#TIMESCALE_SKIP', 0);
+        show.set('#TIMESCALE_GROUP', group);
+        show.set('#TIMESCALE_EASE', 0);
+        show.set('hideNotes', 0);
+        group.set('first', hide);
+        finalEntities.push(group, hide, show);
+        return group;
+    }
     const notesByIndex = new Map();
     const notesByName = new Map();
     const connectorsByIndex = new Map();
@@ -436,17 +460,32 @@ export const extendedToLevelData = (data, offset = 0) => {
             return createConnectorAnchor(beat, lerp(headLane, tailLane, easedFrac), lerp(headSize, tailSize, easedFrac), tsg, kind);
         });
     }
+    function isReverseHiddenPopConnector(headOriginal, tailOriginal) {
+        if (!headOriginal || !tailOriginal)
+            return false;
+        if (headOriginal.archetype !== 'HiddenSlideStartNote')
+            return false;
+        if (tailOriginal.archetype !== 'HiddenSlideTickNote')
+            return false;
+        return getNum(tailOriginal, '#BEAT') < getNum(headOriginal, '#BEAT') - 1e-6;
+    }
+    function getLegacyHiddenPopWindow(headOriginal, tailOriginal) {
+        const headTime = beatToTime(getNum(headOriginal, '#BEAT'));
+        const tailTime = beatToTime(getNum(tailOriginal, '#BEAT'));
+        return Math.max(LEGACY_MIN_HIDDEN_POP_WINDOW, LEGACY_DEFAULT_NOTE_DURATION - (headTime - tailTime));
+    }
     for (const { idx, e } of ext.connectors) {
         const startRef = getField(e, 'start');
         const headRef = getField(e, 'head');
         const tailRef = getField(e, 'tail');
         const rawHead = getNote(headRef);
         const tail = getNote(tailRef);
+        const rawHeadOriginal = resolveOriginal(ext, headRef);
+        const tailOriginal = resolveOriginal(ext, tailRef);
         const activeHead = getNote(startRef);
         const usesStartAsHead = shouldUseStartAsHead(startRef, headRef);
         const head = usesStartAsHead ? activeHead : rawHead;
         const headOriginal = resolveOriginal(ext, usesStartAsHead ? startRef : headRef);
-        const tailOriginal = resolveOriginal(ext, tailRef);
         const endRef = getField(e, 'end');
         let activeTail = getNote(endRef);
         if (!activeTail) {
@@ -474,23 +513,41 @@ export const extendedToLevelData = (data, offset = 0) => {
         const kind = activeConnectorKindMapping[e.archetype];
         const ease = easeTypeMapping[getNum(e, 'ease')] ?? EaseType.LINEAR;
         const tsg = headOriginal ? getTSG(getField(headOriginal, 'timeScaleGroup')) : undefined;
-        const splitAnchors = headOriginal && tailOriginal
+        const reverseHiddenPopConnector = isReverseHiddenPopConnector(rawHeadOriginal, tailOriginal);
+        const splitAnchors = headOriginal && tailOriginal && !reverseHiddenPopConnector
             ? getConnectorSplitAnchors(headOriginal, tailOriginal, tsg, kind, ease)
             : [];
         const segmentEase = splitAnchors.length > 0 ? EaseType.LINEAR : ease;
         const segmentNotes = [head, ...splitAnchors, tail];
-        for (let i = 0; i < segmentNotes.length - 1; i++) {
-            const segmentHead = segmentNotes[i];
-            const segmentTail = segmentNotes[i + 1];
+        if (reverseHiddenPopConnector && rawHeadOriginal && tailOriginal) {
+            const popWindow = getLegacyHiddenPopWindow(rawHeadOriginal, tailOriginal);
+            const showTime = beatToTime(getNum(tailOriginal, '#BEAT')) - popWindow;
+            const showBeat = timeToBeat(showTime);
+            const gateTsg = createHideUntilTimescaleGroup(showBeat);
+            const segmentHead = createConnectorAnchor(getNum(rawHeadOriginal, '#BEAT'), getNum(rawHeadOriginal, 'lane'), getNum(rawHeadOriginal, 'size'), gateTsg, kind);
             const connector = new EntityBuilder('Connector');
-            connector.set('head', segmentHead);
-            connector.set('tail', segmentTail);
+            connector.set('head', head);
+            connector.set('tail', tail);
             connector.set('segmentHead', segmentHead);
-            connector.set('segmentTail', segmentTail);
+            connector.set('segmentTail', tail);
             connector.set('activeHead', activeHead);
             connector.set('activeTail', activeTail);
             finalEntities.push(connector);
         }
+        else {
+            for (let i = 0; i < segmentNotes.length - 1; i++) {
+                const segmentHead = segmentNotes[i];
+                const segmentTail = segmentNotes[i + 1];
+                const connector = new EntityBuilder('Connector');
+                connector.set('head', segmentHead);
+                connector.set('tail', segmentTail);
+                connector.set('segmentHead', segmentHead);
+                connector.set('segmentTail', segmentTail);
+                connector.set('activeHead', activeHead);
+                connector.set('activeTail', activeTail);
+                finalEntities.push(connector);
+            }
+        }
         const connectorLink = new EntityBuilder('Connector');
         connectorLink.set('head', head);
         connectorLink.set('tail', 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.0.4";
+export declare const version = "1.0.6";
 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.4';
+export const version = '1.0.6';
 export const databaseEngineItem = {
     name: 'next-rush',
     version: 13,

package/package.json

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