refactor(chart): Unitize speed events

Author: MisaLiu

src/chart/converter/official/index.ts

@@ -81,7 +81,7 @@ export const ConvertFromOfficial = (_chartRaw: IChartOfficial) => {
       _newEvents.speed.push({
         startTime: calcRealTime(oldEvent.startTime, oldLine.bpm),
         endTime: oldEvent.endTime < 999999999 ? calcRealTime(oldEvent.endTime, oldLine.bpm) : Infinity,
-        value: parseDoublePrecist(oldEvent.value, 6),
+        value: parseDoublePrecist(oldEvent.value * 0.6, 6),
       });
     });
 

src/chart/converter/phiedit/index.ts

@@ -285,15 +285,15 @@ export const ConvertFromPhiEdit = (_chartRaw: string) => {
         break;
       }
       case '&': { // Note scale X
-        noteList[noteList.length - 1].scaleX = parseNumber(commandArr[1], 1);
+        noteList[noteList.length - 1].scaleX = parseNumber(commandArr[1], 1, 4);
         break;
       }
       // Parse line events
       case 'cv': { // Speed event
         pushEventToLine(lineList, commandArr[1], 'speed', {
           startBeat: parseNumber(commandArr[2], 0),
           endBeat: NaN,
-          value: parseNumber(parseFloat(commandArr[3]) / 7, 1),
+          value: parseNumber(parseFloat(commandArr[3]) / (1400 / 120), 1),
         });
         break;
       }

src/chart/converter/rephiedit/index.ts

@@ -231,8 +231,8 @@ export const ConvertFromRePhiEdit = (_chartRaw: TRPEChart) => {
       if (oldLayer.speedEvents) oldLayer.speedEvents.forEach((oldEvent) => {
         newEvents.speed.push(...calculateSpeedEventEase({
           ...oldEvent,
-          start: parseDoublePrecist(oldEvent.start / 4.5, 6),
-          end: parseDoublePrecist(oldEvent.end / 4.5, 6),
+          start: parseDoublePrecist(oldEvent.start / (900 / 120), 6),
+          end: parseDoublePrecist(oldEvent.end / (900 / 120), 6),
         }).map((e) => ({
           ...e,
           startTime: calculateRealTime(bpmList, e.startTime),
@@ -326,14 +326,14 @@ export const ConvertFromRePhiEdit = (_chartRaw: TRPEChart) => {
   for (const note of noteList) sameTimeNote[`${note.time}`] = sameTimeNote[`${note.time}`] ? 2 : 1;
   for (const oldNote of noteList) {
     const floorPosition = getFloorPositionByTime(oldNote.judgeline, oldNote.time);
-    const holdLength = oldNote.type === 3 ? parseDoublePrecist(getFloorPositionByTime(oldNote.judgeline, (oldNote.time + oldNote.holdTime!)) - floorPosition, 3, -1) : null;
+    const holdLength = oldNote.type === 3 ? parseDoublePrecist(getFloorPositionByTime(oldNote.judgeline, (oldNote.time + oldNote.holdTime!)) - floorPosition, 4, -1) : null;
 
     result.notes.push(new GameChartNote(
       oldNote.judgeline,
       oldNote.type,
       oldNote.isAbove,
       oldNote.time,
-      oldNote.speed,
+      parseDoublePrecist(oldNote.speed, 6),
       oldNote.posX,
       sameTimeNote[`${oldNote.time}`] === 2,
       floorPosition,

src/chart/eventlayer.ts

@@ -11,6 +11,9 @@ export interface IGameChartEventLayer {
 }
 
 export class GameChartEventLayer {
+  /**
+   * 1 Speed = 100vh/s
+   */
   readonly speed: ArrayIndexed<GameChartEventSingle> = new ArrayIndexed();
   /**
    * Use percentage. The center of the X-axis is `0%`.

src/chart/index.ts

@@ -106,7 +106,7 @@ export class GameChart {
     for (const note of data.notes) {
       if (note.type === 3) {
         const { isOfficial } = note;
-        const holdLength = (isOfficial ? note.holdTime! / 1000 : note.holdLength!) * note.speed * sizer.noteSpeed / sizer.noteScale;
+        const holdLength = (isOfficial ? note.holdTime! / 1000 : note.holdLength!) * note.speed * sizer.height / sizer.noteScale;
 
         note.sprite!.children[0].visible = true;
         note.sprite!.children[1].scale.y = 1;

src/chart/tick.ts

@@ -31,7 +31,8 @@ export function onChartTick(this: GameChart, currentTime: number, container: Con
   const { data, game } = this;
 
   const { renderer } = game;
-  const { widthHalf, heightHalf } = renderer.size;
+  const { size } = renderer;
+  const { widthHalf, heightHalf } = size;
 
   for (const line of data.lines) {
     const { eventLayers, parent } = line;
@@ -115,7 +116,6 @@ export function onChartTick(this: GameChart, currentTime: number, container: Con
     sprite.alpha = line.alpha;
   }
 
-  const { size } = renderer;
   const { widthHalfBorder, heightHalfBorder } = size;
   for (const note of data.notes) {
     const {
@@ -156,7 +156,7 @@ export function onChartTick(this: GameChart, currentTime: number, container: Con
     }
 
     const posX = widthHalf * notePosX;
-    const posY = floorPositionDiff * size.noteSpeed * (isAbove ? -1 : 1);
+    const posY = floorPositionDiff * size.height * (isAbove ? -1 : 1);
     const realXSin = posY * judgeline.sinr * -1;
     const realYCos = posY * judgeline.cosr;
 
@@ -167,11 +167,11 @@ export function onChartTick(this: GameChart, currentTime: number, container: Con
     note.realHoldEndPosY = note.realPosY = note.realLinePosY + realYCos;
 
     if (type === 3) {
-      let realHoldLength = holdLength! * size.noteSpeed / size.noteScale;
+      let realHoldLength = holdLength! * size.height / size.noteScale;
       if (time <= currentTime) {
         realHoldLength = (
           isOfficial ? (holdEndTime! - currentTime) / 1000 : (holdFloorPosition! - judgeline.floorPosition)
-        ) * speed * size.noteSpeed / size.noteScale;
+        ) * speed * size.height / size.noteScale;
 
         const [ spriteHead, spriteBody, spriteEnd ] = sprite.children;
 

src/renderer/index.ts

@@ -39,7 +39,6 @@ export interface IGameRendererSize {
 
   noteScale: number,
   noteWidth: number,
-  noteSpeed: number,
 
   hitParticleScale: number,
 
@@ -70,7 +69,6 @@ export class GameRenderer {
 
     noteScale: 0,
     noteWidth: 0,
-    noteSpeed: 0,
 
     hitParticleScale: 0,
 
@@ -159,7 +157,6 @@ export class GameRenderer {
 
     size.noteScale = size.width / 8080; // TODO: Settings
     size.noteWidth = size.width * 0.117775;
-    size.noteSpeed = size.height * 0.6;
 
     size.hitParticleScale = size.noteScale * 6;