warscript 0.0.1-dev.3324599 → 0.0.1-dev.33b52d0

package/engine/standard/entries/item-type.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/standard/entries/lightning-type.d.ts

@@ -1,16 +1,43 @@
 /** @noSelfInFile */
-import { StandardLightningTypeId } from "../../object-data/entry/lightning-type";
-export declare const AERIAL_SHACKLES_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const CHAIN_LIGHTNING_PRIMARY_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const CHAIN_LIGHTNING_SECONDARY_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const DRAIN_LIFE_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const DRAIN_LIFE_AND_MANA_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const DRAIN_MANA_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const FINGER_OF_DEATH_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const FORKED_LIGHTNING_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const HEALING_WAVE_PRIMARY_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const HEALING_WAVE_SECONDARY_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const LIGHTNING_ATTACK_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const MANA_BURN_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const MANA_FLARE_LIGHTNING_TYPE_ID: StandardLightningTypeId;
-export declare const SPIRIT_LINK_LIGHTNING_TYPE_ID: StandardLightningTypeId;
+export declare const enum StandardLightningTypeId {
+    /** `LEAS` */
+    AERIAL_SHACKLES = 1279607123,
+    /** `VLCG` */
+    CHAIN_LIGHTNING_GOLD = 1447838535,
+    /** `CLPB` */
+    CHAIN_LIGHTNING_PRIMARY = 1129074754,
+    /** `CLSB` */
+    CHAIN_LIGHTNING_SECONDARY = 1129075522,
+    /** `DRAL` */
+    DRAIN_LIFE = 1146241356,
+    /** `DRAB` */
+    DRAIN_LIFE_AND_MANA = 1146241346,
+    /** `DRAM` */
+    DRAIN_MANA = 1146241357,
+    /** `AFOD` */
+    FINGER_OF_DEATH = 1095126852,
+    /** `FORK` */
+    FORKED_LIGHTNING = 1179603531,
+    /** `HWPB` */
+    HEALING_WAVE_PRIMARY = 1213681730,
+    /** `HWSB` */
+    HEALING_WAVE_SECONDARY = 1213682498,
+    /** `INIT` */
+    INIT = 1229867348,
+    /** `DRWL` */
+    LIFE_WAVE = 1146246988,
+    /** `CHIM` */
+    LIGHTNING_ATTACK = 1128810829,
+    /** `MBUR` */
+    MANA_BURN = 1296192850,
+    /** `MFPB` */
+    MANA_FLARE = 1296453698,
+    /** `DRWM` */
+    MANA_WAVE = 1146246989,
+    /** `POSS` */
+    POSSESSION = 1347375955,
+    /** `VLST` */
+    SOUL_TETHER = 1447842644,
+    /** `SPLK` */
+    SPIRIT_LINK = 1397771339
+}

package/engine/standard/entries/lightning-type.lua

@@ -1,16 +1,2 @@
 local ____exports = {}
-____exports.AERIAL_SHACKLES_LIGHTNING_TYPE_ID = fourCC("LEAS")
-____exports.CHAIN_LIGHTNING_PRIMARY_LIGHTNING_TYPE_ID = fourCC("CLPB")
-____exports.CHAIN_LIGHTNING_SECONDARY_LIGHTNING_TYPE_ID = fourCC("CLSB")
-____exports.DRAIN_LIFE_LIGHTNING_TYPE_ID = fourCC("DRAL")
-____exports.DRAIN_LIFE_AND_MANA_LIGHTNING_TYPE_ID = fourCC("DRAB")
-____exports.DRAIN_MANA_LIGHTNING_TYPE_ID = fourCC("DRAM")
-____exports.FINGER_OF_DEATH_LIGHTNING_TYPE_ID = fourCC("AFOD")
-____exports.FORKED_LIGHTNING_LIGHTNING_TYPE_ID = fourCC("FORK")
-____exports.HEALING_WAVE_PRIMARY_LIGHTNING_TYPE_ID = fourCC("HWPB")
-____exports.HEALING_WAVE_SECONDARY_LIGHTNING_TYPE_ID = fourCC("HWSB")
-____exports.LIGHTNING_ATTACK_LIGHTNING_TYPE_ID = fourCC("CHIM")
-____exports.MANA_BURN_LIGHTNING_TYPE_ID = fourCC("MBUR")
-____exports.MANA_FLARE_LIGHTNING_TYPE_ID = fourCC("MFPB")
-____exports.SPIRIT_LINK_LIGHTNING_TYPE_ID = fourCC("SPLK")
 return ____exports

