warscript 0.0.1-dev.26f0c5f → 0.0.1-dev.277cbcb

package/engine/internal/item/ability.lua

@@ -20,7 +20,6 @@ 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
@@ -32,8 +31,6 @@ 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
@@ -68,7 +65,7 @@ ____exports.itemAbilityDummy = assert(CreateUnit(
     270
 ))
 local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
-local cooldownStarterAbility = getItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
+local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
 ShowUnit(____exports.itemAbilityDummy, false)
 local function startItemCooldownInternal(handle, cooldown)
     local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
@@ -156,50 +153,4 @@ ____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
-        end
-    end
-    local result = action(...)
-    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/unit.d.ts

@@ -267,7 +267,7 @@ export declare class Unit extends Handle<junit> {
     dropItemTarget(item: Item, target: Widget): boolean;
     dropItemSlot(item: Item, slot: number): boolean;
     itemInSlot(slot: number): Item | null;
-    addAbility(abilityId: number): UnitAbility | undefined;
+    addAbility(abilityId: number): UnitAbility | null;
     makeAbilityPermanent(abilityId: number, permanent: true): boolean;
     setAbilityLevel(abilityId: number, level: number): number;
     getAbilityLevel(abilityId: number): number;

package/engine/internal/unit.lua

@@ -60,8 +60,6 @@ local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage
 local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
 local ____attributes = require("attributes")
 local isAttribute = ____attributes.isAttribute
-local ____ability = require("engine.internal.item.ability")
-local doUnitAbilityAction = ____ability.doUnitAbilityAction
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -667,41 +665,6 @@ end
 local nextSyncId = 1
 local unitBySyncId = setmetatable({}, {__mode = "v"})
 local damagingEventByTarget = setmetatable({}, {__mode = "k"})
-local function addAbility(unit, abilityTypeId)
-    local handle = unit.handle
-    if unitAddAbility(handle, abilityTypeId) then
-        local ability = UnitAbility:of(
-            checkNotNull(getUnitAbility(handle, abilityTypeId)),
-            abilityTypeId,
-            unit
-        )
-        local abilities = unit.abilities
-        abilities[#abilities + 1] = ability
-        return ability
-    end
-    return nil
-end
-local function getAbility(unit, abilityTypeId)
-    return UnitAbility:of(
-        getUnitAbility(unit.handle, abilityTypeId),
-        abilityTypeId,
-        unit
-    )
-end
-local function removeAbility(unit, abilityTypeId)
-    if unitRemoveAbility(unit.handle, abilityTypeId) then
-        local abilities = unit.abilities
-        for i = 1, #abilities do
-            if abilities[i].typeId == abilityTypeId then
-                abilities[i]:destroy()
-                tremove(abilities, i)
-                return true
-            end
-        end
-        return true
-    end
-    return false
-end
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
@@ -942,13 +905,17 @@ function Unit.prototype.itemInSlot(self, slot)
     return Item:of(unitItemInSlot(self.handle, slot))
 end
 function Unit.prototype.addAbility(self, abilityId)
-    return doUnitAbilityAction(
-        self.handle,
-        abilityId,
-        addAbility,
-        self,
-        abilityId
-    )
+    if unitAddAbility(self.handle, abilityId) then
+        local ability = UnitAbility:of(
+            checkNotNull(getUnitAbility(self.handle, abilityId)),
+            abilityId,
+            self
+        )
+        local abilities = self.abilities
+        abilities[#abilities + 1] = ability
+        return ability
+    end
+    return nil
 end
 function Unit.prototype.makeAbilityPermanent(self, abilityId, permanent)
     return UnitMakeAbilityPermanent(self.handle, permanent, abilityId)
@@ -963,22 +930,30 @@ function Unit.prototype.hasAbility(self, abilityId)
     return getUnitAbilityLevel(self.handle, abilityId) > 0
 end
 function Unit.prototype.getAbilityById(self, abilityId)
-    return doUnitAbilityAction(
-        self.handle,
+    local handle = self.handle
+    if unitAddAbility(handle, abilityId) then
+        assert(unitRemoveAbility(handle, abilityId))
+        return nil
+    end
+    return UnitAbility:of(
+        getUnitAbility(self.handle, abilityId),
         abilityId,
-        getAbility,
-        self,
-        abilityId
+        self
     )
 end
 function Unit.prototype.removeAbility(self, abilityId)
-    return doUnitAbilityAction(
-        self.handle,
-        abilityId,
-        removeAbility,
-        self,
-        abilityId
-    )
+    if unitRemoveAbility(self.handle, abilityId) then
+        local abilities = self.abilities
+        for i = 1, #abilities do
+            if abilities[i].typeId == abilityId then
+                abilities[i]:destroy()
+                tremove(abilities, i)
+                return true
+            end
+        end
+        return true
+    end
+    return false
 end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.26f0c5f",
+    "version": "0.0.1-dev.277cbcb",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",