warscript 0.0.1-dev.1858ab2 → 0.0.1-dev.2af030d

package/engine/internal/unit.lua

@@ -5,9 +5,9 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ArraySetLength = ____lualib.__TS__ArraySetLength
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
-local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
@@ -92,6 +92,10 @@ local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
 local setResourceAmount = SetResourceAmount
 local getResourceAmount = GetResourceAmount
+local getUnitWeaponRealField = BlzGetUnitWeaponRealField
+local setUnitWeaponRealField = BlzSetUnitWeaponRealField
+local getUnitWeaponStringField = BlzGetUnitWeaponStringField
+local setUnitWeaponStringField = BlzSetUnitWeaponStringField
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local unitDisableAbility = BlzUnitDisableAbility
 local unitInterruptAttack = BlzUnitInterruptAttack
@@ -387,51 +391,158 @@ local getters = {
         return BlzGetUnitArmor(unit)
     end
 }
-local weaponGetters = {
-    index = function(self, handle, index)
-        return index
-    end,
-    cooldown = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index)
-    end,
-    projectileArc = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index)
-    end,
-    projectileArt = function(self, handle, index)
-        return BlzGetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index)
-    end,
-    projectileSpeed = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index)
-    end,
-    attackPoint = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index)
-    end
-}
-local weaponSetters = {
-    cooldown = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index, value))
-    end,
-    projectileArc = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index, value))
-    end,
-    projectileArt = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index, value))
-    end,
-    projectileSpeed = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index, value))
-    end,
-    attackPoint = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index, value))
-    end
-}
-local weaponMetatable = {
-    __index = function(self, key)
-        return weaponGetters[key](weaponGetters, self.h, self.i)
-    end,
-    __newindex = function(self, key, value)
-        weaponSetters[key](weaponSetters, self.h, self.i, value)
-    end
-}
+____exports.UnitWeapon = __TS__Class()
+local UnitWeapon = ____exports.UnitWeapon
+UnitWeapon.name = "UnitWeapon"
+function UnitWeapon.prototype.____constructor(self, unit, index)
+    self.unit = unit
+    self.index = index
+end
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "cooldown",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index)
+        end,
+        set = function(self, cooldown)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index, cooldown)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damage",
+    {
+        get = function(self)
+            local minimumDamage = self.damageBase + self.damageDiceCount
+            local maximumDamage = self.damageBase + self.damageDiceCount * self.damageDiceSideCount
+            return {minimumDamage, maximumDamage}
+        end,
+        set = function(self, ____bindingPattern0)
+            local maximumDamage
+            local minimumDamage
+            minimumDamage = ____bindingPattern0[1]
+            maximumDamage = ____bindingPattern0[2]
+            self.damageBase = minimumDamage - 1
+            self.damageDiceCount = 1
+            self.damageDiceSideCount = maximumDamage - minimumDamage + 1
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageBase",
+    {
+        get = function(self)
+            return BlzGetUnitBaseDamage(self.unit.handle, self.index)
+        end,
+        set = function(self, damageBase)
+            BlzSetUnitBaseDamage(self.unit.handle, self.index, damageBase)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceNumber(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceCount)
+            BlzSetUnitDiceNumber(self.unit.handle, self.index, damageDiceCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceSides(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceSideCount)
+            BlzSetUnitDiceSides(self.unit.handle, self.index, damageDiceSideCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "range",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_RANGE, self.index)
+        end,
+        set = function(self, range)
+            local handle = self.unit.handle
+            local index = self.index
+            setUnitWeaponRealField(
+                handle,
+                UNIT_WEAPON_RF_ATTACK_RANGE,
+                index + 1,
+                getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index + 1) + (range - getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index))
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "impactDelay",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index)
+        end,
+        set = function(self, impactDelay)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index, impactDelay)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileArc",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index)
+        end,
+        set = function(self, missileArc)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index, missileArc)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileModelPath",
+    {
+        get = function(self)
+            return getUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index)
+        end,
+        set = function(self, missileModelPath)
+            setUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index, missileModelPath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileSpeed",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index)
+        end,
+        set = function(self, missileSpeed)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index, missileSpeed)
+        end
+    },
+    true
+)
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
@@ -442,8 +553,6 @@ local getAbilityName = GetAbilityName
 local unitAddAbility = UnitAddAbility
 local getUnitGoldCost = GetUnitGoldCost
 local getUnitLumberCost = GetUnitWoodCost
