warscript 0.0.1-dev.697548e → 0.0.1-dev.6af7b85

package/core/types/frame.lua

@@ -24,11 +24,23 @@ local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
 local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
 local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
 local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
+local ____lua_2Dsets = require("utility.lua-sets")
+local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
+local ____socket = require("net.socket")
+local Socket = ____socket.Socket
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local luaMapInvert = ____lua_2Dmaps.luaMapInvert
+local luaMapOf = ____lua_2Dmaps.luaMapOf
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
+local getHandleId = GetHandleId
+local getOriginFrame = BlzGetOriginFrame
+local location = Location
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -130,6 +142,30 @@ do
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
 local tooltipByFrame = setmetatable({}, {__mode = "k"})
+local keyByAsyncInitOriginFrameType = luaMapOf(ORIGIN_FRAME_PORTRAIT_HP_TEXT, "hp", ORIGIN_FRAME_PORTRAIT_MANA_TEXT, "mana")
+local asyncInitOriginFrameTypeByKey = luaMapInvert(keyByAsyncInitOriginFrameType)
+local seenAsyncInitOriginFrameTypes = mutableLuaSet()
+local seenAsyncInitOriginFrameTypesSocket = __TS__New(Socket)
+local seenPlayersByAsyncInitOriginFrameType = mutableLuaMap()
+seenAsyncInitOriginFrameTypesSocket.onMessage:addListener(function(player, key)
+    local asyncInitOriginFrameType = asyncInitOriginFrameTypeByKey[key]
+    if asyncInitOriginFrameType ~= nil then
+        getOrPut(seenPlayersByAsyncInitOriginFrameType, asyncInitOriginFrameType, mutableLuaSet)[player] = true
+    end
+end)
+local function haveAllPlayersSeenAsyncInitOriginFrameType(frame)
+    local players = seenPlayersByAsyncInitOriginFrameType[frame]
+    if players == nil then
+        return false
+    end
+    for ____, player in ipairs(Player.all) do
+        if player.isUser and player.isPlaying and not (players[player] ~= nil) then
+            return false
+        end
+    end
+    keyByAsyncInitOriginFrameType[frame] = nil
+    return true
+end
 ____exports.Frame = __TS__Class()
 local Frame = ____exports.Frame
 Frame.name = "Frame"
@@ -308,7 +344,17 @@ function Frame.byOrigin(self, frameType, index)
     if index == nil then
         index = 0
     end
-    return self:of(BlzGetOriginFrame(frameType, index))
+    local frame = getOriginFrame(frameType, index)
+    local asyncInitOriginFrameTypeKey = keyByAsyncInitOriginFrameType[frameType]
+    if index == 0 and asyncInitOriginFrameTypeKey ~= nil and not haveAllPlayersSeenAsyncInitOriginFrameType(frameType) then
+        if getHandleId(frame) == 0 or seenAsyncInitOriginFrameTypes[frameType] ~= nil then
+            location(0, 0)
+        else
+            seenAsyncInitOriginFrameTypes[frameType] = true
+            seenAsyncInitOriginFrameTypesSocket:send(asyncInitOriginFrameTypeKey)
+        end
+    end
+    return self:of(frame)
 end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)

package/core/types/item.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
 import { Item } from "../../engine/internal/item";
 import "../../engine/internal/item+owner";
+import "../../engine/internal/item/fields";
 export { Item };

package/core/types/item.lua

@@ -2,5 +2,6 @@ local ____exports = {}
 local ____item = require("engine.internal.item")
 local Item = ____item.Item
 require("engine.internal.item+owner")
+require("engine.internal.item.fields")
 ____exports.Item = Item
 return ____exports

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/buff.d.ts

@@ -219,6 +219,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?;

package/engine/buff.lua

@@ -404,7 +404,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

package/engine/internal/ability.lua

@@ -14,6 +14,8 @@ local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
 local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
 local startItemCooldown = ____ability.startItemCooldown
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local setUnitAbilityLevel = SetUnitAbilityLevel
 local setAbilityIntegerField = BlzSetAbilityIntegerField
@@ -35,8 +37,6 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
-local getItemBooleanField = BlzGetItemBooleanField
-local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
@@ -516,11 +516,14 @@ 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, 1)
+        Timer:run(startItemCooldown, itemHandle, itemOwnerHandle, 0)
     end
 end
 function ItemAbility.prototype.onDestroy(self)