package/engine/standard/entries/unit-type.d.ts

@@ -15,6 +15,7 @@ export declare const MOUNTAIN_KING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_HIGH_ELF_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CAPTAIN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHAPLAIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SWORDSMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
@@ -47,6 +48,7 @@ export declare const SPIRIT_WALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const TAUREN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WIND_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WITCH_DOCTOR_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const BLADEMASTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -67,9 +69,11 @@ export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnit
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEATH_KNIGHT_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const DREADLORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ZOMBIE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ZOMBIE_FEMALE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ARTHAS_EVIL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MAL_GANIS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DIRE_MAMMOTH_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ELDER_JUNGLE_STALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ENRAGED_ELEMENTAL_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -98,6 +102,7 @@ export declare const WENDIGO_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WENDIGO_SHAMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WILDKIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WRAITH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const PIT_LORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const GOBLIN_LAND_MINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID: StandardUnitTypeId;

package/engine/standard/entries/unit-type.lua

@@ -14,6 +14,7 @@ ____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
 ____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.CHAPLAIN_UNIT_TYPE_ID = fourCC("nchp")
 ____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
 ____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
 ____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
@@ -46,6 +47,7 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.BLADEMASTER_HERO_UNIT_TYPE_ID = fourCC("Obla")
 ____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
 ____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
 ____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
@@ -66,9 +68,11 @@ ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
 ____exports.DEATH_KNIGHT_HERO_UNIT_TYPE_ID = fourCC("Udea")
+____exports.DREADLORD_HERO_UNIT_TYPE_ID = fourCC("Udre")
 ____exports.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
 ____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
 ____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
+____exports.MAL_GANIS_HERO_UNIT_TYPE_ID = fourCC("Umal")
 ____exports.DIRE_MAMMOTH_UNIT_TYPE_ID = fourCC("nmdr")
 ____exports.ELDER_JUNGLE_STALKER_UNIT_TYPE_ID = fourCC("njga")
 ____exports.ENRAGED_ELEMENTAL_UNIT_TYPE_ID = fourCC("nele")
@@ -97,6 +101,7 @@ ____exports.WENDIGO_UNIT_TYPE_ID = fourCC("nwen")
 ____exports.WENDIGO_SHAMAN_UNIT_TYPE_ID = fourCC("nwns")
 ____exports.WILDKIN_UNIT_TYPE_ID = fourCC("nowb")
 ____exports.WRAITH_UNIT_TYPE_ID = fourCC("ngh2")
+____exports.PIT_LORD_HERO_UNIT_TYPE_ID = fourCC("Nplh")
 ____exports.GOBLIN_LAND_MINE_UNIT_TYPE_ID = fourCC("nglm")
 ____exports.CIRCLE_OF_POWER_UNIT_TYPE_ID = fourCC("ncop")
 ____exports.CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID = fourCC("ncp2")

package/engine/standard/fields/ability.d.ts

@@ -7,8 +7,8 @@ export declare const BUTTON_POSITION_ACTIVATED_Y_ABILITY_INTEGER_FIELD: AbilityI
 export declare const BUTTON_POSITION_RESEARCH_X_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const BUTTON_POSITION_RESEARCH_Y_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const MISSILE_SPEED_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
-export declare const TARGET_ATTACHMENTS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
-export declare const CASTER_ATTACHMENTS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
+export declare const TARGET_EFFECT_COUNT_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
+export declare const CASTER_EFFECT_COUNT_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const PRIORITY_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const LEVELS_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;
 export declare const REQUIRED_LEVEL_ABILITY_INTEGER_FIELD: AbilityIntegerField & symbol;

