warscript 0.0.1-dev.f0a9ffe → 0.0.1-dev.f0daa48

package/engine/object-field/ability.d.ts

@@ -12,7 +12,7 @@ import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -48,7 +48,7 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
 export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -68,7 +68,7 @@ export declare abstract class AbilityLevelField<ValueType extends number | strin
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {

package/engine/object-field/ability.lua

@@ -7,6 +7,7 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
+local abilityTypeHasField = ____ability.abilityTypeHasField
 local ____object_2Dfield = require("engine.object-field")
 local ObjectArrayField = ____object_2Dfield.ObjectArrayField
 local ObjectField = ____object_2Dfield.ObjectField
@@ -29,8 +30,8 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityField.prototype,
@@ -197,8 +198,8 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityArrayField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
@@ -269,8 +270,8 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityLevelField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,
@@ -518,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else

package/engine/object-field/unit.d.ts

@@ -1,38 +1,44 @@
 /** @noSelfInFile */
 import { Unit } from "../internal/unit";
-import { ObjectField, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectLevelFieldType } from "../object-field";
+import { ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
 import { UnitType, UnitTypeId } from "../object-data/entry/unit-type";
 import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 import { AttackType } from "../object-data/auxiliary/attack-type";
 import { UnitClassifications } from "../object-data/auxiliary/unit-classification";
+import { HealthRegenerationType } from "../object-data/auxiliary/health-regeneration-type";
 export declare abstract class UnitField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = any> extends ObjectField<UnitType, Unit, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Unit;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected hasNativeFieldValue(): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitField>>;
 }
 export declare class UnitBooleanField extends UnitField<boolean, junitbooleanfield> {
     protected get defaultValue(): boolean;
     protected getNativeFieldById(id: number): junitbooleanfield;
     protected getNativeFieldValue(instance: Unit): boolean;
     protected setNativeFieldValue(instance: Unit, value: boolean): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitBooleanField>>;
 }
 export declare class UnitFloatField extends UnitField<number, junitrealfield> {
     protected get defaultValue(): number;
     protected getNativeFieldById(id: number): junitrealfield;
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitFloatField>>;
 }
-export declare class UnitIntegerField extends UnitField<number, junitintegerfield> {
-    protected get defaultValue(): number;
+export declare class UnitIntegerField<T extends number = number> extends UnitField<T, junitintegerfield> {
+    protected get defaultValue(): T;
     protected getNativeFieldById(id: number): junitintegerfield;
-    protected getNativeFieldValue(instance: Unit): number;
-    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+    protected getNativeFieldValue(instance: Unit): T;
+    protected setNativeFieldValue(instance: Unit, value: T): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitIntegerField>>;
 }
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
     protected getNativeFieldValue(instance: Unit): string;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitStringField>>;
 }
 type junitweaponfield = junitweaponbooleanfield | junitweaponintegerfield | junitweaponrealfield | junitweaponstringfield;
 export declare abstract class UnitWeaponField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends junitweaponfield = junitweaponfield> extends ObjectLevelField<UnitType, Unit, ValueType, InputValueType, NativeFieldType> {
@@ -63,8 +69,17 @@ export declare class UnitClassificationsField extends UnitField<UnitClassificati
     protected getNativeFieldValue(instance: Unit): UnitClassifications;
     protected setNativeFieldValue(instance: Unit, value: UnitClassifications): boolean;
 }
+export declare class UnitFlyHeightField extends UnitFloatField {
+    protected getNativeFieldValue(instance: Unit): number;
+    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+}
 export declare class UnitPropulsionWindowField extends UnitFloatField {
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
 }
+export declare class UnitHealthRegenerationTypeField extends UnitIntegerField<HealthRegenerationType> {
+}
+export declare class UnitScalingValueField extends UnitFloatField {
+    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+}
 export {};

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>;