warscript 0.0.1-dev.38157d0 → 0.0.1-dev.3e67cca

package/core/util.d.ts

@@ -54,7 +54,7 @@ declare global {
     function fourCC(id: string): number;
 }
 declare namespace inner {
-    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
+    const orderId: (id: "blink" | "stop" | "load" | "sleep" | "absorb" | "acidbomb" | "acolyteharvest" | "ambush" | "ancestralspirit" | "ancestralspirittarget" | "animatedead" | "antimagicshell" | "attack" | "attackground" | "attackonce" | "attributemodskill" | "auraunholy" | "auravampiric" | "autodispel" | "autodispeloff" | "autodispelon" | "autoentangle" | "autoentangleinstant" | "autoharvestgold" | "autoharvestlumber" | "avatar" | "avengerform" | "awaken" | "banish" | "barkskin" | "barkskinoff" | "barkskinon" | "battleroar" | "battlestations" | "bearform" | "berserk" | "blackarrow" | "blackarrowoff" | "blackarrowon" | "blight" | "blizzard" | "bloodlust" | "bloodlustoff" | "bloodluston" | "board" | "breathoffire" | "breathoffrost" | "build" | "burrow" | "cannibalize" | "carrionscarabs" | "carrionscarabsinstant" | "carrionscarabsoff" | "carrionscarabson" | "carrionswarm" | "chainlightning" | "channel" | "charm" | "chemicalrage" | "cloudoffog" | "clusterrockets" | "coldarrows" | "coldarrowstarg" | "controlmagic" | "corporealform" | "corrosivebreath" | "coupleinstant" | "coupletarget" | "creepanimatedead" | "creepdevour" | "creepheal" | "creephealoff" | "creephealon" | "creepthunderbolt" | "creepthunderclap" | "cripple" | "curse" | "curseoff" | "curseon" | "cyclone" | "darkconversion" | "darkportal" | "darkritual" | "darksummoning" | "deathanddecay" | "deathcoil" | "deathpact" | "decouple" | "defend" | "detectaoe" | "detonate" | "devour" | "devourmagic" | "disassociate" | "disenchant" | "dismount" | "dispel" | "divineshield" | "doom" | "drain" | "dreadlordinferno" | "dropitem" | "moveslot0" | "moveslot1" | "moveslot2" | "moveslot3" | "moveslot4" | "moveslot5" | "drunkenhaze" | "earthquake" | "eattree" | "elementalfury" | "ensnare" | "ensnareoff" | "ensnareon" | "entangle" | "entangleinstant" | "entanglingroots" | "etherealform" | "evileye" | "faeriefire" | "faeriefireoff" | "faeriefireon" | "fanofknives" | "farsight" | "fingerofdeath" | "firebolt" | "flamestrike" | "flamingarrows" | "flamingarrowstarg" | "flamingattack" | "flamingattacktarg" | "flare" | "forceboard" | "forceofnature" | "forkedlightning" | "freezingbreath" | "frenzy" | "frenzyoff" | "frenzyon" | "frostarmor" | "frostarmoroff" | "frostarmoron" | "frostnova" | "getitem" | "gold2lumber" | "grabtree" | "harvest" | "heal" | "healingspray" | "healingward" | "healingwave" | "healoff" | "healon" | "hex" | "holdposition" | "holybolt" | "howlofterror" | "humanbuild" | "immolation" | "impale" | "incineratearrow" | "incineratearrowoff" | "incineratearrowon" | "inferno" | "innerfire" | "innerfireoff" | "innerfireon" | "instant" | "invisibility" | "lavamonster" | "lightningshield" | "loadarcher" | "loadcorpse" | "loadcorpseinstant" | "locustswarm" | "lumber2gold" | "magicdefense" | "magicleash" | "magicundefense" | "manaburn" | "manaflareoff" | "manaflareon" | "manashieldoff" | "manashieldon" | "massteleport" | "mechanicalcritter" | "metamorphosis" | "militia" | "militiaconvert" | "militiaoff" | "militiaunconvert" | "mindrot" | "mirrorimage" | "monsoon" | "mount" | "mounthippogryph" | "move" | "moveAI" | "nagabuild" | "neutraldetectaoe" | "neutralinteract" | "neutralspell" | "nightelfbuild" | "orcbuild" | "parasite" | "parasiteoff" | "parasiteon" | "patrol" | "patrolAI" | "phaseshift" | "phaseshiftinstant" | "phaseshiftoff" | "phaseshifton" | "phoenixfire" | "phoenixmorph" | "poisonarrows" | "poisonarrowstarg" | "polymorph" | "possession" | "preservation" | "purge" | "rainofchaos" | "rainoffire" | "raisedead" | "raisedeadoff" | "raisedeadon" | "ravenform" | "recharge" | "rechargeoff" | "rechargeon" | "rejuvination" | "renew" | "renewoff" | "renewon" | "repair" | "repairoff" | "repairon" | "replenish" | "replenishlife" | "replenishlifeoff" | "replenishlifeon" | "replenishmana" | "replenishmanaoff" | "replenishmanaon" | "replenishoff" | "replenishon" | "request_hero" | "requestsacrifice" | "restoration" | "restorationoff" | "restorationon" | "resumebuild" | "resumeharvesting" | "resurrection" | "returnresources" | "revenge" | "revive" | "roar" | "robogoblin" | "root" | "sacrifice" | "sanctuary" | "scout" | "selfdestruct" | "selfdestructoff" | "selfdestructon" | "sentinel" | "follow" | "smart" | "setrally" | "shadowsight" | "shadowstrike" | "shockwave" | "silence" | "slow" | "slowoff" | "slowon" | "soulburn" | "soulpreservation" | "spellshield" | "spellshieldaoe" | "spellsteal" | "spellstealoff" | "spellstealon" | "spies" | "spiritlink" | "spiritofvengeance" | "spirittroll" | "spiritwolf" | "stampede" | "standdown" | "starfall" | "stasistrap" | "steal" | "stomp" | "stoneform" | "stunned" | "submerge" | "summonfactory" | "summongrizzly" | "summonphoenix" | "summonquillbeast" | "summonwareagle" | "tankdroppilot" | "tankloadpilot" | "tankpilot" | "taunt" | "thunderbolt" | "thunderclap" | "tornado" | "townbelloff" | "townbellon" | "tranquility" | "transmute" | "unavatar" | "unavengerform" | "unbearform" | "unburrow" | "uncoldarrows" | "uncorporealform" | "undeadbuild" | "undefend" | "undivineshield" | "unetherealform" | "unflamingarrows" | "unflamingattack" | "unholyfrenzy" | "unimmolation" | "unload" | "unloadall" | "unloadallcorpses" | "unloadallinstant" | "unpoisonarrows" | "unravenform" | "unrobogoblin" | "unroot" | "unstableconcoction" | "unstoneform" | "unsubmerge" | "unsummon" | "unwindwalk" | "vengeance" | "vengeanceinstant" | "vengeanceoff" | "vengeanceon" | "volcano" | "voodoo" | "ward" | "waterelemental" | "wateryminion" | "web" | "weboff" | "webon" | "whirlwind" | "windwalk" | "wispharvest") => number;
 }
 declare global {
     function orderId(...args: Parameters<typeof inner.orderId>): ReturnType<typeof inner.orderId>;

package/core/util.lua

@@ -196,6 +196,12 @@ do
             drain = 852487,
             dreadlordinferno = 852224,
             dropitem = 852001,
+            moveslot0 = 852002,
+            moveslot1 = 852003,
+            moveslot2 = 852004,
+            moveslot3 = 852005,
+            moveslot4 = 852006,
+            moveslot5 = 852007,
             drunkenhaze = 852585,
             earthquake = 852121,
             eattree = 852146,

package/engine/internal/ability.d.ts

@@ -4,14 +4,6 @@ import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
 import type { AbilityTypeId } from "../object-data/entry/ability-type";
-interface Fields<K, V> {
-    set(field: K, value: V): boolean;
-    get(field: K): V;
-    has(field: K): boolean;
-}
-interface AbilityLevel {
-    realFields: Fields<jabilityreallevelfield, number>;
-}
 export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
 export declare class AbilitySnapshot {
 }
@@ -40,8 +32,7 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilityintegerlevelfield | jabilityreallevelfield, level: number, value: number): boolean;
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
-    get realFields(): Fields<jabilityrealfield, number>;
-    get levels(): readonly AbilityLevel[];
+    get levelCount(): number;
     abstract get level(): number;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
