warscript 0.0.1-dev.697548e → 0.0.1-dev.69b6655

package/engine/behaviour/ability/damage.lua

@@ -4,8 +4,6 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____ability = require("engine.behaviour.ability")
 local AbilityBehavior = ____ability.AbilityBehavior
-local ____unit = require("engine.internal.unit")
-local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
@@ -82,21 +80,20 @@ function DamageAreaAbilityBehavior.prototype.____constructor(self, ability, dama
 end
 function DamageAreaAbilityBehavior.prototype.damageArea(self, caster, x, y)
     local parameters = self.parameters
-    local targets = Unit.getAllowedTargetsInCollisionRange(
-        caster,
-        self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
+    caster:damageArea(
         x,
         y,
-        self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD)
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.areaOfEffect or AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD),
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.allowedTargetCombatClassifications or ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD),
+        self.precalculatedDamage or self:calculateDamage(caster),
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0),
+        nil,
+        nil,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.attackType),
+        parameters and parameters.damageType,
+        parameters and parameters.weaponType,
+        self:resolveCurrentAbilityDependentValue(parameters and parameters.metadata)
     )
-    local damage = self.precalculatedDamage or self:calculateDamage(caster)
-    local maximumDamage = self:resolveCurrentAbilityDependentValue(parameters and parameters.maximumDamage or 0)
-    if maximumDamage ~= 0 and damage > maximumDamage then
-        damage = maximumDamage / #targets
-    end
-    for ____, target in ipairs(targets) do
-        self:damageTarget(caster, target, damage)
-    end
 end
 ____exports.DamageSelfAreaAbilityBehavior = __TS__Class()
 local DamageSelfAreaAbilityBehavior = ____exports.DamageSelfAreaAbilityBehavior

package/engine/behaviour/ability/emulate-impact.lua

@@ -10,9 +10,6 @@ local Unit = ____unit.Unit
 local ____ability = require("engine.standard.fields.ability")
 local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
-local ____math = require("math")
-local max = ____math.max
-local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
 local ____sound = require("core.types.sound")
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
@@ -31,7 +28,11 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
         return false
     end
     caster.mana = caster.mana - manaCost
-    self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
+    if cooldown == 0 then
+        self.ability:interruptCast()
+    else
+        self.ability.cooldownRemaining = cooldown
+    end
     self:flashCasterEffect(caster)
     local soundPresetId = self.ability:getField(ABILITY_SF_EFFECT_SOUND)
     if soundPresetId ~= "" then

package/engine/behaviour/ability.d.ts

@@ -26,6 +26,7 @@ export declare abstract class AbilityBehavior<Parameters extends {
     get unit(): Unit | undefined;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value?: AbilityDependentValue<T>): T | undefined;
