warscript 0.0.1-dev.46a1ede → 0.0.1-dev.475a555

package/engine/buff.lua

@@ -102,12 +102,14 @@ local buffParametersKeys = {
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
     evasionProbability = true,
+    missProbability = true,
     damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
     maximumDuration = true,
     maximumRemainingDuration = true,
+    turnsIntoGhost = true,
     stuns = true,
     ignoresStunImmunity = true,
     providesStunImmunity = true,
@@ -173,6 +175,7 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
     end
 end
 local buffBooleanParameters = {
+    "turnsIntoGhost",
     "stuns",
     "ignoresStunImmunity",
     "disablesAutoAttack",
@@ -320,7 +323,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = selectBuffTypeIdWithLeastDuration(typeIdOrTypeIds, _unit)
         polarity = resistanceTypeOrPolarity
         resistanceType = abilityOrParametersOrResistanceType
-        if __TS__InstanceOf(parametersOrAbility, Ability) then
+        if __TS__InstanceOf(parametersOrAbility, Ability) or parametersOrAbility == nil then
             ability = parametersOrAbility
         else
             ability = nil
@@ -330,7 +333,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         typeId = typeIdOrTypeIds
         polarity = polarityOrTypeIdSelectionPolicy
         resistanceType = resistanceTypeOrPolarity
-        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) then
+        if __TS__InstanceOf(abilityOrParametersOrResistanceType, Ability) or abilityOrParametersOrResistanceType == nil then
             ability = abilityOrParametersOrResistanceType
             parameters = parametersOrAbility
         else
@@ -339,7 +342,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
     end
     self.typeId = typeId
-    if not __TS__InstanceOf(ability, Ability) then
+    if not (__TS__InstanceOf(ability, Ability) or ability == nil) then
         parameters = ability
         ability = nil
     end
@@ -367,14 +370,19 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     end
     self.polarity = resolveEnumValue(ability, level, polarity)
     self.resistanceType = resolveEnumValue(ability, level, resistanceType)
+    local missProbability = parameters and parameters.missProbability or defaultParameters.missProbability
+    if missProbability ~= nil then
+        missProbability = resolveNumberValue(ability, level, missProbability)
+        self[142] = missProbability
+    end
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
         buffByTypeId = {}
         buffByTypeIdByUnit[_unit] = buffByTypeId
     end
-    local ____opt_13 = buffByTypeId[typeId]
-    if ____opt_13 ~= nil then
-        ____opt_13:destroy()
+    local ____opt_15 = buffByTypeId[typeId]
+    if ____opt_15 ~= nil then
+        ____opt_15:destroy()
     end
     local uniqueGroup = parameters and parameters.uniqueGroup or defaultParameters and defaultParameters.uniqueGroup
     if uniqueGroup ~= nil then
@@ -388,13 +396,16 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         level,
         duration,
         spellStealPriority,
-        learnLevelMinimum
+        learnLevelMinimum,
+        missProbability
     ) then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
     local handle = BlzGetUnitAbility(_unit.handle, typeId)
     if handle == nil then
+        self[100] = 1
         UnitBehavior.prototype.destroy(self)
         error(unsuccessfulApplicationMarker, 0)
     end
@@ -410,13 +421,13 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self[106] = BlzGetAbilityStringLevelField(self.handle, ABILITY_SLF_SPECIAL, 0)
     if parameters ~= nil or (next(defaultParameters)) ~= nil then
         for ____, buffBooleanParameter in ipairs(buffBooleanParameters) do
-            local ____ability_22 = ability
-            local ____level_23 = level
-            local ____temp_21 = parameters and parameters[buffBooleanParameter]
-            if ____temp_21 == nil then
-                ____temp_21 = defaultParameters[buffBooleanParameter]
+            local ____ability_24 = ability
+            local ____level_25 = level
+            local ____temp_23 = parameters and parameters[buffBooleanParameter]
+            if ____temp_23 == nil then
+                ____temp_23 = defaultParameters[buffBooleanParameter]
             end
