warscript 0.0.1-dev.989e1a3 → 0.0.1-dev.9979c8f

package/engine/object-data/entry/buff-type/applicable.lua

@@ -65,123 +65,127 @@ function ApplicableBuffType.wrap(self, other)
     return __TS__New(____exports.ApplicableBuffType, other.object)
 end
 ApplicableBuffType.BASE_ID = fourCC("BHbz")
-local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(postcompile(function()
-    local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
-        local abilityType = abilityTypeConstructor:create()
-        abilityType.isInternal = true
-        abilityType.levelCount = applicableBuffType.levelCount
-        abilityType.buttonPositionX = 0
-        abilityType.buttonPositionY = -11
-        abilityType.casterAttachmentPresets = {}
-        abilityType.targetEffectPresets = {}
-        abilityType.casterEffectSoundPresetId = nil
-        abilityType.learnLevelMinimum = 6
-        abilityType.race = "other"
-        abilityType.shouldCheckTechTreeDependencies = false
-        abilityType.techTreeDependencies = {}
-        abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
-            4,
-            2,
-            2097152,
-            8,
-            1048576,
-            16
-        )
-        abilityType.areaOfEffect = 0
-        abilityType.castRange = 999999
-        abilityType.cooldown = 0
-        abilityType.manaCost = 0
-        abilityType.buffDuration = 0
-        abilityType.heroBuffDuration = 0
-        return abilityType
-    end
-    local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
-    local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
-    for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
-        local applicatorAbilityTypeIdByApplicatorType = {}
-        if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
-                applicatorAbilityType.missProbability = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId = table.unpack(
+    postcompile(function()
+        local function prepareAbilityType(abilityTypeConstructor, applicableBuffType)
+            local abilityType = abilityTypeConstructor:create()
+            abilityType.isInternal = true
+            abilityType.levelCount = applicableBuffType.levelCount
+            abilityType.buttonPositionX = 0
+            abilityType.buttonPositionY = -11
+            abilityType.casterAttachmentPresets = {}
+            abilityType.targetEffectPresets = {}
+            abilityType.casterEffectSoundPresetId = nil
+            abilityType.learnLevelMinimum = 6
+            abilityType.race = "other"
+            abilityType.shouldCheckTechTreeDependencies = false
+            abilityType.techTreeDependencies = {}
+            abilityType.allowedTargetCombatClassifications = combatClassificationsOf(
+                4,
+                2,
+                2097152,
+                8,
+                1048576,
+                16
+            )
+            abilityType.areaOfEffect = 0
+            abilityType.castRange = 999999
+            abilityType.cooldown = 0
+            abilityType.manaCost = 0
+            abilityType.buffDuration = 0
+            abilityType.heroBuffDuration = 0
+            return abilityType
+        end
+        local multilevelPhysicalPositiveApplicatorAbilityTypes = {}
+        local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId = {}
+        for applicableBuffType in pairs(compiletimeApplicableBuffTypes) do
+            local applicatorAbilityTypeIdByApplicatorType = {}
+            if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                    applicatorAbilityType.missProbability = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.scaleIncrease = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                end
             end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.scaleIncrease = 0
+            if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
+                if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
+                    applicatorAbilityType.damagePerSecond = 0
+                    applicatorAbilityType.movementSpeedDecreaseFactor = 0
+                    applicatorAbilityType.attackSpeedDecreaseFactor = 0
+                    applicatorAbilityType.isDamageStacking = false
+                    applicatorAbilityType.isMovementSpeedFactorStacking = false
+                    applicatorAbilityType.isAttackSpeedFactorStacking = false
+                    applicatorAbilityType.isAbleToKill = false
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
+                    applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
+                end
+                if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
+                    local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
+                    applicatorAbilityType.attackSpeedIncreaseFactor = 0
+                    applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                    applicatorAbilityType.receivedDamageIncreaseFactor = 0
+                    applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
+                    if applicatorAbilityType.levelCount > 1 then
+                        multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+                    end
+                    applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+                end
+            end
+            if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
+                local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
+                applicatorAbilityType.levelCount = 1
+                applicatorAbilityType.damagePerInterval = 0
+                applicatorAbilityType.castRange = 0
+                applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
+                applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852101] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
             end
+            applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
         end
-        if applicableBuffType.resistanceType == 2 or applicableBuffType.resistanceType == nil then
-            if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(SlowPoisonAbilityType, applicableBuffType)
-                applicatorAbilityType.damagePerSecond = 0
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.isDamageStacking = false
-                applicatorAbilityType.isMovementSpeedFactorStacking = false
-                applicatorAbilityType.isAttackSpeedFactorStacking = false
-                applicatorAbilityType.isAbleToKill = false
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
-            end
-            if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
-                applicatorAbilityType.attackSpeedIncreaseFactor = 0
-                applicatorAbilityType.movementSpeedIncreaseFactor = 0
-                applicatorAbilityType.receivedDamageIncreaseFactor = 0
-                applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                if applicatorAbilityType.levelCount > 1 then
-                    multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType
+        local applicatorUpgradeIds = {}
+        local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
+        for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
+            local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
+            local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
+            local applicatorUpgrade = BlankUpgrade:create()
+            applicatorUpgrade.isInternal = true
+            applicatorUpgrade.levelCount = maxLevelCount - 1
+            applicatorUpgrade.effects = map(
+                applicatorAbilityTypeIds,
+                function(applicatorAbilityTypeId)
+                    return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
                 end
-                applicatorAbilityTypeIdByApplicatorType[852100] = applicatorAbilityType.id
+            )
+            applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
+            for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
+                applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
             end
         end
-        if applicableBuffType.polarity == 0 or applicableBuffType.polarity == nil then
-            local applicatorAbilityType = prepareAbilityType(PermanentImmolationAbilityType, applicableBuffType)
-            applicatorAbilityType.levelCount = 1
-            applicatorAbilityType.damagePerInterval = 0
-            applicatorAbilityType.castRange = 0
-            applicatorAbilityType.buffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.heroBuffDuration = MAXIMUM_INTEGER
-            applicatorAbilityType.allowedTargetCombatClassifications = combatClassificationsOf(1)
-            applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-            applicatorAbilityTypeIdByApplicatorType[0] = applicatorAbilityType.id
-        end
-        applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffType.id] = applicatorAbilityTypeIdByApplicatorType
-    end
-    local applicatorUpgradeIds = {}
-    local applicatorUpgradeIdByApplicatorAbilityTypeId = {}
-    for ____, multilevelPhysicalPositiveApplicatorAbilityTypesChunk in ipairs(chunked(multilevelPhysicalPositiveApplicatorAbilityTypes, 4)) do
-        local maxLevelCount = max(map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "levelCount"))
-        local applicatorAbilityTypeIds = map(multilevelPhysicalPositiveApplicatorAbilityTypesChunk, "id")
-        local applicatorUpgrade = BlankUpgrade:create()
-        applicatorUpgrade.isInternal = true
-        applicatorUpgrade.levelCount = maxLevelCount - 1
-        applicatorUpgrade.effects = map(
-            applicatorAbilityTypeIds,
-            function(applicatorAbilityTypeId)
-                return {type = "rlev", bonusBase = 1, bonusIncrement = 1, abilityTypeId = applicatorAbilityTypeId}
-            end
-        )
-        applicatorUpgradeIds[#applicatorUpgradeIds + 1] = applicatorUpgrade.id
-        for ____, applicatorAbilityTypeId in ipairs(applicatorAbilityTypeIds) do
-            applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId] = applicatorUpgrade.id
+        for ____, unitType in ipairs(UnitType:getAll()) do
+            local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
+            __TS__SparseArrayPush(
+                ____array_0,
+                table.unpack(applicatorUpgradeIds)
+            )
+            unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
         end