+    protected getDuration(widget: Widget): number;
     flashCasterEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     flashTargetEffect(widget: Widget, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;

package/engine/behaviour/ability.lua

@@ -9,6 +9,7 @@ local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+local UnitClassification = ____unit.UnitClassification
 require("engine.internal.unit.ability")
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
@@ -18,6 +19,8 @@ local ____ability = require("engine.standard.fields.ability")
 local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = ____ability.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD
 local CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD
+local DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD = ____ability.DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD
 local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
 local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
@@ -113,6 +116,14 @@ end
 function AbilityBehavior.prototype.resolveCurrentAbilityDependentValue(self, value)
     return resolveCurrentAbilityDependentValue(self.ability, value)
 end
+function AbilityBehavior.prototype.getDuration(self, widget)
+    if __TS__InstanceOf(widget, Unit) then
+        if widget.isHero or widget:getField(UNIT_IF_LEVEL) >= 6 or widget:hasClassification(UnitClassification.RESISTANT) then
+            return self:resolveCurrentAbilityDependentValue(DURATION_HERO_ABILITY_FLOAT_LEVEL_FIELD)
+        end
+    end
+    return self:resolveCurrentAbilityDependentValue(DURATION_NORMAL_ABILITY_FLOAT_LEVEL_FIELD)
+end
 function AbilityBehavior.prototype.flashCasterEffect(self, widget, ...)
     local attachmentPoint = CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD:getValue(self.ability)
     Effect:flash(

package/engine/behaviour/unit.d.ts

@@ -2,6 +2,7 @@
 import { Behavior, BehaviorPriority } from "../behavior";
 import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
+import "../internal/unit/equipment";
 import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 import { Item } from "../internal/item";

package/engine/behaviour/unit.lua

@@ -8,6 +8,7 @@ local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.equipment")
 require("engine.internal.unit+ability")
 require("engine.internal.unit-missile-launch")
 local ____linked_2Dset = require("utility.linked-set")

package/engine/buff.d.ts

@@ -23,6 +23,13 @@ export type BuffPolarityParameterType = EnumParameterValueType<BuffPolarity>;
 export type BuffResistanceTypeParameterType = EnumParameterValueType<BuffResistanceType>;
 export declare class BuffUniqueGroup {
 }
+export type BuffAbilityParameters = {
+    readonly fields?: [AbilityNumberField | AbilityNumberLevelField, NumberParameterValueType][];
+    /** Default `true`. */
+    readonly isButtonVisible?: boolean;
+    /** Default is the level of the source ability or 0 if it is absent. */
+    readonly level?: number;
+};
 export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     spellStealPriority?: number;
     level?: number;
@@ -30,16 +37,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     learnLevelMinimum?: number;
     source?: Unit;
     behaviorConstructors?: (new (unit: Unit) => UnitBehavior)[];
-    abilityTypeIds?: Record<AbilityTypeId, {
-        readonly fields?: [
-            AbilityNumberField | AbilityNumberLevelField,
-            NumberParameterValueType
-        ][];
-        /** Default `true`. */
-        readonly isButtonVisible?: boolean;
-        /** Default is the level of the source ability or 0 if it is absent. */
-        readonly level?: number;
-    }>;
+    abilityTypeIds?: Partial<Record<AbilityTypeId, BuffAbilityParameters>>;
     damageUponDeathAllowedTargetCombatClassifications?: CombatClassifications | AbilityCombatClassificationsLevelField;
     damageUponDeath?: NumberParameterValueType;
     damageUponDeathRange?: NumberParameterValueType;
@@ -219,6 +217,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
         [K in keyof Omit<AdditionalParameters, keyof BuffParameters>]: AdditionalParameters[K] extends AbilityDependentValue<infer T> ? T : AdditionalParameters[K];
     };
     private readonly handle;
+    readonly previousBuff?: Buff;
     private _timer?;
     private readonly _level?;
     private readonly _spellStealPriority?;
@@ -313,10 +312,14 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     ]): void;
     private flash;
     expire(): void;
+    /** Dispels this buff, invoking onDispel before removing it. */
+    dispel(source?: Unit): void;
     protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;
     static getByTypeId<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, unit: Unit, typeId: ApplicableBuffTypeId): T | undefined;
+    /** Called for dispelling, never for a direct destroy() or replacement. */
+    onDispel(source: Unit | undefined): void;
     onExpiration(): void;
     onDeath(source: Unit | undefined): void;
     onDamageDealt(target: Unit, event: DamageEvent): void;

package/engine/buff.lua

@@ -254,6 +254,10 @@ local function destroyBuff(buff)
     buff:destroy()
 end
 local function expireBuff(buff)
+    if buff.isDestroyed or buff[100] ~= 1 then
+        return
+    end
+    buff[100] = 2
     local remainingDamageOverDuration = buff[113] or 0
     local remainingHealingOverDuration = buff[113] or 0
     if remainingDamageOverDuration ~= 0 or remainingHealingOverDuration ~= 0 then
