warscript 0.0.1-dev.f40f923 → 0.0.1-dev.f4350ae

package/engine/object-data/entry/unit-type.lua

@@ -12,6 +12,9 @@ local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNum
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
+local ____movement_2Dtype = require("engine.object-data.auxiliary.movement-type")
+local movementTypeToString = ____movement_2Dtype.movementTypeToString
+local stringToMovementType = ____movement_2Dtype.stringToMovementType
 local ____unit_2Dclassification = require("engine.object-data.auxiliary.unit-classification")
 local stringArrayToUnitClassifications = ____unit_2Dclassification.stringArrayToUnitClassifications
 local unitClassificationsToStringArray = ____unit_2Dclassification.unitClassificationsToStringArray
@@ -19,6 +22,9 @@ local ____entry = require("engine.object-data.entry")
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
 local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToString = ____attack_2Dtype.attackTypeToString
+local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
 local getOrCreateUnitTypeWeapons
@@ -34,18 +40,19 @@ __TS__SetDescriptor(
     "attackType",
     {
         get = function(self)
+            local ____stringToAttackType_1 = stringToAttackType
             local ____self_0 = self.unitType
-            return ____self_0.getStringField(
+            return ____stringToAttackType_1(____self_0.getStringField(
                 ____self_0,
                 ("ua" .. tostring(self.index)) .. "t"
-            )
+            ))
         end,
         set = function(self, attackType)
-            local ____self_1 = self.unitType
-            ____self_1.setStringField(
-                ____self_1,
+            local ____self_2 = self.unitType
+            ____self_2.setStringField(
+                ____self_2,
                 ("ua" .. tostring(self.index)) .. "t",
-                attackType
+                attackTypeToString(attackType)
             )
         end
     },
@@ -56,16 +63,16 @@ __TS__SetDescriptor(
     "backSwingDuration",
     {
         get = function(self)
-            local ____self_2 = self.unitType
-            return ____self_2.getNumberField(
-                ____self_2,
+            local ____self_3 = self.unitType
+            return ____self_3.getNumberField(
+                ____self_3,
                 "ubs" .. tostring(self.index)
             )
         end,
         set = function(self, backSwingDuration)
-            local ____self_3 = self.unitType
-            ____self_3.setNumberField(
-                ____self_3,
+            local ____self_4 = self.unitType
+            ____self_4.setNumberField(
+                ____self_4,
                 "ubs" .. tostring(self.index),
                 backSwingDuration
             )
@@ -78,16 +85,16 @@ __TS__SetDescriptor(
     "cooldown",
     {
         get = function(self)
-            local ____self_4 = self.unitType
-            return ____self_4.getNumberField(
-                ____self_4,
+            local ____self_5 = self.unitType
+            return ____self_5.getNumberField(
+                ____self_5,
                 ("ua" .. tostring(self.index)) .. "c"
             )
         end,
         set = function(self, cooldown)
-            local ____self_5 = self.unitType
-            ____self_5.setNumberField(
-                ____self_5,
+            local ____self_6 = self.unitType
+            ____self_6.setNumberField(
+                ____self_6,
                 ("ua" .. tostring(self.index)) .. "c",
                 cooldown
             )
@@ -121,16 +128,16 @@ __TS__SetDescriptor(
     "damageBase",
     {
         get = function(self)
-            local ____self_6 = self.unitType
-            return ____self_6.getNumberField(
-                ____self_6,
+            local ____self_7 = self.unitType
+            return ____self_7.getNumberField(
+                ____self_7,
                 ("ua" .. tostring(self.index)) .. "b"
             )
         end,
         set = function(self, damageBase)
-            local ____self_7 = self.unitType
-            ____self_7.setNumberField(
-                ____self_7,
+            local ____self_8 = self.unitType
+            ____self_8.setNumberField(
+                ____self_8,
                 ("ua" .. tostring(self.index)) .. "b",
                 damageBase
             )
@@ -143,16 +150,16 @@ __TS__SetDescriptor(
     "damageDiceCount",
     {
         get = function(self)
-            local ____self_8 = self.unitType
-            return ____self_8.getNumberField(
-                ____self_8,
+            local ____self_9 = self.unitType
+            return ____self_9.getNumberField(
+                ____self_9,
                 ("ua" .. tostring(self.index)) .. "d"
             )
         end,
         set = function(self, damageDiceNumber)
-            local ____self_9 = self.unitType
-            ____self_9.setNumberField(
-                ____self_9,
+            local ____self_10 = self.unitType
+            ____self_10.setNumberField(
+                ____self_10,
                 ("ua" .. tostring(self.index)) .. "d",
                 damageDiceNumber
             )
@@ -165,16 +172,16 @@ __TS__SetDescriptor(
     "damageDiceSideCount",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getNumberField(
-                ____self_10,
+            local ____self_11 = self.unitType
+            return ____self_11.getNumberField(
+                ____self_11,
                 ("ua" .. tostring(self.index)) .. "s"
             )
         end,
         set = function(self, damageDiceSideCount)
-            local ____self_11 = self.unitType
-            ____self_11.setNumberField(
-                ____self_11,
+            local ____self_12 = self.unitType
+            ____self_12.setNumberField(
+                ____self_12,
                 ("ua" .. tostring(self.index)) .. "s",
                 damageDiceSideCount
             )
@@ -187,16 +194,16 @@ __TS__SetDescriptor(
     "impactDelay",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getNumberField(
-                ____self_12,
+            local ____self_13 = self.unitType
+            return ____self_13.getNumberField(
+                ____self_13,
                 "udp" .. tostring(self.index)
             )
         end,
         set = function(self, impactDelay)
-            local ____self_13 = self.unitType
-            ____self_13.setNumberField(
-                ____self_13,
+            local ____self_14 = self.unitType
+            ____self_14.setNumberField(
+                ____self_14,
                 "udp" .. tostring(self.index),
                 impactDelay
             )
@@ -209,16 +216,16 @@ __TS__SetDescriptor(
     "missileModelPath",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_15 = self.unitType
+            return ____self_15.getStringField(
+                ____self_15,
                 ("ua" .. tostring(self.index)) .. "m"
             )
         end,
         set = function(self, missileModelPath)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_16 = self.unitType
+            ____self_16.setStringField(
+                ____self_16,
                 ("ua" .. tostring(self.index)) .. "m",
                 missileModelPath
             )
@@ -231,16 +238,16 @@ __TS__SetDescriptor(
     "range",
     {
         get = function(self)
-            local ____self_16 = self.unitType
-            return ____self_16.getNumberField(
-                ____self_16,
+            local ____self_17 = self.unitType
+            return ____self_17.getNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_17 = self.unitType
-            ____self_17.setNumberField(
-                ____self_17,
+            local ____self_18 = self.unitType
+            ____self_18.setNumberField(
+                ____self_18,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -253,16 +260,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_18 = self.unitType
-            return ____self_18.getStringField(
-                ____self_18,
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_19 = self.unitType
-            ____self_19.setStringField(
-                ____self_19,
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -275,16 +282,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_20 = self.unitType
-            return ____self_20.getStringField(
-                ____self_20,
+            local ____self_21 = self.unitType
+            return ____self_21.getStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_21 = self.unitType
-            ____self_21.setStringField(
-                ____self_21,
+            local ____self_22 = self.unitType
+            ____self_22.setStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -297,16 +304,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_22 = self.unitType
-            return ____self_22.getStringField(
-                ____self_22,
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_23 = self.unitType
-            ____self_23.setStringField(
-                ____self_23,
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -1341,10 +1348,13 @@ __TS__SetDescriptor(
     "movementType",
     {
         get = function(self)
-            return self:getStringField("umvt")
+            return stringToMovementType(self:getStringField("umvt"))
         end,
         set = function(self, movementType)
-            self:setStringField("umvt", movementType)
+            self:setStringField(
+                "umvt",
+                movementTypeToString(movementType)
+            )
         end
     },
     true
@@ -1612,11 +1622,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_24 = __TS__Class()
-        ____class_24.name = ____class_24.name
-        __TS__ClassExtends(____class_24, ____exports.UnitType)
-        ____class_24.BASE_ID = id
-        return ____class_24
+        local ____class_25 = __TS__Class()
+        ____class_25.name = ____class_25.name
+        __TS__ClassExtends(____class_25, ____exports.UnitType)
+        ____class_25.BASE_ID = id
+        return ____class_25
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1677,11 +1687,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_25 = __TS__Class()
-        ____class_25.name = ____class_25.name
-        __TS__ClassExtends(____class_25, ____exports.HeroUnitType)
-        ____class_25.BASE_ID = id
-        return ____class_25
+        local ____class_26 = __TS__Class()
+        ____class_26.name = ____class_26.name
+        __TS__ClassExtends(____class_26, ____exports.HeroUnitType)
+        ____class_26.BASE_ID = id
+        return ____class_26
     end
 )
 return ____exports

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

@@ -117,7 +117,7 @@ export declare abstract class AbilityEnumLevelField<T extends number> extends Ab
     protected getNativeFieldById(id: number): jabilityintegerlevelfield;
     protected getNativeFieldValue(instance: Ability, level: number): T;
     protected setNativeFieldValue(instance: Ability, level: number, value: T): boolean;
-    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityEnumLevelField<number>>;
 }
 export declare class AbilityBuffPolarityLevelField extends AbilityEnumLevelField<BuffPolarity> {
     protected values: ReadonlyNonEmptyLinkedSet<BuffPolarity>;

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

@@ -1,16 +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 hasNativeFieldValue(): boolean;
     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,22 +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)
-end
-function UnitStringField.prototype.hasNativeFieldValue(self)
-    return true
+    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
@@ -49,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

@@ -35,14 +35,22 @@ 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 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>;