@@ -88,4 +79,3 @@ export declare class ItemAbility extends Ability {
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }
-export {};

package/engine/internal/ability.lua

@@ -2,7 +2,6 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__Class = ____lualib.__TS__Class
-local __TS__New = ____lualib.__TS__New
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -33,7 +32,6 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
-local getItemAbility = BlzGetItemAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -151,55 +149,6 @@ local orders = postcompile(function()
     end
     return orders
 end)
-local RealFields = __TS__Class()
-RealFields.name = "RealFields"
-function RealFields.prototype.____constructor(self, handle)
-    self.handle = handle
-end
-function RealFields.prototype.set(self, field, value)
-    return BlzSetAbilityRealField(self.handle, field, value)
-end
-function RealFields.prototype.get(self, field)
-    return BlzGetAbilityRealField(self.handle, field)
-end
-function RealFields.prototype.has(self, field)
-    local handle = self.handle
-    return BlzSetAbilityRealField(
-        handle,
-        field,
-        BlzGetAbilityRealField(handle, field)
-    )
-end
-local RealLevelFields = __TS__Class()
-RealLevelFields.name = "RealLevelFields"
-function RealLevelFields.prototype.____constructor(self, handle, level)
-    self.handle = handle
-    self.level = level
-end
-function RealLevelFields.prototype.set(self, field, value)
-    return BlzSetAbilityRealLevelField(self.handle, field, self.level, value)
-end
-function RealLevelFields.prototype.get(self, field)
-    return BlzGetAbilityRealLevelField(self.handle, field, self.level)
-end
-function RealLevelFields.prototype.has(self, field)
-    local handle = self.handle
-    return BlzSetAbilityRealLevelField(
-        handle,
-        field,
-        0,
-        BlzGetAbilityRealLevelField(handle, field, 0)
-    )
-end
-local realLevelMetatable = {__index = self}
-local levelDescriptors = {realFields = function(self, handle, level)
-    return __TS__New(RealLevelFields, handle, level)
-end}
-local levelMetatable = {__index = function(self, key)
-    local fields = levelDescriptors[key](levelDescriptors, self.handle, self.level)
-    rawset(self, key, fields)
-    return fields
-end}
 local fieldGetters = {
     abilityintegerfield = function(ability, field)
         return getAbilityIntegerField(ability.handle, field)
@@ -355,34 +304,9 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Ability.prototype,
-    "realFields",
+    "levelCount",
     {get = function(self)
-        local realFields = __TS__New(RealFields, self.handle)
-        rawset(self, "realFields", realFields)
-        return realFields
-    end},
-    true
-)
-__TS__SetDescriptor(
-    Ability.prototype,
-    "levels",
-    {get = function(self)
-        local handle = self.handle
-        local levels = setmetatable(
-            {},
-            {
-                __len = function(self)
-                    return BlzGetAbilityIntegerField(handle, ABILITY_IF_LEVELS)
-                end,
-                __index = function(self, i)
-                    local level = setmetatable({handle = handle, level = i - 1}, levelMetatable)
-                    self[i] = level
-                    return level
-                end
-            }
-        )
-        rawset(self, "levels", levels)
-        return levels
+        return self:getField(ABILITY_IF_LEVELS)
     end},
     true
 )

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