@@ -543,17 +546,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.d.ts

@@ -32,8 +32,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 +40,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);

package/engine/internal/item.lua

@@ -356,19 +356,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "canBeSold",
-    {
-        get = function(self)
-            return isItemPawnable(self.handle)
-        end,
-        set = function(self, canBeSold)
-            setItemPawnable(self.handle, canBeSold)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "perishes",
@@ -427,30 +414,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "isActivelyUsed",
-    {
-        get = function(self)
-            return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
-        end,
-        set = function(self, isActivelyUsed)
-            local handle = self.handle
-            local powerUp = isItemPowerup(handle)
-            local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
-            local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
-            local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
-            local canBeSold = isItemPawnable(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
-            setItemPawnable(handle, canBeSold)
-            setItemDroppable(handle, canBeDropped)
-            setItemDropOnDeath(handle, dropsOnDeath)
-            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "visible",

package/engine/internal/unit/item.lua

@@ -21,7 +21,7 @@ local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
 local handleByUnitItems = setmetatable({}, {__mode = "k"})
 local function unitItemsNext(handle, index)
     local slot = index & 7
-    if (index & 4294967295) >> 3 == slot then
+    if index >> 3 == slot then
         return nil, nil
     end
     return index + 1, Item:of(unitItemInSlot(handle, slot))

package/engine/local-client.d.ts

@@ -12,6 +12,7 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
+    static get isMinimized(): boolean;
     static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, flashy?: boolean] | [color: Color, flashy?: boolean]): void;
     static get mouseFocusUnit(): Async<Unit> | undefined;
     static get mainSelectedUnit(): Async<Unit> | undefined;
@@ -19,5 +20,9 @@ export declare class LocalClient {
         previousMainSelectedUnit: Unit | undefined,
         newMainSelectedUnit: Unit | undefined
     ]>;
+    static get isInTargetingMode(): boolean;
+    static readonly targetingModeEnterEvent: Event<[]>;
+    static readonly targetingModeLeaveEvent: Event<[]>;
+    static readonly targetingModeStateChangeEvent: Event<[]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,10 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local actualizeTargetingModeState
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
@@ -18,6 +19,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
@@ -62,6 +65,10 @@ local function compareUnitsSelectionPriority(a, b)
 end
 local mainSelectedUnitChangeEvent
 local previousMainSelectedUnit
+local lastTargetingModeState = false
+local targetingModeEnterEvent = __TS__New(Event)
+local targetingModeLeaveEvent = __TS__New(Event)
+local targetingModeStateChangeEvent = __TS__New(Event)
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -128,6 +135,13 @@ __TS__ObjectDefineProperty(
         return isLocalClientActive()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isMinimized",
+    {get = function(self)
+        return getLocalClientHeight() == 0
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "mouseFocusUnit",
@@ -181,6 +195,16 @@ __TS__ObjectDefineProperty(
         return mainSelectedUnitChangeEvent
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isInTargetingMode",
+    {get = function(self)
+        return actualizeTargetingModeState()
+    end}
+)
+LocalClient.targetingModeEnterEvent = targetingModeEnterEvent
+LocalClient.targetingModeLeaveEvent = targetingModeLeaveEvent
+LocalClient.targetingModeStateChangeEvent = targetingModeStateChangeEvent
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)
@@ -188,6 +212,37 @@ LocalClient.onDisconnect = __TS__New(
     end,
     function() return  end
 )
+local commandButtons = array(
+    12,
+    function(i) return Frame:byOrigin(ORIGIN_FRAME_COMMAND_BUTTON, i) end
+)
+local function getTargetingModeState()
+    for i = 0, 10 do
+        if commandButtons[i + 1].visible then
+            return false
+        end
+    end
+    return commandButtons[12].visible
+end
+actualizeTargetingModeState = function()
+    if getTargetingModeState() then
+        if not lastTargetingModeState then
+            lastTargetingModeState = true
+            Event.invoke(targetingModeEnterEvent)
+            Event.invoke(targetingModeStateChangeEvent)
+        end
+        return true
+    end
+    if lastTargetingModeState then
+        lastTargetingModeState = false
+        Event.invoke(targetingModeLeaveEvent)
+        Event.invoke(targetingModeStateChangeEvent)
+    end
+    return false
+end
+Timer.onPeriod[1 / 64]:addListener(function()
+    actualizeTargetingModeState()
+end)
 warpack.afterMapInit(function()
     rawset(
         ____exports.LocalClient,

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

@@ -0,0 +1,22 @@
+/** @noSelfInFile */
+import { ObjectField } from "../object-field";
+import { Item } from "../internal/item";
+import { ItemType, ItemTypeId } from "../object-data/entry/item-type";
+export declare abstract class ItemField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = any> extends ObjectField<ItemType, Item, ValueType, NativeFieldType> {
+    protected get instanceClass(): typeof Item;
+    protected getObjectDataEntryId(instance: Item): ItemTypeId;
+}
+export declare class ItemBooleanField extends ItemField<boolean, jitembooleanfield> {
+    protected get defaultValue(): boolean;
+    protected getNativeFieldById(id: number): jitembooleanfield;
+    protected hasNativeFieldValue(): boolean;
+    protected getNativeFieldValue(instance: Item): boolean;
+    protected setNativeFieldValue(instance: Item, value: boolean): boolean;
+}
+export declare class ItemIntegerField extends ItemField<number, jitemintegerfield> {
+    protected get defaultValue(): number;
+    protected getNativeFieldById(id: number): jitemintegerfield;
+    protected hasNativeFieldValue(): boolean;
+    protected getNativeFieldValue(instance: Item): number;
+    protected setNativeFieldValue(instance: Item, value: number): boolean;
+}

package/engine/object-field/item.lua

@@ -0,0 +1,118 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____object_2Dfield = require("engine.object-field")
+local ObjectField = ____object_2Dfield.ObjectField
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
+local convertItemBooleanField = ConvertItemBooleanField
+local convertItemIntegerField = ConvertItemIntegerField
+local getItemBooleanField = BlzGetItemBooleanField
+local getItemIntegerField = BlzGetItemIntegerField
+local isItemPawnable = IsItemPawnable
+local isItemPowerup = IsItemPowerup
+local setItemBooleanField = BlzSetItemBooleanField
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local setItemIntegerField = BlzSetItemIntegerField
+____exports.ItemField = __TS__Class()
+local ItemField = ____exports.ItemField
+ItemField.name = "ItemField"
+__TS__ClassExtends(ItemField, ObjectField)
+function ItemField.prototype.getObjectDataEntryId(self, instance)
+    return instance.typeId
+end
+__TS__SetDescriptor(
+    ItemField.prototype,
+    "instanceClass",
+    {get = function(self)
+        return Item
+    end},
+    true
+)
+local nativeItemBooleanFieldIds = luaSetOf(
+    fourCC("ipaw"),
+    fourCC("iusa")
+)
+____exports.ItemBooleanField = __TS__Class()
+local ItemBooleanField = ____exports.ItemBooleanField
+ItemBooleanField.name = "ItemBooleanField"
+__TS__ClassExtends(ItemBooleanField, ____exports.ItemField)
+function ItemBooleanField.prototype.getNativeFieldById(self, id)
+    return convertItemBooleanField(id)
+end
+function ItemBooleanField.prototype.hasNativeFieldValue(self)
+    return nativeItemBooleanFieldIds[self.id] ~= nil
+end
+function ItemBooleanField.prototype.getNativeFieldValue(self, instance)
+    return getItemBooleanField(instance.handle, self.nativeField)
+end
+function ItemBooleanField.prototype.setNativeFieldValue(self, instance, value)
+    if self.id == fourCC("iusa") then
+        local handle = instance.handle
+        local powerUp = isItemPowerup(handle)
+        local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
+        local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+        local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
+        local canBeSold = isItemPawnable(handle)
+        local result = setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, value)
+        setItemPawnable(handle, canBeSold)
+        setItemDroppable(handle, canBeDropped)
+        setItemDropOnDeath(handle, dropsOnDeath)
+        setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+        setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
+        return result
+    end
+    return setItemBooleanField(instance.handle, self.nativeField, value)
+end
+__TS__SetDescriptor(
+    ItemBooleanField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return false
+    end},
+    true
+)
+local nativeItemIntegerFieldIds = luaSetOf(
+    fourCC("ilev"),
+    fourCC("iuse"),
+    fourCC("icid"),
+    fourCC("ihtp"),
+    fourCC("ihpc"),
+    fourCC("ipri"),
+    fourCC("iarm"),
+    fourCC("iclr"),
+    fourCC("iclg"),
+    fourCC("iclb"),
+    fourCC("ical")
+)
+____exports.ItemIntegerField = __TS__Class()
+local ItemIntegerField = ____exports.ItemIntegerField
+ItemIntegerField.name = "ItemIntegerField"
+__TS__ClassExtends(ItemIntegerField, ____exports.ItemField)
+function ItemIntegerField.prototype.getNativeFieldById(self, id)
+    return convertItemIntegerField(id)
+end
+function ItemIntegerField.prototype.hasNativeFieldValue(self)
+    return nativeItemIntegerFieldIds[self.id] ~= nil
+end
+function ItemIntegerField.prototype.getNativeFieldValue(self, instance)
+    return getItemIntegerField(instance.handle, self.nativeField)
+end
+function ItemIntegerField.prototype.setNativeFieldValue(self, instance, value)
+    return setItemIntegerField(instance.handle, self.nativeField, value)
+end
+__TS__SetDescriptor(
+    ItemIntegerField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+return ____exports

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

@@ -0,0 +1,4 @@
+/** @noSelfInFile */
+import { ItemBooleanField } from "../../object-field/item";
+export declare const CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD: ItemBooleanField & symbol;
+export declare const IS_ACTIVELY_USED_ITEM_FIELD: ItemBooleanField & symbol;

package/engine/standard/fields/item.lua

@@ -0,0 +1,6 @@
+local ____exports = {}
+local ____item = require("engine.object-field.item")
+local ItemBooleanField = ____item.ItemBooleanField
+____exports.CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD = ItemBooleanField:create(fourCC("ipaw"))
+____exports.IS_ACTIVELY_USED_ITEM_FIELD = ItemBooleanField:create(fourCC("iusa"))
+return ____exports

package/lualib_bundle.lua

@@ -653,6 +653,7 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
+        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -702,40 +703,14 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if type(onFinally) ~= "function" then
-            return self["then"](self, onFinally, onFinally)
-        end
-        return self["then"](
-            self,
-            function(____, x)
-                local ____self_2 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_2["then"](
-                    ____self_2,
-                    function() return x end
-                )
-            end,
-            function(____, e)
-                local ____self_3 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_3["then"](
-                    ____self_3,
-                    function()
-                        error(e, 0)
-                    end
-                )
+        if onFinally then
+            local ____self_finallyCallbacks_2 = self.finallyCallbacks
+            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
+            if self.state ~= 0 then
+                onFinally(nil)
             end
-        )
+        end
+        return self
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -759,11 +734,22 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
+        local finallyCallbacks = self.finallyCallbacks
+        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            return callbacks[callbacksLength](callbacks, value)
+            if finallyCallbacksLength == 0 then
+                return callbacks[callbacksLength](callbacks, value)
+            end
+            callbacks[callbacksLength](callbacks, value)
+        end
+        if finallyCallbacksLength ~= 0 then
+            for i = 1, finallyCallbacksLength - 1 do
+                finallyCallbacks[i](finallyCallbacks)
+            end
+            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -918,10 +904,8 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        if type(source) == "table" then
-            for key in pairs(source) do
-                target[key] = source[key]
-            end
+        for key in pairs(source) do
+            target[key] = source[key]
         end
     end
     return target
@@ -1027,13 +1011,6 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
-        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
-            local instanceMetatable = {}
-            instanceMetatable._isOwnDescriptorMetatable = true
-            setmetatable(instanceMetatable, metatable)
-            setmetatable(target, instanceMetatable)
-            metatable = instanceMetatable
-        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1406,70 +1383,46 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, items[key]}}
+                local result = {done = not key, value = {key, items[key]}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = items[key]}
+                local result = {done = not key, value = items[key]}
+                key = nextKey[key]
+                return result
             end
         }
     end