-local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
-local unitAddItem = UnitAddItem
 local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
@@ -520,6 +629,23 @@ for ____, player in ipairs(Player.all) do
     ShowUnit(dummy, false)
     dummies[player] = dummy
 end
+local function delayHealthChecksCallback(unit)
+    local counter = (unit[102] or 0) - 1
+    if counter ~= 0 then
+        unit[102] = counter
+        return
+    end
+    unit[102] = nil
+    local healthBonus = unit[103]
+    if healthBonus ~= nil then
+        unit[103] = nil
+        local handle = unit.handle
+        BlzSetUnitMaxHP(
+            handle,
+            BlzGetUnitMaxHP(handle) - healthBonus
+        )
+    end
+end
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
@@ -674,6 +800,10 @@ end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
+function Unit.prototype.delayHealthChecks(self)
+    self[102] = (self[102] or 0) + 1
+    Timer:run(delayHealthChecksCallback, self)
+end
 function Unit.prototype.setPosition(self, x, y)
     setUnitPosition(self.handle, x, y)
 end
@@ -1071,12 +1201,27 @@ __TS__SetDescriptor(
     Unit.prototype,
     "weapons",
     {get = function(self)
-        local weapons = {
-            setmetatable({h = self.handle, i = 0}, weaponMetatable),
-            setmetatable({h = self.handle, i = 1}, weaponMetatable)
-        }
-        rawset(self, "weapons", weapons)
-        return weapons
+        return {self.firstWeapon, self.secondWeapon}
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "firstWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 0)
+        rawset(self, "firstWeapon", weapon)
+        return weapon
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "secondWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 1)
+        rawset(self, "secondWeapon", weapon)
+        return weapon
     end},
     true
 )
@@ -1233,7 +1378,7 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[103]
+            return not self[105]
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
@@ -1243,7 +1388,7 @@ __TS__SetDescriptor(
             else
                 ____temp_2 = nil
             end
-            self[103] = ____temp_2
+            self[105] = ____temp_2
         end
     },
     true
@@ -1253,7 +1398,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[103] then
+        if self[105] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1277,10 +1422,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[102] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
         end,
         set = function(self, maxHealth)
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[102] or 0))
+            if maxHealth < 1 and self[102] ~= nil then
+                self[103] = (self[103] or 0) + (1 - maxHealth)
+                maxHealth = 1
+            end
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
         end
     },
     true
@@ -1322,10 +1471,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[102] or 0)
+            return GetWidgetLife(self.handle) - (self[104] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[102] or 0))
+            SetWidgetLife(self.handle, health + (self[104] or 0))
         end
     },
     true