@@ -0,0 +1,23 @@
+/** @noSelfInFile */
+import { Item } from "../item";
+export interface UnitItems extends ReadonlyArray<Item | undefined> {
+    readonly length: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    [0]: Item | undefined;
+    [1]: Item | undefined;
+    [2]: Item | undefined;
+    [3]: Item | undefined;
+    [4]: Item | undefined;
+    [5]: Item | undefined;
+}
+export declare class UnitItems {
+    constructor(handle: junit);
+    protected __newindex(slot: number, item: Item | undefined): void;
+    protected __index(key: string | number): unknown;
+    protected __len(): number;
+    protected __ipairs(): LuaIterator<LuaMultiReturn<[number, Item | undefined]>, junit>;
+}
+declare module "../unit" {
+    interface Unit {
+        readonly items: UnitItems;
+    }
+}

package/engine/internal/unit/item.lua

@@ -0,0 +1,74 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local rawset = _G.rawset
+local ____type = _G.type
+local isItemPowerup = IsItemPowerup
+local setItemBooleanField = BlzSetItemBooleanField
+local unitAddItem = UnitAddItem
+local unitDropItemSlot = UnitDropItemSlot
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
+local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
+local handleByUnitItems = setmetatable({}, {__mode = "k"})
+local function unitItemsNext(handle, index)
+    local slot = index & 7
+    if index >> 3 == slot then
+        return nil, nil
+    end
+    return index + 1, Item:of(unitItemInSlot(handle, slot))
+end
+____exports.UnitItems = __TS__Class()
+local UnitItems = ____exports.UnitItems
+UnitItems.name = "UnitItems"
+function UnitItems.prototype.____constructor(self, handle)
+    handleByUnitItems[self] = handle
+end
+function UnitItems.prototype.__newindex(self, slot, item)
+    local handle = handleByUnitItems[self]
+    if slot < 1 or slot > unitInventorySize(handle) then
+        return
+    end
+    unitRemoveItemFromSlot(handle, slot - 1)
+    if item ~= nil then
+        local itemHandle = item.handle
+        local isPowerup = isItemPowerup(itemHandle)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+        end
+        unitAddItem(handle, itemHandle)
+        unitDropItemSlot(handle, itemHandle, slot - 1)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+        end
+    end
+end
+function UnitItems.prototype.__index(self, key)
+    if ____type(key) == "number" then
+        return Item:of(unitItemInSlot(handleByUnitItems[self], key - 1))
+    end
+    return rawget(____exports.UnitItems.prototype, key)
+end
+function UnitItems.prototype.__len(self)
+    return unitInventorySize(handleByUnitItems[self])
+end
+function UnitItems.prototype.__ipairs(self)
+    local handle = handleByUnitItems[self]
+    return unitItemsNext, handle, unitInventorySize(handle) << 3
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "items",
+    {get = function(self)
+        local items = __TS__New(____exports.UnitItems, self.handle)
+        rawset(self, "items", items)
+        return items
+    end}
+)
+return ____exports

