kipphi 2.1.3-beta.1 → 2.1.3-beta.2

package/chart.ts

@@ -10,6 +10,7 @@ import {
     NormalEasing,
     rpeEasingArray,
     SegmentedEasing,
+    TemplateEasing,
     TemplateEasingLib,
 } from "./easing";
 
@@ -149,6 +150,11 @@ export class Chart {
     /** 难度等级显示绑定的判定线 */
     levelAttach:       JudgeLine | null = null;
 
+    /** 仅用于构造时检查 
+     * @internal
+     */
+    segmentedTemplates: Map<(SegmentedEasing & { easing: TemplateEasing}), [string, TimeT]> = new Map();
+
     constructor() {}
     
     /**
@@ -286,6 +292,9 @@ export class Chart {
         for (let i = 0; i < len; i++) {
             const easingData = templateEasings[i];
             const sequence = chart.sequenceMap.get(easingData.content);
+            if (!sequence) {
+                continue; // 后面check的时候会错误处理
+            }
             if (sequence.type !== EventType.easing) {
                 throw err.CANNOT_IMPLEMENT_TEMEAS_WITH_NON_EASING_ENS(easingData.name);
             }
@@ -303,7 +312,10 @@ export class Chart {
             }
         }
 
-        chart.templateEasingLib.check()
+        chart.templateEasingLib.check();
+
+        chart.checkSegmentedTemplates();
+
         for (const lineData of data.orphanLines) {
             const line: JudgeLine = JudgeLine.fromKPAJSON(data.version, chart, lineData.id, lineData, chart.templateEasingLib, chart.timeCalculator)
             chart.orphanLines.push(line)
@@ -727,6 +739,25 @@ export class Chart {
         
     }
     */
+    checkErrors() {
+        KPAError.flush();
+        for (const [_, seq] of this.sequenceMap) {
+            seq.checkErrors();
+        }
+    }
+    /**
+     * 用于构造谱面时检查
+     */
+    protected checkSegmentedTemplates() {
+        for (const [easing, [pos, time]] of this.segmentedTemplates) {
+            const inner = easing.easing;
+            if (inner.getValue(easing.left) === inner.getValue(easing.right)) {
+                err.EASING_DELTA_CANNOT_BE_ZERO(pos, time).warn();
+            }
+        }
+        this.segmentedTemplates.clear();
+        // 查完就清除，不再需要
+    }
 }
 
 /**

package/env.ts

@@ -74,6 +74,7 @@ export enum ERROR_IDS {
     NODES_NOT_BELONG_TO_SAME_SEQUENCE =             EASING     | INVALID_USAGE | 2,
     NODES_HAS_ZERO_DELTA =                          EASING     | INVALID_USAGE | 3,
     TEMPLATE_EASING_CIRCULAR_REFERENCE =            EASING     | INVALID_USAGE | 4,
+    EASING_DELTA_CANNOT_BE_ZERO =                   EASING     | INVALID_USAGE | 5,
 
     CANNOT_DIVIDE_EXPRESSION_EVALUATOR =            EVALUATOR  | INVALID_USAGE | 0,
     MISSING_MACRO_EVALUATOR_KEY =                   EVALUATOR  | INVALID_DATA  | 0,
@@ -184,6 +185,8 @@ export const ERRORS = {
         `Hold should have a duration.`,
     TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName: string) =>
         `Template Easing '${temEasName}' has circular reference`,
+    EASING_DELTA_CANNOT_BE_ZERO: (seqName: string, time: TimeT) =>
+        `Easing delta cannot be zero. (at ${seqName}, ${toTimeString(time)}`,
 } satisfies Record<keyof typeof ERROR_IDS, (...args: any[]) => string>
 
 type EnumKeys<E extends Record<string, string | number>> = E[keyof E];

package/event.ts

@@ -640,6 +640,12 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
         for (let index = 0; index < length; index++) {
             const event = data[index];
             const [start, end] = chart.createEventFromData<VT>(event, valueType, `${pos}.events[${index}]`);
+
+            // 收集被截的模板缓动
+            const evaluator = start.evaluator;
+            if (evaluator instanceof EasedEvaluator && evaluator.easing instanceof SegmentedEasing && evaluator.easing.easing instanceof TemplateEasing) {
+                chart.segmentedTemplates.set(evaluator.easing as any, [pos, start.time]);
+            }
             // 从前面复制了，复用性减一
             // KPA2没有更改RPE的按事件存储的机制。
             if (TC.lt(event.startTime, lastEndTime)) { // event.startTime < lastEndTime
@@ -956,15 +962,33 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
         }
 
         let lastEnd: EventEndNode<VT> = endNode;
+        currentNode = endNode.next;
         while (true) {
+            const evaluator = currentNode.evaluator;
+            if (this.type === EventType.easing && evaluator instanceof EasedEvaluator && evaluator.easing instanceof TemplateEasing) {
+                if (TemplateEasing.checkCircularReference(this as EventNodeSequence, evaluator.easing)) {
+                    err.TEMPLATE_EASING_CIRCULAR_REFERENCE(this.id).warn();
+                }
+            }
+            if (evaluator instanceof EasedEvaluator && evaluator.easing instanceof SegmentedEasing) {
+                const easing = evaluator.easing;
+                const inner = easing.easing;
+                if (inner.getValue(easing.left) === inner.getValue(easing.right)) {
+                    err.EASING_DELTA_CANNOT_BE_ZERO(this.id, currentNode.time).warn();
+                }
+            }
             const endNode = currentNode.next;
             if (endNode.type === NodeType.TAIL) {
                 break;
             }
+            if (!TC.gt(endNode.time, currentNode.time)) {
+                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn();
+            }
             if (TC.ne(lastEnd.time, currentNode.time)) {
                 err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn();
             }
             currentNode = currentNode.next.next;
+            lastEnd = endNode;
         }
     }
     hasReferenceTo(this: EventNodeSequence<number>, seq: EventNodeSequence<number>) {

package/index.d.ts

@@ -1697,7 +1697,7 @@ declare module "easing" {
 }
 declare module "chart" {
     import { TimeCalculator } from "bpm";
-    import { Easing, TemplateEasingLib } from "easing";
+    import { Easing, SegmentedEasing, TemplateEasing, TemplateEasingLib } from "easing";
     import { EventNodeSequence, EventStartNode, EventEndNode, EventNode } from "event";
     import { JudgeLine } from "judgeline";
     import { NNNList, NNNode } from "note";
@@ -1765,6 +1765,12 @@ declare module "chart" {
         nameAttach: JudgeLine | null;
         /** 难度等级显示绑定的判定线 */
         levelAttach: JudgeLine | null;
