sonolus-next-rush-engine 1.0.5 → 1.0.7

package/dist/extended/convert.js

@@ -87,7 +87,8 @@ const guideKindMapping = {
     6: ConnectorKind.GUIDE_CYAN,
     7: ConnectorKind.GUIDE_BLACK,
 };
-const LEGACY_HIDDEN_POP_WINDOW = 1 / 30;
+const LEGACY_HIDDEN_POP_NOTE_SPEED = 10;
+const LEGACY_MIN_HIDDEN_POP_WINDOW = 1 / 30;
 class ExtData {
     constructor(entities) {
         this.byArch = new Map();
@@ -156,6 +157,9 @@ 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) {
@@ -468,6 +472,12 @@ 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');
@@ -508,13 +518,15 @@ 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 showTime = beatToTime(getNum(tailOriginal, '#BEAT')) - LEGACY_HIDDEN_POP_WINDOW;
+            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);
@@ -523,8 +535,10 @@ export const extendedToLevelData = (data, offset = 0) => {
             connector.set('tail', tail);
             connector.set('segmentHead', segmentHead);
             connector.set('segmentTail', tail);
-            connector.set('activeHead', activeHead);
-            connector.set('activeTail', activeTail);
+            if (hasActiveSlide) {
+                connector.set('activeHead', activeHead);
+                connector.set('activeTail', activeTail);
+            }
             finalEntities.push(connector);
         }
         else {
@@ -536,16 +550,20 @@ export const extendedToLevelData = (data, offset = 0) => {
                 connector.set('tail', segmentTail);
                 connector.set('segmentHead', segmentHead);
                 connector.set('segmentTail', segmentTail);
-                connector.set('activeHead', activeHead);
-                connector.set('activeTail', activeTail);
+                if (hasActiveSlide) {
+                    connector.set('activeHead', activeHead);
+                    connector.set('activeTail', activeTail);
+                }
                 finalEntities.push(connector);
             }
         }
         const connectorLink = new EntityBuilder('Connector');
         connectorLink.set('head', head);
         connectorLink.set('tail', tail);
-        connectorLink.set('activeHead', activeHead);
-        connectorLink.set('activeTail', activeTail);
+        if (hasActiveSlide) {
+            connectorLink.set('activeHead', activeHead);
+            connectorLink.set('activeTail', activeTail);
+        }
         for (const segmentHead of segmentNotes.slice(0, -1)) {
             segmentHead.set('connectorEase', segmentEase);
             segmentHead.set('segmentKind', kind);
@@ -553,7 +571,9 @@ export const extendedToLevelData = (data, offset = 0) => {
         }
         tail.set('segmentKind', kind);
         tail.set('segmentAlpha', 1);
-        activeHead.set('segmentKind', kind);
+        if (hasActiveSlide) {
+            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.5";
+export declare const version = "1.0.7";
 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.5';
+export const version = '1.0.7';
 export const databaseEngineItem = {
     name: 'next-rush',
     version: 13,

package/package.json

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