intelligent-system-design-language 0.3.21 → 0.3.23

package/out/cli/components/derived-data-generator.js

@@ -13,20 +13,20 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
     function generateExtendedDocumentClass(type, entry) {
         function translateMethodOrValueOrStored(property, param) {
             if (param == undefined) {
-                return expandToNode `
-                    return system.${property.name.toLowerCase()} ?? 0
+                return expandToNode `
+                    return system.${property.name.toLowerCase()} ?? 0
                 `;
             }
             if (isMethodBlock(param.value)) {
                 if (isNumberParamValue(param)) {
                     toBeReapplied.add("system." + property.name.toLowerCase());
                 }
-                return expandToNode `
-                    ${translateExpression(entry, id, param.value, true, property)}
+                return expandToNode `
+                    ${translateExpression(entry, id, param.value, true, property)}
                 `;
             }
-            return expandToNode `
-                return ${param.value}
+            return expandToNode `
+                return ${param.value}
             `;
         }
         const generatedFilePath = path.join(generatedFileDir, `${type.toLowerCase()}.mjs`);
@@ -42,21 +42,21 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                     if (stringValue.value == "")
                         return;
                     if (typeof stringValue.value == "string") {
-                        return expandToNode `
-                            // ${property.name} String Derived Data
-                            this.system.${property.name.toLowerCase()} = "${stringValue.value}";
+                        return expandToNode `
+                            // ${property.name} String Derived Data
+                            this.system.${property.name.toLowerCase()} = "${stringValue.value}";
                         `.appendNewLineIfNotEmpty();
                     }
                     else {
-                        return expandToNode `
-                        // ${property.name} String Derived Data
-                        const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
-                            const context = {
-                                object: this
-                            };
-                            ${translateExpression(entry, id, stringValue.value, true, property)}
-                        };
-                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
+                        return expandToNode `
+                        // ${property.name} String Derived Data
+                        const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
+                            const context = {
+                                object: this
+                            };
+                            ${translateExpression(entry, id, stringValue.value, true, property)}
+                        };
+                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
                         `.appendNewLineIfNotEmpty();
                     }
                 }
@@ -66,102 +66,102 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 const minParam = property.params.find(p => isNumberParamMin(p));
                 const maxParam = property.params.find(p => isNumberParamMax(p));
                 if (valueParam) {
-                    return expandToNode `
-                    // ${property.name} Number Calculated Data
-
-
-                    ${minParam != undefined ? expandToNode `
-                        const ${property.name.toLowerCase()}MinFunc = (system) => {
-                            const context = {
-                                object: this
-                            };
-                            ${translateMethodOrValueOrStored(property, minParam)}
-                        };
-                        let ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}MinFunc(this.system);
-                        if (isNaN(${property.name.toLowerCase()}Min) || ${property.name.toLowerCase()}Min === undefined || ${property.name.toLowerCase()}Min === null) {
-                            ${property.name.toLowerCase()}Min = 0;
-                        }
-                        `.appendNewLine() : ""}
-
-                    ${maxParam != undefined ? expandToNode `
-                        const ${property.name.toLowerCase()}MaxFunc = (system) => {
-                            const context = {
-                                object: this
-                            };
-                            ${translateMethodOrValueOrStored(property, maxParam)}
-                        };
-                        let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}MaxFunc(this.system);
-                        if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
-                            ${property.name.toLowerCase()}Max = 0;
-                        }
-                        `.appendNewLine() : ""}
-
-                    // ${property.name} Number Derived Data
-                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
-                        const context = {
-                                object: this
-                        };
-                        ${translateMethodOrValueOrStored(property, valueParam)}
-                    };
-                    Object.defineProperty(this.system, "${property.name.toLowerCase()}", {
-                        get: () => {
-                            let current = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
-                            // Protect against NaN from invalid operations (e.g., "A" + 2)
-                            if (isNaN(current) || current === undefined || current === null) {
-                                current = 0;
-                            }
-                            ${minParam != undefined ? expandToNode `
-                                if ( current < ${property.name.toLowerCase()}Min ) {
-                                    current = ${property.name.toLowerCase()}Min;
-                                }
-                            `.appendNewLine() : ""}
-                            ${maxParam != undefined ? expandToNode `
-                                if ( current > ${property.name.toLowerCase()}Max ) {
-                                    current = ${property.name.toLowerCase()}Max;
-                                }
-                            `.appendNewLine() : ""}
-                            return current;
-                        },
-                        configurable: true
-                    });
-
+                    return expandToNode `
+                    // ${property.name} Number Calculated Data
+
+
+                    ${minParam != undefined ? expandToNode `
+                        const ${property.name.toLowerCase()}MinFunc = (system) => {
+                            const context = {
+                                object: this
+                            };
+                            ${translateMethodOrValueOrStored(property, minParam)}
+                        };
+                        let ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}MinFunc(this.system);
+                        if (isNaN(${property.name.toLowerCase()}Min) || ${property.name.toLowerCase()}Min === undefined || ${property.name.toLowerCase()}Min === null) {
+                            ${property.name.toLowerCase()}Min = 0;
+                        }
+                        `.appendNewLine() : ""}
+
+                    ${maxParam != undefined ? expandToNode `
+                        const ${property.name.toLowerCase()}MaxFunc = (system) => {
+                            const context = {
+                                object: this
+                            };
+                            ${translateMethodOrValueOrStored(property, maxParam)}
+                        };
+                        let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}MaxFunc(this.system);
+                        if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
+                            ${property.name.toLowerCase()}Max = 0;
+                        }
+                        `.appendNewLine() : ""}
+
+                    // ${property.name} Number Derived Data
+                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
+                        const context = {
+                                object: this
+                        };
+                        ${translateMethodOrValueOrStored(property, valueParam)}
+                    };
+                    Object.defineProperty(this.system, "${property.name.toLowerCase()}", {
+                        get: () => {
+                            let current = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
+                            // Protect against NaN from invalid operations (e.g., "A" + 2)
+                            if (isNaN(current) || current === undefined || current === null) {
+                                current = 0;
+                            }
+                            ${minParam != undefined ? expandToNode `
+                                if ( current < ${property.name.toLowerCase()}Min ) {
+                                    current = ${property.name.toLowerCase()}Min;
+                                }
+                            `.appendNewLine() : ""}
+                            ${maxParam != undefined ? expandToNode `
+                                if ( current > ${property.name.toLowerCase()}Max ) {
+                                    current = ${property.name.toLowerCase()}Max;
+                                }
+                            `.appendNewLine() : ""}
+                            return current;
+                        },
+                        configurable: true
+                    });
+
                     `.appendNewLineIfNotEmpty();
                 }
-                return expandToNode `
-                    // ${property.name} Number Derived Data
-                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
-                        const context = {
-                            object: this
-                        };
-                        ${translateMethodOrValueOrStored(property, valueParam)}
-                    };
-                    this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
-
-                    ${minParam != undefined ? expandToNode `
-                    const ${property.name.toLowerCase()}MinFunc = (system) => {
-                        const context = {
-                            object: this
-                        };
-                        ${translateMethodOrValueOrStored(property, minParam)}
-                    };
-                    const ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}MinFunc(this.system);
-                    if ( this.system.${property.name.toLowerCase()} < ${property.name.toLowerCase()}Min ) {
-                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}Min;
-                    }
-                    `.appendNewLine() : ""}
-
-                    ${maxParam != undefined ? expandToNode `
-                    const ${property.name.toLowerCase()}MaxFunc = (system) => {
-                        const context = {
-                            object: this
-                        };
-                        ${translateMethodOrValueOrStored(property, maxParam)}
-                    };
-                    const ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}MaxFunc(this.system);
-                    if ( this.system.${property.name.toLowerCase()} > ${property.name.toLowerCase()}Max ) {
-                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}Max;
-                    }
-                    `.appendNewLine() : ""}
+                return expandToNode `
+                    // ${property.name} Number Derived Data
+                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
+                        const context = {
+                            object: this
+                        };
+                        ${translateMethodOrValueOrStored(property, valueParam)}
+                    };
+                    this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}CurrentValueFunc(this.system);
+
+                    ${minParam != undefined ? expandToNode `
+                    const ${property.name.toLowerCase()}MinFunc = (system) => {
+                        const context = {
+                            object: this
+                        };
+                        ${translateMethodOrValueOrStored(property, minParam)}
+                    };
+                    const ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}MinFunc(this.system);
+                    if ( this.system.${property.name.toLowerCase()} < ${property.name.toLowerCase()}Min ) {
+                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}Min;
+                    }
+                    `.appendNewLine() : ""}
+
+                    ${maxParam != undefined ? expandToNode `
+                    const ${property.name.toLowerCase()}MaxFunc = (system) => {
+                        const context = {
+                            object: this
+                        };
+                        ${translateMethodOrValueOrStored(property, maxParam)}
+                    };
+                    const ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}MaxFunc(this.system);
+                    if ( this.system.${property.name.toLowerCase()} > ${property.name.toLowerCase()}Max ) {
+                        this.system.${property.name.toLowerCase()} = ${property.name.toLowerCase()}Max;
+                    }
+                    `.appendNewLine() : ""}
                 `.appendNewLineIfNotEmpty();
             }
             if (isMoneyField(property)) {
@@ -173,65 +173,65 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                         console.warn(`Money field ${property.name} has both denominations and value parameter. Value parameter will be ignored for multi-denomination money.`);
                         return;
                     }
-                    return expandToNode `
-                    // ${property.name} Money Calculated Data
-                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
-                        const context = {
-                            object: this
-                        };
-                        ${translateMethodOrValueOrStored(property, valueParam)}
-                    };
-                    Object.defineProperty(this.system, "${property.name.toLowerCase()}", {
-                        get: () => {
-                            return ${property.name.toLowerCase()}CurrentValueFunc(this.system);
-                        },
-                        configurable: true
-                    });
-
+                    return expandToNode `
+                    // ${property.name} Money Calculated Data
+                    const ${property.name.toLowerCase()}CurrentValueFunc = (system) => {
+                        const context = {
+                            object: this
+                        };
+                        ${translateMethodOrValueOrStored(property, valueParam)}
+                    };
+                    Object.defineProperty(this.system, "${property.name.toLowerCase()}", {
+                        get: () => {
+                            return ${property.name.toLowerCase()}CurrentValueFunc(this.system);
+                        },
+                        configurable: true
+                    });
+
                     `.appendNewLineIfNotEmpty();
                 }
             }
             if (isAttributeExp(property)) {
                 console.log("Processing Derived Attribute: " + property.name);
                 const modParam = property.params.find(p => isAttributeParamMod(p));
-                return expandToNode `
-
-                    // ${property.name} Attribute Derived Data
-                    const ${property.name.toLowerCase()}CurrentValue = this.system.${property.name.toLowerCase()}?.value ?? 0;
-                    const ${property.name.toLowerCase()}CurrentMax = this.system.${property.name.toLowerCase()}?.max ?? 0;
-                    const ${property.name.toLowerCase()}ModFunc = (system) => {
-                        const context = {
-                            object: this
-                        };
-                        ${modParam ? translateExpression(entry, id, modParam.method, true, property) : `return ${property.name.toLowerCase()}CurrentValue`}
-                    };
-                    let ${property.name.toLowerCase()}Mod = ${property.name.toLowerCase()}ModFunc(this.system);
-                    // Protect against NaN from invalid operations
-                    if (isNaN(${property.name.toLowerCase()}Mod) || ${property.name.toLowerCase()}Mod === undefined || ${property.name.toLowerCase()}Mod === null) {
-                        ${property.name.toLowerCase()}Mod = 0;
-                    }
-                    this.system.${property.name.toLowerCase()} = {
-                        value: ${property.name.toLowerCase()}CurrentValue,
-                        max: ${property.name.toLowerCase()}CurrentMax,
-                        mod: ${property.name.toLowerCase()}Mod
-                    };
-                    if ( this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
-                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
-                    }
+                return expandToNode `
+
+                    // ${property.name} Attribute Derived Data
+                    const ${property.name.toLowerCase()}CurrentValue = this.system.${property.name.toLowerCase()}?.value ?? 0;
+                    const ${property.name.toLowerCase()}CurrentMax = this.system.${property.name.toLowerCase()}?.max ?? 0;
+                    const ${property.name.toLowerCase()}ModFunc = (system) => {
+                        const context = {
+                            object: this
+                        };
+                        ${modParam ? translateExpression(entry, id, modParam.method, true, property) : `return ${property.name.toLowerCase()}CurrentValue`}
+                    };
+                    let ${property.name.toLowerCase()}Mod = ${property.name.toLowerCase()}ModFunc(this.system);
+                    // Protect against NaN from invalid operations
+                    if (isNaN(${property.name.toLowerCase()}Mod) || ${property.name.toLowerCase()}Mod === undefined || ${property.name.toLowerCase()}Mod === null) {
+                        ${property.name.toLowerCase()}Mod = 0;
+                    }
+                    this.system.${property.name.toLowerCase()} = {
+                        value: ${property.name.toLowerCase()}CurrentValue,
+                        max: ${property.name.toLowerCase()}CurrentMax,
+                        mod: ${property.name.toLowerCase()}Mod
+                    };
+                    if ( this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
+                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
+                    }
                 `.appendNewLineIfNotEmpty();
             }
             ;
             function generateValueOrMethod(value) {
                 if (isMethodBlock(value)) {
-                    return expandToNode `
-                        const context = {
-                            object: this
-                        };
-                        ${translateExpression(entry, id, value, true, undefined)}
+                    return expandToNode `
+                        const context = {
+                            object: this
+                        };
+                        ${translateExpression(entry, id, value, true, undefined)}
                     `;
                 }
