warscript 0.0.1-dev.e4a5fce → 0.0.1-dev.e5e97e8

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;
@@ -16,8 +17,10 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     readonly id: ObjectFieldId;
     protected abstract getNativeFieldById(id: number): NativeFieldType;
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
-    constructor(id: number);
-    static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
+    protected abstract hasNativeFieldValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
+    hasValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
+    constructor(id: number, isGlobal?: boolean);
+    static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number, isGlobal?: boolean): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
 }
 export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any> | ReadonlyObjectFieldType<ObjectField<any, any, any, any>>> = T extends ObjectField<any, infer InstanceType, infer ValueType, any> ? DispatchingEvent<[
@@ -33,15 +36,23 @@ 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;
+type ObjectLevelFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, level: number, currentValue: ValueType, originalValue: ValueType) => ValueType;
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract 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>;
@@ -70,14 +81,20 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType[]): boolean;
 }
 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> {
+    private originalValueByLevelByInstance?;
+    private modifiersByInstance?;
     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;
     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;
+    applyModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): void;
+    removeModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): boolean;
     trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
+    private getActualValue;
+    private setActualValue;
+    private calculateActualValue;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;

package/engine/object-field.lua

@@ -20,6 +20,15 @@ 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 emptyLuaMap = ____lua_2Dmaps.emptyLuaMap
+local getOrPut = ____lua_2Dmaps.getOrPut
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
+local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
+local ____arrays = require("utility.arrays")
+local emptyArray = ____arrays.emptyArray
 local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
 local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
 local objectFieldById = {}
@@ -29,7 +38,11 @@ local idGenerator = __TS__New(
 )
 local ObjectFieldBase = __TS__Class()
 ObjectFieldBase.name = "ObjectFieldBase"
