warscript 0.0.1-dev.f5421e8 → 0.0.1-dev.f9166a3

package/engine/object-field/unit.lua

@@ -2,11 +2,22 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____object_2Dfield = require("engine.object-field")
 local ObjectField = ____object_2Dfield.ObjectField
+local ObjectLevelField = ____object_2Dfield.ObjectLevelField
+local ____linked_2Dset = require("utility.linked-set")
+local nonEmptyLinkedSetOf = ____linked_2Dset.nonEmptyLinkedSetOf
+local convertUnitBooleanField = ConvertUnitBooleanField
+local convertUnitIntegerField = ConvertUnitIntegerField
+local convertUnitRealField = ConvertUnitRealField
+local convertUnitStringField = ConvertUnitStringField
+local convertUnitWeaponIntegerField = ConvertUnitWeaponIntegerField
+local getUnitWeaponIntegerField = BlzGetUnitWeaponIntegerField
+local setUnitWeaponIntegerField = BlzSetUnitWeaponIntegerField
 ____exports.UnitField = __TS__Class()
 local UnitField = ____exports.UnitField
 UnitField.name = "UnitField"
@@ -14,6 +25,9 @@ __TS__ClassExtends(UnitField, ObjectField)
 function UnitField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function UnitField.prototype.hasNativeFieldValue(self)
+    return true
+end
 __TS__SetDescriptor(
     UnitField.prototype,
     "instanceClass",
@@ -22,22 +36,79 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitBooleanField = __TS__Class()
+local UnitBooleanField = ____exports.UnitBooleanField
+UnitBooleanField.name = "UnitBooleanField"
+__TS__ClassExtends(UnitBooleanField, ____exports.UnitField)
+function UnitBooleanField.prototype.getNativeFieldById(self, id)
+    return convertUnitBooleanField(id)
+end
+function UnitBooleanField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitBooleanField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitBooleanField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return false
+    end},
+    true
+)
+____exports.UnitFloatField = __TS__Class()
+local UnitFloatField = ____exports.UnitFloatField
+UnitFloatField.name = "UnitFloatField"
+__TS__ClassExtends(UnitFloatField, ____exports.UnitField)
+function UnitFloatField.prototype.getNativeFieldById(self, id)
+    return convertUnitRealField(id)
+end
+function UnitFloatField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitFloatField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitFloatField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+____exports.UnitIntegerField = __TS__Class()
+local UnitIntegerField = ____exports.UnitIntegerField
+UnitIntegerField.name = "UnitIntegerField"
+__TS__ClassExtends(UnitIntegerField, ____exports.UnitField)
+function UnitIntegerField.prototype.getNativeFieldById(self, id)
+    return convertUnitIntegerField(id)
+end
+function UnitIntegerField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitIntegerField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitIntegerField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
 ____exports.UnitStringField = __TS__Class()
 local UnitStringField = ____exports.UnitStringField
 UnitStringField.name = "UnitStringField"
 __TS__ClassExtends(UnitStringField, ____exports.UnitField)
 function UnitStringField.prototype.getNativeFieldById(self, id)
-    return ConvertUnitStringField(id)
-end
-function UnitStringField.prototype.hasNativeFieldValue(self)
-    return true
+    return convertUnitStringField(id)
 end
 function UnitStringField.prototype.getNativeFieldValue(self, instance)
     return instance:getField(self.nativeField)
 end
-function UnitStringField.prototype.getObjectDataEntryId(self, instance)
-    return instance.typeId
-end
 function UnitStringField.prototype.setNativeFieldValue(self, instance, value)
     return instance:setField(self.nativeField, value)
 end