+        /** 仅用于构造时检查
+         * @internal
+         */
+        segmentedTemplates: Map<(SegmentedEasing & {
+            easing: TemplateEasing;
+        }), [string, TimeT]>;
         constructor();
         /**
          * 获取有效节拍数
@@ -1898,6 +1904,11 @@ declare module "chart" {
         bindTimeMacro(node: EventStartNode<any>, macroData: MacroData, pos: string): any;
         bindValueMacro(node: EventNode<any>, macroData: MacroData, pos: string): any;
         linkMacro(node: EventNode<EventValueESType>, linkData: MacroLink, pos: string): any;
+        checkErrors(): void;
+        /**
+         * 用于构造谱面时检查
+         */
+        protected checkSegmentedTemplates(): void;
     }
     /**
      * 表示一组判定线的容器
@@ -2262,6 +2273,7 @@ declare module "env" {
         NODES_NOT_BELONG_TO_SAME_SEQUENCE = 2610,
         NODES_HAS_ZERO_DELTA = 2611,
         TEMPLATE_EASING_CIRCULAR_REFERENCE = 2612,
+        EASING_DELTA_CANNOT_BE_ZERO = 2613,
         CANNOT_DIVIDE_EXPRESSION_EVALUATOR = 2352,
         MISSING_MACRO_EVALUATOR_KEY = 2336,
         MACRO_EVALUATOR_NOT_FOUND = 2337,
@@ -2313,6 +2325,7 @@ declare module "env" {
         EVENT_NODE_NOT_DENSE: (pos: string) => string;
         HOLD_HAS_NO_DURATION: () => string;
         TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName: string) => string;
+        EASING_DELTA_CANNOT_BE_ZERO: (seqName: string, time: TimeT) => string;
     };
     interface ErrorMap extends Record<keyof typeof ERROR_IDS, Array<any>> {
         EVENT_NODE_NOT_DENSE: [EventNode];
@@ -2379,6 +2392,7 @@ declare module "env" {
             EVENT_NODE_NOT_DENSE: (pos: string) => KPAError<ERROR_IDS.EVENT_NODE_NOT_DENSE>;
             HOLD_HAS_NO_DURATION: () => KPAError<ERROR_IDS.HOLD_HAS_NO_DURATION>;
             TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName: string) => KPAError<ERROR_IDS.TEMPLATE_EASING_CIRCULAR_REFERENCE>;
+            EASING_DELTA_CANNOT_BE_ZERO: (seqName: string, time: TimeT) => KPAError<ERROR_IDS.EASING_DELTA_CANNOT_BE_ZERO>;
         };
         freeze(): void;
     };

package/index.js

@@ -79,6 +79,7 @@ var ERROR_IDS;
   ERROR_IDS2[ERROR_IDS2["NODES_NOT_BELONG_TO_SAME_SEQUENCE"] = EASING | INVALID_USAGE | 2] = "NODES_NOT_BELONG_TO_SAME_SEQUENCE";
   ERROR_IDS2[ERROR_IDS2["NODES_HAS_ZERO_DELTA"] = EASING | INVALID_USAGE | 3] = "NODES_HAS_ZERO_DELTA";
   ERROR_IDS2[ERROR_IDS2["TEMPLATE_EASING_CIRCULAR_REFERENCE"] = EASING | INVALID_USAGE | 4] = "TEMPLATE_EASING_CIRCULAR_REFERENCE";
+  ERROR_IDS2[ERROR_IDS2["EASING_DELTA_CANNOT_BE_ZERO"] = EASING | INVALID_USAGE | 5] = "EASING_DELTA_CANNOT_BE_ZERO";
   ERROR_IDS2[ERROR_IDS2["CANNOT_DIVIDE_EXPRESSION_EVALUATOR"] = EVALUATOR | INVALID_USAGE | 0] = "CANNOT_DIVIDE_EXPRESSION_EVALUATOR";
   ERROR_IDS2[ERROR_IDS2["MISSING_MACRO_EVALUATOR_KEY"] = EVALUATOR | INVALID_DATA | 0] = "MISSING_MACRO_EVALUATOR_KEY";
   ERROR_IDS2[ERROR_IDS2["MACRO_EVALUATOR_NOT_FOUND"] = EVALUATOR | INVALID_DATA | 1] = "MACRO_EVALUATOR_NOT_FOUND";
@@ -129,7 +130,8 @@ var ERRORS = {
   MACRO_NOT_PARAMETRIC: (macroId, pos) => `Macro '${macroId}' is not parametric. At ${pos}`,
   EVENT_NODE_NOT_DENSE: (pos) => `EventNode is not dense. At ${pos}`,
   HOLD_HAS_NO_DURATION: () => `Hold should have a duration.`,
-  TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName) => `Template Easing '${temEasName}' has circular reference`
+  TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName) => `Template Easing '${temEasName}' has circular reference`,
+  EASING_DELTA_CANNOT_BE_ZERO: (seqName, time) => `Easing delta cannot be zero. (at ${seqName}, ${toTimeString(time)}`
 };
 
 class KPAError extends Error {
@@ -1771,6 +1773,10 @@ class EventNodeSequence {
     for (let index = 0;index < length; index++) {
       const event = data[index];
       const [start, end] = chart.createEventFromData(event, valueType, `${pos}.events[${index}]`);
+      const evaluator = start.evaluator;
+      if (evaluator instanceof EasedEvaluator && evaluator.easing instanceof SegmentedEasing && evaluator.easing.easing instanceof TemplateEasing) {
+        chart.segmentedTemplates.set(evaluator.easing, [pos, start.time]);
+      }
       if (TC2.lt(event.startTime, lastEndTime)) {
         err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn();
       }
@@ -2011,15 +2017,33 @@ class EventNodeSequence {
       return;
     }
     let lastEnd = endNode;
+    currentNode = endNode.next;
     while (true) {
+      const evaluator = currentNode.evaluator;
+      if (this.type === 5 /* easing */ && evaluator instanceof EasedEvaluator && evaluator.easing instanceof TemplateEasing) {
+        if (TemplateEasing.checkCircularReference(this, evaluator.easing)) {
+          err.TEMPLATE_EASING_CIRCULAR_REFERENCE(this.id).warn();
+        }
+      }
+      if (evaluator instanceof EasedEvaluator && evaluator.easing instanceof SegmentedEasing) {
+        const easing = evaluator.easing;
+        const inner = easing.easing;
+        if (inner.getValue(easing.left) === inner.getValue(easing.right)) {
+          err.EASING_DELTA_CANNOT_BE_ZERO(this.id, currentNode.time).warn();
+        }
+      }
       const endNode2 = currentNode.next;
       if (endNode2.type === 1 /* TAIL */) {
         break;
       }
