warscript 0.0.1-dev.c16baee → 0.0.1-dev.c1eba7d

package/engine/internal/unit.lua

@@ -51,6 +51,8 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____math = require("math")
 local min = ____math.min
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -290,7 +292,6 @@ local function dispatch(event, idGetter, argsGetter)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(...)
                         local id = idGetter(...)
                         local dispatched = rawget(self, id)
@@ -328,7 +329,6 @@ local function dispatchAbility(event)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(unit, ability, ...)
                         local dispatched = rawget(self, ability.typeId)
                         if dispatched ~= nil then
@@ -564,17 +564,6 @@ local function retrieveAbility(unit, ability, abilityId)
             ____exports.Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                ____exports.Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -632,15 +621,15 @@ for ____, player in ipairs(Player.all) do
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[102] or 0) - 1
+    local counter = (unit[103] or 0) - 1
     if counter ~= 0 then
-        unit[102] = counter
+        unit[103] = counter
         return
     end
-    unit[102] = nil
-    local healthBonus = unit[103]
+    unit[103] = nil
+    local healthBonus = unit[104]
     if healthBonus ~= nil then
-        unit[103] = nil
+        unit[104] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -648,12 +637,17 @@ local function delayHealthChecksCallback(unit)
         )
     end
 end
+local nextSyncId = 1
+local unitBySyncId = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
 __TS__ClassExtends(Unit, Handle)
 function Unit.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    local ____nextSyncId_0 = nextSyncId
+    nextSyncId = ____nextSyncId_0 + 1
+    self.syncId = ____nextSyncId_0
     self._owner = Player:of(getOwningPlayer(handle))
     assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
     assert(unitAddAbility(handle, morphDetectAbilityId))
@@ -666,6 +660,7 @@ function Unit.prototype.____constructor(self, handle)
             fourCC("Amrf")
         ))
     end
+    unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
 function Unit.prototype.getEvent(self, event, collector)
@@ -706,6 +701,10 @@ function Unit.prototype.onDestroy(self)
     if eventsToDestroy ~= nil then
         forEach(eventsToDestroy, "destroy")
     end
+    if getUnitAbilityLevel(handle, leaveDetectAbilityId) > 0 then
+        unitRemoveAbility(handle, leaveDetectAbilityId)
+        removeUnit(handle)
+    end
     return Handle.prototype.onDestroy(self)
 end
 function Unit.prototype.addAttackHandler(self, condition, action)
@@ -747,8 +746,8 @@ function Unit.prototype.addModifier(self, property, modifier)
     end}
 end
 function Unit.prototype.hasCombatClassification(self, combatClassification)
-    local ____combatClassification_0 = combatClassification
-    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_0 == ____combatClassification_0
+    local ____combatClassification_1 = combatClassification
+    return getUnitIntegerField(self.handle, UNIT_IF_TARGETED_AS) & ____combatClassification_1 == ____combatClassification_1
 end
 function Unit.prototype.addClassification(self, classification)
     return unitAddType(self.handle, classification)
@@ -766,13 +765,13 @@ function Unit.prototype.isInvisibleTo(self, player)
     return isUnitInvisible(self.handle, player.handle)
 end
 function Unit.prototype.isInRangeOf(self, x, y, range)
-    local ____temp_1
+    local ____temp_2
     if type(x) == "number" then
-        ____temp_1 = isUnitInRangeXY(self.handle, x, y, range)
+        ____temp_2 = isUnitInRangeXY(self.handle, x, y, range)
     else
-        ____temp_1 = isUnitInRange(self.handle, x.handle, y)
+        ____temp_2 = isUnitInRange(self.handle, x.handle, y)
     end