package/engine/internal/unit-missile-launch.lua

@@ -7,14 +7,33 @@ local ____event = require("event")
 local Event = ____event.Event
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
 local eventTimerByUnit = {}
-local function reset(source)
-    local eventTimer = eventTimerByUnit[source]
-    if eventTimer then
-        eventTimer:destroy()
-        eventTimerByUnit[source] = nil
+local instantOrderIds = luaSetOf(
+    orderId("avatar"),
+    orderId("berserk"),
+    orderId("divineshield"),
+    orderId("immolation"),
+    orderId("moveslot0"),
+    orderId("moveslot1"),
+    orderId("moveslot2"),
+    orderId("moveslot3"),
+    orderId("moveslot4"),
+    orderId("moveslot5"),
+    orderId("unavatar"),
+    orderId("undivineshield"),
+    orderId("unimmolation")
+)
+local function reset(source, orderId)
+    if not (instantOrderIds[orderId] ~= nil) then
+        local eventTimer = eventTimerByUnit[source]
+        if eventTimer then
+            eventTimer:destroy()
+            eventTimerByUnit[source] = nil
+        end
     end
 end
 Unit.onImmediateOrder:addListener(reset)

package/engine/internal/unit.d.ts

@@ -68,16 +68,6 @@ declare const modifiers: {
     speed: (unit: junit, value: number) => void;
     armor: (unit: junit, value: number) => void;
 };