-    end
-    for ____, unitType in ipairs(UnitType:getAll()) do
-        local ____array_0 = __TS__SparseArrayNew(table.unpack(unitType.affectingUpgradeIds))
-        __TS__SparseArrayPush(
-            ____array_0,
-            table.unpack(applicatorUpgradeIds)
-        )
-        unitType.affectingUpgradeIds = {__TS__SparseArraySpread(____array_0)}
-    end
-    return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
-end))
+        return {applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorUpgradeIdByApplicatorAbilityTypeId}
+    end),
+    1,
+    2
+)
 local EVASION_ABILITY_TYPE_IDS = postcompile(function()
     return AbilityType:getAllIdsByBaseIds(map({
         "AEev",

package/engine/object-field/ability.lua

@@ -519,9 +519,9 @@ __TS__SetDescriptor(
 )
 ____exports.resolveCurrentAbilityDependentValue = function(ability, value)
     if __TS__InstanceOf(value, ____exports.AbilityField) then
-        return value:getValue(ability)
+        return value:getValue(ability, true)
     elseif __TS__InstanceOf(value, ____exports.AbilityLevelField) then
-        return value:getValue(ability, ability.level)
+        return value:getValue(ability, ability.level, true)
     elseif type(value) == "function" then
         return value(ability)
     else

package/engine/object-field.d.ts

@@ -46,6 +46,7 @@ export declare abstract class ObjectField<ObjectDataEntryType extends ObjectData
     private modifiersByInstance?;
     getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
+    updateActualValue(instance: InstanceType): void;
     applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
     removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
@@ -87,8 +88,9 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     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[];
+    getValue<LevelType extends [number, boolean?] | [boolean?]>(entry: ObjectDataEntryType | InstanceType, ...[level, includeModifiers]: LevelType): LevelType extends [number, boolean?] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    updateActualValue(instance: InstanceType, level?: number): void;
     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;

package/engine/object-field.lua

@@ -139,7 +139,7 @@ function ObjectField.prototype.setValue(self, entry, value)
                 return true
             end
             originalValueByInstance[entry] = value
-            value = self:calculateActualValue(entry)
+            value = (self:calculateActualValue(entry))
         end
     end
     local previousValue = self:setActualValue(entry, value)
@@ -163,6 +163,12 @@ function ObjectField.prototype.setValue(self, entry, 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
     if modifiersByInstance == nil then
@@ -182,10 +188,7 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             ____originalValueByInstance_instance_3 = self:getActualValue(instance)
         end
         ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
-        self:setActualValue(
-            instance,
-            self:calculateActualValue(instance)
-        )
+        self:setActualValue(instance, (self:calculateActualValue(instance)))
     end
 end
 function ObjectField.prototype.removeModifier(self, instance, modifier)
@@ -193,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
@@ -283,10 +283,11 @@ function ObjectField.prototype.calculateActualValue(self, instance)
             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(
@@ -402,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
@@ -425,11 +426,13 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         end
         return self.defaultValue
     end
-    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
+    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
     return self:getActualValue(entry, level)
 end
@@ -512,6 +515,27 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, 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

package/engine/random.d.ts

@@ -18,3 +18,4 @@ 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

@@ -28,4 +28,12 @@ ____exports.random = function(...)
         ...
     ))
 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/unit.d.ts

@@ -1,7 +1,12 @@
 /** @noSelfInFile */
-import { UnitClassificationsField, UnitFlyHeightField, UnitHealthRegenerationTypeField, 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;
-export declare const UNIT_HEALTH_REGENERATION_TYPE_FIELD: UnitHealthRegenerationTypeField & 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,13 +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.UNIT_HEALTH_REGENERATION_TYPE_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
+____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,11 @@ 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/range-event";
 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,11 @@ 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.range-event")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/lualib_bundle.lua

@@ -2241,7 +2241,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             end
             local result = string.gsub(
                 trace,
-                "(%S+)%.lua:(%d+)",
+                "([^%s<]+)%.lua:(%d+)",
                 function(file, line) return replacer(nil, file .. ".lua", file .. ".ts", line) end
             )
             local function stringReplacer(____, file, line)

package/math.d.ts

@@ -23,6 +23,8 @@ export declare const floor: typeof math.floor;
 export declare const log: typeof math.log;
 export declare const max: typeof math.max;
 export declare const min: typeof math.min;
+export declare const sum: (x: number, ...numbers: number[]) => number;
+export declare const product: (x: number, ...numbers: number[]) => number;
 /** Returns the signum function of the argument;
  * zero if the argument is zero,
  * 1.0 if the argument is greater than zero,

package/math.lua

@@ -39,6 +39,20 @@ ____exports.floor = math.floor
 ____exports.log = math.log
 ____exports.max = math.max
 ____exports.min = math.min
+____exports.sum = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x + number
+    end
+    return x
+end
+____exports.product = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x * number
+    end
+    return x
+end
 --- Returns the signum function of the argument;
 -- zero if the argument is zero,
 -- 1.0 if the argument is greater than zero,

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/objutil/object.lua

@@ -153,7 +153,7 @@ end
 function ObjectDefinition.getLevelArrayFieldValue(self, level, value, values)
     return type(values) == "function" and values(level, value) or (__TS__ArrayIsArray(values[1]) and values[1] or values)
 end
-____exports.ObjectType = ObjectType or ({})
+____exports.ObjectType = ____exports.ObjectType or ({})
 ____exports.ObjectType.ABILITY = 0
 ____exports.ObjectType[____exports.ObjectType.ABILITY] = "ABILITY"
 ____exports.ObjectType.ITEM = 1

package/operation.lua

@@ -22,10 +22,7 @@ OperationMonitor.name = "OperationMonitor"
 __TS__ClassExtends(OperationMonitor, __TS__Promise)
 function OperationMonitor.prototype.____constructor(self, operation, ...)
     local args = {...}
-    __TS__Promise.prototype.____constructor(
-        self,
-        table.unpack(args)
-    )
+    __TS__Promise.prototype.____constructor(self, ...)
     self.o = operation
 end
 function OperationMonitor.prototype.cancel(self)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.989e1a3",
+    "version": "0.0.1-dev.9979c8f",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,13 +22,13 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.4",
+        "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.efd0770"
+        "warpack": "0.0.1-dev.e490aaf"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.13.0",
-        "@typescript-eslint/parser": "^8.13.0",
+        "@typescript-eslint/eslint-plugin": "^8.61.1",
+        "@typescript-eslint/parser": "^8.61.1",
         "async": "^3.2.6",
         "copyfiles": "^2.4.1",
         "eslint": "^9.14.0",