@@ -49,4 +120,99 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitWeaponField = __TS__Class()
+local UnitWeaponField = ____exports.UnitWeaponField
+UnitWeaponField.name = "UnitWeaponField"
+__TS__ClassExtends(UnitWeaponField, ObjectLevelField)
+function UnitWeaponField.prototype.getLevelCount(self)
+    return 2
+end
+function UnitWeaponField.prototype.getObjectDataEntryId(self, instance)
+    return instance.typeId
+end
+function UnitWeaponField.prototype.hasNativeFieldValue(self)
+    return true
+end
+__TS__SetDescriptor(
+    UnitWeaponField.prototype,
+    "instanceClass",
+    {get = function(self)
+        return Unit
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitNumberWeaponField = __TS__Class()
+local UnitNumberWeaponField = ____exports.UnitNumberWeaponField
+UnitNumberWeaponField.name = "UnitNumberWeaponField"
+__TS__ClassExtends(UnitNumberWeaponField, ____exports.UnitWeaponField)
+__TS__SetDescriptor(
+    UnitNumberWeaponField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitNumberWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitEnumWeaponField = __TS__Class()
+local UnitEnumWeaponField = ____exports.UnitEnumWeaponField
+UnitEnumWeaponField.name = "UnitEnumWeaponField"
+__TS__ClassExtends(UnitEnumWeaponField, ____exports.UnitWeaponField)
+function UnitEnumWeaponField.prototype.getNativeFieldById(self, id)
+    return convertUnitWeaponIntegerField(id)
+end
+function UnitEnumWeaponField.prototype.getNativeFieldValue(self, instance, index)
+    local value = getUnitWeaponIntegerField(instance.handle, self.nativeField, index)
+    if self.values:contains(value) then
+        return value
+    end
+    return self.values:first()
+end
+function UnitEnumWeaponField.prototype.setNativeFieldValue(self, instance, index, value)
+    return setUnitWeaponIntegerField(instance.handle, self.nativeField, index, value)
+end
+__TS__SetDescriptor(
+    UnitEnumWeaponField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return self.values:first()
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    UnitEnumWeaponField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.UnitAttackTypeWeaponField = __TS__Class()
+local UnitAttackTypeWeaponField = ____exports.UnitAttackTypeWeaponField
+UnitAttackTypeWeaponField.name = "UnitAttackTypeWeaponField"
+__TS__ClassExtends(UnitAttackTypeWeaponField, ____exports.UnitEnumWeaponField)
+function UnitAttackTypeWeaponField.prototype.____constructor(self, ...)
+    UnitAttackTypeWeaponField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(
+        1,
+        2,
+        3,
+        0,
+        5,
+        4,
+        6
+    )
+end
 return ____exports

package/engine/object-field.d.ts

@@ -5,9 +5,10 @@ import { ObjectDataEntry, ObjectDataEntryIdType, ObjectDataEntryLevelFieldValueS
 export type ObjectFieldId = number & {
     readonly __objectDataEntryFieldId: unique symbol;
 };
-export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
+export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number, isGlobal?: boolean) => T);
 export type ObjectFieldAbstractConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (abstract new (id: number) => T);
 declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEntry, InstanceType extends AnyNotNil, ValueType, NativeFieldType> {
+    readonly isGlobal: boolean;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -18,7 +19,7 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
     protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     hasValue(instance: InstanceType): boolean;
-    constructor(id: number);
+    constructor(id: number, isGlobal?: boolean);
     static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
 }
@@ -35,14 +36,22 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
 ]> : never;
 export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
+type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
-    getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
+    private originalValueByInstance?;
+    private modifiersByInstance?;
+    getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
+    applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
+    removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
     trySetValue(entry: ObjectDataEntryType | InstanceType, value: unknown): boolean;
+    private getActualValue;
+    private setActualValue;
+    private calculateActualValue;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectField, R extends ReadonlyObjectFieldType<T>>(this: ReadonlyObjectFieldConstructor<T>): ObjectFieldValueChangeEvent<R>;

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 = {}
@@ -29,7 +34,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 = true
+    end
+    self.isGlobal = isGlobal
     self.valueByInstance = setmetatable({}, {__mode = "k"})
     if objectFieldById[id] ~= nil then
         error(
@@ -48,7 +57,7 @@ function ObjectFieldBase.prototype.supports(self, instance)
 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)
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
 end
 function ObjectFieldBase.create(self, id)
     return __TS__New(
@@ -75,7 +84,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
@@ -86,22 +95,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
@@ -116,37 +119,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
-            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
+        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
@@ -168,6 +187,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),
@@ -221,17 +307,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
@@ -241,17 +327,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
@@ -296,11 +382,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
@@ -309,23 +395,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
@@ -374,15 +460,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

package/objutil/buff.lua

@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
 local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
 local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
 local ____unit = require("core.types.unit")
-local AttackType = ____unit.AttackType
 local DamageType = ____unit.DamageType
 local Unit = ____unit.Unit
 local ____dummy = require("core.dummy")
@@ -756,7 +755,7 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
     end)
 end
 Unit.onDamaging:addListener(function(source, target, event)
-    if event.amount == 0 and event.attackType == AttackType.SPELL and event.damageType == DamageType.NORMAL and not event.isAttack then
+    if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
         Timer:run(function()
             checkBuffs(target, true, source)
         end)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.f5421e8",
+    "version": "0.0.1-dev.f9166a3",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.8e8a660"
+        "warpack": "0.0.1-dev.fa5e065"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/arrays.d.ts

@@ -22,6 +22,7 @@ export declare const mapToLuaSet: {
     <T, R extends AnyNotNil>(array: readonly T[], transform: (value: T) => R): LuaSet<R>;
     <T, K extends KeysOfType<T, AnyNotNil>>(array: readonly T[], key: K): LuaSet<T[K] extends AnyNotNil ? T[K] : never>;
 };
+export declare const flatten: <T>(array: readonly (readonly T[])[]) => T[];
 export declare const flatMap: {
     <T, R>(array: readonly T[], transform: (value: T) => readonly R[]): R[];
     <T, K extends KeysOfType<T, readonly any[]>>(array: readonly T[], key: K): (T[K] extends readonly (infer R)[] ? R : never)[];