@@ -2046,68 +1999,44 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, key}}
+                local result = {done = not key, value = {key, key}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end

package/math.d.ts

@@ -23,6 +23,8 @@ export declare const floor: typeof math.floor;
 export declare const log: typeof math.log;
 export declare const max: typeof math.max;
 export declare const min: typeof math.min;
+export declare const sum: (x: number, ...numbers: number[]) => number;
+export declare const product: (x: number, ...numbers: number[]) => number;
 /** Returns the signum function of the argument;
  * zero if the argument is zero,
  * 1.0 if the argument is greater than zero,

package/math.lua

@@ -39,6 +39,20 @@ ____exports.floor = math.floor
 ____exports.log = math.log
 ____exports.max = math.max
 ____exports.min = math.min
+____exports.sum = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x + number
+    end
+    return x
+end
+____exports.product = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x * number
+    end
+    return x
+end
 --- Returns the signum function of the argument;
 -- zero if the argument is zero,
 -- 1.0 if the argument is greater than zero,

package/operation.lua

@@ -54,7 +54,6 @@ function Operation.prototype.execute(self)
             return __TS__AsyncAwaiter(function(____awaiter_resolve)
                 local result
                 local progress = self.progress
-                local ____hasReturned, ____returnValue
                 local ____try = __TS__AsyncAwaiter(function()
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
@@ -77,8 +76,7 @@ function Operation.prototype.execute(self)
                                 if onComplete ~= nil then
                                     Event.invoke(onComplete, self, false, reason)
                                 end
-                                ____hasReturned = true
-                                return
+                                return ____awaiter_resolve(nil)
                             end
                             result = __TS__Await(self:work())
                             if self.progress ~= progress or self.maximum ~= maximum then
@@ -92,28 +90,21 @@ function Operation.prototype.execute(self)
                         end
                     until not (result == OperationContinue)
                 end)
-                ____try = ____try.catch(
+                __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
-                        return __TS__AsyncAwaiter(function()
-                            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
-                            ____hasReturned = true
-                            return
-                        end)
+                        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)
                     end
-                )
-                __TS__Await(____try)
-                if ____hasReturned then
-                    return ____awaiter_resolve(nil, ____returnValue)
-                end
+                ))
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.697548e",
+    "version": "0.0.1-dev.6af7b85",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,7 +22,7 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.5",
+        "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
         "warpack": "0.0.1-dev.e490aaf"
     },

package/utility/linked-map.d.ts

@@ -15,7 +15,7 @@ export interface ReadonlyLinkedMap<K extends AnyNotNil, V> extends LuaPairsItera
     readonly size: number;
 }
 export interface LinkedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
-    readonly __linkedSet: unique symbol;
+    readonly __linkedMap: unique symbol;
 }
 export declare class LinkedMap<K extends AnyNotNil, V> implements ReadonlyLinkedMap<K, V> {
     private k;
@@ -27,6 +27,7 @@ export declare class LinkedMap<K extends AnyNotNil, V> implements ReadonlyLinked
     remove(key: K): boolean;
     contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
     get size(): number;
+    protected __len(): number;
     protected __pairs(this: LinkedMap<K, V>): LuaIterator<LuaMultiReturn<[K | undefined, V | undefined]>, IteratorState<K, V>>;
 }
 export declare const emptyLinkedMap: <K extends AnyNotNil, V>() => ReadonlyLinkedMap<K, V>;

package/utility/linked-map.lua

@@ -47,6 +47,9 @@ end
 function LinkedMap.prototype.contains(self, key)
     return self.keys:contains(key)
 end
+function LinkedMap.prototype.__len(self)
+    return self.keys.size
+end
 function LinkedMap.prototype.__pairs(self)
     return linkedMapNext, {n = self.k.f, t = self.k.n, v = self.v}, nil
 end
@@ -88,6 +91,9 @@ function EmptyLinkedMap.prototype.remove(self)
         0
     )
 end
+function EmptyLinkedMap.prototype.__len(self)
+    return 0
+end
 function EmptyLinkedMap.prototype.__pairs(self)
     return linkedMapNext, emptyIteratorState, nil
 end

package/utility/linked-set.d.ts

@@ -49,6 +49,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     toArray(): T[];
     sumOf(selector: ((value: T) => number) | KeysOfType<T, number>): number;
     sortBy<R>(selector: ((value: T) => R) | KeysOfType<T, R>): void;
+    protected __len(): number;
     protected __pairs(this: LinkedSet<T>): LuaIterator<T | undefined, IteratorState<T>>;
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;

package/utility/linked-set.lua

@@ -188,6 +188,9 @@ function LinkedSet.prototype.sortBy(self, selector)
     self.f = array[1]
     self.l = array[s]
 end
+function LinkedSet.prototype.__len(self)
+    return self.s
+end
 function LinkedSet.prototype.__pairs(self)
     return linkedSetNext, {t = self.n, n = self.f}, nil
 end
@@ -209,6 +212,9 @@ function EmptyLinkedSet.prototype.add(self)
         0
     )
 end
+function EmptyLinkedSet.prototype.__len(self)
+    return 0
+end
 function EmptyLinkedSet.prototype.__pairs(self)
     return linkedSetNext, emptyIteratorState, nil
 end

package/utility/unordered-map.d.ts

@@ -0,0 +1,27 @@
+/** @noSelfInFile */
+type OneSidedTypeGuard = {
+    readonly __oneSidedTypeGuard: unique symbol;
+};
+export interface ReadonlyUnorderedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    get(key: K): V | undefined;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    readonly size: number;
+}
+export interface UnorderedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    readonly __unorderedMap: unique symbol;
+}
+export declare class UnorderedMap<K extends AnyNotNil, V> implements ReadonlyUnorderedMap<K, V> {
+    private readonly v;
+    private s;
+    get(key: K): V | undefined;
+    getOrPut(key: K, defaultValue: (this: void) => V): V;
+    put(key: K, value: V): void;
+    remove(key: K): boolean;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    get size(): number;
+    protected __len(): number;
+    protected __pairs(this: UnorderedMap<K, V>): ReturnType<typeof pairs>;
+}
+export declare const emptyUnorderedMap: <K extends AnyNotNil, V>() => ReadonlyUnorderedMap<K, V>;
+export declare const mutableUnorderedMap: <K extends AnyNotNil, V>() => UnorderedMap<K, V>;
+export {};

