warscript 0.0.1-dev.f566ce7 → 0.0.1-dev.f594e71

package/engine/internal/item.lua

@@ -13,6 +13,8 @@ local ____color = require("core.types.color")
 local Color = ____color.Color
 local ____event = require("event")
 local Event = ____event.Event
+local ____playerColor = require("core.types.playerColor")
+local PlayerColor = ____playerColor.PlayerColor
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
@@ -27,37 +29,57 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
 local ____vec2 = require("math.vec2")
 local distance = ____vec2.distance
-local itemChargesChangeEvent = __TS__New(Event)
-local itemAddAbility = BlzItemAddAbility
-local itemRemoveAbility = BlzItemRemoveAbility
-local getItemAbility = BlzGetItemAbility
-local isItemPowerup = IsItemPowerup
-local getItemAbilityByIndex = BlzGetItemAbilityByIndex
-local getAbilityId = BlzGetAbilityId
-local getWidgetLife = GetWidgetLife
-local removeItem = RemoveItem
-local getHandleId = GetHandleId
-local setRect = SetRect
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local chooseRandomItemExWithFilter = ChooseRandomItemExWithFilter
+local condition = Condition
+local convertEquipmentType = ConvertEquipmentType
+local convertItemTag = ConvertItemTag
+local createTrigger = CreateTrigger
+local destroyTrigger = DestroyTrigger
 local enumItemsInRect = EnumItemsInRect
+local getAbilityId = BlzGetAbilityId
 local getEnumItem = GetEnumItem
+local getHandleId = GetHandleId
+local getItemAbility = BlzGetItemAbility
+local getItemAbilityByIndex = BlzGetItemAbilityByIndex
+local getItemBooleanField = BlzGetItemBooleanField
+local getItemCharges = GetItemCharges
+local getItemEquipmentType = GetItemEquipmentType
+local getItemIntegerField = BlzGetItemIntegerField
+local getItemTag = GetItemTag
 local getItemTypeId = GetItemTypeId
 local getItemX = GetItemX
 local getItemY = GetItemY
-local getItemCharges = GetItemCharges
+local getManipulatedItem = GetManipulatedItem
+local getTriggerWidget = GetTriggerWidget
+local getWidgetLife = GetWidgetLife
+local isItemEquipped = IsItemEquipped
+local isItemInBag = IsItemInBag
+local isItemPawnable = IsItemPawnable
+local isItemPowerup = IsItemPowerup
+local itemAddAbility = BlzItemAddAbility
+local itemRemoveAbility = BlzItemRemoveAbility
+local loadItemHandle = LoadItemHandle
+local removeItem = RemoveItem
+local saveWidgetHandle = SaveWidgetHandle
+local setItemBooleanField = BlzSetItemBooleanField
 local setItemCharges = SetItemCharges
+local setItemColor = SetItemColor
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local setRect = SetRect
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterDeathEvent = TriggerRegisterDeathEvent
 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
+local itemChargesChangeEvent = __TS__New(Event)
+local itemDeathEvent = __TS__New(Event)
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -137,6 +159,25 @@ local function collectIntoTargetRange()
         targetCollectionNextIndex = targetCollectionNextIndex + 1
     end
 end
+local hashtable = InitHashtable()
+local deathTriggerCondition = condition(function()
+    saveWidgetHandle(
+        hashtable,
+        1,
+        1,
+        getTriggerWidget()
+    )
+    local item = ____exports.Item:of(loadItemHandle(hashtable, 1, 1))
+    if item ~= nil then
+        invoke(itemDeathEvent, item)
+    end
+end)
+itemDeathEvent:addListener(
+    999999,
+    function(item)
+        Timer:run(item, "destroy")
+    end
+)
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -144,6 +185,10 @@ __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
     self[100] = doAbilityAction(handle, getItemAbilities, self)
+    local deathTrigger = createTrigger()
+    triggerRegisterDeathEvent(deathTrigger, handle)
+    triggerAddCondition(deathTrigger, deathTriggerCondition)
+    self[101] = deathTrigger
 end
 function Item.prototype.onDestroy(self)
     local owner = self.owner
@@ -155,11 +200,30 @@ function Item.prototype.onDestroy(self)
         abilities[i]:destroy()
     end
     removeItem(self.handle)
+    destroyTrigger(self[101])
     return Handle.prototype.onDestroy(self)
 end
 function Item.create(self, id, x, y, skinId)
     return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
 end
