warscript 0.0.1-dev.9c98c3a → 0.0.1-dev.9d07b64

package/engine/internal/unit/order.lua

@@ -11,7 +11,7 @@ local getUnitCurrentOrder = GetUnitCurrentOrder
 local issueImmediateOrderById = IssueImmediateOrderById
 local issuePointOrderById = IssuePointOrderById
 local issueTargetOrderById = IssueTargetOrderById
-local unitLastOrderTypeAttribute = attribute()
+local unitLastOrderKindAttribute = attribute()
 local unitLastOrderIdAttribute = attribute()
 local unitLastOrderStartTimeAttribute = attribute()
 local unitLastOrderStartXAttribute = attribute()
@@ -22,7 +22,7 @@ local unitLastOrderTargetAttribute = attribute()
 Unit.onImmediateOrder:addListener(
     4,
     function(unit, orderId)
-        unit[unitLastOrderTypeAttribute] = 0
+        unit[unitLastOrderKindAttribute] = 0
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -35,7 +35,7 @@ Unit.onImmediateOrder:addListener(
 Unit.onPointOrder:addListener(
     4,
     function(unit, orderId, x, y)
-        unit[unitLastOrderTypeAttribute] = 1
+        unit[unitLastOrderKindAttribute] = 1
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -48,7 +48,7 @@ Unit.onPointOrder:addListener(
 Unit.onTargetOrder:addListener(
     4,
     function(unit, orderId, target)
-        unit[unitLastOrderTypeAttribute] = 2
+        unit[unitLastOrderKindAttribute] = 2
         unit[unitLastOrderIdAttribute] = orderId
         unit[unitLastOrderStartTimeAttribute] = elapsedTime()
         unit[unitLastOrderStartXAttribute] = unit.x
@@ -62,7 +62,7 @@ local function toUndefinedIfCurrentOrderDoesNotMatchLast(unit, value)
     local currentOrderId = getUnitCurrentOrder(unit.handle)
     local lastOrderId = unit[unitLastOrderIdAttribute]
     local ____temp_0
-    if currentOrderId == lastOrderId or currentOrderId == orderId("patrolAI") and lastOrderId == orderId("patrol") then
+    if currentOrderId == lastOrderId or currentOrderId == 851991 and lastOrderId == 851990 then
         ____temp_0 = value
     else
         ____temp_0 = nil
@@ -71,9 +71,9 @@ local function toUndefinedIfCurrentOrderDoesNotMatchLast(unit, value)
 end
 __TS__ObjectDefineProperty(
     Unit.prototype,
-    "currentOrderType",
+    "currentOrderKind",
     {get = function(self)
-        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTypeAttribute]) or 0
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderKindAttribute]) or 0
     end}
 )
 __TS__ObjectDefineProperty(
@@ -125,12 +125,12 @@ __TS__ObjectDefineProperty(
         return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTargetAttribute])
     end}
 )
-local issueOrderByType = {
+local issueOrderByKind = {
     [0] = issueImmediateOrderById,
     [1] = issuePointOrderById,
     [2] = function(unitHandle, orderId, widget) return issueTargetOrderById(unitHandle, orderId, widget.handle) end
 }
-Unit.prototype.issueOrder = function(self, orderType, orderId, xOrTarget, y)
-    return issueOrderByType[orderType](self.handle, orderId, xOrTarget, y)
+Unit.prototype.issueOrder = function(self, orderKind, orderId, xOrTarget, y)
+    return issueOrderByKind[orderKind](self.handle, orderId, xOrTarget, y)
 end
 return ____exports

package/engine/internal/unit/range-event.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+import { Event } from "../../../event";
+declare module "../unit" {
+    interface Unit {
+        readonly unitInRangeEvent: Record<number, Event<[unit: Unit, range: number, unitInRange: Unit]>>;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        readonly unitOutOfRangeEvent: Record<number, Event<[unit: Unit, range: number, unitOutOfRange: Unit]>>;
+    }
+}

package/engine/internal/unit/range-event.lua

@@ -0,0 +1,90 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____event = require("event")
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
+local TriggerEvent = ____event.TriggerEvent
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____linked_2Dmap = require("utility.linked-map")
+local mutableLinkedMap = ____linked_2Dmap.mutableLinkedMap
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
+local getTriggerUnit = GetTriggerUnit
+local triggerRegisterUnitInRange = TriggerRegisterUnitInRange
+local eventInvoke = Event.invoke
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitInRangeEvent",
+    {get = function(self)
+        local unit = self
+        local handle = self.handle
+        local unitInRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    TriggerEvent,
+                    function(trigger)
+                        triggerRegisterUnitInRange(trigger, handle, value, nil)
+                    end,
+                    function() return unit, value, Unit:of(getTriggerUnit()) end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitInRangeEvent", unitInRangeEvent)
+        return unitInRangeEvent
+    end}
+)
+local units = __TS__New(LinkedSet)
+local unitsInRangeByRangeAttribute = attribute()
+local function registerUnitOfRangeEvent(unit, range, unitInRange)
+    units:add(unit)
+    unit:getOrPut(unitsInRangeByRangeAttribute, mutableLinkedMap):getOrPut(range, mutableLinkedSet):add(unitInRange)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitOutOfRangeEvent",
+    {get = function(self)
+        local unit = self
+        local unitOutOfRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    InitializingEvent,
+                    function()
+                        unit.unitInRangeEvent[value]:addListener(999999, registerUnitOfRangeEvent)
+                    end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitOutOfRangeEvent", unitOutOfRangeEvent)
+        return unitOutOfRangeEvent
+    end}
+)
+Timer.onPeriod[1]:addListener(function()
+    for unit in pairs(units) do
+        local unitsInRangeByRange = unit[unitsInRangeByRangeAttribute]
+        if unitsInRangeByRange ~= nil then
+            for range, unitsInRange in pairs(unitsInRangeByRange) do
+                for unitInRange in pairs(unitsInRange) do
+                    if unit:getDistanceTo(unitInRange) > range then
+                        unitsInRange:remove(unitInRange)
+                        eventInvoke(unit.unitOutOfRangeEvent[range], unit, range, unitInRange)
+                    end
+                end
+            end
+        end
+    end
+end)
+return ____exports