package/utility/unordered-map.lua

@@ -0,0 +1,99 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____exception = require("exception")
+local UnsupportedOperationException = ____exception.UnsupportedOperationException
+____exports.UnorderedMap = __TS__Class()
+local UnorderedMap = ____exports.UnorderedMap
+UnorderedMap.name = "UnorderedMap"
+function UnorderedMap.prototype.____constructor(self)
+    self.v = {}
+    self.s = 0
+end
+function UnorderedMap.prototype.get(self, key)
+    return self.v[key]
+end
+function UnorderedMap.prototype.getOrPut(self, key, defaultValue)
+    local value = self.v[key]
+    if value ~= nil then
+        return value
+    end
+    value = defaultValue()
+    if value ~= nil then
+        self.v[key] = value
+        self.s = self.s + 1
+    end
+    return value
+end
+function UnorderedMap.prototype.put(self, key, value)
+    local has = self.v[key] ~= nil
+    self.v[key] = value
+    if value ~= nil and not has then
+        self.s = self.s + 1
+    elseif value == nil and has then
+        self.s = self.s - 1
+    end
+end
+function UnorderedMap.prototype.remove(self, key)
+    if self.v[key] ~= nil then
+        self.v[key] = nil
+        self.s = self.s - 1
+        return true
+    end
+    return false
+end
+function UnorderedMap.prototype.contains(self, key)
+    return self.v[key] ~= nil
+end
+function UnorderedMap.prototype.__len(self)
+    return self.s
+end
+function UnorderedMap.prototype.__pairs(self)
+    return pairs(self.v)
+end
+__TS__SetDescriptor(
+    UnorderedMap.prototype,
+    "size",
+    {get = function(self)
+        return self.s
+    end},
+    true
+)
+local EmptyUnorderedMap = __TS__Class()
+EmptyUnorderedMap.name = "EmptyUnorderedMap"
+__TS__ClassExtends(EmptyUnorderedMap, ____exports.UnorderedMap)
+function EmptyUnorderedMap.prototype.getOrPut(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.put(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.remove(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.__len(self)
+    return 0
+end
+function EmptyUnorderedMap.prototype.__pairs(self)
+    return pairs(self.v)
+end
+local EMPTY_UNORDERED_MAP = __TS__New(EmptyUnorderedMap)
+____exports.emptyUnorderedMap = function()
+    return EMPTY_UNORDERED_MAP
+end
+____exports.mutableUnorderedMap = function()
+    return __TS__New(____exports.UnorderedMap)
+end
+return ____exports