-function ObjectFieldBase.prototype.____constructor(self, id)
+function ObjectFieldBase.prototype.____constructor(self, id, isGlobal)
+    if isGlobal == nil then
+        isGlobal = false
+    end
+    self.isGlobal = isGlobal
     self.valueByInstance = setmetatable({}, {__mode = "k"})
     if objectFieldById[id] ~= nil then
         error(
@@ -46,10 +59,15 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
-function ObjectFieldBase.create(self, id)
+function ObjectFieldBase.prototype.hasValue(self, objectDataEntryId)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[objectDataEntryId] ~= nil or self:hasNativeFieldValue(objectDataEntryId)
+end
+function ObjectFieldBase.create(self, id, isGlobal)
     return __TS__New(
         self,
-        id or idGenerator:next()
+        id or idGenerator:next(),
+        isGlobal
     )
 end
 function ObjectFieldBase.of(self, id)
@@ -71,7 +89,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 +100,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 +124,59 @@ 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
-            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)
+    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
-            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
+        local ____originalValueByInstance_1 = originalValueByInstance
+        local ____instance_2 = instance
+        local ____originalValueByInstance_instance_0 = originalValueByInstance[instance]
+        if ____originalValueByInstance_instance_0 == nil then
+            ____originalValueByInstance_instance_0 = self:getActualValue(instance)
+        end
+        ____originalValueByInstance_1[____instance_2] = ____originalValueByInstance_instance_0
+        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 +198,78 @@ 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 or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil or self.isGlobal then
+            local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_3 == nil then
+                ____self_valueByInstance_instance_3 = defaultValue
+            end
+            local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
+            if ____self_valueByInstance_instance_3_4 == nil then
+                ____self_valueByInstance_instance_3_4 = self.defaultValue
+            end
+            return ____self_valueByInstance_instance_3_4
+        end
+    end
+    local ____temp_5 = self:getNativeFieldValue(instance)
+    if ____temp_5 == nil then
+        ____temp_5 = self.defaultValue
+    end
+    return ____temp_5
+end
+function ObjectField.prototype.setActualValue(self, instance, value)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
+        if defaultValue ~= nil or self.isGlobal then
+            local ____self_valueByInstance_instance_6 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_6 == nil then
+                ____self_valueByInstance_instance_6 = defaultValue
+            end
+            local ____self_valueByInstance_instance_6_7 = ____self_valueByInstance_instance_6
+            if ____self_valueByInstance_instance_6_7 == nil then
+                ____self_valueByInstance_instance_6_7 = self.defaultValue
+            end
+            local previousValue = ____self_valueByInstance_instance_6_7
+            if value ~= previousValue then
+                self.valueByInstance[instance] = value
+                self:invokeValueChangeEvent(instance, self, previousValue, value)
+            end
+            return true
+        end
+    end
+    if not self:hasNativeFieldValue(objectDataEntryId) 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_8 = self.originalValueByInstance
+    local originalValue = ____opt_8 and ____opt_8[instance]
+    local ____opt_10 = self.modifiersByInstance
+    local modifiers = ____opt_10 and ____opt_10[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,37 +323,37 @@ 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_13
                 if index == nil then
-                    ____temp_5 = value
+                    ____temp_13 = value
                 else
-                    local ____value_index_4 = value[index + 1]
-                    if ____value_index_4 == nil then
-                        ____value_index_4 = self.defaultValue
+                    local ____value_index_12 = value[index + 1]
+                    if ____value_index_12 == nil then
+                        ____value_index_12 = self.defaultValue
                     end
-                    ____temp_5 = ____value_index_4
+                    ____temp_13 = ____value_index_12
                 end
-                return ____temp_5
+                return ____temp_13
             end
         end
         return index == nil and ({}) or self.defaultValue
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local value = self.valueByInstance[entry] or defaultValue
-            local ____temp_7
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
+        if defaultValue ~= nil or self.isGlobal then
+            local value = self.valueByInstance[entry] or defaultValue or emptyArray()
+            local ____temp_15
             if index == nil then
-                ____temp_7 = value
+                ____temp_15 = value
             else
-                local ____value_index_6 = value[index + 1]
-                if ____value_index_6 == nil then
-                    ____value_index_6 = self.defaultValue
+                local ____value_index_14 = value[index + 1]
+                if ____value_index_14 == nil then
+                    ____value_index_14 = self.defaultValue
                 end
-                ____temp_7 = ____value_index_6
+                ____temp_15 = ____value_index_14
             end
-            return ____temp_7
+            return ____temp_15
         end
     end
     if index ~= nil then
@@ -292,36 +398,16 @@ 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_16 = valueByLevel[level + 1]
+                if ____valueByLevel_index_16 == nil then
+                    ____valueByLevel_index_16 = self.defaultValue
                 end
-                return ____valueByLevel_index_8
+                return ____valueByLevel_index_16
             end
         end
         return self.defaultValue
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    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]
-            end
-            local ____temp_11_12 = ____temp_11
-            if ____temp_11_12 == nil then
-                ____temp_11_12 = self.defaultValue
-            end
-            return ____temp_11_12
-        end
-    end
-    local ____temp_13 = self:getNativeFieldValue(entry, level)
-    if ____temp_13 == nil then
-        ____temp_13 = self.defaultValue
-    end
-    return ____temp_13
+    return self:getActualValue(entry, level)
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -361,28 +447,129 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         valueByLevel[level + 1] = value
         return true
     end
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance ~= nil then
+        local modifiers = modifiersByInstance[entry]
+        if modifiers ~= nil and modifiers.size ~= 0 then
+            local originalValueByLevelByInstance = self.originalValueByLevelByInstance
+            if originalValueByLevelByInstance == nil then
+                originalValueByLevelByInstance = mutableWeakLuaMap()
+                self.originalValueByLevelByInstance = originalValueByLevelByInstance
+            end
+            getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)[level] = value
+            value = self:calculateActualValue(entry, level)
+        end
+    end
+    return self:setActualValue(entry, level, value)
+end
+function ObjectLevelField.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 originalValueByLevelByInstance = self.originalValueByLevelByInstance
+        if originalValueByLevelByInstance == nil then
+            originalValueByLevelByInstance = mutableWeakLuaMap()
+            self.originalValueByLevelByInstance = originalValueByLevelByInstance
+        end
+        local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
+        local levelCount = self:getLevelCount(instance)
+        for level = 0, levelCount - 1 do
+            local ____originalValueByLevel_level_17 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_17 == nil then
+                ____originalValueByLevel_level_17 = self:getActualValue(instance, level)
+            end
+            originalValueByLevel[level] = ____originalValueByLevel_level_17
+            self:setActualValue(
+                instance,
+                level,
+                self:calculateActualValue(instance, level)
+            )
+        end
+    end
+end
+function ObjectLevelField.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
+            local levelCount = self:getLevelCount(instance)
+            for level = 0, levelCount - 1 do
+                self:setActualValue(
+                    instance,
+                    level,
+                    self:calculateActualValue(instance, level)
+                )
+            end
+            return true
+        end
+    end
+    return false
+end
+function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
+    if value ~= nil then
+        if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
+            return false
+        end
+        if type(levelOrValue) ~= "number" then
+            return false
+        end
+        return self:setValue(entry, levelOrValue, value)
+    end
+    if __TS__TypeOf(levelOrValue) ~= __TS__TypeOf(self.defaultValue) then
+        return false
+    end
+    return self:setValue(entry, levelOrValue)
+end
+function ObjectLevelField.prototype.getActualValue(self, instance, level)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil then
-            local valueByLevel = self.valueByInstance[entry]
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local ____opt_18 = self.valueByInstance[instance]
+            local ____temp_20 = ____opt_18 and ____opt_18[level + 1]
+            if ____temp_20 == nil then
+                ____temp_20 = (defaultValueByLevel or emptyArray())[level + 1]
+            end
+            local ____temp_20_21 = ____temp_20
+            if ____temp_20_21 == nil then
+                ____temp_20_21 = self.defaultValue
+            end
+            return ____temp_20_21
+        end
+    end
+    local ____temp_22 = self:getNativeFieldValue(instance, level)
+    if ____temp_22 == nil then
+        ____temp_22 = self.defaultValue
+    end
+    return ____temp_22
+end
+function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local valueByLevel = self.valueByInstance[instance]
             if valueByLevel == nil then
                 valueByLevel = {}
