warscript 0.0.1-dev.d63794c → 0.0.1-dev.d842bb6

package/engine/lightning.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { LightningTypeId } from "./object-data/entry/lightning-type";
-import { Handle, HandleDestructor } from "../core/types/handle";
 import { Unit } from "../core/types/unit";
+import { AbstractDestroyable, Destructor } from "../destroyable";
 declare const enum LightningPropertyKey {
     CHECK_VISIBILITY = 100,
     SOURCE_UNIT = 101,
@@ -12,10 +12,12 @@ declare const enum LightningPropertyKey {
     TARGET_X = 106,
     TARGET_Y = 107,
     TARGET_Z = 108,
-    DURATION = 109
+    DURATION = 109,
+    FADING = 110
 }
 export type LightningConstructor<T extends Lightning> = typeof Lightning & (new (handle: jlightning, typeId: LightningTypeId) => T);
-export declare class Lightning extends Handle<jlightning> {
+export declare class Lightning extends AbstractDestroyable {
+    readonly handle: jlightning;
     readonly typeId: LightningTypeId;
     private [LightningPropertyKey.CHECK_VISIBILITY]?;
     private [LightningPropertyKey.SOURCE_UNIT]?;
@@ -27,8 +29,9 @@ export declare class Lightning extends Handle<jlightning> {
     private [LightningPropertyKey.TARGET_Y]?;
     private [LightningPropertyKey.TARGET_Z]?;
     private [LightningPropertyKey.DURATION]?;
+    private [LightningPropertyKey.FADING]?;
     constructor(handle: jlightning, typeId: LightningTypeId);
-    protected onDestroy(): HandleDestructor;
+    protected onDestroy(): Destructor;
     static create<T extends Lightning>(this: LightningConstructor<T>, typeId: LightningTypeId, ...parameters: [
         ...checkVisibility: [boolean] | [],
         ...sourceAndTarget: [sourceX: number, sourceY: number, targetX: number, targetY: number] | [
@@ -46,6 +49,10 @@ export declare class Lightning extends Handle<jlightning> {
             target: Unit
         ]
     ]): T;
-    static flash(...parameters: [...parameters: Parameters<(typeof Lightning)["create"]>, duration: number]): void;
+    static flash(...parameters: [
+        ...parameters: Parameters<(typeof Lightning)["create"]>,
+        duration: number,
+        fading?: boolean
+    ]): void;
 }
 export {};

package/engine/lightning.lua

@@ -1,15 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____handle = require("core.types.handle")
-local Handle = ____handle.Handle
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____functions = require("utility.functions")
 local forwardByN = ____functions.forwardByN
 local ____unit_2Dmissile_2Ddata = require("engine.internal.unit-missile-data")
 local MISSILE_DATA_BY_UNIT_TYPE_ID = ____unit_2Dmissile_2Ddata.MISSILE_DATA_BY_UNIT_TYPE_ID
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____type = _G.type
 local select = _G.select
 local cos = math.cos
@@ -27,6 +28,11 @@ local getUnitZ = BlzGetUnitZ
 local getUnitFlyHeight = GetUnitFlyHeight
 local getLocationZ = GetLocationZ
 local moveLocation = MoveLocation
+local getLightningColorA = GetLightningColorA
+local getLightningColorR = GetLightningColorR
+local getLightningColorG = GetLightningColorG
+local getLightningColorB = GetLightningColorB
+local setLightningColor = SetLightningColor
 local location = Location(0, 0)
 local unitToUnitLightnings = setmetatable({}, {__mode = "k"})
 local unitToPointLightnings = setmetatable({}, {__mode = "k"})
@@ -36,9 +42,10 @@ local temporaryLightningsCount = 0
 ____exports.Lightning = __TS__Class()
 local Lightning = ____exports.Lightning
 Lightning.name = "Lightning"
-__TS__ClassExtends(Lightning, Handle)
+__TS__ClassExtends(Lightning, AbstractDestroyable)
 function Lightning.prototype.____constructor(self, handle, typeId)
-    Handle.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self.handle = handle
     self.typeId = typeId
 end
 function Lightning.prototype.onDestroy(self)
@@ -46,7 +53,7 @@ function Lightning.prototype.onDestroy(self)
     unitToPointLightnings[self] = nil
     pointToUnitLightnings[self] = nil
     destroyLightning(self.handle)
-    return Handle.prototype.onDestroy(self)
+    return AbstractDestroyable.prototype.onDestroy(self)
 end
 function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY, targetXOrTargetUnitOrTargetYOrTargetZ, targetY, targetZ)
     if type(checkVisibility) ~= "boolean" then
@@ -62,7 +69,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         )
     end
     if targetZ ~= nil then
-        return self:of(
+        return __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -79,7 +87,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     if targetXOrTargetUnitOrTargetYOrTargetZ ~= nil then
         if ____type(targetXOrTargetUnitOrTargetYOrTargetZ) == "number" then
             if ____type(sourceXOrSourceUnit) == "number" then
-                return self:of(
+                return __TS__New(
+                    self,
                     addLightning(
                         util.id2s(typeId),
                         checkVisibility,
@@ -92,7 +101,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
                 )
             end
             local unit = sourceXOrSourceUnit.handle
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -117,7 +127,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             return lightning
         end
         local unit = targetXOrTargetUnitOrTargetYOrTargetZ.handle
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -146,7 +157,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             local unit = sourceXOrSourceUnit.handle
             moveLocation(location, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY)
             local z = getLocationZ(location)
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -173,7 +185,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         local unit = sourceZOrTargetXOrTargetUnitOrTargetY.handle
         moveLocation(location, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit)
         local z = getLocationZ(location)
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -199,7 +212,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     end
     local sourceUnit = sourceXOrSourceUnit.handle
     local targetUnit = sourceYOrTargetXOrTargetUnit.handle
-    local lightning = self:of(
+    local lightning = __TS__New(
+        self,
         addLightningEx(
             util.id2s(typeId),
             checkVisibility,
@@ -225,9 +239,19 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     return lightning
 end
 function Lightning.flash(self, ...)
-    local parametersToForwardCount = select("#", ...) - 1
+    local parameterOrDuration, durationOrFading = select(-2, ...)
+    local hasFading = ____type(durationOrFading) ~= "number"
+    local parametersToForwardCount = select("#", ...) - (hasFading and 2 or 1)
     local lightning = forwardByN[parametersToForwardCount](____exports.Lightning.create, self, ...)
-    local duration = select(-1, ...)
+    local duration
+    if hasFading then
+        duration = parameterOrDuration
+        if durationOrFading then
+            lightning[110] = true
+        end
+    else
+        duration = durationOrFading
+    end
     lightning[109] = duration
     temporaryLightningsCount = temporaryLightningsCount + 1
     temporaryLightnings[temporaryLightningsCount] = lightning
@@ -295,6 +319,16 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
             temporaryLightnings[temporaryLightningsCount] = nil
             temporaryLightningsCount = temporaryLightningsCount - 1
         else
+            if lightning[110] then
+                local handle = lightning.handle
+                setLightningColor(
+                    handle,
+                    getLightningColorR(handle),
+                    getLightningColorG(handle),
+                    getLightningColorB(handle),
+                    getLightningColorA(handle) * (1 - UPDATE_PERIOD / duration)
+                )
+            end
             lightning[109] = duration - UPDATE_PERIOD
             i = i + 1
         end

package/engine/object-data/auxiliary/animation-name.d.ts

@@ -12,3 +12,4 @@ export declare const enum AnimationName {
     STAND = "stand",
     WALK = "walk"
 }
+export declare const isAnimationName: (value: string) => value is AnimationName;

package/engine/object-data/auxiliary/animation-name.lua

@@ -1,2 +1,18 @@
 local ____exports = {}
+local animationNames = {
+    attack = true,
+    birth = true,
+    death = true,
+    decay = true,
+    dissipate = true,
+    morph = true,
+    portrait = true,
+    sleep = true,
+    spell = true,
+    stand = true,
+    walk = true
+}
+____exports.isAnimationName = function(value)
+    return animationNames[value] ~= nil
+end
 return ____exports

package/engine/object-data/entry/ability-type/blank-configurable.lua

@@ -6,6 +6,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____channel = require("engine.object-data.entry.ability-type.channel")
 local ChannelAbilityType = ____channel.ChannelAbilityType
+local ____animation_2Dname = require("engine.object-data.auxiliary.animation-name")
+local isAnimationName = ____animation_2Dname.isAnimationName
 local ____order_2Dtype_2Dstring_2Did_2Dfactory = require("engine.object-data.utility.order-type-string-id-factory")
 local orderTypeStringIdFactory = ____order_2Dtype_2Dstring_2Did_2Dfactory.orderTypeStringIdFactory
 local ____timer = require("core.types.timer")
@@ -21,6 +23,9 @@ local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.A
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
 local ____linked_2Dset = require("utility.linked-set")
 local LinkedSet = ____linked_2Dset.LinkedSet
+local ____sound = require("core.types.sound")
+local Sound3D = ____sound.Sound3D
+local SoundPreset = ____sound.SoundPreset
 local isChannelingAbilityTypeIds = {}
 local usesAttackAnimationByAbilityTypeId = {}
 ____exports.BlankConfigurableAbilityType = __TS__Class()
@@ -211,11 +216,26 @@ for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     for abilityTypeId, usesAttackAnimation in pairs(usesAttackAnimationByAbilityTypeId) do
         if usesAttackAnimation then
             local abilityType = checkNotNull(____exports.BlankConfigurableAbilityType:of(abilityTypeId))
-            abilityType.channelingAnimation = {"attack"}
+            if isAnimationName(abilityType.channelingAnimation[1]) then
+                if abilityType.channelingAnimation[1] ~= "attack" then
+                    abilityType.channelingAnimation = {"attack"}
+                end
+            else
+                abilityType.channelingAnimation = {
+                    "attack",
+                    table.unpack(abilityType.channelingAnimation)
+                }
+            end
         end
     end
     return usesAttackAnimationByAbilityTypeId
 end)) do
+    Unit.abilityCastingFinishEvent[abilityTypeId]:addListener(function(caster, ability)
+        local effectSound = ability:getField(ABILITY_SF_EFFECT_SOUND)
+        if effectSound ~= "" then
+            Sound3D:playFromLabel(effectSound, SoundPreset.Ability, caster)
+        end
+    end)
     if usesAttackAnimation then
         Unit.abilityCastingStartEvent[abilityTypeId]:addListener(
             4,

package/engine/object-data/entry/ability-type/curse.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "missProbability",
     {
         get = function(self)
-            return self:getNumberLevelField("Crs")
+            return self:getNumberLevelField("Crs1")
         end,
         set = function(self, missProbability)
-            self:setNumberLevelField("Crs", missProbability)
+            self:setNumberLevelField("Crs1", missProbability)
         end
     },
     true

package/engine/object-data/entry/ability-type.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
@@ -31,7 +30,7 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
-local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local castAnimationFQNByAbilityTypeId = {}
@@ -53,10 +52,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -999,7 +995,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1006,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1038,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1049,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

package/engine/object-data/entry/buff-type/applicable.lua

@@ -10,8 +10,8 @@ local ____exports = {}
 local preparePhysicalPositiveApplicatorAbility
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
-local ____cripple = require("engine.object-data.entry.ability-type.cripple")
-local CrippleAbilityType = ____cripple.CrippleAbilityType
+local ____curse = require("engine.object-data.entry.ability-type.curse")
+local CurseAbilityType = ____curse.CurseAbilityType
 local ____searing_2Darrows = require("engine.object-data.entry.ability-type.searing-arrows")
 local SearingArrowsAbilityType = ____searing_2Darrows.SearingArrowsAbilityType
 local ____slow_2Dpoison = require("engine.object-data.entry.ability-type.slow-poison")
@@ -30,7 +30,6 @@ local ____arrays = require("utility.arrays")
 local chunked = ____arrays.chunked
 local map = ____arrays.map
 local max = ____arrays.max
-local toLuaSet = ____arrays.toLuaSet
 local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lust")
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
@@ -43,22 +42,11 @@ local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-typ
 local PermanentImmolationAbilityType = ____permanent_2Dimmolation.PermanentImmolationAbilityType
 local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
 local castAbility = ____cast_2Dability.castAbility
-local createItem = CreateItem
-local getAbilityId = BlzGetAbilityId
-local getItemAbility = BlzGetItemAbility
-local getOwningPlayer = GetOwningPlayer
-local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
-local itemAddAbility = BlzItemAddAbility
-local removeItem = RemoveItem
 local setAbilityIntegerField = BlzSetAbilityIntegerField
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setItemBooleanField = BlzSetItemBooleanField
 local setPlayerTechResearched = SetPlayerTechResearched
 local unitAddAbility = UnitAddAbility
-local unitAddItem = UnitAddItem
 local unitDisableAbility = BlzUnitDisableAbility
-local unitDropItemSlot = UnitDropItemSlot
-local unitInventorySize = UnitInventorySize
 local unitRemoveAbility = UnitRemoveAbility
 local compiletimeApplicableBuffTypes = {}
 ____exports.ApplicableBuffType = __TS__Class()
@@ -113,10 +101,8 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         local applicatorAbilityTypeIdByApplicatorType = {}
         if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
             if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CrippleAbilityType, applicableBuffType)
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.damageDecreaseFactor = 0
+                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                applicatorAbilityType.missProbability = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
                 applicatorAbilityTypeIdByApplicatorType[852189] = applicatorAbilityType.id
             end
@@ -204,15 +190,6 @@ local EVASION_ABILITY_TYPE_IDS = postcompile(function()
         "AIcs"
     }, fourCC))
 end)
-local INVENTORY_ABILITY_TYPE_IDS = postcompile(function()
-    return toLuaSet(AbilityType:getAllIdsByBaseIds(map({
-        "AInv",
-        "Aihn",
-        "Aien",
-        "Aion",
-        "Aiun"
-    }, fourCC)))
-end)
 local SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
     local abilityType = SearingArrowsAbilityType:create()
     abilityType.isInternal = true
@@ -244,7 +221,7 @@ Unit.abilityCastingStartEvent[SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID]:addListener(
 )
 ---
 -- @internal For use by internal systems only.
-____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, movementSpeedIncreaseFactor)
+____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, missProbability)
     local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
     local ____opt_1 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_1 and ____opt_1[applicatorType]
@@ -267,8 +244,7 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             applicatorAbilityTypeId,
             preparePhysicalPositiveApplicatorAbility,
             level,
-            duration or 0,
-            movementSpeedIncreaseFactor
+            duration or 0
         )
         if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
