warscript 0.0.1-dev.f48f7bb → 0.0.1-dev.f9166a3

package/engine/object-data/entry.lua

@@ -7,10 +7,11 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local booleanToData, dataToBoolean, numberToData, dataToNumber, stringToData, dataToString, objectDataEntryIdToData, dataToObjectDataEntryId, booleansToData, dataToBooleans, numbersToData, dataToNumbers, stringsToData, dataToStrings, objectDataEntryIdsToData, dataToObjectDataEntryIds, isDataNotBlank
+local booleanToData, dataToBoolean, numberToData, dataToNumber, stringToData, dataToString, objectDataEntryNumericIdToData, dataToObjectDataEntryNumericId, objectDataEntryIdToData, dataToObjectDataEntryId, booleansToData, dataToBooleans, numbersToData, dataToNumbers, stringsToData, dataToStrings, objectDataEntryNumericIdsToData, dataToObjectDataEntryNumericIds, isDataNotBlank
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
@@ -124,7 +125,7 @@ function ObjectDataEntry.getAllByBaseIds(self, baseIds)
     local constructor = self
     for id, object in pairs(constructor:getObjectData(currentMap).all) do
         if dataBaseIds[object.parentId or id] ~= nil then
-            local objectDataEntry = self:of(dataToObjectDataEntryId(id))
+            local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.idType))
             if objectDataEntry ~= nil and not objectDataEntry.isInternal then
                 result[#result + 1] = objectDataEntry
             end
@@ -139,7 +140,7 @@ function ObjectDataEntry.getAll(self)
     local constructor = self
     local result = {}
     for id in pairs(constructor:getObjectData(currentMap).all) do
-        local objectDataEntry = self:of(dataToObjectDataEntryId(id))
+        local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.idType))
         if objectDataEntry ~= nil and not objectDataEntry.isInternal then
             result[#result + 1] = objectDataEntry
         end
@@ -156,9 +157,9 @@ function ObjectDataEntry.of(self, id)
     if object == nil then
         return nil
     end
-    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id)]
+    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id, self.idType)]
     if objectDataEntry == nil then
-        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId) == self.BASE_ID) then
+        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId, self.idType) == self.BASE_ID) then
             local AbstractObjectDataEntryView = __TS__Class()
             AbstractObjectDataEntryView.name = "AbstractObjectDataEntryView"
             __TS__ClassExtends(AbstractObjectDataEntryView, constructor)
@@ -231,13 +232,13 @@ function ObjectDataEntry.prototype.setStringField(self, field, value)
         stringToData(value)
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdField(self, field)
-    return dataToObjectDataEntryId(self.object:getField(field))
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdField(self, field)
+    return dataToObjectDataEntryNumericId(self.object:getField(field))
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdField(self, field, value)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdField(self, field, value)
     self.object:setField(
         field,
-        objectDataEntryIdToData(value)
+        objectDataEntryNumericIdToData(value)
     )
 end
 function ObjectDataEntry.prototype.getAttachmentPresetField(self, modelPathField, nodeFQNField)
@@ -285,13 +286,13 @@ function ObjectDataEntry.prototype.setStringsField(self, field, values)
         stringsToData(values)
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdsField(self, field)
-    return dataToObjectDataEntryIds(self.object:getField(field))
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdsField(self, field)
+    return dataToObjectDataEntryNumericIds(self.object:getField(field))
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdsField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdsField(self, field, values)
     self.object:setField(
         field,
-        objectDataEntryIdsToData(values)
+        objectDataEntryNumericIdsToData(values)
     )
 end
 function ObjectDataEntry.prototype.getAttachmentPresetListField(self, modelPathListField, nodeFQNFields)
@@ -369,16 +370,16 @@ function ObjectDataEntry.prototype.setStringLevelField(self, field, values)
         stringToData
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdLevelField(self, field)
-    return self:getLevelField(field, dataToObjectDataEntryId)
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdLevelField(self, field)
+    return self:getLevelField(field, dataToObjectDataEntryNumericId)
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdLevelField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdLevelField(self, field, values)
     self:setLevelField(
         field,
         values,
         ____exports.extractObjectDataEntryLevelFieldValue,
-        dataToObjectDataEntryId,
-        objectDataEntryIdToData
+        dataToObjectDataEntryNumericId,
+        objectDataEntryNumericIdToData
     )
 end
 function ObjectDataEntry.prototype.getBooleansLevelField(self, field)
@@ -417,23 +418,26 @@ function ObjectDataEntry.prototype.setStringsLevelField(self, field, values)
         stringsToData
     )
 end