-    return ____temp_1
+    return ____temp_2
 end
 function Unit.prototype.isAllyOf(self, unit)
     return isUnitAlly(
@@ -799,7 +798,7 @@ function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[102] = (self[102] or 0) + 1
+    self[103] = (self[103] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -816,14 +815,14 @@ function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
 function Unit.prototype.revive(self, x, y, doEffect)
-    local ____ReviveHero_4 = ReviveHero
-    local ____array_3 = __TS__SparseArrayNew(self.handle, x, y)
-    local ____doEffect_2 = doEffect
-    if ____doEffect_2 == nil then
-        ____doEffect_2 = false
+    local ____ReviveHero_5 = ReviveHero
+    local ____array_4 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_3 = doEffect
+    if ____doEffect_3 == nil then
+        ____doEffect_3 = false
     end
-    __TS__SparseArrayPush(____array_3, ____doEffect_2)
-    ____ReviveHero_4(__TS__SparseArraySpread(____array_3))
+    __TS__SparseArrayPush(____array_4, ____doEffect_3)
+    ____ReviveHero_5(__TS__SparseArraySpread(____array_4))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -863,7 +862,7 @@ function Unit.prototype.dropItemSlot(self, item, slot)
     return UnitDropItemSlot(self.handle, item.handle, slot)
 end
 function Unit.prototype.itemInSlot(self, slot)
-    return Item:of(UnitItemInSlot(self.handle, slot))
+    return Item:of(unitItemInSlot(self.handle, slot))
 end
 function Unit.prototype.addAbility(self, abilityId)
     if unitAddAbility(self.handle, abilityId) then
@@ -932,8 +931,15 @@ function Unit.prototype.interruptAttack(self)
     unitInterruptAttack(self.handle)
 end
 function Unit.prototype.interruptCast(self, abilityId)
-    unitDisableAbility(self.handle, abilityId, true, false)
-    unitDisableAbility(self.handle, abilityId, false, false)
+    local handle = self.handle
+    unitDisableAbility(handle, abilityId, true, false)
+    Timer:run(
+        unitDisableAbility,
+        handle,
+        abilityId,
+        false,
+        false
+    )
 end
 function Unit.prototype.getDistanceTo(self, target)
     local handle = self.handle
@@ -993,18 +999,18 @@ function Unit.prototype.unpauseEx(self)
     self:decrementStunCounter()
 end
 function Unit.prototype.incrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 0 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
-    self[101] = stunCounter + 1
+    self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
-    local stunCounter = self[101] or 0
-    if not self[100] or stunCounter >= 1 then
+    local stunCounter = self[102] or 0
+    if not self[101] or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
-    self[101] = stunCounter - 1
+    self[102] = stunCounter - 1
 end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
@@ -1106,8 +1112,11 @@ function Unit.getInSector(self, pos, range, offsetAngle, centralAngle)
     )
     return targetCollection
 end
-function Unit.getSelectionOf(self, player)
-    targetCollection = {}
+function Unit.getSelectionOf(self, player, target)
+    if target == nil then
+        target = {}
+    end
+    targetCollection = target
     targetCollectionNextIndex = 1
     GroupEnumUnitsSelected(dummyGroup, player.handle, collectIntoTarget)
     return targetCollection
@@ -1129,6 +1138,9 @@ end
 function Unit.prototype.__tostring(self)
     return (((self.constructor.name .. "$") .. util.id2s(self.typeId)) .. "@") .. tostring(getHandleId(self.handle))
 end
+function Unit.getBySyncId(self, syncId)
+    return unitBySyncId[syncId]
+end
 __TS__SetDescriptor(
     Unit.prototype,
     "_deltas",
@@ -1386,17 +1398,17 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[105]
+            return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_5
+            local ____temp_6
             if not isTeamGlowVisible then
-                ____temp_5 = true
+                ____temp_6 = true
             else
-                ____temp_5 = nil
+                ____temp_6 = nil
             end
-            self[105] = ____temp_5
+            self[106] = ____temp_6
         end
     },
     true
@@ -1406,7 +1418,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[105] then
+        if self[106] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1430,14 +1442,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[102] ~= nil then
-                self[103] = (self[103] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[103] ~= nil then
+                self[104] = (self[104] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
         end
     },
     true
@@ -1479,10 +1491,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[104] or 0)
+            return GetWidgetLife(self.handle) - (self[105] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[104] or 0))
+            SetWidgetLife(self.handle, health + (self[105] or 0))
         end
     },
     true
@@ -1693,17 +1705,17 @@ __TS__SetDescriptor(
         set = function(self, isPaused)
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
-                self[100] = true
-                for _ = self[101] or 0, -1 do
+                self[101] = true
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, true)
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[101] or 0, -1 do
+                for _ = self[102] or 0, -1 do
                     BlzPauseUnitEx(handle, false)
                 end
-                self[100] = nil
+                self[101] = nil
             end
         end
     },
