warscript 0.0.1-dev.87b6c38 → 0.0.1-dev.8895ff6

package/engine/object-field.lua

@@ -124,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]
@@ -133,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
+    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
-    return self:setActualValue(entry, value)
 end
 function ObjectField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
@@ -151,17 +181,14 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             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)
+        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_1[____instance_2] = ____originalValueByInstance_instance_0
-        self:setActualValue(
-            instance,
-            self:calculateActualValue(instance)
-        )
+        ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
+        self:setActualValue(instance, (self:calculateActualValue(instance)))
     end
 end
 function ObjectField.prototype.removeModifier(self, instance, modifier)
@@ -169,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
@@ -203,22 +227,22 @@ function ObjectField.prototype.getActualValue(self, 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_3 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_3 == nil then
-                ____self_valueByInstance_instance_3 = 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_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_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_3_4
+            return ____self_valueByInstance_instance_6_7
         end
     end
-    local ____temp_5 = self:getNativeFieldValue(instance)
-    if ____temp_5 == nil then
-        ____temp_5 = self.defaultValue
+    local ____temp_8 = self:getNativeFieldValue(instance)
+    if ____temp_8 == nil then
+        ____temp_8 = self.defaultValue
     end
-    return ____temp_5
+    return ____temp_8
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -226,45 +250,44 @@ function ObjectField.prototype.setActualValue(self, instance, value)
     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
+            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_6_7 = ____self_valueByInstance_instance_6
-            if ____self_valueByInstance_instance_6_7 == nil then
-                ____self_valueByInstance_instance_6_7 = 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_6_7
+            local previousValue = ____self_valueByInstance_instance_9_10
             self.valueByInstance[instance] = value
-            self:invokeValueChangeEvent(instance, self, previousValue, value)
-            return true
+            return previousValue
         end
     end
     if not self:hasNativeFieldValue(objectDataEntryId) then
-        return false
+        return nil
     end
     local previousValue = self:getNativeFieldValue(instance)
     if value ~= previousValue and not self:setNativeFieldValue(instance, value) then
-        return false
+        return nil
     end
-    self:invokeValueChangeEvent(instance, self, previousValue, value)
-    return true
+    return previousValue
 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]
+    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(
@@ -319,17 +342,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_13
+                local ____temp_16
                 if index == nil then
-                    ____temp_13 = value
+                    ____temp_16 = value
                 else
-                    local ____value_index_12 = value[index + 1]
-                    if ____value_index_12 == nil then
-                        ____value_index_12 = self.defaultValue
+                    local ____value_index_15 = value[index + 1]
+                    if ____value_index_15 == nil then
+                        ____value_index_15 = self.defaultValue
                     end
-                    ____temp_13 = ____value_index_12
+                    ____temp_16 = ____value_index_15
                 end
-                return ____temp_13
+                return ____temp_16
             end
         end
         return index == nil and ({}) or self.defaultValue
@@ -339,17 +362,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         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
+            local ____temp_18
             if index == nil then
-                ____temp_15 = value
+                ____temp_18 = value
             else
-                local ____value_index_14 = value[index + 1]
-                if ____value_index_14 == nil then
-                    ____value_index_14 = self.defaultValue
+                local ____value_index_17 = value[index + 1]
+                if ____value_index_17 == nil then
+                    ____value_index_17 = self.defaultValue
                 end
-                ____temp_15 = ____value_index_14
+                ____temp_18 = ____value_index_17
             end
-            return ____temp_15
+            return ____temp_18
         end
     end
     if index ~= nil then
@@ -394,18 +417,18 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_16 = valueByLevel[level + 1]
-                if ____valueByLevel_index_16 == nil then
-                    ____valueByLevel_index_16 = self.defaultValue
+                local ____valueByLevel_index_19 = valueByLevel[level + 1]
+                if ____valueByLevel_index_19 == nil then
+                    ____valueByLevel_index_19 = self.defaultValue
                 end
-                return ____valueByLevel_index_16
+                return ____valueByLevel_index_19
             end
         end
         return self.defaultValue
     end
-    local ____opt_19 = self.originalValueByLevelByInstance
-    local ____opt_17 = ____opt_19 and ____opt_19[entry]
-    local originalValue = ____opt_17 and ____opt_17[level]
+    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
@@ -449,6 +472,7 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         valueByLevel[level + 1] = value
         return true
     end
+    local previousOriginalValue
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[entry]
@@ -458,11 +482,57 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
                 originalValueByLevelByInstance = mutableWeakLuaMap()
                 self.originalValueByLevelByInstance = originalValueByLevelByInstance
             end
-            getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)[level] = value
+            local originalValueByLevel = getOrPut(originalValueByLevelByInstance, entry, mutableLuaMap)
+            previousOriginalValue = originalValueByLevel[level]
+            if value == previousOriginalValue then
+                return true
+            end
+            originalValueByLevel[level] = value
             value = self:calculateActualValue(entry, level)
         end
     end
