warscript 0.0.1-dev.1d1ce87 → 0.0.1-dev.1d3eae2

package/engine/object-field/unit.lua

@@ -18,8 +18,11 @@ local convertUnitStringField = ConvertUnitStringField
 local convertUnitWeaponIntegerField = ConvertUnitWeaponIntegerField
 local getUnitWeaponIntegerField = BlzGetUnitWeaponIntegerField
 local setUnitWeaponIntegerField = BlzSetUnitWeaponIntegerField
+local getUnitFlyHeight = GetUnitFlyHeight
+local setUnitFlyHeight = SetUnitFlyHeight
 local getUnitPropulsionWindow = GetUnitPropWindow
 local setUnitPropulsionWindow = SetUnitPropWindow
+local setUnitScale = SetUnitScale
 ____exports.UnitField = __TS__Class()
 local UnitField = ____exports.UnitField
 UnitField.name = "UnitField"
@@ -38,6 +41,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitBooleanField = __TS__Class()
 local UnitBooleanField = ____exports.UnitBooleanField
 UnitBooleanField.name = "UnitBooleanField"
@@ -59,6 +69,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitBooleanField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitFloatField = __TS__Class()
 local UnitFloatField = ____exports.UnitFloatField
 UnitFloatField.name = "UnitFloatField"
@@ -80,6 +97,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitFloatField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitIntegerField = __TS__Class()
 local UnitIntegerField = ____exports.UnitIntegerField
 UnitIntegerField.name = "UnitIntegerField"
@@ -101,6 +125,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitIntegerField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitStringField = __TS__Class()
 local UnitStringField = ____exports.UnitStringField
 UnitStringField.name = "UnitStringField"
@@ -122,6 +153,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitStringField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitWeaponField = __TS__Class()
 local UnitWeaponField = ____exports.UnitWeaponField
 UnitWeaponField.name = "UnitWeaponField"
@@ -238,6 +276,17 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitFlyHeightField = __TS__Class()
+local UnitFlyHeightField = ____exports.UnitFlyHeightField
+UnitFlyHeightField.name = "UnitFlyHeightField"
+__TS__ClassExtends(UnitFlyHeightField, ____exports.UnitFloatField)
+function UnitFlyHeightField.prototype.getNativeFieldValue(self, instance)
+    return getUnitFlyHeight(instance.handle)
+end
+function UnitFlyHeightField.prototype.setNativeFieldValue(self, instance, value)
+    setUnitFlyHeight(instance.handle, value, 100000)
+    return true
+end
 ____exports.UnitPropulsionWindowField = __TS__Class()
 local UnitPropulsionWindowField = ____exports.UnitPropulsionWindowField
 UnitPropulsionWindowField.name = "UnitPropulsionWindowField"
@@ -249,4 +298,16 @@ function UnitPropulsionWindowField.prototype.setNativeFieldValue(self, instance,
     setUnitPropulsionWindow(instance.handle, value)
     return true
 end
+____exports.UnitHealthRegenerationTypeField = __TS__Class()
+local UnitHealthRegenerationTypeField = ____exports.UnitHealthRegenerationTypeField
+UnitHealthRegenerationTypeField.name = "UnitHealthRegenerationTypeField"
+__TS__ClassExtends(UnitHealthRegenerationTypeField, ____exports.UnitIntegerField)
+____exports.UnitScalingValueField = __TS__Class()
+local UnitScalingValueField = ____exports.UnitScalingValueField
+UnitScalingValueField.name = "UnitScalingValueField"
+__TS__ClassExtends(UnitScalingValueField, ____exports.UnitFloatField)
+function UnitScalingValueField.prototype.setNativeFieldValue(self, instance, value)
+    setUnitScale(instance.handle, value, value, value)
+    return UnitScalingValueField.____super.prototype.setNativeFieldValue(self, instance, value)
+end
 return ____exports

package/engine/object-field.d.ts

@@ -36,7 +36,8 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
 ]> : never;
 export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
-type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
+export type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
+export type ObjectLevelFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, level: number, currentValue: ValueType, originalValue: ValueType) => ValueType;
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
@@ -88,7 +89,12 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
     getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    applyModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): void;
+    removeModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): boolean;
     trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
+    private getActualValue;
+    private setActualValue;
+    private calculateActualValue;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;

package/engine/object-field.lua

