warscript 0.0.1-dev.3370e98 → 0.0.1-dev.33b52d0

package/engine/internal/unit+ability.lua

@@ -9,6 +9,10 @@ local Unit = ____unit.Unit
 local ____event = require("event")
 local createDispatchingEvent = ____event.createDispatchingEvent
 local Event = ____event.Event
+local ____unit_2Dability_2Dlevel_2Dnatives = require("engine.internal.misc.unit-ability-level-natives")
+local rawDecUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawDecUnitAbilityLevel
+local rawIncUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawIncUnitAbilityLevel
+local rawSetUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawSetUnitAbilityLevel
 local abilityGainedEvent = createDispatchingEvent(
     __TS__New(Event),
     function(unit, ability) return ability.typeId end
@@ -19,12 +23,79 @@ local abilityLostEvent = createDispatchingEvent(
     function(unit, ability) return ability.typeId end
 )
 rawset(Unit, "abilityLostEvent", abilityLostEvent)
+local abilityLevelChangedEvent = createDispatchingEvent(
+    __TS__New(Event),
+    function(unit, ability) return ability.typeId end
+)
+rawset(Unit, "abilityLevelChangedEvent", abilityLevelChangedEvent)
+local getUnitAbilityLevel = GetUnitAbilityLevel
+local unitDisableAbility = BlzUnitDisableAbility
+local function invokeAbilityLevelChangedEvent(unitHandle, abilityTypeId)
+    local unit = Unit:of(unitHandle)
+    if unit ~= nil then
+        local ability = unit:getAbility(abilityTypeId)
+        if ability ~= nil then
+            Event.invoke(abilityLevelChangedEvent, unit, ability)
+        end
+    end
+end
+local function invokeAbilityLevelChangedEventIfChanged(unitHandle, abilityTypeId, previousLevel)
+    if previousLevel ~= 0 then
+        local level = getUnitAbilityLevel(unitHandle, abilityTypeId)
+        if level ~= 0 and level ~= previousLevel then
+            invokeAbilityLevelChangedEvent(unitHandle, abilityTypeId)
+        end
+    end
+end
+_G.SetUnitAbilityLevel = function(whichUnit, abilcode, level)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawSetUnitAbilityLevel(whichUnit, abilcode, level)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+_G.IncUnitAbilityLevel = function(whichUnit, abilcode)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawIncUnitAbilityLevel(whichUnit, abilcode)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+_G.DecUnitAbilityLevel = function(whichUnit, abilcode)
+    local previousLevel = getUnitAbilityLevel(whichUnit, abilcode)
+    local result = rawDecUnitAbilityLevel(whichUnit, abilcode)
+    invokeAbilityLevelChangedEventIfChanged(whichUnit, abilcode, previousLevel)
+    return result
+end
+local heroSkillTrigger = CreateTrigger()
+TriggerRegisterAnyUnitEventBJ(heroSkillTrigger, EVENT_PLAYER_HERO_SKILL)
+TriggerAddCondition(
+    heroSkillTrigger,
+    Condition(function()
+        if GetLearnedSkillLevel() > 1 then
+            local unitHandle = GetTriggerUnit()
+            if unitHandle ~= nil then
+                invokeAbilityLevelChangedEvent(
+                    unitHandle,
+                    GetLearnedSkill()
+                )
+            end
+        end
+    end)
+)
 UnitAbility.onCreate:addListener(
     0,
     function(ability)
         Event.invoke(abilityGainedEvent, ability.owner, ability)
     end
 )
+UnitAbility.onDestroy:addListener(
+    999999,
+    function(ability)
+        local owner = ability.owner
+        if owner.state ~= 2 then
+            unitDisableAbility(owner.handle, ability.typeId, true, false)
+        end
+    end
+)
 UnitAbility.destroyEvent:addListener(
     4,
     function(ability)
@@ -40,8 +111,17 @@ ItemAbility.onCreate:addListener(
         end
     end
 )
+ItemAbility.destroyEvent:addListener(
+    4,
+    function(ability)
+        local unit = ability.owner.owner
+        if unit ~= nil then
+            Event.invoke(abilityLostEvent, unit, ability)
+        end
+    end
+)
 Unit.itemPickedUpEvent:addListener(
-    0,
+    -999999,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
             Event.invoke(abilityGainedEvent, unit, ability)
@@ -49,7 +129,7 @@ Unit.itemPickedUpEvent:addListener(
     end
 )
 Unit.itemDroppedEvent:addListener(
-    4,
+    999999,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
             Event.invoke(abilityLostEvent, unit, ability)

package/engine/internal/unit+bonus.lua

@@ -3,9 +3,9 @@ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ____armor_2Dincrease = require("engine.internal.object-data.armor-increase")
-local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_FIELD
-local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____armor_2Dbonus = require("engine.internal.object-data.armor-bonus")
+local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_FIELD
+local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
 local getUnitAbility = BlzGetUnitAbility
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
 local unitAddAbility = UnitAddAbility

package/engine/internal/unit+damage.d.ts

@@ -1,6 +1,8 @@
 /** @noSelfInFile */
+import "./unit/allowed-targets";
 import { Widget } from "../../core/types/widget";
 import { AttackType } from "../object-data/auxiliary/attack-type";
+import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
 export type DamageType = jdamagetype;
 export declare namespace DamageType {
     const UNKNOWN: jdamagetype;
@@ -56,5 +58,12 @@ export declare namespace WeaponType {
 declare module "./unit" {
     interface Unit {
         damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): boolean;
+        /**
+         * Deals amount to each allowed unit in collision range of (x, y).
+         * A positive maximumDamage caps the total requested damage, shared equally
+         * between the targets. Zero or omitted means unlimited; damage mitigation
+         * and damage-event modifiers are applied afterward by damageTarget.
+         */
+        damageArea(x: number, y: number, range: number, allowedTargetCombatClassifications: CombatClassifications, amount: number, maximumDamage?: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): void;
     }
 }

package/engine/internal/unit+damage.lua

@@ -3,6 +3,7 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.allowed-targets")
 local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
@@ -11,6 +12,8 @@ local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
 local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
 local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
 local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
+local ____math = require("math")
+local min = ____math.min
 local createUnit = CreateUnit
 local getOwningPlayer = GetOwningPlayer
 local showUnit = ShowUnit
@@ -116,4 +119,34 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
         weaponType
     )
 end
+Unit.prototype.damageArea = function(self, x, y, range, allowedTargetCombatClassifications, amount, maximumDamage, attack, ranged, attackType, damageType, weaponType, metadata)
+    if maximumDamage == nil then
+        maximumDamage = 0
+    end
+    local targets = Unit.getAllowedTargetsInCollisionRange(
+        self,
+        allowedTargetCombatClassifications,
+        x,
+        y,
+        range
+    )
+    if #targets == 0 then
+        return
+    end
+    if maximumDamage > 0 then
+        amount = min(amount, maximumDamage / #targets)
+    end
+    for ____, target in ipairs(targets) do
+        self:damageTarget(
+            target,
+            amount,
+            attack,
+            ranged,
+            attackType,
+            damageType,
+            weaponType,
+            metadata
+        )
+    end
+end
 return ____exports

package/engine/internal/unit+rally.lua

@@ -23,22 +23,22 @@ local issueTargetOrderById = IssueTargetOrderById
 local queuePointOrderById = BlzQueuePointOrderById
 local queueTargetOrderById = BlzQueueTargetOrderById
 local rallyRouteByUnit = setmetatable({}, {__mode = "k"})
-Unit.onPointOrder[orderId("setrally")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851980]:addListener(function(unit, x, y)
     processPoint(unit, x, y)
 end)
-Unit.onPointOrder[orderId("smart")]:addListener(function(unit, x, y)
+Unit.onPointOrder[851971]:addListener(function(unit, x, y)
     if unit:hasAbility(fourCC("ARal")) then
         processPoint(unit, x, y)
     end
 end)
-Unit.onTargetOrder[orderId("setrally")]:addListener(function(unit, target)
+Unit.onTargetOrder[851980]:addListener(function(unit, target)
     if __TS__InstanceOf(target, Unit) then
         processUnit(unit, target)
     elseif __TS__InstanceOf(target, Destructable) then
         processDestructible(unit, target)
     end
 end)
-Unit.onTargetOrder[orderId("smart")]:addListener(function(unit, target)
+Unit.onTargetOrder[851971]:addListener(function(unit, target)
     if unit:hasAbility(fourCC("ARal")) then
         if __TS__InstanceOf(target, Unit) then
             processUnit(unit, target)
@@ -116,41 +116,19 @@ __TS__ObjectDefineProperty(
             do
                 local rallyPoint = rallyRoute[1]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    issueTargetOrderById(handle, 851980, rallyPoint.handle)
                 elseif rallyPoint ~= nil then
-                    issuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    issuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 else
-                    issueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        handle
-                    )
+                    issueTargetOrderById(handle, 851980, handle)
                 end
             end
             for i = 2, #rallyRoute do
                 local rallyPoint = rallyRoute[i]
                 if __TS__InstanceOf(rallyPoint, Handle) then
-                    queueTargetOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint.handle
-                    )
+                    queueTargetOrderById(handle, 851980, rallyPoint.handle)
                 else
-                    queuePointOrderById(
-                        handle,
-                        orderId("setrally"),
-                        rallyPoint[1],
-                        rallyPoint[2]
-                    )
+                    queuePointOrderById(handle, 851980, rallyPoint[1], rallyPoint[2])
                 end
             end
         end

package/engine/internal/unit-missile-data.lua

@@ -34,74 +34,102 @@ local DEFAULT_VALUES = {
     launchVisualOffsetY = ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y
 }
 local METATABLE = {__index = DEFAULT_VALUES}
+local rawDataByUnitTypeId = postcompile(function()
+    return associate(
+        UnitType:getAll(),
+        function(unitType) return unitType.id end,
+        function(unitType)
+            return {
+                [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
+                [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
+                [2] = unitType.missileImpactOffsetZDE ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZDE or nil,
+                [3] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
+                [4] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
+                [5] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
+                [6] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
+                [7] = unitType.missileLaunchOffsetZDE ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZDE or nil,
+                [8] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
+                [9] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
+                [10] = unitType.missileLaunchVisualOffsetXDE ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXDE or nil,
+                [11] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
+                [12] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil,
+                [13] = unitType.missileLaunchVisualOffsetYDE ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYDE or nil
+            }
+        end
+    )
+end)
+local function resolveData(data)
+    local ____setmetatable_10 = setmetatable
+    local ____LocalClient_isHD_1
+    if LocalClient.isHD then
+        ____LocalClient_isHD_1 = data[1] or data[0]
+    else
+        local ____LocalClient_isDE_0
+        if LocalClient.isDE then
+            ____LocalClient_isDE_0 = data[2] or data[0]
+        else
+            ____LocalClient_isDE_0 = data[0]
+        end
+        ____LocalClient_isHD_1 = ____LocalClient_isDE_0
+    end
+    local ____data__3_8 = data[3]
+    local ____data__4_9 = data[4]
+    local ____LocalClient_isHD_3
+    if LocalClient.isHD then
+        ____LocalClient_isHD_3 = data[6] or data[5]
+    else
+        local ____LocalClient_isDE_2
+        if LocalClient.isDE then
+            ____LocalClient_isDE_2 = data[7] or data[5]
+        else
+            ____LocalClient_isDE_2 = data[5]
+        end
+        ____LocalClient_isHD_3 = ____LocalClient_isDE_2
+    end
+    local ____LocalClient_isHD_5
+    if LocalClient.isHD then
+        ____LocalClient_isHD_5 = data[9] or data[8]
+    else
+        local ____LocalClient_isDE_4
+        if LocalClient.isDE then
+            ____LocalClient_isDE_4 = data[10] or data[8]
+        else
+            ____LocalClient_isDE_4 = data[8]
+        end
+        ____LocalClient_isHD_5 = ____LocalClient_isDE_4
+    end
+    local ____LocalClient_isHD_7
+    if LocalClient.isHD then
+        ____LocalClient_isHD_7 = data[12] or data[11]
+    else
+        local ____LocalClient_isDE_6
+        if LocalClient.isDE then
+            ____LocalClient_isDE_6 = data[13] or data[11]
+        else
+            ____LocalClient_isDE_6 = data[11]
+        end
+        ____LocalClient_isHD_7 = ____LocalClient_isDE_6
+    end
+    return ____setmetatable_10({
+        impactOffsetZ = ____LocalClient_isHD_1,
+        launchOffsetX = ____data__3_8,
+        launchOffsetY = ____data__4_9,
+        launchOffsetZ = ____LocalClient_isHD_3,
+        launchVisualOffsetX = ____LocalClient_isHD_5,
+        launchVisualOffsetY = ____LocalClient_isHD_7
+    }, METATABLE)
+end
 ---
 -- @internal For use by internal systems only.
-____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
-    return setmetatable(
-        mapValues(
-            postcompile(function()
-                return associate(
-                    UnitType:getAll(),
-                    function(unitType) return unitType.id end,
-                    function(unitType)
-                        local ____ = unitType.missileImpactOffsetZSD
-                        local ____ = unitType.missileImpactOffsetZHD
-                        return {
-                            [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
-                            [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
-                            [2] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
-                            [3] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
-                            [4] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
-                            [5] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
-                            [6] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
-                            [7] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
-                            [8] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
-                            [9] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil
-                        }
-                    end
-                )
-            end),
-            function(data)
-                local ____setmetatable_6 = setmetatable
-                local ____LocalClient_isHD_0
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_0 = data[1] or data[0]
-                else
-                    ____LocalClient_isHD_0 = data[0]
-                end
-                local ____data__2_4 = data[2]
-                local ____data__3_5 = data[3]
-                local ____LocalClient_isHD_1
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[5] or data[4]
-                else
-                    ____LocalClient_isHD_1 = data[4]
-                end
-                local ____LocalClient_isHD_2
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_2 = data[7] or data[6]
-                else
-                    ____LocalClient_isHD_2 = data[6]
-                end
-                local ____LocalClient_isHD_3
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[9] or data[8]
-                else
-                    ____LocalClient_isHD_3 = data[8]
-                end
-                return ____setmetatable_6({
-                    impactOffsetZ = ____LocalClient_isHD_0,
-                    launchOffsetX = ____data__2_4,
-                    launchOffsetY = ____data__3_5,
-                    launchOffsetZ = ____LocalClient_isHD_1,
-                    launchVisualOffsetX = ____LocalClient_isHD_2,
-                    launchVisualOffsetY = ____LocalClient_isHD_3
-                }, METATABLE)
-            end
-        ),
-        {__index = function(self)
-            return DEFAULT_VALUES
-        end}
-    )
-end)()
+____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = setmetatable(
+    mapValues(rawDataByUnitTypeId, resolveData),
+    {__index = function(self)
+        return DEFAULT_VALUES
+    end}
+)
+warpack.afterMapInit(function()
+    for unitTypeId, data in pairs(rawDataByUnitTypeId) do
+        ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID[unitTypeId] = resolveData(data)
+    end
+end)
 return ____exports

package/engine/internal/unit-missile-launch.lua

@@ -9,50 +9,81 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____lua_2Dsets = require("utility.lua-sets")
 local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
 local ____math = require("math")
-local min = ____math.min
+local ceil = ____math.ceil
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
-local eventTimerByUnit = {}
+local units = __TS__New(LinkedSet)
+local targetAttribute = attribute()
+local impactDelayAttribute = attribute()
+local passedTimeAttribute = attribute()
 local instantOrderIds = luaSetOf(
-    orderId("avatar"),
-    orderId("berserk"),
-    orderId("divineshield"),
-    orderId("immolation"),
-    orderId("moveslot0"),
-    orderId("moveslot1"),
-    orderId("moveslot2"),
-    orderId("moveslot3"),
-    orderId("moveslot4"),
-    orderId("moveslot5"),
-    orderId("unavatar"),
-    orderId("undivineshield"),
-    orderId("unimmolation")
+    852086,
+    852100,
+    852090,
+    852177,
+    852002,
+    852003,
+    852004,
+    852005,
+    852006,
+    852007,
+    852087,
+    852091,
+    852178
 )
-local function reset(source, orderId)
+---
+-- @internal For use by internal systems only.
+____exports.resetAutoAttackTimer = function(unit)
+    if units:remove(unit) then
+        unit[targetAttribute] = nil
+        unit[impactDelayAttribute] = nil
+        unit[passedTimeAttribute] = nil
+    end
+end
+local function reset(unit, orderId)
     if not (instantOrderIds[orderId] ~= nil) then
-        local eventTimer = eventTimerByUnit[source]
-        if eventTimer then
-            eventTimer:destroy()
-            eventTimerByUnit[source] = nil
-        end
+        ____exports.resetAutoAttackTimer(unit)
     end
 end
 Unit.onImmediateOrder:addListener(reset)
 Unit.onPointOrder:addListener(reset)
 Unit.onTargetOrder:addListener(reset)
-local function timerCallback(source, target)
-    eventTimerByUnit[source] = nil
-    Event.invoke(autoAttackFinishEvent, source, target)
+local timerPeriod = 1 / 64
+local function invokeEvent(unit)
+    units:remove(unit)
+    local target = unit[targetAttribute]
+    unit[targetAttribute] = nil
+    unit[impactDelayAttribute] = nil
+    unit[passedTimeAttribute] = nil
+    Event.invoke(autoAttackFinishEvent, unit, target)
+end
+local function checkUnit(unit)
+    local passedTime = unit[passedTimeAttribute] + timerPeriod
+    local impactDelay = unit[impactDelayAttribute]
+    if passedTime >= impactDelay and ceil(passedTime / 0.02) >= ceil(impactDelay / 0.02) then
+        invokeEvent(unit)
+    else
+        unit[passedTimeAttribute] = passedTime
+    end
 end
-Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
-    local timer = Timer:simple(
-        attackPoint + min(0.001, attackPoint / 2),
-        timerCallback,
-        source,
-        target
-    )
-    eventTimerByUnit[source] = timer
+Timer.onPeriod[timerPeriod]:addListener(function()
+    units:forEach(checkUnit)
 end)
+Unit.autoAttackStartEvent:addListener(
+    999999,
+    function(source, target)
+        if source[targetAttribute] ~= nil then
+            invokeEvent(source)
+        end
+        source[targetAttribute] = target
+        source[impactDelayAttribute] = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
+        source[passedTimeAttribute] = -timerPeriod
+        units:add(source)
+    end
+)
 return ____exports