warscript 0.0.1-dev.a73c979 → 0.0.1-dev.a856ae3

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

@@ -17,8 +17,8 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     readonly id: ObjectFieldId;
     protected abstract getNativeFieldById(id: number): NativeFieldType;
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
-    hasValue(instance: InstanceType): boolean;
+    protected abstract hasNativeFieldValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
+    hasValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
     constructor(id: number, isGlobal?: boolean);
     static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number, isGlobal?: boolean): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
@@ -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;
@@ -45,6 +46,7 @@ export declare abstract class ObjectField<ObjectDataEntryType extends ObjectData
     private modifiersByInstance?;
     getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
+    updateActualValue(instance: InstanceType): void;
     applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
     removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
@@ -86,9 +88,15 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
-    getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
+    getValue<LevelType extends [number, boolean?] | [boolean?]>(entry: ObjectDataEntryType | InstanceType, ...[level, includeModifiers]: LevelType): LevelType extends [number, boolean?] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    updateActualValue(instance: InstanceType, level?: number): void;
+    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>;