@@ -2308,7 +2457,7 @@ Unit.onDamage = __TS__New(
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[102] = (target[102] or 0) + bonusHealth
+                    target[104] = (target[104] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2322,7 +2471,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[102] = (target[102] or 0) - bonusHealth
+                        target[104] = (target[104] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth

package/engine/object-data/entry/ability-type/blink.d.ts

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class BlinkAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get maximumRange(): number[];
+    set maximumRange(maximumRange: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get minimumRange(): number[];
+    set minimumRange(minimumRange: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/blink.lua

@@ -0,0 +1,39 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.BlinkAbilityType = __TS__Class()
+local BlinkAbilityType = ____exports.BlinkAbilityType
+BlinkAbilityType.name = "BlinkAbilityType"
+__TS__ClassExtends(BlinkAbilityType, AbilityType)
+BlinkAbilityType.BASE_ID = fourCC("AEbl")
+__TS__SetDescriptor(
+    BlinkAbilityType.prototype,
+    "maximumRange",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ebl1")
+        end,
+        set = function(self, maximumRange)
+            self:setNumberLevelField("Ebl1", maximumRange)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    BlinkAbilityType.prototype,
+    "minimumRange",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ebl2")
+        end,
+        set = function(self, minimumRange)
+            self:setNumberLevelField("Ebl2", minimumRange)
+        end
+    },
+    true
+)
+return ____exports

package/engine/object-data/entry/ability-type.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
+import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";

package/engine/object-data/entry/ability-type.lua

@@ -6,6 +6,7 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.ability")
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____effect = require("core.types.effect")

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

@@ -7,6 +7,7 @@ local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local ____exports = {}
+local preparePhysicalPositiveApplicatorAbility
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
 local ____cripple = require("engine.object-data.entry.ability-type.cripple")
@@ -34,20 +35,14 @@ local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lu
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
 local BerserkAbilityType = ____berserk.BerserkAbilityType
-local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
-local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
-local ____dummy_2Dinventory = require("engine.internal.object-data.dummy-inventory")
-local INVENTORY_ABILITY_TYPE_ID = ____dummy_2Dinventory.INVENTORY_ABILITY_TYPE_ID
 local ____blank = require("engine.object-data.entry.upgrade.blank")
 local BlankUpgrade = ____blank.BlankUpgrade
-local ____dummy_2Dunits = require("engine.internal.misc.dummy-units")
-local INVENTORY_DUMMY_NATIVE_UNIT = ____dummy_2Dunits.INVENTORY_DUMMY_NATIVE_UNIT
-local ____preconditions = require("utility.preconditions")
-local checkNotNull = ____preconditions.checkNotNull
 local ____unit_2Dtype = require("engine.object-data.entry.unit-type")
 local UnitType = ____unit_2Dtype.UnitType
 local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-type.permanent-immolation")
 local PermanentImmolationAbilityType = ____permanent_2Dimmolation.PermanentImmolationAbilityType
+local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
+local castAbility = ____cast_2Dability.castAbility
 local createItem = CreateItem
 local getAbilityId = BlzGetAbilityId
 local getItemAbility = BlzGetItemAbility
@@ -260,75 +255,25 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
         return unitAddAbility(unit.handle, applicatorAbilityTypeId)
     end
     if applicatorType == 852100 then
-        local success
-        local nativeUnit = unit.handle
-        local nativeItem = createItem(DUMMY_ITEM_ID, 0, 0)
-        unitAddItem(INVENTORY_DUMMY_NATIVE_UNIT, nativeItem)
-        itemAddAbility(nativeItem, applicatorAbilityTypeId)
-        local applicatorAbility = checkNotNull(getItemAbility(nativeItem, applicatorAbilityTypeId))
-        if level == nil then
-            level = 0
-            setAbilityIntegerField(applicatorAbility, ABILITY_IF_LEVELS, 1)
-        end
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_NORMAL, level, duration or 0)
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_HERO, level, duration or 0)
-        if movementSpeedIncreaseFactor ~= nil then
-            setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
-        end
-        setItemBooleanField(nativeItem, ITEM_BF_ACTIVELY_USED, true)
-        setItemBooleanField(nativeItem, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
-        if level > 0 then
+        local nativePlayer = unit.owner.handle
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    level
-                )
-            end
-        end
-        if not unitAddItem(nativeUnit, nativeItem) then
-            local latestInventoryAbilityTypeId = 0
-            local nativeItemBySlot = {}
-            local inventorySize = unitInventorySize(nativeUnit)
-            if inventorySize ~= 0 then
-                for slot = 0, inventorySize - 1 do
-                    nativeItemBySlot[slot] = UnitRemoveItemFromSlot(nativeUnit, slot)
-                end
-                local unitNativeAbility = getUnitAbilityByIndex(nativeUnit, 0)
-                local i = 1
-                while unitNativeAbility ~= nil do
-                    local abilityTypeId = getAbilityId(unitNativeAbility)
-                    if INVENTORY_ABILITY_TYPE_IDS[abilityTypeId] ~= nil then
-                        latestInventoryAbilityTypeId = abilityTypeId
-                    end
-                    unitNativeAbility = getUnitAbilityByIndex(nativeUnit, i)
-                    i = i + 1
-                end
-                unitRemoveAbility(nativeUnit, latestInventoryAbilityTypeId)
+                setPlayerTechResearched(nativePlayer, upgradeId, level)
             end
-            unitAddAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            success = unitAddItem(nativeUnit, nativeItem)
-            unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            if latestInventoryAbilityTypeId ~= 0 then
-                unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-                for slot, nativeItem in pairs(nativeItemBySlot) do
-                    unitAddItem(nativeUnit, nativeItem)
-                    unitDropItemSlot(nativeUnit, nativeItem, slot)
-                end
-            end
-        else
-            success = true
         end
-        removeItem(nativeItem)
-        if level ~= nil and level > 1 then
+        local success = castAbility(
+            unit.handle,
+            applicatorAbilityTypeId,
+            preparePhysicalPositiveApplicatorAbility,
+            level,
+            duration or 0,
+            movementSpeedIncreaseFactor
+        )
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    0
-                )
+                setPlayerTechResearched(nativePlayer, upgradeId, 0)
             end
         end
         return success
@@ -364,6 +309,17 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+    if level == nil then
+        setAbilityIntegerField(ability, ABILITY_IF_LEVELS, 1)
+        level = 1
+    end
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
+    if movementSpeedIncreaseFactor ~= nil then
+        setAbilityRealLevelField(ability, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
+    end
+end
 ---
 -- @internal For use by internal systems only.
 ____exports.removeBuff = function(unit, applicableBuffTypeId)

package/engine/object-data/entry/unit-type.d.ts

@@ -13,6 +13,7 @@ import { ObjectDataEntryIdGenerator } from "../utility/object-data-entry-id-gene
 import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
+import { AttackType } from "../auxiliary/attack-type";
 export type UnitTypeId = ObjectDataEntryId & {
     readonly __unitTypeId: unique symbol;
 };
@@ -23,12 +24,26 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
+    get attackType(): AttackType;
+    set attackType(attackType: AttackType);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
+    get cooldown(): number;
+    set cooldown(cooldown: number);
+    get damage(): [minimumDamage: number, maximumDamage: number];
+    set damage([minimumDamage, maximumDamage]: [number, number]);
+    get damageBase(): number;
+    set damageBase(damageBase: number);
+    get damageDiceCount(): number;
+    set damageDiceCount(damageDiceNumber: number);
+    get damageDiceSideCount(): number;
+    set damageDiceSideCount(damageDiceSideCount: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get range(): number;
+    set range(range: number);
     get soundType(): WeaponSoundType;
     set soundType(soundType: WeaponSoundType);
     get soundTypeSD(): WeaponSoundType;
@@ -117,6 +132,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get runSpeed(): number;
+    set runSpeed(runSpeed: number);
+    get runSpeedSD(): number;
+    set runSpeedSD(runSpeedSD: number);
+    get runSpeedHD(): number;
+    set runSpeedHD(runSpeedHD: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -149,6 +170,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set shadowImageXOffset(shadowImageXOffset: number);
     get shadowImageYOffset(): number;
     set shadowImageYOffset(shadowImageYOffset: number);
+    get walkSpeed(): number;
+    set walkSpeed(walkSpeed: number);
+    get walkSpeedSD(): number;
+    set walkSpeedSD(walkSpeedSD: number);
+    get walkSpeedHD(): number;
+    set walkSpeedHD(walkSpeedHD: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -159,9 +186,9 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set combatClassifications(combatClassifications: CombatClassifications);
     get unitClassifications(): UnitClassifications;
     set unitClassifications(unitClassifications: UnitClassifications);
+    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
-    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get flyHeight(): number;
     set flyHeight(flyHeight: number);
     get flyHeightMinimum(): number;
@@ -190,6 +217,16 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set formationRank(formationRank: number);
     get goldCost(): number;
     set goldCost(goldCost: number);
+    get healthRegenerationRate(): number;
+    set healthRegenerationRate(healthRegenerationRate: number);
+    get manaRegenerationRate(): number;
+    set manaRegenerationRate(manaRegenerationRate: number);
+    get maximumHealth(): number;
+    set maximumHealth(maximumHealth: number);
+    get maximumMana(): number;
+    set maximumMana(maximumMana: number);
+    get initialMana(): number;
+    set initialMana(initialMana: number);
     get isStructure(): boolean;
     set isStructure(isStructure: boolean);
     get race(): Race;
@@ -215,4 +252,8 @@ export declare abstract class HeroUnitType<Id extends HeroUnitTypeId = HeroUnitT
     protected static generateId(): number;
     get heroAbilityTypeIds(): AbilityTypeId[];
     set heroAbilityTypeIds(heroAbilityTypeIds: AbilityTypeId[]);
+    get properNames(): string[];
+    set properNames(properNames: string | string[]);
+    get properNameCount(): number;
+    set properNameCount(properNameCount: number);
 }