-                return expandToNode `
-                    return ${value};
+                return expandToNode `
+                    return ${value};
                 `;
             }
             if (isTrackerExp(property)) {
@@ -241,43 +241,43 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 const valueParam = property.params.find(x => isNumberParamValue(x));
                 if (maxParam == undefined && minParam == undefined && valueParam == undefined)
                     return;
-                return expandToNode `
-                    // ${property.name} Tracker Derived Data
-                    const ${property.name.toLowerCase()}TempValue = this.system.${property.name.toLowerCase()}.temp ?? 0;
-                    const ${property.name.toLowerCase()}CurrentMin = (system) => {
-                        ${minParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.min ?? 0;` : generateValueOrMethod(minParam.value)};
-                    }
-                    const ${property.name.toLowerCase()}CurrentValue = (system) => {
-                        ${valueParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.value ?? 0;` : generateValueOrMethod(valueParam.value)};
-                    }
-                    const ${property.name.toLowerCase()}CurrentMax = (system) => {
-                        ${maxParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.max ?? 0;` : generateValueOrMethod(maxParam.value)};
-                    }
-                    let ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}CurrentMin(this.system);
-                    let ${property.name.toLowerCase()}Value = ${property.name.toLowerCase()}CurrentValue(this.system);
-                    let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}CurrentMax(this.system);
-                    // Protect against NaN from invalid operations
-                    if (isNaN(${property.name.toLowerCase()}Min) || ${property.name.toLowerCase()}Min === undefined || ${property.name.toLowerCase()}Min === null) {
-                        ${property.name.toLowerCase()}Min = 0;
-                    }
-                    if (isNaN(${property.name.toLowerCase()}Value) || ${property.name.toLowerCase()}Value === undefined || ${property.name.toLowerCase()}Value === null) {
-                        ${property.name.toLowerCase()}Value = 0;
-                    }
-                    if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
-                        ${property.name.toLowerCase()}Max = 0;
-                    }
-                    this.system.${property.name.toLowerCase()} = {
-                        min: ${property.name.toLowerCase()}Min,
-                        value: ${property.name.toLowerCase()}Value,
-                        temp: ${property.name.toLowerCase()}TempValue,
-                        max: ${property.name.toLowerCase()}Max,
-                    };
-                    if ( !editMode && this.system.${property.name.toLowerCase()}.value < this.system.${property.name.toLowerCase()}.min ) {
-                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.min;
-                    }
-                    else if ( !editMode && this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
-                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
-                    }
+                return expandToNode `
+                    // ${property.name} Tracker Derived Data
+                    const ${property.name.toLowerCase()}TempValue = this.system.${property.name.toLowerCase()}.temp ?? 0;
+                    const ${property.name.toLowerCase()}CurrentMin = (system) => {
+                        ${minParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.min ?? 0;` : generateValueOrMethod(minParam.value)};
+                    }
+                    const ${property.name.toLowerCase()}CurrentValue = (system) => {
+                        ${valueParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.value ?? 0;` : generateValueOrMethod(valueParam.value)};
+                    }
+                    const ${property.name.toLowerCase()}CurrentMax = (system) => {
+                        ${maxParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.max ?? 0;` : generateValueOrMethod(maxParam.value)};
+                    }
+                    let ${property.name.toLowerCase()}Min = ${property.name.toLowerCase()}CurrentMin(this.system);
+                    let ${property.name.toLowerCase()}Value = ${property.name.toLowerCase()}CurrentValue(this.system);
+                    let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}CurrentMax(this.system);
+                    // Protect against NaN from invalid operations
+                    if (isNaN(${property.name.toLowerCase()}Min) || ${property.name.toLowerCase()}Min === undefined || ${property.name.toLowerCase()}Min === null) {
+                        ${property.name.toLowerCase()}Min = 0;
+                    }
+                    if (isNaN(${property.name.toLowerCase()}Value) || ${property.name.toLowerCase()}Value === undefined || ${property.name.toLowerCase()}Value === null) {
+                        ${property.name.toLowerCase()}Value = 0;
+                    }
+                    if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
+                        ${property.name.toLowerCase()}Max = 0;
+                    }
+                    this.system.${property.name.toLowerCase()} = {
+                        min: ${property.name.toLowerCase()}Min,
+                        value: ${property.name.toLowerCase()}Value,
+                        temp: ${property.name.toLowerCase()}TempValue,
+                        max: ${property.name.toLowerCase()}Max,
+                    };
+                    if ( !editMode && this.system.${property.name.toLowerCase()}.value < this.system.${property.name.toLowerCase()}.min ) {
+                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.min;
+                    }
+                    else if ( !editMode && this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
+                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
+                    }
                 `.appendNewLineIfNotEmpty();
             }
             ;
@@ -289,80 +289,80 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 if (maxParam == undefined && minParam == undefined && valueParam == undefined)
                     return;
                 //toBeReapplied.add("system." + property.name.toLowerCase() + ".max");
-                return expandToNode `
-                    // ${property.name} Resource Derived Data
-                    const ${property.name.toLowerCase()}TempValue = this.system.${property.name.toLowerCase()}.temp ?? 0;
-                    const ${property.name.toLowerCase()}CurrentMin = (system) => {
-                        ${minParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.min ?? 0;` : generateValueOrMethod(minParam.value)};
-                    }
-                    const ${property.name.toLowerCase()}CurrentValue = (system) => {
-                        ${valueParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.value ?? 0;` : generateValueOrMethod(valueParam.value)};
-                    }
-                    const ${property.name.toLowerCase()}CurrentMax = (system) => {
-                        ${maxParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.max ?? 0;` : generateValueOrMethod(maxParam.value)};
-                    }
-                    let ${property.name.toLowerCase()}Value = ${property.name.toLowerCase()}CurrentValue(this.system);
-                    let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}CurrentMax(this.system);
-                    // Protect against NaN from invalid operations
-                    if (isNaN(${property.name.toLowerCase()}Value) || ${property.name.toLowerCase()}Value === undefined || ${property.name.toLowerCase()}Value === null) {
-                        ${property.name.toLowerCase()}Value = 0;
-                    }
-                    if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
-                        ${property.name.toLowerCase()}Max = 0;
-                    }
-                    this.system.${property.name.toLowerCase()} = {
-                        value: ${property.name.toLowerCase()}Value,
-                        temp: ${property.name.toLowerCase()}TempValue,
-                        max: ${property.name.toLowerCase()}Max
-                    };
-                    this.reapplyActiveEffectsForName("system.${property.name.toLowerCase()}.max");
-                    if ( !editMode && this.system.${property.name.toLowerCase()}.value < ${property.name.toLowerCase()}CurrentMin(this.system) ) {
-                        this.system.${property.name.toLowerCase()}.value = ${property.name.toLowerCase()}CurrentMin(this.system);
-                    }
-                    else if ( !editMode && this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
-                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
-                    }
+                return expandToNode `
+                    // ${property.name} Resource Derived Data
+                    const ${property.name.toLowerCase()}TempValue = this.system.${property.name.toLowerCase()}.temp ?? 0;
+                    const ${property.name.toLowerCase()}CurrentMin = (system) => {
+                        ${minParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.min ?? 0;` : generateValueOrMethod(minParam.value)};
+                    }
+                    const ${property.name.toLowerCase()}CurrentValue = (system) => {
+                        ${valueParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.value ?? 0;` : generateValueOrMethod(valueParam.value)};
+                    }
+                    const ${property.name.toLowerCase()}CurrentMax = (system) => {
+                        ${maxParam == undefined ? expandToNode `return this.system.${property.name.toLowerCase()}?.max ?? 0;` : generateValueOrMethod(maxParam.value)};
+                    }
+                    let ${property.name.toLowerCase()}Value = ${property.name.toLowerCase()}CurrentValue(this.system);
+                    let ${property.name.toLowerCase()}Max = ${property.name.toLowerCase()}CurrentMax(this.system);
+                    // Protect against NaN from invalid operations
+                    if (isNaN(${property.name.toLowerCase()}Value) || ${property.name.toLowerCase()}Value === undefined || ${property.name.toLowerCase()}Value === null) {
+                        ${property.name.toLowerCase()}Value = 0;
+                    }
+                    if (isNaN(${property.name.toLowerCase()}Max) || ${property.name.toLowerCase()}Max === undefined || ${property.name.toLowerCase()}Max === null) {
+                        ${property.name.toLowerCase()}Max = 0;
+                    }
+                    this.system.${property.name.toLowerCase()} = {
+                        value: ${property.name.toLowerCase()}Value,
+                        temp: ${property.name.toLowerCase()}TempValue,
+                        max: ${property.name.toLowerCase()}Max
+                    };
+                    this.reapplyActiveEffectsForName("system.${property.name.toLowerCase()}.max");
+                    if ( !editMode && this.system.${property.name.toLowerCase()}.value < ${property.name.toLowerCase()}CurrentMin(this.system) ) {
+                        this.system.${property.name.toLowerCase()}.value = ${property.name.toLowerCase()}CurrentMin(this.system);
+                    }
+                    else if ( !editMode && this.system.${property.name.toLowerCase()}.value > this.system.${property.name.toLowerCase()}.max ) {
+                        this.system.${property.name.toLowerCase()}.value = this.system.${property.name.toLowerCase()}.max;
+                    }
                 `.appendNewLineIfNotEmpty();
             }
             if (isTableField(property)) {
                 console.log("Processing Derived Document Array: " + property.name);
                 const whereParam = property.params.find(p => isWhereParam(p));
                 if (whereParam) {
-                    return expandToNode `
-                    // ${property.name} Document Array Derived Data
-                    this.system.${property.name.toLowerCase()} = this.items.filter((item) => {
-                        if ( item.type !== "${(_a = property.document.ref) === null || _a === void 0 ? void 0 : _a.name.toLowerCase()}") return false;
-                        return ${translateExpression(entry, id, whereParam.value, true, property)};
-                    });
+                    return expandToNode `
+                    // ${property.name} Document Array Derived Data
+                    this.system.${property.name.toLowerCase()} = this.items.filter((item) => {
+                        if ( item.type !== "${(_a = property.document.ref) === null || _a === void 0 ? void 0 : _a.name.toLowerCase()}") return false;
+                        return ${translateExpression(entry, id, whereParam.value, true, property)};
+                    });
                     `.appendNewLineIfNotEmpty();
                 }
-                return expandToNode `
-                    // ${property.name} Document Array Derived Data
-                    this.system.${property.name.toLowerCase()} = this.items.filter((item) => item.type == "${(_b = property.document.ref) === null || _b === void 0 ? void 0 : _b.name.toLowerCase()}");
+                return expandToNode `
+                    // ${property.name} Document Array Derived Data
+                    this.system.${property.name.toLowerCase()} = this.items.filter((item) => item.type == "${(_b = property.document.ref) === null || _b === void 0 ? void 0 : _b.name.toLowerCase()}");
                 `.appendNewLineIfNotEmpty();
             }
             if (isMeasuredTemplateField(property)) {
-                return expandToNode `
-                    // ${property.name} Measured Template Field Derived Data
-                   
-                    const ${property.name.toLowerCase()}Summary = () => {
-                        let sum = \`\${this.system.${property.name.toLowerCase()}.direction}° \${this.system.${property.name.toLowerCase()}.type} (\${this.system.${property.name.toLowerCase()}.distance} squares)\`;
-                        if (this.system.${property.name.toLowerCase()}.type === 'cone') sum += \` \${this.system.${property.name.toLowerCase()}.angle}° angle\`;
-                        if (this.system.${property.name.toLowerCase()}.type === 'ray') sum += \` \${this.system.${property.name.toLowerCase()}.width} squares wide\`;
-                        return sum;
-                    }
-                    this.system.${property.name.toLowerCase()}.summary = ${property.name.toLowerCase()}Summary();  
+                return expandToNode `
+                    // ${property.name} Measured Template Field Derived Data
+                   
+                    const ${property.name.toLowerCase()}Summary = () => {
+                        let sum = \`\${this.system.${property.name.toLowerCase()}.direction}° \${this.system.${property.name.toLowerCase()}.type} (\${this.system.${property.name.toLowerCase()}.distance} squares)\`;
+                        if (this.system.${property.name.toLowerCase()}.type === 'cone') sum += \` \${this.system.${property.name.toLowerCase()}.angle}° angle\`;
+                        if (this.system.${property.name.toLowerCase()}.type === 'ray') sum += \` \${this.system.${property.name.toLowerCase()}.width} squares wide\`;
+                        return sum;
+                    }
+                    this.system.${property.name.toLowerCase()}.summary = ${property.name.toLowerCase()}Summary();  
                 `.appendNewLineIfNotEmpty();
             }
             if (isDiceField(property)) {
-                return expandToNode `
-                    // ${property.name} Dice Field Derived Data
-                    
-                    const ${property.name.toLowerCase()}Value = () => {
-                        // Output a string of num + die
-                        return this.system.${property.name.toLowerCase()}.number + this.system.${property.name.toLowerCase()}.die;
-                    }
-                    this.system.${property.name.toLowerCase()}.value = ${property.name.toLowerCase()}Value();
+                return expandToNode `
+                    // ${property.name} Dice Field Derived Data
+                    
+                    const ${property.name.toLowerCase()}Value = () => {
+                        // Output a string of num + die
+                        return this.system.${property.name.toLowerCase()}.number + this.system.${property.name.toLowerCase()}.die;
+                    }
+                    this.system.${property.name.toLowerCase()}.value = ${property.name.toLowerCase()}Value();
                 `.appendNewLineIfNotEmpty();
             }
             // if (isParentPropertyRefExp(property)) {
@@ -644,78 +644,78 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 .filter(f => functionIsDerivedSafe(f));
             function generateDerivedFunction(functionDef) {
                 const params = functionDef.params.map(p => p.param.name);
-                return expandToNode `
-                    const function_${functionDef.name} = (system${params.length ? ", " + params.join(", ") : ""}) => {
-                        const context = { object: this };
-                        ${translateBodyExpressionToJavascript(entry, id, functionDef.method.body, true, functionDef)}
-                    };
+                return expandToNode `
+                    const function_${functionDef.name} = (system${params.length ? ", " + params.join(", ") : ""}) => {
+                        const context = { object: this };
+                        ${translateBodyExpressionToJavascript(entry, id, functionDef.method.body, true, functionDef)}
+                    };
                 `;
             }
-            return expandToNode `
-                async _prepare${document.name}DerivedData() {
-                    const editMode = this.flags["${id}"]?.["edit-mode"] ?? true;
-
-                    ${joinToNode(derivedFunctions, generateDerivedFunction, { appendNewLineIfNotEmpty: true })}
-
-                    ${cycles.length > 0 ? expandToNode `
-                        // WARNING: Dependency cycles detected: ${cycles.map(cycle => cycle.join(' -> ')).join(', ')}
-                        // Properties will be processed in original order to prevent infinite loops.
-                    `.appendNewLine() : ""}
-
-                    ${joinToNode(sorted.map(dep => dep.property), property => generateDerivedAttribute(property), { appendNewLineIfNotEmpty: true })}
-
-                    ${isActor(document) ? expandToNode `
-                        // Reapply Active Effects for calculated values
-                        ${joinToNode(toBeReapplied, name => expandToNode `this.reapplyActiveEffectsForName("${name}");`, { appendNewLineIfNotEmpty: true })}
-
-                        // Bridge fighter.system.* active effect overrides into system.* for flat (non-nested) fields.
-                        // allApplicableEffects cannot strip the type prefix in V14 (changes is getter-only),
-                        // so Foundry applies flat fields (e.g. bonusdamage, resistanceflat) to actor.fighter.system.*
-                        // Nested fields (e.g. fight.value) are handled by reapplyActiveEffectsForName above.
-                        const _typeOverrides = this.overrides?.${document.name.toLowerCase()}?.system ?? {};
-                        for (const [_k, _v] of Object.entries(_typeOverrides)) {
-                            if (typeof _v !== 'object' && _k in this.system) {
-                                this.system[_k] = _v;
-                            }
-                        }
-                    ` : ""}
-                }
+            return expandToNode `
+                async _prepare${document.name}DerivedData() {
+                    const editMode = this.flags["${id}"]?.["edit-mode"] ?? true;
+
+                    ${joinToNode(derivedFunctions, generateDerivedFunction, { appendNewLineIfNotEmpty: true })}
+
+                    ${cycles.length > 0 ? expandToNode `
+                        // WARNING: Dependency cycles detected: ${cycles.map(cycle => cycle.join(' -> ')).join(', ')}
+                        // Properties will be processed in original order to prevent infinite loops.
+                    `.appendNewLine() : ""}
+
+                    ${joinToNode(sorted.map(dep => dep.property), property => generateDerivedAttribute(property), { appendNewLineIfNotEmpty: true })}
+
+                    ${isActor(document) ? expandToNode `
+                        // Reapply Active Effects for calculated values
+                        ${joinToNode(toBeReapplied, name => expandToNode `this.reapplyActiveEffectsForName("${name}");`, { appendNewLineIfNotEmpty: true })}
+
+                        // Bridge fighter.system.* active effect overrides into system.* for flat (non-nested) fields.
+                        // allApplicableEffects cannot strip the type prefix in V14 (changes is getter-only),
+                        // so Foundry applies flat fields (e.g. bonusdamage, resistanceflat) to actor.fighter.system.*
+                        // Nested fields (e.g. fight.value) are handled by reapplyActiveEffectsForName above.
+                        const _typeOverrides = this.overrides?.${document.name.toLowerCase()}?.system ?? {};
+                        for (const [_k, _v] of Object.entries(_typeOverrides)) {
+                            if (typeof _v !== 'object' && _k in this.system) {
+                                this.system[_k] = _v;
+                            }
+                        }
+                    ` : ""}
+                }
             `.appendNewLineIfNotEmpty().appendNewLine();
         }
         function generateActorPreUpdate(document) {
             const allResources = getAllOfType(document.body, isResourceExp);
             const healthResource = allResources.find(x => x.tag == "health");
             if (healthResource == undefined)
-                return expandToNode `
-            _handlePreUpdate${document.name}Delta(changes, deltas) {
-                // No health resource defined
-            }
+                return expandToNode `
+            _handlePreUpdate${document.name}Delta(changes, deltas) {
+                // No health resource defined
+            }
             `.appendNewLine();
-            return expandToNode `
-            _handlePreUpdate${document.name}Delta(changes, deltas) {
-                // Health resource updates
-                if (changes.system.${healthResource.name.toLowerCase()} === undefined) return;
-
-                // Store value and temp changes
-                const valueChange = changes.system.${healthResource.name.toLowerCase()}.value;
-                const tempChange = changes.system.${healthResource.name.toLowerCase()}.temp;
-
-                // Calculate delta
-                if (valueChange !== undefined) {
-                    const delta = valueChange - this.system.${healthResource.name.toLowerCase()}.value;
-                    if (delta !== 0) {
-                        deltas.${healthResource.name.toLowerCase()} = delta;
-                    }
-                }
-
-                // Calculate temp delta
-                if (tempChange !== undefined) {
-                    const tempDelta = tempChange - this.system.${healthResource.name.toLowerCase()}.temp;
-                    if (tempDelta !== 0) {
-                        deltas.${healthResource.name.toLowerCase()}Temp = tempDelta;
-                    }
-                }
-            }
+            return expandToNode `
+            _handlePreUpdate${document.name}Delta(changes, deltas) {
+                // Health resource updates
+                if (changes.system.${healthResource.name.toLowerCase()} === undefined) return;
+
+                // Store value and temp changes
+                const valueChange = changes.system.${healthResource.name.toLowerCase()}.value;
+                const tempChange = changes.system.${healthResource.name.toLowerCase()}.temp;
+
+                // Calculate delta
+                if (valueChange !== undefined) {
+                    const delta = valueChange - this.system.${healthResource.name.toLowerCase()}.value;
+                    if (delta !== 0) {
+                        deltas.${healthResource.name.toLowerCase()} = delta;
+                    }
+                }
+
+                // Calculate temp delta
+                if (tempChange !== undefined) {
+                    const tempDelta = tempChange - this.system.${healthResource.name.toLowerCase()}.temp;
+                    if (tempDelta !== 0) {
+                        deltas.${healthResource.name.toLowerCase()}Temp = tempDelta;
+                    }
+                }
+            }
             `.appendNewLine();
         }
         function generateDeltas(documents) {
@@ -726,179 +726,179 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                     const healthResource = getAllOfType(document.body, isResourceExp).find(x => x.tag == "health");
                     if (healthResource == undefined)
                         return;
-                    return expandToNode `
-                    case "${document.name.toLowerCase()}": {
-                        // ${healthResource.name} health resource
-
-                        if ( !data.prototypeToken.bar1.attribute ) data.prototypeToken.bar1.attribute = "${healthResource.name.toLowerCase()}";
-                        if ( !data.prototypeToken.displayBars ) data.prototypeToken.displayBars = CONST.TOKEN_DISPLAY_MODES.ALWAYS;
-                    }
+                    return expandToNode `
+                    case "${document.name.toLowerCase()}": {
+                        // ${healthResource.name} health resource
+
+                        if ( !data.prototypeToken.bar1.attribute ) data.prototypeToken.bar1.attribute = "${healthResource.name.toLowerCase()}";
+                        if ( !data.prototypeToken.displayBars ) data.prototypeToken.displayBars = CONST.TOKEN_DISPLAY_MODES.ALWAYS;
+                    }
                     `.appendNewLineIfNotEmpty();
                 }
-                return expandToNode `
-                    switch ( data.type ) {
-                        ${joinToNode(documents.filter(x => isActor(x)), document => documentHealthResource(document), { appendNewLineIfNotEmpty: true })}
-                    }
+                return expandToNode `
+                    switch ( data.type ) {
+                        ${joinToNode(documents.filter(x => isActor(x)), document => documentHealthResource(document), { appendNewLineIfNotEmpty: true })}
+                    }
                 `.appendNewLineIfNotEmpty();
             }
-            return expandToNode `
-            async _preUpdate(data, options, userId) {
-                await super._preUpdate(data, options, userId);
-                if (!options.diff || data === undefined) return;
-                let changes = {};
-
-                // Foundry v12 no longer has diffed data during _preUpdate, so we need to compute it ourselves.
-                if (game.release.version >= 12) {
-                    // Retrieve a copy of the existing actor data.
-                    let newData = game.system.utils.flattenObject(data);
-                    let oldData = game.system.utils.flattenObject(this);
-
-                    // Limit data to just the new data.
-                    const diffData = foundry.utils.diffObject(oldData, newData);
-                    changes = foundry.utils.expandObject(diffData);
-                }
-                else {
-                    changes = foundry.utils.duplicate(data);
-                }
-
-                // Handle name changes
-                if (changes.name) {
-                    let tokenData = {};
-
-                    // Propagate name update to prototype token if same as actor
-                    if (changes.name && this.name == this.prototypeToken.name) {
-                        data.prototypeToken = {name: data.name};
-                    }
-
-                    // Update tokens.
-                    let tokens = this.getActiveTokens();
-                    tokens.forEach(token => {
-                        let updateData = foundry.utils.duplicate(tokenData);
-
-                        // Propagate name update to token if same as actor
-                        if (data.name && this.name == token.name) {
-                            updateData.name = data.name;
-                        }
-                        token.document.update(updateData);
-                    });
-                }
-    
-                if (changes.system === undefined) return; // Nothing more to do
-
-                const deltas = {};
-
-                ${joinToNode(documents.filter(x => isActor(x)), document => expandToNode `
-                    if (this.type == "${document.name.toLowerCase()}") this._handlePreUpdate${document.name}Delta(changes, deltas);
-                `, { appendNewLineIfNotEmpty: true })}
-
-                options.fromPreUpdate = deltas;
-            }
-
-            /* -------------------------------------------- */
-
-            ${joinToNode(documents.filter(x => isActor(x)), document => generateActorPreUpdate(document), { appendNewLineIfNotEmpty: true })}
-
-            /* -------------------------------------------- */
-
-            async _onUpdate(data, options, userId) {
-                await super._onUpdate(data, options, userId);
-
-                // Iterate over all objects in fromPreUpdate, showing scrolling text for each.
-                if (options.fromPreUpdate) {
-                    for (const [key, delta] of Object.entries(options.fromPreUpdate)) {
-                        this._showScrollingText(delta, key);
-                    }
-                }
-
-                // Add / remove status effects
-                const calculatedStatusEffects = CONFIG.statusEffects.filter(effect => effect.calculated);
-                for (const effect of calculatedStatusEffects) {
-                    const key = effect.id;
-                    const active = this.system[key] ?? false;
-                    const existing = this.effects.find(e => e.statuses.has(key));
-
-                    if ((active && existing) || (!active && !existing)) continue;
-
-                    // If the effect is active the AE doesn't exist, add it
-                    if (active && !existing) {
-                        const cls = getDocumentClass("ActiveEffect");
-                        const createData = foundry.utils.deepClone(effect);
-                        createData.statuses = [key];
-                        delete createData.id;
-                        createData.name = game.i18n.localize(createData.name);
-                        await cls.create(createData, {parent: this});
-                        if (key == "dead") Hooks.callAll("death", this);
-                    }
-
-                    // If the effect is active the AE doesn't exist, add it
-                    if (!active && existing) {
-                        this.deleteEmbeddedDocuments("ActiveEffect", [existing.id]);
-                    }
-                }
-            }
-
-            /* -------------------------------------------- */
-
-            async _onCreate(data, options, userId) {
-                await super._onCreate(data, options, userId);
-
-                console.log("onCreate", data, options, userId);
-
-                ${generateHealthResourceAssignments(documents)}
-            }
-
-            /* -------------------------------------------- */
-
-            _showScrollingText(delta, suffix="", overrideOptions={}) {
-            // Show scrolling text of hp update
-            const tokens = this.isToken ? [this.token?.object] : this.getActiveTokens(true);
-            if (delta != 0 && tokens.length > 0) {
-                let color = delta < 0 ? 0xcc0000 : 0x00cc00;
-                for ( let token of tokens ) {
-                    let textOptions = {
-                        anchor: CONST.TEXT_ANCHOR_POINTS.CENTER,
-                        direction: CONST.TEXT_ANCHOR_POINTS.TOP,
-                        fontSize: 32,
-                        fill: color,
-                        stroke: 0x000000,
-                        strokeThickness: 4,
-                        duration: 3000
-                    };
-                    canvas.interface.createScrollingText(
-                        token.center,
-                        delta.signedString()+" "+suffix,
-                        foundry.utils.mergeObject(textOptions, overrideOptions)
-                    );
-                    // Flash dynamic token rings.
-                    if (token?.ring) {
-                        const flashColor = delta < 0 ? Color.fromString('#ff0000') : Color.fromString('#00ff00');
-                        token.ring.flashColor(flashColor, {
-                            duration: 600,
-                            easing: foundry.canvas.tokens.TokenRing.easeTwoPeaks,
-                        });
-                    }
-                }
-            }
-        }
+            return expandToNode `
+            async _preUpdate(data, options, userId) {
+                await super._preUpdate(data, options, userId);
+                if (!options.diff || data === undefined) return;
+                let changes = {};
+
+                // Foundry v12 no longer has diffed data during _preUpdate, so we need to compute it ourselves.
+                if (game.release.version >= 12) {
+                    // Retrieve a copy of the existing actor data.
+                    let newData = game.system.utils.flattenObject(data);
+                    let oldData = game.system.utils.flattenObject(this);
+
+                    // Limit data to just the new data.
+                    const diffData = foundry.utils.diffObject(oldData, newData);
+                    changes = foundry.utils.expandObject(diffData);
+                }
+                else {
+                    changes = foundry.utils.duplicate(data);
+                }
+
+                // Handle name changes
+                if (changes.name) {
+                    let tokenData = {};
+
+                    // Propagate name update to prototype token if same as actor
+                    if (changes.name && this.name == this.prototypeToken.name) {
+                        data.prototypeToken = {name: data.name};
+                    }
+
+                    // Update tokens.
+                    let tokens = this.getActiveTokens();
+                    tokens.forEach(token => {
+                        let updateData = foundry.utils.duplicate(tokenData);
+
+                        // Propagate name update to token if same as actor
+                        if (data.name && this.name == token.name) {
+                            updateData.name = data.name;
+                        }
+                        token.document.update(updateData);
+                    });
+                }
+    
+                if (changes.system === undefined) return; // Nothing more to do
+
+                const deltas = {};
+
+                ${joinToNode(documents.filter(x => isActor(x)), document => expandToNode `
+                    if (this.type == "${document.name.toLowerCase()}") this._handlePreUpdate${document.name}Delta(changes, deltas);
+                `, { appendNewLineIfNotEmpty: true })}
+
+                options.fromPreUpdate = deltas;
+            }
+
+            /* -------------------------------------------- */
+
+            ${joinToNode(documents.filter(x => isActor(x)), document => generateActorPreUpdate(document), { appendNewLineIfNotEmpty: true })}
+
+            /* -------------------------------------------- */
+
+            async _onUpdate(data, options, userId) {
+                await super._onUpdate(data, options, userId);
+
+                // Iterate over all objects in fromPreUpdate, showing scrolling text for each.
+                if (options.fromPreUpdate) {
+                    for (const [key, delta] of Object.entries(options.fromPreUpdate)) {
+                        this._showScrollingText(delta, key);
+                    }
+                }
+
+                // Add / remove status effects
+                const calculatedStatusEffects = CONFIG.statusEffects.filter(effect => effect.calculated);
+                for (const effect of calculatedStatusEffects) {
+                    const key = effect.id;
+                    const active = this.system[key] ?? false;
+                    const existing = this.effects.find(e => e.statuses.has(key));
+
+                    if ((active && existing) || (!active && !existing)) continue;
+
+                    // If the effect is active the AE doesn't exist, add it
+                    if (active && !existing) {
+                        const cls = getDocumentClass("ActiveEffect");
+                        const createData = foundry.utils.deepClone(effect);
+                        createData.statuses = [key];
+                        delete createData.id;
+                        createData.name = game.i18n.localize(createData.name);
+                        await cls.create(createData, {parent: this});
+                        if (key == "dead") Hooks.callAll("death", this);
+                    }
+
+                    // If the effect is active the AE doesn't exist, add it
+                    if (!active && existing) {
+                        this.deleteEmbeddedDocuments("ActiveEffect", [existing.id]);
+                    }
+                }
+            }
+
+            /* -------------------------------------------- */
+
+            async _onCreate(data, options, userId) {
+                await super._onCreate(data, options, userId);
+
+                console.log("onCreate", data, options, userId);
+
+                ${generateHealthResourceAssignments(documents)}
+            }
+
+            /* -------------------------------------------- */
+
+            _showScrollingText(delta, suffix="", overrideOptions={}) {
+            // Show scrolling text of hp update
+            const tokens = this.isToken ? [this.token?.object] : this.getActiveTokens(true);
+            if (delta != 0 && tokens.length > 0) {
+                let color = delta < 0 ? 0xcc0000 : 0x00cc00;
+                for ( let token of tokens ) {
+                    let textOptions = {
+                        anchor: CONST.TEXT_ANCHOR_POINTS.CENTER,
+                        direction: CONST.TEXT_ANCHOR_POINTS.TOP,
+                        fontSize: 32,
+                        fill: color,
+                        stroke: 0x000000,
+                        strokeThickness: 4,
+                        duration: 3000
+                    };
+                    canvas.interface.createScrollingText(
+                        token.center,
+                        delta.signedString()+" "+suffix,
+                        foundry.utils.mergeObject(textOptions, overrideOptions)
+                    );
+                    // Flash dynamic token rings.
+                    if (token?.ring) {
+                        const flashColor = delta < 0 ? Color.fromString('#ff0000') : Color.fromString('#00ff00');
+                        token.ring.flashColor(flashColor, {
+                            duration: 600,
+                            easing: foundry.canvas.tokens.TokenRing.easeTwoPeaks,
+                        });
+                    }
+                }
+            }
+        }
         `.appendNewLineIfNotEmpty();
         }
         function generateInitiativeFormula(document) {
             var _a;
             const initiativeAttribute = getAllOfType(document.body, isInitiativeProperty);
             if (initiativeAttribute.length == 0) {
-                return expandToNode `
-                case "${document.name.toLowerCase()}": return "0";
+                return expandToNode `
+                case "${document.name.toLowerCase()}": return "0";
                 `.appendNewLineIfNotEmpty();
             }
             let initiative = (_a = initiativeAttribute[0]) === null || _a === void 0 ? void 0 : _a.value;
             if (initiative == undefined) {
-                return expandToNode `
-                case "${document.name.toLowerCase()}": return "0";
+                return expandToNode `
+                case "${document.name.toLowerCase()}": return "0";
                 `.appendNewLineIfNotEmpty();
             }
             console.log("Initiative Formula");
-            return expandToNode `
-            case "${document.name.toLowerCase()}": return "${translateExpression(entry, id, initiative, true, initiativeAttribute[0])}";
+            return expandToNode `
+            case "${document.name.toLowerCase()}": return "${translateExpression(entry, id, initiative, true, initiativeAttribute[0])}";
             `.appendNewLineIfNotEmpty();
         }
         function generateDocumentHooks(document) {
@@ -907,177 +907,177 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 var _a;
                 let name = hook.name;
                 function generateBody() {
-                    return expandToNode `
-                        const ${entry.config.name}Roll = game.system.rollClass;
-                        const ${entry.config.name}DamageRoll = game.system.damageRollClass;
-                        const context = {
-                            object: document,
-                            target: game.user.getTargetOrNothing()
-                        };
-                        const system = document.system;
-                        let update = {};
-                        let embeddedUpdate = {};
-                        let parentUpdate = {};
-                        let parentEmbeddedUpdate = {};
-                        let targetUpdate = {};
-                        let targetEmbeddedUpdate = {};
-                        let selfDeleted = false;
-
-                        ${translateBodyExpressionToJavascript(entry, id, hook.body, false, hook)}
-
-                        if (!selfDeleted && Object.keys(update).length > 0) {
-                            await document.update(update);
-                        }
-                        if (!selfDeleted && Object.keys(embeddedUpdate).length > 0) {
-                            for (let key of Object.keys(embeddedUpdate)) {
-                                await document.updateEmbeddedDocuments("Item", embeddedUpdate[key]);
-                            }
-                        }
-                        if (Object.keys(parentUpdate).length > 0) {
-                            await document.parent.update(parentUpdate);
-                        }
-                        if (Object.keys(parentEmbeddedUpdate).length > 0) {
-                            for (let key of Object.keys(parentEmbeddedUpdate)) {
-                                await document.parent.updateEmbeddedDocuments("Item", parentEmbeddedUpdate[key]);
-                            }
-                        }
-                        if (Object.keys(targetUpdate).length > 0) {
-                            await context.target.update(targetUpdate);
-                        }
-                        if (Object.keys(targetEmbeddedUpdate).length > 0) {
-                            for (let key of Object.keys(targetEmbeddedUpdate)) {
-                                await context.target.updateEmbeddedDocuments("Item", targetEmbeddedUpdate[key]);
-                            }
-                        }
+                    return expandToNode `
+                        const ${entry.config.name}Roll = game.system.rollClass;
+                        const ${entry.config.name}DamageRoll = game.system.damageRollClass;
+                        const context = {
+                            object: document,
+                            target: game.user.getTargetOrNothing()
+                        };
+                        const system = document.system;
+                        let update = {};
+                        let embeddedUpdate = {};
+                        let parentUpdate = {};
+                        let parentEmbeddedUpdate = {};
+                        let targetUpdate = {};
+                        let targetEmbeddedUpdate = {};
+                        let selfDeleted = false;
+
+                        ${translateBodyExpressionToJavascript(entry, id, hook.body, false, hook)}
+
+                        if (!selfDeleted && Object.keys(update).length > 0) {
+                            await document.update(update);
+                        }
+                        if (!selfDeleted && Object.keys(embeddedUpdate).length > 0) {
+                            for (let key of Object.keys(embeddedUpdate)) {
+                                await document.updateEmbeddedDocuments("Item", embeddedUpdate[key]);
+                            }
+                        }
+                        if (Object.keys(parentUpdate).length > 0) {
+                            await document.parent.update(parentUpdate);
+                        }
+                        if (Object.keys(parentEmbeddedUpdate).length > 0) {
+                            for (let key of Object.keys(parentEmbeddedUpdate)) {
+                                await document.parent.updateEmbeddedDocuments("Item", parentEmbeddedUpdate[key]);
+                            }
+                        }
+                        if (Object.keys(targetUpdate).length > 0) {
+                            await context.target.update(targetUpdate);
+                        }
+                        if (Object.keys(targetEmbeddedUpdate).length > 0) {
+                            for (let key of Object.keys(targetEmbeddedUpdate)) {
+                                await context.target.updateEmbeddedDocuments("Item", targetEmbeddedUpdate[key]);
+                            }
+                        }
                     `;
                 }
                 switch (name) {
                     case "combatStart":
-                        return expandToNode `
-                            Hooks.on("combatStart", async (${hook.params.map(p => p.name).join(", ")}) => {
-                                ${generateBody()}
-                            });
+                        return expandToNode `
+                            Hooks.on("combatStart", async (${hook.params.map(p => p.name).join(", ")}) => {
+                                ${generateBody()}
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "combatEnd":
-                        return expandToNode `
-                            Hooks.on("deleteCombat", async (${hook.params.map(p => p.name).join(", ")}) => {
-                                ${generateBody()}
-                            });
+                        return expandToNode `
+                            Hooks.on("deleteCombat", async (${hook.params.map(p => p.name).join(", ")}) => {
+                                ${generateBody()}
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "roundStart":
-                        return expandToNode `
-                            Hooks.on("combatRound", async (combat, updateData, updateOptions) => {
-                                const roundStart = async (${hook.params.map(p => p.name).join(", ")}) => {
-                                    ${generateBody()}
-                                }
-
-                                if (updateData.turn == 0) {
-                                    await roundStart(updateData.round);
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("combatRound", async (combat, updateData, updateOptions) => {
+                                const roundStart = async (${hook.params.map(p => p.name).join(", ")}) => {
+                                    ${generateBody()}
+                                }
+
+                                if (updateData.turn == 0) {
+                                    await roundStart(updateData.round);
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "roundEnd":
-                        return expandToNode `
-                            Hooks.on("combatRound", async (combat, updateData, updateOptions) => {
-                                const roundEnd = async (${hook.params.map(p => p.name).join(", ")}) => {
-                                    ${generateBody()}
-                                }
-                            
-                                if (updateData.round > 0) {
-                                    roundEnd(updateData.round - 1);
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("combatRound", async (combat, updateData, updateOptions) => {
+                                const roundEnd = async (${hook.params.map(p => p.name).join(", ")}) => {
+                                    ${generateBody()}
+                                }
+                            
+                                if (updateData.round > 0) {
+                                    roundEnd(updateData.round - 1);
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "turnStart":
-                        return expandToNode `
-                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
-                                const turnStart = async () => {
-                                    ${generateBody()}
-                                }
-                                if (combat.combatant.actor.uuid == document.uuid) {
-                                    await turnStart();
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
+                                const turnStart = async () => {
+                                    ${generateBody()}
+                                }
+                                if (combat.combatant.actor.uuid == document.uuid) {
+                                    await turnStart();
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "turnEnd":
-                        return expandToNode `
-                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
-                                const turnEnd = async () => {
-                                    ${generateBody()}
-                                }
-                                const previousCombatant = combat.combatants.get(combat.previous?.combatantId);
-                                if (previousCombatant?.actor?.uuid == document.uuid) {
-                                    await turnEnd();
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
+                                const turnEnd = async () => {
+                                    ${generateBody()}
+                                }
+                                const previousCombatant = combat.combatants.get(combat.previous?.combatantId);
+                                if (previousCombatant?.actor?.uuid == document.uuid) {
+                                    await turnEnd();
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "turnIsNext":
-                        return expandToNode `
-                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
-                                const turnIsNext = async () => {
-                                    ${generateBody()}
-                                };
-                                if (combat.nextCombatant.actor.uuid == document.uuid) {
-                                    await turnIsNext();
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("combatTurnChange", async (combat, updateData, updateOptions) => {
+                                const turnIsNext = async () => {
+                                    ${generateBody()}
+                                };
+                                if (combat.nextCombatant.actor.uuid == document.uuid) {
+                                    await turnIsNext();
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "death":
-                        return expandToNode `
-                            Hooks.on("death", async (deadDocument) => {
-                                const onDeath = async () => {
-                                    ${generateBody()}
-                                };
-                                if ( deadDocument.uuid == document.uuid ) {
-                                    await onDeath();
-                                }
-                            });
+                        return expandToNode `
+                            Hooks.on("death", async (deadDocument) => {
+                                const onDeath = async () => {
+                                    ${generateBody()}
+                                };
+                                if ( deadDocument.uuid == document.uuid ) {
+                                    await onDeath();
+                                }
+                            });
                         `.appendNewLineIfNotEmpty();
                     case "preApplyDamage":
                     case "preApplyHealing":
                     case "preApplyTemp":
-                        return expandToNode `
-                            if (game.system.documentHooks.has("${name}-" + this.uuid)) return;
-                            const on${name} = async (document, context) => {
-                                const preApply = async (${hook.params.map(p => p.name).join(", ")}) => {
-                                    ${generateBody()}
-                                    return ${(_a = hook.params.shift()) === null || _a === void 0 ? void 0 : _a.name};
-                                }
-                                if (document.uuid == this.uuid) {
-                                    context.amount = await preApply(context.amount, context.damageType, context.damageMetadata);
-                                }
-                            }
-                            game.system.documentHooks.set("${name}-" + this.uuid, on${name});
-                            Hooks.on("${name}", on${name});
+                        return expandToNode `
+                            if (game.system.documentHooks.has("${name}-" + this.uuid)) return;
+                            const on${name} = async (document, context) => {
+                                const preApply = async (${hook.params.map(p => p.name).join(", ")}) => {
+                                    ${generateBody()}
+                                    return ${(_a = hook.params.shift()) === null || _a === void 0 ? void 0 : _a.name};
+                                }
+                                if (document.uuid == this.uuid) {
+                                    context.amount = await preApply(context.amount, context.damageType, context.damageMetadata);
+                                }
+                            }
+                            game.system.documentHooks.set("${name}-" + this.uuid, on${name});
+                            Hooks.on("${name}", on${name});
                         `.appendNewLineIfNotEmpty();
                     case "appliedDamage":
                     case "appliedHealing":
                     case "appliedTemp":
-                        return expandToNode `
-                            if (game.system.documentHooks.has("${name}-" + this.uuid)) return;
-                            const on${name} = async (document, context) => {
-                                const applied = async (${hook.params.map(p => p.name).join(", ")}) => {
-                                    ${generateBody()}
-                                }
-                                if (document.uuid == this.uuid) {
-                                    await applied(context.amount, context.damageType, context.damageMetadata);
-                                }
-                            };
-                            game.system.documentHooks.set("${name}-" + this.uuid, on${name});
-                            Hooks.on("${name}", on${name});
+                        return expandToNode `
+                            if (game.system.documentHooks.has("${name}-" + this.uuid)) return;
+                            const on${name} = async (document, context) => {
+                                const applied = async (${hook.params.map(p => p.name).join(", ")}) => {
+                                    ${generateBody()}
+                                }
+                                if (document.uuid == this.uuid) {
+                                    await applied(context.amount, context.damageType, context.damageMetadata);
+                                }
+                            };
+                            game.system.documentHooks.set("${name}-" + this.uuid, on${name});
+                            Hooks.on("${name}", on${name});
                         `.appendNewLineIfNotEmpty();
                     default:
-                        return expandToNode `
-                        Hooks.on("${name}", async (${hook.params.map(p => p.name).join(", ")}) => { 
-                            ${generateBody()}
-                        });
+                        return expandToNode `
+                        Hooks.on("${name}", async (${hook.params.map(p => p.name).join(", ")}) => { 
+                            ${generateBody()}
+                        });
                         `.appendNewLineIfNotEmpty();
                 }
             }
-            return expandToNode `
-                _register${document.name}Hooks(document) {
-                    ${joinToNode(hooks, generateHook, { appendNewLineIfNotEmpty: true })}
-                }
+            return expandToNode `
+                _register${document.name}Hooks(document) {
+                    ${joinToNode(hooks, generateHook, { appendNewLineIfNotEmpty: true })}
+                }
             `.appendNewLineIfNotEmpty().appendNewLine();
         }
         // Number fields whose `initial:` is an expression (method block) can't be a static schema
@@ -1094,27 +1094,27 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 });
                 if (exprInitialFields.length === 0)
                     return undefined;
-                return expandToNode `
-                    case "${document.name.toLowerCase()}": {
+                return expandToNode `
+                    case "${document.name.toLowerCase()}": {
                         ${joinToNode(exprInitialFields, f => {
                     const initParam = f.params.find(p => isNumberParamInitial(p));
                     const field = f.name.toLowerCase();
-                    return expandToNode `
-                            // ${f.name} expression initial
-                            if (foundry.utils.getProperty(data, "system.${field}") === undefined) {
-                                const ${field}InitialFunc = (system) => {
-                                    const context = { object: this };
-                                    ${translateExpression(entry, id, initParam.value, true, f)}
-                                };
-                                const ${field}Initial = ${field}InitialFunc(this.system);
-                                if (typeof ${field}Initial === "number" && !isNaN(${field}Initial)) {
-                                    initialUpdates["system.${field}"] = ${field}Initial;
-                                }
-                            }
+                    return expandToNode `
+                            // ${f.name} expression initial
+                            if (foundry.utils.getProperty(data, "system.${field}") === undefined) {
+                                const ${field}InitialFunc = (system) => {
+                                    const context = { object: this };
+                                    ${translateExpression(entry, id, initParam.value, true, f)}
+                                };
+                                const ${field}Initial = ${field}InitialFunc(this.system);
+                                if (typeof ${field}Initial === "number" && !isNaN(${field}Initial)) {
+                                    initialUpdates["system.${field}"] = ${field}Initial;
+                                }
+                            }
                             `;
-                }, { appendNewLineIfNotEmpty: true })}
-                        break;
-                    }
+                }, { appendNewLineIfNotEmpty: true })}
+                        break;
+                    }
                 `.appendNewLineIfNotEmpty();
             }
             const cases = entry.documents
@@ -1123,300 +1123,300 @@ export function generateExtendedDocumentClasses(entry, id, destination) {
                 .filter((x) => x !== undefined);
             if (cases.length === 0)
                 return expandToNode ``;
-            return expandToNode `
-                /** @override */
-                async _preCreate(data, options, user) {
-                    await super._preCreate(data, options, user);
-                    const initialUpdates = {};
-                    switch ( this.type ) {
-                        ${joinToNode(cases, c => c, { appendNewLineIfNotEmpty: true })}
-                    }
-                    if (Object.keys(initialUpdates).length > 0) this.updateSource(initialUpdates);
-                }
+            return expandToNode `
+                /** @override */
+                async _preCreate(data, options, user) {
+                    await super._preCreate(data, options, user);
+                    const initialUpdates = {};
+                    switch ( this.type ) {
+                        ${joinToNode(cases, c => c, { appendNewLineIfNotEmpty: true })}
+                    }
+                    if (Object.keys(initialUpdates).length > 0) this.updateSource(initialUpdates);
+                }
             `.appendNewLineIfNotEmpty();
         }
-        const fileNode = expandToNode `
-            export default class ${entry.config.name}${type} extends ${type} {
-                /** @override */
-                prepareDerivedData() {
-                    switch ( this.type ) {
-                        ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => `case "${document.name.toLowerCase()}": return this._prepare${document.name}DerivedData();`, { appendNewLineIfNotEmpty: true })}
-                    }
-                }
-
-                /* -------------------------------------------- */
-
-                ${generateExpressionInitials()}
-
-                /* -------------------------------------------- */
-
-                ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => generateDerivedData(document), { appendNewLineIfNotEmpty: true })}
-            
-                /* -------------------------------------------- */
-
-                ${generateDeltas(entry.documents)}
-
-                /* -------------------------------------------- */
-
-                reapplyActiveEffectsForName(name) {
-                    if (this.documentName !== "Actor") return;
-                    for (const effect of this.appliedEffects) {
-                        for (const change of effect.changes) {
-                            if (change.key == name) {
-                                const changes = effect.apply(this, change);
-                                Object.assign(this.overrides, changes);
-                            }
-                        }
-                    }
-                }
-
-                /* -------------------------------------------- */
-
-                /** @override */
-                _initialize(options = {}) {
-                    super._initialize(options);
-                    
-                    switch ( this.type ) {
-                        ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => `case "${document.name.toLowerCase()}": return this._register${document.name}Hooks(this);`, { appendNewLineIfNotEmpty: true })}
-                    }
-                }
-
-                /* -------------------------------------------- */
-
-                ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), generateDocumentHooks, { appendNewLineIfNotEmpty: true })}
-
-                /* -------------------------------------------- */
-
-                // In order to support per-document type effects, we need to override the allApplicableEffects method to yield virtualized effects with only changes that match the document type
-                /** @override */
-                *allApplicableEffects() {
-                    const systemFlags = this.flags["${id}"] ?? {};
-                    const edit = systemFlags["edit-mode"] ?? true;
-
-                    function getTypedEffect(type, edit, effect, source) {
-                        // Pre-build data to avoid mutating ActiveEffect getters (changes is getter-only in v14).
-                        const data = foundry.utils.duplicate(effect);
-                        data.changes = (data.changes ?? []).filter(c => c.key.startsWith(type));
-                        for ( const change of data.changes ) {
-                            if (change.mode == 0) continue;
-                            change.key = change.key.replace(type + ".", "");
-                        }
-                        if ( edit ) data.disabled = true;
-                        data.flags ??= {};
-                        data.flags["${id}"] ??= {};
-                        data.flags["${id}"].source = source;
-                        return new ActiveEffect(data, {parent: effect.parent});
-                    }
-
-                    for ( const effect of this.effects ) {
-                        yield getTypedEffect(this.type, edit, effect, game.i18n.localize("Self"));
-                    }
-                    ${type == "Actor" ? expandToNode `
-                    for ( const item of this.items ) {
-                        for ( const effect of item.effects ) {
-                            if ( effect.transfer ) yield getTypedEffect(this.type, edit, effect, item.name);
-                        }
-                    }
-                    `.appendNewLine() : ""}
-                }
-
-
-                /* -------------------------------------------- */
-
-                _onCreateDescendantDocuments(parent, collection, documents, data, options, userId) {
-                    super._onCreateDescendantDocuments(parent, collection, documents, data, options, userId);
-
-                    for (const document of documents) {
-                        if (document.documentName !== "ActiveEffect") continue;
-                        
-                        for (const change of document.changes) {
-                            if (change.mode != 0) continue;
-                            const customMode = foundry.utils.getProperty(document.flags["${id}"], change.key + "-custommode");
-                            switch (customMode) {
-                                case 1: // Add Once
-                                    this._effectAddOnce(parent, document, change);
-                                    break;
-                                default:
-                                    console.error("Unknown custom mode", customMode);
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                /* -------------------------------------------- */
-
-                _effectAddOnce(parent, ae, change) {
-                    console.dir("AddOnce", parent, ae, change);
-
-                    const key = change.key.replace(parent.type + ".", "");
-                    const currentValue = foundry.utils.getProperty(parent, key);
-
-                    // Create an update for the parent
-                    const update = {
-                        [key]: currentValue + parseInt(change.value)
-                    };
-                    parent.update(update);
-
-                    // Create a chat card
-                    const chatData = {
-                        user: game.user._id,
-                        speaker: ChatMessage.getSpeaker({ actor: parent }),
-                        content: \`<p>Added "\${ae.name}" once</p>\`
-                    };
-                    ChatMessage.create(chatData);
-                }
-
-                /* -------------------------------------------- */
-                
-                static async createDialog(data = {}, { parent = null, pack = null, types = null, ...options } = {}) {
-                    types ??= game.documentTypes[this.documentName].filter(t => (t !== CONST.BASE_DOCUMENT_TYPE) && (CONFIG[this.documentName].typeCreatables[t] !== false));
-                    if (!types.length) return null;
-
-                    const collection = parent ? null : pack ? game.packs.get(pack) : game.collections.get(this.documentName);
-                    const folders = collection?._formatFolderSelectOptions() ?? [];
-
-                    const label = game.i18n.localize(this.metadata.label);
-                    const title = game.i18n.format("DOCUMENT.Create", { type: label });
-                    const name = data.name || game.i18n.format("DOCUMENT.New", { type: label });
-
-                    let type = data.type || CONFIG[this.documentName]?.defaultType;
-                    if (!types.includes(type)) type = types[0];
-
-                    // If there's only one type, no need to prompt
-                    if (types.length === 1) {
-                        let createName = this.defaultName();
-                        const createData = {
-                            name: createName,
-                            type
-                        };
-                        return this.create(createData, { parent, pack, renderSheet: true });
-                    }
-                    
-                    const createResponse = await game.system.documentCreateDialog.prompt({
-                        type,
-                        types: types.reduce((arr, typer) => {
-                            arr.push({
-                                type: typer,
-                                label: game.i18n.has(typer) ? game.i18n.localize(typer) : typer,
-                                icon: this.getDefaultArtwork({ type: typer })?.img ?? "icons/svg/item-bag.svg",
-                                description: CONFIG[this.documentName]?.typeDescriptions?.[typer] ?? "",
-                                selected: type === typer
-                            });
-                            return arr;
-                        }, []).sort((a, b) => a.label.localeCompare(b.label, game.i18n.lang)),
-                        name,
-                        title,
-                        label,
-                        folders,
-                        folder: data.folder
-                    });
-                    
-                    const createData = foundry.utils.mergeObject(data, createResponse, { inplace: false });
-                    createData.type = createData.type || type;
-                    // The type field can come back as the autocomplete's display label (e.g. the
-                    // localized "Basic Hero") rather than the machine type ("basichero"). Lower-casing
-                    // alone doesn't recover a multi-word machine type, so map the response back against
-                    // the known types -- matching either the raw machine type or its displayed label --
-                    // and fall back to the resolved default type if nothing matches.
-                    if (!types.includes(createData.type)) {
-                        createData.type = types.find(t => t === createData.type || (game.i18n.has(t) ? game.i18n.localize(t) : t) === createData.type) ?? type;
-                    }
-                    if (!createData.folder) delete createData.folder;
-                    if (!createData.name?.trim()) createData.name = this.defaultName();
-                    return this.create(createData, { parent, pack, renderSheet: true });
-
-                    const content = await renderTemplate("systems/${id}/system/templates/document-create.hbs", {
-                        folders, name, type,
-                        folder: data.folder,
-                        hasFolders: folders.length > 0,
-                        types: types.reduce((arr, typer) => {
-                            arr.push({
-                                type: typer,
-                                label: game.i18n.has(typer) ? game.i18n.localize(typer) : typer,
-                                icon: this.getDefaultArtwork({ type: typer })?.img ?? "icons/svg/item-bag.svg",
-                                description: CONFIG[this.documentName]?.typeDescriptions?.[typer] ?? "",
-                                selected: type === typer
-                            });
-                            return arr;
-                        }, []).sort((a, b) => a.label.localeCompare(b.label, game.i18n.lang))
-                    });
-                    return Dialog.prompt({
-                        title, content,
-                        label: title,
-                        render: html => {
-                            const app = html.closest(".app");
-                            const folder = app.querySelector("select");
-                            if (folder) app.querySelector(".dialog-buttons").insertAdjacentElement("afterbegin", folder);
-                            app.querySelectorAll(".window-header .header-button").forEach(btn => {
-                                const label = btn.innerText;
-                                const icon = btn.querySelector("i");
-                                btn.innerHTML = icon.outerHTML;
-                                btn.dataset.tooltip = label;
-                                btn.setAttribute("aria-label", label);
-                            });
-                            app.querySelector(".document-name").select();
-                        },
-                        callback: html => {
-                            const form = html.querySelector("form");
-                            const fd = new FormDataExtended(form);
-                            const createData = foundry.utils.mergeObject(data, fd.object, { inplace: false });
-          
-                        },
-                        rejectClose: false,
-                        options: { ...options, jQuery: false, width: 700, height: 'auto', classes: ["${id}", "create-document", "dialog"] }
-                    });
-                }
-
-                /* -------------------------------------------- */
-
-                static getDefaultArtwork(itemData = {}) {
-                    const { type } = itemData;
-                    const { img, texture } = super.getDefaultArtwork(itemData);
-                    return { img: CONFIG[this.documentName]?.typeArtworks?.[type] ?? img, texture: texture };
-                }
-
-                /* -------------------------------------------- */
-
-                getRollData() {
-                    const data = super.getRollData();
-                    const rollData = foundry.utils.duplicate(data);
-                    rollData.system = this.system;
-                    return rollData;
-                }
-
-                /* -------------------------------------------- */
-
-                /** @override */
-                async modifyTokenAttribute(attribute, value, isDelta, isBar) {
-                    const resource = foundry.utils.getProperty(this.system, attribute);
-
-                    if (isDelta && value < 0) {
-                        // Apply to temp first
-                        resource.temp += value;
-
-                        // If temp is negative, apply to value
-                        if (resource.temp < 0) {
-                            resource.value += resource.temp;
-                            resource.temp = 0;
-                        }
-                        await this.update({ ["system." + attribute]: resource });
-                        return;
-                    }
-
-                    return super.modifyTokenAttribute(attribute, value, isDelta, isBar);
-                }
-
-                ${type == "Actor" ? expandToNode `
-/* -------------------------------------------- */
-
-getInitiativeFormula() {
-    switch ( this.type ) {
-        ${joinToNode(entry.documents.filter(d => isActor(d)), document => generateInitiativeFormula(document), { appendNewLineIfNotEmpty: true })}
-    }
-}
-`.appendNewLine() : ""}
-            }
+        const fileNode = expandToNode `
+            export default class ${entry.config.name}${type} extends ${type} {
+                /** @override */
+                prepareDerivedData() {
+                    switch ( this.type ) {
+                        ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => `case "${document.name.toLowerCase()}": return this._prepare${document.name}DerivedData();`, { appendNewLineIfNotEmpty: true })}
+                    }
+                }
+
+                /* -------------------------------------------- */
+
+                ${generateExpressionInitials()}
+
+                /* -------------------------------------------- */
+
+                ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => generateDerivedData(document), { appendNewLineIfNotEmpty: true })}
+            
+                /* -------------------------------------------- */
+
+                ${generateDeltas(entry.documents)}
+
+                /* -------------------------------------------- */
+
+                reapplyActiveEffectsForName(name) {
+                    if (this.documentName !== "Actor") return;
+                    for (const effect of this.appliedEffects) {
+                        for (const change of effect.changes) {
+                            if (change.key == name) {
+                                const changes = effect.apply(this, change);
+                                Object.assign(this.overrides, changes);
+                            }
+                        }
+                    }
+                }
+
+                /* -------------------------------------------- */
+
+                /** @override */
+                _initialize(options = {}) {
+                    super._initialize(options);
+                    
+                    switch ( this.type ) {
+                        ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), document => `case "${document.name.toLowerCase()}": return this._register${document.name}Hooks(this);`, { appendNewLineIfNotEmpty: true })}
+                    }
+                }
+
+                /* -------------------------------------------- */
+
+                ${joinToNode(entry.documents.filter(d => type == "Actor" ? isActor(d) : isItem(d)), generateDocumentHooks, { appendNewLineIfNotEmpty: true })}
+
+                /* -------------------------------------------- */
+
+                // In order to support per-document type effects, we need to override the allApplicableEffects method to yield virtualized effects with only changes that match the document type
+                /** @override */
+                *allApplicableEffects() {
+                    const systemFlags = this.flags["${id}"] ?? {};
+                    const edit = systemFlags["edit-mode"] ?? true;
+
+                    function getTypedEffect(type, edit, effect, source) {
+                        // Pre-build data to avoid mutating ActiveEffect getters (changes is getter-only in v14).
+                        const data = foundry.utils.duplicate(effect);
+                        data.changes = (data.changes ?? []).filter(c => c.key.startsWith(type));
+                        for ( const change of data.changes ) {
+                            if (change.mode == 0) continue;
+                            change.key = change.key.replace(type + ".", "");
+                        }
+                        if ( edit ) data.disabled = true;
+                        data.flags ??= {};
+                        data.flags["${id}"] ??= {};
+                        data.flags["${id}"].source = source;
+                        return new ActiveEffect(data, {parent: effect.parent});
+                    }
+
+                    for ( const effect of this.effects ) {
+                        yield getTypedEffect(this.type, edit, effect, game.i18n.localize("Self"));
+                    }
+                    ${type == "Actor" ? expandToNode `
+                    for ( const item of this.items ) {
+                        for ( const effect of item.effects ) {
+                            if ( effect.transfer ) yield getTypedEffect(this.type, edit, effect, item.name);
+                        }
+                    }
+                    `.appendNewLine() : ""}
+                }
+
+
+                /* -------------------------------------------- */
+
+                _onCreateDescendantDocuments(parent, collection, documents, data, options, userId) {
+                    super._onCreateDescendantDocuments(parent, collection, documents, data, options, userId);
+
+                    for (const document of documents) {
+                        if (document.documentName !== "ActiveEffect") continue;
+                        
+                        for (const change of document.changes) {
+                            if (change.mode != 0) continue;
+                            const customMode = foundry.utils.getProperty(document.flags["${id}"], change.key + "-custommode");
+                            switch (customMode) {
+                                case 1: // Add Once
+                                    this._effectAddOnce(parent, document, change);
+                                    break;
+                                default:
+                                    console.error("Unknown custom mode", customMode);
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                /* -------------------------------------------- */
+
+                _effectAddOnce(parent, ae, change) {
+                    console.dir("AddOnce", parent, ae, change);
+
+                    const key = change.key.replace(parent.type + ".", "");
+                    const currentValue = foundry.utils.getProperty(parent, key);
+
+                    // Create an update for the parent
+                    const update = {
+                        [key]: currentValue + parseInt(change.value)
+                    };
+                    parent.update(update);
+
+                    // Create a chat card
+                    const chatData = {
+                        user: game.user._id,
+                        speaker: ChatMessage.getSpeaker({ actor: parent }),
+                        content: \`<p>Added "\${ae.name}" once</p>\`
+                    };
+                    ChatMessage.create(chatData);
+                }
+
+                /* -------------------------------------------- */
+                
+                static async createDialog(data = {}, { parent = null, pack = null, types = null, ...options } = {}) {
+                    types ??= game.documentTypes[this.documentName].filter(t => (t !== CONST.BASE_DOCUMENT_TYPE) && (CONFIG[this.documentName].typeCreatables[t] !== false));
+                    if (!types.length) return null;
+
+                    const collection = parent ? null : pack ? game.packs.get(pack) : game.collections.get(this.documentName);
+                    const folders = collection?._formatFolderSelectOptions() ?? [];
+
+                    const label = game.i18n.localize(this.metadata.label);
+                    const title = game.i18n.format("DOCUMENT.Create", { type: label });
+                    const name = data.name || game.i18n.format("DOCUMENT.New", { type: label });
+
+                    let type = data.type || CONFIG[this.documentName]?.defaultType;
+                    if (!types.includes(type)) type = types[0];
+
+                    // If there's only one type, no need to prompt
+                    if (types.length === 1) {
+                        let createName = this.defaultName();
+                        const createData = {
+                            name: createName,
+                            type
+                        };
+                        return this.create(createData, { parent, pack, renderSheet: true });
+                    }
+                    
+                    const createResponse = await game.system.documentCreateDialog.prompt({
+                        type,
+                        types: types.reduce((arr, typer) => {
+                            arr.push({
+                                type: typer,
+                                label: game.i18n.has(typer) ? game.i18n.localize(typer) : typer,
+                                icon: this.getDefaultArtwork({ type: typer })?.img ?? "icons/svg/item-bag.svg",
+                                description: CONFIG[this.documentName]?.typeDescriptions?.[typer] ?? "",
+                                selected: type === typer
+                            });
+                            return arr;
+                        }, []).sort((a, b) => a.label.localeCompare(b.label, game.i18n.lang)),
+                        name,
+                        title,
+                        label,
+                        folders,
+                        folder: data.folder
+                    });
+                    
+                    const createData = foundry.utils.mergeObject(data, createResponse, { inplace: false });
+                    createData.type = createData.type || type;
+                    // The type field can come back as the autocomplete's display label (e.g. the
+                    // localized "Basic Hero") rather than the machine type ("basichero"). Lower-casing
+                    // alone doesn't recover a multi-word machine type, so map the response back against
+                    // the known types -- matching either the raw machine type or its displayed label --
+                    // and fall back to the resolved default type if nothing matches.
+                    if (!types.includes(createData.type)) {
+                        createData.type = types.find(t => t === createData.type || (game.i18n.has(t) ? game.i18n.localize(t) : t) === createData.type) ?? type;
+                    }
+                    if (!createData.folder) delete createData.folder;
+                    if (!createData.name?.trim()) createData.name = this.defaultName();
+                    return this.create(createData, { parent, pack, renderSheet: true });
+
+                    const content = await renderTemplate("systems/${id}/system/templates/document-create.hbs", {
+                        folders, name, type,
+                        folder: data.folder,
+                        hasFolders: folders.length > 0,
+                        types: types.reduce((arr, typer) => {
+                            arr.push({
+                                type: typer,
+                                label: game.i18n.has(typer) ? game.i18n.localize(typer) : typer,
+                                icon: this.getDefaultArtwork({ type: typer })?.img ?? "icons/svg/item-bag.svg",
+                                description: CONFIG[this.documentName]?.typeDescriptions?.[typer] ?? "",
+                                selected: type === typer
+                            });
+                            return arr;
+                        }, []).sort((a, b) => a.label.localeCompare(b.label, game.i18n.lang))
+                    });
+                    return Dialog.prompt({
+                        title, content,
+                        label: title,
+                        render: html => {
+                            const app = html.closest(".app");
+                            const folder = app.querySelector("select");
+                            if (folder) app.querySelector(".dialog-buttons").insertAdjacentElement("afterbegin", folder);
+                            app.querySelectorAll(".window-header .header-button").forEach(btn => {
+                                const label = btn.innerText;
+                                const icon = btn.querySelector("i");
+                                btn.innerHTML = icon.outerHTML;
+                                btn.dataset.tooltip = label;
+                                btn.setAttribute("aria-label", label);
+                            });
+                            app.querySelector(".document-name").select();
+                        },
+                        callback: html => {
+                            const form = html.querySelector("form");
+                            const fd = new FormDataExtended(form);
+                            const createData = foundry.utils.mergeObject(data, fd.object, { inplace: false });
+          
+                        },
+                        rejectClose: false,
+                        options: { ...options, jQuery: false, width: 700, height: 'auto', classes: ["${id}", "create-document", "dialog"] }
+                    });
+                }
+
+                /* -------------------------------------------- */
+
+                static getDefaultArtwork(itemData = {}) {
+                    const { type } = itemData;
+                    const { img, texture } = super.getDefaultArtwork(itemData);
+                    return { img: CONFIG[this.documentName]?.typeArtworks?.[type] ?? img, texture: texture };
+                }
+
+                /* -------------------------------------------- */
+
+                getRollData() {
+                    const data = super.getRollData();
+                    const rollData = foundry.utils.duplicate(data);
+                    rollData.system = this.system;
+                    return rollData;
+                }
+
+                /* -------------------------------------------- */
+
+                /** @override */
+                async modifyTokenAttribute(attribute, value, isDelta, isBar) {
+                    const resource = foundry.utils.getProperty(this.system, attribute);
+
+                    if (isDelta && value < 0) {
+                        // Apply to temp first
+                        resource.temp += value;
+
+                        // If temp is negative, apply to value
+                        if (resource.temp < 0) {
+                            resource.value += resource.temp;
+                            resource.temp = 0;
+                        }
+                        await this.update({ ["system." + attribute]: resource });
+                        return;
+                    }
+
+                    return super.modifyTokenAttribute(attribute, value, isDelta, isBar);
+                }
+
+                ${type == "Actor" ? expandToNode `
+/* -------------------------------------------- */
+
+getInitiativeFormula() {
+    switch ( this.type ) {
+        ${joinToNode(entry.documents.filter(d => isActor(d)), document => generateInitiativeFormula(document), { appendNewLineIfNotEmpty: true })}
+    }
+}
+`.appendNewLine() : ""}
+            }
             `.appendNewLineIfNotEmpty();
         fs.writeFileSync(generatedFilePath, toString(fileNode));
     }