-                self.valueByInstance[entry] = valueByLevel
+                self.valueByInstance[instance] = valueByLevel
             end
-            local ____valueByLevel_index_14 = valueByLevel[level + 1]
-            if ____valueByLevel_index_14 == nil then
-                ____valueByLevel_index_14 = defaultValueByLevel[level + 1]
+            local ____valueByLevel_index_23 = valueByLevel[level + 1]
+            if ____valueByLevel_index_23 == nil then
+                ____valueByLevel_index_23 = (defaultValueByLevel or emptyArray())[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_23_24 = ____valueByLevel_index_23
+            if ____valueByLevel_index_23_24 == nil then
+                ____valueByLevel_index_23_24 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_14_15
+            local previousValue = ____valueByLevel_index_23_24
             if value ~= previousValue then
                 valueByLevel[level + 1] = value
                 self:invokeValueChangeEvent(
-                    entry,
+                    instance,
                     self,
                     level,
                     previousValue,
@@ -392,16 +579,16 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
             return true
         end
     end
-    if not self:hasNativeFieldValue(entry) then
+    if not self:hasNativeFieldValue(objectDataEntryId) then
         return false
     end
-    local previousValue = self:getNativeFieldValue(entry, level)
+    local previousValue = self:getNativeFieldValue(instance, level)
     if value ~= previousValue then
-        if not self:setNativeFieldValue(entry, level, value) then
+        if not self:setNativeFieldValue(instance, level, value) then
             return false
         end
         self:invokeValueChangeEvent(
-            entry,
+            instance,
             self,
             level,
             previousValue,
@@ -410,20 +597,22 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     end
     return true
 end
-function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
-    if value ~= nil then
-        if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
-            return false
-        end
-        if type(levelOrValue) ~= "number" then
-            return false
+function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
+    local ____opt_27 = self.originalValueByLevelByInstance
+    local ____opt_25 = ____opt_27 and ____opt_27[instance]
+    local originalValue = ____opt_25 and ____opt_25[level]
+    local ____opt_29 = self.modifiersByInstance
+    local modifiers = ____opt_29 and ____opt_29[instance]
+    if originalValue ~= nil then
+        local value = originalValue
+        if modifiers ~= nil then
+            for modifier in pairs(modifiers) do
+                value = modifier(instance, level, value, originalValue)
+            end
         end
-        return self:setValue(entry, levelOrValue, value)
-    end
-    if __TS__TypeOf(levelOrValue) ~= __TS__TypeOf(self.defaultValue) then
-        return false
+        return value
     end
-    return self:setValue(entry, levelOrValue)
+    return self.defaultValue
 end
 function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(

package/engine/random.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import { ReadonlyNonEmptyArray } from "../utility/types";
 export declare const randomAngle: () => number;
 export declare const randomInteger: {
     (upperBound?: number): number;
@@ -9,3 +10,11 @@ export declare const randomFloat: {
     (lowerBound: number, upperBound: number): number;
 };
 export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
+export declare const randomElement: {
+    <T>(array: ReadonlyNonEmptyArray<T>): T;
+    <T>(array: ReadonlyArray<T>): T | undefined;
+};
+export declare const random: {
+    <T>(element: T, ...elements: T[]): T;
+    <T>(...elements: T[]): T | undefined;
+};

package/engine/random.lua

@@ -4,6 +4,7 @@ local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
 local PI = ____math.PI
 local getRandomInt = GetRandomInt
 local getRandomReal = GetRandomReal
+local select = _G.select
 local cos = math.cos
 local sin = math.sin
 local sqrt = math.sqrt
@@ -15,4 +16,16 @@ ____exports.randomXY = function(centerX, centerY, range)
     local t = getRandomReal(0, 1) * 2 * PI
     return centerX + r * cos(t), centerY + r * sin(t)
 end
+____exports.randomElement = function(array)
+    return array[getRandomInt(1, #array)]
+end
+____exports.random = function(...)
+    return (select(
+        getRandomInt(
+            1,
+            select("#", ...)
+        ),
+        ...
+    ))
+end
 return ____exports

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;