@@ -404,7 +408,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         buffByTypeId = {}
         buffByTypeIdByUnit[_unit] = buffByTypeId
     end
-    local ____opt_15 = buffByTypeId[typeId]
+    self.previousBuff = buffByTypeId[typeId]
+    local ____opt_15 = self.previousBuff
     if ____opt_15 ~= nil then
         ____opt_15:destroy()
     end
@@ -481,7 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
                 self._abilityTypeIds = abilityTypeIds
             end
             for ____, abilityTypeId in ipairs(sortedKeysUnnested(parametersAbilityTypeIds)) do
-                local abilityParameters = parametersAbilityTypeIds[abilityTypeId]
+                local abilityParameters = checkNotNull(parametersAbilityTypeIds[abilityTypeId])
                 local addedAbility = _unit:addAbility(abilityTypeId)
                 if addedAbility ~= nil then
                     _unit:makeAbilityPermanent(abilityTypeId, true)
@@ -590,6 +595,20 @@ end
 function Buff.prototype.expire(self)
     expireBuff(self)
 end
+function Buff.prototype.dispel(self, source)
+    if self.isDestroyed or self[100] ~= 1 then
+        return
+    end
+    self[100] = 2
+    do
+        pcall(function()
+            self:onDispel(source)
+        end)
+        do
+            self:destroy()
+        end
+    end
+end
 function Buff.prototype.onCreate(self)
 end
 function Buff.prototype.onDestroy(self)
@@ -680,6 +699,8 @@ function Buff.getByTypeId(self, unit, typeId)
     end
     return nil
 end
+function Buff.prototype.onDispel(self, source)
+end
 function Buff.prototype.onExpiration(self)
     local unit = self.unit
     if self[120] ~= nil then