-            if resolveBooleanValue(____ability_22, ____level_23, ____temp_21) then
+            if resolveBooleanValue(____ability_24, ____level_25, ____temp_23) then
                 self[buffBooleanParameter] = true
             end
         end
@@ -497,8 +508,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     self[100] = 1
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
-    local ____opt_36 = self._bonusIdByBonusType
-    local bonusId = ____opt_36 and ____opt_36[bonusType]
+    local ____opt_38 = self._bonusIdByBonusType
+    local bonusId = ____opt_38 and ____opt_38[bonusType]
     return bonusId == nil and 0 or getUnitBonus(self._unit, bonusType, bonusId)
 end
 function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
@@ -514,45 +525,45 @@ function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrPa
         Effect:flash(self[105], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
         local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
-        local ____Effect_40 = Effect
-        local ____Effect_flash_41 = Effect.flash
-        local ____array_39 = __TS__SparseArrayNew(
+        local ____Effect_42 = Effect
+        local ____Effect_flash_43 = Effect.flash
+        local ____array_41 = __TS__SparseArrayNew(
             self[105],
             isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
             stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
         )
-        local ____isWidgetProvided_38
+        local ____isWidgetProvided_40
         if isWidgetProvided then
-            ____isWidgetProvided_38 = yOrParametersOrDuration
+            ____isWidgetProvided_40 = yOrParametersOrDuration
         else
-            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+            ____isWidgetProvided_40 = widgetOrXOrParametersOrDuration
         end
-        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-        ____Effect_flash_41(
-            ____Effect_40,
-            __TS__SparseArraySpread(____array_39)
+        __TS__SparseArrayPush(____array_41, ____isWidgetProvided_40)
+        ____Effect_flash_43(
+            ____Effect_42,
+            __TS__SparseArraySpread(____array_41)
         )
     end
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_44 = Effect
-    local ____Effect_flash_45 = Effect.flash
-    local ____array_43 = __TS__SparseArrayNew(
+    local ____Effect_46 = Effect
+    local ____Effect_flash_47 = Effect.flash
+    local ____array_45 = __TS__SparseArrayNew(
         self[106],
         isWidgetProvided and widgetOrDuration or self._unit,
         stringValueByBuffTypeIdByFieldId[fourCC("fspt")][self.typeId] or "origin"
     )
-    local ____isWidgetProvided_42
+    local ____isWidgetProvided_44
     if isWidgetProvided then
-        ____isWidgetProvided_42 = duration
+        ____isWidgetProvided_44 = duration
     else
-        ____isWidgetProvided_42 = widgetOrDuration
+        ____isWidgetProvided_44 = widgetOrDuration
     end
-    __TS__SparseArrayPush(____array_43, ____isWidgetProvided_42)
-    ____Effect_flash_45(
-        ____Effect_44,
-        __TS__SparseArraySpread(____array_43)
+    __TS__SparseArrayPush(____array_45, ____isWidgetProvided_44)
+    ____Effect_flash_47(
+        ____Effect_46,
+        __TS__SparseArraySpread(____array_45)
     )
 end
 function Buff.prototype.onCreate(self)
@@ -583,15 +594,21 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[137] then
+    if self[139] then
+        unit:decrementInvulnerabilityCounter()
+    end
+    if self[138] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[135] then
-        if self[136] then
+    if self[136] then
+        if self[137] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
     end
+    if self[135] then
+        unit:decrementGhostCounter()
+    end
     if self._abilityTypeIds ~= nil then
         for abilityTypeId in pairs(self._abilityTypeIds) do
             unit:removeAbility(abilityTypeId)
@@ -631,8 +648,8 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getByTypeId(self, unit, typeId)
-    local ____opt_46 = buffByTypeIdByUnit[unit]
-    local buff = ____opt_46 and ____opt_46[typeId]
+    local ____opt_48 = buffByTypeIdByUnit[unit]
+    local buff = ____opt_48 and ____opt_48[typeId]
     if __TS__InstanceOf(buff, self) then
         return buff
     end
@@ -646,9 +663,9 @@ function Buff.prototype.onExpiration(self)
     if self[121] ~= nil then
         (self[102] or unit):healTarget(unit, self[120] or 0)
     end
-    if self[140] then
+    if self[141] then
         unit:explode()
-    elseif self[139] then
+    elseif self[140] then
         unit:kill()
     end
 end
@@ -790,8 +807,8 @@ __TS__SetDescriptor(
                 return
             end
             self[112] = damageInterval
-            local ____opt_48 = self._timer
-            local elapsed = ____opt_48 and ____opt_48.elapsed or 0
+            local ____opt_50 = self._timer
+            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
             local timer = self[114]
             if timer == nil then
                 timer = Timer:create()
@@ -870,8 +887,8 @@ __TS__SetDescriptor(
                 return
             end
             self[117] = healingInterval
-            local ____opt_50 = self._timer
-            local elapsed = ____opt_50 and ____opt_50.elapsed or 0
+            local ____opt_52 = self._timer
+            local elapsed = ____opt_52 and ____opt_52.elapsed or 0
             local timer = self[119]
             if timer == nil then
                 timer = Timer:create()
@@ -952,30 +969,53 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "turnsIntoGhost",
+    {
+        get = function(self)
+            local ____self__135_54 = self[135]
+            if ____self__135_54 == nil then
+                ____self__135_54 = false
+            end
+            return ____self__135_54
+        end,
+        set = function(self, turnsIntoGhost)
+            if not turnsIntoGhost and self[135] then
+                self.object:decrementGhostCounter()
+                self[135] = nil
+            elseif turnsIntoGhost and not self[135] then
+                self.object:incrementGhostCounter()
+                self[135] = true
+            end
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "stuns",
     {
         get = function(self)
-            local ____self__135_52 = self[135]
-            if ____self__135_52 == nil then
-                ____self__135_52 = false
+            local ____self__136_55 = self[136]
+            if ____self__136_55 == nil then
+                ____self__136_55 = false
             end
-            return ____self__135_52
+            return ____self__136_55
         end,
         set = function(self, stuns)
-            if not stuns and self[135] then
-                if self[136] then
+            if not stuns and self[136] then
+                if self[137] then
                     self.object:decrementStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[135] = nil
-            elseif stuns and not self[135] then
-                if self[136] then
+                self[136] = nil
+            elseif stuns and not self[136] then
+                if self[137] then
                     self.object:incrementStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[135] = true
+                self[136] = true
             end
         end
     },
@@ -986,23 +1026,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__136_53 = self[136]
-            if ____self__136_53 == nil then
-                ____self__136_53 = false
+            local ____self__137_56 = self[137]
+            if ____self__137_56 == nil then
+                ____self__137_56 = false
             end
-            return ____self__136_53
+            return ____self__137_56
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[136] then
-                if self[135] then
+            if not ignoresStunImmunity and self[137] then
+                if self[136] then
                     self.object:decrementStunCounter()
                 end
-                self[136] = nil
-            elseif ignoresStunImmunity and not self[136] then
-                if self[135] then
+                self[137] = nil
+            elseif ignoresStunImmunity and not self[137] then
+                if self[136] then
                     self.object:incrementStunCounter()
                 end
-                self[136] = true
+                self[137] = true
             end
         end
     },
@@ -1013,19 +1053,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__137_54 = self[137]
-            if ____self__137_54 == nil then
-                ____self__137_54 = false
+            local ____self__138_57 = self[138]
+            if ____self__138_57 == nil then
+                ____self__138_57 = false
             end
-            return ____self__137_54
+            return ____self__138_57
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[137] then
+            if not disablesAutoAttack and self[138] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[137] = nil
-            elseif disablesAutoAttack and not self[137] then
+                self[138] = nil
+            elseif disablesAutoAttack and not self[138] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[137] = true
+                self[138] = true
             end
         end
     },
@@ -1036,19 +1076,19 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__138_55 = self[138]
-            if ____self__138_55 == nil then
-                ____self__138_55 = false
+            local ____self__139_58 = self[139]
+            if ____self__139_58 == nil then
+                ____self__139_58 = false
             end
-            return ____self__138_55
+            return ____self__139_58
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[138] then
+            if not providesInvulnerability and self[139] then
                 self.object:decrementInvulnerabilityCounter()
-                self[138] = nil
-            elseif providesInvulnerability and not self[138] then
+                self[139] = nil
+            elseif providesInvulnerability and not self[139] then
                 self.object:incrementInvulnerabilityCounter()
-                self[138] = true
+                self[139] = true
             end
         end
     },
@@ -1059,17 +1099,17 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__139_56 = self[139]
-            if ____self__139_56 == nil then
-                ____self__139_56 = false
+            local ____self__140_59 = self[140]
+            if ____self__140_59 == nil then
+                ____self__140_59 = false
             end
-            return ____self__139_56
+            return ____self__140_59
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[139] then
-                self[139] = nil
-            elseif killsOnExpiration and not self[139] then
-                self[139] = true
+            if not killsOnExpiration and self[140] then
+                self[140] = nil
+            elseif killsOnExpiration and not self[140] then
+                self[140] = true
             end
         end
     },
@@ -1080,17 +1120,17 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__140_57 = self[140]
-            if ____self__140_57 == nil then
-                ____self__140_57 = false
+            local ____self__141_60 = self[141]
+            if ____self__141_60 == nil then
+                ____self__141_60 = false
             end
-            return ____self__140_57
+            return ____self__141_60
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[140] then
-                self[140] = nil
-            elseif killsOnExpiration and not self[140] then
-                self[140] = true
+            if not killsOnExpiration and self[141] then
+                self[141] = nil
+            elseif killsOnExpiration and not self[141] then
+                self[141] = true
             end
         end
     },
@@ -1212,13 +1252,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_58 = self._timer
-            return ____opt_58 and ____opt_58.remaining or 0
+            local ____opt_61 = self._timer
+            return ____opt_61 and ____opt_61.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_62 = remainingDuration
-            local ____opt_60 = self._timer
-            local remainingDurationDelta = ____remainingDuration_62 - (____opt_60 and ____opt_60.remaining or 0)
+            local ____remainingDuration_65 = remainingDuration
+            local ____opt_63 = self._timer
+            local remainingDurationDelta = ____remainingDuration_65 - (____opt_63 and ____opt_63.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[103] = self[103] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1232,7 +1272,8 @@ __TS__SetDescriptor(
                         self._level,
                         remainingDuration,
                         self._spellStealPriority,
-                        self._learnLevelMinimum
+                        self._learnLevelMinimum,
+                        self[142]
                     ) then
                         local timer = self._timer
                         if timer == nil then

package/engine/internal/ability.d.ts

@@ -55,9 +55,13 @@ export declare class UnrecognizedAbility extends Ability {
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
+    private d?;
     constructor(handle: jability, typeId: number, owner: Unit);
     incrementHideCounter(): void;
     decrementHideCounter(): void;
+    incrementDisableCounter(): void;
+    decrementDisableCounter(): void;
+    get isDisabled(): boolean;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;

package/engine/internal/ability.lua

@@ -38,6 +38,7 @@ local getHandleId = GetHandleId
 local getItemBooleanField = BlzGetItemBooleanField
 local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
+local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -402,9 +403,25 @@ end
 function UnitAbility.prototype.decrementHideCounter(self)
     unitHideAbility(self.u, self.typeId, false)
 end
+function UnitAbility.prototype.incrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, true, false)
+    self.d = (self.d or 0) + 1
+end
+function UnitAbility.prototype.decrementDisableCounter(self)
+    unitDisableAbility(self.u, self.typeId, false, false)
+    self.d = (self.d or 0) - 1
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "isDisabled",
+    {get = function(self)
+        return self.d ~= nil and self.d > 0
+    end},
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "level",

package/engine/internal/item/ability.lua

@@ -55,22 +55,24 @@ local COOLDOWN_STARTER_ITEM_TYPE_ID = compiletime(function()
     itemType.activelyUsed = true
     return itemType.id
 end)
-local dummy = assert(CreateUnit(
+---
+-- @internal For use by internal systems only.
+____exports.itemAbilityDummy = assert(CreateUnit(
     Player.neutralVictim.handle,
     dummyUnitId,
     0,
     0,
     270
 ))
-local cooldownStarterItem = UnitAddItemById(dummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
+local cooldownStarterItem = UnitAddItemById(____exports.itemAbilityDummy, COOLDOWN_STARTER_ITEM_TYPE_ID)
 local cooldownStarterAbility = BlzGetItemAbility(cooldownStarterItem, COOLDOWN_STARTER_ABILITY_TYPE_ID)
-ShowUnit(dummy, false)
+ShowUnit(____exports.itemAbilityDummy, false)
 local function startItemCooldownInternal(handle, cooldown)
     local cooldownGroup = getItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP)
     setItemIntegerField(handle, ITEM_IF_COOLDOWN_GROUP, COOLDOWN_STARTER_ABILITY_TYPE_ID)
     setAbilityRealLevelField(cooldownStarterAbility, ABILITY_RLF_COOLDOWN, 0, cooldown)
-    unitResetCooldown(dummy)
-    unitUseItem(dummy, cooldownStarterItem)
+    unitResetCooldown(____exports.itemAbilityDummy)
+    unitUseItem(____exports.itemAbilityDummy, cooldownStarterItem)
     Timer:run(restoreCooldownGroup, handle, cooldownGroup)
 end
 restoreCooldownGroup = function(handle, cooldownGroup)
@@ -85,7 +87,7 @@ ____exports.startItemCooldown = function(handle, owner, cooldown)
 end
 ---
 -- @internal For use by internal systems only.
-____exports.abilityActionDummy = dummy
+____exports.abilityActionDummy = ____exports.itemAbilityDummy
 ---
 -- @internal For use by internal systems only.
 ____exports.doAbilityAction = function(handle, action, ...)
@@ -104,11 +106,11 @@ ____exports.doAbilityAction = function(handle, action, ...)
         end
         x = getItemX(handle)
         y = getItemY(handle)
-        unitAddItem(dummy, handle)
+        unitAddItem(____exports.itemAbilityDummy, handle)
     end
     local result = action(handle, ...)
     if not isOwned then
-        unitRemoveItem(dummy, handle)
+        unitRemoveItem(____exports.itemAbilityDummy, handle)
         setItemPosition(handle, x, y)
         if isPowerup then
             setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
@@ -139,9 +141,9 @@ ____exports.doAbilityActionForceDummy = function(handle, owner, action, ...)
         isPowerup = true
     end
     unitRemoveItem(owner, handle)
-    unitAddItem(dummy, handle)
+    unitAddItem(____exports.itemAbilityDummy, handle)
     local result = action(handle, ...)
-    unitRemoveItem(dummy, handle)
+    unitRemoveItem(____exports.itemAbilityDummy, handle)
     unitAddItemToSlot(owner, handle, slot)
     if isPowerup then
         setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)

package/engine/internal/item.d.ts

@@ -5,8 +5,8 @@ import { Event } from "../../event";
 import { ReadonlyRect } from "../../core/types/rect";
 import { ItemAbility } from "./ability";
 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;
-export declare const addAndGetAbility: (handle: jitem, abilityTypeId: AbilityTypeId) => jability | null;
 declare const enum ItemPropertyKey {
     ABILITIES = 100,
     LUA_INDEX_BY_ABILITY_TYPE_ID = 101
@@ -17,7 +17,7 @@ export declare class Item extends Handle<jitem> {
     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;
-    get typeId(): number;
+    get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
     set name(v: string);
@@ -73,6 +73,8 @@ export declare class Item extends Handle<jitem> {
     set position(v: Vec2);
     set charges(v: number);
     get charges(): number;
+    consumeCharge(): boolean;
+    consumeCharges(count: number): boolean;
     addAbility(abilityTypeId: AbilityTypeId): ItemAbility | undefined;
     removeAbility(abilityTypeId: AbilityTypeId): boolean;
     hasAbility(abilityTypeId: AbilityTypeId): boolean;
@@ -82,5 +84,6 @@ export declare class Item extends Handle<jitem> {
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
     static get destroyEvent(): Event<[Item]>;
+    static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};