warscript 0.0.1-dev.9b0216a → 0.0.1-dev.9cbb1ff

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

@@ -45,9 +45,10 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
     protected setNativeFieldValue(instance: Ability, value: string): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityStringField>;
 }
-export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
+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;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -130,7 +131,9 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
 export declare const resolveCurrentAbilityDependentValue: {
     <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
     <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;

package/engine/object-field/ability.lua

@@ -197,6 +197,9 @@ __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)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",

package/engine/object-field.d.ts

@@ -16,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,15 +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 hasNativeFieldValue(instance: InstanceType): boolean;
     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>;
@@ -71,7 +80,6 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
 }
 export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     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;

package/engine/object-field.lua

@@ -20,6 +20,11 @@ local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLe
 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 ____linked_2Dset = require("utility.linked-set")
+local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
 local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
 local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
 local objectFieldById = {}
@@ -46,6 +51,10 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
+function ObjectFieldBase.prototype.hasValue(self, instance)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+end
 function ObjectFieldBase.create(self, id)
     return __TS__New(
         self,
@@ -71,7 +80,7 @@ ____exports.ObjectField = __TS__Class()
 local ObjectField = ____exports.ObjectField
 ObjectField.name = "ObjectField"
 __TS__ClassExtends(ObjectField, ObjectFieldBase)
-function ObjectField.prototype.getValue(self, entry)
+function ObjectField.prototype.getValue(self, entry, includeModifiers)
     if __TS__InstanceOf(entry, ObjectDataEntry) then
         local defaultValueByObjectDataEntryId = (warpack.compiletime and compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId or defaultValueByObjectDataEntryIdByObjectFieldId)[self.id]
         if defaultValueByObjectDataEntryId ~= nil then
@@ -82,22 +91,16 @@ function ObjectField.prototype.getValue(self, entry)
         end
         return self.defaultValue
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_entry_0 = self.valueByInstance[entry]
-            if ____self_valueByInstance_entry_0 == nil then
-                ____self_valueByInstance_entry_0 = defaultValue
+    if includeModifiers == false then
+        local originalValueByInstance = self.originalValueByInstance
+        if originalValueByInstance ~= nil then
+            local originalValue = originalValueByInstance[entry]
+            if originalValue ~= nil then
+                return originalValue
             end
-            return ____self_valueByInstance_entry_0
         end
     end
-    local ____temp_1 = self:getNativeFieldValue(entry)
-    if ____temp_1 == nil then
-        ____temp_1 = self.defaultValue
-    end
-    return ____temp_1
+    return self:getActualValue(entry)
 end
 function ObjectField.prototype.setValue(self, entry, value)
     if __TS__InstanceOf(entry, ObjectDataEntry) then
@@ -112,37 +115,53 @@ function ObjectField.prototype.setValue(self, entry, value)
         defaultValueByObjectDataEntryId[entry.id] = value
         return true
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_entry_2 = self.valueByInstance[entry]
-            if ____self_valueByInstance_entry_2 == nil then
-                ____self_valueByInstance_entry_2 = defaultValue
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[entry]
+        if modifiers ~= nil and modifiers.size ~= 0 then
+            local originalValueByInstance = self.originalValueByInstance
+            if originalValueByInstance == nil then
+                originalValueByInstance = mutableWeakLuaMap()
+                self.originalValueByInstance = originalValueByInstance
             end
-            local ____self_valueByInstance_entry_2_3 = ____self_valueByInstance_entry_2
-            if ____self_valueByInstance_entry_2_3 == nil then
-                ____self_valueByInstance_entry_2_3 = self.defaultValue
-            end
-            local previousValue = ____self_valueByInstance_entry_2_3
-            if value ~= previousValue then
-                self.valueByInstance[entry] = value
-                self:invokeValueChangeEvent(entry, self, previousValue, value)
-            end
-            return true
+            originalValueByInstance[entry] = value
+            value = self:calculateActualValue(entry)
         end
     end
-    if not self:hasNativeFieldValue(entry) then
-        return false
+    return self:setActualValue(entry, value)
+end
+function ObjectField.prototype.applyModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance == nil then
+        modifiersByInstance = mutableWeakLuaMap()
+        self.modifiersByInstance = modifiersByInstance
+    end
+    if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
+        local originalValueByInstance = self.originalValueByInstance
+        if originalValueByInstance == nil then
+            originalValueByInstance = mutableWeakLuaMap()
+            self.originalValueByInstance = originalValueByInstance
+        end
+        originalValueByInstance[instance] = self:getActualValue(instance)
+        self:setActualValue(
+            instance,
+            self:calculateActualValue(instance)
+        )
     end
-    local previousValue = self:getNativeFieldValue(entry)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(entry, value) then
-            return false
+end
+function ObjectField.prototype.removeModifier(self, instance, modifier)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[instance]
+        if modifiers ~= nil and modifiers:remove(modifier) then
+            self:setActualValue(
+                instance,
+                self:calculateActualValue(instance)
+            )
+            return true
         end
-        self:invokeValueChangeEvent(entry, self, previousValue, value)
     end
-    return true
+    return false
 end
 function ObjectField.prototype.removeValue(self, entry)
     if not warpack.compiletime then
@@ -164,6 +183,73 @@ function ObjectField.prototype.trySetValue(self, entry, value)
     end
     return self:setValue(entry, value)
 end
+function ObjectField.prototype.getActualValue(self, instance)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil then
+        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil then
+            local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_0 == nil then
+                ____self_valueByInstance_instance_0 = defaultValue
+            end
+            return ____self_valueByInstance_instance_0
+        end
+    end
+    local ____temp_1 = self:getNativeFieldValue(instance)
+    if ____temp_1 == nil then
+        ____temp_1 = self.defaultValue
+    end
+    return ____temp_1
+end
+function ObjectField.prototype.setActualValue(self, instance, value)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil then
+        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil then
+            local ____self_valueByInstance_instance_2 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_2 == nil then
+                ____self_valueByInstance_instance_2 = defaultValue
+            end
+            local ____self_valueByInstance_instance_2_3 = ____self_valueByInstance_instance_2
+            if ____self_valueByInstance_instance_2_3 == nil then
+                ____self_valueByInstance_instance_2_3 = self.defaultValue
+            end
+            local previousValue = ____self_valueByInstance_instance_2_3
+            if value ~= previousValue then
+                self.valueByInstance[instance] = value
+                self:invokeValueChangeEvent(instance, self, previousValue, value)
+            end
+            return true
+        end
+    end
+    if not self:hasNativeFieldValue(instance) then
+        return false
+    end
+    local previousValue = self:getNativeFieldValue(instance)
+    if value ~= previousValue then
+        if not self:setNativeFieldValue(instance, value) then
+            return false
+        end
+        self:invokeValueChangeEvent(instance, self, previousValue, value)
+    end
+    return true
+end
+function ObjectField.prototype.calculateActualValue(self, instance)
+    local ____opt_4 = self.originalValueByInstance
+    local originalValue = ____opt_4 and ____opt_4[instance]
+    local ____opt_6 = self.modifiersByInstance
+    local modifiers = ____opt_6 and ____opt_6[instance]
+    if originalValue ~= nil then
+        local value = originalValue
+        if modifiers ~= nil then
+            for modifier in pairs(modifiers) do
+                value = modifier(instance, value, originalValue)
+            end
+        end
+        return value
+    end
+    return self.defaultValue
+end
 function ObjectField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(self),
@@ -217,17 +303,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_5
+                local ____temp_9
                 if index == nil then
-                    ____temp_5 = value
+                    ____temp_9 = value
                 else
-                    local ____value_index_4 = value[index + 1]
-                    if ____value_index_4 == nil then
-                        ____value_index_4 = self.defaultValue
+                    local ____value_index_8 = value[index + 1]
+                    if ____value_index_8 == nil then
+                        ____value_index_8 = self.defaultValue
                     end
-                    ____temp_5 = ____value_index_4
+                    ____temp_9 = ____value_index_8
                 end
-                return ____temp_5
+                return ____temp_9
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -237,17 +323,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
         if defaultValue ~= nil then
             local value = self.valueByInstance[entry] or defaultValue
-            local ____temp_7
+            local ____temp_11
             if index == nil then
-                ____temp_7 = value
+                ____temp_11 = value
             else
-                local ____value_index_6 = value[index + 1]
-                if ____value_index_6 == nil then
-                    ____value_index_6 = self.defaultValue
+                local ____value_index_10 = value[index + 1]
+                if ____value_index_10 == nil then
+                    ____value_index_10 = self.defaultValue
                 end
-                ____temp_7 = ____value_index_6
+                ____temp_11 = ____value_index_10
             end
-            return ____temp_7
+            return ____temp_11
         end
     end
     if index ~= nil then
@@ -292,11 +378,11 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_8 = valueByLevel[level + 1]
-                if ____valueByLevel_index_8 == nil then
-                    ____valueByLevel_index_8 = self.defaultValue
+                local ____valueByLevel_index_12 = valueByLevel[level + 1]
+                if ____valueByLevel_index_12 == nil then
+                    ____valueByLevel_index_12 = self.defaultValue
                 end
-                return ____valueByLevel_index_8
+                return ____valueByLevel_index_12
             end
         end
         return self.defaultValue
@@ -305,23 +391,23 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
     if defaultValueByObjectDataEntryId ~= nil then
         local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
         if defaultValueByLevel ~= nil then
-            local ____opt_9 = self.valueByInstance[entry]
-            local ____temp_11 = ____opt_9 and ____opt_9[level + 1]
-            if ____temp_11 == nil then
-                ____temp_11 = defaultValueByLevel[level + 1]
+            local ____opt_13 = self.valueByInstance[entry]
+            local ____temp_15 = ____opt_13 and ____opt_13[level + 1]
+            if ____temp_15 == nil then
+                ____temp_15 = defaultValueByLevel[level + 1]
             end
-            local ____temp_11_12 = ____temp_11
-            if ____temp_11_12 == nil then
-                ____temp_11_12 = self.defaultValue
+            local ____temp_15_16 = ____temp_15
+            if ____temp_15_16 == nil then
+                ____temp_15_16 = self.defaultValue
             end
-            return ____temp_11_12
+            return ____temp_15_16
         end
     end
-    local ____temp_13 = self:getNativeFieldValue(entry, level)
-    if ____temp_13 == nil then
-        ____temp_13 = self.defaultValue
+    local ____temp_17 = self:getNativeFieldValue(entry, level)
+    if ____temp_17 == nil then
+        ____temp_17 = self.defaultValue
     end
-    return ____temp_13
+    return ____temp_17
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -370,15 +456,15 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
                 valueByLevel = {}
                 self.valueByInstance[entry] = valueByLevel
             end
-            local ____valueByLevel_index_14 = valueByLevel[level + 1]
-            if ____valueByLevel_index_14 == nil then
-                ____valueByLevel_index_14 = defaultValueByLevel[level + 1]
+            local ____valueByLevel_index_18 = valueByLevel[level + 1]
+            if ____valueByLevel_index_18 == nil then
+                ____valueByLevel_index_18 = defaultValueByLevel[level + 1]
             end
-            local ____valueByLevel_index_14_15 = ____valueByLevel_index_14
-            if ____valueByLevel_index_14_15 == nil then
-                ____valueByLevel_index_14_15 = self.defaultValue
+            local ____valueByLevel_index_18_19 = ____valueByLevel_index_18
+            if ____valueByLevel_index_18_19 == nil then
+                ____valueByLevel_index_18_19 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_14_15
+            local previousValue = ____valueByLevel_index_18_19
             if value ~= previousValue then
                 valueByLevel[level + 1] = value
                 self:invokeValueChangeEvent(

package/engine/standard/entries/buff-type.d.ts

@@ -0,0 +1,3 @@
+/** @noSelfInFile */
+import { StandardBuffTypeId } from "../../object-data/entry/buff-type";
+export declare const CHEMICAL_RAGE_BUFF_TYPE_ID: StandardBuffTypeId;

package/engine/standard/entries/buff-type.lua

@@ -0,0 +1,3 @@
+local ____exports = {}
+____exports.CHEMICAL_RAGE_BUFF_TYPE_ID = fourCC("BNcr")
+return ____exports