@@ -2060,7 +2072,6 @@ Unit.onDecay = __TS__New(
 Unit.onResurrect = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local dead = setmetatable({}, {__mode = "k"})
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
@@ -2076,10 +2087,15 @@ Unit.onResurrect = __TS__New(
 Unit.morphEvent = __TS__New(
     InitializingEvent,
     function(event)
+        local function ifNotLeft(unit)
+            local handle = unit.handle
+            if getUnitAbilityLevel(handle, leaveDetectAbilityId) ~= 0 and unitAddAbility(handle, morphDetectAbilityId) then
+                invoke(event, unit)
+            end
+        end
         ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
-                assert(unitAddAbility(unit.handle, morphDetectAbilityId))
-                Timer:run(Event.invoke, event, unit)
+                Timer:run(ifNotLeft, unit)
             end
         end)
     end
@@ -2117,27 +2133,26 @@ Unit.onSpellEffect = dispatchId(__TS__New(
 Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_8
+            local ____GetSpellTargetUnit_result_9
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_8 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_9 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_7
+                local ____GetSpellTargetItem_result_8
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_7 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_8 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_6
+                    local ____GetSpellTargetDestructable_result_7
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_6 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_7 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_6 = nil
+                        ____GetSpellTargetDestructable_result_7 = nil
                     end
-                    ____GetSpellTargetItem_result_7 = ____GetSpellTargetDestructable_result_6
+                    ____GetSpellTargetItem_result_8 = ____GetSpellTargetDestructable_result_7
                 end
-                ____GetSpellTargetUnit_result_8 = ____GetSpellTargetItem_result_7
+                ____GetSpellTargetUnit_result_9 = ____GetSpellTargetItem_result_8
             end
-            local target = ____GetSpellTargetUnit_result_8
+            local target = ____GetSpellTargetUnit_result_9
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2309,10 +2324,12 @@ Unit.onImmediateOrder = dispatchId(__TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_ISSUED_ORDER,
     function()
-        local unit = ____exports.Unit:of(getOrderedUnit())
-        local issuedOrderId = getIssuedOrderId()
-        if unit ~= nil and unit.state == 1 then
-            return unit, issuedOrderId
+        local handle = getOrderedUnit()
+        if handle ~= nil and getUnitTypeId(handle) ~= dummyUnitId then
+            local unit = ____exports.Unit:of(handle)
+            if unit.state == 1 then
+                return unit, getIssuedOrderId()
+            end
         end
         return IgnoreEvent
     end
@@ -2334,7 +2351,6 @@ Unit.autoAttackStartEvent = __TS__New(
 )
 Unit.onDamaging = (function()
     local event = __TS__New(Event)
-    local invoke = Event.invoke
     local trigger = CreateTrigger()
     TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGING)
     TriggerAddCondition(
@@ -2433,7 +2449,6 @@ end)()
 Unit.onDamage = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local trigger = CreateTrigger()
         TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
         TriggerAddCondition(
@@ -2449,6 +2464,7 @@ Unit.onDamage = __TS__New(
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
                     isAttack = BlzGetEventIsAttack(),
+                    originalAmount = GetEventDamage(),
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(
@@ -2465,7 +2481,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[104] = (target[104] or 0) + bonusHealth
+                    target[105] = (target[105] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2479,7 +2495,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[104] = (target[104] or 0) - bonusHealth
+                        target[105] = (target[105] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2499,32 +2515,91 @@ Unit.onDamage = __TS__New(
         DestroyTrigger(trigger)
     end
 )
-Unit.onItemDrop = __TS__New(
+Unit.itemDroppedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
 )
-Unit.onItemPickup = __TS__New(
+Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
 )
-Unit.onItemUse = __TS__New(
+Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(GetTriggerUnit()), Item:of(GetManipulatedItem()) end
+    function()
+        local unit = getTriggerUnit()
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
+        end
+        return IgnoreEvent
+    end
+)
+Unit.itemStackedEvent = __TS__New(
+    ____exports.UnitTriggerEvent,
+    EVENT_PLAYER_UNIT_STACK_ITEM,
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemUseOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("useslot0"), orderId("useslot5") do
+            local slot = order - orderId("useslot0")
+            local function listener(unit)
+                local item = unit.items[slot + 1]
+                if item ~= nil then
+                    invoke(event, unit, item)
+                end
+            end
+            self.onImmediateOrder[order]:addListener(listener)
+            self.onTargetOrder[order]:addListener(listener)
+            self.onPointOrder[order]:addListener(listener)
+        end
+        rawset(self, "itemUseOrderEvent", event)
+        return event
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemMoveOrderEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        for order = orderId("moveslot0"), orderId("moveslot5") do
+            local slotTo = order - orderId("moveslot0")
+            self.onTargetOrder[order]:addListener(function(unit, item)
+                local slotFrom = unit.items:findSlot(item)
+                if slotFrom ~= nil then
+                    invoke(
+                        event,
+                        unit,
+                        item,
+                        slotFrom,
+                        slotTo
+                    )
+                end
+            end)
+        end
+        rawset(self, "itemMoveOrderEvent", event)
+        return event
+    end}
 )
 __TS__ObjectDefineProperty(
     Unit,

package/engine/internal/utility.lua

@@ -1,6 +1,8 @@
 local ____exports = {}
 local getUnitAbility = BlzGetUnitAbility
 local unitAddAbility = UnitAddAbility
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
 ---
 -- @internal For use by internal systems only.
@@ -10,4 +12,14 @@ ____exports.addInternalAbility = function(unit, abilityTypeId)
     end
     return getUnitAbility(unit, abilityTypeId)
 end
+---
+-- @internal For use by internal systems only.
+____exports.findUnitItemSlot = function(unit, item)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        if item == unitItemInSlot(unit, slot) then
+            return slot
+        end
+    end
+    return nil
+end
 return ____exports

package/engine/local-client.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
-import { TriggerEvent } from "../event";
+import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
 export declare class LocalClient {
     private constructor();
@@ -11,6 +11,11 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
-    static get mouseFocusUnit(): Async<Unit>;
+    static get mouseFocusUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnitChangeEvent(): Event<[
+        previousMainSelectedUnit: Unit | undefined,
+        newMainSelectedUnit: Unit | undefined
+    ]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }