sonolus-next-rush-engine 1.0.7 → 1.0.9

package/dist/extended/convert.js

@@ -87,8 +87,6 @@ const guideKindMapping = {
     6: ConnectorKind.GUIDE_CYAN,
     7: ConnectorKind.GUIDE_BLACK,
 };
-const LEGACY_HIDDEN_POP_NOTE_SPEED = 10;
-const LEGACY_MIN_HIDDEN_POP_WINDOW = 1 / 30;
 class ExtData {
     constructor(entities) {
         this.byArch = new Map();
@@ -157,9 +155,6 @@ function unlerp(a, b, x) {
 function clamp01(x) {
     return Math.min(1, Math.max(0, x));
 }
-function legacyNoteDuration(noteSpeed) {
-    return lerp(0.35, 4, unlerp(12, 1, noteSpeed) ** 1.31);
-}
 function applyEase(type, x) {
     const t = clamp01(x);
     switch (type) {
@@ -339,28 +334,6 @@ 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();
@@ -472,12 +445,6 @@ export const extendedToLevelData = (data, offset = 0) => {
             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'));
-        const noteDuration = legacyNoteDuration(LEGACY_HIDDEN_POP_NOTE_SPEED);
-        return Math.max(LEGACY_MIN_HIDDEN_POP_WINDOW, noteDuration - (headTime - tailTime));
-    }
     for (const { idx, e } of ext.connectors) {
         const startRef = getField(e, 'start');
         const headRef = getField(e, 'head');
@@ -518,27 +485,21 @@ export const extendedToLevelData = (data, offset = 0) => {
         const ease = easeTypeMapping[getNum(e, 'ease')] ?? EaseType.LINEAR;
         const tsg = headOriginal ? getTSG(getField(headOriginal, 'timeScaleGroup')) : undefined;
         const reverseHiddenPopConnector = isReverseHiddenPopConnector(rawHeadOriginal, tailOriginal);
-        const hasActiveSlide = !reverseHiddenPopConnector;
         const splitAnchors = headOriginal && tailOriginal && !reverseHiddenPopConnector
             ? getConnectorSplitAnchors(headOriginal, tailOriginal, tsg, kind, ease)
             : [];
         const segmentEase = splitAnchors.length > 0 ? EaseType.LINEAR : ease;
         const segmentNotes = [head, ...splitAnchors, tail];
         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 segmentHead = createConnectorAnchor(getNum(rawHeadOriginal, '#BEAT'), getNum(rawHeadOriginal, 'lane'), getNum(rawHeadOriginal, 'size'), getTSG(getField(rawHeadOriginal, 'timeScaleGroup')) ?? tsg, kind);
             const connector = new EntityBuilder('Connector');
             connector.set('head', head);
             connector.set('tail', tail);
             connector.set('segmentHead', segmentHead);
             connector.set('segmentTail', tail);
-            if (hasActiveSlide) {
-                connector.set('activeHead', activeHead);
-                connector.set('activeTail', activeTail);
-            }
+            connector.set('legacyHiddenPop', 1);
+            connector.set('activeHead', activeHead);
+            connector.set('activeTail', activeTail);
             finalEntities.push(connector);
         }
         else {
@@ -550,20 +511,16 @@ export const extendedToLevelData = (data, offset = 0) => {
                 connector.set('tail', segmentTail);
                 connector.set('segmentHead', segmentHead);
                 connector.set('segmentTail', segmentTail);
-                if (hasActiveSlide) {
-                    connector.set('activeHead', activeHead);
-                    connector.set('activeTail', activeTail);
-                }
+                connector.set('activeHead', activeHead);
+                connector.set('activeTail', activeTail);
                 finalEntities.push(connector);
             }
         }
         const connectorLink = new EntityBuilder('Connector');
         connectorLink.set('head', head);
         connectorLink.set('tail', tail);
-        if (hasActiveSlide) {
-            connectorLink.set('activeHead', activeHead);
-            connectorLink.set('activeTail', activeTail);
-        }
+        connectorLink.set('activeHead', activeHead);
+        connectorLink.set('activeTail', activeTail);
         for (const segmentHead of segmentNotes.slice(0, -1)) {
             segmentHead.set('connectorEase', segmentEase);
             segmentHead.set('segmentKind', kind);
@@ -571,9 +528,7 @@ export const extendedToLevelData = (data, offset = 0) => {
         }
         tail.set('segmentKind', kind);
         tail.set('segmentAlpha', 1);
-        if (hasActiveSlide) {
-            activeHead.set('segmentKind', kind);
-        }
+        activeHead.set('segmentKind', kind);
         connectorsByIndex.set(idx, connectorLink);
         if (e.name)
             connectorsByName.set(e.name, connectorLink);

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

package/package.json

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