-    return self:setActualValue(entry, level, value)
+    local previousValue = self:setActualValue(entry, level, value)
+    if previousValue == nil then
+        return false
+    end
+    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_26(
+            self,
+            ____entry_25,
+            self,
+            level,
+            ____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
@@ -479,11 +549,11 @@ function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
         local originalValueByLevel = getOrPut(originalValueByLevelByInstance, instance, mutableLuaMap)
         local levelCount = self:getLevelCount(instance)
         for level = 0, levelCount - 1 do
-            local ____originalValueByLevel_level_21 = originalValueByLevel[level]
-            if ____originalValueByLevel_level_21 == nil then
-                ____originalValueByLevel_level_21 = self:getActualValue(instance, level)
+            local ____originalValueByLevel_level_27 = originalValueByLevel[level]
+            if ____originalValueByLevel_level_27 == nil then
+                ____originalValueByLevel_level_27 = self:getActualValue(instance, level)
             end
-            originalValueByLevel[level] = ____originalValueByLevel_level_21
+            originalValueByLevel[level] = ____originalValueByLevel_level_27
             self:setActualValue(
                 instance,
                 level,
@@ -530,23 +600,23 @@ function ObjectLevelField.prototype.getActualValue(self, instance, level)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
         local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
         if defaultValueByLevel ~= nil or self.isGlobal then
-            local ____opt_22 = self.valueByInstance[instance]
-            local ____temp_24 = ____opt_22 and ____opt_22[level + 1]
-            if ____temp_24 == nil then
-                ____temp_24 = (defaultValueByLevel or emptyArray())[level + 1]
+            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_24_25 = ____temp_24
-            if ____temp_24_25 == nil then
-                ____temp_24_25 = self.defaultValue
+            local ____temp_30_31 = ____temp_30
+            if ____temp_30_31 == nil then
+                ____temp_30_31 = self.defaultValue
             end
-            return ____temp_24_25
+            return ____temp_30_31
         end
     end
-    local ____temp_26 = self:getNativeFieldValue(instance, level)
-    if ____temp_26 == nil then
-        ____temp_26 = self.defaultValue
+    local ____temp_32 = self:getNativeFieldValue(instance, level)
+    if ____temp_32 == nil then
+        ____temp_32 = self.defaultValue
     end
-    return ____temp_26
+    return ____temp_32
 end
 function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
@@ -559,48 +629,34 @@ function ObjectLevelField.prototype.setActualValue(self, instance, level, value)
                 valueByLevel = {}
                 self.valueByInstance[instance] = valueByLevel
             end
-            local ____valueByLevel_index_27 = valueByLevel[level + 1]
-            if ____valueByLevel_index_27 == nil then
-                ____valueByLevel_index_27 = (defaultValueByLevel or emptyArray())[level + 1]
+            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_27_28 = ____valueByLevel_index_27
-            if ____valueByLevel_index_27_28 == nil then
-                ____valueByLevel_index_27_28 = self.defaultValue
+            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_27_28
+            local previousValue = ____valueByLevel_index_33_34
             valueByLevel[level + 1] = value
-            self:invokeValueChangeEvent(
-                instance,
-                self,
-                level,
-                previousValue,
-                value
-            )
-            return true
+            return previousValue
         end
     end
     if not self:hasNativeFieldValue(objectDataEntryId) then
-        return false
+        return nil
     end
     local previousValue = self:getNativeFieldValue(instance, level)
     if value ~= previousValue and not self:setNativeFieldValue(instance, level, value) then
-        return false
+        return nil
     end
-    self:invokeValueChangeEvent(
-        instance,
-        self,
-        level,
-        previousValue,
-        value
-    )
-    return true
+    return previousValue
 end
 function ObjectLevelField.prototype.calculateActualValue(self, instance, level)
-    local ____opt_31 = self.originalValueByLevelByInstance
-    local ____opt_29 = ____opt_31 and ____opt_31[instance]
-    local originalValue = ____opt_29 and ____opt_29[level]
-    local ____opt_33 = self.modifiersByInstance
-    local modifiers = ____opt_33 and ____opt_33[instance]
+    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

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

@@ -1,6 +1,12 @@
 /** @noSelfInFile */
-import { UnitClassificationsField, UnitFlyHeightField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
-export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
-export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
-export declare const FLY_HEIGHT_UNIT_FLOAT_FIELD: UnitFlyHeightField & symbol;
-export declare const SCALING_VALUE_UNIT_FLOAT_FIELD: UnitScalingValueField & symbol;
+import { UnitClassificationsField, UnitFloatField, UnitFlyHeightField, UnitHealthRegenerationTypeField, UnitIntegerField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
+export declare const PROPULSION_WINDOW_UNIT_FIELD: UnitPropulsionWindowField & symbol;
+export declare const CLASSIFICATIONS_UNIT_FIELD: UnitClassificationsField & symbol;
+export declare const FLY_HEIGHT_UNIT_FIELD: UnitFlyHeightField & symbol;
+export declare const SCALING_VALUE_UNIT_FIELD: UnitScalingValueField & symbol;
+export declare const HEALTH_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
+export declare const MANA_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
+export declare const HEALTH_REGENERATION_TYPE_UNIT_FIELD: UnitHealthRegenerationTypeField & symbol;
+export declare const STRENGTH_UNIT_FIELD: UnitIntegerField<number> & symbol;
+export declare const AGILITY_UNIT_FIELD: UnitIntegerField<number> & symbol;
+export declare const INTELLIGENCE_UNIT_FIELD: UnitIntegerField<number> & symbol;

package/engine/standard/fields/unit.lua

@@ -1,11 +1,20 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
 local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitFloatField = ____unit.UnitFloatField
 local UnitFlyHeightField = ____unit.UnitFlyHeightField
+local UnitHealthRegenerationTypeField = ____unit.UnitHealthRegenerationTypeField
+local UnitIntegerField = ____unit.UnitIntegerField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
 local UnitScalingValueField = ____unit.UnitScalingValueField
-____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
-____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
-____exports.FLY_HEIGHT_UNIT_FLOAT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
-____exports.SCALING_VALUE_UNIT_FLOAT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.PROPULSION_WINDOW_UNIT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
+____exports.CLASSIFICATIONS_UNIT_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+____exports.FLY_HEIGHT_UNIT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
+____exports.SCALING_VALUE_UNIT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.HEALTH_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("uhpr"))
+____exports.MANA_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("umpr"))
+____exports.HEALTH_REGENERATION_TYPE_UNIT_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
+____exports.STRENGTH_UNIT_FIELD = UnitIntegerField:create(fourCC("ustc"))
+____exports.AGILITY_UNIT_FIELD = UnitIntegerField:create(fourCC("uagc"))
+____exports.INTELLIGENCE_UNIT_FIELD = UnitIntegerField:create(fourCC("uinc"))
 return ____exports

package/engine/unit.d.ts

@@ -19,8 +19,10 @@ import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
 import "./internal/unit/main-selected";
 import "./internal/unit/add-item-to-slot-init";
+import "./internal/unit/attributes";
 import "./internal/unit/fly-height";
 import "./internal/unit/scale";
+import "./internal/unit/interrupts";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -19,8 +19,10 @@ require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
 require("engine.internal.unit.main-selected")
 require("engine.internal.unit.add-item-to-slot-init")
+require("engine.internal.unit.attributes")
 require("engine.internal.unit.fly-height")
 require("engine.internal.unit.scale")
+require("engine.internal.unit.interrupts")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/objutil/buff.lua

@@ -29,6 +29,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local ____assert = _G.assert
 local ____pairs = _G.pairs
 ____exports.BuffDefinition = __TS__Class()
@@ -461,7 +463,7 @@ local buffs = setmetatable(
     {
         __mode = "k",
         __index = function(self, unit)
-            local ____table = {}
+            local ____table = __TS__New(LinkedMap)
             self[unit] = ____table
             return ____table
         end
@@ -494,7 +496,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
     end
     local constructor = self.constructor
     local instances = buffs[unit]
-    local instance = instances[constructor]
+    local instance = instances:get(constructor)
     if instance then
         instance:destroy()
         if not instance.destroyed then
@@ -507,7 +509,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
             )
         end
     end
-    instances[constructor] = self
+    instances:put(constructor, self)
     if preset then
         local unitHandle = unit.handle
         local slowPoisonMethod = not preset.positive and not preset.magic
@@ -586,13 +588,13 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getInstance(self, unit)
-    return buffs[unit][self]
+    return buffs[unit]:get(self)
 end
 function Buff.isApplied(self, unit)
-    return buffs[unit][self] ~= nil
+    return buffs[unit]:get(self) ~= nil
 end
 function Buff.ifApplied(self, unit, action)
-    local instance = buffs[unit][self]
+    local instance = buffs[unit]:get(self)
     if instance then
         ____assert(__TS__InstanceOf(instance, self))
         action(instance)
@@ -615,7 +617,7 @@ function Buff.prototype.destroy(self)
     if self.preset then
         self.unit:removeAbility(self.preset.buffId)
     end
-    buffs[self.unit][self.constructor] = nil
+    buffs[self.unit]:remove(self.constructor)
     self.destroyed = true
 end
 function Buff.prototype.onDispel(self, source)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.87b6c38",
+    "version": "0.0.1-dev.8895ff6",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/utility/linked-map.d.ts

@@ -0,0 +1,26 @@
+/** @noSelfInFile */
+import { ReadonlyLinkedSet } from "./linked-set";
+type IteratorState<K extends AnyNotNil, V> = {
+    n?: K;
+    t: LuaMap<K, K>;
+    v: LuaMap<K, V>;
+};
+type OneSidedTypeGuard = {
+    readonly __oneSidedTypeGuard: unique symbol;
+};
+export interface LinkedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    readonly __linkedSet: unique symbol;
+}
+export declare class LinkedMap<K extends AnyNotNil, V> {
+    private k;
+    private v;
+    get keys(): ReadonlyLinkedSet<K>;
+    get(key: K): V | undefined;
+    getOrPut(key: K, defaultValue: (this: void) => V): V;
+    put(key: K, value: V): void;
+    remove(key: K): boolean;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    get size(): number;
+    protected __pairs(this: LinkedMap<K, V>): LuaIterator<LuaMultiReturn<[K | undefined, V | undefined]>, IteratorState<K, V>>;
+}
+export {};