-function ObjectDataEntry.prototype.getObjectDataEntryIdsLevelField(self, field)
-    return self:getLevelField(field, dataToObjectDataEntryIds)
+function ObjectDataEntry.prototype.getObjectDataEntryNumericIdsLevelField(self, field)
+    return self:getLevelField(field, dataToObjectDataEntryNumericIds)
 end
-function ObjectDataEntry.prototype.setObjectDataEntryIdsLevelField(self, field, values)
+function ObjectDataEntry.prototype.setObjectDataEntryNumericIdsLevelField(self, field, values)
     self:setLevelField(
         field,
         values,
         ____exports.extractObjectDataEntryLevelArrayFieldValue,
-        dataToObjectDataEntryIds,
-        objectDataEntryIdsToData
+        dataToObjectDataEntryNumericIds,
+        objectDataEntryNumericIdsToData
     )
 end
 function ObjectDataEntry.prototype.getLevelField(self, field, dataToValue)
     local values = {}
     local object = self.object
     for level = 1, tonumber(object:getField("levels")) or 1 do
-        values[level] = dataToValue(object:getField((field .. "+") .. tostring(level)))
+        values[level] = dataToValue(
+            object:getField((field .. "+") .. tostring(level)),
+            "number"
+        )
     end
     return values
 end
@@ -473,6 +477,14 @@ function ObjectDataEntry.prototype.setLevelField(self, field, supplier, extracto
 end
 ObjectDataEntry.BASE_ID = 0
 ObjectDataEntry.IS_SYNTHETIC = false
+__TS__SetDescriptor(
+    ObjectDataEntry.prototype,
+    "type",
+    {get = function(self)
+        return self.constructor
+    end},
+    true
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "isInternal",
@@ -491,11 +503,18 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__ObjectDefineProperty(
+    ObjectDataEntry,
+    "idType",
+    {get = function(self)
+        return type(self.BASE_ID) == "number" and "number" or "string"
+    end}
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "id",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.id)
+        return dataToObjectDataEntryId(self.object.id, self.type.idType)
     end},
     true
 )
@@ -503,7 +522,7 @@ __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "baseId",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.parentId or self.object.id)
+        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.idType)
     end},
     true
 )
@@ -533,10 +552,10 @@ end
 dataToString = function(data)
     return tostring(data or "")
 end
-objectDataEntryIdToData = function(value)
+objectDataEntryNumericIdToData = function(value)
     return value == 0 and "" or string.pack(">I4", value)
 end
-dataToObjectDataEntryId = function(data)
+dataToObjectDataEntryNumericId = function(data)
     local dataString = dataToString(data)
     if isDataNotBlank(nil, dataString) then
         return (string.unpack(">I4", dataString))
@@ -544,6 +563,15 @@ dataToObjectDataEntryId = function(data)
         return 0
     end
 end
+objectDataEntryIdToData = function(value)
+    return type(value) == "number" and objectDataEntryNumericIdToData(value) or value
+end
+dataToObjectDataEntryId = function(data, ____type)
+    if ____type == "number" then
+        return dataToObjectDataEntryNumericId(data)
+    end
+    return dataToString(data)
+end
 booleansToData = function(value)
     return table.concat(
         __TS__ArrayMap(
@@ -607,16 +635,16 @@ dataToStrings = function(data)
         function(____, data) return dataToString(data) end
     )
 end
-objectDataEntryIdsToData = function(value)
+objectDataEntryNumericIdsToData = function(value)
     return table.concat(
         __TS__ArrayMap(
             value,
-            function(____, objectDataEntryId) return objectDataEntryIdToData(objectDataEntryId) end
+            function(____, objectDataEntryId) return objectDataEntryNumericIdToData(objectDataEntryId) end
         ),
         ","
     )
 end
-dataToObjectDataEntryIds = function(data)
+dataToObjectDataEntryNumericIds = function(data)
     return __TS__ArrayMap(
         __TS__ArrayFilter(
             __TS__StringSplit(
@@ -625,7 +653,7 @@ dataToObjectDataEntryIds = function(data)
             ),
             isDataNotBlank
         ),
-        function(____, data) return dataToObjectDataEntryId(data) end
+        function(____, data) return dataToObjectDataEntryNumericId(data) end
     )
 end
 isDataNotBlank = function(self, data)

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

@@ -5,9 +5,10 @@ import { ObjectDataEntry, ObjectDataEntryIdType, ObjectDataEntryLevelFieldValueS
 export type ObjectFieldId = number & {
     readonly __objectDataEntryFieldId: unique symbol;
 };
-export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
+export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number, isGlobal?: boolean) => 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> {
+    readonly isGlobal: boolean;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -18,7 +19,7 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
     protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     hasValue(instance: InstanceType): boolean;
-    constructor(id: number);
+    constructor(id: number, isGlobal?: boolean);
     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;
 }
@@ -35,14 +36,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>;