warscript 0.0.1-dev.ea69747 → 0.0.1-dev.eb24bc1

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

@@ -1,15 +1,59 @@
 /** @noSelfInFile */
 import { Unit } from "../internal/unit";
-import { ObjectField } from "../object-field";
+import { ObjectField, ObjectLevelField, ObjectLevelFieldValueChangeEvent, 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";
 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;
+}
+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;
+}
+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;
+}
+export declare class UnitIntegerField extends UnitField<number, junitintegerfield> {
+    protected get defaultValue(): number;
+    protected getNativeFieldById(id: number): junitintegerfield;
+    protected getNativeFieldValue(instance: Unit): number;
+    protected setNativeFieldValue(instance: Unit, value: number): boolean;
 }
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
     protected getNativeFieldValue(instance: Unit): string;
-    protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;
 }
+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> {
+    protected get instanceClass(): typeof Unit;
+    protected getLevelCount(): number;
+    protected getObjectDataEntryId(instance: Unit): UnitTypeId;
+    protected hasNativeFieldValue(): boolean;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<UnitWeaponField>>;
+}
+export declare abstract class UnitNumberWeaponField<NativeFieldType extends junitweaponintegerfield | junitweaponrealfield = junitweaponintegerfield | junitweaponrealfield> extends UnitWeaponField<number, number, NativeFieldType> {
+    protected get defaultValue(): number;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<UnitNumberWeaponField>;
+}
+export declare abstract class UnitEnumWeaponField<T extends number> extends UnitWeaponField<T, T, junitweaponintegerfield> {
+    protected abstract values: ReadonlyNonEmptyLinkedSet<T>;
+    protected get defaultValue(): T;
+    protected getNativeFieldById(id: number): junitweaponintegerfield;
+    protected getNativeFieldValue(instance: Unit, index: number): T;
+    protected setNativeFieldValue(instance: Unit, index: number, value: T): boolean;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<UnitEnumWeaponField<number>>;
+}
+export declare class UnitAttackTypeWeaponField extends UnitEnumWeaponField<AttackType> {
+    protected values: ReadonlyNonEmptyLinkedSet<AttackType>;
+}
+export {};

package/engine/object-field/unit.lua

@@ -2,11 +2,22 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____object_2Dfield = require("engine.object-field")
 local ObjectField = ____object_2Dfield.ObjectField
+local ObjectLevelField = ____object_2Dfield.ObjectLevelField
+local ____linked_2Dset = require("utility.linked-set")
+local nonEmptyLinkedSetOf = ____linked_2Dset.nonEmptyLinkedSetOf
+local convertUnitBooleanField = ConvertUnitBooleanField
+local convertUnitIntegerField = ConvertUnitIntegerField
+local convertUnitRealField = ConvertUnitRealField
+local convertUnitStringField = ConvertUnitStringField
+local convertUnitWeaponIntegerField = ConvertUnitWeaponIntegerField
+local getUnitWeaponIntegerField = BlzGetUnitWeaponIntegerField
+local setUnitWeaponIntegerField = BlzSetUnitWeaponIntegerField
 ____exports.UnitField = __TS__Class()
 local UnitField = ____exports.UnitField
 UnitField.name = "UnitField"
@@ -14,6 +25,9 @@ __TS__ClassExtends(UnitField, ObjectField)
 function UnitField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function UnitField.prototype.hasNativeFieldValue(self)
+    return true
+end
 __TS__SetDescriptor(
     UnitField.prototype,
     "instanceClass",
@@ -22,19 +36,79 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitBooleanField = __TS__Class()
+local UnitBooleanField = ____exports.UnitBooleanField
+UnitBooleanField.name = "UnitBooleanField"
+__TS__ClassExtends(UnitBooleanField, ____exports.UnitField)
+function UnitBooleanField.prototype.getNativeFieldById(self, id)
+    return convertUnitBooleanField(id)
+end
+function UnitBooleanField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitBooleanField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitBooleanField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return false
+    end},
+    true
+)
+____exports.UnitFloatField = __TS__Class()
+local UnitFloatField = ____exports.UnitFloatField
+UnitFloatField.name = "UnitFloatField"
+__TS__ClassExtends(UnitFloatField, ____exports.UnitField)
+function UnitFloatField.prototype.getNativeFieldById(self, id)
+    return convertUnitRealField(id)
+end
+function UnitFloatField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitFloatField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitFloatField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+____exports.UnitIntegerField = __TS__Class()
+local UnitIntegerField = ____exports.UnitIntegerField
+UnitIntegerField.name = "UnitIntegerField"
+__TS__ClassExtends(UnitIntegerField, ____exports.UnitField)
+function UnitIntegerField.prototype.getNativeFieldById(self, id)
+    return convertUnitIntegerField(id)
+end
+function UnitIntegerField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitIntegerField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitIntegerField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
 ____exports.UnitStringField = __TS__Class()
 local UnitStringField = ____exports.UnitStringField
 UnitStringField.name = "UnitStringField"
 __TS__ClassExtends(UnitStringField, ____exports.UnitField)
 function UnitStringField.prototype.getNativeFieldById(self, id)