@@ -1472,35 +1493,40 @@ __TS__SetDescriptor(
 Buff.createdEvent = buffCreatedEvent
 Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
 (function(self)
-    local function destroyBuffIfNeeded(buff)
-        if getUnitAbility(buff[101].handle, buff.typeId) ~= buff.handle and buff[100] == 1 then
-            buff:destroy()
+    local function destroyBuffIfNeeded(buff, isDispel, source)
+        local currentHandle = getUnitAbility(buff[101].handle, buff.typeId)
+        if currentHandle ~= buff.handle and buff[100] == 1 then
+            if isDispel and currentHandle == nil and buff.unit.isAlive and buff.resistanceType == 1 and (buff._timer == nil or buff.remainingDuration > 0) then
+                buff:dispel(source)
+            else
+                buff:destroy()
+            end
         end
     end
-    ____exports.checkBuff = function(unit, buffTypeId)
+    ____exports.checkBuff = function(unit, buffTypeId, isDispel, source)
         local buffByTypeId = buffByTypeIdByUnit[unit]
         if buffByTypeId ~= nil then
             local buff = buffByTypeId[buffTypeId]
             if buff ~= nil then
-                destroyBuffIfNeeded(buff)
+                destroyBuffIfNeeded(buff, isDispel, source)
             end
         end
     end
-    ____exports.checkBuffs = function(unit)
-        ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
+    ____exports.checkBuffs = function(unit, isDispel, source)
+        ____exports.Buff:forAll(unit, destroyBuffIfNeeded, isDispel, source)
     end
     Unit.abilityChannelingStartEvent:addListener(
         0,
         function(caster)
-            ____exports.checkBuffs(caster)
-            Timer:run(____exports.checkBuffs, caster)
+            ____exports.checkBuffs(caster, true, caster)
+            Timer:run(____exports.checkBuffs, caster, true, caster)
         end
     )
     Unit.abilityUnitTargetChannelingStartEvent:addListener(
         0,
         function(caster, ability, target)
-            ____exports.checkBuffs(target)
-            Timer:run(____exports.checkBuffs, target)
+            ____exports.checkBuffs(target, true, caster)
+            Timer:run(____exports.checkBuffs, target, true, caster)
         end
     )
     Unit.abilityPointTargetChannelingStartEvent:addListener(
@@ -1511,17 +1537,40 @@ Buff.beingDestroyedEvent = buffBeingDestroyedEvent;
                 y,
                 ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
             )
-            forEach(units, ____exports.checkBuffs)
-            Timer:run(forEach, units, ____exports.checkBuffs)
+            forEach(units, ____exports.checkBuffs, true, caster)
+            Timer:run(
+                forEach,
+                units,
+                ____exports.checkBuffs,
+                true,
+                caster
+            )
+        end
+    )
+    Unit.abilityNoTargetChannelingStartEvent:addListener(
+        0,
+        function(caster, ability)
+            local radius = ability:getField(ABILITY_RLF_AREA_OF_EFFECT)
+            if radius > 0 then
+                local units = Unit:getInCollisionRange(caster.x, caster.y, radius)
+                forEach(units, ____exports.checkBuffs, true, caster)
+                Timer:run(
+                    forEach,
+                    units,
+                    ____exports.checkBuffs,
+                    true,
+                    caster
+                )
+            end
         end
     )
     Unit.onDamage:addListener(
         0,
         function(source, target)
             if source ~= nil then
-                ____exports.checkBuffs(source)
+                Timer:run(____exports.checkBuffs, source, false)
             end
-            ____exports.checkBuffs(target)
+            Timer:run(____exports.checkBuffs, target, false)
         end
     )
     buffCreatedEvent:addListener(function(buff)

package/engine/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 export declare const enum GraphicsMode {
     SD = 0,
-    HD = 1
+    HD = 1,
+    DE = 2
 }

package/engine/internal/ability.d.ts

@@ -64,8 +64,12 @@ export declare class UnitAbility extends Ability {
     get isDisabled(): boolean;
     get level(): number;
     set level(v: number);
+    /** Uses the native percentage scale. */
+    get cooldownRemainingPercent(): number;
+    set cooldownRemainingPercent(percent: number);
     get cooldownRemaining(): number;
     set cooldownRemaining(cooldownRemaining: number);
+    startCooldown(cooldown: number): void;
     interruptCast(): void;
     protected onDestroy(): HandleDestructor;
     static get onCreate(): Event<[UnitAbility]>;

package/engine/internal/ability.lua

@@ -14,31 +14,33 @@ local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
 local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
 local startItemCooldown = ____ability.startItemCooldown
-local getUnitAbilityLevel = GetUnitAbilityLevel
-local setUnitAbilityLevel = SetUnitAbilityLevel
-local setAbilityIntegerField = BlzSetAbilityIntegerField
-local setAbilityRealField = BlzSetAbilityRealField
-local setAbilityBooleanField = BlzSetAbilityBooleanField
-local setAbilityStringField = BlzSetAbilityStringField
-local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
-local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
-local setAbilityStringLevelField = BlzSetAbilityStringLevelField
-local getAbilityIntegerField = BlzGetAbilityIntegerField
-local getAbilityRealField = BlzGetAbilityRealField
 local getAbilityBooleanField = BlzGetAbilityBooleanField
-local getAbilityStringField = BlzGetAbilityStringField
+local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
+local getAbilityIntegerField = BlzGetAbilityIntegerField
 local getAbilityIntegerLevelField = BlzGetAbilityIntegerLevelField
+local getAbilityRealField = BlzGetAbilityRealField
 local getAbilityRealLevelField = BlzGetAbilityRealLevelField
-local getAbilityBooleanLevelField = BlzGetAbilityBooleanLevelField
+local getAbilityStringField = BlzGetAbilityStringField
 local getAbilityStringLevelField = BlzGetAbilityStringLevelField
+local getHandleId = GetHandleId
+local getUnitAbilityCooldownPercent = BlzGetUnitAbilityCooldownPercent
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
+local getUnitAbilityLevel = GetUnitAbilityLevel
+local order2orderId = _G.OrderId
+local setAbilityBooleanField = BlzSetAbilityBooleanField
+local setAbilityBooleanLevelField = BlzSetAbilityBooleanLevelField
+local setAbilityIntegerField = BlzSetAbilityIntegerField
+local setAbilityIntegerLevelField = BlzSetAbilityIntegerLevelField
+local setAbilityRealField = BlzSetAbilityRealField
+local setAbilityRealLevelField = BlzSetAbilityRealLevelField
+local setAbilityStringField = BlzSetAbilityStringField
+local setAbilityStringLevelField = BlzSetAbilityStringLevelField
+local setUnitAbilityCooldownPercent = BlzSetUnitAbilityCooldownPercent
+local setUnitAbilityCooldownRemaining = BlzSetUnitAbilityCooldownRemaining
+local setUnitAbilityLevel = SetUnitAbilityLevel
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
-local getHandleId = GetHandleId
-local getItemBooleanField = BlzGetItemBooleanField
-local setItemBooleanField = BlzSetItemBooleanField
-local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
+local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -215,7 +217,6 @@ local levelRefreshFields = {
     [fourCC("Neg1")] = true
 }
 local levelsField = ABILITY_IF_LEVELS
-local order2orderId = _G.OrderId
 local orderIdFieldByParentTypeId = {
     [fourCC("ANcl")] = ABILITY_SLF_BASE_ORDER_ID_NCL6,
     [fourCC("Aspb")] = ABILITY_SLF_BASE_ORDER_ID_SPB5,
@@ -422,6 +423,9 @@ function UnitAbility.prototype.decrementDisableCounter(self)
     unitHideAbility(unit, typeId, true)
     self.d = (self.d or 0) - 1
 end
+function UnitAbility.prototype.startCooldown(self, cooldown)
+    startUnitAbilityCooldown(self.u, self.typeId, cooldown)
+end
 function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
@@ -452,6 +456,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitAbility.prototype,
+    "cooldownRemainingPercent",
+    {
+        get = function(self)
+            return getUnitAbilityCooldownPercent(self.u, self.typeId)
+        end,
+        set = function(self, percent)
+            setUnitAbilityCooldownPercent(self.u, self.typeId, percent)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitAbility.prototype,
     "cooldownRemaining",
@@ -460,7 +477,7 @@ __TS__SetDescriptor(
             return getUnitAbilityCooldownRemaining(self.u, self.typeId)
         end,
         set = function(self, cooldownRemaining)
-            startUnitAbilityCooldown(self.u, self.typeId, cooldownRemaining)
+            setUnitAbilityCooldownRemaining(self.u, self.typeId, cooldownRemaining)
         end
     },
     true
@@ -516,11 +533,13 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
     )
 end
 function ItemAbility.prototype.interruptCast(self)
-    local handle = self.owner.handle
-    local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
-    if activelyUsed then
-        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
-        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
+    local item = self.owner
+    local itemHandle = item.handle
+    local ____opt_1 = item.owner
+    local itemOwnerHandle = ____opt_1 and ____opt_1.handle
+    local cooldownRemaining = doAbilityActionForceDummy(itemHandle, itemOwnerHandle, getAbilityCooldown, self.typeId)
+    if cooldownRemaining == 0 then
+        startItemCooldown(itemHandle, itemOwnerHandle, 0.015625)
     end
 end
 function ItemAbility.prototype.onDestroy(self)
@@ -543,17 +562,17 @@ __TS__SetDescriptor(
     {
         get = function(self)
             local item = self.owner
-            local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
-            local ____item_handle_3 = item.handle
-            local ____opt_1 = item.owner
-            return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
+            local ____doAbilityActionForceDummy_6 = doAbilityActionForceDummy
+            local ____item_handle_5 = item.handle
+            local ____opt_3 = item.owner
+            return ____doAbilityActionForceDummy_6(____item_handle_5, ____opt_3 and ____opt_3.handle, getAbilityCooldown, self.typeId)
         end,
         set = function(self, cooldownRemaining)
             local item = self.owner
-            local ____startItemCooldown_8 = startItemCooldown
-            local ____item_handle_7 = item.handle
-            local ____opt_5 = item.owner
-            ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
+            local ____startItemCooldown_10 = startItemCooldown
+            local ____item_handle_9 = item.handle
+            local ____opt_7 = item.owner
+            ____startItemCooldown_10(____item_handle_9, ____opt_7 and ____opt_7.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/item/fields.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+declare module "../item" {
+    interface Item {
+        canBeSold: boolean;
+    }
+}
+declare module "../item" {
+    interface Item {
+        isActivelyUsed: boolean;
+    }
+}
+export {};

package/engine/internal/item/fields.lua

@@ -0,0 +1,33 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____item = require("engine.standard.fields.item")
+local CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD = ____item.CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD
+local IS_ACTIVELY_USED_ITEM_FIELD = ____item.IS_ACTIVELY_USED_ITEM_FIELD
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "canBeSold",
+    {
+        get = function(self)
+            return CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "isActivelyUsed",
+    {
+        get = function(self)
+            return IS_ACTIVELY_USED_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            IS_ACTIVELY_USED_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/item+owner.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { Unit } from "./unit";
+import "./unit/equipment";
 declare module "./item" {
     interface Item {
         readonly owner?: Unit;

package/engine/internal/item+owner.lua

@@ -5,6 +5,7 @@ local ____item = require("engine.internal.item")
 local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit.equipment")
 local ownerByItem = setmetatable({}, {__mode = "kv"})
 Unit.itemPickedUpEvent:addListener(
     4,
@@ -12,6 +13,12 @@ Unit.itemPickedUpEvent:addListener(
         ownerByItem[item] = unit
     end
 )
+Unit.itemEquippedEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = unit
+    end
+)
 Unit.itemDroppedEvent:addListener(
     4,
     function(unit, item)

package/engine/internal/item.d.ts

@@ -2,19 +2,33 @@
 import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Color } from "../../core/types/color";
 import { Event } from "../../event";
+import { PlayerColor } from "../../core/types/playerColor";
+import { EquipmentType } from "../object-data/auxiliary/equipment-type";
+import { ItemTag } from "../object-data/auxiliary/item-tag";
 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;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100
+    ABILITIES = 100,
+    DEATH_TRIGGER = 101,
+    COLOR = 102
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
+    private readonly [ItemPropertyKey.DEATH_TRIGGER];
+    private [ItemPropertyKey.COLOR]?;
     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 isEquipped(): boolean;
+    get isInBag(): boolean;
+    get equipmentType(): EquipmentType;
+    get tag(): ItemTag;
+    get color(): PlayerColor;
+    set color(color: PlayerColor);
+    static getRandomTypeId(level: number, equipmentType?: EquipmentType, tag?: ItemTag, itemType?: jitemtype): ItemTypeId | undefined;
     get typeId(): ItemTypeId;
     set skinId(v: number);
     get skinId(): number;
@@ -32,8 +46,6 @@ export declare class Item extends Handle<jitem> {
     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);
@@ -42,8 +54,6 @@ export declare class Item extends Handle<jitem> {
     get isDead(): boolean;
     set isInvulnerable(isInvulnerable: boolean);
     get isInvulnerable(): boolean;
-    set isActivelyUsed(isActivelyUsed: boolean);
-    get isActivelyUsed(): boolean;
     set visible(v: boolean);
     get visible(): boolean;
     set level(v: number);
@@ -82,6 +92,7 @@ export declare class Item extends Handle<jitem> {
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
     static get destroyEvent(): Event<[Item]>;
+    static readonly deathEvent: Event<[Item]>;
     static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};