package/engine/internal/unit/scale.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        scale: number;
+    }
+}
+export {};

package/engine/internal/unit/scale.lua

@@ -0,0 +1,20 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit = require("engine.standard.fields.unit")
+local SCALING_VALUE_UNIT_FIELD = ____unit.SCALING_VALUE_UNIT_FIELD
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "scale",
+    {
+        get = function(self)
+            return SCALING_VALUE_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            SCALING_VALUE_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

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

@@ -1,9 +1,10 @@
 /** @noSelfInFile */
-import { Ability } from "./ability";
+import { Ability, UnitAbility } from "./ability";
 import { DispatchingEvent } from "../../event";
 declare module "./unit" {
     namespace Unit {
         const abilityGainedEvent: DispatchingEvent<[Unit, Ability]>;
         const abilityLostEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityLevelChangedEvent: DispatchingEvent<[Unit, UnitAbility]>;
     }
 }

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,6 +23,63 @@ 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 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)
@@ -50,7 +111,7 @@ ItemAbility.destroyEvent:addListener(
     end
 )
 Unit.itemPickedUpEvent:addListener(
-    0,
+    -999999,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
             Event.invoke(abilityGainedEvent, unit, ability)
@@ -58,7 +119,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

@@ -44,58 +44,84 @@ ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
                     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
+                            [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),
             function(data)
-                local ____setmetatable_6 = setmetatable
-                local ____LocalClient_isHD_0
+                local ____setmetatable_10 = setmetatable
+                local ____LocalClient_isHD_1
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_0 = data[1] or data[0]
+                    ____LocalClient_isHD_1 = data[1] or data[0]
                 else
-                    ____LocalClient_isHD_0 = data[0]
+                    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__2_4 = data[2]
-                local ____data__3_5 = data[3]
-                local ____LocalClient_isHD_1
+                local ____data__3_8 = data[3]
+                local ____data__4_9 = data[4]
+                local ____LocalClient_isHD_3
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[5] or data[4]
+                    ____LocalClient_isHD_3 = data[6] or data[5]
                 else
-                    ____LocalClient_isHD_1 = data[4]
+                    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_2
+                local ____LocalClient_isHD_5
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_2 = data[7] or data[6]
+                    ____LocalClient_isHD_5 = data[9] or data[8]
                 else
-                    ____LocalClient_isHD_2 = data[6]
+                    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_3
+                local ____LocalClient_isHD_7
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[9] or data[8]
+                    ____LocalClient_isHD_7 = data[12] or data[11]
                 else
-                    ____LocalClient_isHD_3 = data[8]
+                    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_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
+                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
         ),

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

@@ -13,6 +13,8 @@ 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 ceil = ____math.ceil
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
 local units = __TS__New(LinkedSet)
@@ -20,25 +22,32 @@ 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)
-    if not (instantOrderIds[orderId] ~= nil) and units:remove(source) then
-        source[targetAttribute] = nil
-        source[impactDelayAttribute] = nil
-        source[passedTimeAttribute] = nil
+---
+-- @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
+        ____exports.resetAutoAttackTimer(unit)
     end
 end
 Unit.onImmediateOrder:addListener(reset)
@@ -55,7 +64,8 @@ local function invokeEvent(unit)
 end
 local function checkUnit(unit)
     local passedTime = unit[passedTimeAttribute] + timerPeriod
-    if passedTime >= unit[impactDelayAttribute] then
+    local impactDelay = unit[impactDelayAttribute]
+    if passedTime >= impactDelay and ceil(passedTime / 0.02) >= ceil(impactDelay / 0.02) then
         invokeEvent(unit)
     else
         unit[passedTimeAttribute] = passedTime