kipphi 2.0.0 → 2.0.1

package/chart.ts

@@ -2,13 +2,12 @@
 import { VERSION } from "./version";
 
 import {
-    TimeCalculator,
-    BPMSequence
-} from "./time";
+    TimeCalculator} from "./bpm";
 
 import {
     BezierEasing,
     Easing,
+    NormalEasing,
     rpeEasingArray,
     SegmentedEasing,
     TemplateEasingLib,
@@ -16,13 +15,10 @@ import {
 
 import {
     EventNodeSequence,
-    type AnyEN,
-    type ENOrHead,
-    type ENOrTail,
-    EventNodeLike,
     EventStartNode,
     EventEndNode,
     EventNode,
+    SpeedENS,
 } from "./event";
 
 import {
@@ -34,19 +30,13 @@ import {
 } from "./judgeline";
 
 import {
-    Note,
-    NNList,
     NNNList,
-    type NNNOrHead,
     type NNNOrTail,
     NNNode
 } from "./note";
 
 import {
-    type RGB,
     type TimeT,
-    type EventType,
-    type EventNodeSequenceDataKPA,
     type ValueTypeOfEventType,
     type BPMSegmentData,
     type ChartDataRPE,
@@ -57,6 +47,7 @@ import {
     type EvaluatorDataKPA2,
     EvaluatorType,
     type EasedEvaluatorDataOfType,
+    EventType,
     EventValueType,
     type EventValueTypeOfType,
     type EventValueESType,
@@ -64,11 +55,11 @@ import {
     type TextEasedEvaluatorKPA2,
     type EventNodeSequenceDataKPA2,
     type ChartDataKPA2,
-    type EventDataKPA2
+    type EventDataKPA2,
+    InterpreteAs
 } from "./chartTypes";
-import { ProgramUpdateLevel } from "typescript";
 import { ColorEasedEvaluator, Evaluator, ExpressionEvaluator, NumericEasedEvaluator, TextEasedEvaluator, type EasedEvaluatorOfType } from "./evaluator";
-
+import { err, ERROR_IDS, KPAError }  from "./env";
 
 /// #declaration:global
 
@@ -76,33 +67,13 @@ import { ColorEasedEvaluator, Evaluator, ExpressionEvaluator, NumericEasedEvalua
 export type BasicEventName = "moveX" | "moveY" | "rotate" | "alpha" | "speed";
 
 
-type Plain<T> = Record<string, T>;
-
 
-/**
- * 相当于 Python 推导式
- * @param obj
- * @param expr 
- * @param guard 
- * @returns 
- */
-function dictForIn<T, RT>(obj: Plain<T>, expr: (v: T) => RT, guard?: (v: T) => boolean): Plain<RT> {
-    let ret: Plain<RT> = {}
-    for (let key in obj) {
-        const each = obj[key]
-        if (!guard || guard && guard(each)) {
-            ret[key] = expr(each)
-        }
-    }
-    return ret;
-}
 
 
 export type UIName = "combo"  | "combonumber" | "score" | "pause" | "bar" | "name" | "level"
 
 export class Chart {
     judgeLines: JudgeLine[] = [];
-    bpmList: BPMSegmentData[] = [];
     timeCalculator = new TimeCalculator();
     orphanLines: JudgeLine[] = [];
     // comboMapping: ComboMapping;
@@ -113,8 +84,8 @@ export class Chart {
     illustrator: string = "unknown";
     offset: number = 0;
     
-    templateEasingLib = new TemplateEasingLib;
-    sequenceMap = new Map<string, EventNodeSequence<any>>();
+    templateEasingLib = new TemplateEasingLib(EventNodeSequence.newSeq<EventType.easing>, ExpressionEvaluator);
+    sequenceMap = new Map<string, EventNodeSequence<EventValueESType>>();
 
     effectiveBeats: number;
     nnnList: NNNList;
@@ -149,7 +120,6 @@ export class Chart {
     static fromRPEJSON(data: ChartDataRPE, duration: number) {
         const chart = new Chart();
         chart.judgeLineGroups = data.judgeLineGroup.map(group => new JudgeLineGroup(group));
-        chart.bpmList = data.BPMList;
         chart.name = data.META.name;
         chart.level = data.META.level;
         chart.offset = data.META.offset;
@@ -160,18 +130,12 @@ export class Chart {
         chart.chartingTime = data.kpaChartTime
         chart.rpeChartingTime = data.chartTime ? Math.round(data.chartTime / 60) : 0;
         chart.chartingTime = 0;
-        chart.updateCalculator()
+        chart.initCalculator(data.BPMList)
         console.log(chart, chart.getEffectiveBeats())
         chart.nnnList = new NNNList(chart.getEffectiveBeats())
         
-        /*
-        if (data.envEasings) {
-            chart.templateEasingLib.add(...data.envEasings)
-
-        }
-        */
         
-        // let line = data.judgeLineList[0];
+        
         const judgeLineDataList: JudgeLineDataRPE[] = <JudgeLineDataRPE[]>data.judgeLineList;
         const judgeLineList: JudgeLine[] = judgeLineDataList.map(
             (lineData, id) =>
@@ -196,7 +160,6 @@ export class Chart {
     static fromKPAJSON(data: ChartDataKPA | ChartDataKPA2) {
         const chart = new Chart();
         
-        chart.bpmList = data.bpmList;
         chart.duration = data.duration;
         chart.name = data.info.name;
         chart.level = data.info.level;
@@ -207,21 +170,35 @@ export class Chart {
         chart.judgeLineGroups = data.judgeLineGroups.map(group => new JudgeLineGroup(group));
         chart.chartingTime = data.chartTime ?? 0;
         chart.rpeChartingTime = data.rpeChartTime ?? 0;
-        chart.updateCalculator()
-        chart.nnnList = new NNNList(chart.getEffectiveBeats())
-        const envEasings = data.envEasings;
-        const len = envEasings.length
+
+
+        chart.initCalculator(data.bpmList);
+        chart.nnnList = new NNNList(chart.getEffectiveBeats());
+        /**
+         * 影响事件的格式、是否存在“求值器”这一中间层以及判定线的属性名
+         */
+        const isKPA2 = data.version >= 200;
+        const templateEasings = isKPA2 ? (data as ChartDataKPA2).templateEasings : (data as ChartDataKPA).envEasings;
+        const len = templateEasings.length
         for (let i = 0; i < len; i++) {
-            const easingData = envEasings[i];
+            const easingData = templateEasings[i];
             chart.templateEasingLib.require(easingData.name);
         }
 
-        if (data.version >= 200) {
+        if (isKPA2) {
+            chart.templateEasingLib.readWrapperEasings((data as ChartDataKPA2).wrapperEasings);
             const sequences = (data as ChartDataKPA2).eventNodeSequences;
             const length = sequences.length;
             for (let i = 0; i < length; i++) {
                 const seqData = sequences[i];
-                const sequence = EventNodeSequence.fromRPEJSON<typeof seqData.type, ValueTypeOfEventType<typeof seqData.type>>(seqData.type, seqData.events, chart, seqData.endValue);
+                type VT = ValueTypeOfEventType<typeof seqData.type>
+                const sequence = EventNodeSequence.fromKPA2JSON<typeof seqData.type, VT>(
+                    seqData.type,
+                    seqData.events as EventDataKPA2<VT>[],
+                    chart,
+                    seqData.id,
+                    seqData.endValue as VT
+                );
                 sequence.id = seqData.id;
                 chart.sequenceMap.set(sequence.id, sequence);
             }
@@ -231,20 +208,31 @@ export class Chart {
             const length = sequences.length
             for (let i = 0; i < length; i++) {
                 const seqData = sequences[i];
-                const sequence = EventNodeSequence.fromRPEJSON<typeof seqData.type, ValueTypeOfEventType<typeof seqData.type>>(seqData.type, seqData.events, chart, seqData.endValue);
+                const sequence = EventNodeSequence.fromRPEJSON<typeof seqData.type, ValueTypeOfEventType<typeof seqData.type>>(
+                    seqData.type,
+                    seqData.events,
+                    chart,
+                    seqData.id,
+                    seqData.endValue);
                 sequence.id = seqData.id;
                 chart.sequenceMap.set(sequence.id, sequence);
             }
         }
 
         for (let i = 0; i < len; i++) {
-            const easingData = envEasings[i];
-            chart.templateEasingLib.implement(easingData.name, chart.sequenceMap.get(easingData.content));
+            const easingData = templateEasings[i];
+            const sequence = chart.sequenceMap.get(easingData.content);
+            if (sequence.type !== EventType.easing) {
+                throw err.CANNOT_IMPLEMENT_TEMEAS_WITH_NON_EASING_ENS(easingData.name);
+            }
+            if (typeof sequence.head.next.value !== "number") {
+                throw err.CANNOT_IMPLEMENT_TEMEAS_WITH_NON_NUMERIC_ENS(easingData.name);
+            }
+            chart.templateEasingLib.implement(easingData.name, sequence as EventNodeSequence<number>);
         }
         chart.templateEasingLib.check()
-        const isOld = !data.version || data.version < 150
-        for (let lineData of data.orphanLines) {
-            const line: JudgeLine = JudgeLine.fromKPAJSON(isOld, chart, lineData.id, lineData, chart.templateEasingLib, chart.timeCalculator)
+        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)
         }
         chart.judgeLines.sort((a, b) => a.id - b.id);
@@ -262,10 +250,10 @@ export class Chart {
         }
         return chart;
     }
-    updateCalculator() {
-        this.timeCalculator.bpmList = this.bpmList;
+    initCalculator(bpmList: BPMSegmentData[]) {
+        this.timeCalculator.bpmList = bpmList;
         this.timeCalculator.duration = this.duration;
-        this.timeCalculator.update()
+        this.timeCalculator.initSequence()
     }
     updateEffectiveBeats(duration: number) {
         const EB = this.timeCalculator.secondsToBeats(duration);
@@ -277,19 +265,20 @@ export class Chart {
     dumpKPA(): Required<ChartDataKPA2> {
         const eventNodeSequenceCollector = new Set<EventNodeSequence>();
         const orphanLines = [];
-        for (let line of this.orphanLines) {
+        for (const line of this.orphanLines) {
             orphanLines.push(line.dumpKPA(eventNodeSequenceCollector, this.judgeLineGroups));
         }
         const envEasings = this.templateEasingLib.dump(eventNodeSequenceCollector);
-        const eventNodeSequenceData: EventNodeSequenceDataKPA2<any>[] = [];
-        for (let sequence of eventNodeSequenceCollector) {
+        const eventNodeSequenceData: EventNodeSequenceDataKPA2<EventValueESType>[] = [];
+        for (const sequence of eventNodeSequenceCollector) {
             eventNodeSequenceData.push(sequence.dump());
         }
         return {
             version: VERSION,
             duration: this.duration,
             bpmList: this.timeCalculator.dump(),
-            envEasings: envEasings,
+            templateEasings: envEasings,
+            wrapperEasings: this.templateEasingLib.dumpWrapperEasings(),
             eventNodeSequences: eventNodeSequenceData,
             info: {
                 level: this.level,
@@ -315,18 +304,30 @@ export class Chart {
         };
     }
     createNNNode(time: TimeT) {
-     return new NNNode(time)
+        return new NNNode(time)
     }
+    /**
+     * 
+     * @param type 
+     * @param name 
+     * @returns 
+     * @throws {KPAError<ERROR_IDS.SEQUENCE_NAME_OCCUPIED>}
+     */
     createEventNodeSequence<T extends EventType>(type: T, name: string) {
         if (this.sequenceMap.has(name)) {
-            throw new Error(`The name ${name} is occupied.`)
+            throw err.SEQUENCE_NAME_OCCUPIED(name);
         }
         const seq = EventNodeSequence.newSeq(type, this.getEffectiveBeats());
         seq.id = name;
         this.sequenceMap.set(name, seq);
         return seq;
     }
-    countMaxCombo() {
+    /**
+     * 对谱面物量进行重新计数。
+     * 
+     * 不会返回值，谱面物量存储在 `this.maxCombo` 中。
+     */
+    countMaxCombo(): void {
         let combo = 0;
         const nnnlist = this.nnnList;
         for (let node: NNNOrTail = nnnlist.head.next; node.type !== NodeType.TAIL; node = node.next) {
@@ -345,14 +346,25 @@ export class Chart {
         }
         this.maxCombo = combo;
     }
+    /**
+     * 将UI绑定到某判定线
+     * @param ui UI名称，与RPEJSON中的代号相同
+     * @param judgeLine 所要绑定的目标判定线
+     * @throws {KPAError<ERROR_IDS.UI_OCCUPIED>}
+     */
     attachUIToLine(ui: UIName, judgeLine: JudgeLine) {
         const key = `${ui}Attach` satisfies keyof Chart;
         if (this[key]) {
-            throw new Error(`UI ${ui} is occupied`);
+            throw err.UI_OCCUPIED(ui);
         }
         this[key] = judgeLine;
         judgeLine.hasAttachUI = true;
     }
+    /**
+     * 移除谱面中某个UI的绑定，使UI进入未绑定状态
+     * @param ui UI名称，与RPEJSON中的相同
+     * @returns 
+     */
     detachUI(ui: UIName) {
         const key = `${ui}Attach` satisfies keyof Chart;
         const judgeLine = this[key];
@@ -381,6 +393,12 @@ export class Chart {
         }
         return arr;
     }
+    /**
+     * 扫描所有用到的判定线贴图（纹理）并返回
+     * 
+     * 给谱面播放器的接口，谱面播放器需要在初加载时提供贴图
+     * @returns 
+     */
     scanAllTextures() {
         const textures: Set<string> = new Set;
         for (const line of this.judgeLines) {
@@ -388,6 +406,13 @@ export class Chart {
         }
         return textures
     }
+    /**
+     * 使用KPA2数据创建一个缓动对象。
+     * 
+     * 只有对贝塞尔缓动和截段缓动才会创建新对象，其他几种缓动从缓动库等中的对象池获取
+     * @param data 
+     * @returns 
+     */
     createEasingFromData(data: EasingDataKPA2) {
         switch (data.type) {
             case EasingType.bezier:
@@ -398,16 +423,35 @@ export class Chart {
                 return new SegmentedEasing(this.createEasingFromData(data), data.left, data.right);
             case EasingType.template:
                 return this.templateEasingLib.get(data.identifier);
+            case EasingType.wrapper:
+                return this.templateEasingLib.getWrapper(data.identifier);
         }
     }
+    /**
+     * 使用KPA2数据创建一个求值器对象。
+     * 
+     * 求值器只有缓动型和表达式型两类。
+     * @param data 
+     * @param type 
+     * @returns 
+     */
     createEvaluator<T extends EventValueESType>(data: EvaluatorDataKPA2<T>, type: EventValueTypeOfType<T>): Evaluator<T> {
         switch (data.type) {
             case EvaluatorType.eased:
-                return this.createEasedEvaluator(data, type);
+                // 我管你这的那的 —— 小奶椰
+                return this.createEasedEvaluator(data, type) as unknown as Evaluator<T>;
             case EvaluatorType.expressionbased:
                 return this.createExpressionEvaluator(data) as ExpressionEvaluator<T>;
         }
     }
+    /**
+     * 使用KPA2数据创建一个缓动求值器。
+     * 
+     * 对于普通缓动，这些求值器是从对应类构造器的静态对象池属性中获取的。
+     * @param data 
+     * @param type 
+     * @returns 
+     */
     createEasedEvaluator<T extends EventValueESType>(data: EasedEvaluatorDataOfType<T>, type: EventValueTypeOfType<T>): EasedEvaluatorOfType<T> {
         switch (type) {
             case EventValueType.numeric:
@@ -424,6 +468,30 @@ export class Chart {
                     : new TextEasedEvaluator(this.createEasingFromData(data.easing), (data as TextEasedEvaluatorKPA2).interpretedAs) as EasedEvaluatorOfType<T>
         }
     }
+    /**
+     * 用一个缓动和事件类型获取一个缓动求值器
+     * @param easing 
+     * @param type 
+     * @param interpreteAs 
+     */
+    getEasedEvaluator<T extends string>(easing: Easing, type: EventValueType.text, interpreteAs: InterpreteAs): TextEasedEvaluator;
+    getEasedEvaluator<T extends EventValueESType>(easing: Easing, type: EventValueTypeOfType<T>, interpreteAs?: InterpreteAs): EasedEvaluatorOfType<T> {
+        const easingIsNormal = easing instanceof NormalEasing;
+        switch (type) {
+            case EventValueType.numeric:
+                return easingIsNormal
+                    ? NumericEasedEvaluator.evaluatorsOfNormalEasing[easing.rpeId] as EasedEvaluatorOfType<T>
+                    : new NumericEasedEvaluator(easing) as EasedEvaluatorOfType<T>;
+            case EventValueType.color:
+                return easingIsNormal
+                    ? ColorEasedEvaluator.evaluatorsOfNormalEasing[easing.rpeId] as EasedEvaluatorOfType<T>
+                    : new ColorEasedEvaluator(easing) as EasedEvaluatorOfType<T>;
+            case EventValueType.text:
+                return easingIsNormal
+                    ? TextEasedEvaluator.evaluatorsOfNoEzAndItpAs[easing.rpeId][interpreteAs] as EasedEvaluatorOfType<T>
+                    : new TextEasedEvaluator(easing, interpreteAs) as EasedEvaluatorOfType<T>
+        }
+    }
     createExpressionEvaluator<T extends EventValueESType>(data: ExpressionEvaluatorDataKPA2) {
         return new ExpressionEvaluator<T>(data.jsExpr);
     }
@@ -440,38 +508,62 @@ export class Chart {
         EventNode.connect(start, end);
         return [start, end];
     }
+    /* 暂时不用此方法，因为谱面播放器里面还是用反解法弄的
+    updateNNListsFromENS(speedENS: SpeedENS) {
+        
+    }
+    */
 }
 
 export class JudgeLineGroup {
-    judgeLines: JudgeLine[];
+    /**
+     * 该只读标记只是为了防止外部修改，内部可以修改
+     */
+    judgeLines: readonly JudgeLine[];
     constructor(public name: string) {
         this.judgeLines = []
     }
+    /**
+     * 向判定线组添加一条判定线，并且保证其内部的判定线ID是升序排列的。
+     * @param judgeLine 要添加的判定线
+     * @returns 
+     */
     add(judgeLine: JudgeLine) {
         // 加入之前已经按照ID升序排列
         // 加入时将新判定线插入到正确位置
+        const judgeLines = this.judgeLines as JudgeLine[];
         if (judgeLine.group) {
             judgeLine.group.remove(judgeLine);
         }
         judgeLine.group = this;
         
         // 找到正确的位置插入，保持按ID升序排列
-        for (let i = 0; i < this.judgeLines.length; i++) {
-            if (this.judgeLines[i].id > judgeLine.id) {
-                this.judgeLines.splice(i, 0, judgeLine);
+        for (let i = 0; i < judgeLines.length; i++) {
+            if (judgeLines[i].id > judgeLine.id) {
+                judgeLines.splice(i, 0, judgeLine);
                 return;
             }
         }
         // 如果没有找到比它大的ID，则插入到末尾
-        this.judgeLines.push(judgeLine);
+        judgeLines.push(judgeLine);
         
     }
+    /**
+     * 从判定线组移除一条判定线
+     * @param judgeLine 
+     */
     remove(judgeLine: JudgeLine) {
-        const index = this.judgeLines.indexOf(judgeLine);
+        // 只读仅对外部作限制
+        const judgeLines = this.judgeLines as JudgeLine[];
+        const index = judgeLines.indexOf(judgeLine);
         if (index !== -1) {
-            this.judgeLines.splice(index, 1);
+            judgeLines.splice(index, 1);
         }
     }
+    /**
+     * 
+     * @returns 该判定线组是否为默认判定线组，默认的判断标准是：名称为 "Default"（大小写不敏感）
+     */
     isDefault() {
         return this.name.toLowerCase() === "default";
     }

package/chartTypes.ts

@@ -177,7 +177,8 @@ export enum EasingType {
     normal,
     template,
     bezier,
-    segmented
+    segmented,
+    wrapper
 }
 
 export interface NormalEasingData {
@@ -190,6 +191,11 @@ export interface TemplateEasingData {
     type: EasingType.template;
 }
 
+export interface WrapperEasingData {
+    type: EasingType.wrapper;
+    identifier: string;
+}
+
 export interface BezierEasingData {
     type: EasingType.bezier;
     bezier: [number, number, number, number];
@@ -202,7 +208,7 @@ export interface SegmentedEasingData {
     inner: EasingDataKPA2;
 }
 
-export type EasingDataKPA2 = NormalEasingData | TemplateEasingData | BezierEasingData | SegmentedEasingData;
+export type EasingDataKPA2 = NormalEasingData | TemplateEasingData | BezierEasingData | SegmentedEasingData | WrapperEasingData;
 
 export enum EvaluatorType {
     eased,
@@ -219,7 +225,6 @@ interface EasedEvaluatorDataKPA2<T> {
 export type NumericEasedEvaluatorKPA2 = EasedEvaluatorDataKPA2<number>;
 export type ColorEasedEvaluatorKPA2 = EasedEvaluatorDataKPA2<RGB>;
 export interface TextEasedEvaluatorKPA2 extends EasedEvaluatorDataKPA2<string> {
-    font: string;
     interpretedAs: InterpreteAs;
 }
 
@@ -309,12 +314,12 @@ export interface JudgeLineDataRPE {
     eventLayers: (EventLayerDataRPE | null)[];
     /** 扩展事件 */
     extended?: {
-        colorEvents: EventDataRPELike<RGB>[];
-        inclineEvents: EventDataRPELike[];
-        scaleXEvents: EventDataRPELike[];
-        scaleYEvents: EventDataRPELike[];
-        textEvents: EventDataRPELike<string>[];
-        gifEvents: EventDataRPELike<number>[];
+        colorEvents?: EventDataRPELike<RGB>[];
+        inclineEvents?: EventDataRPELike[];
+        scaleXEvents?: EventDataRPELike[];
+        scaleYEvents?: EventDataRPELike[];
+        textEvents?: EventDataRPELike<string>[];
+        gifEvents?: EventDataRPELike<number>[];
     };
     /** 父线线号，没有父线则为-1 */
     father: number;
@@ -355,19 +360,17 @@ export interface JudgeLineDataRPE {
     zIndex?: number;
 }
 
-export interface JudgeLineDataRPEExtended extends JudgeLineDataRPE {
-    _id?: number;
-    children: number[]
-}
 
-export interface CustomEasingData {
+
+export interface TemplateEasingBodyData {
     content: string;
     name: string;
-    usedBy: string[];
-    dependencies: string[];
+    // usedBy: string[];
+    // dependencies: string[];
 }
 
 
+
 // 使用对应标识符来标记事件节点序列
 
 export interface EventLayerDataKPA {
@@ -378,6 +381,14 @@ export interface EventLayerDataKPA {
     speed: string;
 }
 
+export interface EventLayerDataKPA2 {
+    moveX: string;
+    moveY: string;
+    rotate: string;
+    alpha: string;
+    // 移除了速度事件可以有多层的性质
+}
+
 
 export interface NoteNodeDataKPA {
     notes: NoteDataKPA[];
@@ -412,6 +423,28 @@ export interface JudgeLineDataKPA {
     zOrder: number;
 }
 
+export interface JudgeLineDataKPA2 {
+    cover: boolean;
+    id: number;
+    group: number;
+    nnLists: {[k: string]: NNListDataKPA};
+    hnLists: {[k: string]: NNListDataKPA};
+    name: string;
+    texture: string;
+    eventLayers: EventLayerDataKPA2[];
+    speedEventNodeSeq: string;
+    children: JudgeLineDataKPA2[];
+    rotatesWithFather: boolean;
+
+    anchor: [number, number];
+    extended?: {
+        scaleXEvents: string;
+        scaleYEvents: string;
+        textEvents?: string;
+        colorEvents?: string;
+    }
+    zOrder: number;
+}
 
 
 export interface EventNodeSequenceDataKPA<VT> {
@@ -428,6 +461,13 @@ export interface EventNodeSequenceDataKPA2<VT> {
     endValue: VT;
 }
 
+export interface WrapperEasingBodyData {
+    jsExpr: string;
+    start: number;
+    end: number;
+    id: string;
+}
+
 export interface ChartDataKPA {
     version: number;
     offset: number;
@@ -448,7 +488,7 @@ export interface ChartDataKPA {
         name: number;
         level: number;
     }
-    envEasings: CustomEasingData[]; // New!
+    envEasings: TemplateEasingBodyData[]; // New!
     eventNodeSequences: EventNodeSequenceDataKPA<any>[];
     orphanLines: JudgeLineDataKPA[];
     bpmList: BPMSegmentData[];
@@ -477,9 +517,10 @@ export interface ChartDataKPA2 {
         name: number;
         level: number;
     }
-    envEasings: CustomEasingData[];
-    eventNodeSequences: EventNodeSequenceDataKPA2<any>[];
-    orphanLines: JudgeLineDataKPA[];
+    templateEasings: TemplateEasingBodyData[];
+    wrapperEasings: WrapperEasingBodyData[]
+    eventNodeSequences: EventNodeSequenceDataKPA2<unknown>[];
+    orphanLines: JudgeLineDataKPA2[];
     bpmList: BPMSegmentData[];
     judgeLineGroups: string[];
     chartTime?: number;
@@ -509,4 +550,5 @@ export enum NoteType {
 
 export type ValueTypeOfEventType<T extends EventType> = [number, number, number, number, number, number, number, number, number, string, RGB][T]
 
+export type ExtendedEventTypeName = "scaleX" | "scaleY" | "text" | "color"
 /// #enddeclaration