-export interface UnitItems extends Array<Item | undefined> {
-    readonly length: 0 | 1 | 2 | 3 | 4 | 5 | 6;
-}
-export declare class UnitItems {
-    private readonly handle;
-    constructor(handle: junit);
-    protected __newindex(slot: number, item: Item | undefined): void;
-    protected __index(slot: number): Item | undefined;
-    protected __len(): number;
-}
 export declare class UnitWeapon {
     readonly unit: Unit;
     readonly index: 0 | 1;
@@ -251,7 +241,6 @@ export declare class Unit extends Handle<junit> {
     dropItemTarget(item: Item, target: Widget): boolean;
     dropItemSlot(item: Item, slot: number): boolean;
     itemInSlot(slot: number): Item | null;
-    get items(): UnitItems;
     addAbility(abilityId: number): UnitAbility | null;
     makeAbilityPermanent(abilityId: number, permanent: true): boolean;
     setAbilityLevel(abilityId: number, level: number): number;

package/engine/internal/unit.lua

@@ -15,7 +15,6 @@ local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
 local ____exports = {}
-local unitInventorySize, unitItemInSlot, unitDropItemSlot, unitRemoveItemFromSlot, unitAddItem, isItemPowerup, setItemBooleanField
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____player = require("core.types.player")
@@ -392,37 +391,6 @@ local getters = {
         return BlzGetUnitArmor(unit)
     end
 }
-____exports.UnitItems = __TS__Class()
-local UnitItems = ____exports.UnitItems
-UnitItems.name = "UnitItems"
-function UnitItems.prototype.____constructor(self, handle)
-    self.handle = handle
-end
-function UnitItems.prototype.__newindex(self, slot, item)
-    local handle = self.handle
-    if slot < 0 or slot >= unitInventorySize(handle) then
-        return
-    end
-    unitRemoveItemFromSlot(handle, slot)
-    if item ~= nil then
-        local itemHandle = item.handle
-        local isPowerup = isItemPowerup(itemHandle)
-        if isPowerup then
-            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
-        end
-        unitAddItem(handle, itemHandle)
-        unitDropItemSlot(handle, itemHandle, slot)
-        if isPowerup then
-            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
-        end
-    end
-end
-function UnitItems.prototype.__index(self, slot)
-    return Item:of(unitItemInSlot(self.handle, slot))
-end
-function UnitItems.prototype.__len(self)
-    return unitInventorySize(self.handle)
-end
 ____exports.UnitWeapon = __TS__Class()
 local UnitWeapon = ____exports.UnitWeapon
 UnitWeapon.name = "UnitWeapon"
@@ -575,13 +543,8 @@ __TS__SetDescriptor(
     },
     true
 )
-unitInventorySize = UnitInventorySize
-unitItemInSlot = UnitItemInSlot
-unitDropItemSlot = UnitDropItemSlot
-unitRemoveItemFromSlot = UnitRemoveItemFromSlot
-unitAddItem = UnitAddItem
-isItemPowerup = IsItemPowerup
-setItemBooleanField = BlzSetItemBooleanField
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
 local getUnitAbility = BlzGetUnitAbility
 local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
@@ -1853,16 +1816,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "items",
-    {get = function(self)
-        local items = __TS__New(____exports.UnitItems, self.handle)
-        rawset(self, "items", items)
-        return items
-    end},
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "buffIds",

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

@@ -45,4 +45,16 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get goldCost(): number;
+    set goldCost(goldCost: number);
+    get lumberCost(): number;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }

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

@@ -256,4 +256,82 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "goldCost",
+    {
+        get = function(self)
+            return self:getNumberField("igol")
+        end,
+        set = function(self, goldCost)
+            self:setNumberField("igol", goldCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "lumberCost",
+    {
+        get = function(self)
+            return self:getNumberField("ilum")
+        end,
+        set = function(self, lumberCost)
+            self:setNumberField("ilum", lumberCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "activelyUsed",
+    {
+        get = function(self)
+            return self:getBooleanField("iusa")
+        end,
+        set = function(self, activelyUsed)
+            self:setBooleanField("iusa", activelyUsed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "perishable",
+    {
+        get = function(self)
+            return self:getBooleanField("iper")
+        end,
+        set = function(self, perishable)
+            self:setBooleanField("iper", perishable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "initialStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("iuse")
+        end,
+        set = function(self, initialStackSize)
+            self:setNumberField("iuse", initialStackSize)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "maximumStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("ista")
+        end,
+        set = function(self, maximumStackSize)
+            self:setNumberField("ista", maximumStackSize)
+        end
+    },
+    true
+)
 return ____exports

package/engine/object-field/ability.lua

@@ -261,7 +261,7 @@ local AbilityLevelField = ____exports.AbilityLevelField
 AbilityLevelField.name = "AbilityLevelField"
 __TS__ClassExtends(AbilityLevelField, ObjectLevelField)
 function AbilityLevelField.prototype.getLevelCount(self, entry)
-    return __TS__InstanceOf(entry, Ability) and #entry.levels or entry.levelCount
+    return entry.levelCount
 end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId

package/engine/unit.d.ts

@@ -4,6 +4,7 @@ import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
+import "./internal/unit/item";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";

package/engine/unit.lua

@@ -4,6 +4,7 @@ require("engine.internal.unit.ability")
 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+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")

package/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import "./types";
+import "./patch-lua";
 import "./patch-lualib";
 import "./patch-natives";
 import "./global/math";

package/index.lua

@@ -1,5 +1,6 @@
 local ____exports = {}
 require("types")
+require("patch-lua")
 require("patch-lualib")
 require("patch-natives")
 require("global.math")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.38157d0",
+    "version": "0.0.1-dev.3e67cca",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/patch-lua.lua

@@ -0,0 +1,10 @@
+local getmetatable = _G.getmetatable
+local ipairs = _G.ipairs
+
+_G.ipairs = function(t)
+    local metatable = getmetatable(t)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(t)
+    end
+    return ipairs(t)
+end