@@ -25,6 +25,7 @@ local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
 local ____lua_2Dmaps = require("utility.lua-maps")
 local emptyLuaMap = ____lua_2Dmaps.emptyLuaMap
 local getOrPut = ____lua_2Dmaps.getOrPut
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
 local ____arrays = require("utility.arrays")
 local emptyArray = ____arrays.emptyArray
@@ -99,7 +100,7 @@ function ObjectField.prototype.getValue(self, entry, includeModifiers)
         end
         return self.defaultValue
     end
-    if includeModifiers == false then
+    if not includeModifiers then
         local originalValueByInstance = self.originalValueByInstance
         if originalValueByInstance ~= nil then
             local originalValue = originalValueByInstance[entry]
@@ -123,6 +124,7 @@ function ObjectField.prototype.setValue(self, entry, value)
         defaultValueByObjectDataEntryId[entry.id] = value
         return true
     end
+    local previousOriginalValue
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[entry]
@@ -132,11 +134,34 @@ function ObjectField.prototype.setValue(self, entry, value)
                 originalValueByInstance = mutableWeakLuaMap()
                 self.originalValueByInstance = originalValueByInstance
             end
+            previousOriginalValue = originalValueByInstance[entry]
+            if value == previousOriginalValue then
+                return true
+            end
             originalValueByInstance[entry] = value
             value = self:calculateActualValue(entry)
         end
     end
-    return self:setActualValue(entry, value)
+    local previousValue = self:setActualValue(entry, value)
+    if previousValue == nil then
+        return false
+    end
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_2 = self.invokeValueChangeEvent
+        local ____entry_1 = entry
+        local ____previousOriginalValue_0 = previousOriginalValue
+        if ____previousOriginalValue_0 == nil then
+            ____previousOriginalValue_0 = previousValue
+        end
+        ____self_invokeValueChangeEvent_2(
+            self,
+            ____entry_1,
+            self,
+            ____previousOriginalValue_0,
+            value
+        )
+    end
+    return true
 end
 function ObjectField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
@@ -150,7 +175,13 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             originalValueByInstance = mutableWeakLuaMap()
             self.originalValueByInstance = originalValueByInstance
         end