package/engine/standard/fields/ability.lua

@@ -18,8 +18,8 @@ ____exports.BUTTON_POSITION_ACTIVATED_Y_ABILITY_INTEGER_FIELD = AbilityIntegerFi
 ____exports.BUTTON_POSITION_RESEARCH_X_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arpx"))
 ____exports.BUTTON_POSITION_RESEARCH_Y_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arpy"))
 ____exports.MISSILE_SPEED_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("amsp"))
-____exports.TARGET_ATTACHMENTS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("atac"))
-____exports.CASTER_ATTACHMENTS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("acac"))
+____exports.TARGET_EFFECT_COUNT_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("atac"))
+____exports.CASTER_EFFECT_COUNT_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("acac"))
 ____exports.PRIORITY_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("apri"))
 ____exports.LEVELS_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("alev"))
 ____exports.REQUIRED_LEVEL_ABILITY_INTEGER_FIELD = AbilityIntegerField:create(fourCC("arlv"))

package/engine/text-tag.d.ts

@@ -20,7 +20,13 @@ declare const enum TextTagPropertyKey {
     FONT_SIZE = 104,
     COLOR = 105,
     X = 106,
-    Y = 107
+    Y = 107,
+    UNIT_X = 108,
+    UNIT_Y = 109,
+    UNIT_FLY_HEIGHT = 110,
+    UNIT_TERRAIN_Z = 111,
+    IS_UNIT_VISIBLE = 112,
+    VISIBILITY_CHECK_PHASE = 113
 }
 export declare class TextTag extends AbstractDestroyable {
     private [TextTagPropertyKey.HANDLE]?;
@@ -31,6 +37,12 @@ export declare class TextTag extends AbstractDestroyable {
     private [TextTagPropertyKey.UNIT]?;
     private [TextTagPropertyKey.X]?;
     private [TextTagPropertyKey.Y]?;
+    private [TextTagPropertyKey.UNIT_X]?;
+    private [TextTagPropertyKey.UNIT_Y]?;
+    private [TextTagPropertyKey.UNIT_FLY_HEIGHT]?;
+    private [TextTagPropertyKey.UNIT_TERRAIN_Z]?;
+    private [TextTagPropertyKey.IS_UNIT_VISIBLE]?;
+    private [TextTagPropertyKey.VISIBILITY_CHECK_PHASE]?;
     private constructor();
     protected onDestroy(): Destructor;
     get text(): string;

package/engine/text-tag.lua

@@ -38,6 +38,7 @@ local getUnitX = GetUnitX
 local getUnitY = GetUnitY
 local unitAlive = UnitAlive
 local DEFAULT_FONT_SIZE = 0.024
+local VISIBILITY_CHECK_INTERVAL = 4
 local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
     setTextTagLifespan(textTag, configuration.lifespan)
@@ -54,6 +55,7 @@ local function applyConfiguration(textTag, configuration)
     setTextTagVisibility(textTag, true)
 end
 local unitTextTags = setmetatable({}, {__mode = "k"})
+local nextVisibilityCheckPhase = 0
 local function ensureHandle(textTag)
     local handle = textTag[101]
     if handle == nil then
@@ -109,7 +111,8 @@ function TextTag.create(self, configuration, text, unit)
     textTag[103] = text
     textTag[100] = unit
     textTag[102] = configuration
-    ensureHandle(textTag)
+    textTag[113] = nextVisibilityCheckPhase
+    nextVisibilityCheckPhase = (nextVisibilityCheckPhase + 1) % VISIBILITY_CHECK_INTERVAL
     unitTextTags[textTag] = true
     return textTag
 end
@@ -121,12 +124,14 @@ __TS__SetDescriptor(
             return self[103] or ""
         end,
         set = function(self, text)
-            setTextTagText(
-                ensureHandle(self),
-                text,
-                self[104] or DEFAULT_FONT_SIZE
-            )
+            if text == self[103] then
+                return
+            end
             self[103] = text
+            local handle = self[101]
+            if handle ~= nil then
+                setTextTagText(handle, text, self[104] or DEFAULT_FONT_SIZE)
+            end
         end
     },
     true
@@ -139,12 +144,14 @@ __TS__SetDescriptor(
             return self[104] or DEFAULT_FONT_SIZE
         end,
         set = function(self, fontSize)
-            setTextTagText(
-                ensureHandle(self),
-                self[103] or "",
-                fontSize
-            )
+            if fontSize == self[104] then
+                return
+            end
             self[104] = fontSize
+            local handle = self[101]
+            if handle ~= nil then
+                setTextTagText(handle, self[103] or "", fontSize)
+            end
         end
     },
     true
@@ -157,14 +164,20 @@ __TS__SetDescriptor(
             return self[105] or Color.white
         end,
         set = function(self, color)
-            setTextTagColor(
-                ensureHandle(self),
-                color.r,
-                color.g,
-                color.b,
-                color.a
-            )
+            if color == self[105] then
+                return
+            end
             self[105] = color
+            local handle = self[101]
+            if handle ~= nil then
+                setTextTagColor(
+                    handle,
+                    color.r,
+                    color.g,
+                    color.b,
+                    color.a
+                )
+            end
         end
     },
     true
@@ -178,13 +191,17 @@ __TS__SetDescriptor(
         end,
         set = function(self, unit)
             if unit ~= nil then
-                setTextTagPosUnit(
-                    ensureHandle(self),
-                    unit.handle,
-                    0
-                )
                 self[106] = nil
                 self[107] = nil
+                self[108] = nil
+                self[109] = nil
+                self[110] = nil
+                self[111] = nil
+                self[112] = nil
+                local handle = self[101]
+                if handle ~= nil then
+                    setTextTagPosUnit(handle, unit.handle, self[102].offsetZ)
+                end
                 unitTextTags[self] = true
             elseif self[100] ~= nil then
                 local unit = self[100]
@@ -324,25 +341,47 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
         lifespan = 5
     }
 )
+local visibilityCheckPhase = 0
 Timer.onPeriod[1 / 64]:addListener(function()
+    visibilityCheckPhase = (visibilityCheckPhase + 1) % VISIBILITY_CHECK_INTERVAL
     for textTag in pairs(unitTextTags) do
         local unit = textTag[100].handle
         local x = getUnitX(unit)
         local y = getUnitY(unit)
-        local ____, ____, isInView = worldCoordinatesToFrame(
-            x,
-            y,
-            getUnitFlyHeight(unit) + getTerrainZ(x, y)
-        )
-        if isInView and not isUnitHidden(unit) and not isUnitLoaded(unit) and isUnitVisible(unit, PLAYER_LOCAL_HANDLE) and unitAlive(unit) then
-            setTextTagPosUnit(
-                ensureHandle(textTag),
-                unit,
-                textTag[102].offsetZ
-            )
-        elseif textTag[101] ~= nil then
-            destroyTextTag(textTag[101])
-            textTag[101] = nil
+        local flyHeight = getUnitFlyHeight(unit)
+        local hasMoved = x ~= textTag[108] or y ~= textTag[109]
+        local hasPositionChanged = hasMoved or flyHeight ~= textTag[110]
+        local terrainZ = textTag[111]
+        if hasMoved or terrainZ == nil then
+            terrainZ = getTerrainZ(x, y)
+            textTag[108] = x
+            textTag[109] = y
+            textTag[111] = terrainZ
+        end
+        textTag[110] = flyHeight
+        local ____, ____, isInView = worldCoordinatesToFrame(x, y, flyHeight + terrainZ)
+        local isVisible = false
+        if isInView then
+            local cachedIsVisible = textTag[112]
+            if cachedIsVisible == nil or textTag[113] == visibilityCheckPhase then
+                isVisible = not isUnitHidden(unit) and not isUnitLoaded(unit) and isUnitVisible(unit, PLAYER_LOCAL_HANDLE) and unitAlive(unit)
+                textTag[112] = isVisible
+            else
+                isVisible = cachedIsVisible
+            end
+        else
+            textTag[112] = nil
+        end
+        local handle = textTag[101]
+        if not isVisible then
+            if handle ~= nil then
+                destroyTextTag(handle)
+                textTag[101] = nil
+            end
+        elseif handle == nil then
+            ensureHandle(textTag)
+        elseif hasPositionChanged then
+            setTextTagPosUnit(handle, unit, textTag[102].offsetZ)
         end
     end
 end)

package/engine/unit.d.ts

@@ -2,10 +2,14 @@
 import "./internal/unit";
 import "./internal/unit/order";
 import "./internal/unit/ability";
+import "./internal/unit/appearance";
+import "./internal/unit/extended-inventory";
+import "./internal/unit/equipment-inventory";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
-import "./internal/unit/item";
+import "./internal/unit/inventory";
+import "./internal/unit/item-order-events";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";

package/engine/unit.lua

@@ -2,10 +2,14 @@ local ____exports = {}
 require("engine.internal.unit")
 require("engine.internal.unit.order")
 require("engine.internal.unit.ability")
+require("engine.internal.unit.appearance")
+require("engine.internal.unit.extended-inventory")
+require("engine.internal.unit.equipment-inventory")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
-require("engine.internal.unit.item")
+require("engine.internal.unit.inventory")
+require("engine.internal.unit.item-order-events")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")

package/event.d.ts

@@ -40,7 +40,7 @@ export declare const createDispatchingEvent: {
     <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
-    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);
+    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false, ...unknown[]] | [boolean, ...R]>);
 }
 export declare class EventParametersCaptor<T extends any[]> {
     private readonly event;

package/network.lua

@@ -8,6 +8,7 @@ local ____exports = {}
 local ____event = require("event")
 local TriggerEvent = ____event.TriggerEvent
 local ____exception = require("exception")
+local CancellationException = ____exception.CancellationException
 local IllegalArgumentException = ____exception.IllegalArgumentException
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -86,6 +87,9 @@ function SyncOperation.prototype.____constructor(self, player, data)
     self.l = #self.d
 end
 function SyncOperation.prototype.estimate(self)
+    if self.isCanceled or not self.player.isPlaying then
+        return __TS__Promise.reject(__TS__New(CancellationException))
+    end
     if self.player.isLocal then
         sendSyncData(
             "__oh",
@@ -98,6 +102,7 @@ function SyncOperation.prototype.estimate(self)
 end
 function SyncOperation.prototype.work(self)
     if self.progress >= self.maximum then
+        syncOperationById[self.x] = nil
         return decode(concat(self.c))
     end
     self.s = packetsPerRound
@@ -116,7 +121,18 @@ function SyncOperation.prototype.work(self)
     return __TS__New(__TS__Promise, syncPromiseExecutor)
 end
 function SyncOperation.prototype.doCancel(self)
-    return false
+    if not (syncOperationById[self.x] ~= nil) then
+        return false
+    end
+    syncOperationById[self.x] = nil
+    local ____opt_1 = self.r
+    if ____opt_1 ~= nil then
+        ____opt_1(
+            self,
+            __TS__New(CancellationException)
+        )
+    end
+    return true
 end
 __TS__ObjectDefineProperty(
     SyncOperation,
@@ -178,6 +194,7 @@ SyncOperation._ = (function()
             local resolveWork = syncOperation.w
             if resolveWork then
                 if syncOperation.progress >= syncOperation.maximum then
+                    syncOperationById[id] = nil
                     resolveWork(
                         nil,
                         decode(concat(chunks))
@@ -188,6 +205,13 @@ SyncOperation._ = (function()
             end
         end
     end)
+    Player.onLeave:addListener(function(player)
+        for ____, operation in pairs(syncOperationById) do
+            if operation.player == player then
+                operation:cancel()
+            end
+        end
+    end)
 end)()
 function ____exports.synchronize(player, data)
     return __TS__New(____exports.SyncOperation, player, data):execute()

package/objutil/buff.lua

@@ -527,7 +527,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
                 ability:setField(ABILITY_RLF_DURATION_NORMAL, level, actualDuration)
                 ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             end,
-            preset.positive and (preset.magic and orderId("innerfire") or 852609) or (preset.magic and orderId("cripple") or orderId("flamingarrowstarg")),
+            preset.positive and (preset.magic and 852066 or 852609) or (preset.magic and 852189 or 852173),
             unit
         )
         if slowPoisonMethod then

package/operation.d.ts

@@ -16,9 +16,11 @@ export { OperationContinue };
 export declare abstract class Operation<T> {
     protected constructor();
     private started;
+    private settled;
+    private canceled;
     protected progress: number;
     protected maximum: number;
-    isCanceled: boolean;
+    get isCanceled(): boolean;
     get isStarted(): boolean;
     execute(): OperationMonitor<T>;
     protected abstract estimate(): number | Promise<number>;
@@ -30,6 +32,11 @@ export declare abstract class Operation<T> {
         ...result: [success: true, result: T] | [success: false, reason?: any]
     ]>;
     get onProgress(): Event<[operation: Operation<T>]>;
+    /**
+     * Invoked with `isCanceled` already set. Should unblock any pending `estimate`/`work` promise
+     * (e.g. by rejecting it) and return whether cancellation is possible; on `false` the canceled
+     * state is reverted.
+     */
     protected abstract doCancel(): boolean;
     cancel(): boolean;
 }

package/operation.lua

@@ -35,9 +35,10 @@ local Operation = ____exports.Operation
 Operation.name = "Operation"
 function Operation.prototype.____constructor(self)
     self.started = false
+    self.settled = false
+    self.canceled = false
     self.progress = 0
     self.maximum = 0
-    self.isCanceled = false
 end
 function Operation.prototype.execute(self)
     if self.started then
@@ -55,6 +56,12 @@ function Operation.prototype.execute(self)
                 local result
                 local progress = self.progress
                 local ____try = __TS__AsyncAwaiter(function()
+                    if self.canceled then
+                        error(
+                            __TS__New(CancellationException),
+                            0
+                        )
+                    end
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
                     if maximum ~= 0 then
@@ -65,20 +72,19 @@ function Operation.prototype.execute(self)
                     end
                     repeat
                         do
-                            if self.isCanceled then
-                                local reason = __TS__New(CancellationException)
-                                reject(nil, reason)
-                                local onFailure = ____rawget(self, "onFailure")
-                                if onFailure ~= nil then
-                                    Event.invoke(onFailure, self, reason)
-                                end
-                                local onComplete = ____rawget(self, "onComplete")
-                                if onComplete ~= nil then
-                                    Event.invoke(onComplete, self, false, reason)
-                                end
-                                return ____awaiter_resolve(nil)
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
                             end
                             result = __TS__Await(self:work())
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
+                            end
                             if self.progress ~= progress or self.maximum ~= maximum then
                                 progress = self.progress
                                 maximum = self.maximum
@@ -93,6 +99,7 @@ function Operation.prototype.execute(self)
                 __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
+                        self.settled = true
                         reject(nil, reason)
                         local onFailure = ____rawget(self, "onFailure")
                         if onFailure ~= nil then
@@ -105,6 +112,7 @@ function Operation.prototype.execute(self)
                         return ____awaiter_resolve(nil)
                     end
                 ))
+                self.settled = true
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then
@@ -119,12 +127,27 @@ function Operation.prototype.execute(self)
     )
 end
 function Operation.prototype.cancel(self)
+    if self.canceled then
+        return true
+    end
+    if self.settled then
+        return false
+    end
+    self.canceled = true
     if self:doCancel() then
-        self.isCanceled = true
         return true
     end
+    self.canceled = false
     return false
 end
+__TS__SetDescriptor(
+    Operation.prototype,
+    "isCanceled",
+    {get = function(self)
+        return self.canceled
+    end},
+    true
+)
 __TS__SetDescriptor(
     Operation.prototype,
     "isStarted",