+function Item.getRandomTypeId(self, level, equipmentType, tag, itemType)
+    if equipmentType == nil then
+        equipmentType = 9
+    end
+    if tag == nil then
+        tag = 8
+    end
+    if itemType == nil then
+        itemType = ITEM_TYPE_ANY
+    end
+    local id = chooseRandomItemExWithFilter(
+        itemType,
+        level,
+        convertEquipmentType(equipmentType),
+        convertItemTag(tag)
+    )
+    return id ~= 0 and id or nil
+end
 function Item.prototype.consumeCharge(self)
     return self:consumeCharges(1)
 end
@@ -244,6 +308,52 @@ function Item.getInRect(self, rect)
     enumItemsInRect(rect.handle, nil, collectIntoTarget)
     return targetCollection
 end
+__TS__SetDescriptor(
+    Item.prototype,
+    "isEquipped",
+    {get = function(self)
+        return isItemEquipped(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInBag",
+    {get = function(self)
+        return isItemInBag(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "equipmentType",
+    {get = function(self)
+        return getHandleId(getItemEquipmentType(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "tag",
+    {get = function(self)
+        return getHandleId(getItemTag(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "color",
+    {
+        get = function(self)
+            return self[102] or PlayerColor.red
+        end,
+        set = function(self, color)
+            setItemColor(self.handle, color.handle)
+            self[102] = color
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Item.prototype,
     "typeId",
@@ -635,8 +745,8 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.deathEvent = itemDeathEvent
 Item.chargesChangedEvent = itemChargesChangeEvent
-local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)
 TriggerAddAction(

package/engine/internal/unit/ability.lua

@@ -28,6 +28,9 @@ local ____lua_2Dsets = require("utility.lua-sets")
 local luaSetOf = ____lua_2Dsets.luaSetOf
 local ____attributes = require("attributes")
 local attribute = ____attributes.attribute
+local ____pseudo_2Dpassive_2Dabilities = require("engine.internal.unit.pseudo-passive-abilities")
+local pseudoPassiveAbilityOrderTypeStringId = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityOrderTypeStringId
+local pseudoPassiveAbilityTypeIds = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityTypeIds
 local eventInvoke = Event.invoke
 local condition = Condition
 local createTrigger = CreateTrigger
@@ -90,7 +93,7 @@ local function createCommonEvent(underlyingEvent)
         underlyingEvent,
         3,
         function(caster, ability)
-            return true, caster, ability
+            return not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil), caster, ability
         end
     )
 end
@@ -170,7 +173,7 @@ local function createNoTargetEvent(underlyingEvent)
         underlyingEvent,
         1,
         function(caster, ability, targetUnit, targetItem, targetDestructible, x, y)
-            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil then
+            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil and not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil) then
                 return true, caster, ability
             else
                 return false
@@ -381,7 +384,11 @@ rawset(
                             if unit ~= nil then
                                 local ability = unit:getAbility(abilityTypeId)
                                 if ability ~= nil then
-                                    eventInvoke(event, unit, ability, orderTypeStringId)
+                                    if pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil then
+                                        ability:interruptCast()
+                                    else
+                                        eventInvoke(event, unit, ability, orderTypeStringId)
+                                    end
                                 end
                             end
                         end)
@@ -477,4 +484,9 @@ internalAbilityChannelingStartEvent:addListener(
         end
     end
 )
+local function doNothing()
+end
+for pseudoPassiveAbilityTypeId in pairs(pseudoPassiveAbilityTypeIds) do
+    Unit.abilityCommandEvent[pseudoPassiveAbilityTypeId][pseudoPassiveAbilityOrderTypeStringId]:addListener(999999, doNothing)
+end
 return ____exports

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

@@ -0,0 +1,15 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        getAnimationDuration(this: Unit, animation: string | number): number;
+        setAurasEnabled(this: Unit, enabled: boolean, affectsUI?: boolean): void;
+        isHeroGlowAllowed: boolean;
+        maximumFlyHeight: number;
+        showsAirToGroundIndicator: boolean;
+        alwaysDisplaysHealth: boolean;
+    }
+    interface UnitWeapon {
+        resetAttack(this: UnitWeapon): void;
+    }
+}
+export {};

package/engine/internal/unit/appearance.lua

@@ -0,0 +1,85 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local UnitWeapon = ____unit.UnitWeapon
+local allowHeroGlowOnUnit = AllowHeroGlowOnUnit
+local disallowHeroGlowOnUnit = DisallowHeroGlowOnUnit
+local getUnitAnimationDuration = BlzGetUnitAnimationDuration
+local getUnitAnimationDurationByIndex = BlzGetUnitAnimationDurationByIndex
+local getUnitBooleanField = BlzGetUnitBooleanField
+local getUnitRealField = BlzGetUnitRealField
+local heroGlowIsAllowedOnUnit = HeroGlowIsAllowedOnUnit
+local resetUnitAttack = BlzResetUnitAttack
+local setUnitBooleanField = BlzSetUnitBooleanField
+local setUnitRealField = BlzSetUnitRealField
+local unitEnableAuras = BlzUnitEnableAuras
+Unit.prototype.getAnimationDuration = function(self, animation)
+    if type(animation) == "number" then
+        return getUnitAnimationDurationByIndex(self.handle, animation)
+    end
+    return getUnitAnimationDuration(self.handle, animation)
+end
+Unit.prototype.setAurasEnabled = function(self, enabled, affectsUI)
+    if affectsUI == nil then
+        affectsUI = true
+    end
+    unitEnableAuras(self.handle, enabled, affectsUI)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "isHeroGlowAllowed",
+    {
+        get = function(self)
+            return heroGlowIsAllowedOnUnit(self.handle)
+        end,
+        set = function(self, allowed)
+            if allowed then
+                allowHeroGlowOnUnit(self.handle)
+            else
+                disallowHeroGlowOnUnit(self.handle)
+            end
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "maximumFlyHeight",
+    {
+        get = function(self)
+            return getUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT)
+        end,
+        set = function(self, height)
+            setUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT, height)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "showsAirToGroundIndicator",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND, show)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "alwaysDisplaysHealth",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP, show)
+        end
+    }
+)
+UnitWeapon.prototype.resetAttack = function(self)
+    resetUnitAttack(self.unit.handle, self.index)
+end
+return ____exports

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

@@ -0,0 +1,18 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+export interface UnitBag extends ReadonlyArray<Item | undefined> {
+}
+/** A live, zero-based view of a unit's bag. The engine does not expose bag-slot assignment. */
+export declare class UnitBag {
+    constructor(handle: junit);
+    has(item: Item): boolean;
+    findSlot(item: Item): number | undefined;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly bag: UnitBag;
+    }
+}

package/engine/internal/unit/bag.lua

@@ -0,0 +1,63 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local unitExtendedInventorySize = UnitExtendedInventorySize
+local unitHasItemBagged = UnitHasItemBagged
+local unitItemInBagSlot = UnitItemInBagSlot
+local ____rawget = _G.rawget
+local rawset = _G.rawset
+local ____type = _G.type
+local handleByUnitBag = setmetatable({}, {__mode = "k"})
+local function unitBagNext(handle, slot)
+    if slot >= unitExtendedInventorySize(handle) then
+        return nil, nil
+    end
+    return slot + 1, Item:of(unitItemInBagSlot(handle, slot))
+end
+--- A live, zero-based view of a unit's bag. The engine does not expose bag-slot assignment.
+____exports.UnitBag = __TS__Class()
+local UnitBag = ____exports.UnitBag
+UnitBag.name = "UnitBag"
+function UnitBag.prototype.____constructor(self, handle)
+    handleByUnitBag[self] = handle
+end
+function UnitBag.prototype.has(self, item)
+    return unitHasItemBagged(handleByUnitBag[self], item.handle)
+end
+function UnitBag.prototype.findSlot(self, item)
+    local handle = handleByUnitBag[self]
+    for slot = 0, unitExtendedInventorySize(handle) - 1 do
+        if unitItemInBagSlot(handle, slot) == item.handle then
+            return slot
+        end
+    end
+    return nil
+end
+function UnitBag.prototype.__index(self, key)
+    if ____type(key) == "number" then
+        return Item:of(unitItemInBagSlot(handleByUnitBag[self], key - 1))
+    end
+    return ____rawget(____exports.UnitBag.prototype, key)
+end
+function UnitBag.prototype.__len(self)
+    return unitExtendedInventorySize(handleByUnitBag[self])
+end
+function UnitBag.prototype.__ipairs(self)
+    return unitBagNext, handleByUnitBag[self], 0
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "bag",
+    {get = function(self)
+        local bag = __TS__New(____exports.UnitBag, self.handle)
+        rawset(self, "bag", bag)
+        return bag
+    end}
+)
+return ____exports

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

@@ -32,7 +32,7 @@ declare module "../unit" {
          * @param includeAuras Whether to remove aura buffs. Default `true`.
          * @param autoDispel Unknown. Default `false`.
          */
-        removeBuffs(polarity?: BuffPolarity, resistanceType?: BuffResistanceType, includeExpirationTimers?: boolean, includeAuras?: boolean, autoDispel?: boolean): void;
-        removeBuffs(buffTypeIds: number[]): void;
+        removeBuffs(polarity?: BuffPolarity, resistanceType?: BuffResistanceType, includeExpirationTimers?: boolean, includeAuras?: boolean, autoDispel?: boolean): number;
+        removeBuffs(buffTypeIds: number[]): number;
     }
 }