-        originalValueByInstance[instance] = self:getActualValue(instance)
+        local ____originalValueByInstance_4 = originalValueByInstance
+        local ____instance_5 = instance
+        local ____originalValueByInstance_instance_3 = originalValueByInstance[instance]
+        if ____originalValueByInstance_instance_3 == nil then
+            ____originalValueByInstance_instance_3 = self:getActualValue(instance)
+        end
+        ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
         self:setActualValue(
             instance,
             self:calculateActualValue(instance)
@@ -196,22 +227,22 @@ function ObjectField.prototype.getActualValue(self, instance)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
         if defaultValue ~= nil or self.isGlobal then
-            local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_0 == nil then
-                ____self_valueByInstance_instance_0 = defaultValue
+            local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_6 == nil then
+                ____self_valueByInstance_instance_6 = defaultValue
             end
-            local ____self_valueByInstance_instance_0_1 = ____self_valueByInstance_instance_0
-            if ____self_valueByInstance_instance_0_1 == nil then
-                ____self_valueByInstance_instance_0_1 = self.defaultValue
+            local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
+            if ____self_valueByInstance_instance_6_7 == nil then
+                ____self_valueByInstance_instance_6_7 = self.defaultValue
             end
-            return ____self_valueByInstance_instance_0_1
+            return ____self_valueByInstance_instance_6_7
         end
     end
-    local ____temp_2 = self:getNativeFieldValue(instance)
-    if ____temp_2 == nil then
-        ____temp_2 = self.defaultValue
+    local ____temp_8 = self:getNativeFieldValue(instance)
+    if ____temp_8 == nil then
+        ____temp_8 = self.defaultValue
     end
-    return ____temp_2
+    return ____temp_8
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -219,39 +250,33 @@ function ObjectField.prototype.setActualValue(self, instance, value)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
         if defaultValue ~= nil or self.isGlobal then
-            local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_3 == nil then
-                ____self_valueByInstance_instance_3 = defaultValue
-            end
-            local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
-            if ____self_valueByInstance_instance_3_4 == nil then
-                ____self_valueByInstance_instance_3_4 = self.defaultValue
+            local ____self_valueByInstance_instance_9 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_9 == nil then
+                ____self_valueByInstance_instance_9 = defaultValue
             end
-            local previousValue = ____self_valueByInstance_instance_3_4
-            if value ~= previousValue then
-                self.valueByInstance[instance] = value
-                self:invokeValueChangeEvent(instance, self, previousValue, value)
+            local ____self_valueByInstance_instance_9_10 = ____self_valueByInstance_instance_9
+            if ____self_valueByInstance_instance_9_10 == nil then
+                ____self_valueByInstance_instance_9_10 = self.defaultValue
             end
-            return true
+            local previousValue = ____self_valueByInstance_instance_9_10
+            self.valueByInstance[instance] = value
+            return previousValue
         end
     end
     if not self:hasNativeFieldValue(objectDataEntryId) then
-        return false
+        return nil
     end
     local previousValue = self:getNativeFieldValue(instance)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(instance, value) then
-            return false
-        end
-        self:invokeValueChangeEvent(instance, self, previousValue, value)
+    if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
+        return nil
     end
-    return true
+    return previousValue
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
-    local ____opt_5 = self.originalValueByInstance
-    local originalValue = ____opt_5 and ____opt_5[instance]
-    local ____opt_7 = self.modifiersByInstance
-    local modifiers = ____opt_7 and ____opt_7[instance]
+    local ____opt_11 = self.originalValueByInstance
+    local originalValue = ____opt_11 and ____opt_11[instance]
+    local ____opt_13 = self.modifiersByInstance
+    local modifiers = ____opt_13 and ____opt_13[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then
@@ -316,17 +341,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_10
+                local ____temp_16
                 if index == nil then
-                    ____temp_10 = value
+                    ____temp_16 = value
                 else
-                    local ____value_index_9 = value[index + 1]
-                    if ____value_index_9 == nil then
-                        ____value_index_9 = self.defaultValue
+                    local ____value_index_15 = value[index + 1]
+                    if ____value_index_15 == nil then
+                        ____value_index_15 = self.defaultValue
                     end
-                    ____temp_10 = ____value_index_9
+                    ____temp_16 = ____value_index_15
                 end
-                return ____temp_10
+                return ____temp_16
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -336,17 +361,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
         if defaultValue ~= nil or self.isGlobal then
             local value = self.valueByInstance[entry] or defaultValue or emptyArray()
-            local ____temp_12
+            local ____temp_18
             if index == nil then
-                ____temp_12 = value
+                ____temp_18 = value
             else
-                local ____value_index_11 = value[index + 1]
-                if ____value_index_11 == nil then
-                    ____value_index_11 = self.defaultValue
+                local ____value_index_17 = value[index + 1]
+                if ____value_index_17 == nil then
+                    ____value_index_17 = self.defaultValue
                 end
-                ____temp_12 = ____value_index_11
+                ____temp_18 = ____value_index_17
             end
-            return ____temp_12
+            return ____temp_18
         end
     end
     if index ~= nil then
@@ -391,36 +416,22 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_13 = valueByLevel[level + 1]
-                if ____valueByLevel_index_13 == nil then
-                    ____valueByLevel_index_13 = self.defaultValue
+                local ____valueByLevel_index_19 = valueByLevel[level + 1]
+                if ____valueByLevel_index_19 == nil then
+                    ____valueByLevel_index_19 = self.defaultValue
                 end
-                return ____valueByLevel_index_13
+                return ____valueByLevel_index_19
             end
         end
         return self.defaultValue
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil or self.isGlobal then
-            local ____opt_14 = self.valueByInstance[entry]
-            local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
-            if ____temp_16 == nil then
-                ____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
-            end
-            local ____temp_16_17 = ____temp_16
-            if ____temp_16_17 == nil then
-                ____temp_16_17 = self.defaultValue
-            end
-            return ____temp_16_17
-        end
-    end
-    local ____temp_18 = self:getNativeFieldValue(entry, level)
-    if ____temp_18 == nil then
-        ____temp_18 = self.defaultValue
+    local ____opt_22 = self.originalValueByLevelByInstance
+    local ____opt_20 = ____opt_22 and ____opt_22[entry]
+    local originalValue = ____opt_20 and ____opt_20[level]
+    if originalValue ~= nil then
+        return originalValue
     end
-    return ____temp_18
+    return self:getActualValue(entry, level)
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -460,56 +471,93 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         valueByLevel[level + 1] = value
         return true
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    local objectDataEntryId = self:getObjectDataEntryId(entry)
-    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
-        if defaultValueByLevel ~= nil or self.isGlobal then
-            local valueByLevel = self.valueByInstance[entry]
-            if valueByLevel == nil then
-                valueByLevel = {}
-                self.valueByInstance[entry] = valueByLevel
-            end
-            local ____valueByLevel_index_19 = valueByLevel[level + 1]
-            if ____valueByLevel_index_19 == nil then
-                ____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
-            end
-            local ____valueByLevel_index_19_20 = ____valueByLevel_index_19
-            if ____valueByLevel_index_19_20 == nil then
-                ____valueByLevel_index_19_20 = self.defaultValue
+    local previousOriginalValue
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[entry]
+        if modifiers ~= nil and modifiers.size ~= 0 then
+            local originalValueByLevelByInstance = self.originalValueByLevelByInstance
+            if originalValueByLevelByInstance == nil then
+                originalValueByLevelByInstance = mutableWeakLuaMap()
+                self.originalValueByLevelByInstance = originalValueByLevelByInstance
             end
-            local previousValue = ____valueByLevel_index_19_20
-            if value ~= previousValue then
-                valueByLevel[level + 1] = value
-                self:invokeValueChangeEvent(
-                    entry,
-                    self,
-                    level,
-                    previousValue,
-                    value
-                )
+            local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
+            previousOriginalValue = originalValueByLevel[level]
+            if value == previousOriginalValue then
+                return true
             end
-            return true
+            originalValueByLevel[level] = value
+            value = self:calculateActualValue(entry, level)
         end
     end
-    if not self:hasNativeFieldValue(objectDataEntryId) then
+    local previousValue = self:setActualValue(entry, level, value)
+    if previousValue == nil then
         return false
     end
-    local previousValue = self:getNativeFieldValue(entry, level)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(entry, level, value) then
-            return false
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_26 = self.invokeValueChangeEvent
+        local ____entry_25 = entry
+        local ____previousOriginalValue_24 = previousOriginalValue
+        if ____previousOriginalValue_24 == nil then
+            ____previousOriginalValue_24 = previousValue
         end
-        self:invokeValueChangeEvent(
-            entry,
+        ____self_invokeValueChangeEvent_26(
+            self,
+            ____entry_25,
             self,
             level,
-            previousValue,
+            ____previousOriginalValue_24,
             value
         )
     end
     return true
 end
+function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance == nil then
+        modifiersByInstance = mutableWeakLuaMap()
+        self.modifiersByInstance = modifiersByInstance
+    end
+    if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
+        local originalValueByLevelByInstance = self.originalValueByLevelByInstance
+        if originalValueByLevelByInstance == nil then
+            originalValueByLevelByInstance = mutableWeakLuaMap()
+            self.originalValueByLevelByInstance = originalValueByLevelByInstance
+        end
+        local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
+        local levelCount = self:getLevelCount(instance)
+        for level = 0, levelCount - 1 do
+            local ____originalValueByLevel_level_27 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_27 == nil then
+                ____originalValueByLevel_level_27 = self:getActualValue(instance, level)
+            end
+            originalValueByLevel[level] = ____originalValueByLevel_level_27
+            self:setActualValue(
+                instance,
+                level,
+                self:calculateActualValue(instance, level)
+            )
+        end
+    end
+end
+function ObjectLevelField.prototype.removeModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[instance]
+        if modifiers ~= nil and modifiers:remove(modifier) then
+            local levelCount = self:getLevelCount(instance)
+            for level = 0, levelCount - 1 do
+                self:setActualValue(
+                    instance,
+                    level,
+                    self:calculateActualValue(instance, level)
+                )
+            end
+            return true
+        end
+    end
+    return false
+end
 function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
     if value ~= nil then
         if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
@@ -525,6 +573,79 @@ function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value
     end
     return self:setValue(entry, levelOrValue)
 end
+function ObjectLevelField.prototype.getActualValue(self, instance, level)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local ____opt_28 = self.valueByInstance[instance]
+            local ____temp_30 = ____opt_28 and ____opt_28[level + 1]
+            if ____temp_30 == nil then
+                ____temp_30 = (defaultValueByLevel or emptyArray())[level + 1]
+            end
+            local ____temp_30_31 = ____temp_30
+            if ____temp_30_31 == nil then
+                ____temp_30_31 = self.defaultValue
+            end
+            return ____temp_30_31
+        end
+    end
+    local ____temp_32 = self:getNativeFieldValue(instance, level)
+    if ____temp_32 == nil then
+        ____temp_32 = self.defaultValue
+    end
+    return ____temp_32
+end
+function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local valueByLevel = self.valueByInstance[instance]
+            if valueByLevel == nil then
+                valueByLevel = {}
+                self.valueByInstance[instance] = valueByLevel
+            end
+            local ____valueByLevel_index_33 = valueByLevel[level + 1]
+            if ____valueByLevel_index_33 == nil then
+                ____valueByLevel_index_33 = (defaultValueByLevel or emptyArray())[level + 1]
+            end
+            local ____valueByLevel_index_33_34 = ____valueByLevel_index_33
+            if ____valueByLevel_index_33_34 == nil then
+                ____valueByLevel_index_33_34 = self.defaultValue
+            end
+            local previousValue = ____valueByLevel_index_33_34
+            valueByLevel[level + 1] = value
+            return previousValue
+        end
+    end
+    if not self:hasNativeFieldValue(objectDataEntryId) then
+        return nil
+    end
+    local previousValue = self:getNativeFieldValue(instance, level)
+    if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
+        return nil
+    end
+    return previousValue
+end
+function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
+    local ____opt_37 = self.originalValueByLevelByInstance
+    local ____opt_35 = ____opt_37 and ____opt_37[instance]
+    local originalValue = ____opt_35 and ____opt_35[level]
+    local ____opt_39 = self.modifiersByInstance
+    local modifiers = ____opt_39 and ____opt_39[instance]
+    if originalValue ~= nil then
+        local value = originalValue
+        if modifiers ~= nil then
+            for modifier in pairs(modifiers) do
+                value = modifier(instance, level, value, originalValue)
+            end
+        end
+        return value
+    end
+    return self.defaultValue
+end
 function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(self),

package/engine/standard/fields/ability.d.ts

@@ -376,8 +376,8 @@ export declare const INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD: Abi
 export declare const ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;

package/engine/standard/fields/ability.lua

@@ -387,8 +387,8 @@ ____exports.INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloa
 ____exports.ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Neu1"))
 ____exports.AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Arm1"))
 ____exports.DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi1"))
-____exports.ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
-____exports.MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
+____exports.MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
+____exports.ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
 ____exports.EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa1"))
 ____exports.DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa2"))
 ____exports.ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa3"))

package/engine/standard/fields/unit.d.ts

@@ -1,4 +1,9 @@
 /** @noSelfInFile */
-import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
+import { UnitClassificationsField, UnitFloatField, UnitFlyHeightField, UnitHealthRegenerationTypeField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
 export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
 export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
+export declare const FLY_HEIGHT_UNIT_FLOAT_FIELD: UnitFlyHeightField & symbol;
+export declare const SCALING_VALUE_UNIT_FLOAT_FIELD: UnitScalingValueField & symbol;
+export declare const HEALTH_REGENERATION_RATE_UNIT_FLOAT_FIELD: UnitFloatField & symbol;
+export declare const MANA_REGENERATION_RATE_UNIT_FLOAT_FIELD: UnitFloatField & symbol;
+export declare const UNIT_HEALTH_REGENERATION_TYPE_FIELD: UnitHealthRegenerationTypeField & symbol;

package/engine/standard/fields/unit.lua

@@ -1,7 +1,16 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
 local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitFloatField = ____unit.UnitFloatField
+local UnitFlyHeightField = ____unit.UnitFlyHeightField
+local UnitHealthRegenerationTypeField = ____unit.UnitHealthRegenerationTypeField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
+local UnitScalingValueField = ____unit.UnitScalingValueField
 ____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
 ____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+____exports.FLY_HEIGHT_UNIT_FLOAT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
+____exports.SCALING_VALUE_UNIT_FLOAT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.HEALTH_REGENERATION_RATE_UNIT_FLOAT_FIELD = UnitFloatField:create(fourCC("uhpr"))
+____exports.MANA_REGENERATION_RATE_UNIT_FLOAT_FIELD = UnitFloatField:create(fourCC("umpr"))
+____exports.UNIT_HEALTH_REGENERATION_TYPE_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
 return ____exports