warscript 0.0.1-dev.87bdb89 → 0.0.1-dev.8895ff6

package/engine/internal/ability.lua

@@ -232,6 +232,19 @@ ____exports.getOrderIdByAbilityTypeId = function(abilityTypeId)
     local parentTypeId = availableFields[abilityTypeId]
     return order2orderId(orders[____type(parentTypeId) == "number" and parentTypeId or abilityTypeId] or "")
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeHasField = function(abilityTypeId, field)
+    field = ____type(field) == "number" and field or getHandleId(field)
+    if commonFields[field] then
+        return true
+    end
+    local id = availableFields[abilityTypeId]
+    if ____type(id) == "number" then
+        id = availableFields[id]
+    end
+    return not not (id and id[field])
+end
 ____exports.Ability = __TS__Class()
 local Ability = ____exports.Ability
 Ability.name = "Ability"
@@ -247,15 +260,7 @@ function Ability.prototype.getSnapshot(self)
     return nil
 end
 function Ability.prototype.hasField(self, field)
-    field = ____type(field) == "number" and field or getHandleId(field)
-    if commonFields[field] then
-        return true
-    end
-    local id = availableFields[self.typeId]
-    if ____type(id) == "number" then
-        id = availableFields[id]
-    end
-    return not not (id and id[field])
+    return ____exports.abilityTypeHasField(self.typeId, field)
 end
 function Ability.prototype.getField(self, field, level)
     local fieldType = match(
@@ -404,16 +409,28 @@ function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
 function UnitAbility.prototype.incrementDisableCounter(self)
-    unitDisableAbility(self.u, self.typeId, true, false)
+    local unit = self.u
+    local typeId = self.typeId
+    unitHideAbility(unit, typeId, true)
+    unitDisableAbility(unit, typeId, true, false)
     self.d = (self.d or 0) + 1
 end
 function UnitAbility.prototype.decrementDisableCounter(self)
-    unitDisableAbility(self.u, self.typeId, false, false)
+    local unit = self.u
+    local typeId = self.typeId
+    unitDisableAbility(unit, typeId, false, false)
+    unitHideAbility(unit, typeId, true)
     self.d = (self.d or 0) - 1
 end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
+function UnitAbility.prototype.onDestroy(self)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return UnitAbility.____super.prototype.onDestroy(self)
+end
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "isDisabled",
@@ -506,6 +523,12 @@ function ItemAbility.prototype.interruptCast(self)
         setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
     end
 end
+function ItemAbility.prototype.onDestroy(self)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
+    return ItemAbility.____super.prototype.onDestroy(self)
+end
 __TS__SetDescriptor(
     ItemAbility.prototype,
     "level",

package/engine/internal/item/ability.lua

@@ -20,6 +20,7 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 local unitAddItemToSlot = ____add_2Ditem_2Dto_2Dslot.unitAddItemToSlot
 local isItemOwned = IsItemOwned
 local isItemPowerup = IsItemPowerup
+local getItemAbility = BlzGetItemAbility
 local getItemX = GetItemX
 local getItemY = GetItemY
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
@@ -31,6 +32,8 @@ local unitAddItem = UnitAddItem
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitResetCooldown = UnitResetCooldown
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local COOLDOWN_STARTER_ABILITY_TYPE_ID = compiletime(function()
     if not currentMap then
         return 0
@@ -65,7 +68,7 @@ ____exports.itemAbilityDummy = assert(CreateUnit(
     270
 ))
 local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
-local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+local cooldownStarterAbility = getItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
 ShowUnit(____exports.itemAbilityDummy, false)
 local function startItemCooldownInternal(handle, cooldown)
     local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
@@ -153,4 +156,51 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
     end
     return result
 end
+local depth = 0
+local itemBySlot = {}
+---
+-- @internal For use by internal systems only.
+____exports.doUnitAbilityAction = function(unit, abilityTypeId, action, ...)
+    local ____depth_0 = depth
+    depth = ____depth_0 + 1
+    local offset = 6 * ____depth_0
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = unitItemInSlot(unit, slot)
+        if getItemAbility(item, abilityTypeId) ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            unitRemoveItem(unit, item)
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = item
+        end
+    end
+    local result = action(unit, ...)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        local item = itemBySlot[offset + slot]
+        if item ~= nil then
+            local isAlreadyIgnoredInEvents = ignoreEventsItems[item] ~= nil
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = true
+            end
+            local isPowerup = isItemPowerup(item)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+            end
+            unitAddItemToSlot(unit, item, slot)
+            if isPowerup then
+                setItemBooleanField(item, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+            end
+            if not isAlreadyIgnoredInEvents then
+                ignoreEventsItems[item] = nil
+            end
+            itemBySlot[offset + slot] = nil
+        end
+    end
+    depth = depth - 1
+    return result
+end
 return ____exports

package/engine/internal/item+owner.lua

@@ -6,12 +6,18 @@ local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ownerByItem = setmetatable({}, {__mode = "kv"})
-Unit.itemPickedUpEvent:addListener(function(unit, item)
-    ownerByItem[item] = unit
-end)
-Unit.itemDroppedEvent:addListener(function(unit, item)
-    ownerByItem[item] = nil
-end)
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = unit
+    end
+)
+Unit.itemDroppedEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = nil
+    end
+)
 __TS__ObjectDefineProperty(
     Item.prototype,
     "owner",

package/engine/internal/item.d.ts

@@ -8,12 +8,10 @@ import { AbilityTypeId } from "../object-data/entry/ability-type";
 import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100,
-    LUA_INDEX_BY_ABILITY_TYPE_ID = 101
+    ABILITIES = 100
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
-    private readonly [ItemPropertyKey.LUA_INDEX_BY_ABILITY_TYPE_ID];
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
@@ -30,22 +28,22 @@ export declare class Item extends Handle<jitem> {
     get extendedTooltip(): string;
     set iconPath(v: string);
     get iconPath(): string;
-    set dropOnDeath(v: boolean);
-    get dropOnDeath(): boolean;
-    set droppable(v: boolean);
-    get droppable(): boolean;
-    set pawnable(v: boolean);
-    get pawnable(): boolean;
-    set perishable(v: boolean);
-    get perishable(): boolean;
-    set powerup(v: boolean);
-    get powerup(): boolean;
+    set dropsOnDeath(dropsOnDeath: boolean);
+    get dropsOnDeath(): boolean;
+    set canBeDropped(canBeDropped: boolean);
+    get canBeDropped(): boolean;
+    set canBeSold(canBeSold: boolean);
+    get canBeSold(): boolean;
+    set perishes(perishes: boolean);
+    get perishes(): boolean;
+    set isPowerUp(isPowerUp: boolean);
+    get isPowerUp(): boolean;
     get isAlive(): boolean;
     get isDead(): boolean;
     set isInvulnerable(isInvulnerable: boolean);
     get isInvulnerable(): boolean;
-    set usable(v: boolean);
-    get usable(): boolean;
+    set isActivelyUsed(isActivelyUsed: boolean);
+    get isActivelyUsed(): boolean;
     set visible(v: boolean);
     get visible(): boolean;
     set level(v: number);

package/engine/internal/item.lua

@@ -46,9 +46,18 @@ local getItemY = GetItemY
 local getItemCharges = GetItemCharges
 local setItemCharges = SetItemCharges
 local unitRemoveAbility = UnitRemoveAbility
+local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local isItemPawnable = IsItemPawnable
+local getItemIntegerField = BlzGetItemIntegerField
+local setItemBooleanField = BlzSetItemBooleanField
+local getItemBooleanField = BlzGetItemBooleanField
+local tableRemove = table.remove
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -56,9 +65,6 @@ _G.SetItemCharges = function(whichItem, charges)
         ____exports.Item:of(whichItem)
     )
 end
-local getItemIntegerField = BlzGetItemIntegerField
-local setItemBooleanField = BlzSetItemBooleanField
-local getItemBooleanField = BlzGetItemBooleanField
 invoke = Event.invoke
 local enumRect = Rect:create(0, 0, 0, 0).handle
 ---
@@ -137,15 +143,13 @@ Item.name = "Item"
 __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
-    local abilities = doAbilityAction(handle, getItemAbilities, self)
-    self[100] = abilities
-    local luaIndexByAbilityTypeId = {}
-    for i = 1, #abilities do
-        luaIndexByAbilityTypeId[abilities[i].typeId] = i
-    end
-    self[101] = luaIndexByAbilityTypeId
+    self[100] = doAbilityAction(handle, getItemAbilities, self)
 end
 function Item.prototype.onDestroy(self)
+    local owner = self.owner
+    if owner ~= nil then
+        unitRemoveItem(owner.handle, self.handle)
+    end
     local abilities = self[100]
     for i = 1, #abilities do
         abilities[i]:destroy()
@@ -191,33 +195,32 @@ function Item.prototype.addAbility(self, abilityTypeId)
     if nativeAbility ~= nil then
         local ability = ItemAbility:of(nativeAbility, abilityTypeId, self)
         local abilities = self[100]
-        local luaIndex = #abilities + 1
-        abilities[luaIndex] = ability
-        self[101][abilityTypeId] = luaIndex
+        abilities[#abilities + 1] = ability
         return ability
     end
     return nil
 end
 function Item.prototype.removeAbility(self, abilityTypeId)
-    local luaIndexByAbilityTypeId = self[101]
-    local luaIndex = luaIndexByAbilityTypeId[abilityTypeId]
-    if luaIndex ~= nil and doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId) then
-        luaIndexByAbilityTypeId[abilityTypeId] = nil
-        local abilities = self[100]
-        abilities[luaIndex]:destroy()
-        local abilityTypeIdsLength = #abilities
-        for j = luaIndex, abilityTypeIdsLength do
-            abilities[j] = abilities[j + 1]
+    local abilities = self[100]
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tableRemove(abilities, i)
+            ability:destroy()
+            return true
         end
     end
-    return false
+    return doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId)
 end
 function Item.prototype.hasAbility(self, abilityTypeId)
-    return self[101][abilityTypeId] ~= nil
+    return doAbilityAction(self.handle, getItemAbility, abilityTypeId) ~= nil
 end
 function Item.prototype.getAbility(self, abilityTypeId)
-    local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
-    return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
+    return ItemAbility:of(
+        doAbilityAction(self.handle, getItemAbility, abilityTypeId),
+        abilityTypeId,
+        self
+    )
 end
 function Item.getInRange(self, x, y, range)
     targetCollection = {}
@@ -329,65 +332,68 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "dropOnDeath",
+    "dropsOnDeath",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+            return getItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
         end,
-        set = function(self, v)
-            SetItemDropOnDeath(self.handle, v)
+        set = function(self, dropsOnDeath)
+            setItemDropOnDeath(self.handle, dropsOnDeath)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "droppable",
+    "canBeDropped",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
+            return getItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
         end,
-        set = function(self, v)
-            SetItemDroppable(self.handle, v)
+        set = function(self, canBeDropped)
+            setItemDroppable(self.handle, canBeDropped)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "pawnable",
+    "canBeSold",
     {
         get = function(self)
-            return IsItemPawnable(self.handle)
+            return isItemPawnable(self.handle)
         end,
-        set = function(self, v)
-            SetItemPawnable(self.handle, v)
+        set = function(self, canBeSold)
+            setItemPawnable(self.handle, canBeSold)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "perishable",
+    "perishes",
     {
         get = function(self)
             return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
         end,
-        set = function(self, v)
-            BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
+        set = function(self, perishes)
+            local handle = self.handle
+            local powerUp = isItemPowerup(handle)
+            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "powerup",
+    "isPowerUp",
     {
         get = function(self)
             return isItemPowerup(self.handle)
         end,
-        set = function(self, v)
-            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, v)
+        set = function(self, isPowerUp)
+            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, isPowerUp)
         end
     },
     true
@@ -423,16 +429,24 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "usable",
+    "isActivelyUsed",
     {
         get = function(self)
             return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
         end,
-        set = function(self, v)
+        set = function(self, isActivelyUsed)
             local handle = self.handle
-            local powerup = isItemPowerup(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, v)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerup)
+            local powerUp = isItemPowerup(handle)
+            local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
+            local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+            local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
+            local canBeSold = isItemPawnable(handle)
+            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
+            setItemPawnable(handle, canBeSold)
+            setItemDroppable(handle, canBeDropped)
+            setItemDropOnDeath(handle, dropsOnDeath)
+            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
         end
     },
     true

package/engine/internal/mechanics/cast-ability.lua

@@ -74,9 +74,12 @@ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ..
         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)