+      if (!TC2.gt(endNode2.time, currentNode.time)) {
+        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn();
+      }
       if (TC2.ne(lastEnd.time, currentNode.time)) {
         err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn();
       }
       currentNode = currentNode.next.next;
+      lastEnd = endNode2;
     }
   }
   hasReferenceTo(seq) {
@@ -2137,8 +2161,8 @@ class Note {
       visibleTime,
       yOffset: this.yOffset / this.speed,
       speed: this.speed,
-      tint: this.tint !== undefined ? hex2rgb(this.tint) : undefined,
-      tintHitEffects: this.tint !== undefined ? hex2rgb(this.tintHitEffects) : undefined,
+      tint: this.tint !== undefined && this.tint !== 16777215 ? hex2rgb(this.tint) : undefined,
+      tintHitEffects: this.tintHitEffects !== undefined && this.tintHitEffects !== 16777215 ? hex2rgb(this.tintHitEffects) : undefined,
       judgeArea: this.judgeSize
     };
   }
@@ -2156,8 +2180,8 @@ class Note {
       yOffset: this.yOffset / this.speed,
       absoluteYOffset: this.yOffset,
       speed: this.speed,
-      tint: this.tint !== undefined ? hex2rgb(this.tint) : undefined,
-      tintHitEffects: this.tint !== undefined ? hex2rgb(this.tintHitEffects) : undefined,
+      tint: this.tint !== undefined && this.tint !== 16777215 ? hex2rgb(this.tint) : undefined,
+      tintHitEffects: this.tintHitEffects !== undefined && this.tintHitEffects !== 16777215 ? hex2rgb(this.tintHitEffects) : undefined,
       judgeSize: this.judgeSize && this.judgeSize !== 1 ? this.judgeSize : undefined
     };
   }