package/engine/internal/unit/buff.lua

@@ -1,7 +1,3 @@
-local ____lualib = require("lualib_bundle")
-local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
-local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
-local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local ____exports = {}
 local ____buff = require("engine.buff")
 local checkBuff = ____buff.checkBuff
@@ -19,7 +15,7 @@ Unit.prototype.hasBuff = function(self, buffTypeId)
 end
 Unit.prototype.removeBuff = function(self, buffTypeId)
     if removeBuff(self.handle, buffTypeId) then
-        checkBuff(self, buffTypeId)
+        checkBuff(self, buffTypeId, false)
         return true
     end
     return false
@@ -46,36 +42,55 @@ Unit.prototype.countBuffs = function(self, polarity, resistanceType, includeExpi
     )
 end
 Unit.prototype.removeBuffs = function(self, polarityOrBuffTypeIds, resistanceType, includeExpirationTimers, includeAuras, autoDispel)
+    local handle = self.handle
+    local cnt
     if type(polarityOrBuffTypeIds) == "table" then
-        local handle = self.handle
+        cnt = 0
         for i = 1, #polarityOrBuffTypeIds do
-            unitRemoveAbility(handle, polarityOrBuffTypeIds[i])
+            cnt = cnt + (unitRemoveAbility(handle, polarityOrBuffTypeIds[i]) and 1 or 0)
         end
     else
