warscript 0.0.1-dev.87bdb89 → 0.0.1-dev.8895725

package/engine/object-field.lua

@@ -23,7 +23,9 @@ local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.Ob
 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
@@ -38,7 +40,7 @@ local ObjectFieldBase = __TS__Class()
 ObjectFieldBase.name = "ObjectFieldBase"
 function ObjectFieldBase.prototype.____constructor(self, id, isGlobal)
     if isGlobal == nil then
-        isGlobal = true
+        isGlobal = false
     end
     self.isGlobal = isGlobal
     self.valueByInstance = setmetatable({}, {__mode = "k"})
@@ -57,9 +59,9 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
-function ObjectFieldBase.prototype.hasValue(self, instance)
+function ObjectFieldBase.prototype.hasValue(self, objectDataEntryId)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[objectDataEntryId] ~= nil or self:hasNativeFieldValue(objectDataEntryId)
 end
 function ObjectFieldBase.create(self, id, isGlobal)
     return __TS__New(
@@ -98,7 +100,7 @@ function ObjectField.prototype.getValue(self, entry, includeModifiers)
         end
         return self.defaultValue
     end
-    if includeModifiers == false then
+    if not includeModifiers then
         local originalValueByInstance = self.originalValueByInstance
         if originalValueByInstance ~= nil then
             local originalValue = originalValueByInstance[entry]
@@ -122,6 +124,7 @@ function ObjectField.prototype.setValue(self, entry, value)
         defaultValueByObjectDataEntryId[entry.id] = value
         return true
     end
+    local previousOriginalValue
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[entry]
@@ -131,11 +134,40 @@ function ObjectField.prototype.setValue(self, entry, value)
                 originalValueByInstance = mutableWeakLuaMap()
                 self.originalValueByInstance = originalValueByInstance
             end
+            previousOriginalValue = originalValueByInstance[entry]
+            if value == previousOriginalValue then
+                return true
+            end
             originalValueByInstance[entry] = value
-            value = self:calculateActualValue(entry)
+            value = (self:calculateActualValue(entry))
         end
     end
-    return self:setActualValue(entry, value)
+    local previousValue = self:setActualValue(entry, value)
+    if previousValue == nil then
+        return false
+    end
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_2 = self.invokeValueChangeEvent
+        local ____entry_1 = entry
+        local ____previousOriginalValue_0 = previousOriginalValue
+        if ____previousOriginalValue_0 == nil then
+            ____previousOriginalValue_0 = previousValue
+        end
+        ____self_invokeValueChangeEvent_2(
+            self,
+            ____entry_1,
+            self,
+            ____previousOriginalValue_0,
+            value
+        )
+    end
+    return true
+end
+function ObjectField.prototype.updateActualValue(self, instance)
+    local actualValue, hasModifiers = self:calculateActualValue(instance)
+    if hasModifiers then
+        self:setActualValue(instance, actualValue)
+    end
 end
 function ObjectField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
@@ -149,11 +181,14 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             originalValueByInstance = mutableWeakLuaMap()
             self.originalValueByInstance = originalValueByInstance
         end
-        originalValueByInstance[instance] = self:getActualValue(instance)
-        self:setActualValue(
-            instance,
-            self:calculateActualValue(instance)
-        )
+        local ____originalValueByInstance_4 = originalValueByInstance
+        local ____instance_5 = instance
+        local ____originalValueByInstance_instance_3 = originalValueByInstance[instance]
+        if ____originalValueByInstance_instance_3 == nil then
+            ____originalValueByInstance_instance_3 = self:getActualValue(instance)
+        end
+        ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
+        self:setActualValue(instance, (self:calculateActualValue(instance)))
     end
 end
 function ObjectField.prototype.removeModifier(self, instance, modifier)
@@ -161,10 +196,7 @@ function ObjectField.prototype.removeModifier(self, instance, modifier)
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[instance]
         if modifiers ~= nil and modifiers:remove(modifier) then
-            self:setActualValue(
-                instance,
-                self:calculateActualValue(instance)
-            )
+            self:setActualValue(instance, (self:calculateActualValue(instance)))
             return true
         end
     end
@@ -192,74 +224,70 @@ function ObjectField.prototype.trySetValue(self, 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 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_0 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_0 == nil then
-                ____self_valueByInstance_instance_0 = defaultValue
+            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_0_1 = ____self_valueByInstance_instance_0
-            if ____self_valueByInstance_instance_0_1 == nil then
-                ____self_valueByInstance_instance_0_1 = self.defaultValue
+            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
-            return ____self_valueByInstance_instance_0_1
+            return ____self_valueByInstance_instance_6_7
         end
     end
-    local ____temp_2 = self:getNativeFieldValue(instance)
-    if ____temp_2 == nil then
-        ____temp_2 = self.defaultValue
+    local ____temp_8 = self:getNativeFieldValue(instance)
+    if ____temp_8 == nil then
+        ____temp_8 = self.defaultValue
     end
-    return ____temp_2
+    return ____temp_8
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
+    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_3 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_3 == nil then
-                ____self_valueByInstance_instance_3 = defaultValue
+            local ____self_valueByInstance_instance_9 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_9 == nil then
+                ____self_valueByInstance_instance_9 = 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
+            local ____self_valueByInstance_instance_9_10 = ____self_valueByInstance_instance_9
+            if ____self_valueByInstance_instance_9_10 == nil then
+                ____self_valueByInstance_instance_9_10 = self.defaultValue
             end
-            local previousValue = ____self_valueByInstance_instance_3_4
-            if value ~= previousValue then
-                self.valueByInstance[instance] = value
-                self:invokeValueChangeEvent(instance, self, previousValue, value)
-            end
-            return true
+            local previousValue = ____self_valueByInstance_instance_9_10
+            self.valueByInstance[instance] = value
+            return previousValue
         end
     end
-    if not self:hasNativeFieldValue(instance) then
-        return false
+    if not self:hasNativeFieldValue(objectDataEntryId) then
+        return nil
     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)
+    if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
+        return nil
     end
-    return true
+    return previousValue
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
-    local ____opt_5 = self.originalValueByInstance
-    local originalValue = ____opt_5 and ____opt_5[instance]
-    local ____opt_7 = self.modifiersByInstance
-    local modifiers = ____opt_7 and ____opt_7[instance]
+    local ____opt_11 = self.originalValueByInstance
+    local originalValue = ____opt_11 and ____opt_11[instance]
+    local ____opt_13 = self.modifiersByInstance
+    local modifiers = ____opt_13 and ____opt_13[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then
             for modifier in pairs(modifiers) do
                 value = modifier(instance, value, originalValue)
             end
+            return value, true
         end
-        return value
+        return value, false
     end
-    return self.defaultValue
+    return self.defaultValue, false
 end
 function ObjectField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
@@ -314,37 +342,37 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_10
+                local ____temp_16
                 if index == nil then
-                    ____temp_10 = value
+                    ____temp_16 = value
                 else
-                    local ____value_index_9 = value[index + 1]
-                    if ____value_index_9 == nil then
-                        ____value_index_9 = self.defaultValue
+                    local ____value_index_15 = value[index + 1]
+                    if ____value_index_15 == nil then
+                        ____value_index_15 = self.defaultValue
                     end
-                    ____temp_10 = ____value_index_9
+                    ____temp_16 = ____value_index_15
                 end
-                return ____temp_10
+                return ____temp_16
             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_12
+    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_18
             if index == nil then
-                ____temp_12 = value
+                ____temp_18 = value
             else
-                local ____value_index_11 = value[index + 1]
-                if ____value_index_11 == nil then
-                    ____value_index_11 = self.defaultValue
+                local ____value_index_17 = value[index + 1]
+                if ____value_index_17 == nil then
+                    ____value_index_17 = self.defaultValue
                 end
-                ____temp_12 = ____value_index_11
+                ____temp_18 = ____value_index_17
             end
-            return ____temp_12
+            return ____temp_18
         end
     end
     if index ~= nil then
@@ -375,12 +403,12 @@ ____exports.ObjectLevelField = __TS__Class()
 local ObjectLevelField = ____exports.ObjectLevelField
 ObjectLevelField.name = "ObjectLevelField"
 __TS__ClassExtends(ObjectLevelField, ObjectFieldBase)
-function ObjectLevelField.prototype.getValue(self, entry, level)
+function ObjectLevelField.prototype.getValue(self, entry, level, includeModifiers)
     if level == nil then
         local result = {}
         local levelCount = self:getLevelCount(entry)
         for i = 0, levelCount - 1 do
-            result[i + 1] = self:getValue(entry, i)
+            result[i + 1] = self:getValue(entry, i, includeModifiers)
         end
         return result
     end
@@ -389,36 +417,24 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_13 = valueByLevel[level + 1]
-                if ____valueByLevel_index_13 == nil then
-                    ____valueByLevel_index_13 = self.defaultValue
+                local ____valueByLevel_index_19 = valueByLevel[level + 1]
+                if ____valueByLevel_index_19 == nil then
+                    ____valueByLevel_index_19 = self.defaultValue
                 end
-                return ____valueByLevel_index_13
+                return ____valueByLevel_index_19
             end
         end
         return self.defaultValue
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil or self.isGlobal then
-            local ____opt_14 = self.valueByInstance[entry]
-            local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
-            if ____temp_16 == nil then
-                ____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
-            end
-            local ____temp_16_17 = ____temp_16
-            if ____temp_16_17 == nil then
-                ____temp_16_17 = self.defaultValue
-            end
-            return ____temp_16_17
+    if not includeModifiers then
+        local ____opt_22 = self.originalValueByLevelByInstance
+        local ____opt_20 = ____opt_22 and ____opt_22[entry]
+        local originalValue = ____opt_20 and ____opt_20[level]
+        if originalValue ~= nil then
+            return originalValue
         end
     end
-    local ____temp_18 = self:getNativeFieldValue(entry, level)
-    if ____temp_18 == nil then
-        ____temp_18 = self.defaultValue
-    end
-    return ____temp_18
+    return self:getActualValue(entry, level)
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -458,55 +474,114 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         valueByLevel[level + 1] = value
         return true
     end
-    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil or self.isGlobal then
-            local valueByLevel = self.valueByInstance[entry]
-            if valueByLevel == nil then
-                valueByLevel = {}
-                self.valueByInstance[entry] = valueByLevel
-            end
-            local ____valueByLevel_index_19 = valueByLevel[level + 1]
-            if ____valueByLevel_index_19 == nil then
-                ____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
-            end
-            local ____valueByLevel_index_19_20 = ____valueByLevel_index_19
-            if ____valueByLevel_index_19_20 == nil then
-                ____valueByLevel_index_19_20 = self.defaultValue
+    local previousOriginalValue
+    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
-            local previousValue = ____valueByLevel_index_19_20
-            if value ~= previousValue then
-                valueByLevel[level + 1] = value
-                self:invokeValueChangeEvent(
-                    entry,
-                    self,
-                    level,
-                    previousValue,
-                    value
-                )
+            local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
+            previousOriginalValue = originalValueByLevel[level]
+            if value == previousOriginalValue then
+                return true
             end
-            return true
+            originalValueByLevel[level] = value
+            value = self:calculateActualValue(entry, level)
         end
     end
-    if not self:hasNativeFieldValue(entry) then
+    local previousValue = self:setActualValue(entry, level, value)
+    if previousValue == nil then
         return false
     end
-    local previousValue = self:getNativeFieldValue(entry, level)
-    if value ~= previousValue then
-        if not self:setNativeFieldValue(entry, level, value) then
-            return false
+    if previousOriginalValue ~= nil or value ~= previousValue then
+        local ____self_invokeValueChangeEvent_26 = self.invokeValueChangeEvent
+        local ____entry_25 = entry
+        local ____previousOriginalValue_24 = previousOriginalValue
+        if ____previousOriginalValue_24 == nil then
+            ____previousOriginalValue_24 = previousValue
         end
-        self:invokeValueChangeEvent(
-            entry,
+        ____self_invokeValueChangeEvent_26(
+            self,
+            ____entry_25,
             self,
             level,
-            previousValue,
+            ____previousOriginalValue_24,
             value
         )
     end
     return true
 end
+function ObjectLevelField.prototype.updateActualValue(self, instance, level)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance == nil then
+        return
+    end
+    local modifiers = modifiersByInstance[instance]
+    if modifiers == nil or modifiers.size == 0 then
+        return
+    end
+    if level == nil then
+        for i = 0, self:getLevelCount(instance) - 1 do
+            self:updateActualValue(instance, i)
+        end
+        return
+    end
+    self:setActualValue(
+        instance,
+        level,
+        self:calculateActualValue(instance, level)
+    )
+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_27 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_27 == nil then
+                ____originalValueByLevel_level_27 = self:getActualValue(instance, level)
+            end
+            originalValueByLevel[level] = ____originalValueByLevel_level_27
+            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
@@ -522,6 +597,79 @@ function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value
     end
     return self:setValue(entry, levelOrValue)
 end
+function ObjectLevelField.prototype.getActualValue(self, instance, level)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local ____opt_28 = self.valueByInstance[instance]
+            local ____temp_30 = ____opt_28 and ____opt_28[level + 1]
+            if ____temp_30 == nil then
+                ____temp_30 = (defaultValueByLevel or emptyArray())[level + 1]
+            end
+            local ____temp_30_31 = ____temp_30
+            if ____temp_30_31 == nil then
+                ____temp_30_31 = self.defaultValue
+            end
+            return ____temp_30_31
+        end
+    end
+    local ____temp_32 = self:getNativeFieldValue(instance, level)
+    if ____temp_32 == nil then
+        ____temp_32 = self.defaultValue
+    end
+    return ____temp_32
+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[instance] = valueByLevel
+            end
+            local ____valueByLevel_index_33 = valueByLevel[level + 1]
+            if ____valueByLevel_index_33 == nil then
+                ____valueByLevel_index_33 = (defaultValueByLevel or emptyArray())[level + 1]
+            end
+            local ____valueByLevel_index_33_34 = ____valueByLevel_index_33
+            if ____valueByLevel_index_33_34 == nil then
+                ____valueByLevel_index_33_34 = self.defaultValue
+            end
+            local previousValue = ____valueByLevel_index_33_34
+            valueByLevel[level + 1] = value
+            return previousValue
+        end
+    end
+    if not self:hasNativeFieldValue(objectDataEntryId) then
+        return nil
+    end
+    local previousValue = self:getNativeFieldValue(instance, level)
+    if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
+        return nil
+    end
+    return previousValue
+end
+function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
+    local ____opt_37 = self.originalValueByLevelByInstance
+    local ____opt_35 = ____opt_37 and ____opt_37[instance]
+    local originalValue = ____opt_35 and ____opt_35[level]
+    local ____opt_39 = self.modifiersByInstance
+    local modifiers = ____opt_39 and ____opt_39[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 value
+    end
+    return self.defaultValue
+end
 function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(self),

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,12 @@ 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;
+};
+export declare const shuffle: (array: unknown[]) => void;

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,24 @@ ____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
+____exports.shuffle = function(array)
+    for i = #array - 1, 1 do
+        local j = getRandomInt(0, i)
+        local value = array[i + 1]
+        array[i + 1] = array[j + 1]
+        array[j + 1] = value
+    end
+end
 return ____exports

package/engine/standard/fields/ability.d.ts

@@ -376,8 +376,8 @@ export declare const INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD: Abi
 export declare const ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
-export declare const MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
+export declare const ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;
 export declare const ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD: AbilityFloatLevelField & symbol;

package/engine/standard/fields/ability.lua

@@ -387,8 +387,8 @@ ____exports.INVISIBILITY_TRANSITION_TIME_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloa
 ____exports.ACTIVATION_RADIUS_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Neu1"))
 ____exports.AMOUNT_REGENERATED_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Arm1"))
 ____exports.DAMAGE_PER_SECOND_POI1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi1"))
-____exports.ATTACK_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
-____exports.MOVEMENT_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
+____exports.MOVEMENT_SPEED_FACTOR_POI2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi2"))
+____exports.ATTACK_SPEED_FACTOR_POI3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poi3"))
 ____exports.EXTRA_DAMAGE_POA1_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa1"))
 ____exports.DAMAGE_PER_SECOND_POA2_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa2"))
 ____exports.ATTACK_SPEED_FACTOR_POA3_ABILITY_FLOAT_LEVEL_FIELD = AbilityFloatLevelField:create(fourCC("Poa3"))

package/engine/standard/fields/item.d.ts

@@ -0,0 +1,4 @@
+/** @noSelfInFile */
+import { ItemBooleanField } from "../../object-field/item";
+export declare const CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD: ItemBooleanField & symbol;
+export declare const IS_ACTIVELY_USED_ITEM_FIELD: ItemBooleanField & symbol;