@@ -298,6 +274,9 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             ability:setField(ABILITY_IF_PRIORITY, spellStealPriority or 0)
             ability:setField(ABILITY_IF_REQUIRED_LEVEL, learnLevelMinimum or 6)
+            if missProbability ~= nil and applicatorType == 852189 then
+                ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
+            end
         end,
         applicatorType,
         unit
@@ -309,16 +288,13 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
-preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration)
     if level == nil then
         setAbilityIntegerField(ability, ABILITY_IF_LEVELS, 1)
         level = 1
     end
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
     setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
-    if movementSpeedIncreaseFactor ~= nil then
-        setAbilityRealLevelField(ability, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
-    end
 end
 ---
 -- @internal For use by internal systems only.

package/engine/object-data/entry/item-type.d.ts

@@ -45,6 +45,8 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
     get goldCost(): number;
     set goldCost(goldCost: number);
     get lumberCost(): number;

package/engine/object-data/entry/item-type.lua

@@ -256,6 +256,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "cooldownGroupId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryIdField("icid")
+        end,
+        set = function(self, cooldownGroupId)
+            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "goldCost",

package/engine/object-data/utility/object-data-entry-id-generator.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
@@ -60,4 +61,10 @@ function ObjectDataEntryIdGenerator.prototype.next(self)
     self.id = id
     return id
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeIdGenerator = __TS__New(
+    ____exports.ObjectDataEntryIdGenerator,
+    fourCC("A000")
+)
 return ____exports

package/engine/object-field/ability.d.ts

@@ -45,9 +45,10 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
     protected setNativeFieldValue(instance: Ability, value: string): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityStringField>;
 }