-        local ____array_3 = __TS__SparseArrayNew(
-            self.handle,
-            (polarityOrBuffTypeIds or 3) & 1 ~= 0,
-            (polarityOrBuffTypeIds or 3) & 2 ~= 0,
-            (resistanceType or 0) & 1 ~= 0,
-            (resistanceType or 0) & 2 ~= 0
-        )
+        local positive = (polarityOrBuffTypeIds or 3) & 1 ~= 0
+        local negative = (polarityOrBuffTypeIds or 3) & 2 ~= 0
+        local magic = (resistanceType or 0) & 1 ~= 0
+        local physical = (resistanceType or 0) & 2 ~= 0
         local ____includeExpirationTimers_0 = includeExpirationTimers
         if ____includeExpirationTimers_0 == nil then
             ____includeExpirationTimers_0 = true
         end
-        __TS__SparseArrayPush(____array_3, ____includeExpirationTimers_0)
+        includeExpirationTimers = ____includeExpirationTimers_0
         local ____includeAuras_1 = includeAuras
         if ____includeAuras_1 == nil then
             ____includeAuras_1 = true
         end
-        __TS__SparseArrayPush(____array_3, ____includeAuras_1)
+        includeAuras = ____includeAuras_1
         local ____autoDispel_2 = autoDispel
         if ____autoDispel_2 == nil then
             ____autoDispel_2 = false
         end
-        __TS__SparseArrayPush(____array_3, ____autoDispel_2)
-        unitRemoveBuffsEx(__TS__SparseArraySpread(____array_3))
+        autoDispel = ____autoDispel_2
+        cnt = unitCountBuffsEx(
+            handle,
+            positive,
+            negative,
+            magic,
+            physical,
+            includeExpirationTimers,
+            includeAuras,
+            autoDispel
+        )
+        unitRemoveBuffsEx(
+            handle,
+            positive,
+            negative,
+            magic,
+            physical,
+            includeExpirationTimers,
+            includeAuras,
+            autoDispel
+        )
     end
-    checkBuffs(self)
+    checkBuffs(self, false)
+    return cnt
 end
 return ____exports

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

@@ -0,0 +1,36 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+import { EquipmentSlot } from "../../object-data/auxiliary/equipment-slot";
+import { EquipmentType } from "../../object-data/auxiliary/equipment-type";
+export interface UnitEquipment extends ReadonlyArray<Item | undefined> {
+}
+/** A live view indexed by EquipmentSlot. Equip operations let the engine choose the slot. */
+export declare class UnitEquipment {
+    constructor(handle: junit);
+    equip(item: Item): boolean;
+    unequip(item: Item): void;
+    unequipSlot(slot: EquipmentSlot): Item | undefined;
+    has(item: Item): boolean;
+    hasAny(): boolean;
+    isSlotEmpty(slot: EquipmentSlot): boolean;
+    hasType(type: EquipmentType): boolean;
+    canEquipType(type: EquipmentType): boolean;
+    findSlot(item: Item): EquipmentSlot | undefined;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly equipment: UnitEquipment;
+    }
+    namespace Unit {
+        const itemEquippedEvent: UnitTriggerEvent<[item: Item]>;
+        const itemUnequippedEvent: UnitTriggerEvent<[item: Item]>;
+        let itemStackedEvent: UnitTriggerEvent<[
+            target: Item,
+            source: Item,
+            previousTargetCharges: number
+        ]>;
+    }
+}