+            for slot = 0, inventorySize - 1 do
+                local nativeItem = nativeItemBySlot[slot]
+                if nativeItem ~= nil then
+                    unitAddItem(nativeUnit, nativeItem)
+                    unitDropItemSlot(nativeUnit, nativeItem, slot)
+                end
             end
         end
     end

package/engine/internal/misc/frame-coordinates.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/misc/frame-coordinates.lua

@@ -0,0 +1,21 @@
+local ____exports = {}
+local getLocalClientWidth = BlzGetLocalClientWidth
+local getLocalClientHeight = BlzGetLocalClientHeight
+---
+-- @internal For use by internal systems only.
+____exports.getFrameMinXMaxX = function()
+    local w = getLocalClientWidth()
+    local h = getLocalClientHeight()
+    local width4by3 = (w - h / 600 * 800) / 2
+    local pxtodpi = 0.6 / h
+    local minX = -width4by3 * pxtodpi
+    local maxX = minX + w * pxtodpi
+    return minX, maxX
+end
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MIN_Y = 0
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MAX_Y = 0.6
+return ____exports

package/engine/internal/misc/get-terrain-z.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/misc/get-terrain-z.lua

@@ -0,0 +1,11 @@
+local ____exports = {}
+local getLocationZ = GetLocationZ
+local moveLocation = MoveLocation
+local location = Location(0, 0)
+---
+-- @internal For use by internal systems only.
+____exports.getTerrainZ = function(x, y)
+    moveLocation(location, x, y)
+    return getLocationZ(location)
+end
+return ____exports

package/engine/internal/misc/player-local-handle.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/misc/player-local-handle.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.PLAYER_LOCAL_HANDLE = GetLocalPlayer()
+return ____exports

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+return ____exports

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

@@ -131,11 +131,6 @@ declare module "../unit" {
         const abilityNoTargetChannelingStartEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
-declare module "../unit" {
-    namespace Unit {
-        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
-    }
-}
 declare module "../unit" {
     namespace Unit {
         const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
@@ -155,3 +150,38 @@ declare module "../unit" {
         };
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}