-    return ConvertUnitStringField(id)
+    return convertUnitStringField(id)
 end
 function UnitStringField.prototype.getNativeFieldValue(self, instance)
     return instance:getField(self.nativeField)
 end
-function UnitStringField.prototype.getObjectDataEntryId(self, instance)
-    return instance.typeId
-end
 function UnitStringField.prototype.setNativeFieldValue(self, instance, value)
     return instance:setField(self.nativeField, value)
 end
@@ -46,4 +120,99 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitWeaponField = __TS__Class()
+local UnitWeaponField = ____exports.UnitWeaponField
+UnitWeaponField.name = "UnitWeaponField"
+__TS__ClassExtends(UnitWeaponField, ObjectLevelField)
+function UnitWeaponField.prototype.getLevelCount(self)
+    return 2
+end
+function UnitWeaponField.prototype.getObjectDataEntryId(self, instance)
+    return instance.typeId
+end
+function UnitWeaponField.prototype.hasNativeFieldValue(self)
+    return true
+end
+__TS__SetDescriptor(
+    UnitWeaponField.prototype,
+    "instanceClass",
+    {get = function(self)
+        return Unit
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitNumberWeaponField = __TS__Class()
+local UnitNumberWeaponField = ____exports.UnitNumberWeaponField
+UnitNumberWeaponField.name = "UnitNumberWeaponField"
+__TS__ClassExtends(UnitNumberWeaponField, ____exports.UnitWeaponField)
+__TS__SetDescriptor(
+    UnitNumberWeaponField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitNumberWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitEnumWeaponField = __TS__Class()
+local UnitEnumWeaponField = ____exports.UnitEnumWeaponField
+UnitEnumWeaponField.name = "UnitEnumWeaponField"
+__TS__ClassExtends(UnitEnumWeaponField, ____exports.UnitWeaponField)
+function UnitEnumWeaponField.prototype.getNativeFieldById(self, id)
+    return convertUnitWeaponIntegerField(id)
+end
+function UnitEnumWeaponField.prototype.getNativeFieldValue(self, instance, index)
+    local value = getUnitWeaponIntegerField(instance.handle, self.nativeField, index)
+    if self.values:contains(value) then
+        return value
+    end
+    return self.values:first()
+end
+function UnitEnumWeaponField.prototype.setNativeFieldValue(self, instance, index, value)
+    return setUnitWeaponIntegerField(instance.handle, self.nativeField, index, value)
+end
+__TS__SetDescriptor(
+    UnitEnumWeaponField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return self.values:first()
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitEnumWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitAttackTypeWeaponField = __TS__Class()
+local UnitAttackTypeWeaponField = ____exports.UnitAttackTypeWeaponField
+UnitAttackTypeWeaponField.name = "UnitAttackTypeWeaponField"
+__TS__ClassExtends(UnitAttackTypeWeaponField, ____exports.UnitEnumWeaponField)
+function UnitAttackTypeWeaponField.prototype.____constructor(self, ...)
+    UnitAttackTypeWeaponField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(
+        1,
+        2,
+        3,
+        0,
+        5,
+        4,
+        6
+    )
+end
 return ____exports

package/engine/object-field.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { DispatchingEvent } from "../event";
 import { AbstractConstructor } from "../utility/types";
@@ -9,7 +8,6 @@ export type ObjectFieldId = number & {
 export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
 export type ObjectFieldAbstractConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (abstract new (id: number) => T);
 declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEntry, InstanceType extends AnyNotNil, ValueType, NativeFieldType> {
-    protected readonly valueByInstance: LuaMap<InstanceType, ValueType>;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -18,6 +16,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;
     constructor(id: number);
     static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
@@ -33,21 +33,30 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
     previousValue: ValueType,
     newValue: ValueType
 ]> : never;
-export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue">;
+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 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;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
-    getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
+    private originalValueByInstance?;
+    private modifiersByInstance?;
+    getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
+    applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
+    removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
+    trySetValue(entry: ObjectDataEntryType | InstanceType, value: unknown): boolean;
+    private getActualValue;
+    private setActualValue;
+    private calculateActualValue;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectField, R extends ReadonlyObjectFieldType<T>>(this: ReadonlyObjectFieldConstructor<T>): ObjectFieldValueChangeEvent<R>;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<ObjectField>>;
 }
-export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue">;
+export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue" | "trySetValue">;
 export type ObjectLevelFieldValueChangeEvent<T extends ObjectLevelField<any, any, any, any> | ReadonlyObjectLevelFieldType<ObjectLevelField<any, any, any, any>>> = T extends ObjectLevelField<any, infer InstanceType, infer ValueType, any, any> ? DispatchingEvent<[
     instance: InstanceType,
     field: T,
@@ -76,6 +85,7 @@ 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;
+    trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;