-export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
+export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -130,7 +131,9 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
 export declare const resolveCurrentAbilityDependentValue: {
     <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
     <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;

package/engine/object-field/ability.lua

@@ -197,6 +197,9 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",

package/engine/object-field.d.ts

@@ -16,6 +16,8 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     readonly id: ObjectFieldId;
     protected abstract getNativeFieldById(id: number): NativeFieldType;
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
+    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
+    hasValue(instance: InstanceType): boolean;
     constructor(id: number);
     static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
@@ -35,7 +37,6 @@ export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> =
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
     getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
@@ -71,7 +72,6 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
 }
 export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;

package/engine/object-field.lua

@@ -46,6 +46,10 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
+function ObjectFieldBase.prototype.hasValue(self, instance)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+end
 function ObjectFieldBase.create(self, id)
     return __TS__New(
         self,

package/engine/unit.d.ts

@@ -17,6 +17,7 @@ import "./internal/unit/ghost-counter";
 import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
 import "./internal/unit/main-selected";
+import "./internal/unit/add-item-to-slot-init";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -17,6 +17,7 @@ require("engine.internal.unit.ghost-counter")
 require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
 require("engine.internal.unit.main-selected")
+require("engine.internal.unit.add-item-to-slot-init")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.d63794c",
+    "version": "0.0.1-dev.d842bb6",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.880fc91"
+        "warpack": "0.0.1-dev.0feff1b"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",