@@ -3327,6 +3351,7 @@ class Chart {
   scoreAttach = null;
   nameAttach = null;
   levelAttach = null;
+  segmentedTemplates = new Map;
   constructor() {}
   getEffectiveBeats() {
     const effectiveBeats = this.timeCalculator.secondsToBeats(this.duration);
@@ -3418,6 +3443,9 @@ class Chart {
     for (let i = 0;i < len; i++) {
       const easingData = templateEasings[i];
       const sequence = chart.sequenceMap.get(easingData.content);
+      if (!sequence) {
+        continue;
+      }
       if (sequence.type !== 5 /* easing */) {
         throw err.CANNOT_IMPLEMENT_TEMEAS_WITH_NON_EASING_ENS(easingData.name);
       }
@@ -3434,6 +3462,7 @@ class Chart {
       }
     }
     chart.templateEasingLib.check();
+    chart.checkSegmentedTemplates();
     for (const lineData of data.orphanLines) {
       const line = JudgeLine.fromKPAJSON(data.version, chart, lineData.id, lineData, chart.templateEasingLib, chart.timeCalculator);
       chart.orphanLines.push(line);
@@ -3729,6 +3758,21 @@ class Chart {
     }
     return null;
   }
+  checkErrors() {
+    KPAError.flush();
+    for (const [_, seq] of this.sequenceMap) {
+      seq.checkErrors();
+    }
+  }
+  checkSegmentedTemplates() {
+    for (const [easing, [pos, time]] of this.segmentedTemplates) {
+      const inner = easing.easing;
+      if (inner.getValue(easing.left) === inner.getValue(easing.right)) {
+        err.EASING_DELTA_CANNOT_BE_ZERO(pos, time).warn();
+      }
+    }
+    this.segmentedTemplates.clear();
+  }
 }
 
 class JudgeLineGroup {

package/note.ts

@@ -168,8 +168,8 @@ export class Note {
             visibleTime: visibleTime,
             yOffset: this.yOffset / this.speed,
             speed: this.speed,
-            tint: this.tint !== undefined ? hex2rgb(this.tint) : undefined,
-            tintHitEffects: this.tint !== undefined ? hex2rgb(this.tintHitEffects) : undefined,
+            tint: this.tint !== undefined && this.tint !== 0xffffff ? hex2rgb(this.tint) : undefined,
+            tintHitEffects: this.tintHitEffects !== undefined && this.tintHitEffects !== 0xffffff ? hex2rgb(this.tintHitEffects) : undefined,
             judgeArea: this.judgeSize
         }
     }
@@ -189,8 +189,8 @@ export class Note {
             /** 但是有历史包袱，所以加字段 */
             absoluteYOffset: this.yOffset,
             speed: this.speed,
-            tint: this.tint !== undefined ? hex2rgb(this.tint) : undefined,
-            tintHitEffects: this.tint !== undefined ? hex2rgb(this.tintHitEffects) : undefined,
+            tint: this.tint !== undefined && this.tint !== 0xffffff ? hex2rgb(this.tint) : undefined,
+            tintHitEffects: this.tintHitEffects !== undefined && this.tintHitEffects !== 0xffffff ? hex2rgb(this.tintHitEffects) : undefined,
             judgeSize: this.judgeSize && this.judgeSize !== 1.0 ? this.judgeSize : undefined,
         }
     }

package/operation/easy.ts

@@ -35,20 +35,21 @@ class Operable {
 
 
 class OperableNote extends Operable {
-    private _startTime: TimeT;
-    private _endTime: TimeT;
-    private _type: NoteType;
+    // @ts-expect-error 后面会赋值
+    private _fields: {
+        [x in NotePropName]: Note[x]
+    } = {};
     constructor(public target: Note, buffer: Operation[]) {
         super(buffer);
         if (target.parentNode === null) {
             throw new Error("Note has no parent node")
         }
-        this._startTime = target.startTime;
-        this._endTime = target.endTime;
-        this._type = target.type;
+        this._fields.startTime = target.startTime;
+        this._fields.endTime = target.endTime;
+        this._fields.type = target.type;
     }
     get startTime() {
-        return this._startTime;
+        return this._fields.startTime;
     }
     set startTime(userTime: Time) {
         const timeT = userTimeToTuple(userTime);
@@ -60,28 +61,28 @@ class OperableNote extends Operable {
         if (beats > nnList.effectiveBeats) {
             throw new Error("")
         }
-        this._startTime = timeT;
+        this._fields.startTime = timeT;
         const node = nnList.getNodeOf(timeT);
         this.buffer.push(NoteTimeChangeOperation.lazy(this.target, node));
     }
-    get endTime() { return this._endTime; }
+    get endTime() { return this._fields.endTime; }
     set endTime(userTime: Time) {
-        if (this._type !== NoteType.hold) {
+        if (this._fields.type !== NoteType.hold) {
             throw new Error("Note is not a hold note");
         }
         const timeT = userTimeToTuple(userTime);
-        if (!TC.gt(timeT, this._startTime)) {
+        if (!TC.gt(timeT, this._fields.startTime)) {
             throw new Error("");
         }
-        this._endTime = timeT;
+        this._fields.endTime = timeT;
         this.buffer.push(HoldEndTimeChangeOperation.lazy(this.target, timeT));
     }
-    get type() { return this._type; }
+    get type() { return this._fields.type; }
     set type(type: NoteType) {
-        if (this._type === type) {
+        if (this._fields.type === type) {
             return;
         }
-        this._type = type;
+        this._fields.type = type;
         this.buffer.push(NoteTypeChangeOperation.lazy(this.target, type));
     }
 }
@@ -109,8 +110,12 @@ interface OperableNote {
 
 for (const propName of ["above", "alpha", "positionX", "judgeSize", "isFake", "size", "tint", "tintHitEffects", "visibleBeats"] satisfies NotePropName[]) {
     Object.defineProperty(OperableNote.prototype, propName, {
-        get() { return this.target[propName]},
+        get() { return this._fields[propName] ?? this.target[propName]},
         set(value) {
+            if (this._fields[propName] === value) {
+                return;
+            }
+            this._fields[propName] = value;
             this.buffer.push(NotePropChangeOperation.lazy(this.target, propName, value));
         }
     });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kipphi",
     "description": "Parse your Phigros Chart(.rpe.json or .kpa.json) into an editor-friendly format.",
-    "version": "2.1.3-beta.1",
+    "version": "2.1.3-beta.2",
     "author": "Team Zincs (https://github.com/TeamZincs)",
     "license": "MIT",
     "repository": {